diff --git a/.bladeformatterrc.json b/.bladeformatterrc.json
new file mode 100644
index 0000000000..7d72ac635b
--- /dev/null
+++ b/.bladeformatterrc.json
@@ -0,0 +1,6 @@
+{
+    "indentSize": 4,
+    "wrapLineLength": 250,
+    "endWithNewLine": true,
+    "useTabs": false
+}
diff --git a/.bladeignore b/.bladeignore
new file mode 100644
index 0000000000..140fada73f
--- /dev/null
+++ b/.bladeignore
@@ -0,0 +1 @@
+vendor/*
diff --git a/.github/workflows/Lint.yml b/.github/workflows/Lint.yml
new file mode 100644
index 0000000000..7eae3fc3ec
--- /dev/null
+++ b/.github/workflows/Lint.yml
@@ -0,0 +1,27 @@
+name: Lint
+
+on:
+  push:
+    branches:
+      - '**'
+  pull_request:
+    branches:
+      - '**'
+    types:
+      - opened
+      - edited
+      - synchronize
+      - reopened
+
+jobs:
+  pint:
+    uses: itinerare/github-actions/.github/workflows/pint.yml@main
+    with:
+      php-version: '8.1'
+    concurrency:
+      group: ci-${{ github.head_ref || github.ref_name }}
+
+  blade-formatter:
+    uses: itinerare/github-actions/.github/workflows/blade_formatter.yml@main
+    concurrency:
+      group: ci-${{ github.head_ref || github.ref_name }}
diff --git a/.gitignore b/.gitignore
index 40560a7abd..bafc0dea2e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,6 +9,6 @@ Homestead.json
 Homestead.yaml
 npm-debug.log
 yarn-error.log
-/composer.lock
 *.env
 /composer.phar
+*.cache
diff --git a/app/Actions/Fortify/CreateNewUser.php b/app/Actions/Fortify/CreateNewUser.php
new file mode 100644
index 0000000000..093462d4e8
--- /dev/null
+++ b/app/Actions/Fortify/CreateNewUser.php
@@ -0,0 +1,45 @@
+<?php
+
+namespace App\Actions\Fortify;
+
+use App\Models\Invitation;
+use App\Models\User\User;
+use App\Services\InvitationService;
+use App\Services\UserService;
+use Illuminate\Support\Facades\Hash;
+use Laravel\Fortify\Contracts\CreatesNewUsers;
+
+class CreateNewUser implements CreatesNewUsers {
+    use PasswordValidationRules;
+
+    /**
+     * Validate and create a newly registered user.
+     *
+     * @return \App\Models\User
+     */
+    public function create(array $input) {
+        (new UserService)->validator($input)->validate();
+
+        $user = User::create([
+            'name'     => $input['name'],
+            'email'    => $input['email'],
+            'password' => Hash::make($input['password']),
+            'rank_id'  => 2,
+            'birthday' => $input['dob'],
+        ]);
+        $user->settings()->create([
+            'user_id' => $user->id,
+        ]);
+        $user->profile()->create([
+            'user_id' => $user->id,
+        ]);
+
+        if (isset($input['code'])) {
+            if (!(new InvitationService)->useInvitation(Invitation::where('code', $input['code'])->whereNull('recipient_id')->first(), $user)) {
+                throw new \Exception('An error occurred while using the invitation code.');
+            }
+        }
+
+        return $user;
+    }
+}
diff --git a/app/Actions/Fortify/PasswordValidationRules.php b/app/Actions/Fortify/PasswordValidationRules.php
new file mode 100644
index 0000000000..84a6a1b5a9
--- /dev/null
+++ b/app/Actions/Fortify/PasswordValidationRules.php
@@ -0,0 +1,16 @@
+<?php
+
+namespace App\Actions\Fortify;
+
+use Laravel\Fortify\Rules\Password;
+
+trait PasswordValidationRules {
+    /**
+     * Get the validation rules used to validate passwords.
+     *
+     * @return array
+     */
+    protected function passwordRules() {
+        return ['required', 'string', new Password, 'confirmed'];
+    }
+}
diff --git a/app/Actions/Fortify/ResetUserPassword.php b/app/Actions/Fortify/ResetUserPassword.php
new file mode 100644
index 0000000000..3b656c513e
--- /dev/null
+++ b/app/Actions/Fortify/ResetUserPassword.php
@@ -0,0 +1,26 @@
+<?php
+
+namespace App\Actions\Fortify;
+
+use Illuminate\Support\Facades\Hash;
+use Illuminate\Support\Facades\Validator;
+use Laravel\Fortify\Contracts\ResetsUserPasswords;
+
+class ResetUserPassword implements ResetsUserPasswords {
+    use PasswordValidationRules;
+
+    /**
+     * Validate and reset the user's forgotten password.
+     *
+     * @param mixed $user
+     */
+    public function reset($user, array $input) {
+        Validator::make($input, [
+            'password' => $this->passwordRules(),
+        ])->validate();
+
+        $user->forceFill([
+            'password' => Hash::make($input['password']),
+        ])->save();
+    }
+}
diff --git a/app/Actions/Fortify/UpdateUserPassword.php b/app/Actions/Fortify/UpdateUserPassword.php
new file mode 100644
index 0000000000..39398a5919
--- /dev/null
+++ b/app/Actions/Fortify/UpdateUserPassword.php
@@ -0,0 +1,31 @@
+<?php
+
+namespace App\Actions\Fortify;
+
+use Illuminate\Support\Facades\Hash;
+use Illuminate\Support\Facades\Validator;
+use Laravel\Fortify\Contracts\UpdatesUserPasswords;
+
+class UpdateUserPassword implements UpdatesUserPasswords {
+    use PasswordValidationRules;
+
+    /**
+     * Validate and update the user's password.
+     *
+     * @param mixed $user
+     */
+    public function update($user, array $input) {
+        Validator::make($input, [
+            'current_password' => ['required', 'string'],
+            'password'         => $this->passwordRules(),
+        ])->after(function ($validator) use ($user, $input) {
+            if (!isset($input['current_password']) || !Hash::check($input['current_password'], $user->password)) {
+                $validator->errors()->add('current_password', __('The provided password does not match your current password.'));
+            }
+        })->validateWithBag('updatePassword');
+
+        $user->forceFill([
+            'password' => Hash::make($input['password']),
+        ])->save();
+    }
+}
diff --git a/app/Actions/Fortify/UpdateUserProfileInformation.php b/app/Actions/Fortify/UpdateUserProfileInformation.php
new file mode 100644
index 0000000000..691ded3aa5
--- /dev/null
+++ b/app/Actions/Fortify/UpdateUserProfileInformation.php
@@ -0,0 +1,54 @@
+<?php
+
+namespace App\Actions\Fortify;
+
+use Illuminate\Contracts\Auth\MustVerifyEmail;
+use Illuminate\Support\Facades\Validator;
+use Illuminate\Validation\Rule;
+use Laravel\Fortify\Contracts\UpdatesUserProfileInformation;
+
+class UpdateUserProfileInformation implements UpdatesUserProfileInformation {
+    /**
+     * Validate and update the given user's profile information.
+     *
+     * @param mixed $user
+     */
+    public function update($user, array $input) {
+        Validator::make($input, [
+            'name' => ['required', 'string', 'max:255'],
+
+            'email' => [
+                'required',
+                'string',
+                'email',
+                'max:255',
+                Rule::unique('users')->ignore($user->id),
+            ],
+        ])->validateWithBag('updateProfileInformation');
+
+        if ($input['email'] !== $user->email &&
+            $user instanceof MustVerifyEmail) {
+            $this->updateVerifiedUser($user, $input);
+        } else {
+            $user->forceFill([
+                'name'  => $input['name'],
+                'email' => $input['email'],
+            ])->save();
+        }
+    }
+
+    /**
+     * Update the given verified user's profile information.
+     *
+     * @param mixed $user
+     */
+    protected function updateVerifiedUser($user, array $input) {
+        $user->forceFill([
+            'name'              => $input['name'],
+            'email'             => $input['email'],
+            'email_verified_at' => null,
+        ])->save();
+
+        $user->sendEmailVerificationNotification();
+    }
+}
diff --git a/app/Console/Commands/AddImageHashes.php b/app/Console/Commands/AddImageHashes.php
new file mode 100644
index 0000000000..c266e933aa
--- /dev/null
+++ b/app/Console/Commands/AddImageHashes.php
@@ -0,0 +1,105 @@
+<?php
+
+namespace App\Console\Commands;
+
+use App\Models\Character\CharacterCategory;
+use App\Models\Currency\Currency;
+use App\Models\Feature\Feature;
+use App\Models\Feature\FeatureCategory;
+use App\Models\Item\Item;
+use App\Models\Item\ItemCategory;
+use App\Models\Prompt\Prompt;
+use App\Models\Prompt\PromptCategory;
+use App\Models\Rarity;
+use App\Models\Shop\Shop;
+use App\Models\Species\Species;
+use App\Models\Species\Subtype;
+use App\Services\FeatureService;
+use Illuminate\Console\Command;
+use Illuminate\Support\Facades\File;
+
+class AddImageHashes extends Command {
+    /**
+     * The name and signature of the console command.
+     *
+     * @var string
+     */
+    protected $signature = 'add-image-hashes';
+
+    /**
+     * The console command description.
+     *
+     * @var string
+     */
+    protected $description = 'Adds hashes to any existing images that don\'t already have them.';
+
+    /**
+     * Create a new command instance.
+     */
+    public function __construct() {
+        parent::__construct();
+    }
+
+    /**
+     * Execute the console command.
+     *
+     * @return mixed
+     */
+    public function handle() {
+        $images = CharacterCategory::where('has_image', 1)->whereNull('hash')->get();
+        $images = $images->concat(Currency::where('has_image', 1)->whereNull('hash')->orWhere('has_icon', 1)->whereNull('hash')->get());
+        $images = $images->concat(Feature::where('has_image', 1)->whereNull('hash')->get());
+        $images = $images->concat(FeatureCategory::where('has_image', 1)->whereNull('hash')->get());
+        $images = $images->concat(Item::where('has_image', 1)->whereNull('hash')->get());
+        $images = $images->concat(ItemCategory::where('has_image', 1)->whereNull('hash')->get());
+        $images = $images->concat(Prompt::where('has_image', 1)->whereNull('hash')->get());
+        $images = $images->concat(PromptCategory::where('has_image', 1)->whereNull('hash')->get());
+        $images = $images->concat(Rarity::where('has_image', 1)->whereNull('hash')->get());
+        $images = $images->concat(Shop::where('has_image', 1)->whereNull('hash')->get());
+        $images = $images->concat(Species::where('has_image', 1)->whereNull('hash')->get());
+        $images = $images->concat(Subtype::where('has_image', 1)->whereNull('hash')->get());
+
+        if ($images->count()) {
+            $this->line('Updating images...');
+            foreach ($images as $image) {
+                $oldName = $image->id.'-image.png';
+                $image->hash = randomString(10);
+                // Any service works, I can't use the abstract one
+                if (
+                    File::exists(public_path($image->imageDirectory).'/'.$oldName) &&
+                    (new FeatureService)->handleImage(
+                        null,
+                        public_path($image->imageDirectory),
+                        $image->hash.$image->id.'-image.png',
+                        $oldName
+                    )
+                ) {
+                    $image->save();
+                } else {
+                    $this->info('Didn\'t add hash to '.get_class($image).', this could be expected or an error, id '.$image->id);
+                }
+
+                // Just for currency icons
+                if ($image instanceof Currency) {
+                    $oldName = $image->id.'-icon.png';
+                    if (
+                        File::exists(public_path($image->imageDirectory).'/'.$oldName) &&
+                        (new FeatureService)->handleImage(
+                            null,
+                            public_path($image->imageDirectory),
+                            $image->hash.$image->id.'-icon.png',
+                            $oldName
+                        )
+                    ) {
+                        $image->save();
+                    } else {
+                        $this->info('Didn\'t add hash to currency icon image, this could be expected or an error, id '.$image->id);
+                    }
+                }
+            }
+            $this->info('Updated images.');
+        } else {
+            $this->line('No images need updating!');
+        }
+    }
+}
diff --git a/app/Console/Commands/AddSiteSettings.php b/app/Console/Commands/AddSiteSettings.php
index 3d743d7de3..0c1dfbdd83 100644
--- a/app/Console/Commands/AddSiteSettings.php
+++ b/app/Console/Commands/AddSiteSettings.php
@@ -3,11 +3,9 @@
 namespace App\Console\Commands;
 
 use Illuminate\Console\Command;
+use Illuminate\Support\Facades\DB;
 
-use DB;
-
-class AddSiteSettings extends Command
-{
+class AddSiteSettings extends Command {
     /**
      * The name and signature of the console command.
      *
@@ -24,45 +22,17 @@ class AddSiteSettings extends Command
 
     /**
      * Create a new command instance.
-     *
-     * @return void
      */
-    public function __construct()
-    {
+    public function __construct() {
         parent::__construct();
     }
 
-    /**
-     * Add a site setting.
-     * 
-     * Example usage:
-     * $this->addSiteSetting("site_setting_key", 1, "0: does nothing. 1: does something.");
-     * 
-     * @param  string  $key
-     * @param  int     $value
-     * @param  string  $description
-     */
-    private function addSiteSetting($key, $value, $description) {
-        if(!DB::table('site_settings')->where('key', $key)->exists()) {
-            DB::table('site_settings')->insert([
-                [
-                    'key'         => $key,
-                    'value'       => $value,
-                    'description' => $description,
-                ],
-            ]);
-            $this->info( "Added:   ".$key." / Default: ".$value);
-        }
-        else $this->line("Skipped: ".$key);
-    }
-
     /**
      * Execute the console command.
      *
      * @return mixed
      */
-    public function handle()
-    {
+    public function handle() {
         $this->info('*********************');
         $this->info('* ADD SITE SETTINGS *');
         $this->info('*********************'."\n");
@@ -103,20 +73,43 @@ public function handle()
 
         $this->addSiteSetting('group_currency', 1, 'ID of the group currency to award from gallery submissions (if enabled).');
 
-        if(!DB::table('site_settings')->where('key', 'character_title_display')->exists()) {
-            DB::table('site_settings')->insert([
-                [
-                    'key' => 'character_title_display',
-                    'value' => 0,
-                    'description' => '0: Characters\' titles only display in their image info. 1: Characters\'s titles display alongside their category, species, rarity.'
-                ]
+        $this->addSiteSetting('character_title_display', 0, '0: Characters\' titles only display in their image info. 1: Characters\'s titles display alongside their category, species, rarity.');
 
-            ]);
-            $this->info("Added:   character_title_display / Default: 0");
-        }
-        else $this->line("Skipped: character_title_display");
+        $this->addSiteSetting('is_maintenance_mode', 0, '0: Site is normal, 1: Users without the Has Maintenance Access power will be redirected to the home page.');
+
+        $this->addSiteSetting('deactivated_privacy', 0, 'Who can view the deactivated list? 0: Admin only, 1: Staff only, 2: Members only, 3: Public.');
+
+        $this->addSiteSetting('deactivated_link', 0, '0: No link to the deactivated list is displayed anywhere, 1: Link to the deactivated list is shown on the user list.');
+
+        $this->addSiteSetting('deactivated_key', 0, 'Optional key to view the deactivated list. Enter "0" to not require one.');
+
+        $this->addSiteSetting('comment_dislikes_enabled', 0, '0: Dislikes disabled, 1: Dislikes enabled.');
 
         $this->line("\nSite settings up to date!");
+    }
 
+    /**
+     * Add a site setting.
+     *
+     * Example usage:
+     * $this->addSiteSetting("site_setting_key", 1, "0: does nothing. 1: does something.");
+     *
+     * @param string $key
+     * @param int    $value
+     * @param string $description
+     */
+    private function addSiteSetting($key, $value, $description) {
+        if (!DB::table('site_settings')->where('key', $key)->exists()) {
+            DB::table('site_settings')->insert([
+                [
+                    'key'         => $key,
+                    'value'       => $value,
+                    'description' => $description,
+                ],
+            ]);
+            $this->info('Added:   '.$key.' / Default: '.$value);
+        } else {
+            $this->line('Skipped: '.$key);
+        }
     }
 }
diff --git a/app/Console/Commands/AddTextPages.php b/app/Console/Commands/AddTextPages.php
index 7446f3f6a8..a35bc70261 100644
--- a/app/Console/Commands/AddTextPages.php
+++ b/app/Console/Commands/AddTextPages.php
@@ -2,13 +2,11 @@
 
 namespace App\Console\Commands;
 
-use Illuminate\Console\Command;
-use Config;
-use DB;
 use Carbon\Carbon;
+use Illuminate\Console\Command;
+use Illuminate\Support\Facades\DB;
 
-class AddTextPages extends Command
-{
+class AddTextPages extends Command {
     /**
      * The name and signature of the console command.
      *
@@ -25,11 +23,8 @@ class AddTextPages extends Command
 
     /**
      * Create a new command instance.
-     *
-     * @return void
      */
-    public function __construct()
-    {
+    public function __construct() {
         parent::__construct();
     }
 
@@ -38,34 +33,33 @@ public function __construct()
      *
      * @return mixed
      */
-    public function handle()
-    {
+    public function handle() {
         //
-        $pages = Config::get('lorekeeper.text_pages');
+        $pages = config('lorekeeper.text_pages');
 
-        
         $this->info('******************');
         $this->info('* ADD SITE PAGES *');
         $this->info('******************'."\n");
 
         $this->line("Adding site pages...existing entries will be skipped.\n");
 
-        foreach($pages as $key => $page) {
-            if(!DB::table('site_pages')->where('key', $key)->exists()) {
+        foreach ($pages as $key => $page) {
+            if (!DB::table('site_pages')->where('key', $key)->exists()) {
                 DB::table('site_pages')->insert([
                     [
-                        'key' => $key,
-                        'title' => $page['title'],
-                        'text' => $page['text'],
+                        'key'         => $key,
+                        'title'       => $page['title'],
+                        'text'        => $page['text'],
                         'parsed_text' => $page['text'],
-                        'created_at' => Carbon::now(),
-                        'updated_at' => Carbon::now(),
-                    ]
+                        'created_at'  => Carbon::now(),
+                        'updated_at'  => Carbon::now(),
+                    ],
 
                 ]);
-                $this->info("Added:   ".$page['title']);
+                $this->info('Added:   '.$page['title']);
+            } else {
+                $this->line('Skipped: '.$page['title']);
             }
-            else $this->line("Skipped: ".$page['title']);
         }
     }
 }
diff --git a/app/Console/Commands/CheckNews.php b/app/Console/Commands/CheckNews.php
index f9f63cd7d9..ee1456b626 100644
--- a/app/Console/Commands/CheckNews.php
+++ b/app/Console/Commands/CheckNews.php
@@ -2,11 +2,10 @@
 
 namespace App\Console\Commands;
 
-use Illuminate\Console\Command;
 use App\Services\NewsService;
+use Illuminate\Console\Command;
 
-class CheckNews extends Command
-{
+class CheckNews extends Command {
     /**
      * The name and signature of the console command.
      *
@@ -23,11 +22,8 @@ class CheckNews extends Command
 
     /**
      * Create a new command instance.
-     *
-     * @return void
      */
-    public function __construct()
-    {
+    public function __construct() {
         parent::__construct();
     }
 
@@ -36,8 +32,7 @@ public function __construct()
      *
      * @return mixed
      */
-    public function handle()
-    {
+    public function handle() {
         //
         (new NewsService)->updateQueue();
     }
diff --git a/app/Console/Commands/CheckReleasedItems.php b/app/Console/Commands/CheckReleasedItems.php
new file mode 100644
index 0000000000..61ff26701a
--- /dev/null
+++ b/app/Console/Commands/CheckReleasedItems.php
@@ -0,0 +1,43 @@
+<?php
+
+namespace App\Console\Commands;
+
+use App\Models\Item\Item;
+use App\Models\User\UserItem;
+use Illuminate\Console\Command;
+
+class CheckReleasedItems extends Command {
+    /**
+     * The name and signature of the console command.
+     *
+     * @var string
+     */
+    protected $signature = 'update-released-items';
+
+    /**
+     * The console command description.
+     *
+     * @var string
+     */
+    protected $description = 'Checks unreleased items to see if they are or have been owned by at least one user, and updates them if so.';
+
+    /**
+     * Execute the console command.
+     *
+     * @return int
+     */
+    public function handle() {
+        $userItems = UserItem::pluck('item_id')->unique()->toArray();
+        $releasedItems = Item::where('is_released', 0)->whereIn('id', $userItems);
+
+        if ($releasedItems->count()) {
+            $this->line('Updating items...');
+            $releasedItems->update(['is_released' => 1]);
+            $this->info('Updated items.');
+        } else {
+            $this->line('No items need updating!');
+        }
+
+        return 0;
+    }
+}
diff --git a/app/Console/Commands/CheckSales.php b/app/Console/Commands/CheckSales.php
index a2e8176ca8..4d015699e3 100644
--- a/app/Console/Commands/CheckSales.php
+++ b/app/Console/Commands/CheckSales.php
@@ -2,11 +2,10 @@
 
 namespace App\Console\Commands;
 
-use Illuminate\Console\Command;
 use App\Services\SalesService;
+use Illuminate\Console\Command;
 
-class CheckSales extends Command
-{
+class CheckSales extends Command {
     /**
      * The name and signature of the console command.
      *
@@ -23,11 +22,8 @@ class CheckSales extends Command
 
     /**
      * Create a new command instance.
-     *
-     * @return void
      */
-    public function __construct()
-    {
+    public function __construct() {
         parent::__construct();
     }
 
@@ -36,8 +32,7 @@ public function __construct()
      *
      * @return mixed
      */
-    public function handle()
-    {
+    public function handle() {
         //
         (new SalesService)->updateQueue();
     }
diff --git a/app/Console/Commands/ClearDeletedCharacterAttachments.php b/app/Console/Commands/ClearDeletedCharacterAttachments.php
index daeb1f98d9..601620fd3c 100644
--- a/app/Console/Commands/ClearDeletedCharacterAttachments.php
+++ b/app/Console/Commands/ClearDeletedCharacterAttachments.php
@@ -2,17 +2,14 @@
 
 namespace App\Console\Commands;
 
-use Illuminate\Console\Command;
-
-use DB;
-
 use App\Models\Character\Character;
 use App\Models\Character\CharacterCurrency;
 use App\Models\Character\CharacterFeature;
 use App\Models\Character\CharacterImage;
+use Illuminate\Console\Command;
+use Illuminate\Support\Facades\DB;
 
-class ClearDeletedCharacterAttachments extends Command
-{
+class ClearDeletedCharacterAttachments extends Command {
     /**
      * The name and signature of the console command.
      *
@@ -29,11 +26,8 @@ class ClearDeletedCharacterAttachments extends Command
 
     /**
      * Create a new command instance.
-     *
-     * @return void
      */
-    public function __construct()
-    {
+    public function __construct() {
         parent::__construct();
     }
 
@@ -42,8 +36,7 @@ public function __construct()
      *
      * @return mixed
      */
-    public function handle()
-    {
+    public function handle() {
         // Get deleted character IDs
         $deletedCharacterIds = DB::table('characters')->whereNotNull('deleted_at')->pluck('id');
 
diff --git a/app/Console/Commands/CopyDefaultImages.php b/app/Console/Commands/CopyDefaultImages.php
index 78cb8f798c..d414fe3fc8 100644
--- a/app/Console/Commands/CopyDefaultImages.php
+++ b/app/Console/Commands/CopyDefaultImages.php
@@ -2,11 +2,9 @@
 
 namespace App\Console\Commands;
 
-use Config;
 use Illuminate\Console\Command;
 
-class CopyDefaultImages extends Command
-{
+class CopyDefaultImages extends Command {
     /**
      * The name and signature of the console command.
      *
@@ -23,11 +21,8 @@ class CopyDefaultImages extends Command
 
     /**
      * Create a new command instance.
-     *
-     * @return void
      */
-    public function __construct()
-    {
+    public function __construct() {
         parent::__construct();
     }
 
@@ -36,22 +31,20 @@ public function __construct()
      *
      * @return mixed
      */
-    public function handle()
-    {
+    public function handle() {
         //
         $this->info('***********************');
         $this->info('* COPY DEFAULT IMAGES *');
         $this->info('***********************'."\n");
 
-        $images = Config::get('lorekeeper.image_files');
+        $images = config('lorekeeper.image_files');
 
-        $sourceDir = base_path() . '/data/images/';
-        $destDir = public_path() . '/images/';
+        $sourceDir = base_path().'/data/images/';
+        $destDir = public_path().'/images/';
 
-        foreach($images as $image)
-        {
-            $this->line("Copying image: ".$image['filename'] . "\n");
-            copy($sourceDir . $image['filename'], $destDir . $image['filename']);
+        foreach ($images as $image) {
+            $this->line('Copying image: '.$image['filename']."\n");
+            copy($sourceDir.$image['filename'], $destDir.$image['filename']);
         }
         $this->line('Done!');
     }
diff --git a/app/Console/Commands/FillExistingFullsizeExtensions.php b/app/Console/Commands/FillExistingFullsizeExtensions.php
new file mode 100644
index 0000000000..ca56353a99
--- /dev/null
+++ b/app/Console/Commands/FillExistingFullsizeExtensions.php
@@ -0,0 +1,44 @@
+<?php
+
+namespace App\Console\Commands;
+
+use App\Models\Character\CharacterImage;
+use Illuminate\Console\Command;
+
+class FillExistingFullsizeExtensions extends Command {
+    /**
+     * The name and signature of the console command.
+     *
+     * @var string
+     */
+    protected $signature = 'app:fill-character-fullsize-extensions';
+
+    /**
+     * The console command description.
+     *
+     * @var string
+     */
+    protected $description = 'Supplies file extension information for any stored masterlist full-size images from the existing stored extension.';
+
+    /**
+     * Execute the console command.
+     *
+     * @return int
+     */
+    public function handle() {
+        $images = CharacterImage::whereNotNull('fullsize_hash')->whereNull('fullsize_extension')->get();
+
+        if ($images->count()) {
+            $this->info('Processing '.$images->count().' images...');
+            foreach ($images as $image) {
+                $image->update(['fullsize_extension' => $image->extension]);
+            }
+
+            $this->info('Done!');
+        } else {
+            $this->line('No images need processing!');
+        }
+
+        return Command::SUCCESS;
+    }
+}
diff --git a/app/Console/Commands/FixCharItemNotifs.php b/app/Console/Commands/FixCharItemNotifs.php
index f66d7e8703..0a149f36b9 100644
--- a/app/Console/Commands/FixCharItemNotifs.php
+++ b/app/Console/Commands/FixCharItemNotifs.php
@@ -2,11 +2,10 @@
 
 namespace App\Console\Commands;
 
-use Illuminate\Console\Command;
 use App\Services\ExtensionService;
+use Illuminate\Console\Command;
 
-class FixCharItemNotifs extends Command
-{
+class FixCharItemNotifs extends Command {
     /**
      * The name and signature of the console command.
      *
@@ -23,11 +22,8 @@ class FixCharItemNotifs extends Command
 
     /**
      * Create a new command instance.
-     *
-     * @return void
      */
-    public function __construct()
-    {
+    public function __construct() {
         parent::__construct();
     }
 
@@ -36,8 +32,7 @@ public function __construct()
      *
      * @return mixed
      */
-    public function handle()
-    {
+    public function handle() {
         //
         (new ExtensionService)->updateNotifications(39, 501);
         (new ExtensionService)->updateNotifications(40, 502);
diff --git a/app/Console/Commands/FixRegisteredUsers.php b/app/Console/Commands/FixRegisteredUsers.php
new file mode 100644
index 0000000000..06b4c7dd15
--- /dev/null
+++ b/app/Console/Commands/FixRegisteredUsers.php
@@ -0,0 +1,48 @@
+<?php
+
+namespace App\Console\Commands;
+
+use App\Models\User\User;
+use Illuminate\Console\Command;
+
+class FixRegisteredUsers extends Command {
+    /**
+     * The name and signature of the console command.
+     *
+     * @var string
+     */
+    protected $signature = 'fix-registered-users';
+
+    /**
+     * The console command description.
+     *
+     * @var string
+     */
+    protected $description = 'Fixes users who registered during fortify setup and did not have a user_setting or user_profile entry created.';
+
+    /**
+     * Create a new command instance.
+     */
+    public function __construct() {
+        parent::__construct();
+    }
+
+    /**
+     * Execute the console command.
+     *
+     * @return mixed
+     */
+    public function handle() {
+        // get all users without a user_setting and user_profile entry
+        $users = User::whereDoesntHave('settings')->whereDoesntHave('profile')->get();
+        foreach ($users as $user) {
+            $this->line('Creating user settings and profile for user '.$user->name.'...');
+            $user->settings()->create([
+                'user_id' => $user->id,
+            ]);
+            $user->profile()->create([
+                'user_id' => $user->id,
+            ]);
+        }
+    }
+}
diff --git a/app/Console/Commands/MigrateAliases.php b/app/Console/Commands/MigrateAliases.php
index 9d6fa89033..4ddc36caf5 100644
--- a/app/Console/Commands/MigrateAliases.php
+++ b/app/Console/Commands/MigrateAliases.php
@@ -2,22 +2,19 @@
 
 namespace App\Console\Commands;
 
-use Illuminate\Console\Command;
-
-use DB;
-use Illuminate\Support\Facades\Schema;
-use Illuminate\Database\Schema\Blueprint;
-
-use App\Models\User\User;
-use App\Models\User\UserAlias;
 use App\Models\Character\Character;
 use App\Models\Character\CharacterImageCreator;
 use App\Models\Character\CharacterLog;
-use App\Models\User\UserCharacterLog;
 use App\Models\Item\Item;
+use App\Models\User\User;
+use App\Models\User\UserAlias;
+use App\Models\User\UserCharacterLog;
+use Illuminate\Console\Command;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\DB;
+use Illuminate\Support\Facades\Schema;
 
-class MigrateAliases extends Command
-{
+class MigrateAliases extends Command {
     /**
      * The name and signature of the console command.
      *
@@ -34,11 +31,8 @@ class MigrateAliases extends Command
 
     /**
      * Create a new command instance.
-     *
-     * @return void
      */
-    public function __construct()
-    {
+    public function __construct() {
         parent::__construct();
     }
 
@@ -47,200 +41,221 @@ public function __construct()
      *
      * @return mixed
      */
-    public function handle()
-    {
+    public function handle() {
         $this->info('*****************************');
         $this->info('* MIGRATE ALIAS INFORMATION *');
         $this->info('*****************************'."\n");
 
         $this->line("Migrating aliases...\n");
 
-        /** MOVE USER ALIASES */
-        if(Schema::hasColumn('users', 'alias')) {
+        /* MOVE USER ALIASES */
+        if (Schema::hasColumn('users', 'alias')) {
             // Get users with a set alias
             $aliasUsers = User::whereNotNull('alias')->get();
 
-            if($aliasUsers->count()) {
-                foreach($aliasUsers as $user) {
-                    if(!DB::table('user_aliases')->where('user_id', $user->id)->where('site', 'deviantart')->where('alias', $user->alias)->exists()) {
+            if ($aliasUsers->count()) {
+                foreach ($aliasUsers as $user) {
+                    if (!DB::table('user_aliases')->where('user_id', $user->id)->where('site', 'deviantart')->where('alias', $user->alias)->exists()) {
                         // Create a new row for the user's current dA alias
                         DB::table('user_aliases')->insert([
                             [
-                                'user_id' => $user->id,
-                                'site' => 'deviantart',
-                                'alias' => $user->alias,
-                                'is_visible' => 1,
+                                'user_id'          => $user->id,
+                                'site'             => 'deviantart',
+                                'alias'            => $user->alias,
+                                'is_visible'       => 1,
                                 'is_primary_alias' => 1,
-                            ]
+                            ],
                         ]);
 
                         // Clear the user's alias in the users table and set the has_alias bool in its place
                         $user->update([
-                            'alias' => null,
-                            'has_alias' => 1
+                            'alias'     => null,
+                            'has_alias' => 1,
                         ]);
                     }
                 }
-                $this->info("Migrated: User aliases");
+                $this->info('Migrated: User aliases');
+            } else {
+                $this->line('Skipped: User aliases (nothing to migrate)');
             }
-            else $this->line("Skipped: User aliases (nothing to migrate)");
+        } else {
+            $this->line('Skipped: User aliases (column no longer exists)');
         }
-        else $this->line("Skipped: User aliases (column no longer exists)");
 
         $daAliases = UserAlias::where('site', 'dA')->get();
-        if($daAliases->count()) {
+        if ($daAliases->count()) {
             $this->line('Updating '.$daAliases->count().' deviantArt aliases...');
-            foreach($daAliases as $alias) {
+            foreach ($daAliases as $alias) {
                 $alias->site = 'deviantart';
                 $alias->save();
             }
             $this->info('deviantArt aliases updated!');
+        } else {
+            $this->line('No deviantArt aliases to update!');
         }
-        else $this->line('No deviantArt aliases to update!');
 
-        /** MOVE CHARACTER OWNER ALIASES */
-        if(Schema::hasColumn('characters', 'owner_alias')) {
+        /* MOVE CHARACTER OWNER ALIASES */
+        if (Schema::hasColumn('characters', 'owner_alias')) {
             // This and the following section operate on the assumption that all aliases to this point have been dA accounts
 
             // Get characters with an owner identified by alias
             $aliasCharacters = Character::whereNotNull('owner_alias')->get();
 
-            if($aliasCharacters->count()) {
-                foreach($aliasCharacters as $character) {
+            if ($aliasCharacters->count()) {
+                foreach ($aliasCharacters as $character) {
                     // Just in case, check to update character ownership
                     $userAlias = UserAlias::where('site', 'deviantart')->where('alias', $character->owner_alias)->first();
-                    if($userAlias) {
+                    if ($userAlias) {
                         $character->update(['owner_alias' => null, 'user_id' => $userAlias->user_id]);
-                    }
-                    elseif(!$userAlias) {
+                    } elseif (!$userAlias) {
                         $alias = $character->owner_alias;
                         $character->update(['owner_alias' => null, 'owner_url' => 'https://deviantart.com/'.$alias]);
                     }
                 }
 
-                $this->info("Migrated: Character owner aliases");
+                $this->info('Migrated: Character owner aliases');
+
+                $nullCharacters = Character::where('owner_url', 'https://deviantart.com/null')->get();
+                if ($nullCharacters->count()) {
+                    $this->info('Fixing character owner URLs...');
+
+                    foreach ($nullCharacters as $character) {
+                        $logs = UserCharacterLog::where('character_id', $character->id)->where('recipient_url', '!=', null)->orderBy('id', 'DESC')->first();
+                        if ($logs) {
+                            $character->owner_url = $logs->recipient_url;
+                            $character->save();
+                        }
+                    }
+                    $this->info('Fixed: Character owner URLs');
+                } else {
+                    $this->line('Skipped: Character owner URL fixes (nothing to fix)');
+                }
+            } else {
+                $this->line('Skipped: Character owner aliases (nothing to migrate)');
             }
-            else $this->line("Skipped: Character owner aliases (nothing to migrate)");
+        } else {
+            $this->line('Skipped: Character owner aliases (column no longer exists)');
         }
-        else $this->line("Skipped: Character owner aliases (column no longer exists)");
 
-        if(Schema::hasColumn('character_image_creators', 'alias')) {
+        if (Schema::hasColumn('character_image_creators', 'alias')) {
             /** MOVE CHARACTER IMAGE CREATOR ALIASES */
 
             // Get character image creators with a set alias
             $aliasImageCreators = CharacterImageCreator::whereNotNull('alias')->get();
 
-            if($aliasImageCreators->count()){
-                foreach($aliasImageCreators as $creator) {
+            if ($aliasImageCreators->count()) {
+                foreach ($aliasImageCreators as $creator) {
                     $userAlias = UserAlias::where('site', 'deviantart')->where('alias', $creator->alias)->first();
-                    if($userAlias) {
+                    if ($userAlias) {
                         $creator->update(['alias' => null, 'user_id' => $userAlias->user_id]);
-                    }
-                    elseif(!$userAlias) {
+                    } elseif (!$userAlias) {
                         $alias = $creator->alias;
                         $creator->update(['alias' => null, 'url' => 'https://deviantart.com/'.$alias]);
                     }
                 }
 
-                $this->info("Migrated: Character image creator aliases");
+                $this->info('Migrated: Character image creator aliases');
+            } else {
+                $this->line('Skipped: Character image creator aliases (nothing to migrate)');
             }
-            else $this->line("Skipped: Character image creator aliases (nothing to migrate)");
+        } else {
+            $this->line('Skipped: Character image creator aliases (column no longer exists)');
         }
-        else $this->line("Skipped: Character image creator aliases (column no longer exists)");
 
-        /** MOVE CHARACTER LOG ALIASES */
+        /* MOVE CHARACTER LOG ALIASES */
 
-        if(Schema::hasColumn('character_log', 'recipient_alias') || Schema::hasColumn('character_log', 'sender_alias')) {
+        if (Schema::hasColumn('character_log', 'recipient_alias') || Schema::hasColumn('character_log', 'sender_alias')) {
             // Get character logs with a set recipient alias
             $aliasCharacterLogs = CharacterLog::whereNotNull('recipient_alias')->get();
             $aliasCharacterLogsSender = CharacterLog::whereNotNull('sender_alias')->get();
 
-            if($aliasCharacterLogs->count()) {
-                foreach($aliasCharacterLogs as $characterLog) {
+            if ($aliasCharacterLogs->count()) {
+                foreach ($aliasCharacterLogs as $characterLog) {
                     $userAlias = UserAlias::where('site', 'deviantart')->where('alias', $characterLog->recipient_alias)->first();
-                    if($userAlias) {
+                    if ($userAlias) {
                         $characterLog->update(['recipient_alias' => null, 'recipient_id' => $userAlias->user_id]);
-                    }
-                    elseif(!$userAlias) {
+                    } elseif (!$userAlias) {
                         $alias = $characterLog->recipient_alias;
                         $characterLog->update(['recipient_alias' => null, 'recipient_url' => 'https://deviantart.com/'.$alias]);
                     }
                 }
 
-                foreach($aliasCharacterLogsSender as $characterLog) {
+                foreach ($aliasCharacterLogsSender as $characterLog) {
                     $userAlias = UserAlias::where('site', 'deviantart')->where('alias', $characterLog->sender_alias)->first();
-                    if($userAlias) {
+                    if ($userAlias) {
                         $characterLog->update(['sender_alias' => null, 'sender_id' => $userAlias->user_id]);
-                    }
-                    elseif(!$userAlias) {
+                    } elseif (!$userAlias) {
                         $alias = $characterLog->sender_alias;
                         $characterLog->update(['sender_alias' => null, 'sender_url' => 'https://deviantart.com/'.$alias]);
                     }
                 }
 
-                $this->info("Migrated: Character log aliases");
+                $this->info('Migrated: Character log aliases');
+            } else {
+                $this->line('Skipped: Character log aliases (nothing to migrate)');
             }
-            else $this->line("Skipped: Character log aliases (nothing to migrate)");
+        } else {
+            $this->line('Skipped: Character log aliases (column no longer exists)');
         }
-        else $this->line("Skipped: Character log aliases (column no longer exists)");
 
-        if(Schema::hasColumn('user_character_log', 'recipient_alias') || Schema::hasColumn('user_character_log', 'sender_alias')) {
+        if (Schema::hasColumn('user_character_log', 'recipient_alias') || Schema::hasColumn('user_character_log', 'sender_alias')) {
             // Get character logs with a set recipient alias
             $aliasUserCharacterLogs = UserCharacterLog::whereNotNull('recipient_alias')->get();
             $aliasUserCharacterLogsSender = UserCharacterLog::whereNotNull('sender_alias')->get();
 
-            if($aliasUserCharacterLogs->count() || $aliasUserCharacterLogsSender->count()) {
-                foreach($aliasUserCharacterLogs as $characterLog) {
+            if ($aliasUserCharacterLogs->count() || $aliasUserCharacterLogsSender->count()) {
+                foreach ($aliasUserCharacterLogs as $characterLog) {
                     $userAlias = UserAlias::where('site', 'deviantart')->where('alias', $characterLog->recipient_alias)->first();
-                    if($userAlias) {
+                    if ($userAlias) {
                         $characterLog->update(['recipient_alias' => null, 'recipient_id' => $userAlias->user_id]);
-                    }
-                    elseif(!$userAlias) {
+                    } elseif (!$userAlias) {
                         $alias = $characterLog->recipient_alias;
                         $characterLog->update(['recipient_alias' => null, 'recipient_url' => 'https://deviantart.com/'.$alias]);
                     }
                 }
 
-                foreach($aliasUserCharacterLogsSender as $characterLog) {
+                foreach ($aliasUserCharacterLogsSender as $characterLog) {
                     $userAlias = UserAlias::where('site', 'deviantart')->where('alias', $characterLog->sender_alias)->first();
-                    if($userAlias) {
+                    if ($userAlias) {
                         $characterLog->update(['sender_alias' => null, 'sender_id' => $userAlias->user_id]);
-                    }
-                    elseif(!$userAlias) {
+                    } elseif (!$userAlias) {
                         $alias = $characterLog->sender_alias;
                         $characterLog->update(['sender_alias' => null, 'sender_url' => 'https://deviantart.com/'.$alias]);
                     }
                 }
 
-                $this->info("Migrated: User character log aliases");
+                $this->info('Migrated: User character log aliases');
+            } else {
+                $this->line('Skipped: User character log aliases (nothing to migrate)');
             }
-            else $this->line("Skipped: User character log aliases (nothing to migrate)");
+        } else {
+            $this->line('Skipped: User character log aliases (column no longer exists)');
         }
-        else $this->line("Skipped: User character log aliases (column no longer exists)");
 
-        if(Schema::hasColumn('items', 'artist_alias')) {
+        if (Schema::hasColumn('items', 'artist_alias')) {
             // Get character logs with a set recipient alias
             $aliasItemArtists = Item::whereNotNull('artist_alias')->get();
 
-            if($aliasItemArtists->count()) {
-                foreach($aliasItemArtists as $itemArtist) {
+            if ($aliasItemArtists->count()) {
+                foreach ($aliasItemArtists as $itemArtist) {
                     $userAlias = UserAlias::where('site', 'deviantart')->where('alias', $itemArtist->artist_alias)->first();
-                    if($userAlias) {
+                    if ($userAlias) {
                         $itemArtist->update(['artist_alias' => null, 'artist_id' => $userAlias->user_id]);
-                    }
-                    elseif(!$userAlias) {
+                    } elseif (!$userAlias) {
                         $alias = $itemArtist->artist_alias;
                         $itemArtist->update(['artist_alias' => null, 'artist_url' => 'https://deviantart.com/'.$alias]);
                     }
                 }
 
-                $this->info("Migrated: Item artist aliases");
+                $this->info('Migrated: Item artist aliases');
+            } else {
+                $this->line('Skipped: Item artist aliases (nothing to migrate)');
             }
-            else $this->line("Skipped: Item artist aliases (nothing to migrate)");
+        } else {
+            $this->line('Skipped: Item artist aliases (column no longer exists)');
         }
-        else $this->line("Skipped: Item artist aliases (column no longer exists)");
 
-        if($this->option('drop-columns')) {
+        if ($this->option('drop-columns')) {
             // Drop alias columns from the impacted tables.
             Schema::table('users', function (Blueprint $table) {
                 $table->dropColumn('alias');
@@ -265,11 +280,14 @@ public function handle()
                 //
                 $table->dropColumn('artist_alias');
             });
-            $this->info("Dropped alias columns");
+            $this->info('Dropped alias columns');
+        } else {
+            $this->line('Skipped: Dropping alias columns');
         }
-        else $this->line("Skipped: Dropping alias columns");
 
         $this->line("\nAlias information migrated!");
-        if(!$this->option('drop-columns')) $this->line("After checking that all data has been moved from them,\nrun again with --drop-columns to drop alias columns if desired.");
+        if (!$this->option('drop-columns')) {
+            $this->line("After checking that all data has been moved from them,\nrun again with --drop-columns to drop alias columns if desired.");
+        }
     }
 }
diff --git a/app/Console/Commands/SetupAdminUser.php b/app/Console/Commands/SetupAdminUser.php
index 096f8ec963..c5d3da79dc 100644
--- a/app/Console/Commands/SetupAdminUser.php
+++ b/app/Console/Commands/SetupAdminUser.php
@@ -2,17 +2,15 @@
 
 namespace App\Console\Commands;
 
-use Illuminate\Console\Command;
-
 use App;
-use Carbon\Carbon;
-use App\Services\UserService;
+use App\Models\Rank\Rank;
 use App\Models\User\User;
 use App\Models\User\UserAlias;
-use App\Models\Rank\Rank;
+use App\Services\UserService;
+use Carbon\Carbon;
+use Illuminate\Console\Command;
 
-class SetupAdminUser extends Command
-{
+class SetupAdminUser extends Command {
     /**
      * The name and signature of the console command.
      *
@@ -29,11 +27,8 @@ class SetupAdminUser extends Command
 
     /**
      * Create a new command instance.
-     *
-     * @return void
      */
-    public function __construct()
-    {
+    public function __construct() {
         parent::__construct();
     }
 
@@ -42,28 +37,26 @@ public function __construct()
      *
      * @return mixed
      */
-    public function handle()
-    {
+    public function handle() {
         $this->info('********************');
         $this->info('* ADMIN USER SETUP *');
         $this->info('********************'."\n");
 
         // First things first, check if user ranks exist...
-        if(!Rank::count()) {
-
+        if (!Rank::count()) {
             // These need to be created even if the seeder isn't run for the site to work correctly.
             $adminRank = Rank::create([
-                'name' => 'Admin',
+                'name'        => 'Admin',
                 'description' => 'The site admin. Has the ability to view/edit any data on the site.',
-                'sort' => 1
+                'sort'        => 1,
             ]);
             Rank::create([
-                'name' => 'Member',
+                'name'        => 'Member',
                 'description' => 'A regular member of the site.',
-                'sort' => 0
+                'sort'        => 0,
             ]);
 
-            $this->line("User ranks not found. Default user ranks (admin and basic member) created.");
+            $this->line('User ranks not found. Default user ranks (admin and basic member) created.');
         }
         // Otherwise, grab the rank with the highest "sort" value. (This is the admin rank.)
         else {
@@ -72,128 +65,122 @@ public function handle()
 
         // Check if the admin user exists...
         $user = User::where('rank_id', $adminRank->id)->first();
-        if(!$user) {
-
+        if (!$user) {
             $this->line('Setting up admin account. This account will have access to all site data, please make sure to keep the email and password secret!');
             $name = $this->anticipate('Username', ['Admin', 'System']);
             $email = $this->ask('Email Address');
             $password = $this->secret('Password (hidden)');
 
             $this->line("\nUsername: ".$name);
-            $this->line("Email: ".$email);
-            $confirm = $this->confirm("Proceed to create account with this information?");
+            $this->line('Email: '.$email);
+            $confirm = $this->confirm('Proceed to create account with this information?');
 
             // If env variables indicate a local instance, double-check
             // and then if so, help them set up verified email and alias
-            if(App::environment('local')) {
-                if($this->confirm('Are you on a local/testing instance and not a live site?')) {
-                    if($this->confirm('Would you like to mark your email address as verified and enter an alias now?')) {
+            if (App::environment('local')) {
+                if ($this->confirm('Are you on a local/testing instance and not a live site?')) {
+                    if ($this->confirm('Would you like to mark your email address as verified and enter an alias now?')) {
                         $verifiedAt = Carbon::now();
                         $this->line('Provide an alias. By default, this will be entered as a deviantArt account name, but (assuming a local/testing environment) you may use any username.');
                         $alias = $this->ask('What alias would you like to use?');
                     }
-                }
-                else {
+                } else {
                     $this->info('Please adjust your APP_ENV to Production and APP_DEBUG to false in your .env file before continuing set-up!');
+
                     return;
                 }
             }
 
-            if($confirm) {
+            if ($confirm) {
                 $service = new UserService;
                 $user = $service->createUser([
-                    'name' => $name,
-                    'email' => $email,
-                    'rank_id' => $adminRank->id,
-                    'password' => $password,
-                    'dob' => [
-                        'day' => '01',
-                        'month' => '01',
-                        'year' => '1970'
-                    ],
-                    'has_alias' => isset($alias) ? 1 : 0
+                    'name'      => $name,
+                    'email'     => $email,
+                    'rank_id'   => $adminRank->id,
+                    'password'  => $password,
+                    'dob'       => Carbon::createFromFormat('Y-m-d', '1970-01-01'),
+                    'has_alias' => isset($alias) ? 1 : 0,
                 ]);
-                if(isset($verifiedAt)) {
+                if (isset($verifiedAt)) {
                     $user->email_verified_at = $verifiedAt;
                     $user->save();
                 }
 
-                if(isset($alias)) {
+                if (isset($alias)) {
                     UserAlias::create([
-                        'user_id' => $user->id,
-                        'site' => 'deviantart',
-                        'alias' => $alias,
+                        'user_id'          => $user->id,
+                        'site'             => 'deviantart',
+                        'alias'            => $alias,
                         'is_primary_alias' => 1,
-                        'is_visible' => 1
+                        'is_visible'       => 1,
                     ]);
                 }
 
                 $this->line('Admin account created. You can now log in with the registered email and password.');
                 $this->line('If necessary, you can run this command again to change the email address and password of the admin account.');
+
                 return;
             }
-        }
-        else {
+        } else {
             // Change the admin email/password. Honestly you can do this with the forgotten password feature...
-            $this->line('Admin account [' . $user->name . '] already exists.');
-            if($this->confirm("Reset email address and password for this account?")) {
+            $this->line('Admin account ['.$user->name.'] already exists.');
+            if ($this->confirm('Reset email address and password for this account?')) {
                 $email = $this->ask('Email Address');
                 $password = $this->secret('Password (hidden)');
 
                 $this->line("\nEmail: ".$email);
-                if($this->confirm("Proceed to change email address and password?")) {
+                if ($this->confirm('Proceed to change email address and password?')) {
                     $service = new UserService;
                     $service->updateUser([
-                        'id' => $user->id,
-                        'email' => $email,
-                        'password' => $password
+                        'id'       => $user->id,
+                        'email'    => $email,
+                        'password' => $password,
                     ]);
 
                     $this->line('Admin account email and password changed.');
-
                 }
             }
 
             // If env variables indicate a local instance, double-check
             // and then if so, help them set up verified email and alias
-            if(App::environment('local')) {
-                if($this->confirm('Are you on a local/testing instance and not a live site?')) {
-                    if($this->confirm('Would you like to mark your email address as verified?')) {
+            if (App::environment('local')) {
+                if ($this->confirm('Are you on a local/testing instance and not a live site?')) {
+                    if ($this->confirm('Would you like to mark your email address as verified?')) {
                         $verifiedAt = Carbon::now();
                     }
-                    if(!$user->has_alias && $this->confirm('Would you like to enter an alias now?')) {
+                    if (!$user->has_alias && $this->confirm('Would you like to enter an alias now?')) {
                         $this->line('Provide an alias. By default, this will be entered as a deviantArt account name, but (assuming a local/testing environment) you may use any username.');
                         $alias = $this->ask('What alias would you like to use?');
                     }
-                }
-                else {
+                } else {
                     $this->info('Please adjust your APP_ENV to Production and APP_DEBUG to false in your .env file before continuing set-up!');
+
                     return;
                 }
 
-                if(isset($verifiedAt)) {
+                if (isset($verifiedAt)) {
                     $this->line('Marking email address as verified...');
                     $user->email_verified_at = $verifiedAt;
                     $user->save();
                 }
 
-                if(isset($alias)) {
+                if (isset($alias)) {
                     $this->line('Adding user alias...');
                     $user->update(['has_alias' => 1]);
                     UserAlias::create([
-                        'user_id' => $user->id,
-                        'site' => 'deviantart',
-                        'alias' => $alias,
+                        'user_id'          => $user->id,
+                        'site'             => 'deviantart',
+                        'alias'            => $alias,
                         'is_primary_alias' => 1,
-                        'is_visible' => 1
+                        'is_visible'       => 1,
                     ]);
                 }
 
                 $this->line('Updates complete.');
             }
+
             return;
         }
         $this->line('Action cancelled.');
-
     }
 }
diff --git a/app/Console/Commands/UpdateCommentTypes.php b/app/Console/Commands/UpdateCommentTypes.php
index 56bd30db70..640fd5ef4c 100644
--- a/app/Console/Commands/UpdateCommentTypes.php
+++ b/app/Console/Commands/UpdateCommentTypes.php
@@ -2,11 +2,10 @@
 
 namespace App\Console\Commands;
 
-use App\Models\Comment;
+use App\Models\Comment\Comment;
 use Illuminate\Console\Command;
 
-class UpdateCommentTypes extends Command
-{
+class UpdateCommentTypes extends Command {
     /**
      * The name and signature of the console command.
      *
@@ -23,11 +22,8 @@ class UpdateCommentTypes extends Command
 
     /**
      * Create a new command instance.
-     *
-     * @return void
      */
-    public function __construct()
-    {
+    public function __construct() {
         parent::__construct();
     }
 
@@ -36,15 +32,15 @@ public function __construct()
      *
      * @return int
      */
-    public function handle()
-    {
+    public function handle() {
         $comments = Comment::where('commentable_type', 'App\Models\Report\Report')->where('type', 'User-User');
 
-        if($comments->count()) {
+        if ($comments->count()) {
             $this->line('Updating comment types...');
             $comments->update(['type' => 'Staff-User']);
+            $this->info('Comment types updated!');
         } else {
-            $this->info('No comments to update!');
+            $this->line('No comments need updating!');
         }
 
         return 0;
diff --git a/app/Console/Commands/UpdateExtensionTracker.php b/app/Console/Commands/UpdateExtensionTracker.php
index f334f1a2a5..a33b5566db 100644
--- a/app/Console/Commands/UpdateExtensionTracker.php
+++ b/app/Console/Commands/UpdateExtensionTracker.php
@@ -3,11 +3,9 @@
 namespace App\Console\Commands;
 
 use Illuminate\Console\Command;
-use DB;
-use Config;
+use Illuminate\Support\Facades\DB;
 
-class UpdateExtensionTracker extends Command
-{
+class UpdateExtensionTracker extends Command {
     /**
      * The name and signature of the console command.
      *
@@ -24,11 +22,8 @@ class UpdateExtensionTracker extends Command
 
     /**
      * Create a new command instance.
-     *
-     * @return void
      */
-    public function __construct()
-    {
+    public function __construct() {
         parent::__construct();
     }
 
@@ -37,48 +32,71 @@ public function __construct()
      *
      * @return mixed
      */
-    public function handle()
-    {
-        $extensions = Config::get('lorekeeper.extension_tracker');
-
+    public function handle() {
         $this->info("\n".'****************************');
         $this->info('* UPDATE EXTENSION TRACKER *');
         $this->info('****************************');
 
+        $extendos = [];
+        foreach (glob('config/lorekeeper/ext-tracker/*.php') as $extension) {
+            $extendos[basename($extension, '.php')] = include $extension;
+        }
+
         $this->line('Adding site extensions...existing entries will be updated.'."\n");
 
-        foreach($extensions as $data)
-        {
-            $extension = DB::table('site_extensions')->where('key', $data['key']);
-            if(!$extension->exists())
-            {
+        foreach ($extendos as $key => $data) {
+            $extension = DB::table('site_extensions')->where('key', $key);
+            if (!$extension->exists()) {
                 DB::table('site_extensions')->insert([
-                    'key' => $data['key'],
+                    'key'      => $key,
                     'wiki_key' => $data['wiki_key'],
                     'creators' => $data['creators'],
-                    'version' => $data['version'],
+                    'version'  => $data['version'],
                 ]);
-                $this->info('Added:   '.$data['key'].' / Version: '.$data['version']);
-            }
-            elseif($extension->first()->version != $data['version'])
-            {
-                $this->info(ucfirst($data['key']).' version mismatch. Old version: '.$extension->first()->version.' / New version: '.$data['version']);
-                $confirm = $this->confirm('Do you want to update the listed version of '.$data['key'].' to '.$data['version'].'? This will not affect any other files.');
-                if($confirm){
-                    DB::table('site_extensions')->where('key', $data['key'])->update([
-                        'key' => $data['key'],
+                $this->info('Added:   '.$key.' / Version: '.$data['version']);
+            } elseif ($extension->first()->version != $data['version']) {
+                $this->info(ucfirst($key).' version mismatch. Old version: '.$extension->first()->version.' / New version: '.$data['version']);
+                $confirm = $this->confirm('Do you want to update the listed version of '.$key.' to '.$data['version'].'? This will not affect any other files.');
+                if ($confirm || !app()->runningInConsole()) {
+                    DB::table('site_extensions')->where('key', $key)->update([
+                        'key'      => $key,
                         'wiki_key' => $data['wiki_key'],
                         'creators' => $data['creators'],
-                        'version' => $data['version'],
+                        'version'  => $data['version'],
                     ]);
-                    $this->info('Updated:   '.$data['key'].' / Version: '.$data['version']);
+                    $this->info('Updated:   '.$key.' / Version: '.$data['version']);
+                } else {
+                    $this->line('Skipped: '.$key.' / Version: '.$extension->first()->version);
                 }
-                else $this->line('Skipped: '.$data['key'].' / Version: '.$extension->first()->version);
+            } else {
+                $this->line('Skipped: '.$key.' / Version: '.$data['version']);
             }
-            else $this->line('Skipped: '.$data['key'].' / Version: '.$data['version']);
         }
-        
-        $this->info("\n".'All extensions are in tracker.'."\n");
 
+        if (app()->runningInConsole()) {
+            $extensions = DB::table('site_extensions')->pluck('key')->toArray();
+            $processed = array_keys($extendos);
+
+            $missing = array_merge(array_diff($processed, $extensions), array_diff($extensions, $processed));
+
+            if (count($missing)) {
+                $miss = implode(', ', $missing);
+                $this->line("\033[31m");
+                $this->error('The following extension'.(count($missing) == 1 ? ' is' : 's are').' not present as a file but '.(count($missing) == 1 ? 'is' : 'are').' still in your database:');
+                $this->line($miss);
+
+                $confirm = $this->confirm('Do you want to remove '.(count($missing) == 1 ? 'this extension' : 'these extensions').' from your database and extensions list? This will not affect any other files.');
+                if ($confirm) {
+                    foreach ($missing as $ext) {
+                        $extension = DB::table('site_extensions')->where('key', $ext)->delete();
+                        $this->info('Deleted:   '.$ext);
+                    }
+                } else {
+                    $this->line('Leaving extension'.(count($missing) == 1 ? '' : 's').' alone.');
+                }
+            }
+        }
+
+        $this->info("\n".'All extensions are in tracker.'."\n");
     }
 }
diff --git a/app/Console/Commands/UpdateLorekeeperV2.php b/app/Console/Commands/UpdateLorekeeperV2.php
index 129416f842..305305edb4 100644
--- a/app/Console/Commands/UpdateLorekeeperV2.php
+++ b/app/Console/Commands/UpdateLorekeeperV2.php
@@ -2,11 +2,10 @@
 
 namespace App\Console\Commands;
 
-use App\Models\Comment;
+use App\Models\Comment\Comment;
 use Illuminate\Console\Command;
 
-class UpdateLorekeeperV2 extends Command
-{
+class UpdateLorekeeperV2 extends Command {
     /**
      * The name and signature of the console command.
      *
@@ -23,11 +22,8 @@ class UpdateLorekeeperV2 extends Command
 
     /**
      * Create a new command instance.
-     *
-     * @return void
      */
-    public function __construct()
-    {
+    public function __construct() {
         parent::__construct();
     }
 
@@ -36,15 +32,14 @@ public function __construct()
      *
      * @return int
      */
-    public function handle()
-    {
+    public function handle() {
         $this->info('**************************');
         $this->info('* UPDATE LOREKEEPER (V2) *');
         $this->info('**************************'."\n");
 
         // Check if the user has run composer
         $this->info('This command should be run after updating packages using composer.');
-        if($this->confirm('Have you run the composer update command or equivalent?')) {
+        if ($this->confirm('Have you run the composer update command or equivalent?')) {
             // Migrate
             $this->line('Running migrations...');
             $this->call('migrate');
@@ -63,33 +58,37 @@ public function handle()
             $this->line("\n".'Updating comments...');
             // Folding in fix-child-comment-types for tidiness
             $childComments = Comment::whereNotNull('child_id')->get();
-            if($childComments->count()) {
+            if ($childComments->count()) {
                 $this->line('Updating '.$childComments->count().' child comments...');
-                foreach($childComments as $comment) {
+                foreach ($childComments as $comment) {
                     $parent = Comment::find($comment->child_id);
-                    if(isset($parent->type) && $comment->type != $parent->type)
+                    if (isset($parent->type) && $comment->type != $parent->type) {
                         $comment->update(['type' => $parent->type]);
+                    }
                 }
                 $this->info('Child comments updated!');
+            } else {
+                $this->line('No child comments to update!');
             }
-            else $this->line('No child comments to update!');
 
             // Folding in update-sales-comments for tidiness
             $salesComments = Comment::where('commentable_type', 'App\Models\Sales')->get();
-            if($salesComments->count()) {
+            if ($salesComments->count()) {
                 $this->line('Updating '.$salesComments->count().' sales comments...');
-                foreach($salesComments as $comment) {
+                foreach ($salesComments as $comment) {
                     $comment->commentable_type = 'App\Models\Sales\Sales';
                     $comment->save();
                 }
                 $this->info('Sales comments updated!');
+            } else {
+                $this->line('No sales comments to update!');
             }
-            else $this->line('No sales comments to update!');
 
             // Migrate aliases
             $this->line("\n".'Updating alias information...');
             $this->call('migrate-aliases');
+        } else {
+            $this->line('Aborting! Please run composer update and then run this command again.');
         }
-        else $this->line('Aborting! Please run composer update and then run this command again.');
     }
 }
diff --git a/app/Console/Commands/UpdateLorekeeperV3.php b/app/Console/Commands/UpdateLorekeeperV3.php
new file mode 100644
index 0000000000..3494422cc2
--- /dev/null
+++ b/app/Console/Commands/UpdateLorekeeperV3.php
@@ -0,0 +1,78 @@
+<?php
+
+namespace App\Console\Commands;
+
+use Illuminate\Console\Command;
+
+class UpdateLorekeeperV3 extends Command {
+    /**
+     * The name and signature of the console command.
+     *
+     * @var string
+     */
+    protected $signature = 'update-lorekeeper-v3';
+
+    /**
+     * The console command description.
+     *
+     * @var string
+     */
+    protected $description = 'Runs commands to update Lorekeeper to version 3.0 from version 2.';
+
+    /**
+     * Create a new command instance.
+     */
+    public function __construct() {
+        parent::__construct();
+    }
+
+    /**
+     * Execute the console command.
+     *
+     * @return int
+     */
+    public function handle() {
+        $this->info('**************************');
+        $this->info('* UPDATE LOREKEEPER (V3) *');
+        $this->info('**************************'."\n");
+
+        // Check if the user has run composer
+        $this->info('This command should be run after installing packages using composer.');
+        if ($this->confirm('Have you run the composer install command or equivalent?')) {
+            // Migrate
+            $this->line('Running migrations...');
+            $this->call('migrate');
+
+            // Clear caches
+            $this->line("\n".'Clearing caches...');
+            $this->call('optimize');
+            $this->call('view:clear');
+            $this->call('route:clear');
+
+            // Run miscellaneous commands
+            $this->line("\n".'Updating site pages and settings...');
+            $this->call('add-site-settings');
+            $this->call('add-text-pages');
+
+            $this->line("\n".'Updating character images...');
+            $this->call('app:fill-character-fullsize-extensions');
+
+            $this->line("\n".'Updating released items...');
+            $this->call('update-released-items');
+
+            $this->line("\n".'Updating comments...');
+            $this->call('update-comment-types');
+
+            if ($this->confirm(
+                "\n".'Adding image hashes to old images will protect existing unreleased content'
+                ."\n".'but may break references to these urls in places like news, sales or pages.'
+                ."\n".'Do you wish to add hashes to your existing images?'
+            )) {
+                $this->line("\n".'Updating data images...');
+                $this->call('add-image-hashes');
+            }
+        } else {
+            $this->line('Aborting! Please run composer update and then run this command again.');
+        }
+    }
+}
diff --git a/app/Console/Commands/UpdateStaffRewardActions.php b/app/Console/Commands/UpdateStaffRewardActions.php
new file mode 100644
index 0000000000..05c58c7314
--- /dev/null
+++ b/app/Console/Commands/UpdateStaffRewardActions.php
@@ -0,0 +1,88 @@
+<?php
+
+namespace App\Console\Commands;
+
+use Illuminate\Console\Command;
+use Illuminate\Support\Facades\DB;
+
+class UpdateStaffRewardActions extends Command {
+    /**
+     * The name and signature of the console command.
+     *
+     * @var string
+     */
+    protected $signature = 'update-staff-reward-actions';
+
+    /**
+     * The console command description.
+     *
+     * @var string
+     */
+    protected $description = 'Run this command in order to add staff actions with configurable rewards.';
+
+    /**
+     * Create a new command instance.
+     */
+    public function __construct() {
+        parent::__construct();
+    }
+
+    /**
+     * Execute the console command.
+     *
+     * @return mixed
+     */
+    public function handle() {
+        $this->info("\n".'*******************************');
+        $this->info('* UPDATE STAFF REWARD ACTIONS *');
+        $this->info('*******************************');
+
+        $actions = [];
+        foreach (glob('config/lorekeeper/staff-reward-actions/*.php') as $action) {
+            $actions[basename($action, '.php')] = include $action;
+        }
+
+        $this->line('Adding staff actions...existing entries will be skipped.'."\n");
+
+        foreach ($actions as $key => $data) {
+            $action = DB::table('staff_actions')->where('key', $key);
+            if (!$action->exists()) {
+                DB::table('staff_actions')->insert([
+                    'key'         => $key,
+                    'name'        => $data['name'],
+                    'description' => $data['description'],
+                    'value'       => 1,
+                ]);
+                $this->info('Added:   '.$key);
+            } else {
+                $this->line('Skipped: '.$key);
+            }
+        }
+
+        if (app()->runningInConsole()) {
+            $processed = array_keys($actions);
+            $actions = DB::table('staff_actions')->pluck('key')->toArray();
+
+            $missing = array_merge(array_diff($processed, $actions), array_diff($actions, $processed));
+
+            if (count($missing)) {
+                $miss = implode(', ', $missing);
+                $this->line("\033[31m");
+                $this->error('The following action'.(count($missing) == 1 ? ' is' : 's are').' not present as a file but '.(count($missing) == 1 ? 'is' : 'are').' still in your database:');
+                $this->line($miss);
+
+                $confirm = $this->confirm('Do you want to remove '.(count($missing) == 1 ? 'this action' : 'these actions').' from your database and actions list? This will not affect any other files.');
+                if ($confirm) {
+                    foreach ($missing as $act) {
+                        $action = DB::table('staff_actions')->where('key', $act)->delete();
+                        $this->info('Deleted:   '.$act);
+                    }
+                } else {
+                    $this->line('Leaving action'.(count($missing) == 1 ? '' : 's').' alone.');
+                }
+            }
+        }
+
+        $this->info("\n".'All actions have been added.'."\n");
+    }
+}
diff --git a/app/Console/Commands/WatermarkOldImages.php b/app/Console/Commands/WatermarkOldImages.php
new file mode 100644
index 0000000000..a67c03a575
--- /dev/null
+++ b/app/Console/Commands/WatermarkOldImages.php
@@ -0,0 +1,71 @@
+<?php
+
+namespace App\Console\Commands;
+
+use App\Models\Character\Character;
+use App\Models\Character\CharacterImage;
+use Illuminate\Console\Command;
+use Intervention\Image\Facades\Image;
+
+class WatermarkOldImages extends Command {
+    /**
+     * The name and signature of the console command.
+     *
+     * @var string
+     */
+    protected $signature = 'watermark-old-images';
+
+    /**
+     * The console command description.
+     *
+     * @var string
+     */
+    protected $description = 'Retroactively watermarks character images.';
+
+    /**
+     * Create a new command instance.
+     */
+    public function __construct() {
+        parent::__construct();
+    }
+
+    /**
+     * Execute the console command.
+     *
+     * @return int
+     */
+    public function handle() {
+        $this->info('************************');
+        $this->info('* WATERMARK OLD IMAGES *');
+        $this->info('************************'."\n");
+
+        $this->info('This command can take a while to run. It will also overlay the watermark on *every* image, regardless if the watermark has previously been applied.');
+        if ($this->confirm('Are you sure you want to continue?')) {
+            // check if user wants to run it on all images or just active images
+            $this->info('This command will only run on currently visible characters.');
+            if ($this->confirm('Do you want to watermark all images or just active ones? Yes = All images.')) {
+                $this->info('Watermarking all images...');
+                $images = CharacterImage::all();
+            } else {
+                $this->info('Watermarking active images...');
+                $characters = Character::myo(0)->visible()->get();
+                $images = CharacterImage::whereIn('character_id', $characters->pluck('character_image_id'))->get();
+            }
+            $this->info('Found '.$images->count().' images to watermark.');
+            $this->line('Beginning watermarking...');
+
+            $service = new \App\Services\CharacterManager;
+
+            foreach ($images as $image) {
+                // consider thumbnail
+                $service->cropThumbnail(['x0' => $image->x0, 'x1' => $image->x1, 'y0' => $image->y0, 'y1' => $image->y1], $image);
+                // get the image
+                $service->processImage($image);
+            }
+
+            $this->info('Watermarking complete.');
+        } else {
+            $this->line('Bye.');
+        }
+    }
+}
diff --git a/app/Console/Kernel.php b/app/Console/Kernel.php
index 2ec3d9aab5..a8bae72c58 100644
--- a/app/Console/Kernel.php
+++ b/app/Console/Kernel.php
@@ -5,8 +5,7 @@
 use Illuminate\Console\Scheduling\Schedule;
 use Illuminate\Foundation\Console\Kernel as ConsoleKernel;
 
-class Kernel extends ConsoleKernel
-{
+class Kernel extends ConsoleKernel {
     /**
      * The Artisan commands provided by your application.
      *
@@ -18,28 +17,24 @@ class Kernel extends ConsoleKernel
 
     /**
      * Define the application's command schedule.
-     *
-     * @param  \Illuminate\Console\Scheduling\Schedule  $schedule
-     * @return void
      */
-    protected function schedule(Schedule $schedule)
-    {
+    protected function schedule(Schedule $schedule) {
         $schedule->command('check-news')
-                ->everyMinute();
-        $schedule->exec('rm public/images/avatars/*.tmp')
-                ->daily();
+            ->everyMinute();
         $schedule->command('check-sales')
-                ->everyMinute();
-
+            ->everyMinute();
+        $schedule->exec('rm public/images/avatars/*.tmp')
+            ->daily();
+        $schedule->command('update-extension-tracker')
+            ->daily();
+        $schedule->command('update-staff-reward-actions')
+            ->daily();
     }
 
     /**
      * Register the commands for the application.
-     *
-     * @return void
      */
-    protected function commands()
-    {
+    protected function commands() {
         $this->load(__DIR__.'/Commands');
 
         require base_path('routes/console.php');
diff --git a/app/Events/CommentCreated.php b/app/Events/CommentCreated.php
index 3a6c243185..e38689b08c 100644
--- a/app/Events/CommentCreated.php
+++ b/app/Events/CommentCreated.php
@@ -2,22 +2,18 @@
 
 namespace App\Events;
 
+use App\Models\Comment\Comment;
 use Illuminate\Queue\SerializesModels;
-use App\Models\Comment;
 
-class CommentCreated
-{
+class CommentCreated {
     use SerializesModels;
 
     public $comment;
 
     /**
      * Create a new event instance.
-     *
-     * @return void
      */
-    public function __construct(Comment $comment)
-    {
+    public function __construct(Comment $comment) {
         $this->comment = $comment;
     }
 }
diff --git a/app/Events/CommentDeleted.php b/app/Events/CommentDeleted.php
index 2eb694982d..149345d765 100644
--- a/app/Events/CommentDeleted.php
+++ b/app/Events/CommentDeleted.php
@@ -2,22 +2,18 @@
 
 namespace App\Events;
 
+use App\Models\Comment\Comment;
 use Illuminate\Queue\SerializesModels;
-use App\Models\Comment;
 
-class CommentDeleted
-{
+class CommentDeleted {
     use SerializesModels;
 
     public $comment;
 
     /**
      * Create a new event instance.
-     *
-     * @return void
      */
-    public function __construct(Comment $comment)
-    {
+    public function __construct(Comment $comment) {
         $this->comment = $comment;
     }
 }
diff --git a/app/Events/CommentUpdated.php b/app/Events/CommentUpdated.php
index 0c276f32b8..8df8dc1aec 100644
--- a/app/Events/CommentUpdated.php
+++ b/app/Events/CommentUpdated.php
@@ -2,22 +2,18 @@
 
 namespace App\Events;
 
+use App\Models\Comment\Comment;
 use Illuminate\Queue\SerializesModels;
-use App\Models\Comment;
 
-class CommentUpdated
-{
+class CommentUpdated {
     use SerializesModels;
 
     public $comment;
 
     /**
      * Create a new event instance.
-     *
-     * @return void
      */
-    public function __construct(Comment $comment)
-    {
+    public function __construct(Comment $comment) {
         $this->comment = $comment;
     }
 }
diff --git a/app/Exceptions/Handler.php b/app/Exceptions/Handler.php
index 376174d4ed..5ea241a030 100644
--- a/app/Exceptions/Handler.php
+++ b/app/Exceptions/Handler.php
@@ -2,12 +2,11 @@
 
 namespace App\Exceptions;
 
-use Throwable;
 use Illuminate\Foundation\Exceptions\Handler as ExceptionHandler;
 use Illuminate\Validation\ValidationException;
+use Throwable;
 
-class Handler extends ExceptionHandler
-{
+class Handler extends ExceptionHandler {
     /**
      * A list of the exception types that are not reported.
      *
@@ -30,11 +29,9 @@ class Handler extends ExceptionHandler
     /**
      * Report or log an exception.
      *
-     * @param  \Exception  $exception
-     * @return void
+     * @param \Exception $exception
      */
-    public function report(Throwable $exception)
-    {
+    public function report(Throwable $exception) {
         if ($exception instanceof ValidationException) {
             foreach ($exception->validator->errors()->all() as $message) {
                 flash($message)->error();
@@ -47,12 +44,12 @@ public function report(Throwable $exception)
     /**
      * Render an exception into an HTTP response.
      *
-     * @param  \Illuminate\Http\Request  $request
-     * @param  \Exception  $exception
+     * @param \Illuminate\Http\Request $request
+     * @param \Exception               $exception
+     *
      * @return \Illuminate\Http\Response
      */
-    public function render($request, Throwable $exception)
-    {
+    public function render($request, Throwable $exception) {
         return parent::render($request, $exception);
     }
 }
diff --git a/app/Facades/Notifications.php b/app/Facades/Notifications.php
index 2c39eaf656..682c9b3159 100644
--- a/app/Facades/Notifications.php
+++ b/app/Facades/Notifications.php
@@ -5,7 +5,7 @@
 use Illuminate\Support\Facades\Facade;
 
 class Notifications extends Facade {
-
-    protected static function getFacadeAccessor() { return 'notifications'; }
-
-}
\ No newline at end of file
+    protected static function getFacadeAccessor() {
+        return 'notifications';
+    }
+}
diff --git a/app/Facades/Settings.php b/app/Facades/Settings.php
index d41cac1272..c75b230e7b 100644
--- a/app/Facades/Settings.php
+++ b/app/Facades/Settings.php
@@ -5,7 +5,7 @@
 use Illuminate\Support\Facades\Facade;
 
 class Settings extends Facade {
-
-    protected static function getFacadeAccessor() { return 'settings'; }
-
-}
\ No newline at end of file
+    protected static function getFacadeAccessor() {
+        return 'settings';
+    }
+}
diff --git a/app/Helpers/AssetHelpers.php b/app/Helpers/AssetHelpers.php
index 78685c204c..c1fde8dc1a 100644
--- a/app/Helpers/AssetHelpers.php
+++ b/app/Helpers/AssetHelpers.php
@@ -15,11 +15,11 @@
  * based on form input. Corresponds to the GroupCurrencyForm configured in
  * app/Forms.
  *
- * @param  array  $data
+ * @param array $data
+ *
  * @return int
  */
-function calculateGroupCurrency($data)
-{
+function calculateGroupCurrency($data) {
     // Sets a starting point for the total so that numbers can be added to it.
     // Don't change this!
     $total = 0;
@@ -32,16 +32,20 @@ function calculateGroupCurrency($data)
 
     // For instance, if the user selected that the submission has a visual art component,
     // these actions will be performed:
-    if($pieceType->has('art')) {
+    if ($pieceType->has('art')) {
         // This adds values to the total!
         $total += ($data['art_finish'] + $data['art_type']);
         // This multiplies each option selected in the "bonus" form field by
         // the result from the "art type" field, and adds it to the total.
-        if(isset($data['art_bonus'])) foreach((array)$data['art_bonus'] as $bonus) $total += (round($bonus) * $data['art_type']);
+        if (isset($data['art_bonus'])) {
+            foreach ((array) $data['art_bonus'] as $bonus) {
+                $total += (round($bonus) * $data['art_type']);
+            }
+        }
     }
 
     // Likewise for if the user selected that the submission has a written component:
-    if($pieceType->has('lit')) {
+    if ($pieceType->has('lit')) {
         // This divides the word count by 100, rounds the result, and then multiplies it by one--
         // so, effectively, for every 100 words, 1 of the currency is awarded.
         // You can adjust these numbers as you see fit.
@@ -49,7 +53,7 @@ function calculateGroupCurrency($data)
     }
 
     // And if it has a crafted or other physical object component:
-    if($pieceType->has('craft')) {
+    if ($pieceType->has('craft')) {
         // This just adds 4! You can adjust this as you desire.
         $total += 4;
     }
@@ -62,92 +66,122 @@ function calculateGroupCurrency($data)
  * Gets the asset keys for an array depending on whether the
  * assets being managed are owned by a user or character.
  *
- * @param  bool  $isCharacter
+ * @param bool $isCharacter
+ *
  * @return array
  */
-function getAssetKeys($isCharacter = false)
-{
-    if(!$isCharacter) return ['items', 'currencies', 'raffle_tickets', 'loot_tables', 'user_items', 'characters'];
-    else return ['currencies', 'items', 'character_items', 'loot_tables'];
+function getAssetKeys($isCharacter = false) {
+    if (!$isCharacter) {
+        return ['items', 'currencies', 'raffle_tickets', 'loot_tables', 'user_items', 'characters'];
+    } else {
+        return ['currencies', 'items', 'character_items', 'loot_tables'];
+    }
 }
 
 /**
  * Gets the model name for an asset type.
  * The asset type has to correspond to one of the asset keys above.
  *
- * @param  string  $type
- * @param  bool    $namespaced
+ * @param string $type
+ * @param bool   $namespaced
+ *
  * @return string
  */
-function getAssetModelString($type, $namespaced = true)
-{
-    switch($type)
-    {
+function getAssetModelString($type, $namespaced = true) {
+    switch ($type) {
         case 'items':
-            if($namespaced) return '\App\Models\Item\Item';
-            else return 'Item';
+            if ($namespaced) {
+                return '\App\Models\Item\Item';
+            } else {
+                return 'Item';
+            }
             break;
 
         case 'currencies':
-            if($namespaced) return '\App\Models\Currency\Currency';
-            else return 'Currency';
+            if ($namespaced) {
+                return '\App\Models\Currency\Currency';
+            } else {
+                return 'Currency';
+            }
             break;
 
         case 'raffle_tickets':
-            if($namespaced) return '\App\Models\Raffle\Raffle';
-            else return 'Raffle';
+            if ($namespaced) {
+                return '\App\Models\Raffle\Raffle';
+            } else {
+                return 'Raffle';
+            }
             break;
 
         case 'loot_tables':
-            if($namespaced) return '\App\Models\Loot\LootTable';
-            else return 'LootTable';
+            if ($namespaced) {
+                return '\App\Models\Loot\LootTable';
+            } else {
+                return 'LootTable';
+            }
             break;
 
         case 'user_items':
-            if($namespaced) return '\App\Models\User\UserItem';
-            else return 'UserItem';
+            if ($namespaced) {
+                return '\App\Models\User\UserItem';
+            } else {
+                return 'UserItem';
+            }
             break;
 
         case 'characters':
-            if($namespaced) return '\App\Models\Character\Character';
-            else return 'Character';
+            if ($namespaced) {
+                return '\App\Models\Character\Character';
+            } else {
+                return 'Character';
+            }
             break;
 
         case 'character_items':
-            if($namespaced) return '\App\Models\Character\CharacterItem';
-            else return 'CharacterItem';
+            if ($namespaced) {
+                return '\App\Models\Character\CharacterItem';
+            } else {
+                return 'CharacterItem';
+            }
             break;
     }
+
     return null;
 }
 
 /**
  * Initialises a new blank assets array, keyed by the asset type.
  *
- * @param  bool  $isCharacter
+ * @param bool $isCharacter
+ *
  * @return array
  */
-function createAssetsArray($isCharacter = false)
-{
+function createAssetsArray($isCharacter = false) {
     $keys = getAssetKeys($isCharacter);
     $assets = [];
-    foreach($keys as $key) $assets[$key] = [];
+    foreach ($keys as $key) {
+        $assets[$key] = [];
+    }
+
     return $assets;
 }
 
 /**
  * Merges 2 asset arrays.
  *
- * @param  array  $first
- * @param  array  $second
+ * @param array $first
+ * @param array $second
+ *
  * @return array
  */
-function mergeAssetsArrays($first, $second)
-{
+function mergeAssetsArrays($first, $second) {
     $keys = getAssetKeys();
-    foreach($keys as $key)
-        foreach($second[$key] as $item)
+    foreach ($keys as $key) {
+        foreach ($second[$key] as $item) {
             addAsset($first, $item['asset'], $item['quantity']);
+        }
+    }
+
     return $first;
 }
 
@@ -155,15 +189,38 @@ function mergeAssetsArrays($first, $second)
  * Adds an asset to the given array.
  * If the asset already exists, it adds to the quantity.
  *
- * @param  array  $array
- * @param  mixed  $asset
- * @param  int    $quantity
+ * @param array $array
+ * @param mixed $asset
+ * @param int   $quantity
  */
-function addAsset(&$array, $asset, $quantity = 1)
-{
-    if(!$asset) return;
-    if(isset($array[$asset->assetType][$asset->id])) $array[$asset->assetType][$asset->id]['quantity'] += $quantity;
-    else $array[$asset->assetType][$asset->id] = ['asset' => $asset, 'quantity' => $quantity];
+function addAsset(&$array, $asset, $quantity = 1) {
+    if (!$asset) {
+        return;
+    }
+    if (isset($array[$asset->assetType][$asset->id])) {
+        $array[$asset->assetType][$asset->id]['quantity'] += $quantity;
+    } else {
+        $array[$asset->assetType][$asset->id] = ['asset' => $asset, 'quantity' => $quantity];
+    }
+}
+
+/**
+ * Removes an asset from the given array, if it exists.
+ *
+ * @param array $array
+ * @param mixed $asset
+ * @param int   $quantity
+ */
+function removeAsset(&$array, $asset, $quantity = 1) {
+    if (!$asset) {
+        return;
+    }
+    if (isset($array[$asset->assetType][$asset->id])) {
+        $array[$asset->assetType][$asset->id]['quantity'] -= $quantity;
+        if ($array[$asset->assetType][$asset->id]['quantity'] == 0) {
+            unset($array[$asset->assetType][$asset->id]);
+        }
+    }
 }
 
 /**
@@ -171,21 +228,22 @@ function addAsset(&$array, $asset, $quantity = 1)
  * where each asset is listed in [id => quantity] format.
  * json_encode this and store in the data attribute.
  *
- * @param  array  $array
- * @param  bool   $isCharacter
+ * @param array $array
+ * @param bool  $isCharacter
+ *
  * @return array
  */
-function getDataReadyAssets($array, $isCharacter = false)
-{
+function getDataReadyAssets($array, $isCharacter = false) {
     $result = [];
-    foreach($array as $key => $type)
-    {
-        if($type && !isset($result[$key])) $result[$key] = [];
-        foreach($type as $assetId => $assetData)
-        {
+    foreach ($array as $key => $type) {
+        if ($type && !isset($result[$key])) {
+            $result[$key] = [];
+        }
+        foreach ($type as $assetId => $assetData) {
             $result[$key][$assetId] = $assetData['quantity'];
         }
     }
+
     return $result;
 }
 
@@ -194,27 +252,24 @@ function getDataReadyAssets($array, $isCharacter = false)
  * basically reversing the above function.
  * Use the data attribute after json_decode()ing it.
  *
- * @param  array  $array
+ * @param array $array
+ *
  * @return array
  */
-function parseAssetData($array)
-{
+function parseAssetData($array) {
     $assets = createAssetsArray();
-    foreach($array as $key => $contents)
-    {
+    foreach ($array as $key => $contents) {
         $model = getAssetModelString($key);
-        if($model)
-        {
-            foreach($contents as $id => $quantity)
-            {
+        if ($model) {
+            foreach ($contents as $id => $quantity) {
                 $assets[$key][$id] = [
-                    'asset' => $model::find($id),
-                    'quantity' => $quantity
+                    'asset'    => $model::find($id),
+                    'quantity' => $quantity,
                 ];
             }
-
         }
     }
+
     return $assets;
 }
 
@@ -222,58 +277,62 @@ function parseAssetData($array)
  * Distributes the assets in an assets array to the given recipient (user).
  * Loot tables will be rolled before distribution.
  *
- * @param  array                  $assets
- * @param  \App\Models\User\User  $sender
- * @param  \App\Models\User\User  $recipient
- * @param  string                 $logType
- * @param  string                 $data
+ * @param array                 $assets
+ * @param \App\Models\User\User $sender
+ * @param \App\Models\User\User $recipient
+ * @param string                $logType
+ * @param string                $data
+ *
  * @return array
  */
-function fillUserAssets($assets, $sender, $recipient, $logType, $data)
-{
+function fillUserAssets($assets, $sender, $recipient, $logType, $data) {
     // Roll on any loot tables
-    if(isset($assets['loot_tables']))
-    {
-        foreach($assets['loot_tables'] as $table)
-        {
+    if (isset($assets['loot_tables'])) {
+        foreach ($assets['loot_tables'] as $table) {
             $assets = mergeAssetsArrays($assets, $table['asset']->roll($table['quantity']));
         }
         unset($assets['loot_tables']);
     }
 
-    foreach($assets as $key => $contents)
-    {
-        if($key == 'items' && count($contents))
-        {
+    foreach ($assets as $key => $contents) {
+        if ($key == 'items' && count($contents)) {
             $service = new \App\Services\InventoryManager;
-            foreach($contents as $asset)
-                if(!$service->creditItem($sender, $recipient, $logType, $data, $asset['asset'], $asset['quantity'])) return false;
-        }
-        elseif($key == 'currencies' && count($contents))
-        {
+            foreach ($contents as $asset) {
+                if (!$service->creditItem($sender, $recipient, $logType, $data, $asset['asset'], $asset['quantity'])) {
+                    return false;
+                }
+            }
+        } elseif ($key == 'currencies' && count($contents)) {
             $service = new \App\Services\CurrencyManager;
-            foreach($contents as $asset)
-                if(!$service->creditCurrency($sender, $recipient, $logType, $data['data'], $asset['asset'], $asset['quantity'])) return false;
-        }
-        elseif($key == 'raffle_tickets' && count($contents))
-        {
+            foreach ($contents as $asset) {
+                if (!$service->creditCurrency($sender, $recipient, $logType, $data['data'], $asset['asset'], $asset['quantity'])) {
+                    return false;
+                }
+            }
+        } elseif ($key == 'raffle_tickets' && count($contents)) {
             $service = new \App\Services\RaffleManager;
-            foreach($contents as $asset)
-                if(!$service->addTicket($recipient, $asset['asset'], $asset['quantity'])) return false;
-        }
-        elseif($key == 'user_items' && count($contents))
-        {
+            foreach ($contents as $asset) {
+                if (!$service->addTicket($recipient, $asset['asset'], $asset['quantity'])) {
+                    return false;
+                }
+            }
+        } elseif ($key == 'user_items' && count($contents)) {
             $service = new \App\Services\InventoryManager;
-            foreach($contents as $asset)
-                if(!$service->moveStack($sender, $recipient, $logType, $data, $asset['asset'])) return false;
-        }
-        elseif($key == 'characters' && count($contents))
-        {
+            foreach ($contents as $asset) {
+                if (!$service->moveStack($sender, $recipient, $logType, $data, $asset['asset'])) {
+                    return false;
+                }
+            }
+        } elseif ($key == 'characters' && count($contents)) {
             $service = new \App\Services\CharacterManager;
-            foreach($contents as $asset)
-                if(!$service->moveCharacter($asset['asset'], $recipient, $data, $asset['quantity'], $logType)) return false;
+            foreach ($contents as $asset) {
+                if (!$service->moveCharacter($asset['asset'], $recipient, $data, $asset['quantity'], $logType)) {
+                    return false;
+                }
+            }
         }
     }
+
     return $assets;
 }
 
@@ -281,43 +340,72 @@ function fillUserAssets($assets, $sender, $recipient, $logType, $data)
  * Distributes the assets in an assets array to the given recipient (character).
  * Loot tables will be rolled before distribution.
  *
- * @param  array                            $assets
- * @param  \App\Models\User\User            $sender
- * @param  \App\Models\Character\Character  $recipient
- * @param  string                           $logType
- * @param  string                           $data
+ * @param array                           $assets
+ * @param \App\Models\User\User           $sender
+ * @param \App\Models\Character\Character $recipient
+ * @param string                          $logType
+ * @param string                          $data
+ * @param mixed|null                      $submitter
+ *
  * @return array
  */
-function fillCharacterAssets($assets, $sender, $recipient, $logType, $data, $submitter = null)
-{
-    if(!Config::get('lorekeeper.extensions.character_reward_expansion.default_recipient') && $recipient->user) $item_recipient = $recipient->user;
-    else $item_recipient = $submitter;
-
+function fillCharacterAssets($assets, $sender, $recipient, $logType, $data, $submitter = null) {
+    if (!config('lorekeeper.extensions.character_reward_expansion.default_recipient') && $recipient->user) {
+        $item_recipient = $recipient->user;
+    } else {
+        $item_recipient = $submitter;
+    }
 
     // Roll on any loot tables
-    if(isset($assets['loot_tables']))
-    {
-        foreach($assets['loot_tables'] as $table)
-        {
+    if (isset($assets['loot_tables'])) {
+        foreach ($assets['loot_tables'] as $table) {
             $assets = mergeAssetsArrays($assets, $table['asset']->roll($table['quantity']));
         }
         unset($assets['loot_tables']);
     }
 
-    foreach($assets as $key => $contents)
-    {
-        if($key == 'currencies' && count($contents))
-        {
+    foreach ($assets as $key => $contents) {
+        if ($key == 'currencies' && count($contents)) {
             $service = new \App\Services\CurrencyManager;
-            foreach($contents as $asset)
-                if(!$service->creditCurrency($sender, ( $asset['asset']->is_character_owned ? $recipient : $item_recipient), $logType, $data['data'], $asset['asset'], $asset['quantity'])) return false;
-        }
-        elseif($key == 'items' && count($contents))
-        {
+            foreach ($contents as $asset) {
+                if (!$service->creditCurrency($sender, ($asset['asset']->is_character_owned ? $recipient : $item_recipient), $logType, $data['data'], $asset['asset'], $asset['quantity'])) {
+                    return false;
+                }
+            }
+        } elseif ($key == 'items' && count($contents)) {
             $service = new \App\Services\InventoryManager;
-            foreach($contents as $asset)
-                if(!$service->creditItem($sender, ( ($asset['asset']->category && $asset['asset']->category->is_character_owned) ? $recipient : $item_recipient), $logType, $data, $asset['asset'], $asset['quantity'])) return false;
+            foreach ($contents as $asset) {
+                if (!$service->creditItem($sender, (($asset['asset']->category && $asset['asset']->category->is_character_owned) ? $recipient : $item_recipient), $logType, $data, $asset['asset'], $asset['quantity'])) {
+                    return false;
+                }
+            }
         }
     }
+
     return $assets;
 }
+
+/**
+ * Creates a rewards string from an asset array.
+ *
+ * @param array $array
+ *
+ * @return string
+ */
+function createRewardsString($array) {
+    $string = [];
+    foreach ($array as $key => $contents) {
+        foreach ($contents as $asset) {
+            $string[] = $asset['asset']->displayName.' x'.$asset['quantity'];
+        }
+    }
+    if (!count($string)) {
+        return 'Nothing. :('; // :(
+    }
+
+    if (count($string) == 1) {
+        return implode(', ', $string);
+    }
+
+    return implode(', ', array_slice($string, 0, count($string) - 1)).(count($string) > 2 ? ', and ' : ' and ').end($string);
+}
diff --git a/app/Helpers/Helpers.php b/app/Helpers/Helpers.php
index 4299ed72ec..3bbdad08f9 100644
--- a/app/Helpers/Helpers.php
+++ b/app/Helpers/Helpers.php
@@ -12,18 +12,20 @@
 /**
  * Returns class name if the current URL corresponds to the given path.
  *
- * @param  string  $path
- * @param  string  $class
+ * @param string $path
+ * @param string $class
+ *
  * @return string
  */
 function set_active($path, $class = 'active') {
-    return call_user_func_array('Request::is', (array)$path) ? $class : '';
+    return call_user_func_array('Request::is', (array) $path) ? $class : '';
 }
 
 /**
  * Adds a help icon with a tooltip.
  *
- * @param  string  $text
+ * @param string $text
+ *
  * @return string
  */
 function add_help($text) {
@@ -33,23 +35,30 @@ function add_help($text) {
 /**
  * Uses the given array to generate breadcrumb links.
  *
- * @param  array  $links
+ * @param array $links
+ *
  * @return string
  */
 function breadcrumbs($links) {
     $ret = '<nav><ol class="breadcrumb">';
     $count = 0;
     $ret .= '<li class="breadcrumb-item"><a href="'.url('/').'">'.config('lorekeeper.settings.site_name', 'Lorekeeper').'</a></li>';
-    foreach($links as $key => $link) {
+    foreach ($links as $key => $link) {
         $isLast = ($count == count($links) - 1);
 
         $ret .= '<li class="breadcrumb-item ';
-        if($isLast) $ret .= 'active';
+        if ($isLast) {
+            $ret .= 'active';
+        }
         $ret .= '">';
 
-        if(!$isLast) $ret .= '<a href="'.url($link).'">';
-        $ret .=  $key;
-        if(!$isLast) $ret .= '</a>';
+        if (!$isLast) {
+            $ret .= '<a href="'.url($link).'">';
+        }
+        $ret .= $key;
+        if (!$isLast) {
+            $ret .= '</a>';
+        }
 
         $ret .= '</li>';
 
@@ -63,22 +72,26 @@ function breadcrumbs($links) {
 /**
  * Formats the timestamp to a standard format.
  *
- * @param  \Illuminate\Support\Carbon\Carbon  $timestamp
+ * @param \Illuminate\Support\Carbon\Carbon $timestamp
+ * @param mixed                             $showTime
+ *
  * @return string
  */
 function format_date($timestamp, $showTime = true) {
-    return $timestamp->format('j F Y' . ($showTime ? ', H:i:s' : '')) . ($showTime ? ' <abbr data-toggle="tooltip" title="UTC'.$timestamp->timezone->toOffsetName().'">' . strtoupper($timestamp->timezone->getAbbreviatedName($timestamp->isDST())) . '</abbr>' : '');
+    return $timestamp->format('j F Y'.($showTime ? ', H:i:s' : '')).($showTime ? ' <abbr data-toggle="tooltip" title="UTC'.$timestamp->timezone->toOffsetName().'">'.strtoupper($timestamp->timezone->getAbbreviatedName($timestamp->isDST())).'</abbr>' : '');
 }
 
 function pretty_date($timestamp, $showTime = true) {
-   return '<abbr data-toggle="tooltip" title="' . $timestamp->format('F j Y' . ($showTime ? ', H:i:s' : '')) . ' ' . strtoupper($timestamp->timezone->getAbbreviatedName($timestamp->isDST())).'">' .$timestamp->diffForHumans() . '</abbr>';
+    return '<abbr data-toggle="tooltip" title="'.$timestamp->format('F j Y'.($showTime ? ', H:i:s' : '')).' '.strtoupper($timestamp->timezone->getAbbreviatedName($timestamp->isDST())).'">'.$timestamp->diffForHumans().'</abbr>';
 }
 
 /**
  * Formats a number to fit the number of digits given,
  * for generating masterlist numbers.
  *
- * @param  \Illuminate\Support\Carbon\Carbon  $timestamp
+ * @param mixed $number
+ * @param mixed $digits
+ *
  * @return string
  */
 function format_masterlist_number($number, $digits) {
@@ -88,26 +101,28 @@ function format_masterlist_number($number, $digits) {
 /**
  * Parses a piece of user-entered text for HTML output and optionally gets pings.
  *
- * @param  string  $text
- * @param  array   $pings
+ * @param string $text
+ * @param array  $pings
+ *
  * @return string
  */
 function parse($text, &$pings = null) {
-    if(!$text) return null;
+    if (!$text) {
+        return null;
+    }
 
-    require_once(base_path().'/vendor/ezyang/htmlpurifier/library/HTMLPurifier.auto.php');
+    require_once base_path().'/vendor/ezyang/htmlpurifier/library/HTMLPurifier.auto.php';
 
     $config = HTMLPurifier_Config::createDefault();
     $config->set('Attr.EnableID', true);
     $config->set('HTML.DefinitionID', 'include');
     $config->set('HTML.DefinitionRev', 2);
     if ($def = $config->maybeGetRawHTMLDefinition()) {
-        $def->addElement('include', 'Block', 'Empty', 'Common', array('file*' => 'URI', 'height' => 'Text', 'width' => 'Text'));
-		$def->addAttribute('a', 'data-toggle', 'Enum#collapse,tab');
-		$def->addAttribute('a', 'aria-expanded', 'Enum#true,false');
-		$def->addAttribute('a', 'data-target', 'Text');
-		$def->addAttribute('div', 'data-parent', 'Text');
-
+        $def->addElement('include', 'Block', 'Empty', 'Common', ['file*' => 'URI', 'height' => 'Text', 'width' => 'Text']);
+        $def->addAttribute('a', 'data-toggle', 'Enum#collapse,tab');
+        $def->addAttribute('a', 'aria-expanded', 'Enum#true,false');
+        $def->addAttribute('a', 'data-target', 'Text');
+        $def->addAttribute('div', 'data-parent', 'Text');
     }
 
     $purifier = new HTMLPurifier($config);
@@ -115,9 +130,15 @@ function parse($text, &$pings = null) {
 
     $users = $characters = null;
     $text = parseUsers($text, $users);
+    $text = parseUsersAndAvatars($text, $users);
+    $text = parseUserIDs($text, $users);
+    $text = parseUserIDsForAvatars($text, $users);
     $text = parseCharacters($text, $characters);
+    $text = parseCharacterThumbs($text, $characters);
     $text = parseGalleryThumbs($text, $submissions);
-    if($pings) $pings = ['users' => $users, 'characters' => $characters];
+    if ($pings) {
+        $pings = ['users' => $users, 'characters' => $characters];
+    }
 
     return $text;
 }
@@ -126,19 +147,20 @@ function parse($text, &$pings = null) {
  * Parses a piece of user-entered text to match user mentions
  * and replace with a link.
  *
- * @param  string  $text
- * @param  mixed   $users
+ * @param string $text
+ * @param mixed  $users
+ *
  * @return string
  */
 function parseUsers($text, &$users) {
     $matches = null;
     $users = [];
     $count = preg_match_all('/\B@([A-Za-z0-9_-]+)/', $text, $matches);
-    if($count) {
+    if ($count) {
         $matches = array_unique($matches[1]);
-        foreach($matches as $match) {
+        foreach ($matches as $match) {
             $user = \App\Models\User\User::where('name', $match)->first();
-            if($user) {
+            if ($user) {
                 $users[] = $user;
                 $text = preg_replace('/\B@'.$match.'/', $user->displayName, $text);
             }
@@ -148,23 +170,105 @@ function parseUsers($text, &$users) {
     return $text;
 }
 
+/**
+ * Parses a piece of user-entered text to match user mentions
+ * and replace with a link and avatar.
+ *
+ * @param string $text
+ * @param mixed  $users
+ *
+ * @return string
+ */
+function parseUsersAndAvatars($text, &$users) {
+    $matches = null;
+    $users = [];
+    $count = preg_match_all('/\B%([A-Za-z0-9_-]+)/', $text, $matches);
+    if ($count) {
+        $matches = array_unique($matches[1]);
+        foreach ($matches as $match) {
+            $user = \App\Models\User\User::where('name', $match)->first();
+            if ($user) {
+                $users[] = $user;
+                $text = preg_replace('/\B%'.$match.'/', '<a href="'.$user->url.'"><img src="'.$user->avatarUrl.'" style="width:70px; height:70px; border-radius:50%; " alt="'.$user->name.'\'s Avatar"></a>'.$user->displayName, $text);
+            }
+        }
+    }
+
+    return $text;
+}
+
+/**
+ * Parses a piece of user-entered text to match userid mentions
+ * and replace with a link.
+ *
+ * @param string $text
+ * @param mixed  $users
+ *
+ * @return string
+ */
+function parseUserIDs($text, &$users) {
+    $matches = null;
+    $users = [];
+    $count = preg_match_all('/\[user=([^\[\]&<>?"\']+)\]/', $text, $matches);
+    if ($count) {
+        $matches = array_unique($matches[1]);
+        foreach ($matches as $match) {
+            $user = \App\Models\User\User::where('id', $match)->first();
+            if ($user) {
+                $users[] = $user;
+                $text = preg_replace('/\[user='.$match.'\]/', $user->displayName, $text);
+            }
+        }
+    }
+
+    return $text;
+}
+
+/**
+ * Parses a piece of user-entered text to match userid mentions
+ * and replace with a user avatar.
+ *
+ * @param string $text
+ * @param mixed  $users
+ *
+ * @return string
+ */
+function parseUserIDsForAvatars($text, &$users) {
+    $matches = null;
+    $users = [];
+    $count = preg_match_all('/\[userav=([^\[\]&<>?"\']+)\]/', $text, $matches);
+    if ($count) {
+        $matches = array_unique($matches[1]);
+        foreach ($matches as $match) {
+            $user = \App\Models\User\User::where('id', $match)->first();
+            if ($user) {
+                $users[] = $user;
+                $text = preg_replace('/\[userav='.$match.'\]/', '<a href="'.$user->url.'"><img src="'.$user->avatarUrl.'" style="width:70px; height:70px; border-radius:50%; " alt="'.$user->name.'\'s Avatar"></a>', $text);
+            }
+        }
+    }
+
+    return $text;
+}
+
 /**
  * Parses a piece of user-entered text to match character mentions
  * and replace with a link.
  *
- * @param  string  $text
- * @param  mixed   $characters
+ * @param string $text
+ * @param mixed  $characters
+ *
  * @return string
  */
 function parseCharacters($text, &$characters) {
     $matches = null;
     $characters = [];
     $count = preg_match_all('/\[character=([^\[\]&<>?"\']+)\]/', $text, $matches);
-    if($count) {
+    if ($count) {
         $matches = array_unique($matches[1]);
-        foreach($matches as $match) {
+        foreach ($matches as $match) {
             $character = \App\Models\Character\Character::where('slug', $match)->first();
-            if($character) {
+            if ($character) {
                 $characters[] = $character;
                 $text = preg_replace('/\[character='.$match.'\]/', $character->displayName, $text);
             }
@@ -174,23 +278,51 @@ function parseCharacters($text, &$characters) {
     return $text;
 }
 
+/**
+ * Parses a piece of user-entered text to match character mentions
+ * and replace with a thumbnail.
+ *
+ * @param string $text
+ * @param mixed  $characters
+ *
+ * @return string
+ */
+function parseCharacterThumbs($text, &$characters) {
+    $matches = null;
+    $characters = [];
+    $count = preg_match_all('/\[charthumb=([^\[\]&<>?"\']+)\]/', $text, $matches);
+    if ($count) {
+        $matches = array_unique($matches[1]);
+        foreach ($matches as $match) {
+            $character = \App\Models\Character\Character::where('slug', $match)->first();
+            if ($character) {
+                $characters[] = $character;
+                $text = preg_replace('/\[charthumb='.$match.'\]/', '<a href="'.$character->url.'"><img class="img-thumbnail" alt="Thumbnail of '.$character->fullName.'" data-toggle="tooltip" title="'.$character->fullName.'" src="'.$character->image->thumbnailUrl.'"></a>', $text);
+            }
+        }
+    }
+
+    return $text;
+}
+
 /**
  * Parses a piece of user-entered text to match gallery submission thumb mentions
  * and replace with a link.
  *
- * @param  string  $text
- * @param  mixed   $submissions
+ * @param string $text
+ * @param mixed  $submissions
+ *
  * @return string
  */
 function parseGalleryThumbs($text, &$submissions) {
     $matches = null;
     $submissions = [];
     $count = preg_match_all('/\[thumb=([^\[\]&<>?"\']+)\]/', $text, $matches);
-    if($count) {
+    if ($count) {
         $matches = array_unique($matches[1]);
-        foreach($matches as $match) {
+        foreach ($matches as $match) {
             $submission = \App\Models\Gallery\GallerySubmission::where('id', $match)->first();
-            if($submission) {
+            if ($submission) {
                 $submissions[] = $submission;
                 $text = preg_replace('/\[thumb='.$match.'\]/', '<a href="'.$submission->url.'" data-toggle="tooltip" title="'.$submission->displayTitle.' by '.nl2br(htmlentities($submission->creditsPlain)).(isset($submission->content_warning) ? '<br/><strong>Content Warning:</strong> '.nl2br(htmlentities($submission->content_warning)) : '').'">'.view('widgets._gallery_thumb', ['submission' => $submission]).'</a>', $text);
             }
@@ -203,14 +335,17 @@ function parseGalleryThumbs($text, &$submissions) {
 /**
  * Generates a string of random characters of the specified length.
  *
- * @param  int  $characters
+ * @param int $characters
+ *
  * @return string
  */
-function randomString($characters)
-{
+function randomString($characters) {
     $src = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789';
     $code = '';
-    for ($i = 0; $i < $characters; $i++) $code .= $src[mt_rand(0, strlen($src) - 1)];
+    for ($i = 0; $i < $characters; $i++) {
+        $code .= $src[mt_rand(0, strlen($src) - 1)];
+    }
+
     return $code;
 }
 
@@ -218,17 +353,17 @@ function randomString($characters)
  * Check that a url is from a site used for authentication,
  * and if it belongs to a user.
  *
- * @param  string                  $url
- * @param  bool                    $failOnError
+ * @param string $url
+ * @param bool   $failOnError
+ *
  * @return \App\Models\User\User|string
  */
-function checkAlias($url, $failOnError = true)
-{
-    if($url) {
+function checkAlias($url, $failOnError = true) {
+    if ($url) {
         $recipient = null;
         $matches = [];
         // Check to see if url is 1. from a site used for auth
-        foreach (Config::get('lorekeeper.sites') as $key=> $site) {
+        foreach (config('lorekeeper.sites') as $key=> $site) {
             if (isset($site['auth']) && $site['auth']) {
                 preg_match_all($site['regex'], $url, $matches, PREG_SET_ORDER, 0);
                 if ($matches != []) {
@@ -242,8 +377,13 @@ function checkAlias($url, $failOnError = true)
         }
 
         // and 2. if it contains an alias associated with a user on-site.
+
         if (isset($matches[0]) && $matches[0] != [] && isset($matches[0][1])) {
-            $alias = App\Models\User\UserAlias::where('site', $urlSite)->where('alias', $matches[0][0])->first();
+            if ($urlSite != 'discord') {
+                $alias = App\Models\User\UserAlias::where('site', $urlSite)->where('alias', $matches[0][1])->first();
+            } else {
+                $alias = App\Models\User\UserAlias::where('site', $urlSite)->where('alias', $matches[0][0])->first();
+            }
             if ($alias) {
                 $recipient = $alias->user;
             } else {
@@ -258,37 +398,52 @@ function checkAlias($url, $failOnError = true)
 /**
  * Prettifies links to user profiles on various sites in a "user@site" format.
  *
- * @param  string  $url
+ * @param string $url
+ *
  * @return string
  */
-function prettyProfileLink($url)
-{
+function prettyProfileLink($url) {
     $matches = [];
     // Check different sites and return site if a match is made, plus username (retreived from the URL)
-    foreach(Config::get('lorekeeper.sites') as $siteName=>$siteInfo) {
-        if(preg_match_all($siteInfo['regex'], $url, $matches)) {$site = $siteName; $name = $matches[1][0]; $link = $matches[0][0]; break;}
+    foreach (config('lorekeeper.sites') as $siteName=> $siteInfo) {
+        if (preg_match_all($siteInfo['regex'], $url, $matches)) {
+            $site = $siteName;
+            $name = $matches[1][0];
+            $link = $matches[0][0];
+            break;
+        }
     }
 
     // Return formatted link if possible; failing that, an unformatted link
-    if(isset($name) && isset($site) && isset($link)) return '<a href="https://'.$link.'">'.$name.'@'.(Config::get('lorekeeper.sites.'.$site.'.display_name') != null ? Config::get('lorekeeper.sites.'.$site.'.display_name') : $site).'</a>';
-    else return '<a href="'.$url.'">'.$url.'</a>';
+    if (isset($name) && isset($site) && isset($link)) {
+        return '<a href="https://'.$link.'">'.$name.'@'.(config('lorekeeper.sites.'.$site.'.display_name') != null ? config('lorekeeper.sites.'.$site.'.display_name') : $site).'</a>';
+    } else {
+        return '<a href="'.$url.'">'.$url.'</a>';
+    }
 }
 
 /**
  * Prettifies user profile names for use in various functions.
  *
- * @param  string  $url
+ * @param string $url
+ *
  * @return string
  */
-function prettyProfileName($url)
-{
+function prettyProfileName($url) {
     $matches = [];
     // Check different sites and return site if a match is made, plus username (retreived from the URL)
-    foreach(Config::get('lorekeeper.sites') as $siteName=>$siteInfo) {
-        if(preg_match_all($siteInfo['regex'], $url, $matches)) {$site = $siteName; $name = $matches[1][0]; break;}
+    foreach (config('lorekeeper.sites') as $siteName=> $siteInfo) {
+        if (preg_match_all($siteInfo['regex'], $url, $matches)) {
+            $site = $siteName;
+            $name = $matches[1][0];
+            break;
+        }
     }
 
     // Return formatted name if possible; failing that, an unformatted url
-    if(isset($name) && isset($site)) return $name.'@'.(Config::get('lorekeeper.sites.'.$site.'.display_name') != null ? Config::get('lorekeeper.sites.'.$site.'.display_name') : $site);
-    else return $url;
+    if (isset($name) && isset($site)) {
+        return $name.'@'.(config('lorekeeper.sites.'.$site.'.display_name') != null ? config('lorekeeper.sites.'.$site.'.display_name') : $site);
+    } else {
+        return $url;
+    }
 }
diff --git a/app/Helpers/HoneypotHandler.php b/app/Helpers/HoneypotHandler.php
new file mode 100644
index 0000000000..11dc61a8fd
--- /dev/null
+++ b/app/Helpers/HoneypotHandler.php
@@ -0,0 +1,15 @@
+<?php
+
+namespace App\Helpers;
+
+use Closure;
+use Illuminate\Http\Request;
+use Spatie\Honeypot\SpamResponder\SpamResponder;
+
+class HoneypotHandler implements SpamResponder {
+    public function respond(Request $request, Closure $next) {
+        flash('Woah there! Your request has activated anti-spam measures. If you believe this to be in error, please wait a few seconds before submitting the form again.')->warning();
+
+        return redirect()->back();
+    }
+}
diff --git a/app/Helpers/Notifications.php b/app/Helpers/Notifications.php
index 38957fa6a9..d71e9d9492 100644
--- a/app/Helpers/Notifications.php
+++ b/app/Helpers/Notifications.php
@@ -2,11 +2,10 @@
 
 namespace App\Helpers;
 
-use DB;
 use App\Models\Notification;
+use Illuminate\Support\Facades\DB;
 
 class Notifications {
-
     /*
     |--------------------------------------------------------------------------
     | Notifications
@@ -19,13 +18,13 @@ class Notifications {
     /**
      * Creates a new notification.
      *
-     * @param  string                 $type
-     * @param  \App\Models\User\User  $user
-     * @param  array                  $data
+     * @param string                $type
+     * @param \App\Models\User\User $user
+     * @param array                 $data
+     *
      * @return bool
      */
-    public function create($type, $user, $data)
-    {
+    public function create($type, $user, $data) {
         DB::beginTransaction();
 
         try {
@@ -33,18 +32,20 @@ public function create($type, $user, $data)
                 'user_id'               => $user->id,
                 'notification_type_id'  => Notification::getNotificationId($type),
                 'data'                  => json_encode($data),
-                'is_unread'             => 1
+                'is_unread'             => 1,
             ]);
 
             $user->notifications_unread++;
             $user->save();
-            
+
             DB::commit();
+
             return true;
-        } catch(\Exception $e) { 
+        } catch (\Exception $e) {
             $this->setError('error', $e->getMessage());
         }
         DB::rollback();
+
         return false;
     }
-}
\ No newline at end of file
+}
diff --git a/app/Helpers/Settings.php b/app/Helpers/Settings.php
index e0dd3a087b..1254fa21d0 100644
--- a/app/Helpers/Settings.php
+++ b/app/Helpers/Settings.php
@@ -2,10 +2,9 @@
 
 namespace App\Helpers;
 
-use DB;
+use Illuminate\Support\Facades\DB;
 
 class Settings {
-
     /*
     |--------------------------------------------------------------------------
     | Settings
@@ -18,13 +17,16 @@ class Settings {
     /**
      * Gets a site setting.
      *
-     * @param  string  $key
+     * @param string $key
+     *
      * @return mixed|null
      */
-    public function get($key)
-    {
+    public function get($key) {
         $setting = DB::table('site_settings')->where('key', $key)->first();
-        if($setting) return $setting->value;
-        else return null;
+        if ($setting) {
+            return $setting->value;
+        } else {
+            return null;
+        }
     }
-}
\ No newline at end of file
+}
diff --git a/app/Http/Controllers/Admin/Characters/CharacterController.php b/app/Http/Controllers/Admin/Characters/CharacterController.php
index 76e5439c01..aa268ca512 100644
--- a/app/Http/Controllers/Admin/Characters/CharacterController.php
+++ b/app/Http/Controllers/Admin/Characters/CharacterController.php
@@ -2,32 +2,25 @@
 
 namespace App\Http\Controllers\Admin\Characters;
 
-use Illuminate\Http\Request;
-
-use Auth;
-use Config;
-use Settings;
-
+use App\Facades\Settings;
+use App\Http\Controllers\Controller;
 use App\Models\Character\Character;
 use App\Models\Character\CharacterCategory;
-use App\Models\Rarity;
 use App\Models\Character\CharacterTitle;
-use App\Models\User\User;
+use App\Models\Character\CharacterTransfer;
+use App\Models\Feature\Feature;
+use App\Models\Rarity;
 use App\Models\Species\Species;
 use App\Models\Species\Subtype;
-use App\Models\Feature\Feature;
-use App\Models\Character\CharacterTransfer;
 use App\Models\Trade;
+use App\Models\User\User;
 use App\Models\User\UserItem;
-
 use App\Services\CharacterManager;
-use App\Services\CurrencyManager;
 use App\Services\TradeManager;
+use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Auth;
 
-use App\Http\Controllers\Controller;
-
-class CharacterController extends Controller
-{
+class CharacterController extends Controller {
     /*
     |--------------------------------------------------------------------------
     | Admin / Character Controller
@@ -40,12 +33,11 @@ class CharacterController extends Controller
     /**
      * Gets the next number for a character in a category.
      *
-     * @param  \Illuminate\Http\Request       $request
-     * @param  App\Services\CharacterManager  $service
+     * @param App\Services\CharacterManager $service
+     *
      * @return string
      */
-    public function getPullNumber(Request $request, CharacterManager $service)
-    {
+    public function getPullNumber(Request $request, CharacterManager $service) {
         return $service->pullNumber($request->get('category'));
     }
 
@@ -54,17 +46,16 @@ public function getPullNumber(Request $request, CharacterManager $service)
      *
      * @return \Illuminate\Contracts\Support\Renderable
      */
-    public function getCreateCharacter()
-    {
+    public function getCreateCharacter() {
         return view('admin.masterlist.create_character', [
-            'categories' => CharacterCategory::orderBy('sort')->get(),
+            'categories'  => CharacterCategory::orderBy('sort')->get(),
             'userOptions' => User::query()->orderBy('name')->pluck('name', 'id')->toArray(),
-            'rarities' => ['0' => 'Select Rarity'] + Rarity::orderBy('sort', 'DESC')->pluck('name', 'id')->toArray(),
+            'rarities'    => ['0' => 'Select Rarity'] + Rarity::orderBy('sort', 'DESC')->pluck('name', 'id')->toArray(),
+            'specieses'   => ['0' => 'Select Species'] + Species::orderBy('sort', 'DESC')->pluck('name', 'id')->toArray(),
+            'subtypes'    => ['0' => 'Pick a Species First'],
+            'features'    => Feature::getDropdownItems(1),
+            'isMyo'       => false,
             'titles' => ['0' => 'Select Title', 'custom' => 'Custom Title'] + CharacterTitle::orderBy('sort', 'DESC')->pluck('title', 'id')->toArray(),
-            'specieses' => ['0' => 'Select Species'] + Species::orderBy('sort', 'DESC')->pluck('name', 'id')->toArray(),
-            'subtypes' => ['0' => 'Pick a Species First'],
-            'features' => Feature::orderBy('name')->pluck('name', 'id')->toArray(),
-            'isMyo' => false
         ]);
     }
 
@@ -73,41 +64,39 @@ public function getCreateCharacter()
      *
      * @return \Illuminate\Contracts\Support\Renderable
      */
-    public function getCreateMyo()
-    {
+    public function getCreateMyo() {
         return view('admin.masterlist.create_character', [
             'userOptions' => User::query()->orderBy('name')->pluck('name', 'id')->toArray(),
-            'rarities' => ['0' => 'Select Rarity'] + Rarity::orderBy('sort', 'DESC')->pluck('name', 'id')->toArray(),
-            'specieses' => ['0' => 'Select Species'] + Species::orderBy('sort', 'DESC')->pluck('name', 'id')->toArray(),
-            'subtypes' => ['0' => 'Pick a Species First'],
-            'features' => Feature::orderBy('name')->pluck('name', 'id')->toArray(),
-            'isMyo' => true
+            'rarities'    => ['0' => 'Select Rarity'] + Rarity::orderBy('sort', 'DESC')->pluck('name', 'id')->toArray(),
+            'specieses'   => ['0' => 'Select Species'] + Species::orderBy('sort', 'DESC')->pluck('name', 'id')->toArray(),
+            'subtypes'    => ['0' => 'Pick a Species First'],
+            'features'    => Feature::getDropdownItems(1),
+            'isMyo'       => true,
         ]);
     }
 
     /**
-     * Shows the edit image subtype portion of the modal
+     * Shows the edit image subtype portion of the modal.
      *
-     * @param  Request  $request
      * @return \Illuminate\Contracts\Support\Renderable
      */
     public function getCreateCharacterMyoSubtype(Request $request) {
-      $species = $request->input('species');
-      return view('admin.masterlist._create_character_subtype', [
-          'subtypes' => ['0' => 'Select Subtype'] + Subtype::where('species_id','=',$species)->orderBy('sort', 'DESC')->pluck('name', 'id')->toArray(),
-          'isMyo' => $request->input('myo')
-      ]);
+        $species = $request->input('species');
+
+        return view('admin.masterlist._create_character_subtype', [
+            'subtypes' => ['0' => 'Select Subtype'] + Subtype::where('species_id', '=', $species)->orderBy('sort', 'DESC')->pluck('name', 'id')->toArray(),
+            'isMyo'    => $request->input('myo'),
+        ]);
     }
 
     /**
      * Creates a character.
      *
-     * @param  \Illuminate\Http\Request       $request
-     * @param  App\Services\CharacterManager  $service
+     * @param App\Services\CharacterManager $service
+     *
      * @return \Illuminate\Http\RedirectResponse
      */
-    public function postCreateCharacter(Request $request, CharacterManager $service)
-    {
+    public function postCreateCharacter(Request $request, CharacterManager $service) {
         $request->validate(Character::$createRules);
         $data = $request->only([
             'user_id', 'owner_url', 'character_category_id', 'number', 'slug',
@@ -116,28 +105,30 @@ public function postCreateCharacter(Request $request, CharacterManager $service)
             'x0', 'x1', 'y0', 'y1',
             'designer_id', 'designer_url',
             'artist_id', 'artist_url',
-            'species_id', 'subtype_id', 'rarity_id', 'feature_id', 'feature_data', 'title_id', 'title_data',
-            'image', 'thumbnail', 'image_description'
+            'species_id', 'subtype_id', 'rarity_id', 'feature_id', 'feature_data',
+            'image', 'thumbnail', 'image_description', 'title_id', 'title_data',
         ]);
         if ($character = $service->createCharacter($data, Auth::user())) {
             flash('Character created successfully.')->success();
+
             return redirect()->to($character->url);
+        } else {
+            foreach ($service->errors()->getMessages()['error'] as $error) {
+                flash($error)->error();
+            }
         }
-        else {
-            foreach($service->errors()->getMessages()['error'] as $error) flash($error)->error();
-        }
+
         return redirect()->back()->withInput();
     }
 
     /**
      * Creates an MYO slot.
      *
-     * @param  \Illuminate\Http\Request       $request
-     * @param  App\Services\CharacterManager  $service
+     * @param App\Services\CharacterManager $service
+     *
      * @return \Illuminate\Http\RedirectResponse
      */
-    public function postCreateMyo(Request $request, CharacterManager $service)
-    {
+    public function postCreateMyo(Request $request, CharacterManager $service) {
         $request->validate(Character::$myoRules);
         $data = $request->only([
             'user_id', 'owner_url', 'name',
@@ -147,408 +138,482 @@ public function postCreateMyo(Request $request, CharacterManager $service)
             'designer_id', 'designer_url',
             'artist_id', 'artist_url',
             'species_id', 'subtype_id', 'rarity_id', 'feature_id', 'feature_data',
-            'image', 'thumbnail'
+            'image', 'thumbnail',
         ]);
         if ($character = $service->createCharacter($data, Auth::user(), true)) {
             flash('MYO slot created successfully.')->success();
+
             return redirect()->to($character->url);
+        } else {
+            foreach ($service->errors()->getMessages()['error'] as $error) {
+                flash($error)->error();
+            }
         }
-        else {
-            foreach($service->errors()->getMessages()['error'] as $error) flash($error)->error();
-        }
+
         return redirect()->back()->withInput();
     }
 
     /**
      * Shows the edit character stats modal.
      *
-     * @param  string  $slug
+     * @param string $slug
+     *
      * @return \Illuminate\Contracts\Support\Renderable
      */
-    public function getEditCharacterStats($slug)
-    {
+    public function getEditCharacterStats($slug) {
         $this->character = Character::where('slug', $slug)->first();
-        if(!$this->character) abort(404);
+        if (!$this->character) {
+            abort(404);
+        }
 
         return view('character.admin._edit_stats_modal', [
-            'character' => $this->character,
-            'categories' => CharacterCategory::orderBy('sort')->pluck('name', 'id')->toArray(),
+            'character'   => $this->character,
+            'categories'  => CharacterCategory::orderBy('sort')->pluck('name', 'id')->toArray(),
             'userOptions' => User::query()->orderBy('name')->pluck('name', 'id')->toArray(),
-            'number' => format_masterlist_number($this->character->number, Config::get('lorekeeper.settings.character_number_digits')),
-            'isMyo' => false
+            'number'      => format_masterlist_number($this->character->number, config('lorekeeper.settings.character_number_digits')),
+            'isMyo'       => false,
         ]);
     }
 
     /**
      * Shows the edit MYO stats modal.
      *
-     * @param  int  $id
+     * @param int $id
+     *
      * @return \Illuminate\Contracts\Support\Renderable
      */
-    public function getEditMyoStats($id)
-    {
+    public function getEditMyoStats($id) {
         $this->character = Character::where('is_myo_slot', 1)->where('id', $id)->first();
-        if(!$this->character) abort(404);
+        if (!$this->character) {
+            abort(404);
+        }
 
         return view('character.admin._edit_stats_modal', [
-            'character' => $this->character,
+            'character'   => $this->character,
             'userOptions' => User::query()->orderBy('name')->pluck('name', 'id')->toArray(),
-            'isMyo' => true
+            'isMyo'       => true,
         ]);
     }
 
     /**
      * Edits a character's stats.
      *
-     * @param  \Illuminate\Http\Request       $request
-     * @param  App\Services\CharacterManager  $service
-     * @param  string                         $slug
+     * @param App\Services\CharacterManager $service
+     * @param string                        $slug
+     *
      * @return \Illuminate\Http\RedirectResponse
      */
-    public function postEditCharacterStats(Request $request, CharacterManager $service, $slug)
-    {
+    public function postEditCharacterStats(Request $request, CharacterManager $service, $slug) {
         $request->validate(Character::$updateRules);
         $data = $request->only([
             'character_category_id', 'number', 'slug',
             'is_giftable', 'is_tradeable', 'is_sellable', 'sale_value',
-            'transferrable_at'
+            'transferrable_at',
         ]);
         $this->character = Character::where('slug', $slug)->first();
-        if(!$this->character) abort(404);
+        if (!$this->character) {
+            abort(404);
+        }
         if ($service->updateCharacterStats($data, $this->character, Auth::user())) {
             flash('Character stats updated successfully.')->success();
+
             return redirect()->to($this->character->url);
+        } else {
+            foreach ($service->errors()->getMessages()['error'] as $error) {
+                flash($error)->error();
+            }
         }
-        else {
-            foreach($service->errors()->getMessages()['error'] as $error) flash($error)->error();
-        }
+
         return redirect()->back()->withInput();
     }
 
     /**
      * Edits an MYO slot's stats.
      *
-     * @param  \Illuminate\Http\Request       $request
-     * @param  App\Services\CharacterManager  $service
-     * @param  int                            $id
+     * @param App\Services\CharacterManager $service
+     * @param int                           $id
+     *
      * @return \Illuminate\Http\RedirectResponse
      */
-    public function postEditMyoStats(Request $request, CharacterManager $service, $id)
-    {
+    public function postEditMyoStats(Request $request, CharacterManager $service, $id) {
         $request->validate(Character::$myoRules);
         $data = $request->only([
             'name',
             'is_giftable', 'is_tradeable', 'is_sellable', 'sale_value',
-            'transferrable_at'
+            'transferrable_at',
         ]);
         $this->character = Character::where('is_myo_slot', 1)->where('id', $id)->first();
-        if(!$this->character) abort(404);
+        if (!$this->character) {
+            abort(404);
+        }
         if ($service->updateCharacterStats($data, $this->character, Auth::user())) {
             flash('Character stats updated successfully.')->success();
+
             return redirect()->to($this->character->url);
+        } else {
+            foreach ($service->errors()->getMessages()['error'] as $error) {
+                flash($error)->error();
+            }
         }
-        else {
-            foreach($service->errors()->getMessages()['error'] as $error) flash($error)->error();
-        }
+
         return redirect()->back()->withInput();
     }
 
     /**
      * Shows the edit character description modal.
      *
-     * @param  string  $slug
+     * @param string $slug
+     *
      * @return \Illuminate\Contracts\Support\Renderable
      */
-    public function getEditCharacterDescription($slug)
-    {
+    public function getEditCharacterDescription($slug) {
         $this->character = Character::where('slug', $slug)->first();
-        if(!$this->character) abort(404);
+        if (!$this->character) {
+            abort(404);
+        }
 
         return view('character.admin._edit_description_modal', [
             'character' => $this->character,
-            'isMyo' => false
+            'isMyo'     => false,
         ]);
     }
 
     /**
      * Shows the edit MYO slot description modal.
      *
-     * @param  int  $id
+     * @param int $id
+     *
      * @return \Illuminate\Contracts\Support\Renderable
      */
-    public function getEditMyoDescription($id)
-    {
+    public function getEditMyoDescription($id) {
         $this->character = Character::where('is_myo_slot', 1)->where('id', $id)->first();
-        if(!$this->character) abort(404);
+        if (!$this->character) {
+            abort(404);
+        }
 
         return view('character.admin._edit_description_modal', [
             'character' => $this->character,
-            'isMyo' => true
+            'isMyo'     => true,
         ]);
     }
 
     /**
      * Edits a character's description.
      *
-     * @param  \Illuminate\Http\Request       $request
-     * @param  App\Services\CharacterManager  $service
-     * @param  string                         $slug
+     * @param App\Services\CharacterManager $service
+     * @param string                        $slug
+     *
      * @return \Illuminate\Http\RedirectResponse
      */
-    public function postEditCharacterDescription(Request $request, CharacterManager $service, $slug)
-    {
+    public function postEditCharacterDescription(Request $request, CharacterManager $service, $slug) {
         $data = $request->only([
-            'description'
+            'description',
         ]);
         $this->character = Character::where('slug', $slug)->first();
-        if(!$this->character) abort(404);
+        if (!$this->character) {
+            abort(404);
+        }
         if ($service->updateCharacterDescription($data, $this->character, Auth::user())) {
             flash('Character description updated successfully.')->success();
+
             return redirect()->to($this->character->url);
+        } else {
+            foreach ($service->errors()->getMessages()['error'] as $error) {
+                flash($error)->error();
+            }
         }
-        else {
-            foreach($service->errors()->getMessages()['error'] as $error) flash($error)->error();
-        }
+
         return redirect()->back()->withInput();
     }
 
     /**
      * Edits an MYO slot's description.
      *
-     * @param  \Illuminate\Http\Request       $request
-     * @param  App\Services\CharacterManager  $service
-     * @param  int                            $id
+     * @param App\Services\CharacterManager $service
+     * @param int                           $id
+     *
      * @return \Illuminate\Http\RedirectResponse
      */
-    public function postEditMyoDescription(Request $request, CharacterManager $service, $id)
-    {
+    public function postEditMyoDescription(Request $request, CharacterManager $service, $id) {
         $data = $request->only([
-            'description'
+            'description',
         ]);
         $this->character = Character::where('is_myo_slot', 1)->where('id', $id)->first();
-        if(!$this->character) abort(404);
+        if (!$this->character) {
+            abort(404);
+        }
         if ($service->updateCharacterDescription($data, $this->character, Auth::user())) {
             flash('Character description updated successfully.')->success();
+
             return redirect()->to($this->character->url);
+        } else {
+            foreach ($service->errors()->getMessages()['error'] as $error) {
+                flash($error)->error();
+            }
         }
-        else {
-            foreach($service->errors()->getMessages()['error'] as $error) flash($error)->error();
-        }
+
         return redirect()->back()->withInput();
     }
 
     /**
      * Edits a character's settings.
      *
-     * @param  \Illuminate\Http\Request       $request
-     * @param  App\Services\CharacterManager  $service
-     * @param  string                         $slug
+     * @param App\Services\CharacterManager $service
+     * @param string                        $slug
+     *
      * @return \Illuminate\Http\RedirectResponse
      */
-    public function postCharacterSettings(Request $request, CharacterManager $service, $slug)
-    {
+    public function postCharacterSettings(Request $request, CharacterManager $service, $slug) {
         $data = $request->only([
-            'is_visible'
+            'is_visible',
         ]);
         $this->character = Character::where('slug', $slug)->first();
-        if(!$this->character) abort(404);
+        if (!$this->character) {
+            abort(404);
+        }
         if ($service->updateCharacterSettings($data, $this->character, Auth::user())) {
             flash('Character settings updated successfully.')->success();
+
             return redirect()->to($this->character->url);
+        } else {
+            foreach ($service->errors()->getMessages()['error'] as $error) {
+                flash($error)->error();
+            }
         }
-        else {
-            foreach($service->errors()->getMessages()['error'] as $error) flash($error)->error();
-        }
+
         return redirect()->back()->withInput();
     }
 
     /**
      * Edits an MYO slot's settings.
      *
-     * @param  \Illuminate\Http\Request       $request
-     * @param  App\Services\CharacterManager  $service
-     * @param  int                            $id
+     * @param App\Services\CharacterManager $service
+     * @param int                           $id
+     *
      * @return \Illuminate\Http\RedirectResponse
      */
-    public function postMyoSettings(Request $request, CharacterManager $service, $id)
-    {
+    public function postMyoSettings(Request $request, CharacterManager $service, $id) {
         $data = $request->only([
-            'is_visible'
+            'is_visible',
         ]);
         $this->character = Character::where('is_myo_slot', 1)->where('id', $id)->first();
-        if(!$this->character) abort(404);
+        if (!$this->character) {
+            abort(404);
+        }
         if ($service->updateCharacterSettings($data, $this->character, Auth::user())) {
             flash('Character settings updated successfully.')->success();
+
             return redirect()->to($this->character->url);
+        } else {
+            foreach ($service->errors()->getMessages()['error'] as $error) {
+                flash($error)->error();
+            }
         }
-        else {
-            foreach($service->errors()->getMessages()['error'] as $error) flash($error)->error();
-        }
+
         return redirect()->back()->withInput();
     }
 
     /**
      * Shows the delete character modal.
      *
-     * @param  string  $slug
+     * @param string $slug
+     *
      * @return \Illuminate\Contracts\Support\Renderable
      */
-    public function getCharacterDelete($slug)
-    {
+    public function getCharacterDelete($slug) {
         $this->character = Character::where('slug', $slug)->first();
-        if(!$this->character) abort(404);
+        if (!$this->character) {
+            abort(404);
+        }
 
         return view('character.admin._delete_character_modal', [
             'character' => $this->character,
-            'isMyo' => false
+            'isMyo'     => false,
         ]);
     }
 
     /**
      * Shows the delete MYO slot modal.
      *
-     * @param  int  $id
+     * @param int $id
+     *
      * @return \Illuminate\Contracts\Support\Renderable
      */
-    public function getMyoDelete($id)
-    {
+    public function getMyoDelete($id) {
         $this->character = Character::where('is_myo_slot', 1)->where('id', $id)->first();
-        if(!$this->character) abort(404);
+        if (!$this->character) {
+            abort(404);
+        }
 
         return view('character.admin._delete_character_modal', [
             'character' => $this->character,
-            'isMyo' => true
+            'isMyo'     => true,
         ]);
     }
 
     /**
      * Deletes a character.
      *
-     * @param  \Illuminate\Http\Request       $request
-     * @param  App\Services\CharacterManager  $service
-     * @param  string                         $slug
+     * @param App\Services\CharacterManager $service
+     * @param string                        $slug
+     *
      * @return \Illuminate\Http\RedirectResponse
      */
-    public function postCharacterDelete(Request $request, CharacterManager $service, $slug)
-    {
+    public function postCharacterDelete(Request $request, CharacterManager $service, $slug) {
         $this->character = Character::where('slug', $slug)->first();
-        if(!$this->character) abort(404);
+        if (!$this->character) {
+            abort(404);
+        }
 
         if ($service->deleteCharacter($this->character, Auth::user())) {
             flash('Character deleted successfully.')->success();
+
             return redirect()->to('masterlist');
+        } else {
+            foreach ($service->errors()->getMessages()['error'] as $error) {
+                flash($error)->error();
+            }
         }
-        else {
-            foreach($service->errors()->getMessages()['error'] as $error) flash($error)->error();
-        }
+
         return redirect()->back();
     }
 
     /**
      * Deletes an MYO slot.
      *
-     * @param  \Illuminate\Http\Request       $request
-     * @param  App\Services\CharacterManager  $service
-     * @param  int                            $id
+     * @param App\Services\CharacterManager $service
+     * @param int                           $id
+     *
      * @return \Illuminate\Http\RedirectResponse
      */
-    public function postMyoDelete(Request $request, CharacterManager $service, $id)
-    {
+    public function postMyoDelete(Request $request, CharacterManager $service, $id) {
         $this->character = Character::where('is_myo_slot', 1)->where('id', $id)->first();
-        if(!$this->character) abort(404);
+        if (!$this->character) {
+            abort(404);
+        }
 
         if ($service->deleteCharacter($this->character, Auth::user())) {
             flash('Character deleted successfully.')->success();
+
             return redirect()->to('myos');
+        } else {
+            foreach ($service->errors()->getMessages()['error'] as $error) {
+                flash($error)->error();
+            }
         }
-        else {
-            foreach($service->errors()->getMessages()['error'] as $error) flash($error)->error();
-        }
+
         return redirect()->back();
     }
 
     /**
      * Transfers a character.
      *
-     * @param  \Illuminate\Http\Request       $request
-     * @param  App\Services\CharacterManager  $service
-     * @param  string                         $slug
+     * @param App\Services\CharacterManager $service
+     * @param string                        $slug
+     *
      * @return \Illuminate\Http\RedirectResponse
      */
-    public function postTransfer(Request $request, CharacterManager $service, $slug)
-    {
+    public function postTransfer(Request $request, CharacterManager $service, $slug) {
         $this->character = Character::where('slug', $slug)->first();
-        if(!$this->character) abort(404);
+        if (!$this->character) {
+            abort(404);
+        }
 
-        if($service->adminTransfer($request->only(['recipient_id', 'recipient_url', 'cooldown', 'reason']), $this->character, Auth::user())) {
+        if ($service->adminTransfer($request->only(['recipient_id', 'recipient_url', 'cooldown', 'reason']), $this->character, Auth::user())) {
             flash('Character transferred successfully.')->success();
+        } else {
+            foreach ($service->errors()->getMessages()['error'] as $error) {
+                flash($error)->error();
+            }
         }
-        else {
-            foreach($service->errors()->getMessages()['error'] as $error) flash($error)->error();
-        }
+
         return redirect()->back();
     }
 
     /**
      * Transfers an MYO slot.
      *
-     * @param  \Illuminate\Http\Request       $request
-     * @param  App\Services\CharacterManager  $service
-     * @param  int                            $id
+     * @param App\Services\CharacterManager $service
+     * @param int                           $id
+     *
      * @return \Illuminate\Http\RedirectResponse
      */
-    public function postMyoTransfer(Request $request, CharacterManager $service, $id)
-    {
+    public function postMyoTransfer(Request $request, CharacterManager $service, $id) {
         $this->character = Character::where('is_myo_slot', 1)->where('id', $id)->first();
-        if(!$this->character) abort(404);
+        if (!$this->character) {
+            abort(404);
+        }
 
-        if($service->adminTransfer($request->only(['recipient_id', 'recipient_url', 'cooldown', 'reason']), $this->character, Auth::user())) {
+        if ($service->adminTransfer($request->only(['recipient_id', 'recipient_url', 'cooldown', 'reason']), $this->character, Auth::user())) {
             flash('Character transferred successfully.')->success();
+        } else {
+            foreach ($service->errors()->getMessages()['error'] as $error) {
+                flash($error)->error();
+            }
         }
-        else {
-            foreach($service->errors()->getMessages()['error'] as $error) flash($error)->error();
-        }
+
         return redirect()->back();
     }
 
     /**
      * Shows the character transfer queue.
      *
-     * @param  string  $type
+     * @param string $type
+     *
      * @return \Illuminate\Contracts\Support\Renderable
      */
-    public function getTransferQueue($type)
-    {
+    public function getTransferQueue(Request $request, $type) {
         $transfers = CharacterTransfer::query();
         $user = Auth::user();
+        $data = $request->only(['sort']);
+        if (isset($data['sort'])) {
+            switch ($data['sort']) {
+                case 'newest':
+                    $transfers->sortNewest();
+                    break;
+                case 'oldest':
+                    $transfers->sortOldest();
+                    break;
+            }
+        } else {
+            $transfers->sortOldest();
+        }
 
-        if($type == 'completed') $transfers->completed();
-        else if ($type == 'incoming') $transfers->active()->where('is_approved', 0);
-        else abort(404);
+        if ($type == 'completed') {
+            $transfers->completed();
+        } elseif ($type == 'incoming') {
+            $transfers->active()->where('is_approved', 0);
+        } else {
+            abort(404);
+        }
 
         $openTransfersQueue = Settings::get('open_transfers_queue');
 
         return view('admin.masterlist.character_transfers', [
-            'transfers' => $transfers->orderBy('id', 'DESC')->paginate(20),
-            'transfersQueue' => Settings::get('open_transfers_queue'),
+            'transfers'          => $transfers->orderBy('id', 'DESC')->paginate(20),
+            'transfersQueue'     => Settings::get('open_transfers_queue'),
             'openTransfersQueue' => $openTransfersQueue,
-            'transferCount' => $openTransfersQueue ? CharacterTransfer::active()->where('is_approved', 0)->count() : 0,
-            'tradeCount' => $openTransfersQueue ? Trade::where('status', 'Pending')->count() : 0
+            'transferCount'      => $openTransfersQueue ? CharacterTransfer::active()->where('is_approved', 0)->count() : 0,
+            'tradeCount'         => $openTransfersQueue ? Trade::where('status', 'Pending')->count() : 0,
         ]);
     }
 
     /**
      * Shows the character transfer action modal.
      *
-     * @param  int     $id
-     * @param  string  $action
+     * @param int    $id
+     * @param string $action
+     *
      * @return \Illuminate\Contracts\Support\Renderable
      */
-    public function getTransferModal($id, $action)
-    {
-        if($action != 'approve' && $action != 'reject') abort(404);
+    public function getTransferModal($id, $action) {
+        if ($action != 'approve' && $action != 'reject') {
+            abort(404);
+        }
         $transfer = CharacterTransfer::where('id', $id)->active()->first();
-        if(!$transfer) abort(404);
+        if (!$transfer) {
+            abort(404);
+        }
 
         return view('admin.masterlist._'.$action.'_modal', [
             'transfer' => $transfer,
@@ -559,57 +624,64 @@ public function getTransferModal($id, $action)
     /**
      * Acts on a transfer in the transfer queue.
      *
-     * @param  \Illuminate\Http\Request       $request
-     * @param  App\Services\CharacterManager  $service
-     * @param  int                            $id
+     * @param App\Services\CharacterManager $service
+     * @param int                           $id
+     *
      * @return \Illuminate\Http\RedirectResponse
      */
-    public function postTransferQueue(Request $request, CharacterManager $service, $id)
-    {
-        if(!Auth::check()) abort(404);
+    public function postTransferQueue(Request $request, CharacterManager $service, $id) {
+        if (!Auth::check()) {
+            abort(404);
+        }
 
         $action = $request->get('action');
 
-        if($service->processTransferQueue($request->only(['action', 'cooldown', 'reason']) + ['transfer_id' => $id], Auth::user())) {
+        if ($service->processTransferQueue($request->only(['action', 'cooldown', 'reason']) + ['transfer_id' => $id], Auth::user())) {
             if (strtolower($action) == 'approve') {
-                flash('Transfer ' . strtolower($action) . 'd.')->success();
+                flash('Transfer '.strtolower($action).'d.')->success();
             } else {
-                flash('Transfer ' . strtolower($action) . 'ed.')->success();
+                flash('Transfer '.strtolower($action).'ed.')->success();
+            }
+        } else {
+            foreach ($service->errors()->getMessages()['error'] as $error) {
+                flash($error)->error();
             }
         }
-        else {
-            foreach($service->errors()->getMessages()['error'] as $error) flash($error)->error();
-        }
+
         return redirect()->back();
     }
 
     /**
      * Shows the character trade queue.
      *
-     * @param  string  $type
+     * @param string $type
+     *
      * @return \Illuminate\Contracts\Support\Renderable
      */
-    public function getTradeQueue($type)
-    {
+    public function getTradeQueue($type) {
         $trades = Trade::query();
         $user = Auth::user();
 
-        if($type == 'completed') $trades->completed();
-        else if ($type == 'incoming') $trades->where('status', 'Pending');
-        else abort(404);
+        if ($type == 'completed') {
+            $trades->completed();
+        } elseif ($type == 'incoming') {
+            $trades->where('status', 'Pending');
+        } else {
+            abort(404);
+        }
 
         $openTransfersQueue = Settings::get('open_transfers_queue');
 
-        $stacks = array();
-        foreach($trades->get() as $trade) {
-            foreach($trade->data as $side=>$assets) {
-                if(isset($assets['user_items'])) {
+        $stacks = [];
+        foreach ($trades->get() as $trade) {
+            foreach ($trade->data as $side=> $assets) {
+                if (isset($assets['user_items'])) {
                     $user_items = UserItem::with('item')->find(array_keys($assets['user_items']));
-                    $items = array();
-                    foreach($assets['user_items'] as $id=>$quantity) {
+                    $items = [];
+                    foreach ($assets['user_items'] as $id=> $quantity) {
                         $user_item = $user_items->find($id);
                         $user_item['quantity'] = $quantity;
-                        array_push($items,$user_item);
+                        array_push($items, $user_item);
                     }
                     $items = collect($items)->groupBy('item_id');
                     $stacks[$trade->id][$side] = $items;
@@ -618,30 +690,34 @@ public function getTradeQueue($type)
         }
 
         return view('admin.masterlist.character_trades', [
-            'trades' => $trades->orderBy('id', 'DESC')->paginate(20),
-            'tradesQueue' => Settings::get('open_transfers_queue'),
+            'trades'             => $trades->orderBy('id', 'DESC')->paginate(20),
+            'tradesQueue'        => Settings::get('open_transfers_queue'),
             'openTransfersQueue' => $openTransfersQueue,
-            'transferCount' => $openTransfersQueue ? CharacterTransfer::active()->where('is_approved', 0)->count() : 0,
-            'tradeCount' => $openTransfersQueue ? Trade::where('status', 'Pending')->count() : 0,
-            'stacks' => $stacks
+            'transferCount'      => $openTransfersQueue ? CharacterTransfer::active()->where('is_approved', 0)->count() : 0,
+            'tradeCount'         => $openTransfersQueue ? Trade::where('status', 'Pending')->count() : 0,
+            'stacks'             => $stacks,
         ]);
     }
 
     /**
      * Shows the character trade action modal.
      *
-     * @param  int     $id
-     * @param  string  $action
+     * @param int    $id
+     * @param string $action
+     *
      * @return \Illuminate\Contracts\Support\Renderable
      */
-    public function getTradeModal($id, $action)
-    {
-        if($action != 'approve' && $action != 'reject') abort(404);
+    public function getTradeModal($id, $action) {
+        if ($action != 'approve' && $action != 'reject') {
+            abort(404);
+        }
         $trade = Trade::where('id', $id)->first();
-        if(!$trade) abort(404);
+        if (!$trade) {
+            abort(404);
+        }
 
         return view('admin.masterlist._'.$action.'_trade_modal', [
-            'trade' => $trade,
+            'trade'    => $trade,
             'cooldown' => Settings::get('transfer_cooldown'),
         ]);
     }
@@ -649,36 +725,36 @@ public function getTradeModal($id, $action)
     /**
      * Acts on a trade in the trade queue.
      *
-     * @param  \Illuminate\Http\Request       $request
-     * @param  App\Services\CharacterManager  $service
-     * @param  int                            $id
+     * @param App\Services\CharacterManager $service
+     * @param int                           $id
+     *
      * @return \Illuminate\Http\RedirectResponse
      */
-    public function postTradeQueue(Request $request, TradeManager $service, $id)
-    {
-        if(!Auth::check()) abort(404);
+    public function postTradeQueue(Request $request, TradeManager $service, $id) {
+        if (!Auth::check()) {
+            abort(404);
+        }
 
         $action = strtolower($request->get('action'));
-        if($action == 'approve' && $service->approveTrade($request->only(['action', 'cooldowns']) + ['id' => $id], Auth::user())) {
+        if ($action == 'approve' && $service->approveTrade($request->only(['action', 'cooldowns']) + ['id' => $id], Auth::user())) {
             flash('Trade approved.')->success();
-        }
-        else if($action == 'reject' && $service->rejectTrade($request->only(['action', 'reason']) + ['id' => $id], Auth::user())) {
+        } elseif ($action == 'reject' && $service->rejectTrade($request->only(['action', 'reason']) + ['id' => $id], Auth::user())) {
             flash('Trade rejected.')->success();
+        } else {
+            foreach ($service->errors()->getMessages()['error'] as $error) {
+                flash($error)->error();
+            }
         }
-        else {
-            foreach($service->errors()->getMessages()['error'] as $error) flash($error)->error();
-        }
+
         return redirect()->back();
     }
 
-
     /**
      * Shows a list of all existing MYO slots.
      *
      * @return \Illuminate\Contracts\Support\Renderable
      */
-    public function getMyoIndex()
-    {
+    public function getMyoIndex() {
         return view('admin.masterlist.myo_index', [
             'slots' => Character::myo(1)->orderBy('id', 'DESC')->paginate(30),
         ]);
diff --git a/app/Http/Controllers/Admin/Characters/CharacterImageController.php b/app/Http/Controllers/Admin/Characters/CharacterImageController.php
index e70aeb9aba..2cf58c6475 100644
--- a/app/Http/Controllers/Admin/Characters/CharacterImageController.php
+++ b/app/Http/Controllers/Admin/Characters/CharacterImageController.php
@@ -2,26 +2,20 @@
 
 namespace App\Http\Controllers\Admin\Characters;
 
-use Illuminate\Http\Request;
-
-use Auth;
-
+use App\Http\Controllers\Controller;
 use App\Models\Character\Character;
 use App\Models\Character\CharacterImage;
-use App\Models\Character\CharacterCategory;
-use App\Models\Rarity;
 use App\Models\Character\CharacterTitle;
-use App\Models\User\User;
+use App\Models\Feature\Feature;
+use App\Models\Rarity;
 use App\Models\Species\Species;
 use App\Models\Species\Subtype;
-use App\Models\Feature\Feature;
-
+use App\Models\User\User;
 use App\Services\CharacterManager;
+use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Auth;
 
-use App\Http\Controllers\Controller;
-
-class CharacterImageController extends Controller
-{
+class CharacterImageController extends Controller {
     /*
     |--------------------------------------------------------------------------
     | Admin / Character Image Controller
@@ -34,129 +28,138 @@ class CharacterImageController extends Controller
     /**
      * Shows the add image page. Existing characters only, not MYO slots.
      *
-     * @param  string  $slug
+     * @param string $slug
+     *
      * @return \Illuminate\Contracts\Support\Renderable
      */
-    public function getNewImage($slug)
-    {
+    public function getNewImage($slug) {
         $this->character = Character::where('slug', $slug)->first();
-        if(!$this->character) abort(404);
+        if (!$this->character) {
+            abort(404);
+        }
 
         return view('character.admin.upload_image', [
             'character' => $this->character,
-            'rarities' => ['0' => 'Select Rarity'] + Rarity::orderBy('sort', 'DESC')->pluck('name', 'id')->toArray(),
+            'rarities'  => ['0' => 'Select Rarity'] + Rarity::orderBy('sort', 'DESC')->pluck('name', 'id')->toArray(),
             'specieses' => ['0' => 'Select Species'] + Species::orderBy('sort', 'DESC')->pluck('name', 'id')->toArray(),
-            'subtypes' => ['0' => 'Select Subtype'] + Subtype::where('species_id','=',$this->character->image->species_id)->orderBy('sort', 'DESC')->pluck('name', 'id')->toArray(),
-            'users' => User::query()->orderBy('name')->pluck('name', 'id')->toArray(),
-            'features' => Feature::orderBy('name')->pluck('name', 'id')->toArray(),
-            'isMyo' => false
+            'subtypes'  => ['0' => 'Select Subtype'] + Subtype::where('species_id', '=', $this->character->image->species_id)->orderBy('sort', 'DESC')->pluck('name', 'id')->toArray(),
+            'users'     => User::query()->orderBy('name')->pluck('name', 'id')->toArray(),
+            'features'  => Feature::getDropdownItems(1),
+            'isMyo'     => false,
         ]);
     }
 
     /**
-     * Shows the edit image subtype portion of the modal
+     * Shows the edit image subtype portion of the modal.
      *
-     * @param  Request  $request
      * @return \Illuminate\Contracts\Support\Renderable
      */
     public function getNewImageSubtype(Request $request) {
-      $species = $request->input('species');
-      $id = $request->input('id');
-      return view('character.admin._upload_image_subtype', [
-          'subtypes' => ['0' => 'Select Subtype'] + Subtype::where('species_id','=',$species)->orderBy('sort', 'DESC')->pluck('name', 'id')->toArray(),
-          'subtype' => $id
-      ]);
+        $species = $request->input('species');
+        $id = $request->input('id');
+
+        return view('character.admin._upload_image_subtype', [
+            'subtypes' => ['0' => 'Select Subtype'] + Subtype::where('species_id', '=', $species)->orderBy('sort', 'DESC')->pluck('name', 'id')->toArray(),
+            'subtype'  => $id,
+        ]);
     }
 
     /**
      * Creates a new image for a character.
      *
-     * @param  \Illuminate\Http\Request       $request
-     * @param  App\Services\CharacterManager  $service
-     * @param  string                         $slug
+     * @param App\Services\CharacterManager $service
+     * @param string                        $slug
+     *
      * @return \Illuminate\Http\RedirectResponse
      */
-    public function postNewImage(Request $request, CharacterManager $service, $slug)
-    {
+    public function postNewImage(Request $request, CharacterManager $service, $slug) {
         $request->validate(CharacterImage::$createRules);
         $data = $request->only(['image', 'thumbnail', 'x0', 'x1', 'y0', 'y1', 'use_cropper', 'artist_url', 'artist_id', 'designer_url', 'designer_id', 'species_id', 'subtype_id', 'rarity_id', 'feature_id', 'feature_data', 'is_valid', 'is_visible']);
         $this->character = Character::where('slug', $slug)->first();
-        if(!$this->character) abort(404);
-        if($service->createImage($data, $this->character, Auth::user())) {
-            flash('Image uploaded successfully.')->success();
+        if (!$this->character) {
+            abort(404);
         }
-        else {
-            foreach($service->errors()->getMessages()['error'] as $error) flash($error)->error();
+        if ($service->createImage($data, $this->character, Auth::user())) {
+            flash('Image uploaded successfully.')->success();
+        } else {
+            foreach ($service->errors()->getMessages()['error'] as $error) {
+                flash($error)->error();
+            }
+
             return redirect()->back()->withInput();
         }
+
         return redirect()->to($this->character->url.'/images');
     }
 
     /**
      * Shows the edit image features modal.
      *
-     * @param  int  $id
+     * @param int $id
+     *
      * @return \Illuminate\Contracts\Support\Renderable
      */
-    public function getEditImageFeatures($id)
-    {
-      $image = CharacterImage::find($id);
+    public function getEditImageFeatures($id) {
+        $image = CharacterImage::find($id);
 
         return view('character.admin._edit_features_modal', [
-            'image' => $image,
-            'rarities' => ['0' => 'Select Rarity'] + Rarity::orderBy('sort', 'DESC')->pluck('name', 'id')->toArray(),
-            'titles' => ['0' => 'Select Title', 'custom' => 'Custom Title'] + CharacterTitle::orderBy('sort', 'DESC')->pluck('title', 'id')->toArray(),
+            'image'     => $image,
+            'titles'    => ['custom' => 'Custom Title'] + CharacterTitle::orderBy('sort', 'DESC')->pluck('title', 'id')->toArray(),
+            'rarities'  => ['0' => 'Select Rarity'] + Rarity::orderBy('sort', 'DESC')->pluck('name', 'id')->toArray(),
             'specieses' => ['0' => 'Select Species'] + Species::orderBy('sort', 'DESC')->pluck('name', 'id')->toArray(),
-            'subtypes' => ['0' => 'Select Subtype'] + Subtype::where('species_id','=',$image->species_id)->orderBy('sort', 'DESC')->pluck('name', 'id')->toArray(),
-            'features' => Feature::orderBy('name')->pluck('name', 'id')->toArray()
+            'subtypes'  => ['0' => 'Select Subtype'] + Subtype::where('species_id', '=', $image->species_id)->orderBy('sort', 'DESC')->pluck('name', 'id')->toArray(),
+            'features'  => Feature::getDropdownItems(1),
         ]);
     }
 
     /**
      * Edits the features of an image.
      *
-     * @param  \Illuminate\Http\Request       $request
-     * @param  App\Services\CharacterManager  $service
-     * @param  int                            $id
+     * @param App\Services\CharacterManager $service
+     * @param int                           $id
+     *
      * @return \Illuminate\Http\RedirectResponse
      */
-    public function postEditImageFeatures(Request $request, CharacterManager $service, $id)
-    {
+    public function postEditImageFeatures(Request $request, CharacterManager $service, $id) {
         $data = $request->only(['species_id', 'subtype_id', 'rarity_id', 'feature_id', 'feature_data', 'title_id', 'title_data']);
         $image = CharacterImage::find($id);
-        if(!$image) abort(404);
-        if($service->updateImageFeatures($data, $image, Auth::user())) {
-            flash('Character traits edited successfully.')->success();
+        if (!$image) {
+            abort(404);
         }
-        else {
-            foreach($service->errors()->getMessages()['error'] as $error) flash($error)->error();
+        if ($service->updateImageFeatures($data, $image, Auth::user())) {
+            flash('Character traits edited successfully.')->success();
+        } else {
+            foreach ($service->errors()->getMessages()['error'] as $error) {
+                flash($error)->error();
+            }
         }
+
         return redirect()->back()->withInput();
     }
 
     /**
-     * Shows the edit image subtype portion of the modal
+     * Shows the edit image subtype portion of the modal.
      *
-     * @param  Request  $request
      * @return \Illuminate\Contracts\Support\Renderable
      */
     public function getEditImageSubtype(Request $request) {
-      $species = $request->input('species');
-      $id = $request->input('id');
-      return view('character.admin._edit_features_subtype', [
-          'image' => CharacterImage::find($id),
-          'subtypes' => ['0' => 'Select Subtype'] + Subtype::where('species_id','=',$species)->orderBy('sort', 'DESC')->pluck('name', 'id')->toArray(),
-      ]);
+        $species = $request->input('species');
+        $id = $request->input('id');
+
+        return view('character.admin._edit_features_subtype', [
+            'image'    => CharacterImage::find($id),
+            'subtypes' => ['0' => 'Select Subtype'] + Subtype::where('species_id', '=', $species)->orderBy('sort', 'DESC')->pluck('name', 'id')->toArray(),
+        ]);
     }
 
     /**
      * Shows the edit image notes modal.
      *
-     * @param  int  $id
+     * @param int $id
+     *
      * @return \Illuminate\Contracts\Support\Renderable
      */
-    public function getEditImageNotes($id)
-    {
+    public function getEditImageNotes($id) {
         return view('character.admin._edit_notes_modal', [
             'image' => CharacterImage::find($id),
         ]);
@@ -165,33 +168,36 @@ public function getEditImageNotes($id)
     /**
      * Edits the features of an image.
      *
-     * @param  \Illuminate\Http\Request       $request
-     * @param  App\Services\CharacterManager  $service
-     * @param  int                            $id
+     * @param App\Services\CharacterManager $service
+     * @param int                           $id
+     *
      * @return \Illuminate\Http\RedirectResponse
      */
-    public function postEditImageNotes(Request $request, CharacterManager $service, $id)
-    {
+    public function postEditImageNotes(Request $request, CharacterManager $service, $id) {
         $data = $request->only(['description']);
         $image = CharacterImage::find($id);
-        if(!$image) abort(404);
-        if($service->updateImageNotes($data, $image, Auth::user())) {
-            flash('Image notes edited successfully.')->success();
+        if (!$image) {
+            abort(404);
         }
-        else {
-            foreach($service->errors()->getMessages()['error'] as $error) flash($error)->error();
+        if ($service->updateImageNotes($data, $image, Auth::user())) {
+            flash('Image notes edited successfully.')->success();
+        } else {
+            foreach ($service->errors()->getMessages()['error'] as $error) {
+                flash($error)->error();
+            }
         }
+
         return redirect()->back();
     }
 
     /**
      * Shows the edit image credits modal.
      *
-     * @param  int  $id
+     * @param int $id
+     *
      * @return \Illuminate\Contracts\Support\Renderable
      */
-    public function getEditImageCredits($id)
-    {
+    public function getEditImageCredits($id) {
         return view('character.admin._edit_credits_modal', [
             'image' => CharacterImage::find($id),
             'users' => User::query()->orderBy('name')->pluck('name', 'id')->toArray(),
@@ -201,33 +207,36 @@ public function getEditImageCredits($id)
     /**
      * Edits the credits of an image.
      *
-     * @param  \Illuminate\Http\Request       $request
-     * @param  App\Services\CharacterManager  $service
-     * @param  int                            $id
+     * @param App\Services\CharacterManager $service
+     * @param int                           $id
+     *
      * @return \Illuminate\Http\RedirectResponse
      */
-    public function postEditImageCredits(Request $request, CharacterManager $service, $id)
-    {
+    public function postEditImageCredits(Request $request, CharacterManager $service, $id) {
         $data = $request->only(['artist_url', 'artist_id', 'designer_url', 'designer_id']);
         $image = CharacterImage::find($id);
-        if(!$image) abort(404);
-        if($service->updateImageCredits($data, $image, Auth::user())) {
-            flash('Image credits edited successfully.')->success();
+        if (!$image) {
+            abort(404);
         }
-        else {
-            foreach($service->errors()->getMessages()['error'] as $error) flash($error)->error();
+        if ($service->updateImageCredits($data, $image, Auth::user())) {
+            flash('Image credits edited successfully.')->success();
+        } else {
+            foreach ($service->errors()->getMessages()['error'] as $error) {
+                flash($error)->error();
+            }
         }
+
         return redirect()->back();
     }
 
     /**
      * Shows the reupload image modal.
      *
-     * @param  int  $id
+     * @param int $id
+     *
      * @return \Illuminate\Contracts\Support\Renderable
      */
-    public function getImageReupload($id)
-    {
+    public function getImageReupload($id) {
         return view('character.admin._reupload_image_modal', [
             'image' => CharacterImage::find($id),
         ]);
@@ -236,90 +245,99 @@ public function getImageReupload($id)
     /**
      * Reuploads an image.
      *
-     * @param  \Illuminate\Http\Request       $request
-     * @param  App\Services\CharacterManager  $service
-     * @param  int                            $id
+     * @param App\Services\CharacterManager $service
+     * @param int                           $id
+     *
      * @return \Illuminate\Http\RedirectResponse
      */
-    public function postImageReupload(Request $request, CharacterManager $service, $id)
-    {
+    public function postImageReupload(Request $request, CharacterManager $service, $id) {
+        $request->validate(['image' => CharacterImage::$createRules['image'], 'thumbnail' => CharacterImage::$createRules['thumbnail']]);
         $data = $request->only(['image', 'thumbnail', 'x0', 'x1', 'y0', 'y1', 'use_cropper']);
         $image = CharacterImage::find($id);
-        if(!$image) abort(404);
-        if($service->reuploadImage($data, $image, Auth::user())) {
-            flash('Image uploaded successfully.')->success();
+        if (!$image) {
+            abort(404);
         }
-        else {
-            foreach($service->errors()->getMessages()['error'] as $error) flash($error)->error();
+        if ($service->reuploadImage($data, $image, Auth::user())) {
+            flash('Image uploaded successfully.')->success();
+        } else {
+            foreach ($service->errors()->getMessages()['error'] as $error) {
+                flash($error)->error();
+            }
         }
+
         return redirect()->back();
     }
 
     /**
      * Edits an image's settings.
      *
-     * @param  \Illuminate\Http\Request       $request
-     * @param  App\Services\CharacterManager  $service
-     * @param  int                            $id
+     * @param App\Services\CharacterManager $service
+     * @param int                           $id
+     *
      * @return \Illuminate\Http\RedirectResponse
      */
-    public function postImageSettings(Request $request, CharacterManager $service, $id)
-    {
+    public function postImageSettings(Request $request, CharacterManager $service, $id) {
         $data = $request->only(['is_valid', 'is_visible']);
         $image = CharacterImage::find($id);
-        if(!$image) abort(404);
-        if($service->updateImageSettings($data, $image, Auth::user())) {
-            flash('Image settings edited successfully.')->success();
+        if (!$image) {
+            abort(404);
         }
-        else {
-            foreach($service->errors()->getMessages()['error'] as $error) flash($error)->error();
+        if ($service->updateImageSettings($data, $image, Auth::user())) {
+            flash('Image settings edited successfully.')->success();
+        } else {
+            foreach ($service->errors()->getMessages()['error'] as $error) {
+                flash($error)->error();
+            }
         }
+
         return redirect()->back();
     }
 
     /**
      * Shows the set active image modal.
      *
-     * @param  int  $id
+     * @param int $id
+     *
      * @return \Illuminate\Contracts\Support\Renderable
      */
-    public function getImageActive($id)
-    {
+    public function getImageActive($id) {
         return view('character.admin._active_image_modal', [
             'image' => CharacterImage::find($id),
         ]);
     }
 
-
     /**
      * Sets an image to be the character's active image.
      *
-     * @param  \Illuminate\Http\Request       $request
-     * @param  App\Services\CharacterManager  $service
-     * @param  int                            $id
+     * @param App\Services\CharacterManager $service
+     * @param int                           $id
+     *
      * @return \Illuminate\Http\RedirectResponse
      */
-    public function postImageActive(Request $request, CharacterManager $service, $id)
-    {
+    public function postImageActive(Request $request, CharacterManager $service, $id) {
         $image = CharacterImage::find($id);
-        if(!$image) abort(404);
-        if($service->updateActiveImage($image, Auth::user())) {
-            flash('Active character image set successfully.')->success();
+        if (!$image) {
+            abort(404);
         }
-        else {
-            foreach($service->errors()->getMessages()['error'] as $error) flash($error)->error();
+        if ($service->updateActiveImage($image, Auth::user())) {
+            flash('Active character image set successfully.')->success();
+        } else {
+            foreach ($service->errors()->getMessages()['error'] as $error) {
+                flash($error)->error();
+            }
         }
+
         return redirect()->back();
     }
 
     /**
      * Shows the delete image modal.
      *
-     * @param  int  $id
+     * @param int $id
+     *
      * @return \Illuminate\Contracts\Support\Renderable
      */
-    public function getImageDelete($id)
-    {
+    public function getImageDelete($id) {
         return view('character.admin._delete_image_modal', [
             'image' => CharacterImage::find($id),
         ]);
@@ -328,44 +346,51 @@ public function getImageDelete($id)
     /**
      * Deletes an image.
      *
-     * @param  \Illuminate\Http\Request       $request
-     * @param  App\Services\CharacterManager  $service
-     * @param  int                            $id
+     * @param App\Services\CharacterManager $service
+     * @param int                           $id
+     *
      * @return \Illuminate\Http\RedirectResponse
      */
-    public function postImageDelete(Request $request, CharacterManager $service, $id)
-    {
+    public function postImageDelete(Request $request, CharacterManager $service, $id) {
         $image = CharacterImage::find($id);
-        if(!$image) abort(404);
-        if($service->deleteImage($image, Auth::user())) {
-            flash('Character image deleted successfully.')->success();
+        if (!$image) {
+            abort(404);
         }
-        else {
-            foreach($service->errors()->getMessages()['error'] as $error) flash($error)->error();
+        if ($service->deleteImage($image, Auth::user())) {
+            flash('Character image deleted successfully.')->success();
+        } else {
+            foreach ($service->errors()->getMessages()['error'] as $error) {
+                flash($error)->error();
+            }
         }
+
         return redirect()->back();
     }
 
     /**
      * Sorts a character's images.
      *
-     * @param  \Illuminate\Http\Request       $request
-     * @param  App\Services\CharacterManager  $service
-     * @param  string                         $slug
+     * @param App\Services\CharacterManager $service
+     * @param string                        $slug
+     *
      * @return \Illuminate\Http\RedirectResponse
      */
-    public function postSortImages(Request $request, CharacterManager $service, $slug)
-    {
+    public function postSortImages(Request $request, CharacterManager $service, $slug) {
         $this->character = Character::where('slug', $slug)->first();
-        if(!$this->character) abort(404);
+        if (!$this->character) {
+            abort(404);
+        }
 
         if ($service->sortImages($request->only(['sort']), $this->character, Auth::user())) {
             flash('Images sorted successfully.')->success();
+
             return redirect()->back();
+        } else {
+            foreach ($service->errors()->getMessages()['error'] as $error) {
+                flash($error)->error();
+            }
         }
-        else {
-            foreach($service->errors()->getMessages()['error'] as $error) flash($error)->error();
-        }
+
         return redirect()->back();
     }
 }
diff --git a/app/Http/Controllers/Admin/Characters/GrantController.php b/app/Http/Controllers/Admin/Characters/GrantController.php
index a084da98c1..58c0afc09b 100644
--- a/app/Http/Controllers/Admin/Characters/GrantController.php
+++ b/app/Http/Controllers/Admin/Characters/GrantController.php
@@ -2,58 +2,54 @@
 
 namespace App\Http\Controllers\Admin\Characters;
 
-use Auth;
-use Config;
-use Illuminate\Http\Request;
-
+use App\Http\Controllers\Controller;
 use App\Models\Character\Character;
 use App\Models\Currency\Currency;
-use App\Models\Item\Item;
-
 use App\Services\CurrencyManager;
 use App\Services\InventoryManager;
+use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Auth;
 
-use App\Http\Controllers\Controller;
-
-class GrantController extends Controller
-{
+class GrantController extends Controller {
     /**
      * Grants or removes currency from a character.
      *
-     * @param  string                        $slug
-     * @param  \Illuminate\Http\Request      $request
-     * @param  App\Services\CurrencyManager  $service
+     * @param string                       $slug
+     * @param App\Services\CurrencyManager $service
+     *
      * @return \Illuminate\Http\RedirectResponse
      */
-    public function postCharacterCurrency($slug, Request $request, CurrencyManager $service)
-    {
+    public function postCharacterCurrency($slug, Request $request, CurrencyManager $service) {
         $data = $request->only(['currency_id', 'quantity', 'data']);
-        if($service->grantCharacterCurrencies($data, Character::where('slug', $slug)->first(), Auth::user())) {
+        if ($service->grantCharacterCurrencies($data, Character::where('slug', $slug)->first(), Auth::user())) {
             flash('Currency granted successfully.')->success();
+        } else {
+            foreach ($service->errors()->getMessages()['error'] as $error) {
+                flash($error)->error();
+            }
         }
-        else {
-            foreach($service->errors()->getMessages()['error'] as $error) flash($error)->error();
-        }
+
         return redirect()->back();
     }
 
     /**
      * Grants items to characters.
      *
-     * @param  string                          $slug
-     * @param  \Illuminate\Http\Request        $request
-     * @param  App\Services\InventoryManager   $service
+     * @param string                        $slug
+     * @param App\Services\InventoryManager $service
+     *
      * @return \Illuminate\Http\RedirectResponse
      */
-    public function postCharacterItems($slug, Request $request, InventoryManager $service)
-    {
+    public function postCharacterItems($slug, Request $request, InventoryManager $service) {
         $data = $request->only(['item_ids', 'quantities', 'data', 'disallow_transfer', 'notes']);
-        if($service->grantCharacterItems($data,  Character::where('slug', $slug)->first(), Auth::user())) {
+        if ($service->grantCharacterItems($data, Character::where('slug', $slug)->first(), Auth::user())) {
             flash('Items granted successfully.')->success();
+        } else {
+            foreach ($service->errors()->getMessages()['error'] as $error) {
+                flash($error)->error();
+            }
         }
-        else {
-            foreach($service->errors()->getMessages()['error'] as $error) flash($error)->error();
-        }
+
         return redirect()->back();
     }
 }
diff --git a/app/Http/Controllers/Admin/Data/CharacterCategoryController.php b/app/Http/Controllers/Admin/Data/CharacterCategoryController.php
index 096238e7ac..7ffccea2b7 100644
--- a/app/Http/Controllers/Admin/Data/CharacterCategoryController.php
+++ b/app/Http/Controllers/Admin/Data/CharacterCategoryController.php
@@ -2,17 +2,14 @@
 
 namespace App\Http\Controllers\Admin\Data;
 
-use Illuminate\Http\Request;
-
+use App\Http\Controllers\Controller;
 use App\Models\Character\CharacterCategory;
 use App\Models\Character\Sublist;
-
 use App\Services\CharacterCategoryService;
+use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Auth;
 
-use App\Http\Controllers\Controller;
-
-class CharacterCategoryController extends Controller
-{
+class CharacterCategoryController extends Controller {
     /*
     |--------------------------------------------------------------------------
     | Admin / Character Category Controller
@@ -27,78 +24,81 @@ class CharacterCategoryController extends Controller
      *
      * @return \Illuminate\Contracts\Support\Renderable
      */
-    public function getIndex()
-    {
+    public function getIndex() {
         return view('admin.characters.character_categories', [
-            'categories' => CharacterCategory::orderBy('sort', 'DESC')->get()
+            'categories' => CharacterCategory::orderBy('sort', 'DESC')->get(),
         ]);
     }
-    
+
     /**
      * Shows the create character category page.
      *
      * @return \Illuminate\Contracts\Support\Renderable
      */
-    public function getCreateCharacterCategory()
-    {
+    public function getCreateCharacterCategory() {
         return view('admin.characters.create_edit_character_category', [
             'category' => new CharacterCategory,
-            'sublists' => [0 => 'No Sublist'] + Sublist::orderBy('name', 'DESC')->pluck('name', 'id')->toArray()
+            'sublists' => [0 => 'No Sublist'] + Sublist::orderBy('name', 'DESC')->pluck('name', 'id')->toArray(),
         ]);
     }
-    
+
     /**
      * Shows the edit character category page.
      *
-     * @param  int  $id
+     * @param int $id
+     *
      * @return \Illuminate\Contracts\Support\Renderable
      */
-    public function getEditCharacterCategory($id)
-    {
+    public function getEditCharacterCategory($id) {
         $category = CharacterCategory::find($id);
-        if(!$category) abort(404);
+        if (!$category) {
+            abort(404);
+        }
+
         return view('admin.characters.create_edit_character_category', [
             'category' => $category,
-            'sublists' => [0 => 'No Sublist'] + Sublist::orderBy('name', 'DESC')->pluck('name', 'id')->toArray()
+            'sublists' => [0 => 'No Sublist'] + Sublist::orderBy('name', 'DESC')->pluck('name', 'id')->toArray(),
         ]);
     }
 
     /**
      * Creates or edits a character category.
      *
-     * @param  \Illuminate\Http\Request               $request
-     * @param  App\Services\CharacterCategoryService  $service
-     * @param  int|null                               $id
+     * @param App\Services\CharacterCategoryService $service
+     * @param int|null                              $id
+     *
      * @return \Illuminate\Http\RedirectResponse
      */
-    public function postCreateEditCharacterCategory(Request $request, CharacterCategoryService $service, $id = null)
-    {
+    public function postCreateEditCharacterCategory(Request $request, CharacterCategoryService $service, $id = null) {
         $id ? $request->validate(CharacterCategory::$updateRules) : $request->validate(CharacterCategory::$createRules);
         $data = $request->only([
-            'code', 'name', 'description', 'image', 'remove_image', 'masterlist_sub_id'
+            'code', 'name', 'description', 'image', 'remove_image', 'masterlist_sub_id', 'is_visible',
         ]);
-        if($id && $service->updateCharacterCategory(CharacterCategory::find($id), $data)) {
+        if ($id && $service->updateCharacterCategory(CharacterCategory::find($id), $data, Auth::user())) {
             flash('Category updated successfully.')->success();
-        }
-        else if (!$id && $category = $service->createCharacterCategory($data)) {
+        } elseif (!$id && $category = $service->createCharacterCategory($data, Auth::user())) {
             flash('Category created successfully.')->success();
+
             return redirect()->to('admin/data/character-categories/edit/'.$category->id);
+        } else {
+            foreach ($service->errors()->getMessages()['error'] as $error) {
+                flash($error)->error();
+            }
         }
-        else {
-            foreach($service->errors()->getMessages()['error'] as $error) flash($error)->error();
-        }
+
         return redirect()->back();
     }
-    
+
     /**
      * Gets the character category deletion modal.
      *
-     * @param  int  $id
+     * @param int $id
+     *
      * @return \Illuminate\Contracts\Support\Renderable
      */
-    public function getDeleteCharacterCategory($id)
-    {
+    public function getDeleteCharacterCategory($id) {
         $category = CharacterCategory::find($id);
+
         return view('admin.characters._delete_character_category', [
             'category' => $category,
         ]);
@@ -107,37 +107,39 @@ public function getDeleteCharacterCategory($id)
     /**
      * Deletes a character category.
      *
-     * @param  \Illuminate\Http\Request               $request
-     * @param  App\Services\CharacterCategoryService  $service
-     * @param  int                                    $id
+     * @param App\Services\CharacterCategoryService $service
+     * @param int                                   $id
+     *
      * @return \Illuminate\Http\RedirectResponse
      */
-    public function postDeleteCharacterCategory(Request $request, CharacterCategoryService $service, $id)
-    {
-        if($id && $service->deleteCharacterCategory(CharacterCategory::find($id))) {
+    public function postDeleteCharacterCategory(Request $request, CharacterCategoryService $service, $id) {
+        if ($id && $service->deleteCharacterCategory(CharacterCategory::find($id), Auth::user())) {
             flash('Category deleted successfully.')->success();
+        } else {
+            foreach ($service->errors()->getMessages()['error'] as $error) {
+                flash($error)->error();
+            }
         }
-        else {
-            foreach($service->errors()->getMessages()['error'] as $error) flash($error)->error();
-        }
+
         return redirect()->to('admin/data/character-categories');
     }
 
     /**
      * Sorts character categories.
      *
-     * @param  \Illuminate\Http\Request               $request
-     * @param  App\Services\CharacterCategoryService  $service
+     * @param App\Services\CharacterCategoryService $service
+     *
      * @return \Illuminate\Http\RedirectResponse
      */
-    public function postSortCharacterCategory(Request $request, CharacterCategoryService $service)
-    {
-        if($service->sortCharacterCategory($request->get('sort'))) {
+    public function postSortCharacterCategory(Request $request, CharacterCategoryService $service) {
+        if ($service->sortCharacterCategory($request->get('sort'))) {
             flash('Category order updated successfully.')->success();
+        } else {
+            foreach ($service->errors()->getMessages()['error'] as $error) {
+                flash($error)->error();
+            }
         }
-        else {
-            foreach($service->errors()->getMessages()['error'] as $error) flash($error)->error();
-        }
+
         return redirect()->back();
     }
 }
diff --git a/app/Http/Controllers/Admin/Data/CurrencyController.php b/app/Http/Controllers/Admin/Data/CurrencyController.php
index de042d2cb7..518366f50c 100644
--- a/app/Http/Controllers/Admin/Data/CurrencyController.php
+++ b/app/Http/Controllers/Admin/Data/CurrencyController.php
@@ -2,18 +2,13 @@
 
 namespace App\Http\Controllers\Admin\Data;
 
-use Illuminate\Http\Request;
-
-use Auth;
-
+use App\Http\Controllers\Controller;
 use App\Models\Currency\Currency;
-
 use App\Services\CurrencyService;
+use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Auth;
 
-use App\Http\Controllers\Controller;
-
-class CurrencyController extends Controller
-{
+class CurrencyController extends Controller {
     /*
     |--------------------------------------------------------------------------
     | Admin / Currency Controller
@@ -28,79 +23,82 @@ class CurrencyController extends Controller
      *
      * @return \Illuminate\Contracts\Support\Renderable
      */
-    public function getIndex()
-    {
+    public function getIndex() {
         return view('admin.currencies.currencies', [
-            'currencies' => Currency::paginate(30)
+            'currencies' => Currency::paginate(30),
         ]);
     }
-    
+
     /**
      * Shows the create currency page.
      *
      * @return \Illuminate\Contracts\Support\Renderable
      */
-    public function getCreateCurrency()
-    {
+    public function getCreateCurrency() {
         return view('admin.currencies.create_edit_currency', [
-            'currency' => new Currency
+            'currency' => new Currency,
         ]);
     }
-    
+
     /**
      * Shows the edit currency page.
      *
-     * @param  int  $id
+     * @param int $id
+     *
      * @return \Illuminate\Contracts\Support\Renderable
      */
-    public function getEditCurrency($id)
-    {
+    public function getEditCurrency($id) {
         $currency = Currency::find($id);
-        if(!$currency) abort(404);
+        if (!$currency) {
+            abort(404);
+        }
+
         return view('admin.currencies.create_edit_currency', [
-            'currency' => $currency
+            'currency' => $currency,
         ]);
     }
 
     /**
      * Creates or edits a currency.
      *
-     * @param  \Illuminate\Http\Request               $request
-     * @param  App\Services\CharacterCategoryService  $service
-     * @param  int|null                               $id
+     * @param App\Services\CharacterCategoryService $service
+     * @param int|null                              $id
+     *
      * @return \Illuminate\Http\RedirectResponse
      */
-    public function postCreateEditCurrency(Request $request, CurrencyService $service, $id = null)
-    {
+    public function postCreateEditCurrency(Request $request, CurrencyService $service, $id = null) {
         $id ? $request->validate(Currency::$updateRules) : $request->validate(Currency::$createRules);
         $data = $request->only([
-            'is_user_owned', 'is_character_owned', 
+            'is_user_owned', 'is_character_owned',
             'name', 'abbreviation', 'description',
             'is_displayed', 'allow_user_to_user', 'allow_user_to_character', 'allow_character_to_user',
-            'icon', 'image', 'remove_icon', 'remove_image'
+            'icon', 'image', 'remove_icon', 'remove_image',
         ]);
-        if($id && $service->updateCurrency(Currency::find($id), $data, Auth::user())) {
+        if ($id && $service->updateCurrency(Currency::find($id), $data, Auth::user())) {
             flash('Currency updated successfully.')->success();
-        }
-        else if (!$id && $currency = $service->createCurrency($data, Auth::user())) {
+        } elseif (!$id && $currency = $service->createCurrency($data, Auth::user())) {
             flash('Currency created successfully.')->success();
+
             return redirect()->to('admin/data/currencies/edit/'.$currency->id);
+        } else {
+            foreach ($service->errors()->getMessages()['error'] as $error) {
+                flash($error)->error();
+            }
         }
-        else {
-            foreach($service->errors()->getMessages()['error'] as $error) flash($error)->error();
-        }
+
         return redirect()->back();
     }
-    
+
     /**
      * Gets the currency deletion modal.
      *
-     * @param  int  $id
+     * @param int $id
+     *
      * @return \Illuminate\Contracts\Support\Renderable
      */
-    public function getDeleteCurrency($id)
-    {
+    public function getDeleteCurrency($id) {
         $currency = Currency::find($id);
+
         return view('admin.currencies._delete_currency', [
             'currency' => $currency,
         ]);
@@ -109,19 +107,20 @@ public function getDeleteCurrency($id)
     /**
      * Deletes a currency.
      *
-     * @param  \Illuminate\Http\Request               $request
-     * @param  App\Services\CharacterCategoryService  $service
-     * @param  int                                    $id
+     * @param App\Services\CharacterCategoryService $service
+     * @param int                                   $id
+     *
      * @return \Illuminate\Http\RedirectResponse
      */
-    public function postDeleteCurrency(Request $request, CurrencyService $service, $id)
-    {
-        if($id && $service->deleteCurrency(Currency::find($id))) {
+    public function postDeleteCurrency(Request $request, CurrencyService $service, $id) {
+        if ($id && $service->deleteCurrency(Currency::find($id), Auth::user())) {
             flash('Currency deleted successfully.')->success();
+        } else {
+            foreach ($service->errors()->getMessages()['error'] as $error) {
+                flash($error)->error();
+            }
         }
-        else {
-            foreach($service->errors()->getMessages()['error'] as $error) flash($error)->error();
-        }
+
         return redirect()->to('admin/data/currencies');
     }
 
@@ -130,30 +129,30 @@ public function postDeleteCurrency(Request $request, CurrencyService $service, $
      *
      * @return \Illuminate\Contracts\Support\Renderable
      */
-    public function getSort()
-    {
+    public function getSort() {
         return view('admin.currencies.sort', [
-            'userCurrencies' => Currency::where('is_user_owned', 1)->orderBy('sort_user', 'DESC')->get(),
-            'characterCurrencies' => Currency::where('is_character_owned', 1)->orderBy('sort_character', 'DESC')->get()
+            'userCurrencies'      => Currency::where('is_user_owned', 1)->orderBy('sort_user', 'DESC')->get(),
+            'characterCurrencies' => Currency::where('is_character_owned', 1)->orderBy('sort_character', 'DESC')->get(),
         ]);
     }
 
     /**
      * Sorts currencies.
      *
-     * @param  \Illuminate\Http\Request               $request
-     * @param  App\Services\CharacterCategoryService  $service
-     * @param  string                                 $type
+     * @param App\Services\CharacterCategoryService $service
+     * @param string                                $type
+     *
      * @return \Illuminate\Http\RedirectResponse
      */
-    public function postSortCurrency(Request $request, CurrencyService $service, $type)
-    {
-        if($service->sortCurrency($request->get('sort'), $type)) {
+    public function postSortCurrency(Request $request, CurrencyService $service, $type) {
+        if ($service->sortCurrency($request->get('sort'), $type)) {
             flash('Currency order updated successfully.')->success();
+        } else {
+            foreach ($service->errors()->getMessages()['error'] as $error) {
+                flash($error)->error();
+            }
         }
-        else {
-            foreach($service->errors()->getMessages()['error'] as $error) flash($error)->error();
-        }
+
         return redirect()->back();
     }
 }
diff --git a/app/Http/Controllers/Admin/Data/FeatureController.php b/app/Http/Controllers/Admin/Data/FeatureController.php
index eacd21a6d4..8c720ff6e6 100644
--- a/app/Http/Controllers/Admin/Data/FeatureController.php
+++ b/app/Http/Controllers/Admin/Data/FeatureController.php
@@ -2,34 +2,29 @@
 
 namespace App\Http\Controllers\Admin\Data;
 
-use Illuminate\Http\Request;
-
-use Auth;
-
-use App\Models\Feature\FeatureCategory;
+use App\Http\Controllers\Controller;
 use App\Models\Feature\Feature;
+use App\Models\Feature\FeatureCategory;
 use App\Models\Rarity;
 use App\Models\Species\Species;
 use App\Models\Species\Subtype;
-
 use App\Services\FeatureService;
+use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Auth;
 
-use App\Http\Controllers\Controller;
-
-class FeatureController extends Controller
-{
+class FeatureController extends Controller {
     /*
     |--------------------------------------------------------------------------
     | Admin / Feature Controller
     |--------------------------------------------------------------------------
     |
-    | Handles creation/editing of character feature categories and features 
+    | Handles creation/editing of character feature categories and features
     | (AKA traits, which is a reserved keyword in PHP and thus can't be used).
     |
     */
 
     /**********************************************************************************************
-    
+
         FEATURE CATEGORIES
 
     **********************************************************************************************/
@@ -39,76 +34,79 @@ class FeatureController extends Controller
      *
      * @return \Illuminate\Contracts\Support\Renderable
      */
-    public function getIndex()
-    {
+    public function getIndex() {
         return view('admin.features.feature_categories', [
-            'categories' => FeatureCategory::orderBy('sort', 'DESC')->get()
+            'categories' => FeatureCategory::orderBy('sort', 'DESC')->get(),
         ]);
     }
-    
+
     /**
      * Shows the create feature category page.
      *
      * @return \Illuminate\Contracts\Support\Renderable
      */
-    public function getCreateFeatureCategory()
-    {
+    public function getCreateFeatureCategory() {
         return view('admin.features.create_edit_feature_category', [
-            'category' => new FeatureCategory
+            'category' => new FeatureCategory,
         ]);
     }
-    
+
     /**
      * Shows the edit feature category page.
      *
-     * @param  int  $id
+     * @param int $id
+     *
      * @return \Illuminate\Contracts\Support\Renderable
      */
-    public function getEditFeatureCategory($id)
-    {
+    public function getEditFeatureCategory($id) {
         $category = FeatureCategory::find($id);
-        if(!$category) abort(404);
+        if (!$category) {
+            abort(404);
+        }
+
         return view('admin.features.create_edit_feature_category', [
-            'category' => $category
+            'category' => $category,
         ]);
     }
 
     /**
      * Creates or edits a feature category.
      *
-     * @param  \Illuminate\Http\Request     $request
-     * @param  App\Services\FeatureService  $service
-     * @param  int|null                     $id
+     * @param App\Services\FeatureService $service
+     * @param int|null                    $id
+     *
      * @return \Illuminate\Http\RedirectResponse
      */
-    public function postCreateEditFeatureCategory(Request $request, FeatureService $service, $id = null)
-    {
+    public function postCreateEditFeatureCategory(Request $request, FeatureService $service, $id = null) {
         $id ? $request->validate(FeatureCategory::$updateRules) : $request->validate(FeatureCategory::$createRules);
         $data = $request->only([
-            'name', 'description', 'image', 'remove_image'
+            'name', 'description', 'image', 'remove_image', 'is_visible',
         ]);
-        if($id && $service->updateFeatureCategory(FeatureCategory::find($id), $data, Auth::user())) {
+        if ($id && $service->updateFeatureCategory(FeatureCategory::find($id), $data, Auth::user())) {
             flash('Category updated successfully.')->success();
-        }
-        else if (!$id && $category = $service->createFeatureCategory($data, Auth::user())) {
+        } elseif (!$id && $category = $service->createFeatureCategory($data, Auth::user())) {
             flash('Category created successfully.')->success();
+
             return redirect()->to('admin/data/trait-categories/edit/'.$category->id);
+        } else {
+            foreach ($service->errors()->getMessages()['error'] as $error) {
+                flash($error)->error();
+            }
         }
-        else {
-            foreach($service->errors()->getMessages()['error'] as $error) flash($error)->error();
-        }
+
         return redirect()->back();
     }
-    
+
     /**
      * Gets the feature category deletion modal.
      *
-     * @param  int  $id
+     * @param int $id
+     *
      * @return \Illuminate\Contracts\Support\Renderable
      */
-    public function getDeleteFeatureCategory($id)
-    {
+    public function getDeleteFeatureCategory($id) {
         $category = FeatureCategory::find($id);
+
         return view('admin.features._delete_feature_category', [
             'category' => $category,
         ]);
@@ -117,42 +115,44 @@ public function getDeleteFeatureCategory($id)
     /**
      * Creates or edits a feature category.
      *
-     * @param  \Illuminate\Http\Request     $request
-     * @param  App\Services\FeatureService  $service
-     * @param  int|null                     $id
+     * @param App\Services\FeatureService $service
+     * @param int|null                    $id
+     *
      * @return \Illuminate\Http\RedirectResponse
      */
-    public function postDeleteFeatureCategory(Request $request, FeatureService $service, $id)
-    {
-        if($id && $service->deleteFeatureCategory(FeatureCategory::find($id))) {
+    public function postDeleteFeatureCategory(Request $request, FeatureService $service, $id) {
+        if ($id && $service->deleteFeatureCategory(FeatureCategory::find($id), Auth::user())) {
             flash('Category deleted successfully.')->success();
+        } else {
+            foreach ($service->errors()->getMessages()['error'] as $error) {
+                flash($error)->error();
+            }
         }
-        else {
-            foreach($service->errors()->getMessages()['error'] as $error) flash($error)->error();
-        }
+
         return redirect()->to('admin/data/trait-categories');
     }
 
     /**
      * Sorts feature categories.
      *
-     * @param  \Illuminate\Http\Request     $request
-     * @param  App\Services\FeatureService  $service
+     * @param App\Services\FeatureService $service
+     *
      * @return \Illuminate\Http\RedirectResponse
      */
-    public function postSortFeatureCategory(Request $request, FeatureService $service)
-    {
-        if($service->sortFeatureCategory($request->get('sort'))) {
+    public function postSortFeatureCategory(Request $request, FeatureService $service) {
+        if ($service->sortFeatureCategory($request->get('sort'))) {
             flash('Category order updated successfully.')->success();
+        } else {
+            foreach ($service->errors()->getMessages()['error'] as $error) {
+                flash($error)->error();
+            }
         }
-        else {
-            foreach($service->errors()->getMessages()['error'] as $error) flash($error)->error();
-        }
+
         return redirect()->back();
     }
 
     /**********************************************************************************************
-    
+
         FEATURES
 
     **********************************************************************************************/
@@ -160,125 +160,148 @@ public function postSortFeatureCategory(Request $request, FeatureService $servic
     /**
      * Shows the feature index.
      *
-     * @param  \Illuminate\Http\Request  $request
      * @return \Illuminate\Contracts\Support\Renderable
      */
-    public function getFeatureIndex(Request $request)
-    {
+    public function getFeatureIndex(Request $request) {
         $query = Feature::query();
-        $data = $request->only(['rarity_id', 'feature_category_id', 'species_id', 'name']);
-        if(isset($data['rarity_id']) && $data['rarity_id'] != 'none') 
+        $data = $request->only(['rarity_id', 'feature_category_id', 'species_id', 'subtype_id', 'name']);
+        if (isset($data['rarity_id']) && $data['rarity_id'] != 'none') {
             $query->where('rarity_id', $data['rarity_id']);
-        if(isset($data['feature_category_id']) && $data['feature_category_id'] != 'none') 
+        }
+        if (isset($data['feature_category_id']) && $data['feature_category_id'] != 'none') {
             $query->where('feature_category_id', $data['feature_category_id']);
-        if(isset($data['species_id']) && $data['species_id'] != 'none') 
+        }
+        if (isset($data['species_id']) && $data['species_id'] != 'none') {
             $query->where('species_id', $data['species_id']);
-        if(isset($data['subtype_id']) && $data['subtype_id'] != 'none') 
+        }
+        if (isset($data['subtype_id']) && $data['subtype_id'] != 'none') {
             $query->where('subtype_id', $data['subtype_id']);
-        if(isset($data['name'])) 
+        }
+        if (isset($data['name'])) {
             $query->where('name', 'LIKE', '%'.$data['name'].'%');
+        }
+
         return view('admin.features.features', [
-            'features' => $query->paginate(20)->appends($request->query()),
-            'rarities' => ['none' => 'Any Rarity'] + Rarity::orderBy('sort', 'DESC')->pluck('name', 'id')->toArray(),
-            'specieses' => ['none' => 'Any Species'] + Species::orderBy('sort', 'DESC')->pluck('name', 'id')->toArray(),
-            'subtypes' => ['none' => 'Any Subtype'] + Subtype::orderBy('sort', 'DESC')->pluck('name', 'id')->toArray(),
-            'categories' => ['none' => 'Any Category'] + FeatureCategory::orderBy('sort', 'DESC')->pluck('name', 'id')->toArray()
+            'features'   => $query->paginate(20)->appends($request->query()),
+            'rarities'   => ['none' => 'Any Rarity'] + Rarity::orderBy('sort', 'DESC')->pluck('name', 'id')->toArray(),
+            'specieses'  => ['none' => 'Any Species'] + Species::orderBy('sort', 'DESC')->pluck('name', 'id')->toArray(),
+            'subtypes'   => ['none' => 'Any Subtype'] + Subtype::orderBy('sort', 'DESC')->pluck('name', 'id')->toArray(),
+            'categories' => ['none' => 'Any Category'] + FeatureCategory::orderBy('sort', 'DESC')->pluck('name', 'id')->toArray(),
         ]);
     }
-    
+
     /**
      * Shows the create feature page.
      *
      * @return \Illuminate\Contracts\Support\Renderable
      */
-    public function getCreateFeature()
-    {
+    public function getCreateFeature() {
         return view('admin.features.create_edit_feature', [
-            'feature' => new Feature,
-            'rarities' => ['none' => 'Select a Rarity'] + Rarity::orderBy('sort', 'DESC')->pluck('name', 'id')->toArray(),
-            'specieses' => ['none' => 'No restriction'] + Species::orderBy('sort', 'DESC')->pluck('name', 'id')->toArray(),
-            'subtypes' => ['none' => 'No subtype'] + Subtype::orderBy('sort', 'DESC')->pluck('name', 'id')->toArray(),
-            'categories' => ['none' => 'No category'] + FeatureCategory::orderBy('sort', 'DESC')->pluck('name', 'id')->toArray()
+            'feature'    => new Feature,
+            'rarities'   => ['none' => 'Select a Rarity'] + Rarity::orderBy('sort', 'DESC')->pluck('name', 'id')->toArray(),
+            'specieses'  => ['none' => 'No restriction'] + Species::orderBy('sort', 'DESC')->pluck('name', 'id')->toArray(),
+            'subtypes'   => ['none' => 'No subtype'] + Subtype::orderBy('sort', 'DESC')->pluck('name', 'id')->toArray(),
+            'categories' => ['none' => 'No category'] + FeatureCategory::orderBy('sort', 'DESC')->pluck('name', 'id')->toArray(),
         ]);
     }
-    
+
     /**
      * Shows the edit feature page.
      *
-     * @param  int  $id
+     * @param int $id
+     *
      * @return \Illuminate\Contracts\Support\Renderable
      */
-    public function getEditFeature($id)
-    {
+    public function getEditFeature($id) {
         $feature = Feature::find($id);
-        if(!$feature) abort(404);
+        if (!$feature) {
+            abort(404);
+        }
+
         return view('admin.features.create_edit_feature', [
-            'feature' => $feature,
-            'rarities' => ['none' => 'Select a Rarity'] + Rarity::orderBy('sort', 'DESC')->pluck('name', 'id')->toArray(),
-            'specieses' => ['none' => 'No restriction'] + Species::orderBy('sort', 'DESC')->pluck('name', 'id')->toArray(),
-            'subtypes' => ['none' => 'No subtype'] + Subtype::orderBy('sort', 'DESC')->pluck('name', 'id')->toArray(),
-            'categories' => ['none' => 'No category'] + FeatureCategory::orderBy('sort', 'DESC')->pluck('name', 'id')->toArray()
+            'feature'    => $feature,
+            'rarities'   => ['none' => 'Select a Rarity'] + Rarity::orderBy('sort', 'DESC')->pluck('name', 'id')->toArray(),
+            'specieses'  => ['none' => 'No restriction'] + Species::orderBy('sort', 'DESC')->pluck('name', 'id')->toArray(),
+            'subtypes'   => ['none' => 'No subtype'] + Subtype::orderBy('sort', 'DESC')->pluck('name', 'id')->toArray(),
+            'categories' => ['none' => 'No category'] + FeatureCategory::orderBy('sort', 'DESC')->pluck('name', 'id')->toArray(),
         ]);
     }
 
     /**
      * Creates or edits a feature.
      *
-     * @param  \Illuminate\Http\Request     $request
-     * @param  App\Services\FeatureService  $service
-     * @param  int|null                     $id
+     * @param App\Services\FeatureService $service
+     * @param int|null                    $id
+     *
      * @return \Illuminate\Http\RedirectResponse
      */
-    public function postCreateEditFeature(Request $request, FeatureService $service, $id = null)
-    {
+    public function postCreateEditFeature(Request $request, FeatureService $service, $id = null) {
         $id ? $request->validate(Feature::$updateRules) : $request->validate(Feature::$createRules);
         $data = $request->only([
-            'name', 'species_id', 'subtype_id', 'rarity_id', 'feature_category_id', 'description', 'image', 'remove_image'
+            'name', 'species_id', 'subtype_id', 'rarity_id', 'feature_category_id', 'description', 'image', 'remove_image', 'is_visible',
         ]);
-        if($id && $service->updateFeature(Feature::find($id), $data, Auth::user())) {
+        if ($id && $service->updateFeature(Feature::find($id), $data, Auth::user())) {
             flash('Trait updated successfully.')->success();
-        }
-        else if (!$id && $feature = $service->createFeature($data, Auth::user())) {
+        } elseif (!$id && $feature = $service->createFeature($data, Auth::user())) {
             flash('Trait created successfully.')->success();
+
             return redirect()->to('admin/data/traits/edit/'.$feature->id);
+        } else {
+            foreach ($service->errors()->getMessages()['error'] as $error) {
+                flash($error)->error();
+            }
         }
-        else {
-            foreach($service->errors()->getMessages()['error'] as $error) flash($error)->error();
-        }
+
         return redirect()->back();
     }
-    
+
     /**
      * Gets the feature deletion modal.
      *
-     * @param  int  $id
+     * @param int $id
+     *
      * @return \Illuminate\Contracts\Support\Renderable
      */
-    public function getDeleteFeature($id)
-    {
+    public function getDeleteFeature($id) {
         $feature = Feature::find($id);
+
         return view('admin.features._delete_feature', [
             'feature' => $feature,
         ]);
     }
 
-
     /**
      * Deletes a feature.
      *
-     * @param  \Illuminate\Http\Request     $request
-     * @param  App\Services\FeatureService  $service
-     * @param  int                          $id
+     * @param App\Services\FeatureService $service
+     * @param int                         $id
+     *
      * @return \Illuminate\Http\RedirectResponse
      */
-    public function postDeleteFeature(Request $request, FeatureService $service, $id)
-    {
-        if($id && $service->deleteFeature(Feature::find($id))) {
+    public function postDeleteFeature(Request $request, FeatureService $service, $id) {
+        if ($id && $service->deleteFeature(Feature::find($id), Auth::user())) {
             flash('Trait deleted successfully.')->success();
+        } else {
+            foreach ($service->errors()->getMessages()['error'] as $error) {
+                flash($error)->error();
+            }
         }
-        else {
-            foreach($service->errors()->getMessages()['error'] as $error) flash($error)->error();
-        }
+
         return redirect()->to('admin/data/traits');
     }
+
+    /**
+     * Shows the edit subtype portion of the modal.
+     *
+     * @return \Illuminate\Contracts\Support\Renderable
+     */
+    public function getCreateEditFeatureSubtype(Request $request) {
+        $species = $request->input('species');
+        $subtype_id = $request->input('subtype_id');
+
+        return view('admin.features._create_edit_feature_subtype', [
+            'subtypes'   => ['0' => 'Select Subtype'] + Subtype::where('species_id', '=', $species)->orderBy('sort', 'DESC')->pluck('name', 'id')->toArray(),
+            'subtype_id' => $subtype_id,
+        ]);
+    }
 }
diff --git a/app/Http/Controllers/Admin/Data/GalleryController.php b/app/Http/Controllers/Admin/Data/GalleryController.php
index d6088bf6f5..5c17b1630a 100644
--- a/app/Http/Controllers/Admin/Data/GalleryController.php
+++ b/app/Http/Controllers/Admin/Data/GalleryController.php
@@ -2,17 +2,13 @@
 
 namespace App\Http\Controllers\Admin\Data;
 
-use Illuminate\Http\Request;
-
-use Auth;
-
+use App\Http\Controllers\Controller;
 use App\Models\Gallery\Gallery;
 use App\Services\GalleryService;
+use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Auth;
 
-use App\Http\Controllers\Controller;
-
-class GalleryController extends Controller
-{
+class GalleryController extends Controller {
     /*
     |--------------------------------------------------------------------------
     | Admin / Gallery Controller
@@ -27,10 +23,9 @@ class GalleryController extends Controller
      *
      * @return \Illuminate\Contracts\Support\Renderable
      */
-    public function getIndex()
-    {
+    public function getIndex() {
         return view('admin.galleries.galleries', [
-            'galleries' => Gallery::sort()->whereNull('parent_id')->paginate(10)
+            'galleries' => Gallery::sort()->whereNull('parent_id')->paginate(10),
         ]);
     }
 
@@ -39,66 +34,70 @@ public function getIndex()
      *
      * @return \Illuminate\Contracts\Support\Renderable
      */
-    public function getCreateGallery()
-    {
+    public function getCreateGallery() {
         return view('admin.galleries.create_edit_gallery', [
-            'gallery' => new Gallery,
-            'galleries' => Gallery::sort()->pluck('name','id')
+            'gallery'   => new Gallery,
+            'galleries' => Gallery::sort()->pluck('name', 'id'),
         ]);
     }
 
     /**
      * Shows the edit gallery page.
      *
-     * @param  int  $id
+     * @param int $id
+     *
      * @return \Illuminate\Contracts\Support\Renderable
      */
-    public function getEditGallery($id)
-    {
+    public function getEditGallery($id) {
         $gallery = Gallery::find($id);
-        if(!$gallery) abort(404);
+        if (!$gallery) {
+            abort(404);
+        }
+
         return view('admin.galleries.create_edit_gallery', [
-            'gallery' => $gallery,
-            'galleries' => Gallery::sort()->pluck('name','id')->forget($id)
+            'gallery'   => $gallery,
+            'galleries' => Gallery::sort()->pluck('name', 'id')->forget($id),
         ]);
     }
 
     /**
      * Creates or edits a gallery.
      *
-     * @param  \Illuminate\Http\Request    $request
-     * @param  App\Services\GalleryService $service
-     * @param  int|null                    $id
+     * @param App\Services\GalleryService $service
+     * @param int|null                    $id
+     *
      * @return \Illuminate\Http\RedirectResponse
      */
-    public function postCreateEditGallery(Request $request, GalleryService $service, $id = null)
-    {
+    public function postCreateEditGallery(Request $request, GalleryService $service, $id = null) {
         $id ? $request->validate(Gallery::$updateRules) : $request->validate(Gallery::$createRules);
         $data = $request->only([
-            'name', 'sort', 'parent_id', 'description', 'submissions_open', 'currency_enabled', 'votes_required', 'start_at', 'end_at', 'hide_before_start', 'prompt_selection'
+            'name', 'sort', 'parent_id', 'description', 'submissions_open', 'currency_enabled', 'votes_required', 'start_at', 'end_at', 'hide_before_start', 'prompt_selection',
         ]);
-        if($id && $service->updateGallery(Gallery::find($id), $data, Auth::user())) {
+        if ($id && $service->updateGallery(Gallery::find($id), $data, Auth::user())) {
             flash('Gallery updated successfully.')->success();
-        }
-        else if (!$id && $gallery = $service->createGallery($data, Auth::user())) {
+        } elseif (!$id && $gallery = $service->createGallery($data, Auth::user())) {
             flash('Gallery created successfully.')->success();
+
             return redirect()->to('admin/data/galleries/edit/'.$gallery->id);
+        } else {
+            foreach ($service->errors()->getMessages()['error'] as $error) {
+                flash($error)->error();
+            }
         }
-        else {
-            foreach($service->errors()->getMessages()['error'] as $error) flash($error)->error();
-        }
+
         return redirect()->back();
     }
 
     /**
      * Gets the gallery deletion modal.
      *
-     * @param  int  $id
+     * @param int $id
+     *
      * @return \Illuminate\Contracts\Support\Renderable
      */
-    public function getDeleteGallery($id)
-    {
+    public function getDeleteGallery($id) {
         $gallery = Gallery::find($id);
+
         return view('admin.galleries._delete_gallery', [
             'gallery' => $gallery,
         ]);
@@ -107,19 +106,20 @@ public function getDeleteGallery($id)
     /**
      * Deletes a gallery.
      *
-     * @param  \Illuminate\Http\Request    $request
-     * @param  App\Services\GalleryService  $service
-     * @param  int                         $id
+     * @param App\Services\GalleryService $service
+     * @param int                         $id
+     *
      * @return \Illuminate\Http\RedirectResponse
      */
-    public function postDeleteGallery(Request $request, GalleryService $service, $id)
-    {
-        if($id && $service->deleteGallery(Gallery::find($id))) {
+    public function postDeleteGallery(Request $request, GalleryService $service, $id) {
+        if ($id && $service->deleteGallery(Gallery::find($id), Auth::user())) {
             flash('Gallery deleted successfully.')->success();
+        } else {
+            foreach ($service->errors()->getMessages()['error'] as $error) {
+                flash($error)->error();
+            }
         }
-        else {
-            foreach($service->errors()->getMessages()['error'] as $error) flash($error)->error();
-        }
+
         return redirect()->to('admin/data/galleries');
     }
 }
diff --git a/app/Http/Controllers/Admin/Data/ItemController.php b/app/Http/Controllers/Admin/Data/ItemController.php
index 0fb2b3b9f3..fc7105a14e 100644
--- a/app/Http/Controllers/Admin/Data/ItemController.php
+++ b/app/Http/Controllers/Admin/Data/ItemController.php
@@ -2,25 +2,19 @@
 
 namespace App\Http\Controllers\Admin\Data;
 
-use Illuminate\Http\Request;
-
-use Auth;
-
-use App\Models\Item\ItemCategory;
+use App\Http\Controllers\Controller;
+use App\Models\Currency\Currency;
 use App\Models\Item\Item;
-use App\Models\Item\ItemTag;
+use App\Models\Item\ItemCategory;
+use App\Models\Prompt\Prompt;
 use App\Models\Shop\Shop;
 use App\Models\Shop\ShopStock;
-use App\Models\Prompt\Prompt;
-use App\Models\Currency\Currency;
 use App\Models\User\User;
-
 use App\Services\ItemService;
+use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Auth;
 
-use App\Http\Controllers\Controller;
-
-class ItemController extends Controller
-{
+class ItemController extends Controller {
     /*
     |--------------------------------------------------------------------------
     | Admin / Item Controller
@@ -41,10 +35,9 @@ class ItemController extends Controller
      *
      * @return \Illuminate\Contracts\Support\Renderable
      */
-    public function getIndex()
-    {
+    public function getIndex() {
         return view('admin.items.item_categories', [
-            'categories' => ItemCategory::orderBy('sort', 'DESC')->get()
+            'categories' => ItemCategory::orderBy('sort', 'DESC')->get(),
         ]);
     }
 
@@ -53,64 +46,68 @@ public function getIndex()
      *
      * @return \Illuminate\Contracts\Support\Renderable
      */
-    public function getCreateItemCategory()
-    {
+    public function getCreateItemCategory() {
         return view('admin.items.create_edit_item_category', [
-            'category' => new ItemCategory
+            'category' => new ItemCategory,
         ]);
     }
 
     /**
      * Shows the edit item category page.
      *
-     * @param  int  $id
+     * @param int $id
+     *
      * @return \Illuminate\Contracts\Support\Renderable
      */
-    public function getEditItemCategory($id)
-    {
+    public function getEditItemCategory($id) {
         $category = ItemCategory::find($id);
-        if(!$category) abort(404);
+        if (!$category) {
+            abort(404);
+        }
+
         return view('admin.items.create_edit_item_category', [
-            'category' => $category
+            'category' => $category,
         ]);
     }
 
     /**
      * Creates or edits an item category.
      *
-     * @param  \Illuminate\Http\Request  $request
-     * @param  App\Services\ItemService  $service
-     * @param  int|null                  $id
+     * @param App\Services\ItemService $service
+     * @param int|null                 $id
+     *
      * @return \Illuminate\Http\RedirectResponse
      */
-    public function postCreateEditItemCategory(Request $request, ItemService $service, $id = null)
-    {
+    public function postCreateEditItemCategory(Request $request, ItemService $service, $id = null) {
         $id ? $request->validate(ItemCategory::$updateRules) : $request->validate(ItemCategory::$createRules);
         $data = $request->only([
-            'name', 'description', 'image', 'remove_image', 'is_character_owned', 'character_limit', 'can_name'
+            'name', 'description', 'image', 'remove_image', 'is_character_owned', 'character_limit', 'can_name', 'is_visible',
         ]);
-        if($id && $service->updateItemCategory(ItemCategory::find($id), $data, Auth::user())) {
+        if ($id && $service->updateItemCategory(ItemCategory::find($id), $data, Auth::user())) {
             flash('Category updated successfully.')->success();
-        }
-        else if (!$id && $category = $service->createItemCategory($data, Auth::user())) {
+        } elseif (!$id && $category = $service->createItemCategory($data, Auth::user())) {
             flash('Category created successfully.')->success();
+
             return redirect()->to('admin/data/item-categories/edit/'.$category->id);
+        } else {
+            foreach ($service->errors()->getMessages()['error'] as $error) {
+                flash($error)->error();
+            }
         }
-        else {
-            foreach($service->errors()->getMessages()['error'] as $error) flash($error)->error();
-        }
+
         return redirect()->back();
     }
 
     /**
      * Gets the item category deletion modal.
      *
-     * @param  int  $id
+     * @param int $id
+     *
      * @return \Illuminate\Contracts\Support\Renderable
      */
-    public function getDeleteItemCategory($id)
-    {
+    public function getDeleteItemCategory($id) {
         $category = ItemCategory::find($id);
+
         return view('admin.items._delete_item_category', [
             'category' => $category,
         ]);
@@ -119,37 +116,39 @@ public function getDeleteItemCategory($id)
     /**
      * Deletes an item category.
      *
-     * @param  \Illuminate\Http\Request  $request
-     * @param  App\Services\ItemService  $service
-     * @param  int                       $id
+     * @param App\Services\ItemService $service
+     * @param int                      $id
+     *
      * @return \Illuminate\Http\RedirectResponse
      */
-    public function postDeleteItemCategory(Request $request, ItemService $service, $id)
-    {
-        if($id && $service->deleteItemCategory(ItemCategory::find($id))) {
+    public function postDeleteItemCategory(Request $request, ItemService $service, $id) {
+        if ($id && $service->deleteItemCategory(ItemCategory::find($id), Auth::user())) {
             flash('Category deleted successfully.')->success();
+        } else {
+            foreach ($service->errors()->getMessages()['error'] as $error) {
+                flash($error)->error();
+            }
         }
-        else {
-            foreach($service->errors()->getMessages()['error'] as $error) flash($error)->error();
-        }
+
         return redirect()->to('admin/data/item-categories');
     }
 
     /**
      * Sorts item categories.
      *
-     * @param  \Illuminate\Http\Request  $request
-     * @param  App\Services\ItemService  $service
+     * @param App\Services\ItemService $service
+     *
      * @return \Illuminate\Http\RedirectResponse
      */
-    public function postSortItemCategory(Request $request, ItemService $service)
-    {
-        if($service->sortItemCategory($request->get('sort'))) {
+    public function postSortItemCategory(Request $request, ItemService $service) {
+        if ($service->sortItemCategory($request->get('sort'))) {
             flash('Category order updated successfully.')->success();
+        } else {
+            foreach ($service->errors()->getMessages()['error'] as $error) {
+                flash($error)->error();
+            }
         }
-        else {
-            foreach($service->errors()->getMessages()['error'] as $error) flash($error)->error();
-        }
+
         return redirect()->back();
     }
 
@@ -162,20 +161,21 @@ public function postSortItemCategory(Request $request, ItemService $service)
     /**
      * Shows the item index.
      *
-     * @param  \Illuminate\Http\Request  $request
      * @return \Illuminate\Contracts\Support\Renderable
      */
-    public function getItemIndex(Request $request)
-    {
+    public function getItemIndex(Request $request) {
         $query = Item::query();
         $data = $request->only(['item_category_id', 'name']);
-        if(isset($data['item_category_id']) && $data['item_category_id'] != 'none')
+        if (isset($data['item_category_id']) && $data['item_category_id'] != 'none') {
             $query->where('item_category_id', $data['item_category_id']);
-        if(isset($data['name']))
+        }
+        if (isset($data['name'])) {
             $query->where('name', 'LIKE', '%'.$data['name'].'%');
+        }
+
         return view('admin.items.items', [
-            'items' => $query->paginate(20)->appends($request->query()),
-            'categories' => ['none' => 'Any Category'] + ItemCategory::orderBy('sort', 'DESC')->pluck('name', 'id')->toArray()
+            'items'      => $query->paginate(20)->appends($request->query()),
+            'categories' => ['none' => 'Any Category'] + ItemCategory::orderBy('sort', 'DESC')->pluck('name', 'id')->toArray(),
         ]);
     }
 
@@ -184,75 +184,79 @@ public function getItemIndex(Request $request)
      *
      * @return \Illuminate\Contracts\Support\Renderable
      */
-    public function getCreateItem()
-    {
+    public function getCreateItem() {
         return view('admin.items.create_edit_item', [
-            'item' => new Item,
-            'categories' => ['none' => 'No category'] + ItemCategory::orderBy('sort', 'DESC')->pluck('name', 'id')->toArray(),
-            'prompts' => Prompt::where('is_active', 1)->orderBy('id')->pluck('name', 'id'),
+            'item'           => new Item,
+            'categories'     => ['none' => 'No category'] + ItemCategory::orderBy('sort', 'DESC')->pluck('name', 'id')->toArray(),
+            'prompts'        => Prompt::where('is_active', 1)->orderBy('id')->pluck('name', 'id'),
             'userCurrencies' => Currency::where('is_user_owned', 1)->orderBy('sort_user', 'DESC')->pluck('name', 'id'),
-            'userOptions' => User::query()->orderBy('name')->pluck('name', 'id')->toArray()
+            'userOptions'    => User::query()->orderBy('name')->pluck('name', 'id')->toArray(),
         ]);
     }
 
     /**
      * Shows the edit item page.
      *
-     * @param  int  $id
+     * @param int $id
+     *
      * @return \Illuminate\Contracts\Support\Renderable
      */
-    public function getEditItem($id)
-    {
+    public function getEditItem($id) {
         $item = Item::find($id);
-        if(!$item) abort(404);
+        if (!$item) {
+            abort(404);
+        }
+
         return view('admin.items.create_edit_item', [
-            'item' => $item,
-            'categories' => ['none' => 'No category'] + ItemCategory::orderBy('sort', 'DESC')->pluck('name', 'id')->toArray(),
-            'shops' => Shop::whereIn('id', ShopStock::where('item_id', $item->id)->pluck('shop_id')->unique()->toArray())->orderBy('sort', 'DESC')->get(),
-            'prompts' => Prompt::where('is_active', 1)->orderBy('id')->pluck('name', 'id'),
+            'item'           => $item,
+            'categories'     => ['none' => 'No category'] + ItemCategory::orderBy('sort', 'DESC')->pluck('name', 'id')->toArray(),
+            'shops'          => Shop::whereIn('id', ShopStock::where('item_id', $item->id)->pluck('shop_id')->unique()->toArray())->orderBy('sort', 'DESC')->get(),
+            'prompts'        => Prompt::where('is_active', 1)->orderBy('id')->pluck('name', 'id'),
             'userCurrencies' => Currency::where('is_user_owned', 1)->orderBy('sort_user', 'DESC')->pluck('name', 'id'),
-            'userOptions' => User::query()->orderBy('name')->pluck('name', 'id')->toArray()
+            'userOptions'    => User::query()->orderBy('name')->pluck('name', 'id')->toArray(),
         ]);
     }
 
     /**
      * Creates or edits an item.
      *
-     * @param  \Illuminate\Http\Request  $request
-     * @param  App\Services\ItemService  $service
-     * @param  int|null                  $id
+     * @param App\Services\ItemService $service
+     * @param int|null                 $id
+     *
      * @return \Illuminate\Http\RedirectResponse
      */
-    public function postCreateEditItem(Request $request, ItemService $service, $id = null)
-    {
+    public function postCreateEditItem(Request $request, ItemService $service, $id = null) {
         $id ? $request->validate(Item::$updateRules) : $request->validate(Item::$createRules);
         $data = $request->only([
             'name', 'allow_transfer', 'item_category_id', 'description', 'image', 'remove_image', 'rarity',
             'reference_url', 'artist_id', 'artist_url', 'uses', 'shops', 'prompts', 'release', 'currency_id', 'currency_quantity',
-            'is_released'
+            'is_released',
         ]);
-        if($id && $service->updateItem(Item::find($id), $data, Auth::user())) {
+        if ($id && $service->updateItem(Item::find($id), $data, Auth::user())) {
             flash('Item updated successfully.')->success();
-        }
-        else if (!$id && $item = $service->createItem($data, Auth::user())) {
+        } elseif (!$id && $item = $service->createItem($data, Auth::user())) {
             flash('Item created successfully.')->success();
+
             return redirect()->to('admin/data/items/edit/'.$item->id);
+        } else {
+            foreach ($service->errors()->getMessages()['error'] as $error) {
+                flash($error)->error();
+            }
         }
-        else {
-            foreach($service->errors()->getMessages()['error'] as $error) flash($error)->error();
-        }
+
         return redirect()->back();
     }
 
     /**
      * Gets the item deletion modal.
      *
-     * @param  int  $id
+     * @param int $id
+     *
      * @return \Illuminate\Contracts\Support\Renderable
      */
-    public function getDeleteItem($id)
-    {
+    public function getDeleteItem($id) {
         $item = Item::find($id);
+
         return view('admin.items._delete_item', [
             'item' => $item,
         ]);
@@ -261,19 +265,20 @@ public function getDeleteItem($id)
     /**
      * Creates or edits an item.
      *
-     * @param  \Illuminate\Http\Request  $request
-     * @param  App\Services\ItemService  $service
-     * @param  int                       $id
+     * @param App\Services\ItemService $service
+     * @param int                      $id
+     *
      * @return \Illuminate\Http\RedirectResponse
      */
-    public function postDeleteItem(Request $request, ItemService $service, $id)
-    {
-        if($id && $service->deleteItem(Item::find($id))) {
+    public function postDeleteItem(Request $request, ItemService $service, $id) {
+        if ($id && $service->deleteItem(Item::find($id), Auth::user())) {
             flash('Item deleted successfully.')->success();
+        } else {
+            foreach ($service->errors()->getMessages()['error'] as $error) {
+                flash($error)->error();
+            }
         }
-        else {
-            foreach($service->errors()->getMessages()['error'] as $error) flash($error)->error();
-        }
+
         return redirect()->to('admin/data/items');
     }
 
@@ -286,114 +291,124 @@ public function postDeleteItem(Request $request, ItemService $service, $id)
     /**
      * Gets the tag addition page.
      *
-     * @param  App\Services\ItemService  $service
-     * @param  int  $id
+     * @param App\Services\ItemService $service
+     * @param int                      $id
+     *
      * @return \Illuminate\Contracts\Support\Renderable
      */
-    public function getAddItemTag(ItemService $service, $id)
-    {
+    public function getAddItemTag(ItemService $service, $id) {
         $item = Item::find($id);
+
         return view('admin.items.add_tag', [
             'item' => $item,
-            'tags' => array_diff($service->getItemTags(), $item->tags()->pluck('tag')->toArray())
+            'tags' => array_diff($service->getItemTags(), $item->tags()->pluck('tag')->toArray()),
         ]);
     }
 
     /**
      * Adds a tag to an item.
      *
-     * @param  \Illuminate\Http\Request  $request
-     * @param  App\Services\ItemService  $service
-     * @param  int                       $id
+     * @param App\Services\ItemService $service
+     * @param int                      $id
+     *
      * @return \Illuminate\Http\RedirectResponse
      */
-    public function postAddItemTag(Request $request, ItemService $service, $id)
-    {
+    public function postAddItemTag(Request $request, ItemService $service, $id) {
         $item = Item::find($id);
         $tag = $request->get('tag');
-        if($tag = $service->addItemTag($item, $tag)) {
+        if ($tag = $service->addItemTag($item, $tag, Auth::user())) {
             flash('Tag added successfully.')->success();
+
             return redirect()->to($tag->adminUrl);
+        } else {
+            foreach ($service->errors()->getMessages()['error'] as $error) {
+                flash($error)->error();
+            }
         }
-        else {
-            foreach($service->errors()->getMessages()['error'] as $error) flash($error)->error();
-        }
+
         return redirect()->back();
     }
 
     /**
      * Gets the tag editing page.
      *
-     * @param  int  $id
+     * @param int   $id
+     * @param mixed $tag
+     *
      * @return \Illuminate\Contracts\Support\Renderable
      */
-    public function getEditItemTag(ItemService $service, $id, $tag)
-    {
+    public function getEditItemTag(ItemService $service, $id, $tag) {
         $item = Item::find($id);
         $tag = $item->tags()->where('tag', $tag)->first();
-        if(!$item || !$tag) abort(404);
+        if (!$item || !$tag) {
+            abort(404);
+        }
+
         return view('admin.items.edit_tag', [
             'item' => $item,
-            'tag' => $tag
+            'tag'  => $tag,
         ] + $tag->getEditData());
     }
 
     /**
      * Edits tag data for an item.
      *
-     * @param  \Illuminate\Http\Request  $request
-     * @param  App\Services\ItemService  $service
-     * @param  int                       $id
-     * @param  string                    $tag
+     * @param App\Services\ItemService $service
+     * @param int                      $id
+     * @param string                   $tag
+     *
      * @return \Illuminate\Http\RedirectResponse
      */
-    public function postEditItemTag(Request $request, ItemService $service, $id, $tag)
-    {
+    public function postEditItemTag(Request $request, ItemService $service, $id, $tag) {
         $item = Item::find($id);
-        if($service->editItemTag($item, $tag, $request->all())) {
+        if ($service->editItemTag($item, $tag, $request->all(), Auth::user())) {
             flash('Tag edited successfully.')->success();
+        } else {
+            foreach ($service->errors()->getMessages()['error'] as $error) {
+                flash($error)->error();
+            }
         }
-        else {
-            foreach($service->errors()->getMessages()['error'] as $error) flash($error)->error();
-        }
+
         return redirect()->back();
     }
 
     /**
      * Gets the item tag deletion modal.
      *
-     * @param  int  $id
-     * @param  string                    $tag
+     * @param int    $id
+     * @param string $tag
+     *
      * @return \Illuminate\Contracts\Support\Renderable
      */
-    public function getDeleteItemTag($id, $tag)
-    {
+    public function getDeleteItemTag($id, $tag) {
         $item = Item::find($id);
         $tag = $item->tags()->where('tag', $tag)->first();
+
         return view('admin.items._delete_item_tag', [
             'item' => $item,
-            'tag' => $tag
+            'tag'  => $tag,
         ]);
     }
 
     /**
      * Deletes a tag from an item.
      *
-     * @param  \Illuminate\Http\Request  $request
-     * @param  App\Services\ItemService  $service
-     * @param  int                       $id
-     * @param  string                    $tag
+     * @param App\Services\ItemService $service
+     * @param int                      $id
+     * @param string                   $tag
+     *
      * @return \Illuminate\Http\RedirectResponse
      */
-    public function postDeleteItemTag(Request $request, ItemService $service, $id, $tag)
-    {
+    public function postDeleteItemTag(Request $request, ItemService $service, $id, $tag) {
         $item = Item::find($id);
-        if($service->deleteItemTag($item, $tag)) {
+        if ($service->deleteItemTag($item, $tag, Auth::user())) {
             flash('Tag deleted successfully.')->success();
+        } else {
+            foreach ($service->errors()->getMessages()['error'] as $error) {
+                flash($error)->error();
+            }
         }
-        else {
-            foreach($service->errors()->getMessages()['error'] as $error) flash($error)->error();
-        }
+
         return redirect()->to('admin/data/items/edit/'.$item->id);
     }
 }
diff --git a/app/Http/Controllers/Admin/Data/LootTableController.php b/app/Http/Controllers/Admin/Data/LootTableController.php
index e48ab3eee5..592d99bd07 100644
--- a/app/Http/Controllers/Admin/Data/LootTableController.php
+++ b/app/Http/Controllers/Admin/Data/LootTableController.php
@@ -2,21 +2,15 @@
 
 namespace App\Http\Controllers\Admin\Data;
 
-use Illuminate\Http\Request;
-
-use Auth;
-
+use App\Http\Controllers\Controller;
+use App\Models\Currency\Currency;
 use App\Models\Item\Item;
 use App\Models\Item\ItemCategory;
-use App\Models\Currency\Currency;
 use App\Models\Loot\LootTable;
-
 use App\Services\LootService;
+use Illuminate\Http\Request;
 
-use App\Http\Controllers\Controller;
-
-class LootTableController extends Controller
-{
+class LootTableController extends Controller {
     /*
     |--------------------------------------------------------------------------
     | Admin / Loot Table Controller
@@ -31,10 +25,9 @@ class LootTableController extends Controller
      *
      * @return \Illuminate\Contracts\Support\Renderable
      */
-    public function getIndex()
-    {
+    public function getIndex() {
         return view('admin.loot_tables.loot_tables', [
-            'tables' => LootTable::paginate(20)
+            'tables' => LootTable::paginate(20),
         ]);
     }
 
@@ -43,82 +36,85 @@ public function getIndex()
      *
      * @return \Illuminate\Contracts\Support\Renderable
      */
-    public function getCreateLootTable()
-    {
+    public function getCreateLootTable() {
         $rarities = Item::whereNotNull('data')->get()->pluck('rarity')->unique()->toArray();
         sort($rarities);
 
         return view('admin.loot_tables.create_edit_loot_table', [
-            'table' => new LootTable,
-            'items' => Item::orderBy('name')->pluck('name', 'id'),
+            'table'      => new LootTable,
+            'items'      => Item::orderBy('name')->pluck('name', 'id'),
             'categories' => ItemCategory::orderBy('sort', 'DESC')->pluck('name', 'id'),
             'currencies' => Currency::orderBy('name')->pluck('name', 'id'),
-            'tables' => LootTable::orderBy('name')->pluck('name', 'id'),
-            'rarities' => array_filter($rarities),
+            'tables'     => LootTable::orderBy('name')->pluck('name', 'id'),
+            'rarities'   => array_filter($rarities),
         ]);
     }
 
     /**
      * Shows the edit loot table page.
      *
-     * @param  int  $id
+     * @param int $id
+     *
      * @return \Illuminate\Contracts\Support\Renderable
      */
-    public function getEditLootTable($id)
-    {
+    public function getEditLootTable($id) {
         $table = LootTable::find($id);
-        if(!$table) abort(404);
+        if (!$table) {
+            abort(404);
+        }
 
         $rarities = Item::whereNotNull('data')->get()->pluck('rarity')->unique()->toArray();
         sort($rarities);
 
         return view('admin.loot_tables.create_edit_loot_table', [
-            'table' => $table,
-            'items' => Item::orderBy('name')->pluck('name', 'id'),
+            'table'      => $table,
+            'items'      => Item::orderBy('name')->pluck('name', 'id'),
             'categories' => ItemCategory::orderBy('sort', 'DESC')->pluck('name', 'id'),
             'currencies' => Currency::orderBy('name')->pluck('name', 'id'),
-            'tables' => LootTable::orderBy('name')->pluck('name', 'id'),
-            'rarities' => array_filter($rarities),
+            'tables'     => LootTable::orderBy('name')->pluck('name', 'id'),
+            'rarities'   => array_filter($rarities),
         ]);
     }
 
     /**
      * Creates or edits a loot table.
      *
-     * @param  \Illuminate\Http\Request  $request
-     * @param  App\Services\LootService  $service
-     * @param  int|null                  $id
+     * @param App\Services\LootService $service
+     * @param int|null                 $id
+     *
      * @return \Illuminate\Http\RedirectResponse
      */
-    public function postCreateEditLootTable(Request $request, LootService $service, $id = null)
-    {
+    public function postCreateEditLootTable(Request $request, LootService $service, $id = null) {
         $id ? $request->validate(LootTable::$updateRules) : $request->validate(LootTable::$createRules);
         $data = $request->only([
             'name', 'display_name', 'rewardable_type', 'rewardable_id', 'quantity', 'weight',
-            'criteria', 'rarity'
+            'criteria', 'rarity',
         ]);
-        if($id && $service->updateLootTable(LootTable::find($id), $data)) {
+        if ($id && $service->updateLootTable(LootTable::find($id), $data)) {
             flash('Loot table updated successfully.')->success();
-        }
-        else if (!$id && $table = $service->createLootTable($data)) {
+        } elseif (!$id && $table = $service->createLootTable($data)) {
             flash('Loot table created successfully.')->success();
+
             return redirect()->to('admin/data/loot-tables/edit/'.$table->id);
+        } else {
+            foreach ($service->errors()->getMessages()['error'] as $error) {
+                flash($error)->error();
+            }
         }
-        else {
-            foreach($service->errors()->getMessages()['error'] as $error) flash($error)->error();
-        }
+
         return redirect()->back();
     }
 
     /**
      * Gets the loot table deletion modal.
      *
-     * @param  int  $id
+     * @param int $id
+     *
      * @return \Illuminate\Contracts\Support\Renderable
      */
-    public function getDeleteLootTable($id)
-    {
+    public function getDeleteLootTable($id) {
         $table = LootTable::find($id);
+
         return view('admin.loot_tables._delete_loot_table', [
             'table' => $table,
         ]);
@@ -127,45 +123,48 @@ public function getDeleteLootTable($id)
     /**
      * Deletes an item category.
      *
-     * @param  \Illuminate\Http\Request  $request
-     * @param  App\Services\LootService  $service
-     * @param  int                       $id
+     * @param App\Services\LootService $service
+     * @param int                      $id
+     *
      * @return \Illuminate\Http\RedirectResponse
      */
-    public function postDeleteLootTable(Request $request, LootService $service, $id)
-    {
-        if($id && $service->deleteLootTable(LootTable::find($id))) {
+    public function postDeleteLootTable(Request $request, LootService $service, $id) {
+        if ($id && $service->deleteLootTable(LootTable::find($id))) {
             flash('Loot table deleted successfully.')->success();
+        } else {
+            foreach ($service->errors()->getMessages()['error'] as $error) {
+                flash($error)->error();
+            }
         }
-        else {
-            foreach($service->errors()->getMessages()['error'] as $error) flash($error)->error();
-        }
+
         return redirect()->to('admin/data/loot-tables');
     }
 
     /**
      * Gets the loot table test roll modal.
      *
-     * @param  \Illuminate\Http\Request  $request
-     * @param  App\Services\LootService  $service
-     * @param  int                       $id
+     * @param App\Services\LootService $service
+     * @param int                      $id
+     *
      * @return \Illuminate\Contracts\Support\Renderable
      */
-    public function getRollLootTable(Request $request, LootService $service, $id)
-    {
+    public function getRollLootTable(Request $request, LootService $service, $id) {
         $table = LootTable::find($id);
-        if(!$table) abort(404);
+        if (!$table) {
+            abort(404);
+        }
 
         // Normally we'd merge the result tables, but since we're going to be looking at
         // the results of each roll individually on this page, we'll keep them separate
         $results = [];
-        for ($i = 0; $i < $request->get('quantity'); $i++)
+        for ($i = 0; $i < $request->get('quantity'); $i++) {
             $results[] = $table->roll();
+        }
 
         return view('admin.loot_tables._roll_loot_table', [
-            'table' => $table,
-            'results' => $results,
-            'quantity' => $request->get('quantity')
+            'table'    => $table,
+            'results'  => $results,
+            'quantity' => $request->get('quantity'),
         ]);
     }
 }
diff --git a/app/Http/Controllers/Admin/Data/PromptController.php b/app/Http/Controllers/Admin/Data/PromptController.php
index a3c73ce6b8..ed19ceb6d2 100644
--- a/app/Http/Controllers/Admin/Data/PromptController.php
+++ b/app/Http/Controllers/Admin/Data/PromptController.php
@@ -2,23 +2,14 @@
 
 namespace App\Http\Controllers\Admin\Data;
 
-use Illuminate\Http\Request;
-
-use Auth;
-
-use App\Models\Prompt\PromptCategory;
+use App\Http\Controllers\Controller;
 use App\Models\Prompt\Prompt;
-use App\Models\Item\Item;
-use App\Models\Currency\Currency;
-use App\Models\Loot\LootTable;
-use App\Models\Raffle\Raffle;
-
+use App\Models\Prompt\PromptCategory;
 use App\Services\PromptService;
+use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Auth;
 
-use App\Http\Controllers\Controller;
-
-class PromptController extends Controller
-{
+class PromptController extends Controller {
     /*
     |--------------------------------------------------------------------------
     | Admin / Prompt Controller
@@ -33,10 +24,9 @@ class PromptController extends Controller
      *
      * @return \Illuminate\Contracts\Support\Renderable
      */
-    public function getIndex()
-    {
+    public function getIndex() {
         return view('admin.prompts.prompt_categories', [
-            'categories' => PromptCategory::orderBy('sort', 'DESC')->get()
+            'categories' => PromptCategory::orderBy('sort', 'DESC')->get(),
         ]);
     }
 
@@ -45,64 +35,68 @@ public function getIndex()
      *
      * @return \Illuminate\Contracts\Support\Renderable
      */
-    public function getCreatePromptCategory()
-    {
+    public function getCreatePromptCategory() {
         return view('admin.prompts.create_edit_prompt_category', [
-            'category' => new PromptCategory
+            'category' => new PromptCategory,
         ]);
     }
 
     /**
      * Shows the edit prompt category page.
      *
-     * @param  int  $id
+     * @param int $id
+     *
      * @return \Illuminate\Contracts\Support\Renderable
      */
-    public function getEditPromptCategory($id)
-    {
+    public function getEditPromptCategory($id) {
         $category = PromptCategory::find($id);
-        if(!$category) abort(404);
+        if (!$category) {
+            abort(404);
+        }
+
         return view('admin.prompts.create_edit_prompt_category', [
-            'category' => $category
+            'category' => $category,
         ]);
     }
 
     /**
      * Creates or edits a prompt category.
      *
-     * @param  \Illuminate\Http\Request    $request
-     * @param  App\Services\PromptService  $service
-     * @param  int|null                    $id
+     * @param App\Services\PromptService $service
+     * @param int|null                   $id
+     *
      * @return \Illuminate\Http\RedirectResponse
      */
-    public function postCreateEditPromptCategory(Request $request, PromptService $service, $id = null)
-    {
+    public function postCreateEditPromptCategory(Request $request, PromptService $service, $id = null) {
         $id ? $request->validate(PromptCategory::$updateRules) : $request->validate(PromptCategory::$createRules);
         $data = $request->only([
-            'name', 'description', 'image', 'remove_image'
+            'name', 'description', 'image', 'remove_image',
         ]);
-        if($id && $service->updatePromptCategory(PromptCategory::find($id), $data, Auth::user())) {
+        if ($id && $service->updatePromptCategory(PromptCategory::find($id), $data, Auth::user())) {
             flash('Category updated successfully.')->success();
-        }
-        else if (!$id && $category = $service->createPromptCategory($data, Auth::user())) {
+        } elseif (!$id && $category = $service->createPromptCategory($data, Auth::user())) {
             flash('Category created successfully.')->success();
+
             return redirect()->to('admin/data/prompt-categories/edit/'.$category->id);
+        } else {
+            foreach ($service->errors()->getMessages()['error'] as $error) {
+                flash($error)->error();
+            }
         }
-        else {
-            foreach($service->errors()->getMessages()['error'] as $error) flash($error)->error();
-        }
+
         return redirect()->back();
     }
 
     /**
      * Gets the prompt category deletion modal.
      *
-     * @param  int  $id
+     * @param int $id
+     *
      * @return \Illuminate\Contracts\Support\Renderable
      */
-    public function getDeletePromptCategory($id)
-    {
+    public function getDeletePromptCategory($id) {
         $category = PromptCategory::find($id);
+
         return view('admin.prompts._delete_prompt_category', [
             'category' => $category,
         ]);
@@ -111,41 +105,42 @@ public function getDeletePromptCategory($id)
     /**
      * Deletes a prompt category.
      *
-     * @param  \Illuminate\Http\Request    $request
-     * @param  App\Services\PromptService  $service
-     * @param  int                         $id
+     * @param App\Services\PromptService $service
+     * @param int                        $id
+     *
      * @return \Illuminate\Http\RedirectResponse
      */
-    public function postDeletePromptCategory(Request $request, PromptService $service, $id)
-    {
-        if($id && $service->deletePromptCategory(PromptCategory::find($id))) {
+    public function postDeletePromptCategory(Request $request, PromptService $service, $id) {
+        if ($id && $service->deletePromptCategory(PromptCategory::find($id))) {
             flash('Category deleted successfully.')->success();
+        } else {
+            foreach ($service->errors()->getMessages()['error'] as $error) {
+                flash($error)->error();
+            }
         }
-        else {
-            foreach($service->errors()->getMessages()['error'] as $error) flash($error)->error();
-        }
+
         return redirect()->to('admin/data/prompt-categories');
     }
 
     /**
      * Sorts prompt categories.
      *
-     * @param  \Illuminate\Http\Request    $request
-     * @param  App\Services\PromptService  $service
+     * @param App\Services\PromptService $service
+     *
      * @return \Illuminate\Http\RedirectResponse
      */
-    public function postSortPromptCategory(Request $request, PromptService $service)
-    {
-        if($service->sortPromptCategory($request->get('sort'))) {
+    public function postSortPromptCategory(Request $request, PromptService $service) {
+        if ($service->sortPromptCategory($request->get('sort'))) {
             flash('Category order updated successfully.')->success();
+        } else {
+            foreach ($service->errors()->getMessages()['error'] as $error) {
+                flash($error)->error();
+            }
         }
-        else {
-            foreach($service->errors()->getMessages()['error'] as $error) flash($error)->error();
-        }
+
         return redirect()->back();
     }
 
-
     /**********************************************************************************************
 
         PROMPTS
@@ -155,20 +150,21 @@ public function postSortPromptCategory(Request $request, PromptService $service)
     /**
      * Shows the prompt category index.
      *
-     * @param  \Illuminate\Http\Request  $request
      * @return \Illuminate\Contracts\Support\Renderable
      */
-    public function getPromptIndex(Request $request)
-    {
+    public function getPromptIndex(Request $request) {
         $query = Prompt::query();
         $data = $request->only(['prompt_category_id', 'name']);
-        if(isset($data['prompt_category_id']) && $data['prompt_category_id'] != 'none')
+        if (isset($data['prompt_category_id']) && $data['prompt_category_id'] != 'none') {
             $query->where('prompt_category_id', $data['prompt_category_id']);
-        if(isset($data['name']))
+        }
+        if (isset($data['name'])) {
             $query->where('name', 'LIKE', '%'.$data['name'].'%');
+        }
+
         return view('admin.prompts.prompts', [
-            'prompts' => $query->paginate(20)->appends($request->query()),
-            'categories' => ['none' => 'Any Category'] + PromptCategory::orderBy('sort', 'DESC')->pluck('name', 'id')->toArray()
+            'prompts'    => $query->paginate(20)->appends($request->query()),
+            'categories' => ['none' => 'Any Category'] + PromptCategory::orderBy('sort', 'DESC')->pluck('name', 'id')->toArray(),
         ]);
     }
 
@@ -177,74 +173,70 @@ public function getPromptIndex(Request $request)
      *
      * @return \Illuminate\Contracts\Support\Renderable
      */
-    public function getCreatePrompt()
-    {
+    public function getCreatePrompt() {
         return view('admin.prompts.create_edit_prompt', [
-            'prompt' => new Prompt,
+            'prompt'     => new Prompt,
             'categories' => ['none' => 'No category'] + PromptCategory::orderBy('sort', 'DESC')->pluck('name', 'id')->toArray(),
-            'items' => Item::orderBy('name')->pluck('name', 'id'),
-            'currencies' => Currency::where('is_user_owned', 1)->orderBy('name')->pluck('name', 'id'),
-            'tables' => LootTable::orderBy('name')->pluck('name', 'id'),
-            'raffles' => Raffle::where('rolled_at', null)->where('is_active', 1)->orderBy('name')->pluck('name', 'id'),
         ]);
     }
 
     /**
      * Shows the edit prompt page.
      *
-     * @param  int  $id
+     * @param int $id
+     *
      * @return \Illuminate\Contracts\Support\Renderable
      */
-    public function getEditPrompt($id)
-    {
+    public function getEditPrompt($id) {
         $prompt = Prompt::find($id);
-        if(!$prompt) abort(404);
+        if (!$prompt) {
+            abort(404);
+        }
+
         return view('admin.prompts.create_edit_prompt', [
-            'prompt' => $prompt,
+            'prompt'     => $prompt,
             'categories' => ['none' => 'No category'] + PromptCategory::orderBy('sort', 'DESC')->pluck('name', 'id')->toArray(),
-            'items' => Item::orderBy('name')->pluck('name', 'id'),
-            'currencies' => Currency::where('is_user_owned', 1)->orderBy('name')->pluck('name', 'id'),
-            'tables' => LootTable::orderBy('name')->pluck('name', 'id'),
-            'raffles' => Raffle::where('rolled_at', null)->where('is_active', 1)->orderBy('name')->pluck('name', 'id'),
         ]);
     }
 
     /**
      * Creates or edits a prompt.
      *
-     * @param  \Illuminate\Http\Request    $request
-     * @param  App\Services\PromptService  $service
-     * @param  int|null                    $id
+     * @param App\Services\PromptService $service
+     * @param int|null                   $id
+     *
      * @return \Illuminate\Http\RedirectResponse
      */
-    public function postCreateEditPrompt(Request $request, PromptService $service, $id = null)
-    {
+    public function postCreateEditPrompt(Request $request, PromptService $service, $id = null) {
         $id ? $request->validate(Prompt::$updateRules) : $request->validate(Prompt::$createRules);
         $data = $request->only([
-            'name', 'prompt_category_id', 'summary', 'description', 'start_at', 'end_at', 'hide_before_start', 'hide_after_end', 'is_active', 'rewardable_type', 'rewardable_id', 'quantity', 'image', 'remove_image', 'prefix', 'hide_submissions'
+            'name', 'prompt_category_id', 'summary', 'description', 'start_at', 'end_at', 'hide_before_start', 'hide_after_end', 'is_active', 'rewardable_type', 'rewardable_id', 'quantity', 'image', 'remove_image', 'prefix', 'hide_submissions', 'staff_only',
         ]);
-        if($id && $service->updatePrompt(Prompt::find($id), $data, Auth::user())) {
+        if ($id && $service->updatePrompt(Prompt::find($id), $data, Auth::user())) {
             flash('Prompt updated successfully.')->success();
-        }
-        else if (!$id && $prompt = $service->createPrompt($data, Auth::user())) {
+        } elseif (!$id && $prompt = $service->createPrompt($data, Auth::user())) {
             flash('Prompt created successfully.')->success();
+
             return redirect()->to('admin/data/prompts/edit/'.$prompt->id);
+        } else {
+            foreach ($service->errors()->getMessages()['error'] as $error) {
+                flash($error)->error();
+            }
         }
-        else {
-            foreach($service->errors()->getMessages()['error'] as $error) flash($error)->error();
-        }
+
         return redirect()->back();
     }
 
     /**
      * Gets the prompt deletion modal.
      *
-     * @param  int  $id
+     * @param int $id
+     *
      * @return \Illuminate\Contracts\Support\Renderable
      */
-    public function getDeletePrompt($id)
-    {
+    public function getDeletePrompt($id) {
         $prompt = Prompt::find($id);
+
         return view('admin.prompts._delete_prompt', [
             'prompt' => $prompt,
         ]);
@@ -253,19 +245,20 @@ public function getDeletePrompt($id)
     /**
      * Deletes a prompt.
      *
-     * @param  \Illuminate\Http\Request    $request
-     * @param  App\Services\PromptService  $service
-     * @param  int                         $id
+     * @param App\Services\PromptService $service
+     * @param int                        $id
+     *
      * @return \Illuminate\Http\RedirectResponse
      */
-    public function postDeletePrompt(Request $request, PromptService $service, $id)
-    {
-        if($id && $service->deletePrompt(Prompt::find($id))) {
+    public function postDeletePrompt(Request $request, PromptService $service, $id) {
+        if ($id && $service->deletePrompt(Prompt::find($id))) {
             flash('Prompt deleted successfully.')->success();
+        } else {
+            foreach ($service->errors()->getMessages()['error'] as $error) {
+                flash($error)->error();
+            }
         }
-        else {
-            foreach($service->errors()->getMessages()['error'] as $error) flash($error)->error();
-        }
+
         return redirect()->to('admin/data/prompts');
     }
 }
diff --git a/app/Http/Controllers/Admin/Data/RarityController.php b/app/Http/Controllers/Admin/Data/RarityController.php
index 0ac98f2e18..5b58937d1a 100644
--- a/app/Http/Controllers/Admin/Data/RarityController.php
+++ b/app/Http/Controllers/Admin/Data/RarityController.php
@@ -2,18 +2,13 @@
 
 namespace App\Http\Controllers\Admin\Data;
 
-use Illuminate\Http\Request;
-
-use Auth;
-
+use App\Http\Controllers\Controller;
 use App\Models\Rarity;
-
 use App\Services\RarityService;
+use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Auth;
 
-use App\Http\Controllers\Controller;
-
-class RarityController extends Controller
-{
+class RarityController extends Controller {
     /*
     |--------------------------------------------------------------------------
     | Admin / Rarity Controller
@@ -28,76 +23,79 @@ class RarityController extends Controller
      *
      * @return \Illuminate\Contracts\Support\Renderable
      */
-    public function getIndex()
-    {
+    public function getIndex() {
         return view('admin.rarities.rarities', [
-            'rarities' => Rarity::orderBy('sort', 'DESC')->get()
+            'rarities' => Rarity::orderBy('sort', 'DESC')->get(),
         ]);
     }
-    
+
     /**
      * Shows the create rarity page.
      *
      * @return \Illuminate\Contracts\Support\Renderable
      */
-    public function getCreateRarity()
-    {
+    public function getCreateRarity() {
         return view('admin.rarities.create_edit_rarity', [
-            'rarity' => new Rarity
+            'rarity' => new Rarity,
         ]);
     }
-    
+
     /**
      * Shows the edit rarity page.
      *
-     * @param  int  $id
+     * @param int $id
+     *
      * @return \Illuminate\Contracts\Support\Renderable
      */
-    public function getEditRarity($id)
-    {
+    public function getEditRarity($id) {
         $rarity = Rarity::find($id);
-        if(!$rarity) abort(404);
+        if (!$rarity) {
+            abort(404);
+        }
+
         return view('admin.rarities.create_edit_rarity', [
-            'rarity' => $rarity
+            'rarity' => $rarity,
         ]);
     }
 
     /**
      * Creates or edits a rarity.
      *
-     * @param  \Illuminate\Http\Request    $request
-     * @param  App\Services\RarityService  $service
-     * @param  int|null                    $id
+     * @param App\Services\RarityService $service
+     * @param int|null                   $id
+     *
      * @return \Illuminate\Http\RedirectResponse
      */
-    public function postCreateEditRarity(Request $request, RarityService $service, $id = null)
-    {
+    public function postCreateEditRarity(Request $request, RarityService $service, $id = null) {
         $id ? $request->validate(Rarity::$updateRules) : $request->validate(Rarity::$createRules);
         $data = $request->only([
-            'name', 'color', 'description', 'image', 'remove_image'
+            'name', 'color', 'description', 'image', 'remove_image',
         ]);
-        if($id && $service->updateRarity(Rarity::find($id), $data, Auth::user())) {
+        if ($id && $service->updateRarity(Rarity::find($id), $data, Auth::user())) {
             flash('Rarity updated successfully.')->success();
-        }
-        else if (!$id && $rarity = $service->createRarity($data, Auth::user())) {
+        } elseif (!$id && $rarity = $service->createRarity($data, Auth::user())) {
             flash('Rarity created successfully.')->success();
+
             return redirect()->to('admin/data/rarities/edit/'.$rarity->id);
+        } else {
+            foreach ($service->errors()->getMessages()['error'] as $error) {
+                flash($error)->error();
+            }
         }
-        else {
-            foreach($service->errors()->getMessages()['error'] as $error) flash($error)->error();
-        }
+
         return redirect()->back();
     }
-    
+
     /**
      * Gets the rarity deletion modal.
      *
-     * @param  int  $id
+     * @param int $id
+     *
      * @return \Illuminate\Contracts\Support\Renderable
      */
-    public function getDeleteRarity($id)
-    {
+    public function getDeleteRarity($id) {
         $rarity = Rarity::find($id);
+
         return view('admin.rarities._delete_rarity', [
             'rarity' => $rarity,
         ]);
@@ -106,37 +104,39 @@ public function getDeleteRarity($id)
     /**
      * Deletes a rarity.
      *
-     * @param  \Illuminate\Http\Request    $request
-     * @param  App\Services\RarityService  $service
-     * @param  int                         $id
+     * @param App\Services\RarityService $service
+     * @param int                        $id
+     *
      * @return \Illuminate\Http\RedirectResponse
      */
-    public function postDeleteRarity(Request $request, RarityService $service, $id)
-    {
-        if($id && $service->deleteRarity(Rarity::find($id))) {
+    public function postDeleteRarity(Request $request, RarityService $service, $id) {
+        if ($id && $service->deleteRarity(Rarity::find($id))) {
             flash('Rarity deleted successfully.')->success();
+        } else {
+            foreach ($service->errors()->getMessages()['error'] as $error) {
+                flash($error)->error();
+            }
         }
-        else {
-            foreach($service->errors()->getMessages()['error'] as $error) flash($error)->error();
-        }
+
         return redirect()->to('admin/data/rarities');
     }
 
     /**
      * Sorts rarities.
      *
-     * @param  \Illuminate\Http\Request    $request
-     * @param  App\Services\RarityService  $service
+     * @param App\Services\RarityService $service
+     *
      * @return \Illuminate\Http\RedirectResponse
      */
-    public function postSortRarity(Request $request, RarityService $service)
-    {
-        if($service->sortRarity($request->get('sort'))) {
+    public function postSortRarity(Request $request, RarityService $service) {
+        if ($service->sortRarity($request->get('sort'))) {
             flash('Rarity order updated successfully.')->success();
+        } else {
+            foreach ($service->errors()->getMessages()['error'] as $error) {
+                flash($error)->error();
+            }
         }
-        else {
-            foreach($service->errors()->getMessages()['error'] as $error) flash($error)->error();
-        }
+
         return redirect()->back();
     }
 }
diff --git a/app/Http/Controllers/Admin/Data/ShopController.php b/app/Http/Controllers/Admin/Data/ShopController.php
index 13cab9d712..f15a769f07 100644
--- a/app/Http/Controllers/Admin/Data/ShopController.php
+++ b/app/Http/Controllers/Admin/Data/ShopController.php
@@ -2,21 +2,15 @@
 
 namespace App\Http\Controllers\Admin\Data;
 
-use Illuminate\Http\Request;
-
-use Auth;
-
-use App\Models\Shop\Shop;
-use App\Models\Shop\ShopStock;
-use App\Models\Item\Item;
+use App\Http\Controllers\Controller;
 use App\Models\Currency\Currency;
-
+use App\Models\Item\Item;
+use App\Models\Shop\Shop;
 use App\Services\ShopService;
+use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Auth;
 
-use App\Http\Controllers\Controller;
-
-class ShopController extends Controller
-{
+class ShopController extends Controller {
     /*
     |--------------------------------------------------------------------------
     | Admin / Shop Controller
@@ -31,38 +25,39 @@ class ShopController extends Controller
      *
      * @return \Illuminate\Contracts\Support\Renderable
      */
-    public function getIndex()
-    {
+    public function getIndex() {
         return view('admin.shops.shops', [
-            'shops' => Shop::orderBy('sort', 'DESC')->get()
+            'shops' => Shop::orderBy('sort', 'DESC')->get(),
         ]);
     }
-    
+
     /**
      * Shows the create shop page.
      *
      * @return \Illuminate\Contracts\Support\Renderable
      */
-    public function getCreateShop()
-    {
+    public function getCreateShop() {
         return view('admin.shops.create_edit_shop', [
-            'shop' => new Shop
+            'shop' => new Shop,
         ]);
     }
-    
+
     /**
      * Shows the edit shop page.
      *
-     * @param  int  $id
+     * @param int $id
+     *
      * @return \Illuminate\Contracts\Support\Renderable
      */
-    public function getEditShop($id)
-    {
+    public function getEditShop($id) {
         $shop = Shop::find($id);
-        if(!$shop) abort(404);
+        if (!$shop) {
+            abort(404);
+        }
+
         return view('admin.shops.create_edit_shop', [
-            'shop' => $shop,
-            'items' => Item::orderBy('name')->pluck('name', 'id'),
+            'shop'       => $shop,
+            'items'      => Item::orderBy('name')->pluck('name', 'id'),
             'currencies' => Currency::orderBy('name')->pluck('name', 'id'),
         ]);
     }
@@ -70,62 +65,66 @@ public function getEditShop($id)
     /**
      * Creates or edits a shop.
      *
-     * @param  \Illuminate\Http\Request  $request
-     * @param  App\Services\ShopService  $service
-     * @param  int|null                  $id
+     * @param App\Services\ShopService $service
+     * @param int|null                 $id
+     *
      * @return \Illuminate\Http\RedirectResponse
      */
-    public function postCreateEditShop(Request $request, ShopService $service, $id = null)
-    {
+    public function postCreateEditShop(Request $request, ShopService $service, $id = null) {
         $id ? $request->validate(Shop::$updateRules) : $request->validate(Shop::$createRules);
         $data = $request->only([
-            'name', 'description', 'image', 'remove_image', 'is_active'
+            'name', 'description', 'image', 'remove_image', 'is_active',
         ]);
-        if($id && $service->updateShop(Shop::find($id), $data, Auth::user())) {
+        if ($id && $service->updateShop(Shop::find($id), $data, Auth::user())) {
             flash('Shop updated successfully.')->success();
-        }
-        else if (!$id && $shop = $service->createShop($data, Auth::user())) {
+        } elseif (!$id && $shop = $service->createShop($data, Auth::user())) {
             flash('Shop created successfully.')->success();
+
             return redirect()->to('admin/data/shops/edit/'.$shop->id);
+        } else {
+            foreach ($service->errors()->getMessages()['error'] as $error) {
+                flash($error)->error();
+            }
         }
-        else {
-            foreach($service->errors()->getMessages()['error'] as $error) flash($error)->error();
-        }
+
         return redirect()->back();
     }
 
     /**
      * Edits a shop's stock.
      *
-     * @param  \Illuminate\Http\Request  $request
-     * @param  App\Services\ShopService  $service
-     * @param  int                       $id
+     * @param App\Services\ShopService $service
+     * @param int                      $id
+     *
      * @return \Illuminate\Http\RedirectResponse
      */
-    public function postEditShopStock(Request $request, ShopService $service, $id)
-    {
+    public function postEditShopStock(Request $request, ShopService $service, $id) {
         $data = $request->only([
-            'shop_id', 'item_id', 'currency_id', 'cost', 'use_user_bank', 'use_character_bank', 'is_limited_stock', 'quantity', 'purchase_limit'
+            'shop_id', 'item_id', 'currency_id', 'cost', 'use_user_bank', 'use_character_bank', 'is_limited_stock', 'quantity', 'purchase_limit',
         ]);
-        if($service->updateShopStock(Shop::find($id), $data, Auth::user())) {
+        if ($service->updateShopStock(Shop::find($id), $data, Auth::user())) {
             flash('Shop stock updated successfully.')->success();
+
             return redirect()->back();
+        } else {
+            foreach ($service->errors()->getMessages()['error'] as $error) {
+                flash($error)->error();
+            }
         }
-        else {
-            foreach($service->errors()->getMessages()['error'] as $error) flash($error)->error();
-        }
+
         return redirect()->back();
     }
-    
+
     /**
      * Gets the shop deletion modal.
      *
-     * @param  int  $id
+     * @param int $id
+     *
      * @return \Illuminate\Contracts\Support\Renderable
      */
-    public function getDeleteShop($id)
-    {
+    public function getDeleteShop($id) {
         $shop = Shop::find($id);
+
         return view('admin.shops._delete_shop', [
             'shop' => $shop,
         ]);
@@ -134,38 +133,39 @@ public function getDeleteShop($id)
     /**
      * Deletes a shop.
      *
-     * @param  \Illuminate\Http\Request  $request
-     * @param  App\Services\ShopService  $service
-     * @param  int                       $id
+     * @param App\Services\ShopService $service
+     * @param int                      $id
+     *
      * @return \Illuminate\Http\RedirectResponse
      */
-    public function postDeleteShop(Request $request, ShopService $service, $id)
-    {
-        if($id && $service->deleteShop(Shop::find($id))) {
+    public function postDeleteShop(Request $request, ShopService $service, $id) {
+        if ($id && $service->deleteShop(Shop::find($id))) {
             flash('Shop deleted successfully.')->success();
+        } else {
+            foreach ($service->errors()->getMessages()['error'] as $error) {
+                flash($error)->error();
+            }
         }
-        else {
-            foreach($service->errors()->getMessages()['error'] as $error) flash($error)->error();
-        }
+
         return redirect()->to('admin/data/shops');
     }
 
     /**
      * Sorts shops.
      *
-     * @param  \Illuminate\Http\Request  $request
-     * @param  App\Services\ShopService  $service
+     * @param App\Services\ShopService $service
+     *
      * @return \Illuminate\Http\RedirectResponse
      */
-    public function postSortShop(Request $request, ShopService $service)
-    {
-        if($service->sortShop($request->get('sort'))) {
+    public function postSortShop(Request $request, ShopService $service) {
+        if ($service->sortShop($request->get('sort'))) {
             flash('Shop order updated successfully.')->success();
+        } else {
+            foreach ($service->errors()->getMessages()['error'] as $error) {
+                flash($error)->error();
+            }
         }
-        else {
-            foreach($service->errors()->getMessages()['error'] as $error) flash($error)->error();
-        }
+
         return redirect()->back();
     }
-
 }
diff --git a/app/Http/Controllers/Admin/Data/SpeciesController.php b/app/Http/Controllers/Admin/Data/SpeciesController.php
index 8b1e9ae370..cbacf601c3 100644
--- a/app/Http/Controllers/Admin/Data/SpeciesController.php
+++ b/app/Http/Controllers/Admin/Data/SpeciesController.php
@@ -2,20 +2,15 @@
 
 namespace App\Http\Controllers\Admin\Data;
 
-use Illuminate\Http\Request;
-
-use Auth;
-
+use App\Http\Controllers\Controller;
+use App\Models\Character\Sublist;
 use App\Models\Species\Species;
 use App\Models\Species\Subtype;
-use App\Models\Character\Sublist;
-
 use App\Services\SpeciesService;
+use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Auth;
 
-use App\Http\Controllers\Controller;
-
-class SpeciesController extends Controller
-{
+class SpeciesController extends Controller {
     /*
     |--------------------------------------------------------------------------
     | Admin / Species Controller
@@ -30,78 +25,81 @@ class SpeciesController extends Controller
      *
      * @return \Illuminate\Contracts\Support\Renderable
      */
-    public function getIndex()
-    {
+    public function getIndex() {
         return view('admin.specieses.specieses', [
-            'specieses' => Species::orderBy('sort', 'DESC')->get()
+            'specieses' => Species::orderBy('sort', 'DESC')->get(),
         ]);
     }
-    
+
     /**
      * Shows the create species page.
      *
      * @return \Illuminate\Contracts\Support\Renderable
      */
-    public function getCreateSpecies()
-    {
+    public function getCreateSpecies() {
         return view('admin.specieses.create_edit_species', [
-            'species' => new Species,
-            'sublists' => [0 => 'No Sublist'] + Sublist::orderBy('name', 'DESC')->pluck('name', 'id')->toArray()
+            'species'  => new Species,
+            'sublists' => [0 => 'No Sublist'] + Sublist::orderBy('name', 'DESC')->pluck('name', 'id')->toArray(),
         ]);
     }
-    
+
     /**
      * Shows the edit species page.
      *
-     * @param  int  $id
+     * @param int $id
+     *
      * @return \Illuminate\Contracts\Support\Renderable
      */
-    public function getEditSpecies($id)
-    {
+    public function getEditSpecies($id) {
         $species = Species::find($id);
-        if(!$species) abort(404);
+        if (!$species) {
+            abort(404);
+        }
+
         return view('admin.specieses.create_edit_species', [
-            'species' => $species,
-            'sublists' => [0 => 'No Sublist'] + Sublist::orderBy('name', 'DESC')->pluck('name', 'id')->toArray()
+            'species'  => $species,
+            'sublists' => [0 => 'No Sublist'] + Sublist::orderBy('name', 'DESC')->pluck('name', 'id')->toArray(),
         ]);
     }
 
     /**
      * Creates or edits a species.
      *
-     * @param  \Illuminate\Http\Request     $request
-     * @param  App\Services\SpeciesService  $service
-     * @param  int|null                     $id
+     * @param App\Services\SpeciesService $service
+     * @param int|null                    $id
+     *
      * @return \Illuminate\Http\RedirectResponse
      */
-    public function postCreateEditSpecies(Request $request, SpeciesService $service, $id = null)
-    {
+    public function postCreateEditSpecies(Request $request, SpeciesService $service, $id = null) {
         $id ? $request->validate(Species::$updateRules) : $request->validate(Species::$createRules);
         $data = $request->only([
-            'name', 'description', 'image', 'remove_image', 'masterlist_sub_id'
+            'name', 'description', 'image', 'remove_image', 'masterlist_sub_id', 'is_visible',
         ]);
-        if($id && $service->updateSpecies(Species::find($id), $data, Auth::user())) {
+        if ($id && $service->updateSpecies(Species::find($id), $data, Auth::user())) {
             flash('Species updated successfully.')->success();
-        }
-        else if (!$id && $species = $service->createSpecies($data, Auth::user())) {
+        } elseif (!$id && $species = $service->createSpecies($data, Auth::user())) {
             flash('Species created successfully.')->success();
+
             return redirect()->to('admin/data/species/edit/'.$species->id);
+        } else {
+            foreach ($service->errors()->getMessages()['error'] as $error) {
+                flash($error)->error();
+            }
         }
-        else {
-            foreach($service->errors()->getMessages()['error'] as $error) flash($error)->error();
-        }
+
         return redirect()->back();
     }
-    
+
     /**
      * Gets the species deletion modal.
      *
-     * @param  int  $id
+     * @param int $id
+     *
      * @return \Illuminate\Contracts\Support\Renderable
      */
-    public function getDeleteSpecies($id)
-    {
+    public function getDeleteSpecies($id) {
         $species = Species::find($id);
+
         return view('admin.specieses._delete_species', [
             'species' => $species,
         ]);
@@ -110,37 +108,39 @@ public function getDeleteSpecies($id)
     /**
      * Deletes a species.
      *
-     * @param  \Illuminate\Http\Request     $request
-     * @param  App\Services\SpeciesService  $service
-     * @param  int                          $id
+     * @param App\Services\SpeciesService $service
+     * @param int                         $id
+     *
      * @return \Illuminate\Http\RedirectResponse
      */
-    public function postDeleteSpecies(Request $request, SpeciesService $service, $id)
-    {
-        if($id && $service->deleteSpecies(Species::find($id))) {
+    public function postDeleteSpecies(Request $request, SpeciesService $service, $id) {
+        if ($id && $service->deleteSpecies(Species::find($id))) {
             flash('Species deleted successfully.')->success();
+        } else {
+            foreach ($service->errors()->getMessages()['error'] as $error) {
+                flash($error)->error();
+            }
         }
-        else {
-            foreach($service->errors()->getMessages()['error'] as $error) flash($error)->error();
-        }
+
         return redirect()->to('admin/data/species');
     }
 
     /**
      * Sorts species.
      *
-     * @param  \Illuminate\Http\Request     $request
-     * @param  App\Services\SpeciesService  $service
+     * @param App\Services\SpeciesService $service
+     *
      * @return \Illuminate\Http\RedirectResponse
      */
-    public function postSortSpecies(Request $request, SpeciesService $service)
-    {
-        if($service->sortSpecies($request->get('sort'))) {
+    public function postSortSpecies(Request $request, SpeciesService $service) {
+        if ($service->sortSpecies($request->get('sort'))) {
             flash('Species order updated successfully.')->success();
+        } else {
+            foreach ($service->errors()->getMessages()['error'] as $error) {
+                flash($error)->error();
+            }
         }
-        else {
-            foreach($service->errors()->getMessages()['error'] as $error) flash($error)->error();
-        }
+
         return redirect()->back();
     }
 
@@ -149,78 +149,81 @@ public function postSortSpecies(Request $request, SpeciesService $service)
      *
      * @return \Illuminate\Contracts\Support\Renderable
      */
-    public function getSubtypeIndex()
-    {
+    public function getSubtypeIndex() {
         return view('admin.specieses.subtypes', [
-            'subtypes' => Subtype::orderBy('sort', 'DESC')->get()
+            'subtypes' => Subtype::orderBy('sort', 'DESC')->get(),
         ]);
     }
-    
+
     /**
      * Shows the create subtype page.
      *
      * @return \Illuminate\Contracts\Support\Renderable
      */
-    public function getCreateSubtype()
-    {
+    public function getCreateSubtype() {
         return view('admin.specieses.create_edit_subtype', [
-            'subtype' => new Subtype,
-            'specieses' => Species::orderBy('sort', 'DESC')->pluck('name', 'id')->toArray()
+            'subtype'   => new Subtype,
+            'specieses' => Species::orderBy('sort', 'DESC')->pluck('name', 'id')->toArray(),
         ]);
     }
-    
+
     /**
      * Shows the edit subtype page.
      *
-     * @param  int  $id
+     * @param int $id
+     *
      * @return \Illuminate\Contracts\Support\Renderable
      */
-    public function getEditSubtype($id)
-    {
+    public function getEditSubtype($id) {
         $subtype = Subtype::find($id);
-        if(!$subtype) abort(404);
+        if (!$subtype) {
+            abort(404);
+        }
+
         return view('admin.specieses.create_edit_subtype', [
-            'subtype' => $subtype,
-            'specieses' => Species::orderBy('sort', 'DESC')->pluck('name', 'id')->toArray()
+            'subtype'   => $subtype,
+            'specieses' => Species::orderBy('sort', 'DESC')->pluck('name', 'id')->toArray(),
         ]);
     }
 
     /**
      * Creates or edits a subtype.
      *
-     * @param  \Illuminate\Http\Request     $request
-     * @param  App\Services\SpeciesService  $service
-     * @param  int|null                     $id
+     * @param App\Services\SpeciesService $service
+     * @param int|null                    $id
+     *
      * @return \Illuminate\Http\RedirectResponse
      */
-    public function postCreateEditSubtype(Request $request, SpeciesService $service, $id = null)
-    {
+    public function postCreateEditSubtype(Request $request, SpeciesService $service, $id = null) {
         $id ? $request->validate(Subtype::$updateRules) : $request->validate(Subtype::$createRules);
         $data = $request->only([
-            'species_id', 'name', 'description', 'image', 'remove_image'
+            'species_id', 'name', 'description', 'image', 'remove_image', 'is_visible',
         ]);
-        if($id && $service->updateSubtype(Subtype::find($id), $data, Auth::user())) {
+        if ($id && $service->updateSubtype(Subtype::find($id), $data, Auth::user())) {
             flash('Subtype updated successfully.')->success();
-        }
-        else if (!$id && $subtype = $service->createSubtype($data, Auth::user())) {
+        } elseif (!$id && $subtype = $service->createSubtype($data, Auth::user())) {
             flash('Subtype created successfully.')->success();
+
             return redirect()->to('admin/data/subtypes/edit/'.$subtype->id);
+        } else {
+            foreach ($service->errors()->getMessages()['error'] as $error) {
+                flash($error)->error();
+            }
         }
-        else {
-            foreach($service->errors()->getMessages()['error'] as $error) flash($error)->error();
-        }
+
         return redirect()->back();
     }
-    
+
     /**
      * Gets the subtype deletion modal.
      *
-     * @param  int  $id
+     * @param int $id
+     *
      * @return \Illuminate\Contracts\Support\Renderable
      */
-    public function getDeleteSubtype($id)
-    {
+    public function getDeleteSubtype($id) {
         $subtype = Subtype::find($id);
+
         return view('admin.specieses._delete_subtype', [
             'subtype' => $subtype,
         ]);
@@ -229,37 +232,39 @@ public function getDeleteSubtype($id)
     /**
      * Deletes a subtype.
      *
-     * @param  \Illuminate\Http\Request     $request
-     * @param  App\Services\SpeciesService  $service
-     * @param  int                          $id
+     * @param App\Services\SpeciesService $service
+     * @param int                         $id
+     *
      * @return \Illuminate\Http\RedirectResponse
      */
-    public function postDeleteSubtype(Request $request, SpeciesService $service, $id)
-    {
-        if($id && $service->deleteSubtype(Subtype::find($id))) {
+    public function postDeleteSubtype(Request $request, SpeciesService $service, $id) {
+        if ($id && $service->deleteSubtype(Subtype::find($id))) {
             flash('Subtype deleted successfully.')->success();
+        } else {
+            foreach ($service->errors()->getMessages()['error'] as $error) {
+                flash($error)->error();
+            }
         }
-        else {
-            foreach($service->errors()->getMessages()['error'] as $error) flash($error)->error();
-        }
+
         return redirect()->to('admin/data/subtypes');
     }
 
     /**
      * Sorts subtypes.
      *
-     * @param  \Illuminate\Http\Request     $request
-     * @param  App\Services\SpeciesService  $service
+     * @param App\Services\SpeciesService $service
+     *
      * @return \Illuminate\Http\RedirectResponse
      */
-    public function postSortSubtypes(Request $request, SpeciesService $service)
-    {
-        if($service->sortSubtypes($request->get('sort'))) {
+    public function postSortSubtypes(Request $request, SpeciesService $service) {
+        if ($service->sortSubtypes($request->get('sort'))) {
             flash('Subtype order updated successfully.')->success();
+        } else {
+            foreach ($service->errors()->getMessages()['error'] as $error) {
+                flash($error)->error();
+            }
         }
-        else {
-            foreach($service->errors()->getMessages()['error'] as $error) flash($error)->error();
-        }
+
         return redirect()->back();
     }
 }
diff --git a/app/Http/Controllers/Admin/Data/SublistController.php b/app/Http/Controllers/Admin/Data/SublistController.php
index 7fcf67aaa2..dd8d86f407 100644
--- a/app/Http/Controllers/Admin/Data/SublistController.php
+++ b/app/Http/Controllers/Admin/Data/SublistController.php
@@ -2,16 +2,14 @@
 
 namespace App\Http\Controllers\Admin\Data;
 
-use Illuminate\Http\Request;
-
 use App\Http\Controllers\Controller;
-use App\Models\Character\Sublist;
-use App\Services\SublistService;
 use App\Models\Character\CharacterCategory;
+use App\Models\Character\Sublist;
 use App\Models\Species\Species;
+use App\Services\SublistService;
+use Illuminate\Http\Request;
 
-class SublistController extends Controller
-{
+class SublistController extends Controller {
     /*
     |--------------------------------------------------------------------------
     | Admin / Masterlist Sub Controller
@@ -26,87 +24,94 @@ class SublistController extends Controller
      *
      * @return \Illuminate\Contracts\Support\Renderable
      */
-    public function getIndex()
-    {
+    public function getIndex() {
         return view('admin.sublist.sublist', [
-            'sublists' => Sublist::orderBy('sort', 'DESC')->get()
+            'sublists' => Sublist::orderBy('sort', 'DESC')->get(),
         ]);
     }
-    
+
     /**
      * Shows the create sublist page.
      *
      * @return \Illuminate\Contracts\Support\Renderable
      */
-    public function getCreateSublist()
-    {
+    public function getCreateSublist() {
         return view('admin.sublist.create_edit_sublist', [
-            'sublist' => new Sublist,
+            'sublist'       => new Sublist,
             'subCategories' => [],
-            'subSpecies' => [],
-            'categories' => CharacterCategory::orderBy('sort')->pluck('name', 'id'),
-            'species' => Species::orderBy('sort')->pluck('name', 'id')
+            'subSpecies'    => [],
+            'categories'    => CharacterCategory::orderBy('sort')->pluck('name', 'id'),
+            'species'       => Species::orderBy('sort')->pluck('name', 'id'),
         ]);
     }
-    
+
     /**
      * Shows the edit sublist page.
      *
-     * @param  int  $id
+     * @param int $id
+     *
      * @return \Illuminate\Contracts\Support\Renderable
      */
-    public function getEditSublist($id)
-    {
+    public function getEditSublist($id) {
         $sublist = Sublist::find($id);
-        if(!$sublist) abort(404);
+        if (!$sublist) {
+            abort(404);
+        }
+
         return view('admin.sublist.create_edit_sublist', [
-            'sublist' => $sublist,
+            'sublist'       => $sublist,
             'subCategories' => CharacterCategory::where('masterlist_sub_id', $sublist->id)->pluck('id'),
-            'subSpecies' => Species::where('masterlist_sub_id', $sublist->id)->pluck('id'),
-            'categories' => CharacterCategory::orderBy('sort')->pluck('name', 'id'),
-            'species' => Species::orderBy('sort')->pluck('name', 'id')
+            'subSpecies'    => Species::where('masterlist_sub_id', $sublist->id)->pluck('id'),
+            'categories'    => CharacterCategory::orderBy('sort')->pluck('name', 'id'),
+            'species'       => Species::orderBy('sort')->pluck('name', 'id'),
         ]);
     }
 
     /**
      * Creates or edits a sublist.
      *
-     * @param  \Illuminate\Http\Request               $request
-     * @param  App\Services\SublistService             $service
-     * @param  int|null                               $id
+     * @param App\Services\SublistService $service
+     * @param int|null                    $id
+     *
      * @return \Illuminate\Http\RedirectResponse
      */
-    public function postCreateEditSublist(Request $request, SublistService $service, $id = null)
-    {
-        if(!$request['show_main'] || $request['show_main'] == null) $request['show_main'] = 0; else $request['show_main'] = 1;
+    public function postCreateEditSublist(Request $request, SublistService $service, $id = null) {
+        if (!$request['show_main'] || $request['show_main'] == null) {
+            $request['show_main'] = 0;
+        } else {
+            $request['show_main'] = 1;
+        }
         $id ? $request->validate(Sublist::$updateRules) : $request->validate(Sublist::$createRules);
         $data = $request->only([
-            'name', 'key', 'show_main'
+            'name', 'key', 'show_main',
         ]);
-        $contents = $request->only([ 'categories', 'species' ]);
+        $contents = $request->only(['categories', 'species']);
 
-        if($id && $service->updateSublist(Sublist::find($id), $data, $contents)) {
+        if ($id && $service->updateSublist(Sublist::find($id), $data, $contents)) {
             flash('Sublist updated successfully.')->success();
-        }
-        else if (!$id && $sublist = $service->createSublist($data, $contents)) {
+        } elseif (!$id && $sublist = $service->createSublist($data, $contents)) {
             flash('Sublist created successfully.')->success();
+
             return redirect()->to('admin/data/sublists/edit/'.$sublist->id);
+        } else {
+            foreach ($service->errors()->getMessages()['error'] as $error) {
+                flash($error)->error();
+            }
         }
-        else {
-            foreach($service->errors()->getMessages()['error'] as $error) flash($error)->error();
-        }
+
         return redirect()->back();
     }
-    
+
     /**
      * Gets the sublist deletion modal.
      *
-     * @param  int  $id
+     * @param int $id
+     *
      * @return \Illuminate\Contracts\Support\Renderable
      */
-    public function getDeleteSublist($id)
-    {
+    public function getDeleteSublist($id) {
         $sublist = Sublist::find($id);
+
         return view('admin.sublist._delete_sublist', [
             'sublist' => $sublist,
         ]);
@@ -115,37 +120,39 @@ public function getDeleteSublist($id)
     /**
      * Deletes a sublist.
      *
-     * @param  \Illuminate\Http\Request               $request
-     * @param  App\Services\SublistService             $service
-     * @param  int                                    $id
+     * @param App\Services\SublistService $service
+     * @param int                         $id
+     *
      * @return \Illuminate\Http\RedirectResponse
      */
-    public function postDeleteSublist(Request $request, SublistService $service, $id)
-    {
-        if($id && $service->deleteSublist(Sublist::find($id))) {
+    public function postDeleteSublist(Request $request, SublistService $service, $id) {
+        if ($id && $service->deleteSublist(Sublist::find($id))) {
             flash('Sublist deleted successfully.')->success();
+        } else {
+            foreach ($service->errors()->getMessages()['error'] as $error) {
+                flash($error)->error();
+            }
         }
-        else {
-            foreach($service->errors()->getMessages()['error'] as $error) flash($error)->error();
-        }
+
         return redirect()->to('admin/data/sublists');
     }
-    
+
     /**
      * Sorts sublist order.
      *
-     * @param  \Illuminate\Http\Request               $request
-     * @param  App\Services\SublistService              $service
+     * @param App\Services\SublistService $service
+     *
      * @return \Illuminate\Http\RedirectResponse
      */
-    public function postSortSublist(Request $request, SublistService $service)
-    {
-        if($service->sortSublist($request->get('sort'))) {
+    public function postSortSublist(Request $request, SublistService $service) {
+        if ($service->sortSublist($request->get('sort'))) {
             flash('Category order updated successfully.')->success();
+        } else {
+            foreach ($service->errors()->getMessages()['error'] as $error) {
+                flash($error)->error();
+            }
         }
-        else {
-            foreach($service->errors()->getMessages()['error'] as $error) flash($error)->error();
-        }
+
         return redirect()->back();
     }
 }
diff --git a/app/Http/Controllers/Admin/DesignController.php b/app/Http/Controllers/Admin/DesignController.php
index 72787517e2..4bd17e057d 100644
--- a/app/Http/Controllers/Admin/DesignController.php
+++ b/app/Http/Controllers/Admin/DesignController.php
@@ -2,98 +2,116 @@
 
 namespace App\Http\Controllers\Admin;
 
-use Auth;
-use Config;
-use Illuminate\Http\Request;
-
-use App\Models\Character\CharacterDesignUpdate;
-use App\Models\Character\CharacterCategory;
-
-use App\Services\CharacterManager;
-
 use App\Http\Controllers\Controller;
+use App\Models\Character\CharacterCategory;
+use App\Models\Character\CharacterDesignUpdate;
+use App\Services\DesignUpdateManager;
+use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Auth;
 
-class DesignController extends Controller
-{
+class DesignController extends Controller {
     /**
      * Show the design index page.
      *
-     * @param  \Illuminate\Http\Request  $request
-     * @param  string                    $type
-     * @param  string                    $id
+     * @param string $type
+     * @param mixed  $status
+     *
      * @return \Illuminate\Contracts\Support\Renderable
      */
-    public function getDesignIndex(Request $request, $type, $status)
-    {
+    public function getDesignIndex(Request $request, $type, $status) {
         $requests = CharacterDesignUpdate::where('status', ucfirst($status));
-        if($type == 'myo-approvals') $requests = $requests->myos();
-        else $requests = $requests->characters();
-        
+        $data = $request->only(['sort']);
+        if (isset($data['sort'])) {
+            switch ($data['sort']) {
+                case 'newest':
+                    $requests->sortNewest();
+                    break;
+                case 'oldest':
+                    $requests->sortOldest();
+                    break;
+            }
+        } else {
+            $requests->sortOldest();
+        }
+        if ($type == 'myo-approvals') {
+            $requests = $requests->myos();
+        } else {
+            $requests = $requests->characters();
+        }
+
         return view('admin.designs.index', [
             'requests' => $requests->paginate(30)->appends($request->query()),
-            'isMyo' => ($type == 'myo-approvals')
+            'isMyo'    => ($type == 'myo-approvals'),
         ]);
     }
 
     /**
      * Show the design action confirmation modal.
      *
+     * @param mixed $id
+     * @param mixed $action
+     *
      * @return \Illuminate\Contracts\Support\Renderable
      */
-    public function getDesignConfirmation($id, $action)
-    {
+    public function getDesignConfirmation($id, $action) {
         $r = CharacterDesignUpdate::where('id', $id)->where('status', 'Pending')->first();
-        if(!$r) abort(404);
+        if (!$r) {
+            abort(404);
+        }
+
         return view('admin.designs._'.$action.'_request_modal', [
-            'request' => $r
+            'request' => $r,
         ] + ($action == 'approve' ? [
             'categories' => CharacterCategory::orderBy('sort')->get(),
         ] : []));
     }
 
-    public function postDesign($id, $action, Request $request, CharacterManager $service)
-    {
+    public function postDesign($id, $action, Request $request, DesignUpdateManager $service) {
         $r = CharacterDesignUpdate::where('id', $id)->where('status', 'Pending')->first();
 
-        if($action == 'cancel' && $service->cancelRequest($request->only(['staff_comments', 'preserve_queue']), $r, Auth::user())) {
+        if ($action == 'cancel' && $service->cancelRequest($request->only(['staff_comments', 'preserve_queue']), $r, Auth::user())) {
             flash('Request cancelled successfully.')->success();
-        }
-        elseif($action == 'approve' && $service->approveRequest($request->only([
-                'character_category_id', 'number', 'slug', 'description',
-                'is_giftable', 'is_tradeable', 'is_sellable', 'sale_value', 
-                'transferrable_at', 'set_active', 'invalidate_old',
-            ]), $r, Auth::user())) {
+        } elseif ($action == 'approve' && $service->approveRequest($request->only([
+            'character_category_id', 'number', 'slug', 'description',
+            'is_giftable', 'is_tradeable', 'is_sellable', 'sale_value',
+            'transferrable_at', 'set_active', 'invalidate_old', 'remove_myo_image',
+        ]), $r, Auth::user())) {
             flash('Request approved successfully.')->success();
-        }
-        elseif($action == 'reject' && $service->rejectRequest($request->only(['staff_comments']), $r, Auth::user())) {
+        } elseif ($action == 'reject' && $service->rejectRequest($request->only(['staff_comments']), $r, Auth::user())) {
             flash('Request rejected successfully.')->success();
+        } else {
+            foreach ($service->errors()->getMessages()['error'] as $error) {
+                flash($error)->error();
+            }
         }
-        else {
-            foreach($service->errors()->getMessages()['error'] as $error) flash($error)->error();
-        }
+
         return redirect()->back();
     }
 
     /**
      * Casts a vote for a design's approval or denial.
      *
+     * @param mixed $id
+     * @param mixed $action
+     *
      * @return \Illuminate\Contracts\Support\Renderable
      */
-    public function postVote($id, $action, Request $request, CharacterManager $service)
-    {
+    public function postVote($id, $action, Request $request, DesignUpdateManager $service) {
         $r = CharacterDesignUpdate::where('id', $id)->where('status', 'Pending')->first();
-        if(!$r) throw new \Exception ("Invalid design update.");
+        if (!$r) {
+            throw new \Exception('Invalid design update.');
+        }
 
-        if($action == 'reject' && $service->voteRequest($action, $r, Auth::user())) {
+        if ($action == 'reject' && $service->voteRequest($action, $r, Auth::user())) {
             flash('Voted to reject successfully.')->success();
-        }
-        elseif($action == 'approve' && $service->voteRequest($action, $r, Auth::user())) {
+        } elseif ($action == 'approve' && $service->voteRequest($action, $r, Auth::user())) {
             flash('Voted to approve successfully.')->success();
+        } else {
+            foreach ($service->errors()->getMessages()['error'] as $error) {
+                flash($error)->error();
+            }
         }
-        else {
-            foreach($service->errors()->getMessages()['error'] as $error) flash($error)->error();
-        }
+
         return redirect()->back();
     }
-
 }
diff --git a/app/Http/Controllers/Admin/FileController.php b/app/Http/Controllers/Admin/FileController.php
index 2aac0facaa..d1a0587781 100644
--- a/app/Http/Controllers/Admin/FileController.php
+++ b/app/Http/Controllers/Admin/FileController.php
@@ -2,206 +2,216 @@
 
 namespace App\Http\Controllers\Admin;
 
-use Illuminate\Http\Request;
-
-use Auth;
-use Config;
-
-use App\Services\FileManager;
-
 use App\Http\Controllers\Controller;
+use App\Services\FileManager;
+use Illuminate\Http\Request;
 
-class FileController extends Controller
-{
+class FileController extends Controller {
     /**
      * Shows the files index.
      *
-     * @param  string  $folder
+     * @param string $folder
+     *
      * @return \Illuminate\Contracts\Support\Renderable
      */
-    public function getIndex($folder = null)
-    {
+    public function getIndex($folder = null) {
         $filesDirectory = public_path().'/files';
 
         // Create the files directory if it doesn't already exist.
-        if(!file_exists($filesDirectory))
-        {
+        if (!file_exists($filesDirectory)) {
             // Create the directory.
             if (!mkdir($filesDirectory, 0755, true)) {
                 $this->abort(500);
+
                 return false;
             }
             chmod($filesDirectory, 0755);
         }
-        if($folder && !file_exists($filesDirectory.'/'.$folder)) abort(404);
+        if ($folder && !file_exists($filesDirectory.'/'.$folder)) {
+            abort(404);
+        }
         $dir = $filesDirectory.($folder ? '/'.$folder : '');
-        $files = scandir($dir); 
+        $files = scandir($dir);
         $fileList = [];
-        foreach($files as $file)
-        {
-            if(is_file($dir. '/'.$file)) $fileList[] = $file;
+        foreach ($files as $file) {
+            if (is_file($dir.'/'.$file)) {
+                $fileList[] = $file;
+            }
         }
+
         return view('admin.files.index', [
-            'folder' => $folder,
-            'folders' => glob(public_path().'/files/*' , GLOB_ONLYDIR),
-            'files' => $fileList
+            'folder'  => $folder,
+            'folders' => glob(public_path().'/files/*', GLOB_ONLYDIR),
+            'files'   => $fileList,
         ]);
     }
 
     /**
      * Creates a new directory in the files directory.
      *
-     * @param  \Illuminate\Http\Request  $request
-     * @param  App\Services\FileManager  $service
+     * @param App\Services\FileManager $service
+     *
      * @return \Illuminate\Http\RedirectResponse
      */
-    public function postCreateFolder(Request $request, FileManager $service)
-    {
+    public function postCreateFolder(Request $request, FileManager $service) {
         $request->validate(['name' => 'required|alpha_dash']);
 
-        if($service->createDirectory(public_path().'/files/'.$request->get('name'))) {
+        if ($service->createDirectory(public_path().'/files/'.$request->get('name'))) {
             flash('Folder created successfully.')->success();
+        } else {
+            foreach ($service->errors()->getMessages()['error'] as $error) {
+                flash($error)->error();
+            }
         }
-        else {
-            foreach($service->errors()->getMessages()['error'] as $error) flash($error)->error();
-        }
+
         return redirect()->back();
     }
 
     /**
      * Moves a file in the files directory.
      *
-     * @param  \Illuminate\Http\Request  $request
-     * @param  App\Services\FileManager  $service
+     * @param App\Services\FileManager $service
+     *
      * @return \Illuminate\Http\RedirectResponse
      */
-    public function postMoveFile(Request $request, FileManager $service)
-    {
+    public function postMoveFile(Request $request, FileManager $service) {
         $request->validate(['destination' => 'required']);
         $oldDir = $request->get('folder');
         $newDir = $request->get('destination');
 
-        if($service->moveFile(public_path().'/files'.($oldDir ? '/' . $oldDir : ''),
-        public_path().'/files'.($newDir != 'root' ? '/' . $newDir : ''),
-        $request->get('filename'))) {
+        if ($service->moveFile(
+            public_path().'/files'.($oldDir ? '/'.$oldDir : ''),
+            public_path().'/files'.($newDir != 'root' ? '/'.$newDir : ''),
+            $request->get('filename')
+        )) {
             flash('File moved successfully.')->success();
+        } else {
+            foreach ($service->errors()->getMessages()['error'] as $error) {
+                flash($error)->error();
+            }
         }
-        else {
-            foreach($service->errors()->getMessages()['error'] as $error) flash($error)->error();
-        }
+
         return redirect()->back();
     }
 
     /**
      * Renames a file in the files directory.
      *
-     * @param  \Illuminate\Http\Request  $request
-     * @param  App\Services\FileManager  $service
+     * @param App\Services\FileManager $service
+     *
      * @return \Illuminate\Http\RedirectResponse
      */
-    public function postRenameFile(Request $request, FileManager $service)
-    {
+    public function postRenameFile(Request $request, FileManager $service) {
         $request->validate(['name' => 'required|regex:/^[a-z0-9\._-]+$/i']);
         $dir = $request->get('folder');
         $oldName = $request->get('filename');
         $newName = $request->get('name');
 
-        if($service->renameFile(public_path().'/files'.($dir ? '/' . $dir : ''), $oldName, $newName)) {
+        if ($service->renameFile(public_path().'/files'.($dir ? '/'.$dir : ''), $oldName, $newName)) {
             flash('File renamed successfully.')->success();
+        } else {
+            foreach ($service->errors()->getMessages()['error'] as $error) {
+                flash($error)->error();
+            }
         }
-        else {
-            foreach($service->errors()->getMessages()['error'] as $error) flash($error)->error();
-        }
+
         return redirect()->back();
     }
 
     /**
      * Deletes a file in the files directory.
      *
-     * @param  \Illuminate\Http\Request  $request
-     * @param  App\Services\FileManager  $service
+     * @param App\Services\FileManager $service
+     *
      * @return \Illuminate\Http\RedirectResponse
      */
-    public function postDeleteFile(Request $request, FileManager $service)
-    {
+    public function postDeleteFile(Request $request, FileManager $service) {
         $request->validate(['filename' => 'required']);
         $dir = $request->get('folder');
         $name = $request->get('filename');
 
-        if($service->deleteFile(public_path().'/files'.($dir ? '/' . $dir : '') . '/' . $name)) {
+        if ($service->deleteFile(public_path().'/files'.($dir ? '/'.$dir : '').'/'.$name)) {
             flash('File deleted successfully.')->success();
+        } else {
+            foreach ($service->errors()->getMessages()['error'] as $error) {
+                flash($error)->error();
+            }
         }
-        else {
-            foreach($service->errors()->getMessages()['error'] as $error) flash($error)->error();
-        }
+
         return redirect()->back();
     }
 
     /**
      * Uploads a file to the files directory.
      *
-     * @param  \Illuminate\Http\Request  $request
-     * @param  App\Services\FileManager  $service
+     * @param App\Services\FileManager $service
+     *
      * @return \Illuminate\Http\RedirectResponse
      */
-    public function postUploadFile(Request $request, FileManager $service)
-    {
-        $request->validate(['file' => 'required|file']);
+    public function postUploadFile(Request $request, FileManager $service) {
+        $request->validate(['files.*' => 'file|required']);
         $dir = $request->get('folder');
-        $file = $request->file('file');
-
-        if($service->uploadFile($file, $dir, $file->getClientOriginalName())) {
-            flash('File uploaded successfully.')->success();
-        }
-        else {
-            foreach($service->errors()->getMessages()['error'] as $error) flash($error)->error();
+        $files = $request->file('files');
+        foreach ($files as $file) {
+            if ($service->uploadFile($file, $dir, $file->getClientOriginalName())) {
+                flash('File uploaded successfully.')->success();
+            } else {
+                foreach ($service->errors()->getMessages()['error'] as $error) {
+                    flash($error)->error();
+                }
+            }
         }
+
         return redirect()->back();
     }
 
     /**
      * Renames a directory in the files directory.
      *
-     * @param  \Illuminate\Http\Request  $request
-     * @param  App\Services\FileManager  $service
+     * @param App\Services\FileManager $service
+     *
      * @return \Illuminate\Http\RedirectResponse
      */
-    public function postRenameFolder(Request $request, FileManager $service)
-    {
+    public function postRenameFolder(Request $request, FileManager $service) {
         $request->validate(['name' => 'required|regex:/^[a-z0-9\._-]+$/i']);
         $dir = public_path().'/files';
         $oldName = $request->get('folder');
         $newName = $request->get('name');
 
-        if($service->renameDirectory($dir, $oldName, $newName)) {
+        if ($service->renameDirectory($dir, $oldName, $newName)) {
             flash('Folder renamed successfully.')->success();
-        }
-        else {
-            foreach($service->errors()->getMessages()['error'] as $error) flash($error)->error();
+        } else {
+            foreach ($service->errors()->getMessages()['error'] as $error) {
+                flash($error)->error();
+            }
+
             return redirect()->back();
         }
+
         return redirect()->to('admin/files/'.$newName);
     }
 
     /**
      * Deletes a directory in the files directory.
      *
-     * @param  \Illuminate\Http\Request  $request
-     * @param  App\Services\FileManager  $service
+     * @param App\Services\FileManager $service
+     *
      * @return \Illuminate\Http\RedirectResponse
      */
-    public function postDeleteFolder(Request $request, FileManager $service)
-    {
+    public function postDeleteFolder(Request $request, FileManager $service) {
         $request->validate(['folder' => 'required']);
         $dir = $request->get('folder');
 
-        if($service->deleteDirectory(public_path().'/files/'.$dir)) {
+        if ($service->deleteDirectory(public_path().'/files/'.$dir)) {
             flash('Folder deleted successfully.')->success();
-        }
-        else {
-            foreach($service->errors()->getMessages()['error'] as $error) flash($error)->error();
+        } else {
+            foreach ($service->errors()->getMessages()['error'] as $error) {
+                flash($error)->error();
+            }
+
             return redirect()->back();
         }
+
         return redirect()->to('admin/files');
     }
 
@@ -210,54 +220,55 @@ public function postDeleteFolder(Request $request, FileManager $service)
      *
      * @return \Illuminate\Contracts\Support\Renderable
      */
-    public function getSiteImages()
-    {
+    public function getSiteImages() {
         return view('admin.files.images', [
-            'images' => Config::get('lorekeeper.image_files')
+            'images' => config('lorekeeper.image_files'),
         ]);
     }
 
     /**
      * Uploads a site image file.
      *
-     * @param  \Illuminate\Http\Request  $request
-     * @param  App\Services\FileManager  $service
+     * @param App\Services\FileManager $service
+     *
      * @return \Illuminate\Http\RedirectResponse
      */
-    public function postUploadImage(Request $request, FileManager $service)
-    {
+    public function postUploadImage(Request $request, FileManager $service) {
         $request->validate(['file' => 'required|file']);
         $file = $request->file('file');
         $key = $request->get('key');
-        $filename = Config::get('lorekeeper.image_files.'.$key)['filename'];
+        $filename = config('lorekeeper.image_files.'.$key)['filename'];
 
-        if($service->uploadFile($file, null, $filename, false)) {
+        if ($service->uploadFile($file, null, $filename, false)) {
             flash('Image uploaded successfully.')->success();
+        } else {
+            foreach ($service->errors()->getMessages()['error'] as $error) {
+                flash($error)->error();
+            }
         }
-        else {
-            foreach($service->errors()->getMessages()['error'] as $error) flash($error)->error();
-        }
+
         return redirect()->back();
     }
 
     /**
      * Uploads a custom site CSS file.
      *
-     * @param  \Illuminate\Http\Request  $request
-     * @param  App\Services\FileManager  $service
+     * @param App\Services\FileManager $service
+     *
      * @return \Illuminate\Http\RedirectResponse
      */
-    public function postUploadCss(Request $request, FileManager $service)
-    {
+    public function postUploadCss(Request $request, FileManager $service) {
         $request->validate(['file' => 'required|file']);
         $file = $request->file('file');
 
-        if($service->uploadCss($file)) {
+        if ($service->uploadCss($file)) {
             flash('File uploaded successfully.')->success();
+        } else {
+            foreach ($service->errors()->getMessages()['error'] as $error) {
+                flash($error)->error();
+            }
         }
-        else {
-            foreach($service->errors()->getMessages()['error'] as $error) flash($error)->error();
-        }
+
         return redirect()->back();
     }
 }
diff --git a/app/Http/Controllers/Admin/GalleryController.php b/app/Http/Controllers/Admin/GalleryController.php
index 0b911254e3..b3126db1ab 100644
--- a/app/Http/Controllers/Admin/GalleryController.php
+++ b/app/Http/Controllers/Admin/GalleryController.php
@@ -2,79 +2,111 @@
 
 namespace App\Http\Controllers\Admin;
 
-use Auth;
-use Config;
-use Settings;
-use Illuminate\Http\Request;
-
+use App\Facades\Settings;
+use App\Http\Controllers\Controller;
+use App\Models\Currency\Currency;
 use App\Models\Gallery\Gallery;
 use App\Models\Gallery\GallerySubmission;
-use App\Models\Currency\Currency;
-
 use App\Services\GalleryManager;
+use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Auth;
 
-use App\Http\Controllers\Controller;
-
-class GalleryController extends Controller
-{
+class GalleryController extends Controller {
     /**
      * Shows the submission index page.
      *
-     * @param  string  $status
+     * @param string $status
+     *
      * @return \Illuminate\Contracts\Support\Renderable
      */
-    public function getSubmissionIndex(Request $request, $status = null)
-    {
+    public function getSubmissionIndex(Request $request, $status = null) {
         $submissions = GallerySubmission::collaboratorApproved()->where('status', $status ? ucfirst($status) : 'Pending');
-        if($request->get('gallery_id')) 
-            $submissions->where(function($query) use ($request) {
-                $query->where('gallery_id', $request->get('gallery_id'));
+        $data = $request->only(['gallery_id', 'sort']);
+        if (isset($data['gallery_id'])) {
+            $submissions->where(function ($query) use ($data) {
+                $query->where('gallery_id', $data['gallery_id']);
             });
-        if($status == 'pending' || !$status) $submissions = $submissions->orderBy('created_at', 'ASC');
-        else $submissions = $submissions->orderBy('created_at', 'DESC');
+        }
+        if (isset($data['sort'])) {
+            switch ($data['sort']) {
+                case 'newest':
+                    $submissions->sortNewest();
+                    break;
+                case 'oldest':
+                    $submissions->sortOldest();
+                    break;
+            }
+        } else {
+            $submissions->sortOldest();
+        }
+        if ($status == 'pending' || !$status) {
+            $submissions = $submissions->orderBy('created_at', 'ASC');
+        } else {
+            $submissions = $submissions->orderBy('created_at', 'DESC');
+        }
+
         return view('admin.galleries.submissions_index', [
             'submissions' => $submissions->paginate(10)->appends($request->query()),
-            'galleries' => ['' => 'Any Gallery'] + Gallery::orderBy('sort', 'DESC')->pluck('name', 'id')->toArray()
+            'galleries'   => ['' => 'Any Gallery'] + Gallery::orderBy('sort', 'DESC')->pluck('name', 'id')->toArray(),
         ]);
     }
 
     /**
      * Shows the index of submissions in the context of currency rewards.
      *
-     * @param  string  $status
+     * @param string $status
+     *
      * @return \Illuminate\Contracts\Support\Renderable
      */
-    public function getCurrencyIndex(Request $request, $status = null)
-    {
+    public function getCurrencyIndex(Request $request, $status = null) {
         $submissions = GallerySubmission::requiresAward()->where('is_valued', !$status || $status == 'pending' ? 0 : 1);
-        if($request->get('gallery_id')) 
-            $submissions->where(function($query) use ($request) {
-                $query->where('gallery_id', $request->get('gallery_id'));
+        $data = $request->only(['gallery_id', 'sort']);
+        if (isset($data['gallery_id'])) {
+            $submissions->where(function ($query) use ($data) {
+                $query->where('gallery_id', $data['gallery_id']);
             });
-        if($status == 'pending' || !$status) $submissions = $submissions->orderBy('created_at', 'ASC');
-        else $submissions = $submissions->orderBy('created_at', 'DESC');
+        }
+        if (isset($data['sort'])) {
+            switch ($data['sort']) {
+                case 'newest':
+                    $submissions->sortNewest();
+                    break;
+                case 'oldest':
+                    $submissions->sortOldest();
+                    break;
+            }
+        } else {
+            $submissions->sortOldest();
+        }
+        if ($status == 'pending' || !$status) {
+            $submissions = $submissions->orderBy('created_at', 'ASC');
+        } else {
+            $submissions = $submissions->orderBy('created_at', 'DESC');
+        }
+
         return view('admin.galleries.submissions_currency_index', [
             'submissions' => $submissions->paginate(10)->appends($request->query()),
-            'galleries' => ['' => 'Any Gallery'] + Gallery::orderBy('sort', 'DESC')->pluck('name', 'id')->toArray(),
-            'currency' => Currency::find(Settings::get('group_currency'))
+            'galleries'   => ['' => 'Any Gallery'] + Gallery::orderBy('sort', 'DESC')->pluck('name', 'id')->toArray(),
+            'currency'    => Currency::find(Settings::get('group_currency')),
         ]);
     }
 
     /**
      * Edits gallery submissions.
      *
-     * @param  \Illuminate\Http\Request       $request
-     * @param  App\Services\GalleryManager    $service
-     * @param  int                            $id
-     * @param  string                         $action
+     * @param App\Services\GalleryManager $service
+     * @param int                         $id
+     * @param string                      $action
+     *
      * @return \Illuminate\Http\RedirectResponse
      */
-    public function postEditSubmission(Request $request, GalleryManager $service, $id, $action)
-    {
-        if(!$id) { flash('Invalid submission selected.')->error(); }
-        
-        if($id && $action) {
-            switch($action) {
+    public function postEditSubmission(Request $request, GalleryManager $service, $id, $action) {
+        if (!$id) {
+            flash('Invalid submission selected.')->error();
+        }
+
+        if ($id && $action) {
+            switch ($action) {
                 default:
                     flash('Invalid action selected.')->error();
                     break;
@@ -92,71 +124,77 @@ public function postEditSubmission(Request $request, GalleryManager $service, $i
                     break;
             }
         }
+
         return redirect()->back();
     }
 
     /**
      * Casts a vote for a submission's approval or denial.
      *
-     * @param  int                            $id
-     * @param  string                         $action
-     * @param  \Illuminate\Http\Request       $request
-     * @param  App\Services\GalleryManager    $service
+     * @param int                         $id
+     * @param string                      $action
+     * @param App\Services\GalleryManager $service
+     *
      * @return \Illuminate\Contracts\Support\Renderable
      */
-    private function postVote($id, GalleryManager $service, $action)
-    {
+    private function postVote($id, GalleryManager $service, $action) {
         $submission = GallerySubmission::where('id', $id)->where('status', 'Pending')->first();
-        if(!$submission) throw new \Exception ("Invalid submission.");
+        if (!$submission) {
+            throw new \Exception('Invalid submission.');
+        }
 
-        if($action == 'reject' && $service->castVote($action, $submission, Auth::user())) {
+        if ($action == 'reject' && $service->castVote($action, $submission, Auth::user())) {
             flash('Voted to reject successfully.')->success();
-        }
-        elseif($action == 'accept' && $service->castVote($action, $submission, Auth::user())) {
+        } elseif ($action == 'accept' && $service->castVote($action, $submission, Auth::user())) {
             flash('Voted to approve successfully.')->success();
+        } else {
+            foreach ($service->errors()->getMessages()['error'] as $error) {
+                flash($error)->error();
+            }
         }
-        else {
-            foreach($service->errors()->getMessages()['error'] as $error) flash($error)->error();
-        }
+
         return redirect()->back();
     }
 
     /**
      * Posts staff comments for a gallery submission.
      *
-     * @param  int                             $id
-     * @param  string                          $data
-     * @param  App\Services\GalleryManager     $service
+     * @param int                         $id
+     * @param string                      $data
+     * @param App\Services\GalleryManager $service
+     *
      * @return \Illuminate\Http\RedirectResponse
      */
-    private function postStaffComments($id, $data, GalleryManager $service)
-    {
-        if($service->postStaffComments($id, $data, Auth::user())) {
+    private function postStaffComments($id, $data, GalleryManager $service) {
+        if ($service->postStaffComments($id, $data, Auth::user())) {
             flash('Comments updated succesfully.')->success();
+        } else {
+            foreach ($service->errors()->getMessages()['error'] as $error) {
+                flash($error)->error();
+            }
         }
-        else {
-            foreach($service->errors()->getMessages()['error'] as $error) flash($error)->error();
-        }
+
         return redirect()->back();
     }
 
     /**
      * Posts group currency evaluation for a gallery submission.
      *
-     * @param  int                             $id
-     * @param  string                          $data
-     * @param  App\Services\GalleryManager     $service
+     * @param int                         $id
+     * @param string                      $data
+     * @param App\Services\GalleryManager $service
+     *
      * @return \Illuminate\Http\RedirectResponse
      */
-    private function postValue($id, $data, GalleryManager $service)
-    {
-        if($service->postValueSubmission($id, $data, Auth::user())) {
+    private function postValue($id, $data, GalleryManager $service) {
+        if ($service->postValueSubmission($id, $data, Auth::user())) {
             flash('Submission evaluated succesfully.')->success();
+        } else {
+            foreach ($service->errors()->getMessages()['error'] as $error) {
+                flash($error)->error();
+            }
         }
-        else {
-            foreach($service->errors()->getMessages()['error'] as $error) flash($error)->error();
-        }
+
         return redirect()->back();
     }
-
 }
diff --git a/app/Http/Controllers/Admin/HomeController.php b/app/Http/Controllers/Admin/HomeController.php
index 333d6fb134..dfea74f501 100644
--- a/app/Http/Controllers/Admin/HomeController.php
+++ b/app/Http/Controllers/Admin/HomeController.php
@@ -2,46 +2,107 @@
 
 namespace App\Http\Controllers\Admin;
 
-use Illuminate\Http\Request;
-
-use Settings;
-use Auth;
-
-use App\Models\Submission\Submission;
-use App\Models\Gallery\GallerySubmission;
+use App\Facades\Settings;
+use App\Http\Controllers\Controller;
+use App\Models\AdminLog;
 use App\Models\Character\CharacterDesignUpdate;
 use App\Models\Character\CharacterTransfer;
-use App\Models\Trade;
+use App\Models\Currency\Currency;
+use App\Models\Gallery\GallerySubmission;
 use App\Models\Report\Report;
+use App\Models\Submission\Submission;
+use App\Models\Trade;
+use App\Models\User\User;
+use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Auth;
+use Illuminate\Support\Facades\DB;
 
-use App\Http\Controllers\Controller;
-
-class HomeController extends Controller
-{
+class HomeController extends Controller {
     /**
      * Show the admin dashboard.
      *
      * @return \Illuminate\Contracts\Support\Renderable
      */
-    public function getIndex()
-    {
+    public function getIndex() {
         $openTransfersQueue = Settings::get('open_transfers_queue');
         $galleryRequireApproval = Settings::get('gallery_submissions_require_approval');
         $galleryCurrencyAwards = Settings::get('gallery_submissions_reward_currency');
+
         return view('admin.index', [
-            'submissionCount' => Submission::where('status', 'Pending')->whereNotNull('prompt_id')->count(),
-            'claimCount' => Submission::where('status', 'Pending')->whereNull('prompt_id')->count(),
-            'designCount' => CharacterDesignUpdate::characters()->where('status', 'Pending')->count(),
-            'myoCount' => CharacterDesignUpdate::myos()->where('status', 'Pending')->count(),
-            'reportCount' => Report::where('status', 'Pending')->count(),
-            'assignedReportCount' => Report::assignedToMe(Auth::user())->count(),
-            'openTransfersQueue' => $openTransfersQueue,
-            'transferCount' => $openTransfersQueue ? CharacterTransfer::active()->where('is_approved', 0)->count() : 0,
-            'tradeCount' => $openTransfersQueue ? Trade::where('status', 'Pending')->count() : 0,
+            'submissionCount'        => Submission::where('status', 'Pending')->whereNotNull('prompt_id')->count(),
+            'claimCount'             => Submission::where('status', 'Pending')->whereNull('prompt_id')->count(),
+            'designCount'            => CharacterDesignUpdate::characters()->where('status', 'Pending')->count(),
+            'myoCount'               => CharacterDesignUpdate::myos()->where('status', 'Pending')->count(),
+            'reportCount'            => Report::where('status', 'Pending')->count(),
+            'assignedReportCount'    => Report::assignedToMe(Auth::user())->count(),
+            'openTransfersQueue'     => $openTransfersQueue,
+            'transferCount'          => $openTransfersQueue ? CharacterTransfer::active()->where('is_approved', 0)->count() : 0,
+            'tradeCount'             => $openTransfersQueue ? Trade::where('status', 'Pending')->count() : 0,
             'galleryRequireApproval' => $galleryRequireApproval,
-            'galleryCurrencyAwards' => $galleryCurrencyAwards,
+            'galleryCurrencyAwards'  => $galleryCurrencyAwards,
             'gallerySubmissionCount' => GallerySubmission::collaboratorApproved()->where('status', 'Pending')->count(),
-            'galleryAwardCount' => GallerySubmission::requiresAward()->where('is_valued', 0)->count()
+            'galleryAwardCount'      => GallerySubmission::requiresAward()->where('is_valued', 0)->count(),
         ]);
     }
+
+    /**
+     * Show admin logs.
+     *
+     * @return \Illuminate\Contracts\Support\Renderable
+     */
+    public function getLogs(Request $request) {
+        // get all staff users so we can search by them
+        // have to check rank relation
+        $staff = User::whereHas('rank', function ($query) {
+            // check rank id = 1 OR the rank has existing relation powers
+            $query->where('id', 1)->orWhereHas('powers');
+        })->get()->pluck('name', 'id');
+
+        $query = AdminLog::query();
+
+        $data = $request->only(['user_id', 'action']);
+        if (isset($data['user_id']) && $data['user_id'] != '') {
+            $query->where('user_id', $data['user_id']);
+        }
+        if (isset($data['action']) && $data['action'] != '') {
+            $query->where('action', $data['action']);
+        }
+
+        $query->orderBy('created_at', 'DESC');
+
+        return view('admin.logs', [
+            'logs'    => $query->paginate(20)->appends($request->query()),
+            'staff'   => $staff,
+            'actions' => AdminLog::pluck('action', 'action')->unique(),
+        ]);
+    }
+
+    /**
+     * Shows the staff reward settings index.
+     *
+     * @return \Illuminate\Contracts\Support\Renderable
+     */
+    public function getStaffRewardSettings() {
+        return view('admin.staff_reward_settings', [
+            'currency' => Currency::find(config('lorekeeper.extensions.staff_rewards.currency_id')),
+            'settings' => DB::table('staff_actions')->orderBy('key')->paginate(20),
+        ]);
+    }
+
+    /**
+     * Edits a staff reward setting.
+     *
+     * @param string $key
+     *
+     * @return \Illuminate\Http\RedirectResponse
+     */
+    public function postEditStaffRewardSetting(Request $request, $key) {
+        if (DB::table('staff_actions')->where('key', $key)->update(['value' => $request->get('value')])) {
+            flash('Setting updated successfully.')->success();
+        } else {
+            flash('Invalid setting selected.')->success();
+        }
+
+        return redirect()->back();
+    }
 }
diff --git a/app/Http/Controllers/Admin/InvitationController.php b/app/Http/Controllers/Admin/InvitationController.php
index 9078360c2c..4aaf7b9aa2 100644
--- a/app/Http/Controllers/Admin/InvitationController.php
+++ b/app/Http/Controllers/Admin/InvitationController.php
@@ -2,61 +2,60 @@
 
 namespace App\Http\Controllers\Admin;
 
-use Illuminate\Http\Request;
-
-use Auth;
+use App\Http\Controllers\Controller;
 use App\Models\Invitation;
 use App\Services\InvitationService;
+use Illuminate\Support\Facades\Auth;
 
-use App\Http\Controllers\Controller;
-
-class InvitationController extends Controller
-{
+class InvitationController extends Controller {
     /**
      * Shows the invitation key index.
      *
      * @return \Illuminate\Contracts\Support\Renderable
      */
-    public function getIndex()
-    {
+    public function getIndex() {
         return view('admin.invitations.invitations', [
-            'invitations' => Invitation::orderBy('id', 'DESC')->paginate(20)
+            'invitations' => Invitation::orderBy('id', 'DESC')->paginate(20),
         ]);
     }
 
     /**
      * Generates a new invitation key.
      *
-     * @param  App\Services\InvitationService  $service
+     * @param App\Services\InvitationService $service
+     *
      * @return \Illuminate\Http\RedirectResponse
      */
-    public function postGenerateKey(InvitationService $service)
-    {
-        if($service->generateInvitation(Auth::user())) {
+    public function postGenerateKey(InvitationService $service) {
+        if ($service->generateInvitation(Auth::user())) {
             flash('Generated invitation successfully.')->success();
+        } else {
+            foreach ($service->errors()->getMessages()['error'] as $error) {
+                flash($error)->error();
+            }
         }
-        else {
-            foreach($service->errors()->getMessages()['error'] as $error) flash($error)->error();
-        }
+
         return redirect()->back();
     }
 
     /**
      * Generates a new invitation key.
      *
-     * @param  App\Services\InvitationService  $service
-     * @param  int                             $id
+     * @param App\Services\InvitationService $service
+     * @param int                            $id
+     *
      * @return \Illuminate\Http\RedirectResponse
      */
-    public function postDeleteKey(InvitationService $service, $id)
-    {
+    public function postDeleteKey(InvitationService $service, $id) {
         $invitation = Invitation::find($id);
-        if($invitation && $service->deleteInvitation($invitation)) {
+        if ($invitation && $service->deleteInvitation($invitation)) {
             flash('Deleted invitation key successfully.')->success();
+        } else {
+            foreach ($service->errors()->getMessages()['error'] as $error) {
+                flash($error)->error();
+            }
         }
-        else {
-            foreach($service->errors()->getMessages()['error'] as $error) flash($error)->error();
-        }
+
         return redirect()->back();
     }
 }
diff --git a/app/Http/Controllers/Admin/NewsController.php b/app/Http/Controllers/Admin/NewsController.php
index 05d2686f7d..dc22454cdb 100644
--- a/app/Http/Controllers/Admin/NewsController.php
+++ b/app/Http/Controllers/Admin/NewsController.php
@@ -2,92 +2,91 @@
 
 namespace App\Http\Controllers\Admin;
 
-use Illuminate\Http\Request;
-
-use Auth;
-
+use App\Http\Controllers\Controller;
 use App\Models\News;
 use App\Services\NewsService;
+use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Auth;
 
-use App\Http\Controllers\Controller;
-
-class NewsController extends Controller
-{
+class NewsController extends Controller {
     /**
      * Shows the news index.
      *
      * @return \Illuminate\Contracts\Support\Renderable
      */
-    public function getIndex()
-    {
+    public function getIndex() {
         return view('admin.news.news', [
-            'newses' => News::orderBy('updated_at', 'DESC')->paginate(20)
+            'newses' => News::orderBy('updated_at', 'DESC')->paginate(20),
         ]);
     }
-    
+
     /**
-     * Shows the create news page. 
+     * Shows the create news page.
      *
      * @return \Illuminate\Contracts\Support\Renderable
      */
-    public function getCreateNews()
-    {
+    public function getCreateNews() {
         return view('admin.news.create_edit_news', [
-            'news' => new News
+            'news' => new News,
         ]);
     }
-    
+
     /**
      * Shows the edit news page.
      *
-     * @param  int  $id
+     * @param int $id
+     *
      * @return \Illuminate\Contracts\Support\Renderable
      */
-    public function getEditNews($id)
-    {
+    public function getEditNews($id) {
         $news = News::find($id);
-        if(!$news) abort(404);
+        if (!$news) {
+            abort(404);
+        }
+
         return view('admin.news.create_edit_news', [
-            'news' => $news
+            'news' => $news,
         ]);
     }
 
     /**
      * Creates or edits a news page.
      *
-     * @param  \Illuminate\Http\Request  $request
-     * @param  App\Services\NewsService  $service
-     * @param  int|null                  $id
+     * @param App\Services\NewsService $service
+     * @param int|null                 $id
+     *
      * @return \Illuminate\Http\RedirectResponse
      */
-    public function postCreateEditNews(Request $request, NewsService $service, $id = null)
-    {
+    public function postCreateEditNews(Request $request, NewsService $service, $id = null) {
         $id ? $request->validate(News::$updateRules) : $request->validate(News::$createRules);
         $data = $request->only([
-            'title', 'text', 'post_at', 'is_visible', 'bump'
+            'title', 'text', 'post_at', 'is_visible', 'bump',
         ]);
-        if($id && $service->updateNews(News::find($id), $data, Auth::user())) {
+        if ($id && $service->updateNews(News::find($id), $data, Auth::user())) {
             flash('News updated successfully.')->success();
-        }
-        else if (!$id && $news = $service->createNews($data, Auth::user())) {
+        } elseif (!$id && $news = $service->createNews($data, Auth::user())) {
             flash('News created successfully.')->success();
+
             return redirect()->to('admin/news/edit/'.$news->id);
+        } else {
+            foreach ($service->errors()->getMessages()['error'] as $error) {
+                flash($error)->error();
+            }
         }
-        else {
-            foreach($service->errors()->getMessages()['error'] as $error) flash($error)->error();
-        }
+
         return redirect()->back();
     }
-    
+
     /**
      * Gets the news deletion modal.
      *
-     * @param  int  $id
+     * @param int $id
+     *
      * @return \Illuminate\Contracts\Support\Renderable
      */
-    public function getDeleteNews($id)
-    {
+    public function getDeleteNews($id) {
         $news = News::find($id);
+
         return view('admin.news._delete_news', [
             'news' => $news,
         ]);
@@ -96,20 +95,20 @@ public function getDeleteNews($id)
     /**
      * Deletes a news page.
      *
-     * @param  \Illuminate\Http\Request  $request
-     * @param  App\Services\NewsService  $service
-     * @param  int                       $id
+     * @param App\Services\NewsService $service
+     * @param int                      $id
+     *
      * @return \Illuminate\Http\RedirectResponse
      */
-    public function postDeleteNews(Request $request, NewsService $service, $id)
-    {
-        if($id && $service->deleteNews(News::find($id))) {
+    public function postDeleteNews(Request $request, NewsService $service, $id) {
+        if ($id && $service->deleteNews(News::find($id))) {
             flash('News deleted successfully.')->success();
+        } else {
+            foreach ($service->errors()->getMessages()['error'] as $error) {
+                flash($error)->error();
+            }
         }
-        else {
-            foreach($service->errors()->getMessages()['error'] as $error) flash($error)->error();
-        }
+
         return redirect()->to('admin/news');
     }
-
 }
diff --git a/app/Http/Controllers/Admin/PageController.php b/app/Http/Controllers/Admin/PageController.php
index 78be2a7d31..34ce22bfa1 100644
--- a/app/Http/Controllers/Admin/PageController.php
+++ b/app/Http/Controllers/Admin/PageController.php
@@ -2,92 +2,91 @@
 
 namespace App\Http\Controllers\Admin;
 
-use Illuminate\Http\Request;
-
-use Auth;
-
+use App\Http\Controllers\Controller;
 use App\Models\SitePage;
 use App\Services\PageService;
+use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Auth;
 
-use App\Http\Controllers\Controller;
-
-class PageController extends Controller
-{
+class PageController extends Controller {
     /**
      * Shows the page index.
      *
      * @return \Illuminate\Contracts\Support\Renderable
      */
-    public function getIndex()
-    {
+    public function getIndex() {
         return view('admin.pages.pages', [
-            'pages' => SitePage::orderBy('title')->paginate(20)
+            'pages' => SitePage::orderBy('title')->paginate(20),
         ]);
     }
-    
+
     /**
-     * Shows the create page page. 
+     * Shows the create page page.
      *
      * @return \Illuminate\Contracts\Support\Renderable
      */
-    public function getCreatePage()
-    {
+    public function getCreatePage() {
         return view('admin.pages.create_edit_page', [
-            'page' => new SitePage
+            'page' => new SitePage,
         ]);
     }
-    
+
     /**
      * Shows the edit page page.
      *
-     * @param  int  $id
+     * @param int $id
+     *
      * @return \Illuminate\Contracts\Support\Renderable
      */
-    public function getEditPage($id)
-    {
+    public function getEditPage($id) {
         $page = SitePage::find($id);
-        if(!$page) abort(404);
+        if (!$page) {
+            abort(404);
+        }
+
         return view('admin.pages.create_edit_page', [
-            'page' => $page
+            'page' => $page,
         ]);
     }
 
     /**
      * Creates or edits a page.
      *
-     * @param  \Illuminate\Http\Request  $request
-     * @param  App\Services\PageService  $service
-     * @param  int|null                  $id
+     * @param App\Services\PageService $service
+     * @param int|null                 $id
+     *
      * @return \Illuminate\Http\RedirectResponse
      */
-    public function postCreateEditPage(Request $request, PageService $service, $id = null)
-    {
+    public function postCreateEditPage(Request $request, PageService $service, $id = null) {
         $id ? $request->validate(SitePage::$updateRules) : $request->validate(SitePage::$createRules);
         $data = $request->only([
-            'key', 'title', 'text', 'is_visible', 'can_comment'
+            'key', 'title', 'text', 'is_visible', 'can_comment', 'allow_dislikes',
         ]);
-        if($id && $service->updatePage(SitePage::find($id), $data, Auth::user())) {
+        if ($id && $service->updatePage(SitePage::find($id), $data, Auth::user())) {
             flash('Page updated successfully.')->success();
-        }
-        else if (!$id && $page = $service->createPage($data, Auth::user())) {
+        } elseif (!$id && $page = $service->createPage($data, Auth::user())) {
             flash('Page created successfully.')->success();
+
             return redirect()->to('admin/pages/edit/'.$page->id);
+        } else {
+            foreach ($service->errors()->getMessages()['error'] as $error) {
+                flash($error)->error();
+            }
         }
-        else {
-            foreach($service->errors()->getMessages()['error'] as $error) flash($error)->error();
-        }
+
         return redirect()->back();
     }
-    
+
     /**
      * Gets the page deletion modal.
      *
-     * @param  int  $id
+     * @param int $id
+     *
      * @return \Illuminate\Contracts\Support\Renderable
      */
-    public function getDeletePage($id)
-    {
+    public function getDeletePage($id) {
         $page = SitePage::find($id);
+
         return view('admin.pages._delete_page', [
             'page' => $page,
         ]);
@@ -96,19 +95,20 @@ public function getDeletePage($id)
     /**
      * Deletes a page.
      *
-     * @param  \Illuminate\Http\Request  $request
-     * @param  App\Services\PageService  $service
-     * @param  int                       $id
+     * @param App\Services\PageService $service
+     * @param int                      $id
+     *
      * @return \Illuminate\Http\RedirectResponse
      */
-    public function postDeletePage(Request $request, PageService $service, $id)
-    {
-        if($id && $service->deletePage(SitePage::find($id))) {
+    public function postDeletePage(Request $request, PageService $service, $id) {
+        if ($id && $service->deletePage(SitePage::find($id))) {
             flash('Page deleted successfully.')->success();
+        } else {
+            foreach ($service->errors()->getMessages()['error'] as $error) {
+                flash($error)->error();
+            }
         }
-        else {
-            foreach($service->errors()->getMessages()['error'] as $error) flash($error)->error();
-        }
+
         return redirect()->to('admin/pages');
     }
 }
diff --git a/app/Http/Controllers/Admin/RaffleController.php b/app/Http/Controllers/Admin/RaffleController.php
index cd3363c15b..ed7771b5ce 100644
--- a/app/Http/Controllers/Admin/RaffleController.php
+++ b/app/Http/Controllers/Admin/RaffleController.php
@@ -1,56 +1,55 @@
-<?php namespace App\Http\Controllers\Admin;
+<?php
 
-use Auth;
-use DB;
-use Exception;
+namespace App\Http\Controllers\Admin;
 
-use Carbon\Carbon;
-use Illuminate\Http\Request;
-use App\Models\Raffle\RaffleGroup;
+use App\Http\Controllers\Controller;
 use App\Models\Raffle\Raffle;
+use App\Models\Raffle\RaffleGroup;
 use App\Models\Raffle\RaffleTicket;
-
 use App\Models\User\User;
-use App\Services\RaffleService;
 use App\Services\RaffleManager;
+use App\Services\RaffleService;
+use Illuminate\Http\Request;
 
-use App\Http\Controllers\Controller;
-
-class RaffleController extends Controller
-{
+class RaffleController extends Controller {
     /**
      * Shows the raffle index.
      *
-     * @param  \Illuminate\Http\Request  $request
      * @return \Illuminate\Contracts\Support\Renderable
      */
-    public function getRaffleIndex(Request $request)
-    {
+    public function getRaffleIndex(Request $request) {
         $raffles = Raffle::query();
-        if ($request->get('is_active')) $raffles->where('is_active', $request->get('is_active'));
-        else $raffles->where('is_active', '!=', 2);
+        if ($request->get('is_active')) {
+            $raffles->where('is_active', $request->get('is_active'));
+        } else {
+            $raffles->where('is_active', '!=', 2);
+        }
         $raffles = $raffles->orderBy('group_id')->orderBy('order');
 
         return view('admin.raffle.index', [
             'raffles' => $raffles->get(),
-            'groups' => RaffleGroup::whereIn('id', $raffles->pluck('group_id')->toArray())->get()->keyBy('id')
+            'groups'  => RaffleGroup::whereIn('id', $raffles->pluck('group_id')->toArray())->get()->keyBy('id'),
         ]);
     }
 
     /**
      * Shows the create/edit raffle modal.
      *
-     * @param  int|null  $id
+     * @param int|null $id
+     *
      * @return \Illuminate\Contracts\Support\Renderable
      */
-    public function getCreateEditRaffle($id = null)
-    {
+    public function getCreateEditRaffle($id = null) {
         $raffle = null;
         if ($id) {
             $raffle = Raffle::find($id);
-            if (!$raffle) abort(404);
+            if (!$raffle) {
+                abort(404);
+            }
+        } else {
+            $raffle = new Raffle;
         }
-        else $raffle = new Raffle;
+
         return view('admin.raffle._raffle_create_edit', [
             'raffle' => $raffle,
             'groups' => [0 => 'No group'] + RaffleGroup::where('is_active', '<', 2)->pluck('name', 'id')->toArray(),
@@ -60,140 +59,155 @@ public function getCreateEditRaffle($id = null)
     /**
      * Creates or edits a raffle.
      *
-     * @param  \Illuminate\Http\Request    $request
-     * @param  App\Services\RaffleService  $service
-     * @param  int|null                    $id
+     * @param App\Services\RaffleService $service
+     * @param int|null                   $id
+     *
      * @return \Illuminate\Http\RedirectResponse
      */
-    public function postCreateEditRaffle(Request $request, RaffleService $service, $id = null)
-    {
-        $data = $request->only(['name', 'is_active', 'winner_count', 'group_id', 'order']);
+    public function postCreateEditRaffle(Request $request, RaffleService $service, $id = null) {
+        $data = $request->only(['name', 'is_active', 'winner_count', 'group_id', 'order', 'ticket_cap']);
         $raffle = null;
-        if (!$id) $raffle = $service->createRaffle($data);
-        else if ($id) $raffle = $service->updateRaffle($data, Raffle::find($id));
+        if (!$id) {
+            $raffle = $service->createRaffle($data);
+        } elseif ($id) {
+            $raffle = $service->updateRaffle($data, Raffle::find($id));
+        }
         if ($raffle) {
-            flash('Raffle ' . ($id ? 'updated' : 'created') . ' successfully!')->success();
+            flash('Raffle '.($id ? 'updated' : 'created').' successfully!')->success();
+
             return redirect()->back();
-        }
-        else {
+        } else {
             flash('Couldn\'t create raffle.')->error();
-            return redirect()->back()->withInput();  
+
+            return redirect()->back()->withInput();
         }
     }
-    
+
     /**
      * Shows the create/edit raffle group modal.
      *
-     * @param  int|null  $id
+     * @param int|null $id
+     *
      * @return \Illuminate\Contracts\Support\Renderable
      */
-    public function getCreateEditRaffleGroup($id = null)
-    {
+    public function getCreateEditRaffleGroup($id = null) {
         $group = null;
         if ($id) {
             $group = RaffleGroup::find($id);
-            if (!$group) abort(404);
+            if (!$group) {
+                abort(404);
+            }
+        } else {
+            $group = new RaffleGroup;
         }
-        else $group = new RaffleGroup;
+
         return view('admin.raffle._group_create_edit', [
-            'group' => $group
+            'group' => $group,
         ]);
     }
 
     /**
      * Creates or edits a raffle group.
      *
-     * @param  \Illuminate\Http\Request    $request
-     * @param  App\Services\RaffleService  $service
-     * @param  int|null                    $id
+     * @param App\Services\RaffleService $service
+     * @param int|null                   $id
+     *
      * @return \Illuminate\Http\RedirectResponse
      */
-    public function postCreateEditRaffleGroup(Request $request, RaffleService $service, $id = null)
-    {
-        $data =$request->only(['name', 'is_active']);
+    public function postCreateEditRaffleGroup(Request $request, RaffleService $service, $id = null) {
+        $data = $request->only(['name', 'is_active']);
         $group = null;
-        if (!$id) $group = $service->createRaffleGroup($data);
-        else if ($id) $group = $service->updateRaffleGroup($data, RaffleGroup::find($id));
+        if (!$id) {
+            $group = $service->createRaffleGroup($data);
+        } elseif ($id) {
+            $group = $service->updateRaffleGroup($data, RaffleGroup::find($id));
+        }
         if ($group) {
-            flash('Raffle group ' . ($id ? 'updated' : 'created') . ' successfully!')->success();
+            flash('Raffle group '.($id ? 'updated' : 'created').' successfully!')->success();
+
             return redirect()->back();
-        }
-        else {
+        } else {
             flash('Couldn\'t create raffle group.')->error();
-            return redirect()->back()->withInput();  
+
+            return redirect()->back()->withInput();
         }
     }
 
     /**
      * Shows the ticket index of a raffle.
      *
-     * @param  \Illuminate\Http\Request  $request
-     * @param  int|\\                    $id
+     * @param \|int $id
+     *
      * @return \Illuminate\Contracts\Support\Renderable
      */
-    public function getRaffleTickets(Request $request, $id)
-    {
+    public function getRaffleTickets(Request $request, $id) {
         $raffle = Raffle::find($id);
-        if(!$raffle) abort(404);
+        if (!$raffle) {
+            abort(404);
+        }
 
         return view('admin.raffle.ticket_index', [
-            'raffle' => $raffle,
+            'raffle'  => $raffle,
             'tickets' => $raffle->tickets()->orderBy('id')->paginate(200),
-            "page" => $request->get('page') ? $request->get('page') - 1 : 0
+            'users'   => User::visible()->orderBy('name')->pluck('name', 'id')->toArray(),
+            'page'    => $request->get('page') ? $request->get('page') - 1 : 0,
         ]);
     }
 
     /**
      * Creates raffle tickets for a raffle.
      *
-     * @param  \Illuminate\Http\Request    $request
-     * @param  App\Services\RaffleManager  $service
-     * @param  int                         $id
+     * @param App\Services\RaffleManager $service
+     * @param int                        $id
+     *
      * @return \Illuminate\Http\RedirectResponse
      */
-    public function postCreateRaffleTickets(Request $request, RaffleManager $service, $id)
-    {
-        $data = $request->get('names');
+    public function postCreateRaffleTickets(Request $request, RaffleManager $service, $id) {
+        $request->validate(RaffleTicket::$createRules);
+        $data = $request->only('user_id', 'alias', 'ticket_count');
         if ($count = $service->addTickets(Raffle::find($id), $data)) {
-            flash($count . ' tickets added!')->success();
+            flash($count.' tickets added!')->success();
+
             return redirect()->back();
-        }
-        else {
+        } else {
             flash('Couldn\'t add tickets.')->error();
-            return redirect()->back()->withInput();  
+
+            return redirect()->back()->withInput();
         }
     }
 
     /**
      * Deletes a raffle ticket.
      *
-     * @param  \Illuminate\Http\Request    $request
-     * @param  App\Services\RaffleManager  $service
-     * @param  int                         $id
+     * @param App\Services\RaffleManager $service
+     * @param int                        $id
+     *
      * @return \Illuminate\Http\RedirectResponse
      */
-    public function postDeleteRaffleTicket(Request $request, RaffleManager $service, $id)
-    {
+    public function postDeleteRaffleTicket(Request $request, RaffleManager $service, $id) {
         if ($service->removeTicket(RaffleTicket::find($id))) {
             flash('Ticket removed.')->success();
+
             return redirect()->back();
-        }
-        else {
+        } else {
             flash('Couldn\'t remove ticket.')->error();
-            return redirect()->back()->withInput();  
+
+            return redirect()->back()->withInput();
         }
     }
 
     /**
      * Shows the confirmation modal for rolling a raffle.
      *
-     * @param  int  $id
+     * @param int $id
+     *
      * @return \Illuminate\Contracts\Support\Renderable
      */
-    public function getRollRaffle($id)
-    {
+    public function getRollRaffle($id) {
         $raffle = Raffle::find($id);
-        if(!$raffle) abort(404);
+        if (!$raffle) {
+            abort(404);
+        }
 
         return view('admin.raffle._raffle_roll', [
             'raffle' => $raffle,
@@ -203,32 +217,35 @@ public function getRollRaffle($id)
     /**
      * Rolls a raffle.
      *
-     * @param  App\Services\RaffleManager  $service
-     * @param  int                         $id
+     * @param App\Services\RaffleManager $service
+     * @param int                        $id
+     *
      * @return \Illuminate\Http\RedirectResponse
      */
-    public function postRollRaffle(RaffleManager $service, $id)
-    {
+    public function postRollRaffle(RaffleManager $service, $id) {
         if ($service->rollRaffle(Raffle::find($id))) {
             flash('Winners rolled!')->success();
+
             return redirect()->back();
-        }
-        else {
+        } else {
             flash('Error in rolling winners.')->error();
-            return redirect()->back()->withInput();  
+
+            return redirect()->back()->withInput();
         }
     }
 
     /**
      * Shows the confirmation modal for rolling a raffle group.
      *
-     * @param  int  $id
+     * @param int $id
+     *
      * @return \Illuminate\Contracts\Support\Renderable
      */
-    public function getRollRaffleGroup($id)
-    {
+    public function getRollRaffleGroup($id) {
         $group = RaffleGroup::find($id);
-        if(!$group) abort(404);
+        if (!$group) {
+            abort(404);
+        }
 
         return view('admin.raffle._group_roll', [
             'group' => $group,
@@ -238,19 +255,20 @@ public function getRollRaffleGroup($id)
     /**
      * Rolls a raffle group.
      *
-     * @param  App\Services\RaffleManager  $service
-     * @param  int                         $id
+     * @param App\Services\RaffleManager $service
+     * @param int                        $id
+     *
      * @return \Illuminate\Http\RedirectResponse
      */
-    public function postRollRaffleGroup(RaffleManager $service, $id)
-    {
+    public function postRollRaffleGroup(RaffleManager $service, $id) {
         if ($service->rollRaffleGroup(RaffleGroup::find($id))) {
             flash('Winners rolled!')->success();
+
             return redirect()->back();
-        }
-        else {
+        } else {
             flash('Error in rolling winners.')->error();
-            return redirect()->back()->withInput();  
+
+            return redirect()->back()->withInput();
         }
     }
 }
diff --git a/app/Http/Controllers/Admin/ReportController.php b/app/Http/Controllers/Admin/ReportController.php
index dec9759a5b..f38bee2590 100644
--- a/app/Http/Controllers/Admin/ReportController.php
+++ b/app/Http/Controllers/Admin/ReportController.php
@@ -2,74 +2,87 @@
 
 namespace App\Http\Controllers\Admin;
 
-use Auth;
-use Config;
-use Illuminate\Http\Request;
-
-use App\Models\Prompt\PromptCategory;
+use App\Http\Controllers\Controller;
 use App\Models\Report\Report;
-use App\Models\Item\Item;
-use App\Models\Currency\Currency;
-use App\Models\Loot\LootTable;
-
 use App\Services\ReportManager;
+use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Auth;
 
-use App\Http\Controllers\Controller;
-
-class ReportController extends Controller
-{
+class ReportController extends Controller {
     /**
      * Shows the report index page.
      *
-     * @param  string  $status
+     * @param string $status
+     *
      * @return \Illuminate\Contracts\Support\Renderable
      */
-    public function getReportIndex(Request $request, $status = null)
-    {
-        if($status == 'assigned-to-me') $reports = Report::assignedToMe(Auth::user()); 
-        else $reports = Report::where('status', $status ? ucfirst($status) : 'Pending');
+    public function getReportIndex(Request $request, $status = null) {
+        if ($status == 'assigned-to-me') {
+            $reports = Report::assignedToMe(Auth::user());
+        } else {
+            $reports = Report::where('status', $status ? ucfirst($status) : 'Pending');
+        }
+        $data = $request->only(['sort']);
+        if (isset($data['sort'])) {
+            switch ($data['sort']) {
+                case 'newest':
+                    $reports->sortNewest();
+                    break;
+                case 'oldest':
+                    $reports->sortOldest();
+                    break;
+                case 'bug':
+                    $reports->whereNotNull('error_type');
+                    break;
+            }
+        } else {
+            $reports->sortOldest();
+        }
 
         return view('admin.reports.index', [
             'reports' => $reports->orderBy('id', 'DESC')->paginate(30)->appends($request->query()),
         ]);
     }
-    
+
     /**
      * Shows the report detail page.
      *
-     * @param  int  $id
+     * @param int $id
+     *
      * @return \Illuminate\Contracts\Support\Renderable
      */
-    public function getReport($id)
-    {
+    public function getReport($id) {
         $report = Report::where('id', $id)->first();
-        if(!$report) abort(404);
+        if (!$report) {
+            abort(404);
+        }
+
         return view('admin.reports.report', [
             'report' => $report,
         ]);
-    }    
+    }
 
     /**
      * Creates a new report.
      *
-     * @param  \Illuminate\Http\Request        $request
-     * @param  App\Services\ReportManager  $service
-     * @param  int                             $id
-     * @param  string                          $action
+     * @param App\Services\ReportManager $service
+     * @param int                        $id
+     * @param string                     $action
+     *
      * @return \Illuminate\Http\RedirectResponse
      */
-    public function postReport(Request $request, ReportManager $service, $id, $action)
-    {
+    public function postReport(Request $request, ReportManager $service, $id, $action) {
         $data = $request->only(['staff_comments']);
-        if($action == 'assign' && $service->assignReport($request->only(['staff_comments']) + ['id' => $id], Auth::user())) {
+        if ($action == 'assign' && $service->assignReport($request->only(['staff_comments']) + ['id' => $id], Auth::user())) {
             flash('Report assigned successfully.')->success();
-        }
-        elseif($action == 'close' && $service->closeReport($data + ['id' => $id], Auth::user())) {
+        } elseif ($action == 'close' && $service->closeReport($data + ['id' => $id], Auth::user())) {
             flash('Report closed successfully.')->success();
+        } else {
+            foreach ($service->errors()->getMessages()['error'] as $error) {
+                flash($error)->error();
+            }
         }
-        else {
-            foreach($service->errors()->getMessages()['error'] as $error) flash($error)->error();
-        }
+
         return redirect()->back();
     }
 }
diff --git a/app/Http/Controllers/Admin/SalesController.php b/app/Http/Controllers/Admin/SalesController.php
index 34bc9c7e16..4defd417a5 100644
--- a/app/Http/Controllers/Admin/SalesController.php
+++ b/app/Http/Controllers/Admin/SalesController.php
@@ -2,28 +2,22 @@
 
 namespace App\Http\Controllers\Admin;
 
-use Illuminate\Http\Request;
-
-use Auth;
-
-use App\Models\Sales\Sales;
+use App\Http\Controllers\Controller;
 use App\Models\Character\Character;
-
+use App\Models\Sales\Sales;
 use App\Services\SalesService;
+use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Auth;
 
-use App\Http\Controllers\Controller;
-
-class SalesController extends Controller
-{
+class SalesController extends Controller {
     /**
      * Shows the Sales index.
      *
      * @return \Illuminate\Contracts\Support\Renderable
      */
-    public function getIndex()
-    {
+    public function getIndex() {
         return view('admin.sales.sales', [
-            'saleses' => Sales::orderBy('post_at', 'DESC')->paginate(20)
+            'saleses' => Sales::orderBy('post_at', 'DESC')->paginate(20),
         ]);
     }
 
@@ -32,37 +26,39 @@ public function getIndex()
      *
      * @return \Illuminate\Contracts\Support\Renderable
      */
-    public function getCreateSales()
-    {
+    public function getCreateSales() {
         return view('admin.sales.create_edit_sales', [
-            'sales' => new Sales
+            'sales' => new Sales,
         ]);
     }
 
     /**
      * Shows the edit Sales page.
      *
-     * @param  int  $id
+     * @param int $id
+     *
      * @return \Illuminate\Contracts\Support\Renderable
      */
-    public function getEditSales($id)
-    {
+    public function getEditSales($id) {
         $sales = Sales::find($id);
-        if(!$sales) abort(404);
+        if (!$sales) {
+            abort(404);
+        }
+
         return view('admin.sales.create_edit_sales', [
-            'sales' => $sales
+            'sales' => $sales,
         ]);
     }
 
     /**
      * Shows character information.
      *
-     * @param  string  $slug
+     * @param string $slug
+     *
      * @return \Illuminate\Contracts\Support\Renderable
      */
-    public function getCharacterInfo($slug)
-    {
-        $character = Character::visible()->where('slug', $slug)->first();
+    public function getCharacterInfo($slug) {
+        $character = Character::where('slug', $slug)->first();
 
         return view('home._character', [
             'character' => $character,
@@ -72,41 +68,43 @@ public function getCharacterInfo($slug)
     /**
      * Creates or edits a Sales page.
      *
-     * @param  \Illuminate\Http\Request  $request
-     * @param  App\Services\SalesService  $service
-     * @param  int|null                  $id
+     * @param App\Services\SalesService $service
+     * @param int|null                  $id
+     *
      * @return \Illuminate\Http\RedirectResponse
      */
-    public function postCreateEditSales(Request $request, SalesService $service, $id = null)
-    {
+    public function postCreateEditSales(Request $request, SalesService $service, $id = null) {
         $id ? $request->validate(Sales::$updateRules) : $request->validate(Sales::$createRules);
         $data = $request->only([
             'title', 'text', 'post_at', 'is_visible', 'bump', 'is_open', 'comments_open_at',
             // Character information
-            'slug', 'sale_type', 'price', 'starting_bid', 'min_increment', 'autobuy', 'end_point', 'minimum', 'description', 'link', 'character_is_open', 'new_entry'
+            'slug', 'sale_type', 'price', 'starting_bid', 'min_increment', 'autobuy', 'end_point', 'minimum', 'description', 'link', 'character_is_open', 'new_entry', 'image_id',
         ]);
-        if($id && $service->updateSales(Sales::find($id), $data, Auth::user())) {
+        if ($id && $service->updateSales(Sales::find($id), $data, Auth::user())) {
             flash('Sales updated successfully.')->success();
-        }
-        else if (!$id && $sales = $service->createSales($data, Auth::user())) {
+        } elseif (!$id && $sales = $service->createSales($data, Auth::user())) {
             flash('Sales created successfully.')->success();
+
             return redirect()->to('admin/sales/edit/'.$sales->id);
+        } else {
+            foreach ($service->errors()->getMessages()['error'] as $error) {
+                flash($error)->error();
+            }
         }
-        else {
-            foreach($service->errors()->getMessages()['error'] as $error) flash($error)->error();
-        }
+
         return redirect()->back();
     }
 
     /**
      * Gets the Sales deletion modal.
      *
-     * @param  int  $id
+     * @param int $id
+     *
      * @return \Illuminate\Contracts\Support\Renderable
      */
-    public function getDeleteSales($id)
-    {
+    public function getDeleteSales($id) {
         $sales = Sales::find($id);
+
         return view('admin.sales._delete_sales', [
             'sales' => $sales,
         ]);
@@ -115,20 +113,20 @@ public function getDeleteSales($id)
     /**
      * Deletes a Sales page.
      *
-     * @param  \Illuminate\Http\Request  $request
-     * @param  App\Services\SalesService  $service
-     * @param  int                       $id
+     * @param App\Services\SalesService $service
+     * @param int                       $id
+     *
      * @return \Illuminate\Http\RedirectResponse
      */
-    public function postDeleteSales(Request $request, SalesService $service, $id)
-    {
-        if($id && $service->deleteSales(Sales::find($id))) {
+    public function postDeleteSales(Request $request, SalesService $service, $id) {
+        if ($id && $service->deleteSales(Sales::find($id))) {
             flash('Sales deleted successfully.')->success();
+        } else {
+            foreach ($service->errors()->getMessages()['error'] as $error) {
+                flash($error)->error();
+            }
         }
-        else {
-            foreach($service->errors()->getMessages()['error'] as $error) flash($error)->error();
-        }
+
         return redirect()->to('admin/sales');
     }
-
 }
diff --git a/app/Http/Controllers/Admin/SettingsController.php b/app/Http/Controllers/Admin/SettingsController.php
index 0bc6ef8616..44dfacbb5c 100644
--- a/app/Http/Controllers/Admin/SettingsController.php
+++ b/app/Http/Controllers/Admin/SettingsController.php
@@ -2,40 +2,36 @@
 
 namespace App\Http\Controllers\Admin;
 
-use Illuminate\Http\Request;
-use DB;
-
 use App\Http\Controllers\Controller;
+use Illuminate\Http\Request;
+use Illuminate\Support\Facades\DB;
 
-class SettingsController extends Controller
-{
+class SettingsController extends Controller {
     /**
      * Shows the settings index.
      *
      * @return \Illuminate\Contracts\Support\Renderable
      */
-    public function getIndex()
-    {
+    public function getIndex() {
         return view('admin.settings.settings', [
-            'settings' => DB::table('site_settings')->orderBy('key')->paginate(20)
+            'settings' => DB::table('site_settings')->orderBy('key')->paginate(20),
         ]);
     }
 
     /**
      * Edits a setting.
      *
-     * @param  \Illuminate\Http\Request       $request
-     * @param  string                         $key
+     * @param string $key
+     *
      * @return \Illuminate\Http\RedirectResponse
      */
-    public function postEditSetting(Request $request, $key)
-    {
-        if(DB::table('site_settings')->where('key', $key)->update(['value' => $request->get('value')])) {
+    public function postEditSetting(Request $request, $key) {
+        if (DB::table('site_settings')->where('key', $key)->update(['value' => $request->get('value')])) {
             flash('Setting updated successfully.')->success();
-        }
-        else {
+        } else {
             flash('Invalid setting selected.')->success();
         }
+
         return redirect()->back();
     }
 }
diff --git a/app/Http/Controllers/Admin/SubmissionController.php b/app/Http/Controllers/Admin/SubmissionController.php
index 8d2d89d187..ed2fe8c0f0 100644
--- a/app/Http/Controllers/Admin/SubmissionController.php
+++ b/app/Http/Controllers/Admin/SubmissionController.php
@@ -2,41 +2,36 @@
 
 namespace App\Http\Controllers\Admin;
 
-use Auth;
-use Config;
-use Illuminate\Http\Request;
-
-use App\Models\Prompt\PromptCategory;
-use App\Models\Submission\Submission;
-use App\Models\Item\Item;
-use App\Models\Item\ItemCategory;
+use App\Http\Controllers\Controller;
+use App\Models\Character\Character;
 use App\Models\Currency\Currency;
+use App\Models\Item\Item;
 use App\Models\Loot\LootTable;
+use App\Models\Prompt\PromptCategory;
 use App\Models\Raffle\Raffle;
-
+use App\Models\Submission\Submission;
 use App\Services\SubmissionManager;
+use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Auth;
 
-use App\Http\Controllers\Controller;
-
-class SubmissionController extends Controller
-{
+class SubmissionController extends Controller {
     /**
      * Shows the submission index page.
      *
-     * @param  string  $status
+     * @param string $status
+     *
      * @return \Illuminate\Contracts\Support\Renderable
      */
-    public function getSubmissionIndex(Request $request, $status = null)
-    {
+    public function getSubmissionIndex(Request $request, $status = null) {
         $submissions = Submission::with('prompt')->where('status', $status ? ucfirst($status) : 'Pending')->whereNotNull('prompt_id');
         $data = $request->only(['prompt_category_id', 'sort']);
-        if(isset($data['prompt_category_id']) && $data['prompt_category_id'] != 'none')
-            $submissions->whereHas('prompt', function($query) use ($data) {
+        if (isset($data['prompt_category_id']) && $data['prompt_category_id'] != 'none') {
+            $submissions->whereHas('prompt', function ($query) use ($data) {
                 $query->where('prompt_category_id', $data['prompt_category_id']);
             });
-        if(isset($data['sort']))
-        {
-            switch($data['sort']) {
+        }
+        if (isset($data['sort'])) {
+            switch ($data['sort']) {
                 case 'newest':
                     $submissions->sortNewest();
                     break;
@@ -44,56 +39,61 @@ public function getSubmissionIndex(Request $request, $status = null)
                     $submissions->sortOldest();
                     break;
             }
+        } else {
+            $submissions->sortOldest();
         }
-        else $submissions->sortOldest();
+
         return view('admin.submissions.index', [
             'submissions' => $submissions->paginate(30)->appends($request->query()),
-            'categories' => ['none' => 'Any Category'] + PromptCategory::orderBy('sort', 'DESC')->pluck('name', 'id')->toArray(),
-            'isClaims' => false
+            'categories'  => ['none' => 'Any Category'] + PromptCategory::orderBy('sort', 'DESC')->pluck('name', 'id')->toArray(),
+            'isClaims'    => false,
         ]);
     }
 
     /**
      * Shows the submission detail page.
      *
-     * @param  int  $id
+     * @param int $id
+     *
      * @return \Illuminate\Contracts\Support\Renderable
      */
-    public function getSubmission($id)
-    {
-        $submission = Submission::whereNotNull('prompt_id')->where('id', $id)->first();
+    public function getSubmission($id) {
+        $submission = Submission::whereNotNull('prompt_id')->where('id', $id)->where('status', '!=', 'Draft')->first();
         $inventory = isset($submission->data['user']) ? parseAssetData($submission->data['user']) : null;
-        if(!$submission) abort(404);
+        if (!$submission) {
+            abort(404);
+        }
+
         return view('admin.submissions.submission', [
-            'submission' => $submission,
-            'inventory' => $inventory,
-            'rewardsData' => isset($submission->data['rewards']) ? parseAssetData($submission->data['rewards']) : null,
-            'itemsrow' => Item::all()->keyBy('id'),
-            'page' => 'submission',
-            'expanded_rewards' => Config::get('lorekeeper.extensions.character_reward_expansion.expanded'),
+            'submission'       => $submission,
+            'inventory'        => $inventory,
+            'rewardsData'      => isset($submission->data['rewards']) ? parseAssetData($submission->data['rewards']) : null,
+            'itemsrow'         => Item::all()->keyBy('id'),
+            'page'             => 'submission',
+            'expanded_rewards' => config('lorekeeper.extensions.character_reward_expansion.expanded'),
+            'characters'       => Character::visible(Auth::check() ? Auth::user() : null)->myo(0)->orderBy('slug', 'DESC')->get()->pluck('fullName', 'slug')->toArray(),
         ] + ($submission->status == 'Pending' ? [
             'characterCurrencies' => Currency::where('is_character_owned', 1)->orderBy('sort_character', 'DESC')->pluck('name', 'id'),
-            'items' => Item::orderBy('name')->pluck('name', 'id'),
-            'currencies' => Currency::where('is_user_owned', 1)->orderBy('name')->pluck('name', 'id'),
-            'tables' => LootTable::orderBy('name')->pluck('name', 'id'),
-            'raffles' => Raffle::where('rolled_at', null)->where('is_active', 1)->orderBy('name')->pluck('name', 'id'),
-            'count' => Submission::where('prompt_id', $submission->prompt_id)->where('status', 'Approved')->where('user_id', $submission->user_id)->count()
+            'items'               => Item::orderBy('name')->pluck('name', 'id'),
+            'currencies'          => Currency::where('is_user_owned', 1)->orderBy('name')->pluck('name', 'id'),
+            'tables'              => LootTable::orderBy('name')->pluck('name', 'id'),
+            'raffles'             => Raffle::where('rolled_at', null)->where('is_active', 1)->orderBy('name')->pluck('name', 'id'),
+            'count'               => Submission::where('prompt_id', $submission->prompt_id)->where('status', 'Approved')->where('user_id', $submission->user_id)->count(),
         ] : []));
     }
 
     /**
      * Shows the claim index page.
      *
-     * @param  string  $status
+     * @param string $status
+     *
      * @return \Illuminate\Contracts\Support\Renderable
      */
-    public function getClaimIndex(Request $request, $status = null)
-    {
+    public function getClaimIndex(Request $request, $status = null) {
         $submissions = Submission::where('status', $status ? ucfirst($status) : 'Pending')->whereNull('prompt_id');
         $data = $request->only(['sort']);
-        if(isset($data['sort']))
-        {
-            switch($data['sort']) {
+        if (isset($data['sort'])) {
+            switch ($data['sort']) {
                 case 'newest':
                     $submissions->sortNewest();
                     break;
@@ -101,62 +101,72 @@ public function getClaimIndex(Request $request, $status = null)
                     $submissions->sortOldest();
                     break;
             }
+        } else {
+            $submissions->sortOldest();
         }
-        else $submissions->sortOldest();
+
         return view('admin.submissions.index', [
             'submissions' => $submissions->paginate(30),
-            'isClaims' => true
+            'isClaims'    => true,
         ]);
     }
 
     /**
      * Shows the claim detail page.
      *
-     * @param  int  $id
+     * @param int $id
+     *
      * @return \Illuminate\Contracts\Support\Renderable
      */
-    public function getClaim($id)
-    {
-        $submission = Submission::whereNull('prompt_id')->where('id', $id)->first();
+    public function getClaim($id) {
+        $submission = Submission::whereNull('prompt_id')->where('id', $id)->where('status', '!=', 'Draft')->first();
         $inventory = isset($submission->data['user']) ? parseAssetData($submission->data['user']) : null;
-        if(!$submission) abort(404);
+        if (!$submission) {
+            abort(404);
+        }
+
         return view('admin.submissions.submission', [
-            'submission' => $submission,
-            'inventory' => $inventory,
-            'itemsrow' => Item::all()->keyBy('id'),
-            'expanded_rewards' => Config::get('lorekeeper.extensions.character_reward_expansion.expanded'),
+            'submission'       => $submission,
+            'inventory'        => $inventory,
+            'itemsrow'         => Item::all()->keyBy('id'),
+            'expanded_rewards' => config('lorekeeper.extensions.character_reward_expansion.expanded'),
+            'characters'       => Character::visible(Auth::check() ? Auth::user() : null)->myo(0)->orderBy('slug', 'DESC')->get()->pluck('fullName', 'slug')->toArray(),
         ] + ($submission->status == 'Pending' ? [
             'characterCurrencies' => Currency::where('is_character_owned', 1)->orderBy('sort_character', 'DESC')->pluck('name', 'id'),
-            'items' => Item::orderBy('name')->pluck('name', 'id'),
-            'currencies' => Currency::where('is_user_owned', 1)->orderBy('name')->pluck('name', 'id'),
-            'tables' => LootTable::orderBy('name')->pluck('name', 'id'),
-            'raffles' => Raffle::where('rolled_at', null)->where('is_active', 1)->orderBy('name')->pluck('name', 'id'),
-            'count' => Submission::where('prompt_id', $id)->where('status', 'Approved')->where('user_id', $submission->user_id)->count(),
-            'rewardsData' => isset($submission->data['rewards']) ? parseAssetData($submission->data['rewards']) : null
+            'items'               => Item::orderBy('name')->pluck('name', 'id'),
+            'currencies'          => Currency::where('is_user_owned', 1)->orderBy('name')->pluck('name', 'id'),
+            'tables'              => LootTable::orderBy('name')->pluck('name', 'id'),
+            'raffles'             => Raffle::where('rolled_at', null)->where('is_active', 1)->orderBy('name')->pluck('name', 'id'),
+            'count'               => Submission::where('prompt_id', $id)->where('status', 'Approved')->where('user_id', $submission->user_id)->count(),
+            'rewardsData'         => isset($submission->data['rewards']) ? parseAssetData($submission->data['rewards']) : null,
         ] : []));
     }
 
     /**
      * Creates a new submission.
      *
-     * @param  \Illuminate\Http\Request        $request
-     * @param  App\Services\SubmissionManager  $service
-     * @param  int                             $id
-     * @param  string                          $action
+     * @param App\Services\SubmissionManager $service
+     * @param int                            $id
+     * @param string                         $action
+     *
      * @return \Illuminate\Http\RedirectResponse
      */
-    public function postSubmission(Request $request, SubmissionManager $service, $id, $action)
-    {
-        $data = $request->only(['slug',  'character_rewardable_quantity', 'character_rewardable_id',  'character_rewardable_type', 'character_currency_id', 'rewardable_type', 'rewardable_id', 'quantity', 'staff_comments' ]);
-        if($action == 'reject' && $service->rejectSubmission($request->only(['staff_comments']) + ['id' => $id], Auth::user())) {
+    public function postSubmission(Request $request, SubmissionManager $service, $id, $action) {
+        $data = $request->only(['slug',  'character_rewardable_quantity', 'character_rewardable_id',  'character_rewardable_type', 'character_currency_id', 'rewardable_type', 'rewardable_id', 'quantity', 'staff_comments']);
+        if ($action == 'reject' && $service->rejectSubmission($request->only(['staff_comments']) + ['id' => $id], Auth::user())) {
             flash('Submission rejected successfully.')->success();
-        }
-        elseif($action == 'approve' && $service->approveSubmission($data + ['id' => $id], Auth::user())) {
+        } elseif ($action == 'cancel' && $service->cancelSubmission($request->only(['staff_comments']) + ['id' => $id], Auth::user())) {
+            flash('Submission canceled successfully.')->success();
+
+            return redirect()->to('admin/submissions');
+        } elseif ($action == 'approve' && $service->approveSubmission($data + ['id' => $id], Auth::user())) {
             flash('Submission approved successfully.')->success();
+        } else {
+            foreach ($service->errors()->getMessages()['error'] as $error) {
+                flash($error)->error();
+            }
         }
-        else {
-            foreach($service->errors()->getMessages()['error'] as $error) flash($error)->error();
-        }
+
         return redirect()->back();
     }
 }
diff --git a/app/Http/Controllers/Admin/Users/GrantController.php b/app/Http/Controllers/Admin/Users/GrantController.php
index bdc2c9bdfd..bbe1d52df5 100644
--- a/app/Http/Controllers/Admin/Users/GrantController.php
+++ b/app/Http/Controllers/Admin/Users/GrantController.php
@@ -2,57 +2,51 @@
 
 namespace App\Http\Controllers\Admin\Users;
 
-use Auth;
-use Config;
-use Illuminate\Http\Request;
-
-use App\Models\User\User;
-use App\Models\Item\Item;
-use App\Models\Currency\Currency;
-
-use App\Models\User\UserItem;
-use App\Models\Character\CharacterItem;
-use App\Models\Trade;
+use App\Http\Controllers\Controller;
+use App\Models\Character\Character;
 use App\Models\Character\CharacterDesignUpdate;
+use App\Models\Character\CharacterItem;
+use App\Models\Currency\Currency;
+use App\Models\Item\Item;
 use App\Models\Submission\Submission;
-
-use App\Models\Character\Character;
+use App\Models\Trade;
+use App\Models\User\User;
+use App\Models\User\UserItem;
 use App\Services\CurrencyManager;
 use App\Services\InventoryManager;
+use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Auth;
 
-use App\Http\Controllers\Controller;
-
-class GrantController extends Controller
-{
+class GrantController extends Controller {
     /**
      * Show the currency grant page.
      *
      * @return \Illuminate\Contracts\Support\Renderable
      */
-    public function getUserCurrency()
-    {
+    public function getUserCurrency() {
         return view('admin.grants.user_currency', [
-            'users' => User::orderBy('id')->pluck('name', 'id'),
-            'userCurrencies' => Currency::where('is_user_owned', 1)->orderBy('sort_user', 'DESC')->pluck('name', 'id')
+            'users'          => User::orderBy('id')->pluck('name', 'id'),
+            'userCurrencies' => Currency::where('is_user_owned', 1)->orderBy('sort_user', 'DESC')->pluck('name', 'id'),
         ]);
     }
 
     /**
      * Grants or removes currency from multiple users.
      *
-     * @param  \Illuminate\Http\Request      $request
-     * @param  App\Services\CurrencyManager  $service
+     * @param App\Services\CurrencyManager $service
+     *
      * @return \Illuminate\Http\RedirectResponse
      */
-    public function postUserCurrency(Request $request, CurrencyManager $service)
-    {
+    public function postUserCurrency(Request $request, CurrencyManager $service) {
         $data = $request->only(['names', 'currency_id', 'quantity', 'data']);
-        if($service->grantUserCurrencies($data, Auth::user())) {
+        if ($service->grantUserCurrencies($data, Auth::user())) {
             flash('Currency granted successfully.')->success();
+        } else {
+            foreach ($service->errors()->getMessages()['error'] as $error) {
+                flash($error)->error();
+            }
         }
-        else {
-            foreach($service->errors()->getMessages()['error'] as $error) flash($error)->error();
-        }
+
         return redirect()->back();
     }
 
@@ -61,30 +55,30 @@ public function postUserCurrency(Request $request, CurrencyManager $service)
      *
      * @return \Illuminate\Contracts\Support\Renderable
      */
-    public function getItems()
-    {
+    public function getItems() {
         return view('admin.grants.items', [
             'users' => User::orderBy('id')->pluck('name', 'id'),
-            'items' => Item::orderBy('name')->pluck('name', 'id')
+            'items' => Item::orderBy('name')->pluck('name', 'id'),
         ]);
     }
 
     /**
      * Grants or removes items from multiple users.
      *
-     * @param  \Illuminate\Http\Request        $request
-     * @param  App\Services\InventoryManager  $service
+     * @param App\Services\InventoryManager $service
+     *
      * @return \Illuminate\Http\RedirectResponse
      */
-    public function postItems(Request $request, InventoryManager $service)
-    {
+    public function postItems(Request $request, InventoryManager $service) {
         $data = $request->only(['names', 'item_ids', 'quantities', 'data', 'disallow_transfer', 'notes']);
-        if($service->grantItems($data, Auth::user())) {
+        if ($service->grantItems($data, Auth::user())) {
             flash('Items granted successfully.')->success();
+        } else {
+            foreach ($service->errors()->getMessages()['error'] as $error) {
+                flash($error)->error();
+            }
         }
-        else {
-            foreach($service->errors()->getMessages()['error'] as $error) flash($error)->error();
-        }
+
         return redirect()->back();
     }
 
@@ -93,11 +87,10 @@ public function postItems(Request $request, InventoryManager $service)
      *
      * @return \Illuminate\Contracts\Support\Renderable
      */
-    public function getItemSearch(Request $request)
-    {
+    public function getItemSearch(Request $request) {
         $item = Item::find($request->only(['item_id']))->first();
 
-        if($item) {
+        if ($item) {
             // Gather all instances of this item
             $userItems = UserItem::where('item_id', $item->id)->where('count', '>', 0)->get();
             $characterItems = CharacterItem::where('item_id', $item->id)->where('count', '>', 0)->get();
@@ -113,16 +106,15 @@ public function getItemSearch(Request $request)
         }
 
         return view('admin.grants.item_search', [
-            'item' => $item ? $item : null,
-            'items' => Item::orderBy('name')->pluck('name', 'id'),
-            'userItems' => $item ? $userItems : null,
+            'item'           => $item ? $item : null,
+            'items'          => Item::orderBy('name')->pluck('name', 'id'),
+            'userItems'      => $item ? $userItems : null,
             'characterItems' => $item ? $characterItems : null,
-            'users' => $item ? $users : null,
-            'characters' => $item ? $characters : null,
-            'designUpdates' => $item ? $designUpdates :null,
-            'trades' => $item ? $trades : null,
-            'submissions' => $item ? $submissions : null,
+            'users'          => $item ? $users : null,
+            'characters'     => $item ? $characters : null,
+            'designUpdates'  => $item ? $designUpdates : null,
+            'trades'         => $item ? $trades : null,
+            'submissions'    => $item ? $submissions : null,
         ]);
     }
-
 }
diff --git a/app/Http/Controllers/Admin/Users/RankController.php b/app/Http/Controllers/Admin/Users/RankController.php
index e670375a71..e35b5c5683 100644
--- a/app/Http/Controllers/Admin/Users/RankController.php
+++ b/app/Http/Controllers/Admin/Users/RankController.php
@@ -2,25 +2,21 @@
 
 namespace App\Http\Controllers\Admin\Users;
 
-use Auth;
-use Config;
-use Illuminate\Http\Request;
+use App\Http\Controllers\Controller;
 use App\Models\Rank\Rank;
 use App\Services\RankService;
+use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Auth;
 
-use App\Http\Controllers\Controller;
-
-class RankController extends Controller
-{
+class RankController extends Controller {
     /**
      * Show the rank index.
      *
      * @return \Illuminate\Contracts\Support\Renderable
      */
-    public function getIndex()
-    {
+    public function getIndex() {
         return view('admin.users.ranks', [
-            'ranks' => Rank::orderBy('sort', 'DESC')->get()
+            'ranks' => Rank::orderBy('sort', 'DESC')->get(),
         ]);
     }
 
@@ -29,86 +25,94 @@ public function getIndex()
      *
      * @return \Illuminate\Contracts\Support\Renderable
      */
-    public function getCreateRank()
-    {
+    public function getCreateRank() {
         return view('admin.users._create_edit_rank', [
-            'rank' => new Rank,
+            'rank'       => new Rank,
             'rankPowers' => null,
-            'powers' => Config::get('lorekeeper.powers'),
-            'editable' => 1
+            'powers'     => config('lorekeeper.powers'),
+            'editable'   => 1,
         ]);
     }
 
     /**
      * Get the rank editing modal.
      *
+     * @param mixed $id
+     *
      * @return \Illuminate\Contracts\Support\Renderable
      */
-    public function getEditRank($id)
-    {
+    public function getEditRank($id) {
         $rank = Rank::find($id);
         $editable = Auth::user()->canEditRank($rank);
-        if(!$editable) $rank = null;
+        if (!$editable) {
+            $rank = null;
+        }
+
         return view('admin.users._create_edit_rank', [
-            'rank' => $rank,
+            'rank'       => $rank,
             'rankPowers' => $rank ? $rank->getPowers() : null,
-            'powers' => Config::get('lorekeeper.powers'),
-            'editable' => $editable
+            'powers'     => config('lorekeeper.powers'),
+            'editable'   => $editable,
         ]);
     }
 
-    public function postCreateEditRank(Request $request, RankService $service, $id = null)
-    {
+    public function postCreateEditRank(Request $request, RankService $service, $id = null) {
         $request->validate(Rank::$rules);
         $data = $request->only(['name', 'description', 'color', 'powers', 'icon']);
-        if($id && $service->updateRank(Rank::find($id), $data, Auth::user())) {
+        if ($id && $service->updateRank(Rank::find($id), $data, Auth::user())) {
             flash('Rank updated successfully.')->success();
-        }
-        else if ($service->createRank($data, Auth::user())) {
+        } elseif ($service->createRank($data, Auth::user())) {
             flash('Rank created successfully.')->success();
+        } else {
+            foreach ($service->errors()->getMessages()['error'] as $error) {
+                flash($error)->error();
+            }
         }
-        else {
-            foreach($service->errors()->getMessages()['error'] as $error) flash($error)->error();
-        }
+
         return redirect()->back();
     }
-    
+
     /**
      * Get the rank deletion modal.
      *
+     * @param mixed $id
+     *
      * @return \Illuminate\Contracts\Support\Renderable
      */
-    public function getDeleteRank($id)
-    {
+    public function getDeleteRank($id) {
         $rank = Rank::find($id);
         $editable = Auth::user()->canEditRank($rank);
-        if(!$editable) $rank = null;
+        if (!$editable) {
+            $rank = null;
+        }
+
         return view('admin.users._delete_rank', [
-            'rank' => $rank,
-            'editable' => $editable
+            'rank'     => $rank,
+            'editable' => $editable,
         ]);
     }
 
-    public function postDeleteRank(Request $request, RankService $service, $id)
-    {
-        if($id && $service->deleteRank(Rank::find($id), Auth::user())) {
+    public function postDeleteRank(Request $request, RankService $service, $id) {
+        if ($id && $service->deleteRank(Rank::find($id), Auth::user())) {
             flash('Rank deleted successfully.')->success();
+        } else {
+            foreach ($service->errors()->getMessages()['error'] as $error) {
+                flash($error)->error();
+            }
         }
-        else {
-            foreach($service->errors()->getMessages()['error'] as $error) flash($error)->error();
-        }
+
         return redirect()->back();
     }
-    
-    public function postSortRanks(Request $request, RankService $service)
-    {
-        if($service->sortRanks($request->get('sort'), Auth::user())) {
+
+    public function postSortRanks(Request $request, RankService $service) {
+        if ($service->sortRanks($request->get('sort'), Auth::user())) {
             flash('Ranks sorted successfully.')->success();
+        } else {
+            foreach ($service->errors()->getMessages()['error'] as $error) {
+                flash($error)->error();
+            }
         }
-        else {
-            foreach($service->errors()->getMessages()['error'] as $error) flash($error)->error();
-        }
+
         return redirect()->back();
     }
-
 }
diff --git a/app/Http/Controllers/Admin/Users/UserController.php b/app/Http/Controllers/Admin/Users/UserController.php
index 5527ca1370..6ee7507116 100644
--- a/app/Http/Controllers/Admin/Users/UserController.php
+++ b/app/Http/Controllers/Admin/Users/UserController.php
@@ -2,40 +2,36 @@
 
 namespace App\Http\Controllers\Admin\Users;
 
-use DB;
-use Auth;
-use Config;
-
-use Illuminate\Http\Request;
-use Carbon\Carbon;
-
+use App\Http\Controllers\Controller;
+use App\Models\Rank\Rank;
 use App\Models\User\User;
 use App\Models\User\UserAlias;
-use App\Models\Rank\Rank;
 use App\Models\User\UserUpdateLog;
-
 use App\Services\UserService;
+use Carbon\Carbon;
+use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Auth;
 
-use App\Http\Controllers\Controller;
-
-class UserController extends Controller
-{
+class UserController extends Controller {
     /**
      * Show the user index.
      *
      * @return \Illuminate\Contracts\Support\Renderable
      */
-    public function getIndex(Request $request)
-    {
-        $query = User::join('ranks','users.rank_id', '=', 'ranks.id')->select('ranks.name AS rank_name', 'users.*');
+    public function getIndex(Request $request) {
+        $query = User::join('ranks', 'users.rank_id', '=', 'ranks.id')->select('ranks.name AS rank_name', 'users.*');
         $sort = $request->only(['sort']);
 
-        if($request->get('name')) $query->where(function($query) use ($request) {
-            $query->where('users.name', 'LIKE', '%' . $request->get('name') . '%')->orWhere('users.alias', 'LIKE', '%' . $request->get('name') . '%');
-        });
-        if($request->get('rank_id')) $query->where('rank_id', $request->get('rank_id'));
+        if ($request->get('name')) {
+            $query->where(function ($query) use ($request) {
+                $query->where('users.name', 'LIKE', '%'.$request->get('name').'%')->orWhere('users.alias', 'LIKE', '%'.$request->get('name').'%');
+            });
+        }
+        if ($request->get('rank_id')) {
+            $query->where('rank_id', $request->get('rank_id'));
+        }
 
-        switch(isset($sort['sort']) ? $sort['sort'] : null) {
+        switch ($sort['sort'] ?? null) {
             default:
                 $query->orderBy('ranks.sort', 'DESC')->orderBy('name');
                 break;
@@ -46,10 +42,10 @@ public function getIndex(Request $request)
                 $query->orderBy('name', 'DESC');
                 break;
             case 'alias':
-                $query->orderBy('alias', 'ASC');
+                $query->aliasSort();
                 break;
             case 'alias-reverse':
-                $query->orderBy('alias', 'DESC');
+                $query->aliasSort(true);
                 break;
             case 'rank':
                 $query->orderBy('ranks.sort', 'DESC')->orderBy('name');
@@ -65,239 +61,364 @@ public function getIndex(Request $request)
         return view('admin.users.index', [
             'users' => $query->paginate(30)->appends($request->query()),
             'ranks' => [0 => 'Any Rank'] + Rank::orderBy('ranks.sort', 'DESC')->pluck('name', 'id')->toArray(),
-            'count' => $query->count()
+            'count' => $query->count(),
         ]);
     }
 
     /**
      * Show a user's admin page.
      *
+     * @param mixed $name
+     *
      * @return \Illuminate\Contracts\Support\Renderable
      */
-    public function getUser($name)
-    {
+    public function getUser($name) {
         $user = User::where('name', $name)->first();
 
-        if(!$user) abort(404);
+        if (!$user) {
+            abort(404);
+        }
 
         return view('admin.users.user', [
-            'user' => $user,
-            'ranks' => Rank::orderBy('ranks.sort')->pluck('name', 'id')->toArray()
+            'user'  => $user,
+            'ranks' => Rank::orderBy('ranks.sort')->pluck('name', 'id')->toArray(),
         ]);
     }
 
-    public function postUserBasicInfo(Request $request, $name)
-    {
+    public function postUserBasicInfo(Request $request, $name) {
         $user = User::where('name', $name)->first();
-        if(!$user){
+        if (!$user) {
             flash('Invalid user.')->error();
-        }
-        elseif (!Auth::user()->canEditRank($user->rank)) {
+        } elseif (!Auth::user()->canEditRank($user->rank)) {
             flash('You cannot edit the information of a user that has a higher rank than yourself.')->error();
-        }
-        else {
+        } else {
+            if (!(new UserService)->logAdminAction(Auth::user(), 'Edited User', 'Edited '.$user->displayname)) {
+                flash('Failed to log admin action.')->error();
+
+                return redirect()->back();
+            }
+
             $request->validate([
-                'name' => 'required|between:3,25'
+                'name' => 'required|between:3,25',
             ]);
             $data = $request->only(['name'] + (!$user->isAdmin ? [1 => 'rank_id'] : []));
 
             $logData = ['old_name' => $user->name] + $data;
-            if($user->update($data)) {
+            if ($user->update($data)) {
                 UserUpdateLog::create(['staff_id' => Auth::user()->id, 'user_id' => $user->id, 'data' => json_encode($logData), 'type' => 'Name/Rank Change']);
                 flash('Updated user\'s information successfully.')->success();
-            }
-            else {
+            } else {
                 flash('Failed to update user\'s information.')->error();
             }
         }
+
         return redirect()->to($user->adminUrl);
     }
 
-    public function postUserAlias(Request $request, $name, $id)
-    {
+    public function postUserAlias(Request $request, $name, $id) {
         $user = User::where('name', $name)->first();
         $alias = UserAlias::find($id);
 
         $logData = ['old_alias' => $user ? $alias->alias : null, 'old_site' => $user ? $alias->site : null];
         $isPrimary = $alias->is_primary_alias;
 
-        if(!$user) flash('Invalid user.')->error();
-        else if(!$alias) flash('Invalid alias.')->error();
-        else if (!Auth::user()->canEditRank($user->rank)) {
+        if (!$user) {
+            flash('Invalid user.')->error();
+        } elseif (!$alias) {
+            flash('Invalid alias.')->error();
+        } elseif (!Auth::user()->canEditRank($user->rank)) {
             flash('You cannot edit the information of a user that has a higher rank than yourself.')->error();
-        }
-        else if($alias && $alias->delete()) {
+        } elseif ($alias && $alias->delete()) {
             // If this was the user's primary alias, check if they have any remaining valid primary aliases
             // or any remaining aliases at all, and update accordingly
-            if($isPrimary) {
-                if(!$user->aliases->count()) $user->update(['has_alias' => 0]);
-                else {
+            if ($isPrimary) {
+                if (!$user->aliases->count()) {
+                    $user->update(['has_alias' => 0]);
+                } else {
                     // Hidden aliases are excluded as a courtesy measure (users may not want them forced visible for any number of reasons)
-                    foreach($user->aliases as $alias) {
-                        if(Config::get('lorekeeper.sites.'.$alias->site.'.auth') && Config::get('lorekeeper.sites.'.$alias->site.'.primary_alias') && $alias->is_visible) {
+                    foreach ($user->aliases as $alias) {
+                        if (config('lorekeeper.sites.'.$alias->site.'.auth') && config('lorekeeper.sites.'.$alias->site.'.primary_alias') && $alias->is_visible) {
                             $alias->update(['is_primary_alias' => 1]);
                             break;
                         }
                     }
                     // If the user does not have a remaining valid primary alias after this check, update accordingly
-                    if(!$user->primaryAlias) $user->update(['has_alias' => 0]);
+                    if (!$user->primaryAlias) {
+                        $user->update(['has_alias' => 0]);
+                    }
                 }
             }
+            if (!(new UserService)->logAdminAction(Auth::user(), 'Edited User', 'Cleared '.$user->displayname.'\' alias')) {
+                flash('Failed to log admin action.')->error();
+
+                return redirect()->back();
+            }
+
             UserUpdateLog::create(['staff_id' => Auth::user()->id, 'user_id' => $user->id, 'data' => json_encode($logData), 'type' => 'Clear Alias']);
             flash('Cleared user\'s alias successfully.')->success();
-        }
-        else {
+        } else {
             flash('Failed to clear user\'s alias.')->error();
         }
+
         return redirect()->back();
     }
 
-
-    public function postUserAccount(Request $request, $name)
-    {
+    public function postUserAccount(Request $request, $name) {
         $user = User::where('name', $name)->first();
 
-        if(!$user) {
+        if (!$user) {
             flash('Invalid user.')->error();
-        }
-        else if (!Auth::user()->canEditRank($user->rank)) {
+        } elseif (!Auth::user()->canEditRank($user->rank)) {
             flash('You cannot edit the information of a user that has a higher rank than yourself.')->error();
-        }
-        else if($user->settings->update(['is_fto' => $request->get('is_fto') ?: 0])) {
+        } elseif ($user->settings->update(['is_fto' => $request->get('is_fto') ?: 0])) {
+            if (!(new UserService)->logAdminAction(Auth::user(), 'Edited User', 'Edited '.$user->displayname)) {
+                flash('Failed to log admin action.')->error();
+
+                return redirect()->back();
+            }
+
             UserUpdateLog::create(['staff_id' => Auth::user()->id, 'user_id' => $user->id, 'data' => json_encode(['is_fto' => $request->get('is_fto') ? 'Yes' : 'No']), 'type' => 'FTO Status Change']);
             flash('Updated user\'s account information successfully.')->success();
-        }
-        else {
+        } else {
             flash('Failed to update user\'s account information.')->error();
         }
+
         return redirect()->back();
     }
 
-    public function postUserBirthday(Request $request, $name)
-    {
+    public function postUserBirthday(Request $request, $name) {
         $user = User::where('name', $name)->first();
-        if(!$user) {
+        if (!$user) {
             flash('Invalid user.')->error();
         }
 
         $service = new UserService;
         // Make birthday into format we can store
-        $data = $request->input('dob');
-        $date = $data['day']."-".$data['month']."-".$data['year'];
+        $date = $request->input('dob');
 
         $formatDate = Carbon::parse($date);
         $logData = ['old_date' => $user->birthday ? $user->birthday->isoFormat('DD-MM-YYYY') : Carbon::now()->isoFormat('DD-MM-YYYY')] + ['new_date' => $date];
+        if (!(new UserService)->logAdminAction(Auth::user(), 'Edited User', 'Edited '.$user->displayname.' birthday')) {
+            flash('Failed to log admin action.')->error();
+
+            return redirect()->back();
+        }
 
-        if($service->updateBirthday($formatDate, $user)) {
+        if ($service->updateBirthday($formatDate, $user)) {
             UserUpdateLog::create(['staff_id' => Auth::user()->id, 'user_id' => $user->id, 'data' => json_encode($logData), 'type' => 'Birth Date Change']);
             flash('Birthday updated successfully!')->success();
+        } else {
+            foreach ($service->errors()->getMessages()['error'] as $error) {
+                flash($error)->error();
+            }
         }
-        else {
-            foreach($service->errors()->getMessages()['error'] as $error) flash($error)->error();
-        }
+
         return redirect()->back();
     }
 
     /**
      * Show a user's account update log.
      *
+     * @param mixed $name
+     *
      * @return \Illuminate\Contracts\Support\Renderable
      */
-    public function getUserUpdates($name)
-    {
+    public function getUserUpdates($name) {
         $user = User::where('name', $name)->first();
 
-        if(!$user) abort(404);
+        if (!$user) {
+            abort(404);
+        }
 
         return view('admin.users.user_update_log', [
             'user' => $user,
-            'logs' => UserUpdateLog::where('user_id', $user->id)->orderBy('id', 'DESC')->paginate(50)
+            'logs' => UserUpdateLog::where('user_id', $user->id)->orderBy('id', 'DESC')->paginate(50),
         ]);
     }
 
     /**
      * Show a user's ban page.
      *
+     * @param mixed $name
+     *
      * @return \Illuminate\Contracts\Support\Renderable
      */
-    public function getBan($name)
-    {
+    public function getBan($name) {
         $user = User::where('name', $name)->first();
 
-        if(!$user) abort(404);
+        if (!$user) {
+            abort(404);
+        }
 
         return view('admin.users.user_ban', [
-            'user' => $user
+            'user' => $user,
         ]);
     }
 
     /**
      * Show a user's ban confirmation page.
      *
+     * @param mixed $name
+     *
      * @return \Illuminate\Contracts\Support\Renderable
      */
-    public function getBanConfirmation($name)
-    {
+    public function getBanConfirmation($name) {
         $user = User::where('name', $name)->first();
 
-        if(!$user) abort(404);
+        if (!$user) {
+            abort(404);
+        }
 
         return view('admin.users._user_ban_confirmation', [
-            'user' => $user
+            'user' => $user,
         ]);
     }
 
-    public function postBan(Request $request, UserService $service, $name)
-    {
+    public function postBan(Request $request, UserService $service, $name) {
         $user = User::where('name', $name)->with('settings')->first();
         $wasBanned = $user->is_banned;
-        if(!$user) {
+        if (!$user) {
             flash('Invalid user.')->error();
-        }
-        else if (!Auth::user()->canEditRank($user->rank)) {
+        } elseif (!Auth::user()->canEditRank($user->rank)) {
             flash('You cannot edit the information of a user that has a higher rank than yourself.')->error();
-        }
-        else if($service->ban(['ban_reason' => $request->get('ban_reason')], $user, Auth::user())) {
+        } elseif ($service->ban(['ban_reason' => $request->get('ban_reason')], $user, Auth::user())) {
             flash($wasBanned ? 'User ban reason edited successfully.' : 'User banned successfully.')->success();
+        } else {
+            foreach ($service->errors()->getMessages()['error'] as $error) {
+                flash($error)->error();
+            }
         }
-        else {
-            foreach($service->errors()->getMessages()['error'] as $error) flash($error)->error();
-        }
+
         return redirect()->back();
     }
 
     /**
      * Show a user's unban confirmation page.
      *
+     * @param mixed $name
+     *
      * @return \Illuminate\Contracts\Support\Renderable
      */
-    public function getUnbanConfirmation($name)
-    {
+    public function getUnbanConfirmation($name) {
         $user = User::where('name', $name)->with('settings')->first();
 
-        if(!$user) abort(404);
+        if (!$user) {
+            abort(404);
+        }
 
         return view('admin.users._user_unban_confirmation', [
-            'user' => $user
+            'user' => $user,
         ]);
     }
 
-    public function postUnban(Request $request, UserService $service, $name)
-    {
+    public function postUnban(Request $request, UserService $service, $name) {
         $user = User::where('name', $name)->first();
 
-        if(!$user) {
+        if (!$user) {
             flash('Invalid user.')->error();
+        } elseif (!Auth::user()->canEditRank($user->rank)) {
+            flash('You cannot edit the information of a user that has a higher rank than yourself.')->error();
+        } elseif ($service->unban($user, Auth::user())) {
+            flash('User unbanned successfully.')->success();
+        } else {
+            foreach ($service->errors()->getMessages()['error'] as $error) {
+                flash($error)->error();
+            }
+        }
+
+        return redirect()->back();
+    }
+
+    /**
+     * Show a user's deactivate page.
+     *
+     * @param mixed $name
+     *
+     * @return \Illuminate\Contracts\Support\Renderable
+     */
+    public function getDeactivate($name) {
+        $user = User::where('name', $name)->first();
+
+        if (!$user) {
+            abort(404);
         }
-        else if (!Auth::user()->canEditRank($user->rank)) {
+
+        return view('admin.users.user_deactivate', [
+            'user' => $user,
+        ]);
+    }
+
+    /**
+     * Show a user's deactivate confirmation page.
+     *
+     * @param mixed $name
+     *
+     * @return \Illuminate\Contracts\Support\Renderable
+     */
+    public function getDeactivateConfirmation($name) {
+        $user = User::where('name', $name)->first();
+
+        if (!$user) {
+            abort(404);
+        }
+
+        return view('admin.users._user_deactivate_confirmation', [
+            'user' => $user,
+        ]);
+    }
+
+    public function postDeactivate(Request $request, UserService $service, $name) {
+        $user = User::where('name', $name)->with('settings')->first();
+        $wasDeactivated = $user->is_deactivated;
+        if (!$user) {
+            flash('Invalid user.')->error();
+        } elseif (!Auth::user()->canEditRank($user->rank)) {
             flash('You cannot edit the information of a user that has a higher rank than yourself.')->error();
+        } elseif ($service->deactivate(['deactivate_reason' => $request->get('deactivate_reason')], $user, Auth::user())) {
+            flash($wasDeactivated ? 'User deactivation reason edited successfully.' : 'User deactivated successfully.')->success();
+        } else {
+            foreach ($service->errors()->getMessages()['error'] as $error) {
+                flash($error)->error();
+            }
         }
-        else if($service->unban($user, Auth::user())) {
-            flash('User unbanned successfully.')->success();
+
+        return redirect()->back();
+    }
+
+    /**
+     * Show a user's reactivate confirmation page.
+     *
+     * @param mixed $name
+     *
+     * @return \Illuminate\Contracts\Support\Renderable
+     */
+    public function getReactivateConfirmation($name) {
+        $user = User::where('name', $name)->with('settings')->first();
+
+        if (!$user) {
+            abort(404);
         }
-        else {
-            foreach($service->errors()->getMessages()['error'] as $error) flash($error)->error();
+
+        return view('admin.users._user_reactivate_confirmation', [
+            'user' => $user,
+        ]);
+    }
+
+    public function postReactivate(Request $request, UserService $service, $name) {
+        $user = User::where('name', $name)->first();
+
+        if (!$user) {
+            flash('Invalid user.')->error();
+        } elseif (!Auth::user()->canEditRank($user->rank)) {
+            flash('You cannot edit the information of a user that has a higher rank than yourself.')->error();
+        } elseif ($service->reactivate($user, Auth::user())) {
+            flash('User reactivated successfully.')->success();
+        } else {
+            foreach ($service->errors()->getMessages()['error'] as $error) {
+                flash($error)->error();
+            }
         }
+
         return redirect()->back();
     }
 }
diff --git a/app/Http/Controllers/Auth/ForgotPasswordController.php b/app/Http/Controllers/Auth/ForgotPasswordController.php
index 6a247fefd0..f93f8724cf 100644
--- a/app/Http/Controllers/Auth/ForgotPasswordController.php
+++ b/app/Http/Controllers/Auth/ForgotPasswordController.php
@@ -5,8 +5,7 @@
 use App\Http\Controllers\Controller;
 use Illuminate\Foundation\Auth\SendsPasswordResetEmails;
 
-class ForgotPasswordController extends Controller
-{
+class ForgotPasswordController extends Controller {
     /*
     |--------------------------------------------------------------------------
     | Password Reset Controller
@@ -22,11 +21,8 @@ class ForgotPasswordController extends Controller
 
     /**
      * Create a new controller instance.
-     *
-     * @return void
      */
-    public function __construct()
-    {
+    public function __construct() {
         $this->middleware('guest');
     }
 }
diff --git a/app/Http/Controllers/Auth/LoginController.php b/app/Http/Controllers/Auth/LoginController.php
index 375ff22f6c..ab01b94ebc 100644
--- a/app/Http/Controllers/Auth/LoginController.php
+++ b/app/Http/Controllers/Auth/LoginController.php
@@ -3,11 +3,13 @@
 namespace App\Http\Controllers\Auth;
 
 use App\Http\Controllers\Controller;
-use Illuminate\Foundation\Auth\AuthenticatesUsers;
 use App\Models\User\User;
+use App\Models\User\UserAlias;
+use App\Services\LinkService;
+use Illuminate\Support\Facades\Auth;
+use Laravel\Socialite\Facades\Socialite;
 
-class LoginController extends Controller
-{
+class LoginController extends Controller {
     /*
     |--------------------------------------------------------------------------
     | Login Controller
@@ -19,8 +21,6 @@ class LoginController extends Controller
     |
     */
 
-    use AuthenticatesUsers;
-
     /**
      * Where to redirect users after login.
      *
@@ -30,21 +30,46 @@ class LoginController extends Controller
 
     /**
      * Create a new controller instance.
-     *
-     * @return void
      */
-    public function __construct()
-    {
+    public function __construct() {
         $this->middleware('guest')->except('logout');
     }
 
     /**
-     * Show the application's login form.
+     * Authenticate via Aliases.
+     *
+     * @param mixed $provider
+     *
+     * @return \Illuminate\Http\Response
+     */
+    public function getAuthRedirect(LinkService $service, $provider) {
+        $result = $service->getAuthRedirect($provider, true);
+
+        return $result;
+    }
+
+    /**
+     * Authenticate via Aliases.
+     *
+     * @param mixed $provider
      *
      * @return \Illuminate\Http\Response
      */
-    public function showLoginForm()
-    {
-        return view('auth.login', ['userCount' => User::count()]);
+    public function getAuthCallback(LinkService $service, $provider) {
+        // Toyhouse runs on Laravel Passport for OAuth2 and this has some issues with state exceptions,
+        // admin suggested the easy fix (to use stateless)
+        $socialite = $provider == 'toyhouse' ? Socialite::driver($provider)->stateless() : Socialite::driver($provider);
+        // Needs to match for the user call to work
+        $socialite->redirectUrl(str_replace('auth', 'login', url(config('services.'.$provider.'.redirect'))));
+        $result = $socialite->user();
+
+        $user = UserAlias::where('user_snowflake', $result->id)->first();
+        if (!$user) {
+            return redirect('/register/'.$provider)->with(['userData' => $result]);
+        }
+
+        Auth::login($user->user);
+
+        return redirect($this->redirectTo);
     }
 }
diff --git a/app/Http/Controllers/Auth/RegisterController.php b/app/Http/Controllers/Auth/RegisterController.php
index ad31782413..13946d23a0 100644
--- a/app/Http/Controllers/Auth/RegisterController.php
+++ b/app/Http/Controllers/Auth/RegisterController.php
@@ -2,23 +2,21 @@
 
 namespace App\Http\Controllers\Auth;
 
-use DB;
-use Settings;
-use Carbon\Carbon;
-
-use App\Models\User\User;
+use App\Facades\Settings;
 use App\Http\Controllers\Controller;
-use Illuminate\Support\Facades\Hash;
-use Illuminate\Support\Facades\Validator;
-use Illuminate\Foundation\Auth\RegistersUsers;
-use Illuminate\Support\Arr;
-
 use App\Models\Invitation;
-use App\Services\UserService;
+use App\Models\User\User;
+use App\Models\User\UserAlias;
 use App\Services\InvitationService;
+use App\Services\LinkService;
+use App\Services\UserService;
+use Illuminate\Http\Request;
+use Illuminate\Support\Arr;
+use Illuminate\Support\Facades\Auth;
+use Illuminate\Support\Facades\DB;
+use Laravel\Socialite\Facades\Socialite;
 
-class RegisterController extends Controller
-{
+class RegisterController extends Controller {
     /*
     |--------------------------------------------------------------------------
     | Register Controller
@@ -30,8 +28,6 @@ class RegisterController extends Controller
     |
     */
 
-    use RegistersUsers;
-
     /**
      * Where to redirect users after registration.
      *
@@ -41,74 +37,76 @@ class RegisterController extends Controller
 
     /**
      * Create a new controller instance.
-     *
-     * @return void
      */
-    public function __construct()
-    {
+    public function __construct() {
         $this->middleware('guest');
     }
 
     /**
      * Show the application registration form.
      *
+     * @param mixed $provider
+     *
      * @return \Illuminate\Http\Response
      */
-    public function showRegistrationForm()
-    {
-        return view('auth.register', ['userCount' => User::count()]);
+    public function getRegisterWithDriver($provider) {
+        $userData = session()->get('userData');
+
+        return view('auth.register_with_driver', [
+            'userCount' => User::count(),
+            'provider'  => $provider,
+            'user'      => $userData->nickname ?? null,
+            'token'     => $userData->token ?? null,
+        ]);
     }
 
     /**
-     * Get a validator for an incoming registration request.
+     * Show the application registration form.
+     *
+     * @param mixed $provider
      *
-     * @param  array  $data
-     * @return \Illuminate\Contracts\Validation\Validator
+     * @return \Illuminate\Http\Response
      */
-    protected function validator(array $data)
-    {
-        return Validator::make($data, [
-            'name' => ['required', 'string', 'min:3', 'max:25', 'alpha_dash', 'unique:users'],
-            'email' => ['required', 'string', 'email', 'max:255', 'unique:users'],
-            'agreement' => ['required', 'accepted'],
-            'password' => ['required', 'string', 'min:8', 'confirmed'],
-            'dob' => ['required', function ($attribute, $value, $fail) {
-                     {
-                        $date = $value['day']."-".$value['month']."-".$value['year'];
-                        $formatDate = carbon::parse($date);
-                        $now = Carbon::now();
-                        if($formatDate->diffInYears($now) < 13) {
-                            $fail('You must be 13 or older to access this site.');
-                        }
-                    }
-                }
-            ],
-            'code' => ['string', function ($attribute, $value, $fail) {
-                    if(!Settings::get('is_registration_open')) {
-                        if(!$value) $fail('An invitation code is required to register an account.');
-                        $invitation = Invitation::where('code', $value)->whereNull('recipient_id')->first();
-                        if(!$invitation) $fail('Invalid code entered.');
-                    }
-                }
-            ]
-        ]);
+    public function postRegisterWithDriver(LinkService $service, Request $request, $provider) {
+        $providerData = Socialite::driver($provider)->userFromToken($request->get('token'));
+
+        if (UserAlias::where('site', $provider)->where('user_snowflake', $providerData->id)->first()) {
+            flash('An Account is already tied to the authorized '.$provider.' account.')->error();
+
+            return redirect()->back();
+        }
+
+        $data = $request->all();
+
+        (new UserService)->validator($data, true)->validate();
+        $user = $this->create($data);
+        if ($service->saveProvider($provider, $providerData, $user)) {
+            Auth::login($user);
+
+            return redirect('/');
+        } else {
+            foreach ($service->errors()->getMessages()['error'] as $error) {
+                flash($error)->error();
+            }
+
+            return redirect()->back();
+        }
     }
 
     /**
      * Create a new user instance after a valid registration.
      *
-     * @param  array  $data
      * @return \App\Models\User\User
      */
-    protected function create(array $data)
-    {
+    protected function create(array $data) {
         DB::beginTransaction();
         $service = new UserService;
         $user = $service->createUser(Arr::only($data, ['name', 'email', 'password', 'dob']));
-        if(!Settings::get('is_registration_open')) {
+        if (!Settings::get('is_registration_open')) {
             (new InvitationService)->useInvitation(Invitation::where('code', $data['code'])->first(), $user);
         }
         DB::commit();
+
         return $user;
     }
 }
diff --git a/app/Http/Controllers/Auth/ResetPasswordController.php b/app/Http/Controllers/Auth/ResetPasswordController.php
index 2c863aa6b5..2ada41391f 100644
--- a/app/Http/Controllers/Auth/ResetPasswordController.php
+++ b/app/Http/Controllers/Auth/ResetPasswordController.php
@@ -5,8 +5,7 @@
 use App\Http\Controllers\Controller;
 use Illuminate\Foundation\Auth\ResetsPasswords;
 
-class ResetPasswordController extends Controller
-{
+class ResetPasswordController extends Controller {
     /*
     |--------------------------------------------------------------------------
     | Password Reset Controller
@@ -29,11 +28,8 @@ class ResetPasswordController extends Controller
 
     /**
      * Create a new controller instance.
-     *
-     * @return void
      */
-    public function __construct()
-    {
+    public function __construct() {
         $this->middleware('guest');
     }
 }
diff --git a/app/Http/Controllers/Auth/VerificationController.php b/app/Http/Controllers/Auth/VerificationController.php
index 22aaf00666..071bd656b4 100644
--- a/app/Http/Controllers/Auth/VerificationController.php
+++ b/app/Http/Controllers/Auth/VerificationController.php
@@ -5,8 +5,7 @@
 use App\Http\Controllers\Controller;
 use Illuminate\Foundation\Auth\VerifiesEmails;
 
-class VerificationController extends Controller
-{
+class VerificationController extends Controller {
     /*
     |--------------------------------------------------------------------------
     | Email Verification Controller
@@ -29,11 +28,8 @@ class VerificationController extends Controller
 
     /**
      * Create a new controller instance.
-     *
-     * @return void
      */
-    public function __construct()
-    {
+    public function __construct() {
         $this->middleware('auth');
         $this->middleware('signed')->only('verify');
         $this->middleware('throttle:6,1')->only('verify', 'resend');
diff --git a/app/Http/Controllers/BrowseController.php b/app/Http/Controllers/BrowseController.php
index 84bb80e975..1c4109920d 100644
--- a/app/Http/Controllers/BrowseController.php
+++ b/app/Http/Controllers/BrowseController.php
@@ -2,26 +2,22 @@
 
 namespace App\Http\Controllers;
 
-use Illuminate\Http\Request;
-
-use DB;
-use Auth;
-use Settings;
-use App\Models\User\User;
-use App\Models\Rank\Rank;
-
+use App\Facades\Settings;
 use App\Models\Character\Character;
-use App\Models\Character\CharacterImage;
 use App\Models\Character\CharacterCategory;
+use App\Models\Character\CharacterImage;
 use App\Models\Character\Sublist;
 use App\Models\Character\CharacterTitle;
+use App\Models\Feature\Feature;
+use App\Models\Rank\Rank;
+use App\Models\Rarity;
 use App\Models\Species\Species;
 use App\Models\Species\Subtype;
-use App\Models\Rarity;
-use App\Models\Feature\Feature;
+use App\Models\User\User;
+use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Auth;
 
-class BrowseController extends Controller
-{
+class BrowseController extends Controller {
     /*
     |--------------------------------------------------------------------------
     | Browse Controller
@@ -34,20 +30,22 @@ class BrowseController extends Controller
     /**
      * Shows the user list.
      *
-     * @param  \Illuminate\Http\Request  $request
      * @return \Illuminate\Contracts\Support\Renderable
      */
-    public function getUsers(Request $request)
-    {
-        $query = User::visible()->join('ranks','users.rank_id', '=', 'ranks.id')->select('ranks.name AS rank_name', 'users.*');
+    public function getUsers(Request $request) {
+        $query = User::visible()->join('ranks', 'users.rank_id', '=', 'ranks.id')->select('ranks.name AS rank_name', 'users.*');
         $sort = $request->only(['sort']);
 
-        if($request->get('name')) $query->where(function($query) use ($request) {
-            $query->where('users.name', 'LIKE', '%' . $request->get('name') . '%');
-        });
-        if($request->get('rank_id')) $query->where('rank_id', $request->get('rank_id'));
+        if ($request->get('name')) {
+            $query->where(function ($query) use ($request) {
+                $query->where('users.name', 'LIKE', '%'.$request->get('name').'%');
+            });
+        }
+        if ($request->get('rank_id')) {
+            $query->where('rank_id', $request->get('rank_id'));
+        }
 
-        switch(isset($sort['sort']) ? $sort['sort'] : null) {
+        switch ($sort['sort'] ?? null) {
             default:
                 $query->orderBy('ranks.sort', 'DESC')->orderBy('name');
                 break;
@@ -57,6 +55,12 @@ public function getUsers(Request $request)
             case 'alpha-reverse':
                 $query->orderBy('name', 'DESC');
                 break;
+            case 'alias':
+                $query->aliasSort();
+                break;
+            case 'alias-reverse':
+                $query->aliasSort(true);
+                break;
             case 'rank':
                 $query->orderBy('ranks.sort', 'DESC')->orderBy('name');
                 break;
@@ -69,106 +73,157 @@ public function getUsers(Request $request)
         }
 
         return view('browse.users', [
-            'users' => $query->paginate(30)->appends($request->query()),
-            'ranks' => [0 => 'Any Rank'] + Rank::orderBy('ranks.sort', 'DESC')->pluck('name', 'id')->toArray(),
-            'blacklistLink' => Settings::get('blacklist_link')
+            'users'             => $query->paginate(30)->appends($request->query()),
+            'ranks'             => [0 => 'Any Rank'] + Rank::orderBy('ranks.sort', 'DESC')->pluck('name', 'id')->toArray(),
+            'blacklistLink'     => Settings::get('blacklist_link'),
+            'deactivatedLink'   => Settings::get('deactivated_link'),
+        ]);
+    }
+
+    /**
+     * Shows the user deactivated.
+     *
+     * @return \Illuminate\Contracts\Support\Renderable
+     */
+    public function getDeactivated(Request $request) {
+        $canView = false;
+        $key = Settings::get('deactivated_key');
+
+        // First, check the display settings for the deactivated...
+        $privacy = Settings::get('deactivated_privacy');
+        if ($privacy == 3 ||
+            (Auth::check() &&
+            ($privacy == 2 ||
+            ($privacy == 1 && Auth::user()->isStaff) ||
+            ($privacy == 0 && Auth::user()->isAdmin)))) {
+            // Next, check if the deactivated requires a key
+            $canView = true;
+            if ($key != '0' && ($request->get('key') != $key)) {
+                $canView = false;
+            }
+        }
+
+        return view('browse.deactivated', [
+            'canView' => $canView,
+            'privacy' => $privacy,
+            'key'     => $key,
+            'users'   => $canView ? User::where('is_deactivated', 1)->orderBy('users.name')->paginate(30)->appends($request->query()) : null,
         ]);
     }
 
     /**
      * Shows the user blacklist.
      *
-     * @param  \Illuminate\Http\Request  $request
      * @return \Illuminate\Contracts\Support\Renderable
      */
-    public function getBlacklist(Request $request)
-    {
+    public function getBlacklist(Request $request) {
         $canView = false;
         $key = Settings::get('blacklist_key');
 
         // First, check the display settings for the blacklist...
         $privacy = Settings::get('blacklist_privacy');
-        if ( $privacy == 3 ||
+        if ($privacy == 3 ||
             (Auth::check() &&
             ($privacy == 2 ||
             ($privacy == 1 && Auth::user()->isStaff) ||
-            ($privacy == 0 && Auth::user()->isAdmin))))
-        {
+            ($privacy == 0 && Auth::user()->isAdmin)))) {
             // Next, check if the blacklist requires a key
             $canView = true;
-            if($key != '0' && ($request->get('key') != $key)) $canView = false;
-
+            if ($key != '0' && ($request->get('key') != $key)) {
+                $canView = false;
+            }
         }
+
         return view('browse.blacklist', [
             'canView' => $canView,
             'privacy' => $privacy,
-            'key' => $key,
-            'users' => $canView ? User::where('is_banned', 1)->orderBy('users.name')->paginate(30)->appends($request->query()) : null,
+            'key'     => $key,
+            'users'   => $canView ? User::where('is_banned', 1)->orderBy('users.name')->paginate(30)->appends($request->query()) : null,
         ]);
     }
 
     /**
      * Shows the character masterlist.
      *
-     * @param  \Illuminate\Http\Request  $request
      * @return \Illuminate\Contracts\Support\Renderable
      */
-    public function getCharacters(Request $request)
-    {
+    public function getCharacters(Request $request) {
         $query = Character::with('user.rank')->with('image.features')->with('rarity')->with('image.species')->myo(0);
         $imageQuery = CharacterImage::images(Auth::check() ? Auth::user() : null)->with('features')->with('rarity')->with('species')->with('features');
 
-        if($sublists = Sublist::where('show_main', 0)->get())
-        $subCategories = []; $subSpecies = [];
-        {   foreach($sublists as $sublist)
-            {
-                $subCategories = array_merge($subCategories, $sublist->categories->pluck('id')->toArray());
-                $subSpecies = array_merge($subSpecies, $sublist->species->pluck('id')->toArray());
-            }
+        if ($sublists = Sublist::where('show_main', 0)->get()) {
+            $subCategories = [];
+            $subSpecies = [];
+        }
+        foreach ($sublists as $sublist) {
+            $subCategories = array_merge($subCategories, $sublist->categories->pluck('id')->toArray());
+            $subSpecies = array_merge($subSpecies, $sublist->species->pluck('id')->toArray());
         }
 
         $query->whereNotIn('character_category_id', $subCategories);
         $imageQuery->whereNotIn('species_id', $subSpecies);
 
-        if($request->get('name')) $query->where(function($query) use ($request) {
-            $query->where('characters.name', 'LIKE', '%' . $request->get('name') . '%')->orWhere('characters.slug', 'LIKE', '%' . $request->get('name') . '%');
-        });
-        if($request->get('rarity_id')) $query->where('rarity_id', $request->get('rarity_id'));
-        if($request->get('character_category_id')) $query->where('character_category_id', $request->get('character_category_id'));
+        if ($request->get('name')) {
+            $query->where(function ($query) use ($request) {
+                $query->where('characters.name', 'LIKE', '%'.$request->get('name').'%')->orWhere('characters.slug', 'LIKE', '%'.$request->get('name').'%');
+            });
+        }
+        if ($request->get('rarity_id')) {
+            $query->where('rarity_id', $request->get('rarity_id'));
+        }
+        if ($request->get('character_category_id')) {
+            $query->where('character_category_id', $request->get('character_category_id'));
+        }
 
-        if($request->get('sale_value_min')) $query->where('sale_value', '>=', $request->get('sale_value_min'));
-        if($request->get('sale_value_max')) $query->where('sale_value', '<=', $request->get('sale_value_max'));
+        if ($request->get('sale_value_min')) {
+            $query->where('sale_value', '>=', $request->get('sale_value_min'));
+        }
+        if ($request->get('sale_value_max')) {
+            $query->where('sale_value', '<=', $request->get('sale_value_max'));
+        }
 
-        if($request->get('is_trading')) $query->where('is_trading', 1);
-        if($request->get('is_sellable')) $query->where('is_sellable', 1);
-        if($request->get('is_tradeable')) $query->where('is_tradeable', 1);
-        if($request->get('is_giftable')) $query->where('is_giftable', 1);
+        if ($request->get('is_trading')) {
+            $query->where('is_trading', 1);
+        }
+        if ($request->get('is_sellable')) {
+            $query->where('is_sellable', 1);
+        }
+        if ($request->get('is_tradeable')) {
+            $query->where('is_tradeable', 1);
+        }
+        if ($request->get('is_giftable')) {
+            $query->where('is_giftable', 1);
+        }
 
-        if($request->get('owner')) {
+        if ($request->get('owner')) {
             $owner = User::find($request->get('owner'));
-            $query->where(function($query) use ($owner) {
+            $query->where(function ($query) use ($owner) {
                 $query->where('user_id', $owner->id);
             });
         }
-        if($request->get('owner_url')) {
+        if ($request->get('owner_url')) {
             $ownerUrl = $request->get('owner_url');
-            $query->where(function($query) use ($ownerUrl) {
-                $query->where('owner_url','LIKE', '%'.$ownerUrl.'%');
+            $query->where(function ($query) use ($ownerUrl) {
+                $query->where('owner_url', 'LIKE', '%'.$ownerUrl.'%');
             });
         }
 
         // Search only main images
-        if(!$request->get('search_images')) {
+        if (!$request->get('search_images')) {
             $imageQuery->whereIn('id', $query->pluck('character_image_id')->toArray());
         }
 
         // Searching on image properties
-        if($request->get('species_id')) $imageQuery->where('species_id', $request->get('species_id'));
-        if($request->get('subtype_id')) $imageQuery->where('subtype_id', $request->get('subtype_id'));
-        if($request->get('feature_id')) {
+        if ($request->get('species_id')) {
+            $imageQuery->where('species_id', $request->get('species_id'));
+        }
+        if ($request->get('subtype_id')) {
+            $imageQuery->where('subtype_id', $request->get('subtype_id'));
+        }
+        if ($request->get('feature_id')) {
             $featureIds = $request->get('feature_id');
-            foreach($featureIds as $featureId) {
-                $imageQuery->whereHas('features', function($query) use ($featureId) {
+            foreach ($featureIds as $featureId) {
+                $imageQuery->whereHas('features', function ($query) use ($featureId) {
                     $query->where('feature_id', $featureId);
                 });
             }
@@ -182,57 +237,64 @@ public function getCharacters(Request $request)
             $imageQuery->where('title_data','LIKE', '%'.$request->get('title_data').'%');
         }
 
-        if($request->get('artist')) {
+        if ($request->get('artist')) {
             $artist = User::find($request->get('artist'));
-            $imageQuery->whereHas('artists', function($query) use ($artist) {
+            $imageQuery->whereHas('artists', function ($query) use ($artist) {
                 $query->where('user_id', $artist->id);
             });
         }
-        if($request->get('designer')) {
+        if ($request->get('designer')) {
             $designer = User::find($request->get('designer'));
-            $imageQuery->whereHas('designers', function($query) use ($designer) {
+            $imageQuery->whereHas('designers', function ($query) use ($designer) {
                 $query->where('user_id', $designer->id);
             });
         }
-        if($request->get('artist_url')) {
+        if ($request->get('artist_url')) {
             $artistUrl = $request->get('artist_url');
-            $imageQuery->whereHas('artists', function($query) use ($artistUrl) {
+            $imageQuery->whereHas('artists', function ($query) use ($artistUrl) {
                 $query->where('url', 'LIKE', '%'.$artistUrl.'%');
             });
         }
-        if($request->get('designer_url')) {
+        if ($request->get('designer_url')) {
             $designerUrl = $request->get('designer_url');
-            $imageQuery->whereHas('designers', function($query) use ($designerUrl) {
+            $imageQuery->whereHas('designers', function ($query) use ($designerUrl) {
                 $query->where('url', 'LIKE', '%'.$designerUrl.'%');
             });
         }
 
         $query->whereIn('id', $imageQuery->pluck('character_id')->toArray());
 
-        if($request->get('is_gift_art_allowed')) switch($request->get('is_gift_art_allowed')) {
-            case 1:
-                $query->where('is_gift_art_allowed', 1);
-            break;
-            case 2:
-                $query->where('is_gift_art_allowed', 2);
-            break;
-            case 3:
-                $query->where('is_gift_art_allowed', '>=', 1);
-            break;
-        }
-        if($request->get('is_gift_writing_allowed')) switch($request->get('is_gift_writing_allowed')) {
-            case 1:
-                $query->where('is_gift_writing_allowed', 1);
-            break;
-            case 2:
-                $query->where('is_gift_writing_allowed', 2);
-            break;
-            case 3:
-                $query->where('is_gift_writing_allowed', '>=', 1);
-            break;
-        }
-
-        switch($request->get('sort')) {
+        if ($request->get('is_gift_art_allowed')) {
+            switch ($request->get('is_gift_art_allowed')) {
+                case 1:
+                    $query->where('is_gift_art_allowed', 1);
+                    break;
+                case 2:
+                    $query->where('is_gift_art_allowed', 2);
+                    break;
+                case 3:
+                    $query->where('is_gift_art_allowed', '>=', 1);
+                    break;
+            }
+        }
+        if ($request->get('is_gift_writing_allowed')) {
+            switch ($request->get('is_gift_writing_allowed')) {
+                case 1:
+                    $query->where('is_gift_writing_allowed', 1);
+                    break;
+                case 2:
+                    $query->where('is_gift_writing_allowed', 2);
+                    break;
+                case 3:
+                    $query->where('is_gift_writing_allowed', '>=', 1);
+                    break;
+            }
+        }
+
+        switch ($request->get('sort')) {
+            default:
+                $query->orderBy('characters.number', 'DESC');
+                break;
             case 'number_desc':
                 $query->orderBy('characters.number', 'DESC');
                 break;
@@ -251,99 +313,115 @@ public function getCharacters(Request $request)
             case 'sale_value_asc':
                 $query->orderBy('characters.sale_value', 'ASC');
                 break;
-            default:
-                $query->orderBy('characters.number', 'DESC');
         }
 
-        if(!Auth::check() || !Auth::user()->hasPower('manage_characters')) $query->visible();
+        if (!Auth::check() || !Auth::user()->hasPower('manage_characters')) {
+            $query->visible();
+        }
 
         return view('browse.masterlist', [
-            'isMyo' => false,
-            'characters' => $query->paginate(24)->appends($request->query()),
-            'categories' => [0 => 'Any Category'] + CharacterCategory::whereNotIn('id', $subCategories)->orderBy('character_categories.sort', 'DESC')->pluck('name', 'id')->toArray(),
-            'specieses' => [0 => 'Any Species'] + Species::whereNotIn('id', $subSpecies)->orderBy('specieses.sort', 'DESC')->pluck('name', 'id')->toArray(),
-            'subtypes' => [0 => 'Any Subtype'] + Subtype::orderBy('subtypes.sort', 'DESC')->pluck('name', 'id')->toArray(),
-            'rarities' => [0 => 'Any Rarity'] + Rarity::orderBy('rarities.sort', 'DESC')->pluck('name', 'id')->toArray(),
+            'isMyo'       => false,
+            'characters'  => $query->paginate(24)->appends($request->query()),
+            'categories'  => [0 => 'Any Category'] + CharacterCategory::whereNotIn('id', $subCategories)->visible(Auth::check() ? Auth::user() : null)->orderBy('character_categories.sort', 'DESC')->pluck('name', 'id')->toArray(),
+            'specieses'   => [0 => 'Any Species'] + Species::whereNotIn('id', $subSpecies)->visible(Auth::check() ? Auth::user() : null)->orderBy('specieses.sort', 'DESC')->pluck('name', 'id')->toArray(),
+            'subtypes'    => [0 => 'Any Subtype'] + Subtype::visible(Auth::check() ? Auth::user() : null)->orderBy('subtypes.sort', 'DESC')->pluck('name', 'id')->toArray(),
+            'rarities'    => [0 => 'Any Rarity'] + Rarity::orderBy('rarities.sort', 'DESC')->pluck('name', 'id')->toArray(),
+            'features'    => Feature::getDropdownItems(),
+            'sublists'    => Sublist::orderBy('sort', 'DESC')->get(),
+            'userOptions' => User::query()->orderBy('name')->pluck('name', 'id')->toArray(),
             'titles' => [0 => 'Any Title', 'custom' => 'Custom Title'] + CharacterTitle::orderBy('character_titles.sort', 'DESC')->pluck('title', 'id')->toArray(),
-            'features' => Feature::orderBy('features.name')->pluck('name', 'id')->toArray(),
-            'sublists' => Sublist::orderBy('sort', 'DESC')->get(),
-            'userOptions' => User::query()->orderBy('name')->pluck('name', 'id')->toArray()
         ]);
     }
 
     /**
      * Shows the MYO slot masterlist.
      *
-     * @param  \Illuminate\Http\Request  $request
      * @return \Illuminate\Contracts\Support\Renderable
      */
-    public function getMyos(Request $request)
-    {
+    public function getMyos(Request $request) {
         $query = Character::with('user.rank')->with('image.features')->with('rarity')->with('image.species')->myo(1);
 
         $imageQuery = CharacterImage::images(Auth::check() ? Auth::user() : null)->with('features')->with('rarity')->with('species')->with('features');
 
-        if($request->get('name')) $query->where(function($query) use ($request) {
-            $query->where('characters.name', 'LIKE', '%' . $request->get('name') . '%')->orWhere('characters.slug', 'LIKE', '%' . $request->get('name') . '%');
-        });
-        if($request->get('rarity_id')) $query->where('rarity_id', $request->get('rarity_id'));
+        if ($request->get('name')) {
+            $query->where(function ($query) use ($request) {
+                $query->where('characters.name', 'LIKE', '%'.$request->get('name').'%')->orWhere('characters.slug', 'LIKE', '%'.$request->get('name').'%');
+            });
+        }
+        if ($request->get('rarity_id')) {
+            $query->where('rarity_id', $request->get('rarity_id'));
+        }
 
-        if($request->get('sale_value_min')) $query->where('sale_value', '>=', $request->get('sale_value_min'));
-        if($request->get('sale_value_max')) $query->where('sale_value', '<=', $request->get('sale_value_max'));
+        if ($request->get('sale_value_min')) {
+            $query->where('sale_value', '>=', $request->get('sale_value_min'));
+        }
+        if ($request->get('sale_value_max')) {
+            $query->where('sale_value', '<=', $request->get('sale_value_max'));
+        }
 
-        if($request->get('is_trading')) $query->where('is_trading', 1);
-        if($request->get('is_sellable')) $query->where('is_sellable', 1);
-        if($request->get('is_tradeable')) $query->where('is_tradeable', 1);
-        if($request->get('is_giftable')) $query->where('is_giftable', 1);
+        if ($request->get('is_trading')) {
+            $query->where('is_trading', 1);
+        }
+        if ($request->get('is_sellable')) {
+            $query->where('is_sellable', 1);
+        }
+        if ($request->get('is_tradeable')) {
+            $query->where('is_tradeable', 1);
+        }
+        if ($request->get('is_giftable')) {
+            $query->where('is_giftable', 1);
+        }
 
-        if($request->get('owner')) {
+        if ($request->get('owner')) {
             $owner = User::find($request->get('owner'));
-            $query->where(function($query) use ($owner) {
+            $query->where(function ($query) use ($owner) {
                 $query->where('user_id', $owner->id);
             });
         }
-        if($request->get('owner_url')) {
+        if ($request->get('owner_url')) {
             $ownerUrl = $request->get('owner_url');
-            $query->where(function($query) use ($ownerUrl) {
-                $query->where('owner_url','LIKE', '%'.$ownerUrl.'%');
+            $query->where(function ($query) use ($ownerUrl) {
+                $query->where('owner_url', 'LIKE', '%'.$ownerUrl.'%');
             });
         }
 
         // Search only main images
-        if(!$request->get('search_images')) {
+        if (!$request->get('search_images')) {
             $imageQuery->whereIn('id', $query->pluck('character_image_id')->toArray());
         }
 
         // Searching on image properties
-        if($request->get('species_id')) $imageQuery->where('species_id', $request->get('species_id'));
-        if($request->get('artist')) {
+        if ($request->get('species_id')) {
+            $imageQuery->where('species_id', $request->get('species_id'));
+        }
+        if ($request->get('artist')) {
             $artist = User::find($request->get('artist'));
-            $imageQuery->whereHas('artists', function($query) use ($artist) {
+            $imageQuery->whereHas('artists', function ($query) use ($artist) {
                 $query->where('user_id', $artist->id);
             });
         }
-        if($request->get('designer')) {
+        if ($request->get('designer')) {
             $designer = User::find($request->get('designer'));
-            $imageQuery->whereHas('designers', function($query) use ($designer) {
+            $imageQuery->whereHas('designers', function ($query) use ($designer) {
                 $query->where('user_id', $designer->id);
             });
         }
-        if($request->get('artist_url')) {
+        if ($request->get('artist_url')) {
             $artistUrl = $request->get('artist_url');
-            $imageQuery->whereHas('artists', function($query) use ($artistUrl) {
+            $imageQuery->whereHas('artists', function ($query) use ($artistUrl) {
                 $query->where('url', 'LIKE', '%'.$artistUrl.'%');
             });
         }
-        if($request->get('designer_url')) {
+        if ($request->get('designer_url')) {
             $designerUrl = $request->get('designer_url');
-            $imageQuery->whereHas('designers', function($query) use ($designerUrl) {
+            $imageQuery->whereHas('designers', function ($query) use ($designerUrl) {
                 $query->where('url', 'LIKE', '%'.$designerUrl.'%');
             });
         }
-        if($request->get('feature_id')) {
+        if ($request->get('feature_id')) {
             $featureIds = $request->get('feature_id');
-            foreach($featureIds as $featureId) {
-                $imageQuery->whereHas('features', function($query) use ($featureId) {
+            foreach ($featureIds as $featureId) {
+                $imageQuery->whereHas('features', function ($query) use ($featureId) {
                     $query->where('feature_id', $featureId);
                 });
             }
@@ -351,7 +429,10 @@ public function getMyos(Request $request)
 
         $query->whereIn('id', $imageQuery->pluck('character_id')->toArray());
 
-        switch($request->get('sort')) {
+        switch ($request->get('sort')) {
+            default:
+                $query->orderBy('characters.id', 'DESC');
+                break;
             case 'id_desc':
                 $query->orderBy('characters.id', 'DESC');
                 break;
@@ -366,99 +447,133 @@ public function getMyos(Request $request)
                 break;
         }
 
-        if(!Auth::check() || !Auth::user()->hasPower('manage_characters')) $query->visible();
+        if (!Auth::check() || !Auth::user()->hasPower('manage_characters')) {
+            $query->visible();
+        }
 
         return view('browse.myo_masterlist', [
-            'isMyo' => true,
-            'slots' => $query->paginate(30)->appends($request->query()),
-            'specieses' => [0 => 'Any Species'] + Species::orderBy('specieses.sort', 'DESC')->pluck('name', 'id')->toArray(),
-            'rarities' => [0 => 'Any Rarity'] + Rarity::orderBy('rarities.sort', 'DESC')->pluck('name', 'id')->toArray(),
-            'features' => Feature::orderBy('features.name')->pluck('name', 'id')->toArray(),
-            'sublists' => Sublist::orderBy('sort', 'DESC')->get(),
-            'userOptions' => User::query()->orderBy('name')->pluck('name', 'id')->toArray()
+            'isMyo'       => true,
+            'slots'       => $query->paginate(30)->appends($request->query()),
+            'specieses'   => [0 => 'Any Species'] + Species::visible(Auth::check() ? Auth::user() : null)->orderBy('specieses.sort', 'DESC')->pluck('name', 'id')->toArray(),
+            'rarities'    => [0 => 'Any Rarity'] + Rarity::orderBy('rarities.sort', 'DESC')->pluck('name', 'id')->toArray(),
+            'features'    => Feature::getDropdownItems(),
+            'sublists'    => Sublist::orderBy('sort', 'DESC')->get(),
+            'userOptions' => User::query()->orderBy('name')->pluck('name', 'id')->toArray(),
         ]);
     }
 
     /**
      * Shows the Sub masterlists.
      *
-     * @param  \Illuminate\Http\Request  $request
+     * @param mixed $key
+     *
      * @return \Illuminate\Contracts\Support\Renderable
      */
-    public function getSublist(Request $request, $key)
-    {
+    public function getSublist(Request $request, $key) {
         $query = Character::with('user.rank')->with('image.features')->with('rarity')->with('image.species')->myo(0);
         $imageQuery = CharacterImage::with('features')->with('rarity')->with('species')->with('features');
 
         $sublist = Sublist::where('key', $key)->first();
-        if(!$sublist) abort(404);
+        if (!$sublist) {
+            abort(404);
+        }
         $subCategories = $sublist->categories->pluck('id')->toArray();
         $subSpecies = $sublist->species->pluck('id')->toArray();
 
-        if($subCategories) $query->whereIn('character_category_id', $subCategories);
-        if($subSpecies) $imageQuery->whereIn('species_id', $subSpecies);
-
-        if($request->get('name')) $query->where(function($query) use ($request) {
-            $query->where('characters.name', 'LIKE', '%' . $request->get('name') . '%')->orWhere('characters.slug', 'LIKE', '%' . $request->get('name') . '%');
-        });
-        if($request->get('rarity_id')) $query->where('rarity_id', $request->get('rarity_id'));
-        if($request->get('character_category_id')) $query->where('character_category_id', $request->get('character_category_id'));
-
-        if($request->get('sale_value_min')) $query->where('sale_value', '>=', $request->get('sale_value_min'));
-        if($request->get('sale_value_max')) $query->where('sale_value', '<=', $request->get('sale_value_max'));
-
-        if($request->get('is_trading')) $query->where('is_trading', 1);
-        if($request->get('is_gift_art_allowed')) switch($request->get('is_gift_art_allowed')) {
-            case 1:
-                $query->where('is_gift_art_allowed', 1);
-            break;
-            case 2:
-                $query->where('is_gift_art_allowed', 2);
-            break;
-            case 3:
-                $query->where('is_gift_art_allowed', '>=', 1);
-            break;
-        }
-        if($request->get('is_gift_writing_allowed')) switch($request->get('is_gift_writing_allowed')) {
-            case 1:
-                $query->where('is_gift_writing_allowed', 1);
-            break;
-            case 2:
-                $query->where('is_gift_writing_allowed', 2);
-            break;
-            case 3:
-                $query->where('is_gift_writing_allowed', '>=', 1);
-            break;
-        }
-        if($request->get('is_sellable')) $query->where('is_sellable', 1);
-        if($request->get('is_tradeable')) $query->where('is_tradeable', 1);
-        if($request->get('is_giftable')) $query->where('is_giftable', 1);
-
-        if($request->get('owner')) {
+        if ($subCategories) {
+            $query->whereIn('character_category_id', $subCategories);
+        }
+        if ($subSpecies) {
+            $imageQuery->whereIn('species_id', $subSpecies);
+        }
+
+        if ($request->get('name')) {
+            $query->where(function ($query) use ($request) {
+                $query->where('characters.name', 'LIKE', '%'.$request->get('name').'%')->orWhere('characters.slug', 'LIKE', '%'.$request->get('name').'%');
+            });
+        }
+        if ($request->get('rarity_id')) {
+            $query->where('rarity_id', $request->get('rarity_id'));
+        }
+        if ($request->get('character_category_id')) {
+            $query->where('character_category_id', $request->get('character_category_id'));
+        }
+
+        if ($request->get('sale_value_min')) {
+            $query->where('sale_value', '>=', $request->get('sale_value_min'));
+        }
+        if ($request->get('sale_value_max')) {
+            $query->where('sale_value', '<=', $request->get('sale_value_max'));
+        }
+
+        if ($request->get('is_trading')) {
+            $query->where('is_trading', 1);
+        }
+        if ($request->get('is_gift_art_allowed')) {
+            switch ($request->get('is_gift_art_allowed')) {
+                case 1:
+                    $query->where('is_gift_art_allowed', 1);
+                    break;
+                case 2:
+                    $query->where('is_gift_art_allowed', 2);
+                    break;
+                case 3:
+                    $query->where('is_gift_art_allowed', '>=', 1);
+                    break;
+            }
+        }
+        if ($request->get('is_gift_writing_allowed')) {
+            switch ($request->get('is_gift_writing_allowed')) {
+                case 1:
+                    $query->where('is_gift_writing_allowed', 1);
+                    break;
+                case 2:
+                    $query->where('is_gift_writing_allowed', 2);
+                    break;
+                case 3:
+                    $query->where('is_gift_writing_allowed', '>=', 1);
+                    break;
+            }
+        }
+        if ($request->get('is_sellable')) {
+            $query->where('is_sellable', 1);
+        }
+        if ($request->get('is_tradeable')) {
+            $query->where('is_tradeable', 1);
+        }
+        if ($request->get('is_giftable')) {
+            $query->where('is_giftable', 1);
+        }
+
+        if ($request->get('owner')) {
             $owner = User::find($request->get('owner'));
-            $query->where(function($query) use ($owner) {
+            $query->where(function ($query) use ($owner) {
                 $query->where('user_id', $owner->id);
             });
         }
-        if($request->get('owner_url')) {
+        if ($request->get('owner_url')) {
             $ownerUrl = $request->get('owner_url');
-            $query->where(function($query) use ($ownerUrl) {
-                $query->where('owner_url','LIKE', '%'.$ownerUrl.'%');
+            $query->where(function ($query) use ($ownerUrl) {
+                $query->where('owner_url', 'LIKE', '%'.$ownerUrl.'%');
             });
         }
 
         // Search only main images
-        if(!$request->get('search_images')) {
+        if (!$request->get('search_images')) {
             $imageQuery->whereIn('id', $query->pluck('character_image_id')->toArray());
         }
 
         // Searching on image properties
-        if($request->get('species_id')) $imageQuery->where('species_id', $request->get('species_id'));
-        if($request->get('subtype_id')) $imageQuery->where('subtype_id', $request->get('subtype_id'));
-        if($request->get('feature_id')) {
+        if ($request->get('species_id')) {
+            $imageQuery->where('species_id', $request->get('species_id'));
+        }
+        if ($request->get('subtype_id')) {
+            $imageQuery->where('subtype_id', $request->get('subtype_id'));
+        }
+        if ($request->get('feature_id')) {
             $featureIds = $request->get('feature_id');
-            foreach($featureIds as $featureId) {
-                $imageQuery->whereHas('features', function($query) use ($featureId) {
+            foreach ($featureIds as $featureId) {
+                $imageQuery->whereHas('features', function ($query) use ($featureId) {
                     $query->where('feature_id', $featureId);
                 });
             }
@@ -472,34 +587,37 @@ public function getSublist(Request $request, $key)
             $imageQuery->where('title_data','LIKE', '%'.$request->get('title_data').'%');
         }
 
-        if($request->get('artist')) {
+        if ($request->get('artist')) {
             $artist = User::find($request->get('artist'));
-            $imageQuery->whereHas('artists', function($query) use ($artist) {
+            $imageQuery->whereHas('artists', function ($query) use ($artist) {
                 $query->where('user_id', $artist->id);
             });
         }
-        if($request->get('designer')) {
+        if ($request->get('designer')) {
             $designer = User::find($request->get('designer'));
-            $imageQuery->whereHas('designers', function($query) use ($designer) {
+            $imageQuery->whereHas('designers', function ($query) use ($designer) {
                 $query->where('user_id', $designer->id);
             });
         }
-        if($request->get('artist_url')) {
+        if ($request->get('artist_url')) {
             $artistUrl = $request->get('artist_url');
-            $imageQuery->whereHas('artists', function($query) use ($artistUrl) {
+            $imageQuery->whereHas('artists', function ($query) use ($artistUrl) {
                 $query->where('url', 'LIKE', '%'.$artistUrl.'%');
             });
         }
-        if($request->get('designer_url')) {
+        if ($request->get('designer_url')) {
             $designerUrl = $request->get('designer_url');
-            $imageQuery->whereHas('designers', function($query) use ($designerUrl) {
+            $imageQuery->whereHas('designers', function ($query) use ($designerUrl) {
                 $query->where('url', 'LIKE', '%'.$designerUrl.'%');
             });
         }
 
         $query->whereIn('id', $imageQuery->pluck('character_id')->toArray());
 
-        switch($request->get('sort')) {
+        switch ($request->get('sort')) {
+            default:
+                $query->orderBy('characters.number', 'DESC');
+                break;
             case 'number_desc':
                 $query->orderBy('characters.number', 'DESC');
                 break;
@@ -518,28 +636,33 @@ public function getSublist(Request $request, $key)
             case 'sale_value_asc':
                 $query->orderBy('characters.sale_value', 'ASC');
                 break;
-            default:
-                $query->orderBy('characters.number', 'DESC');
         }
 
-        if(!Auth::check() || !Auth::user()->hasPower('manage_characters')) $query->visible();
+        if (!Auth::check() || !Auth::user()->hasPower('manage_characters')) {
+            $query->visible();
+        }
 
         $subCategory = CharacterCategory::where('masterlist_sub_id', $sublist->id)->orderBy('character_categories.sort', 'DESC')->pluck('name', 'id')->toArray();
-        if(!$subCategory) $subCategory = CharacterCategory::orderBy('character_categories.sort', 'DESC')->pluck('name', 'id')->toArray();
+        if (!$subCategory) {
+            $subCategory = CharacterCategory::visible(Auth::check() ? Auth::user() : null)->orderBy('character_categories.sort', 'DESC')->pluck('name', 'id')->toArray();
+        }
         $subSpecies = Species::where('masterlist_sub_id', $sublist->id)->orderBy('specieses.sort', 'DESC')->pluck('name', 'id')->toArray();
-        if(!$subSpecies) $subSpecies = Species::orderBy('specieses.sort', 'DESC')->pluck('name', 'id')->toArray();
+        if (!$subSpecies) {
+            $subSpecies = Species::visible(Auth::check() ? Auth::user() : null)->orderBy('specieses.sort', 'DESC')->pluck('name', 'id')->toArray();
+        }
+
         return view('browse.sub_masterlist', [
-            'isMyo' => false,
-            'characters' => $query->paginate(24)->appends($request->query()),
-            'categories' => [0 => 'Any Category'] + $subCategory,
-            'specieses' => [0 => 'Any Species'] + $subSpecies,
-            'subtypes' => [0 => 'Any Subtype'] + Subtype::orderBy('subtypes.sort', 'DESC')->pluck('name', 'id')->toArray(),
-            'rarities' => [0 => 'Any Rarity'] + Rarity::orderBy('rarities.sort', 'DESC')->pluck('name', 'id')->toArray(),
+            'isMyo'       => false,
+            'characters'  => $query->paginate(24)->appends($request->query()),
+            'categories'  => [0 => 'Any Category'] + $subCategory,
+            'specieses'   => [0 => 'Any Species'] + $subSpecies,
+            'subtypes'    => [0 => 'Any Subtype'] + Subtype::visible(Auth::check() ? Auth::user() : null)->orderBy('subtypes.sort', 'DESC')->pluck('name', 'id')->toArray(),
+            'rarities'    => [0 => 'Any Rarity'] + Rarity::orderBy('rarities.sort', 'DESC')->pluck('name', 'id')->toArray(),
+            'features'    => Feature::getDropdownItems(),
+            'sublist'     => $sublist,
+            'sublists'    => Sublist::orderBy('sort', 'DESC')->get(),
+            'userOptions' => User::query()->orderBy('name')->pluck('name', 'id')->toArray(),
             'titles' => [0 => 'Any Title', 'custom' => 'Custom Title'] + CharacterTitle::orderBy('character_titles.sort', 'DESC')->pluck('title', 'id')->toArray(),
-            'features' => Feature::orderBy('features.name')->pluck('name', 'id')->toArray(),
-            'sublist' => $sublist,
-            'sublists' => Sublist::orderBy('sort', 'DESC')->get(),
-            'userOptions' => User::query()->orderBy('name')->pluck('name', 'id')->toArray()
         ]);
     }
 }
diff --git a/app/Http/Controllers/Characters/CharacterController.php b/app/Http/Controllers/Characters/CharacterController.php
index 1a77d7cc61..74c090a080 100644
--- a/app/Http/Controllers/Characters/CharacterController.php
+++ b/app/Http/Controllers/Characters/CharacterController.php
@@ -2,41 +2,30 @@
 
 namespace App\Http\Controllers\Characters;
 
-use Illuminate\Http\Request;
-
-use DB;
-use Auth;
-use Route;
-use Settings;
-use App\Models\User\User;
+use App\Facades\Settings;
+use App\Http\Controllers\Controller;
 use App\Models\Character\Character;
-use App\Models\Species\Species;
-use App\Models\Rarity;
-use App\Models\Feature\Feature;
+use App\Models\Character\CharacterCurrency;
+use App\Models\Character\CharacterItem;
 use App\Models\Character\CharacterProfile;
-
+use App\Models\Character\CharacterTransfer;
 use App\Models\Currency\Currency;
-use App\Models\Currency\CurrencyLog;
-use App\Models\User\UserCurrency;
 use App\Models\Gallery\GallerySubmission;
-use App\Models\Character\CharacterCurrency;
-
 use App\Models\Item\Item;
 use App\Models\Item\ItemCategory;
+use App\Models\User\User;
+use App\Models\User\UserCurrency;
 use App\Models\User\UserItem;
-use App\Models\Character\CharacterItem;
-use App\Models\Item\ItemLog;
-
-use App\Models\Character\CharacterTransfer;
-
+use App\Services\CharacterManager;
 use App\Services\CurrencyManager;
+use App\Services\DesignUpdateManager;
 use App\Services\InventoryManager;
-use App\Services\CharacterManager;
-
-use App\Http\Controllers\Controller;
+use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Auth;
+use Illuminate\Support\Facades\View;
+use Route;
 
-class CharacterController extends Controller
-{
+class CharacterController extends Controller {
     /*
     |--------------------------------------------------------------------------
     | Character Controller
@@ -48,19 +37,72 @@ class CharacterController extends Controller
 
     /**
      * Create a new controller instance.
-     *
-     * @return void
      */
-    public function __construct()
-    {
+    public function __construct() {
         $this->middleware(function ($request, $next) {
             $slug = Route::current()->parameter('slug');
             $query = Character::myo(0)->where('slug', $slug);
-            if(!(Auth::check() && Auth::user()->hasPower('manage_characters'))) $query->where('is_visible', 1);
+            if (!(Auth::check() && Auth::user()->hasPower('manage_characters'))) {
+                $query->where('is_visible', 1);
+            }
             $this->character = $query->first();
-            if(!$this->character) abort(404);
+            if (!$this->character) {
+                abort(404);
+            }
 
             $this->character->updateOwner();
+
+            if (config('lorekeeper.extensions.previous_and_next_characters.display')) {
+                $query = Character::myo(0);
+                // Get only characters of this category if pull number is limited to category
+                if (config('lorekeeper.settings.character_pull_number') === 'category') {
+                    $query->where('character_category_id', $this->character->character_category_id);
+                }
+
+                if (!(Auth::check() && Auth::user()->hasPower('manage_characters'))) {
+                    $query->where('is_visible', 1);
+                }
+
+                // Get the previous and next characters, if they exist
+                $prevCharName = null;
+                $prevCharUrl = null;
+                $nextCharName = null;
+                $nextCharUrl = null;
+
+                if ($query->count()) {
+                    $characters = $query->orderBy('number', 'DESC')->get();
+
+                    // Filter
+                    $lowerChar = $characters->where('number', '<', $this->character->number)->first();
+                    $higherChar = $characters->where('number', '>', $this->character->number)->last();
+                }
+
+                if (config('lorekeeper.extensions.previous_and_next_characters.reverse') == 0) {
+                    $nextCharacter = $lowerChar;
+                    $previousCharacter = $higherChar;
+                } else {
+                    $previousCharacter = $lowerChar;
+                    $nextCharacter = $higherChar;
+                }
+
+                if (!$previousCharacter || $previousCharacter->id == $this->character->id) {
+                    $previousCharacter = null;
+                } else {
+                    $prevCharName = $previousCharacter->fullName;
+                    $prevCharUrl = $previousCharacter->url;
+                }
+
+                if (!$nextCharacter || $nextCharacter->id == $this->character->id) {
+                    $nextCharacter = null;
+                } else {
+                    $nextCharName = $nextCharacter->fullName;
+                    $nextCharUrl = $nextCharacter->url;
+                }
+
+                $extPrevAndNextBtns = ['prevCharName' => $prevCharName, 'prevCharUrl' => $prevCharUrl, 'nextCharName' => $nextCharName, 'nextCharUrl' => $nextCharUrl];
+                View::share('extPrevAndNextBtns', $extPrevAndNextBtns);
+            }
+
             return $next($request);
         });
     }
@@ -68,42 +110,49 @@ public function __construct()
     /**
      * Shows a character's masterlist entry.
      *
-     * @param  string  $slug
+     * @param string $slug
+     *
      * @return \Illuminate\Contracts\Support\Renderable
      */
-    public function getCharacter($slug)
-    {
+    public function getCharacter($slug) {
         return view('character.character', [
-            'character' => $this->character,
+            'character'             => $this->character,
+            'showMention'           => true,
+            'extPrevAndNextBtnsUrl' => '',
         ]);
     }
 
     /**
      * Shows a character's profile.
      *
-     * @param  string  $slug
+     * @param string $slug
+     *
      * @return \Illuminate\Contracts\Support\Renderable
      */
-    public function getCharacterProfile($slug)
-    {
+    public function getCharacterProfile($slug) {
         return view('character.profile', [
-            'character' => $this->character,
+            'character'             => $this->character,
+            'extPrevAndNextBtnsUrl' => '/profile',
         ]);
     }
 
     /**
      * Shows a character's edit profile page.
      *
-     * @param  string  $slug
+     * @param string $slug
+     *
      * @return \Illuminate\Contracts\Support\Renderable
      */
-    public function getEditCharacterProfile($slug)
-    {
-        if(!Auth::check()) abort(404);
+    public function getEditCharacterProfile($slug) {
+        if (!Auth::check()) {
+            abort(404);
+        }
 
         $isMod = Auth::user()->hasPower('manage_characters');
         $isOwner = ($this->character->user_id == Auth::user()->id);
-        if(!$isMod && !$isOwner) abort(404);
+        if (!$isMod && !$isOwner) {
+            abort(404);
+        }
 
         return view('character.edit_profile', [
             'character' => $this->character,
@@ -113,67 +162,74 @@ public function getEditCharacterProfile($slug)
     /**
      * Edits a character's profile.
      *
-     * @param  \Illuminate\Http\Request       $request
-     * @param  App\Services\CharacterManager  $service
-     * @param  string                         $slug
+     * @param App\Services\CharacterManager $service
+     * @param string                        $slug
+     *
      * @return \Illuminate\Http\RedirectResponse
      */
-    public function postEditCharacterProfile(Request $request, CharacterManager $service, $slug)
-    {
-        if(!Auth::check()) abort(404);
+    public function postEditCharacterProfile(Request $request, CharacterManager $service, $slug) {
+        if (!Auth::check()) {
+            abort(404);
+        }
 
         $isMod = Auth::user()->hasPower('manage_characters');
         $isOwner = ($this->character->user_id == Auth::user()->id);
-        if(!$isMod && !$isOwner) abort(404);
+        if (!$isMod && !$isOwner) {
+            abort(404);
+        }
 
         $request->validate(CharacterProfile::$rules);
 
-        if($service->updateCharacterProfile($request->only(['name', 'link', 'text', 'is_gift_art_allowed', 'is_gift_writing_allowed', 'is_trading', 'alert_user']), $this->character, Auth::user(), !$isOwner)) {
+        if ($service->updateCharacterProfile($request->only(['name', 'link', 'text', 'is_gift_art_allowed', 'is_gift_writing_allowed', 'is_trading', 'alert_user']), $this->character, Auth::user(), !$isOwner)) {
             flash('Profile edited successfully.')->success();
+        } else {
+            foreach ($service->errors()->getMessages()['error'] as $error) {
+                flash($error)->error();
+            }
         }
-        else {
-            foreach($service->errors()->getMessages()['error'] as $error) flash($error)->error();
-        }
+
         return redirect()->back();
     }
 
     /**
      * Shows a character's gallery.
      *
-     * @param  string  $slug
+     * @param string $slug
+     *
      * @return \Illuminate\Contracts\Support\Renderable
      */
-    public function getCharacterGallery($slug)
-    {
+    public function getCharacterGallery(Request $request, $slug) {
         return view('character.gallery', [
-            'character' => $this->character,
-            'submissions' => GallerySubmission::whereIn('id', $this->character->gallerySubmissions->pluck('gallery_submission_id')->toArray())->visible()->accepted()->orderBy('created_at', 'DESC')->paginate(20),
+            'character'             => $this->character,
+            'extPrevAndNextBtnsUrl' => '/gallery',
+            'submissions'           => GallerySubmission::whereIn('id', $this->character->gallerySubmissions->pluck('gallery_submission_id')->toArray())->visible()->accepted()->orderBy('created_at', 'DESC')->paginate(20)->appends($request->query()),
         ]);
     }
 
     /**
      * Shows a character's images.
      *
-     * @param  string  $slug
+     * @param string $slug
+     *
      * @return \Illuminate\Contracts\Support\Renderable
      */
-    public function getCharacterImages($slug)
-    {
+    public function getCharacterImages($slug) {
         return view('character.images', [
-            'user' => Auth::check() ? Auth::user() : null,
-            'character' => $this->character,
+            'user'                  => Auth::check() ? Auth::user() : null,
+            'character'             => $this->character,
+            'extPrevAndNextBtnsUrl' => '/images',
         ]);
     }
 
     /**
      * Shows a character's inventory.
      *
-     * @param  string  $slug
+     * @param string $slug
+     *
      * @return \Illuminate\Contracts\Support\Renderable
      */
-    public function getCharacterInventory($slug)
-    {
-        $categories = ItemCategory::where('is_character_owned', '1')->orderBy('sort', 'DESC')->get();
+    public function getCharacterInventory($slug) {
+        $categories = ItemCategory::visible(Auth::check() ? Auth::user() : null)->where('is_character_owned', '1')->orderBy('sort', 'DESC')->get();
         $itemOptions = Item::whereIn('item_category_id', $categories->pluck('id'));
 
         $items = count($categories) ?
@@ -190,31 +246,37 @@ public function getCharacterInventory($slug)
                 ->orderBy('updated_at')
                 ->get()
                 ->groupBy(['item_category_id', 'id']);
+
         return view('character.inventory', [
-            'character' => $this->character,
-            'categories' => $categories->keyBy('id'),
-            'items' => $items,
-            'logs' => $this->character->getItemLogs(),
-            ] + (Auth::check() && (Auth::user()->hasPower('edit_inventories') || Auth::user()->id == $this->character->user_id) ? [
-                'itemOptions' => $itemOptions->pluck('name', 'id'),
-                'userInventory' => UserItem::with('item')->whereIn('item_id', $itemOptions->pluck('id'))->whereNull('deleted_at')->where('count', '>', '0')->where('user_id', Auth::user()->id)->get()->filter(function($userItem){return $userItem->isTransferrable == true;})->sortBy('item.name'),
-                'page' => 'character'
-            ] : []));
+            'character'             => $this->character,
+            'extPrevAndNextBtnsUrl' => '/inventory',
+            'categories'            => $categories->keyBy('id'),
+            'items'                 => $items,
+            'logs'                  => $this->character->getItemLogs(),
+        ] + (Auth::check() && (Auth::user()->hasPower('edit_inventories') || Auth::user()->id == $this->character->user_id) ? [
+            'itemOptions'   => $itemOptions->pluck('name', 'id'),
+            'userInventory' => UserItem::with('item')->whereIn('item_id', $itemOptions->pluck('id'))->whereNull('deleted_at')->where('count', '>', '0')->where('user_id', Auth::user()->id)->get()->filter(function ($userItem) {
+                return $userItem->isTransferrable == true;
+            })->sortBy('item.name'),
+            'page'          => 'character',
+        ] : []));
     }
 
     /**
      * Shows a character's bank.
      *
-     * @param  string  $slug
+     * @param string $slug
+     *
      * @return \Illuminate\Contracts\Support\Renderable
      */
-    public function getCharacterBank($slug)
-    {
+    public function getCharacterBank($slug) {
         $character = $this->character;
+
         return view('character.bank', [
-            'character' => $this->character,
-            'currencies' => $character->getCurrencies(true),
-            'logs' => $this->character->getCurrencyLogs(),
+            'character'             => $this->character,
+            'extPrevAndNextBtnsUrl' => '/bank',
+            'currencies'            => $character->getCurrencies(true),
+            'logs'                  => $this->character->getCurrencyLogs(),
         ] + (Auth::check() && Auth::user()->id == $this->character->user_id ? [
             'takeCurrencyOptions' => Currency::where('allow_character_to_user', 1)->where('is_user_owned', 1)->where('is_character_owned', 1)->whereIn('id', CharacterCurrency::where('character_id', $this->character->id)->pluck('currency_id')->toArray())->orderBy('sort_character', 'DESC')->pluck('name', 'id')->toArray(),
             'giveCurrencyOptions' => Currency::where('allow_user_to_character', 1)->where('is_user_owned', 1)->where('is_character_owned', 1)->whereIn('id', UserCurrency::where('user_id', Auth::user()->id)->pluck('currency_id')->toArray())->orderBy('sort_user', 'DESC')->pluck('name', 'id')->toArray(),
@@ -227,40 +289,44 @@ public function getCharacterBank($slug)
     /**
      * Transfers currency between the user and character.
      *
-     * @param  \Illuminate\Http\Request       $request
-     * @param  App\Services\CharacterManager  $service
-     * @param  string                         $slug
+     * @param App\Services\CharacterManager $service
+     * @param string                        $slug
+     *
      * @return \Illuminate\Http\RedirectResponse
      */
-    public function postCurrencyTransfer(Request $request, CurrencyManager $service, $slug)
-    {
-        if(!Auth::check()) abort(404);
+    public function postCurrencyTransfer(Request $request, CurrencyManager $service, $slug) {
+        if (!Auth::check()) {
+            abort(404);
+        }
 
         $action = $request->get('action');
         $sender = ($action == 'take') ? $this->character : Auth::user();
         $recipient = ($action == 'take') ? Auth::user() : $this->character;
 
-        if($service->transferCharacterCurrency($sender, $recipient, Currency::where(($action == 'take') ? 'allow_character_to_user' : 'allow_user_to_character', 1)->where('id', $request->get(($action == 'take') ? 'take_currency_id' : 'give_currency_id'))->first(), $request->get('quantity'))) {
+        if ($service->transferCharacterCurrency($sender, $recipient, Currency::where(($action == 'take') ? 'allow_character_to_user' : 'allow_user_to_character', 1)->where('id', $request->get(($action == 'take') ? 'take_currency_id' : 'give_currency_id'))->first(), $request->get('quantity'))) {
             flash('Currency transferred successfully.')->success();
+        } else {
+            foreach ($service->errors()->getMessages()['error'] as $error) {
+                flash($error)->error();
+            }
         }
-        else {
-            foreach($service->errors()->getMessages()['error'] as $error) flash($error)->error();
-        }
+
         return redirect()->back();
     }
 
     /**
      * Handles inventory item processing, including transferring items between the user and character.
      *
-     * @param  \Illuminate\Http\Request       $request
-     * @param  App\Services\CharacterManager  $service
-     * @param  string                         $slug
+     * @param App\Services\CharacterManager $service
+     * @param string                        $slug
+     *
      * @return \Illuminate\Http\RedirectResponse
      */
-    public function postInventoryEdit(Request $request, InventoryManager $service, $slug)
-    {
-        if(!Auth::check()) abort(404);
-        switch($request->get('action')) {
+    public function postInventoryEdit(Request $request, InventoryManager $service, $slug) {
+        if (!Auth::check()) {
+            abort(404);
+        }
+        switch ($request->get('action')) {
             default:
                 flash('Invalid action selected.')->error();
                 break;
@@ -268,11 +334,12 @@ public function postInventoryEdit(Request $request, InventoryManager $service, $
                 $sender = Auth::user();
                 $recipient = $this->character;
 
-                if($service->transferCharacterStack($sender, $recipient, UserItem::find($request->get('stack_id')), $request->get('stack_quantity'))) {
+                if ($service->transferCharacterStack($sender, $recipient, UserItem::find($request->get('stack_id')), $request->get('stack_quantity'), Auth::user())) {
                     flash('Item transferred successfully.')->success();
-                }
-                else {
-                    foreach($service->errors()->getMessages()['error'] as $error) flash($error)->error();
+                } else {
+                    foreach ($service->errors()->getMessages()['error'] as $error) {
+                        flash($error)->error();
+                    }
                 }
                 break;
             case 'name':
@@ -289,230 +356,260 @@ public function postInventoryEdit(Request $request, InventoryManager $service, $
         return redirect()->back();
     }
 
-    /**
-     * Transfers inventory items back to a user.
-     *
-     * @param  \Illuminate\Http\Request       $request
-     * @param  App\Services\InventoryManager  $service
-     * @return \Illuminate\Http\RedirectResponse
-     */
-    private function postItemTransfer(Request $request, InventoryManager $service)
-    {
-        if($service->transferCharacterStack($this->character, $this->character->user, CharacterItem::find($request->get('ids')), $request->get('quantities'))) {
-            flash('Item transferred successfully.')->success();
-        }
-        else {
-            foreach($service->errors()->getMessages()['error'] as $error) flash($error)->error();
-        }
-        return redirect()->back();
-    }
-
-    /**
-     * Names an inventory stack.
-     *
-     * @param  \Illuminate\Http\Request       $request
-     * @param  App\Services\CharacterManager  $service
-     * @return \Illuminate\Http\RedirectResponse
-     */
-    private function postName(Request $request, InventoryManager $service)
-    {
-        if($service->nameStack($this->character, CharacterItem::find($request->get('ids')), $request->get('stack_name'))) {
-            flash('Item named successfully.')->success();
-        }
-        else {
-            foreach($service->errors()->getMessages()['error'] as $error) flash($error)->error();
-        }
-        return redirect()->back();
-    }
-
-    /**
-     * Deletes an inventory stack.
-     *
-     * @param  \Illuminate\Http\Request       $request
-     * @param  App\Services\CharacterManager  $service
-     * @return \Illuminate\Http\RedirectResponse
-     */
-    private function postDelete(Request $request, InventoryManager $service)
-    {
-        if($service->deleteStack($this->character, CharacterItem::find($request->get('ids')), $request->get('quantities'))) {
-            flash('Item deleted successfully.')->success();
-        }
-        else {
-            foreach($service->errors()->getMessages()['error'] as $error) flash($error)->error();
-        }
-        return redirect()->back();
-    }
-
     /**
      * Shows a character's currency logs.
      *
-     * @param  string  $slug
+     * @param string $slug
+     *
      * @return \Illuminate\Contracts\Support\Renderable
      */
-    public function getCharacterCurrencyLogs($slug)
-    {
+    public function getCharacterCurrencyLogs($slug) {
         return view('character.currency_logs', [
-            'character' => $this->character,
-            'logs' => $this->character->getCurrencyLogs(0)
+            'character'             => $this->character,
+            'extPrevAndNextBtnsUrl' => '/currency-logs',
+            'logs'                  => $this->character->getCurrencyLogs(0),
         ]);
     }
 
     /**
      * Shows a character's item logs.
      *
-     * @param  string  $name
+     * @param mixed $slug
+     *
      * @return \Illuminate\Contracts\Support\Renderable
      */
-    public function getCharacterItemLogs($slug)
-    {
+    public function getCharacterItemLogs($slug) {
         return view('character.item_logs', [
-            'character' => $this->character,
-            'logs' => $this->character->getItemLogs(0)
+            'character'             => $this->character,
+            'extPrevAndNextBtnsUrl' => '/item-logs',
+            'logs'                  => $this->character->getItemLogs(0),
         ]);
     }
 
     /**
      * Shows a character's ownership logs.
      *
-     * @param  string  $slug
+     * @param string $slug
+     *
      * @return \Illuminate\Contracts\Support\Renderable
      */
-    public function getCharacterOwnershipLogs($slug)
-    {
+    public function getCharacterOwnershipLogs($slug) {
         return view('character.ownership_logs', [
-            'character' => $this->character,
-            'logs' => $this->character->getOwnershipLogs(0)
+            'character'             => $this->character,
+            'extPrevAndNextBtnsUrl' => '/ownership',
+            'logs'                  => $this->character->getOwnershipLogs(0),
         ]);
     }
 
     /**
      * Shows a character's ownership logs.
      *
-     * @param  string  $slug
+     * @param string $slug
+     *
      * @return \Illuminate\Contracts\Support\Renderable
      */
-    public function getCharacterLogs($slug)
-    {
+    public function getCharacterLogs($slug) {
         return view('character.character_logs', [
-            'character' => $this->character,
-            'logs' => $this->character->getCharacterLogs()
+            'character'             => $this->character,
+            'extPrevAndNextBtnsUrl' => '/change-log',
+            'logs'                  => $this->character->getCharacterLogs(),
         ]);
     }
 
     /**
      * Shows a character's submissions.
      *
+     * @param mixed $slug
+     *
      * @return \Illuminate\Contracts\Support\Renderable
      */
-    public function getCharacterSubmissions($slug)
-    {
+    public function getCharacterSubmissions($slug) {
         return view('character.submission_logs', [
-            'character' => $this->character,
-            'logs' => $this->character->getSubmissions()
+            'character'             => $this->character,
+            'extPrevAndNextBtnsUrl' => '/submissions',
+            'logs'                  => $this->character->getSubmissions(),
         ]);
     }
 
     /**
      * Shows a character's transfer page.
      *
-     * @param  string  $slug
+     * @param string $slug
+     *
      * @return \Illuminate\Contracts\Support\Renderable
      */
-    public function getTransfer($slug)
-    {
-        if(!Auth::check()) abort(404);
+    public function getTransfer($slug) {
+        if (!Auth::check()) {
+            abort(404);
+        }
 
         $isMod = Auth::user()->hasPower('manage_characters');
         $isOwner = ($this->character->user_id == Auth::user()->id);
-        if(!$isMod && !$isOwner) abort(404);
+        if (!$isMod && !$isOwner) {
+            abort(404);
+        }
 
         return view('character.transfer', [
-            'character' => $this->character,
-            'transfer' => CharacterTransfer::active()->where('character_id', $this->character->id)->first(),
-            'cooldown' => Settings::get('transfer_cooldown'),
+            'character'      => $this->character,
+            'transfer'       => CharacterTransfer::active()->where('character_id', $this->character->id)->first(),
+            'cooldown'       => Settings::get('transfer_cooldown'),
             'transfersQueue' => Settings::get('open_transfers_queue'),
-            'userOptions' => User::visible()->orderBy('name')->pluck('name', 'id')->toArray(),
+            'userOptions'    => User::visible()->orderBy('name')->pluck('name', 'id')->toArray(),
         ]);
     }
 
     /**
      * Opens a transfer request for a character.
      *
-     * @param  \Illuminate\Http\Request       $request
-     * @param  App\Services\CharacterManager  $service
-     * @param  string                         $slug
+     * @param App\Services\CharacterManager $service
+     * @param string                        $slug
+     *
      * @return \Illuminate\Http\RedirectResponse
      */
-    public function postTransfer(Request $request, CharacterManager $service, $slug)
-    {
-        if(!Auth::check()) abort(404);
+    public function postTransfer(Request $request, CharacterManager $service, $slug) {
+        if (!Auth::check()) {
+            abort(404);
+        }
 
-        if($service->createTransfer($request->only(['recipient_id', 'user_reason']), $this->character, Auth::user())) {
+        if ($service->createTransfer($request->only(['recipient_id', 'user_reason']), $this->character, Auth::user())) {
             flash('Transfer created successfully.')->success();
+        } else {
+            foreach ($service->errors()->getMessages()['error'] as $error) {
+                flash($error)->error();
+            }
         }
-        else {
-            foreach($service->errors()->getMessages()['error'] as $error) flash($error)->error();
-        }
+
         return redirect()->back();
     }
 
     /**
      * Cancels a transfer request for a character.
      *
-     * @param  \Illuminate\Http\Request       $request
-     * @param  App\Services\CharacterManager  $service
-     * @param  string                         $slug
-     * @param  int                            $id
+     * @param App\Services\CharacterManager $service
+     * @param string                        $slug
+     * @param int                           $id
+     *
      * @return \Illuminate\Http\RedirectResponse
      */
-    public function postCancelTransfer(Request $request, CharacterManager $service, $slug, $id)
-    {
-        if(!Auth::check()) abort(404);
+    public function postCancelTransfer(Request $request, CharacterManager $service, $slug, $id) {
+        if (!Auth::check()) {
+            abort(404);
+        }
 
-        if($service->cancelTransfer(['transfer_id' => $id], Auth::user())) {
+        if ($service->cancelTransfer(['transfer_id' => $id], Auth::user())) {
             flash('Transfer cancelled.')->success();
+        } else {
+            foreach ($service->errors()->getMessages()['error'] as $error) {
+                flash($error)->error();
+            }
         }
-        else {
-            foreach($service->errors()->getMessages()['error'] as $error) flash($error)->error();
-        }
+
         return redirect()->back();
     }
 
     /**
      * Shows a character's design update approval page.
      *
-     * @param  string  $slug
+     * @param string $slug
+     *
      * @return \Illuminate\Contracts\Support\Renderable
      */
-    public function getCharacterApproval($slug)
-    {
-        if(!Auth::check() || $this->character->user_id != Auth::user()->id) abort(404);
+    public function getCharacterApproval($slug) {
+        if (!Auth::check() || $this->character->user_id != Auth::user()->id) {
+            abort(404);
+        }
 
         return view('character.update_form', [
             'character' => $this->character,
             'queueOpen' => Settings::get('is_design_updates_open'),
-            'request' => $this->character->designUpdate()->active()->first()
+            'request'   => $this->character->designUpdate()->active()->first(),
         ]);
     }
 
     /**
      * Opens a new design update approval request for a character.
      *
-     * @param  App\Services\CharacterManager  $service
-     * @param  string                         $slug
+     * @param App\Services\DesignUpdateManager $service
+     * @param string                           $slug
+     *
      * @return \Illuminate\Http\RedirectResponse
      */
-    public function postCharacterApproval($slug, CharacterManager $service)
-    {
-        if(!Auth::check() || $this->character->user_id != Auth::user()->id) abort(404);
+    public function postCharacterApproval($slug, DesignUpdateManager $service) {
+        if (!Auth::check() || $this->character->user_id != Auth::user()->id) {
+            abort(404);
+        }
 
-        if($request = $service->createDesignUpdateRequest($this->character, Auth::user())) {
+        if ($request = $service->createDesignUpdateRequest($this->character, Auth::user())) {
             flash('Successfully created new design update request draft.')->success();
+
             return redirect()->to($request->url);
+        } else {
+            foreach ($service->errors()->getMessages()['error'] as $error) {
+                flash($error)->error();
+            }
+        }
+
+        return redirect()->back();
+    }
+
+    /**
+     * Transfers inventory items back to a user.
+     *
+     * @param App\Services\InventoryManager $service
+     *
+     * @return \Illuminate\Http\RedirectResponse
+     */
+    private function postItemTransfer(Request $request, InventoryManager $service) {
+        if ($service->transferCharacterStack($this->character, $this->character->user, CharacterItem::find($request->get('ids')), $request->get('quantities'), Auth::user())) {
+            flash('Item transferred successfully.')->success();
+        } else {
+            foreach ($service->errors()->getMessages()['error'] as $error) {
+                flash($error)->error();
+            }
+        }
+
+        return redirect()->back();
+    }
+
+    /**
+     * Names an inventory stack.
+     *
+     * @param App\Services\CharacterManager $service
+     *
+     * @return \Illuminate\Http\RedirectResponse
+     */
+    private function postName(Request $request, InventoryManager $service) {
+        $request->validate([
+            'stack_name' => 'nullable|max:100',
+        ]);
+
+        if ($service->nameStack($this->character, CharacterItem::find($request->get('ids')), $request->get('stack_name'), Auth::user())) {
+            flash('Item named successfully.')->success();
+        } else {
+            foreach ($service->errors()->getMessages()['error'] as $error) {
+                flash($error)->error();
+            }
         }
-        else {
-            foreach($service->errors()->getMessages()['error'] as $error) flash($error)->error();
+
+        return redirect()->back();
+    }
+
+    /**
+     * Deletes an inventory stack.
+     *
+     * @param App\Services\CharacterManager $service
+     *
+     * @return \Illuminate\Http\RedirectResponse
+     */
+    private function postDelete(Request $request, InventoryManager $service) {
+        if ($service->deleteStack($this->character, CharacterItem::find($request->get('ids')), $request->get('quantities'), Auth::user())) {
+            flash('Item deleted successfully.')->success();
+        } else {
+            foreach ($service->errors()->getMessages()['error'] as $error) {
+                flash($error)->error();
+            }
         }
+
         return redirect()->back();
     }
 }
diff --git a/app/Http/Controllers/Characters/DesignController.php b/app/Http/Controllers/Characters/DesignController.php
index b80c32c5c2..32d3d5168f 100644
--- a/app/Http/Controllers/Characters/DesignController.php
+++ b/app/Http/Controllers/Characters/DesignController.php
@@ -2,318 +2,367 @@
 
 namespace App\Http\Controllers\Characters;
 
-use Illuminate\Http\Request;
-
-use DB;
-use Auth;
-use Settings;
-use App\Models\Item\Item;
-use App\Models\User\User;
-use App\Models\User\UserItem;
+use App\Http\Controllers\Controller;
 use App\Models\Character\Character;
 use App\Models\Character\CharacterDesignUpdate;
-use App\Models\Species\Species;
-use App\Models\Species\Subtype;
-use App\Models\Rarity;
 use App\Models\Character\CharacterTitle;
 use App\Models\Feature\Feature;
+use App\Models\Item\Item;
 use App\Models\Item\ItemCategory;
-use App\Services\CharacterManager;
-
-use App\Http\Controllers\Controller;
+use App\Models\Rarity;
+use App\Models\Species\Species;
+use App\Models\Species\Subtype;
+use App\Models\User\User;
+use App\Models\User\UserItem;
+use App\Services\DesignUpdateManager;
+use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Auth;
 
-class DesignController extends Controller
-{
+class DesignController extends Controller {
     /**
      * Shows the index of character design update submissions.
      *
-     * @param  string  $type
+     * @param string $type
+     *
      * @return \Illuminate\Contracts\Support\Renderable
      */
-    public function getDesignUpdateIndex($type = null)
-    {
+    public function getDesignUpdateIndex($type = null) {
         $requests = CharacterDesignUpdate::where('user_id', Auth::user()->id);
-        if(!$type) $type = 'draft';
+        if (!$type) {
+            $type = 'draft';
+        }
         $requests->where('status', ucfirst($type));
 
         return view('character.design.index', [
             'requests' => $requests->orderBy('id', 'DESC')->paginate(20),
-            'status' => $type
+            'status'   => $type,
         ]);
     }
 
     /**
      * Shows a design update request.
      *
-     * @param  int  $id
+     * @param int $id
+     *
      * @return \Illuminate\Contracts\Support\Renderable
      */
-    public function getDesignUpdate($id)
-    {
+    public function getDesignUpdate($id) {
         $r = CharacterDesignUpdate::find($id);
-        if(!$r || ($r->user_id != Auth::user()->id && !Auth::user()->hasPower('manage_characters'))) abort(404);
+        if (!$r || ($r->user_id != Auth::user()->id && !Auth::user()->hasPower('manage_characters'))) {
+            abort(404);
+        }
+
         return view('character.design.request', [
-            'request' => $r
+            'request' => $r,
         ]);
     }
 
     /**
      * Shows a design update request's comments section.
      *
-     * @param  int  $id
+     * @param int $id
+     *
      * @return \Illuminate\Contracts\Support\Renderable
      */
-    public function getComments($id)
-    {
+    public function getComments($id) {
         $r = CharacterDesignUpdate::find($id);
-        if(!$r || ($r->user_id != Auth::user()->id && !Auth::user()->hasPower('manage_characters'))) abort(404);
+        if (!$r || ($r->user_id != Auth::user()->id && !Auth::user()->hasPower('manage_characters'))) {
+            abort(404);
+        }
+
         return view('character.design.comments', [
-            'request' => $r
+            'request' => $r,
         ]);
     }
 
     /**
      * Edits a design update request's comments section.
      *
-     * @param  \Illuminate\Http\Request       $request
-     * @param  App\Services\CharacterManager  $service
-     * @param  int                            $id
+     * @param App\Services\DesignUpdateManager $service
+     * @param int                              $id
+     *
      * @return \Illuminate\Http\RedirectResponse
      */
-    public function postComments(Request $request, CharacterManager $service, $id)
-    {
+    public function postComments(Request $request, DesignUpdateManager $service, $id) {
         $r = CharacterDesignUpdate::find($id);
-        if(!$r) abort(404);
-        if($r->user_id != Auth::user()->id) abort(404);
+        if (!$r) {
+            abort(404);
+        }
+        if ($r->user_id != Auth::user()->id) {
+            abort(404);
+        }
 
-        if($service->saveRequestComment($request->only(['comments']), $r)) {
+        if ($service->saveRequestComment($request->only(['comments']), $r)) {
             flash('Request edited successfully.')->success();
+        } else {
+            foreach ($service->errors()->getMessages()['error'] as $error) {
+                flash($error)->error();
+            }
         }
-        else {
-            foreach($service->errors()->getMessages()['error'] as $error) flash($error)->error();
-        }
+
         return redirect()->back();
     }
 
     /**
      * Shows a design update request's image section.
      *
-     * @param  int  $id
+     * @param int $id
+     *
      * @return \Illuminate\Contracts\Support\Renderable
      */
-    public function getImage($id)
-    {
+    public function getImage($id) {
         $r = CharacterDesignUpdate::find($id);
-        if(!$r || ($r->user_id != Auth::user()->id && !Auth::user()->hasPower('manage_characters'))) abort(404);
+        if (!$r || ($r->user_id != Auth::user()->id && !Auth::user()->hasPower('manage_characters'))) {
+            abort(404);
+        }
+
         return view('character.design.image', [
             'request' => $r,
-            'users' => User::query()->orderBy('name')->pluck('name', 'id')->toArray(),
+            'users'   => User::query()->orderBy('name')->pluck('name', 'id')->toArray(),
         ]);
     }
 
     /**
      * Edits a design update request's image upload section.
      *
-     * @param  \Illuminate\Http\Request       $request
-     * @param  App\Services\CharacterManager  $service
-     * @param  int                            $id
+     * @param App\Services\DesignUpdateManager $service
+     * @param int                              $id
+     *
      * @return \Illuminate\Http\RedirectResponse
      */
-    public function postImage(Request $request, CharacterManager $service, $id)
-    {
+    public function postImage(Request $request, DesignUpdateManager $service, $id) {
         $r = CharacterDesignUpdate::find($id);
-        if(!$r) abort(404);
-        if($r->user_id != Auth::user()->id && !Auth::user()->hasPower('manage_characters')) abort(404);
+        if (!$r) {
+            abort(404);
+        }
+        if ($r->user_id != Auth::user()->id && !Auth::user()->hasPower('manage_characters')) {
+            abort(404);
+        }
         $request->validate(CharacterDesignUpdate::$imageRules);
 
         $useAdmin = ($r->status != 'Draft' || $r->user_id != Auth::user()->id) && Auth::user()->hasPower('manage_characters');
-        if($service->saveRequestImage($request->all(), $r, $useAdmin)) {
+        if ($service->saveRequestImage($request->all(), $r, $useAdmin)) {
             flash('Request edited successfully.')->success();
+        } else {
+            foreach ($service->errors()->getMessages()['error'] as $error) {
+                flash($error)->error();
+            }
         }
-        else {
-            foreach($service->errors()->getMessages()['error'] as $error) flash($error)->error();
-        }
+
         return redirect()->back();
     }
 
     /**
      * Shows a design update request's addons section.
      *
-     * @param  int  $id
+     * @param int $id
+     *
      * @return \Illuminate\Contracts\Support\Renderable
      */
-    public function getAddons($id)
-    {
+    public function getAddons($id) {
         $r = CharacterDesignUpdate::find($id);
-        if(!$r || ($r->user_id != Auth::user()->id && !Auth::user()->hasPower('manage_characters'))) abort(404);
-        if($r->status == 'Draft' && $r->user_id == Auth::user()->id)
+        if (!$r || ($r->user_id != Auth::user()->id && !Auth::user()->hasPower('manage_characters'))) {
+            abort(404);
+        }
+        if ($r->status == 'Draft' && $r->user_id == Auth::user()->id) {
             $inventory = UserItem::with('item')->whereNull('deleted_at')->where('count', '>', '0')->where('user_id', $r->user_id)->get();
-        else
+        } else {
             $inventory = isset($r->data['user']) ? parseAssetData($r->data['user']) : null;
+        }
+
         return view('character.design.addons', [
-            'request' => $r,
-            'categories' => ItemCategory::orderBy('sort', 'DESC')->get(),
-            'inventory' => $inventory,
-            'items' => Item::all()->keyBy('id'),
+            'request'     => $r,
+            'categories'  => ItemCategory::visible(Auth::check() ? Auth::user() : null)->orderBy('sort', 'DESC')->get(),
+            'inventory'   => $inventory,
+            'items'       => Item::all()->keyBy('id'),
             'item_filter' => Item::orderBy('name')->get()->keyBy('id'),
-            'page' => 'update'
+            'page'        => 'update',
         ]);
     }
 
     /**
      * Edits a design update request's addons section.
      *
-     * @param  \Illuminate\Http\Request       $request
-     * @param  App\Services\CharacterManager  $service
-     * @param  int                            $id
+     * @param App\Services\DesignUpdateManager $service
+     * @param int                              $id
+     *
      * @return \Illuminate\Http\RedirectResponse
      */
-    public function postAddons(Request $request, CharacterManager $service, $id)
-    {
+    public function postAddons(Request $request, DesignUpdateManager $service, $id) {
         $r = CharacterDesignUpdate::find($id);
-        if(!$r) abort(404);
-        if($r->user_id != Auth::user()->id) abort(404);
+        if (!$r) {
+            abort(404);
+        }
+        if ($r->user_id != Auth::user()->id) {
+            abort(404);
+        }
 
-        if($service->saveRequestAddons($request->all(), $r)) {
+        if ($service->saveRequestAddons($request->all(), $r)) {
             flash('Request edited successfully.')->success();
+        } else {
+            foreach ($service->errors()->getMessages()['error'] as $error) {
+                flash($error)->error();
+            }
         }
-        else {
-            foreach($service->errors()->getMessages()['error'] as $error) flash($error)->error();
-        }
+
         return redirect()->back();
     }
 
     /**
      * Shows a design update request's features section.
      *
-     * @param  int  $id
+     * @param int $id
+     *
      * @return \Illuminate\Contracts\Support\Renderable
      */
-    public function getFeatures($id)
-    {
+    public function getFeatures($id) {
         $r = CharacterDesignUpdate::find($id);
-        if(!$r || ($r->user_id != Auth::user()->id && !Auth::user()->hasPower('manage_characters'))) abort(404);
+        if (!$r || ($r->user_id != Auth::user()->id && !Auth::user()->hasPower('manage_characters'))) {
+            abort(404);
+        }
 
         return view('character.design.features', [
-            'request' => $r,
-            'specieses' => ['0' => 'Select Species'] + Species::orderBy('sort', 'DESC')->pluck('name', 'id')->toArray(),
-            'subtypes' => ['0' => 'No Subtype'] + Subtype::where('species_id','=',$r->species_id)->orderBy('sort', 'DESC')->pluck('name', 'id')->toArray(),
-            'rarities' => ['0' => 'Select Rarity'] + Rarity::orderBy('sort', 'DESC')->pluck('name', 'id')->toArray(),
-            'titles' => ['0' => 'Select Title', 'custom' => 'Custom Title'] + CharacterTitle::orderBy('sort', 'DESC')->pluck('title', 'id')->toArray(),
-            'features' => Feature::orderBy('name')->pluck('name', 'id')->toArray()
+            'request'   => $r,
+            'specieses' => ['0' => 'Select Species'] + Species::visible()->orderBy('sort', 'DESC')->pluck('name', 'id')->toArray(),
+            'subtypes'  => ['0' => 'No Subtype'] + Subtype::visible()->where('species_id', '=', $r->species_id)->orderBy('sort', 'DESC')->pluck('name', 'id')->toArray(),
+            'rarities'  => ['0' => 'Select Rarity'] + Rarity::orderBy('sort', 'DESC')->pluck('name', 'id')->toArray(),
+            'features'  => Feature::getDropdownItems(),
+            'titles' => ['custom' => 'Custom Title'] + CharacterTitle::orderBy('sort', 'DESC')->pluck('title', 'id')->toArray(),
         ]);
     }
 
     /**
-     * Shows the edit image subtype portion of the modal
+     * Shows the edit image subtype portion of the modal.
      *
-     * @param  Request  $request
      * @return \Illuminate\Contracts\Support\Renderable
      */
     public function getFeaturesSubtype(Request $request) {
+        $species = $request->input('species');
+        $id = $request->input('id');
 
-      $species = $request->input('species');
-      $id = $request->input('id');
-      return view('character.design._features_subtype', [
-          'subtypes' => ['0' => 'Select Subtype'] + Subtype::where('species_id','=',$species)->orderBy('sort', 'DESC')->pluck('name', 'id')->toArray(),
-          'subtype' => $id
-      ]);
+        return view('character.design._features_subtype', [
+            'subtypes' => ['0' => 'Select Subtype'] + Subtype::visible()->where('species_id', '=', $species)->orderBy('sort', 'DESC')->pluck('name', 'id')->toArray(),
+            'subtype'  => $id,
+        ]);
     }
 
     /**
      * Edits a design update request's features section.
      *
-     * @param  \Illuminate\Http\Request       $request
-     * @param  App\Services\CharacterManager  $service
-     * @param  int                            $id
+     * @param App\Services\DesignUpdateManager $service
+     * @param int                              $id
+     *
      * @return \Illuminate\Http\RedirectResponse
      */
-    public function postFeatures(Request $request, CharacterManager $service, $id)
-    {
+    public function postFeatures(Request $request, DesignUpdateManager $service, $id) {
         $r = CharacterDesignUpdate::find($id);
-        if(!$r) abort(404);
-        if($r->user_id != Auth::user()->id) abort(404);
+        if (!$r) {
+            abort(404);
+        }
+        if ($r->user_id != Auth::user()->id) {
+            abort(404);
+        }
 
-        if($service->saveRequestFeatures($request->all(), $r)) {
+        if ($service->saveRequestFeatures($request->all(), $r)) {
             flash('Request edited successfully.')->success();
+        } else {
+            foreach ($service->errors()->getMessages()['error'] as $error) {
+                flash($error)->error();
+            }
         }
-        else {
-            foreach($service->errors()->getMessages()['error'] as $error) flash($error)->error();
-        }
+
         return redirect()->back();
     }
 
     /**
      * Shows the design update request submission confirmation modal.
      *
-     * @param  int  $id
+     * @param int $id
+     *
      * @return \Illuminate\Contracts\Support\Renderable
      */
-    public function getConfirm($id)
-    {
+    public function getConfirm($id) {
         $r = CharacterDesignUpdate::find($id);
-        if(!$r || ($r->user_id != Auth::user()->id && !Auth::user()->hasPower('manage_characters'))) abort(404);
+        if (!$r || ($r->user_id != Auth::user()->id && !Auth::user()->hasPower('manage_characters'))) {
+            abort(404);
+        }
+
         return view('character.design._confirm_modal', [
-            'request' => $r
+            'request' => $r,
         ]);
     }
 
     /**
      * Submits a design update request for approval.
      *
-     * @param  App\Services\CharacterManager  $service
-     * @param  int                            $id
+     * @param App\Services\DesignUpdateManager $service
+     * @param int                              $id
+     *
      * @return \Illuminate\Http\RedirectResponse
      */
-    public function postSubmit(CharacterManager $service, $id)
-    {
+    public function postSubmit(DesignUpdateManager $service, $id) {
         $r = CharacterDesignUpdate::find($id);
-        if(!$r) abort(404);
-        if($r->user_id != Auth::user()->id) abort(404);
+        if (!$r) {
+            abort(404);
+        }
+        if ($r->user_id != Auth::user()->id) {
+            abort(404);
+        }
 
-        if($service->submitRequest($r)) {
+        if ($service->submitRequest($r)) {
             flash('Request submitted successfully.')->success();
+        } else {
+            foreach ($service->errors()->getMessages()['error'] as $error) {
+                flash($error)->error();
+            }
         }
-        else {
-            foreach($service->errors()->getMessages()['error'] as $error) flash($error)->error();
-        }
+
         return redirect()->back();
     }
 
     /**
      * Shows the design update request deletion confirmation modal.
      *
-     * @param  int  $id
+     * @param int $id
+     *
      * @return \Illuminate\Contracts\Support\Renderable
      */
-    public function getDelete($id)
-    {
+    public function getDelete($id) {
         $r = CharacterDesignUpdate::find($id);
-        if(!$r || ($r->user_id != Auth::user()->id && !Auth::user()->hasPower('manage_characters'))) abort(404);
+        if (!$r || ($r->user_id != Auth::user()->id && !Auth::user()->hasPower('manage_characters'))) {
+            abort(404);
+        }
+
         return view('character.design._delete_modal', [
-            'request' => $r
+            'request' => $r,
         ]);
     }
 
     /**
      * Deletes a design update request.
      *
-     * @param  App\Services\CharacterManager  $service
-     * @param  int                            $id
+     * @param App\Services\DesignUpdateManager $service
+     * @param int                              $id
+     *
      * @return \Illuminate\Http\RedirectResponse
      */
-    public function postDelete(CharacterManager $service, $id)
-    {
+    public function postDelete(DesignUpdateManager $service, $id) {
         $r = CharacterDesignUpdate::find($id);
-        if(!$r) abort(404);
-        if($r->user_id != Auth::user()->id) abort(404);
+        if (!$r) {
+            abort(404);
+        }
+        if ($r->user_id != Auth::user()->id) {
+            abort(404);
+        }
 
-        if($service->deleteRequest($r)) {
+        if ($service->deleteRequest($r)) {
             flash('Request deleted successfully.')->success();
+        } else {
+            foreach ($service->errors()->getMessages()['error'] as $error) {
+                flash($error)->error();
+            }
         }
-        else {
-            foreach($service->errors()->getMessages()['error'] as $error) flash($error)->error();
-        }
+
         return redirect()->to('designs');
     }
 }
diff --git a/app/Http/Controllers/Characters/MyoController.php b/app/Http/Controllers/Characters/MyoController.php
index da29321e9c..cbdae42528 100644
--- a/app/Http/Controllers/Characters/MyoController.php
+++ b/app/Http/Controllers/Characters/MyoController.php
@@ -2,27 +2,18 @@
 
 namespace App\Http\Controllers\Characters;
 
-use Illuminate\Http\Request;
-
-use DB;
-use Auth;
-use Route;
-use Settings;
-use App\Models\User\User;
+use App\Facades\Settings;
+use App\Http\Controllers\Controller;
 use App\Models\Character\Character;
-use App\Models\Currency\Currency;
-use App\Models\Currency\CurrencyLog;
-use App\Models\User\UserCurrency;
-use App\Models\Character\CharacterCurrency;
 use App\Models\Character\CharacterTransfer;
-
-use App\Services\CurrencyManager;
+use App\Models\User\User;
 use App\Services\CharacterManager;
+use App\Services\DesignUpdateManager;
+use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Auth;
+use Route;
 
-use App\Http\Controllers\Controller;
-
-class MyoController extends Controller
-{
+class MyoController extends Controller {
     /*
     |--------------------------------------------------------------------------
     | MYO Slot Controller
@@ -34,38 +25,41 @@ class MyoController extends Controller
 
     /**
      * Create a new controller instance.
-     *
-     * @return void
      */
-    public function __construct()
-    {
-       $this->middleware(function ($request, $next) {
-           $id = Route::current()->parameter('id');
-           $check = Character::where('id', $id)->first();
-           if(!$check) abort(404);
-
-           if($check->is_myo_slot) {
-             $query = Character::myo(1)->where('id', $id);
-             if(!(Auth::check() && Auth::user()->hasPower('manage_characters'))) $query->where('is_visible', 1);
-             $this->character = $query->first();
-             if(!$this->character) abort(404);
-             $this->character->updateOwner();
-             return $next($request);
-           }
-           else {
-             return redirect('/character/' . $check->slug);
-           }
-       });
+    public function __construct() {
+        $this->middleware(function ($request, $next) {
+            $id = Route::current()->parameter('id');
+            $check = Character::where('id', $id)->first();
+            if (!$check) {
+                abort(404);
+            }
+
+            if ($check->is_myo_slot) {
+                $query = Character::myo(1)->where('id', $id);
+                if (!(Auth::check() && Auth::user()->hasPower('manage_characters'))) {
+                    $query->where('is_visible', 1);
+                }
+                $this->character = $query->first();
+                if (!$this->character) {
+                    abort(404);
+                }
+                $this->character->updateOwner();
+
+                return $next($request);
+            } else {
+                return redirect('/character/'.$check->slug);
+            }
+        });
     }
 
     /**
      * Shows an MYO slot's masterlist entry.
      *
-     * @param  int  $id
+     * @param int $id
+     *
      * @return \Illuminate\Contracts\Support\Renderable
      */
-    public function getCharacter($id)
-    {
+    public function getCharacter($id) {
         return view('character.myo.character', [
             'character' => $this->character,
         ]);
@@ -74,11 +68,11 @@ public function getCharacter($id)
     /**
      * Shows an MYO slot's profile.
      *
-     * @param  int  $id
+     * @param int $id
+     *
      * @return \Illuminate\Contracts\Support\Renderable
      */
-    public function getCharacterProfile($id)
-    {
+    public function getCharacterProfile($id) {
         return view('character.profile', [
             'character' => $this->character,
         ]);
@@ -87,16 +81,20 @@ public function getCharacterProfile($id)
     /**
      * Shows an MYO slot's edit profile page.
      *
-     * @param  int  $id
+     * @param int $id
+     *
      * @return \Illuminate\Contracts\Support\Renderable
      */
-    public function getEditCharacterProfile($id)
-    {
-        if(!Auth::check()) abort(404);
+    public function getEditCharacterProfile($id) {
+        if (!Auth::check()) {
+            abort(404);
+        }
 
         $isMod = Auth::user()->hasPower('manage_characters');
         $isOwner = ($this->character->user_id == Auth::user()->id);
-        if(!$isMod && !$isOwner) abort(404);
+        if (!$isMod && !$isOwner) {
+            abort(404);
+        }
 
         return view('character.edit_profile', [
             'character' => $this->character,
@@ -106,171 +104,193 @@ public function getEditCharacterProfile($id)
     /**
      * Edits an MYO slot's profile.
      *
-     * @param  \Illuminate\Http\Request       $request
-     * @param  App\Services\CharacterManager  $service
-     * @param  int                            $id
+     * @param App\Services\CharacterManager $service
+     * @param int                           $id
+     *
      * @return \Illuminate\Http\RedirectResponse
      */
-    public function postEditCharacterProfile(Request $request, CharacterManager $service, $id)
-    {
-        if(!Auth::check()) abort(404);
+    public function postEditCharacterProfile(Request $request, CharacterManager $service, $id) {
+        if (!Auth::check()) {
+            abort(404);
+        }
 
         $isMod = Auth::user()->hasPower('manage_characters');
         $isOwner = ($this->character->user_id == Auth::user()->id);
-        if(!$isMod && !$isOwner) abort(404);
+        if (!$isMod && !$isOwner) {
+            abort(404);
+        }
 
-        if($service->updateCharacterProfile($request->only(['text', 'is_gift_art_allowed', 'is_trading', 'alert_user']), $this->character, Auth::user(), !$isOwner)) {
+        if ($service->updateCharacterProfile($request->only(['text', 'is_gift_art_allowed', 'is_trading', 'alert_user']), $this->character, Auth::user(), !$isOwner)) {
             flash('Profile edited successfully.')->success();
+        } else {
+            foreach ($service->errors()->getMessages()['error'] as $error) {
+                flash($error)->error();
+            }
         }
-        else {
-            foreach($service->errors()->getMessages()['error'] as $error) flash($error)->error();
-        }
+
         return redirect()->back();
     }
 
     /**
      * Shows an MYO slot's ownership logs.
      *
-     * @param  int  $id
+     * @param int $id
+     *
      * @return \Illuminate\Contracts\Support\Renderable
      */
-    public function getCharacterOwnershipLogs($id)
-    {
+    public function getCharacterOwnershipLogs($id) {
         return view('character.ownership_logs', [
             'character' => $this->character,
-            'logs' => $this->character->getOwnershipLogs(0)
+            'logs'      => $this->character->getOwnershipLogs(0),
         ]);
     }
 
     /**
      * Shows an MYO slot's ownership logs.
      *
-     * @param  int  $id
+     * @param int $id
+     *
      * @return \Illuminate\Contracts\Support\Renderable
      */
-    public function getCharacterLogs($id)
-    {
+    public function getCharacterLogs($id) {
         return view('character.character_logs', [
             'character' => $this->character,
-            'logs' => $this->character->getCharacterLogs()
+            'logs'      => $this->character->getCharacterLogs(),
         ]);
     }
 
     /**
      * Shows an MYO slot's submissions.
      *
-     * @param  int  $id
+     * @param int $id
+     *
      * @return \Illuminate\Contracts\Support\Renderable
      */
-    public function getCharacterSubmissions($id)
-    {
+    public function getCharacterSubmissions($id) {
         return view('character.submission_logs', [
             'character' => $this->character,
-            'logs' => $this->character->getSubmissions()
+            'logs'      => $this->character->getSubmissions(),
         ]);
     }
 
     /**
      * Shows an MYO slot's transfer page.
      *
-     * @param  int  $id
+     * @param int $id
+     *
      * @return \Illuminate\Contracts\Support\Renderable
      */
-    public function getTransfer($id)
-    {
-        if(!Auth::check()) abort(404);
+    public function getTransfer($id) {
+        if (!Auth::check()) {
+            abort(404);
+        }
 
         $isMod = Auth::user()->hasPower('manage_characters');
         $isOwner = ($this->character->user_id == Auth::user()->id);
-        if(!$isMod && !$isOwner) abort(404);
+        if (!$isMod && !$isOwner) {
+            abort(404);
+        }
 
         return view('character.transfer', [
-            'character' => $this->character,
-            'transfer' => CharacterTransfer::active()->where('character_id', $this->character->id)->first(),
-            'cooldown' => Settings::get('transfer_cooldown'),
+            'character'      => $this->character,
+            'transfer'       => CharacterTransfer::active()->where('character_id', $this->character->id)->first(),
+            'cooldown'       => Settings::get('transfer_cooldown'),
             'transfersQueue' => Settings::get('open_transfers_queue'),
-            'userOptions' => User::visible()->orderBy('name')->pluck('name', 'id')->toArray(),
+            'userOptions'    => User::visible()->orderBy('name')->pluck('name', 'id')->toArray(),
         ]);
     }
 
     /**
      * Opens a transfer request for an MYO slot.
      *
-     * @param  \Illuminate\Http\Request       $request
-     * @param  App\Services\CharacterManager  $service
-     * @param  int                            $id
+     * @param App\Services\CharacterManager $service
+     * @param int                           $id
+     *
      * @return \Illuminate\Http\RedirectResponse
      */
-    public function postTransfer(Request $request, CharacterManager $service, $id)
-    {
-        if(!Auth::check()) abort(404);
+    public function postTransfer(Request $request, CharacterManager $service, $id) {
+        if (!Auth::check()) {
+            abort(404);
+        }
 
-        if($service->createTransfer($request->only(['recipient_id', 'user_reason']), $this->character, Auth::user())) {
+        if ($service->createTransfer($request->only(['recipient_id', 'user_reason']), $this->character, Auth::user())) {
             flash('Transfer created successfully.')->success();
+        } else {
+            foreach ($service->errors()->getMessages()['error'] as $error) {
+                flash($error)->error();
+            }
         }
-        else {
-            foreach($service->errors()->getMessages()['error'] as $error) flash($error)->error();
-        }
+
         return redirect()->back();
     }
 
     /**
      * Cancels a transfer request for an MYO slot.
      *
-     * @param  \Illuminate\Http\Request       $request
-     * @param  App\Services\CharacterManager  $service
-     * @param  int                            $id
-     * @param  int                            $id2
+     * @param App\Services\CharacterManager $service
+     * @param int                           $id
+     * @param int                           $id2
+     *
      * @return \Illuminate\Http\RedirectResponse
      */
-    public function postCancelTransfer(Request $request, CharacterManager $service, $id, $id2)
-    {
-        if(!Auth::check()) abort(404);
+    public function postCancelTransfer(Request $request, CharacterManager $service, $id, $id2) {
+        if (!Auth::check()) {
+            abort(404);
+        }
 
-        if($service->cancelTransfer(['transfer_id' => $id2], Auth::user())) {
+        if ($service->cancelTransfer(['transfer_id' => $id2], Auth::user())) {
             flash('Transfer cancelled.')->success();
+        } else {
+            foreach ($service->errors()->getMessages()['error'] as $error) {
+                flash($error)->error();
+            }
         }
-        else {
-            foreach($service->errors()->getMessages()['error'] as $error) flash($error)->error();
-        }
+
         return redirect()->back();
     }
 
     /**
      * Shows an MYO slot's approval page.
      *
-     * @param  int  $id
+     * @param int $id
+     *
      * @return \Illuminate\Contracts\Support\Renderable
      */
-    public function getCharacterApproval($id)
-    {
-        if(!Auth::check() || $this->character->user_id != Auth::user()->id) abort(404);
+    public function getCharacterApproval($id) {
+        if (!Auth::check() || $this->character->user_id != Auth::user()->id) {
+            abort(404);
+        }
 
         return view('character.update_form', [
             'character' => $this->character,
             'queueOpen' => Settings::get('is_myos_open'),
-            'request' => $this->character->designUpdate()->active()->first()
+            'request'   => $this->character->designUpdate()->active()->first(),
         ]);
     }
 
     /**
      * Opens a new design approval request for an MYO slot.
      *
-     * @param  App\Services\CharacterManager  $service
-     * @param  int                            $id
+     * @param App\Services\DesignUpdateManager $service
+     * @param int                              $id
+     *
      * @return \Illuminate\Http\RedirectResponse
      */
-    public function postCharacterApproval(CharacterManager $service, $id)
-    {
-        if(!Auth::check() || $this->character->user_id != Auth::user()->id) abort(404);
+    public function postCharacterApproval(DesignUpdateManager $service, $id) {
+        if (!Auth::check() || $this->character->user_id != Auth::user()->id) {
+            abort(404);
+        }
 
-        if($request = $service->createDesignUpdateRequest($this->character, Auth::user())) {
+        if ($request = $service->createDesignUpdateRequest($this->character, Auth::user())) {
             flash('Successfully created new MYO slot approval draft.')->success();
+
             return redirect()->to($request->url);
+        } else {
+            foreach ($service->errors()->getMessages()['error'] as $error) {
+                flash($error)->error();
+            }
         }
-        else {
-            foreach($service->errors()->getMessages()['error'] as $error) flash($error)->error();
-        }
+
         return redirect()->back();
     }
 }
diff --git a/app/Http/Controllers/Comments/CommentController.php b/app/Http/Controllers/Comments/CommentController.php
index 337eff26a7..9ed612ab28 100644
--- a/app/Http/Controllers/Comments/CommentController.php
+++ b/app/Http/Controllers/Comments/CommentController.php
@@ -2,35 +2,29 @@
 
 namespace App\Http\Controllers\Comments;
 
+use App\Facades\Notifications;
+use App\Facades\Settings;
+use App\Models\Comment\Comment;
+use App\Models\Gallery\GallerySubmission;
+use App\Models\News;
+use App\Models\Report\Report;
+use App\Models\Sales\Sales;
+use App\Models\SitePage;
+use App\Models\User\User;
 use Illuminate\Http\Request;
-use Settings;
 use Illuminate\Routing\Controller;
 use Illuminate\Support\Facades\Auth;
-use Spatie\Honeypot\ProtectAgainstSpam;
-use Illuminate\Support\Facades\Config;
 use Illuminate\Support\Facades\Gate;
 use Illuminate\Support\Facades\Redirect;
 use Illuminate\Support\Facades\URL;
 use Illuminate\Support\Facades\Validator;
+use Spatie\Honeypot\ProtectAgainstSpam;
 
-use App\Models\Comment;
-use App\Models\Sales\Sales;
-use App\Models\User\User;
-use App\Models\News;
-use App\Models\Gallery\GallerySubmission;
-use App\Models\Report\Report;
-use App\Models\SitePage;
-
-use Notifications;
-
-class CommentController extends Controller implements CommentControllerInterface
-{
-    public function __construct()
-    {
-
+class CommentController extends Controller {
+    public function __construct() {
         $this->middleware('web');
 
-        if (Config::get('comments.guest_commenting') == true) {
+        if (config('comments.guest_commenting') == true) {
             $this->middleware('auth')->except('store');
             $this->middleware(ProtectAgainstSpam::class)->only('store');
         } else {
@@ -40,33 +34,50 @@ public function __construct()
 
     /**
      * Creates a new comment for given model.
+     *
+     * @param mixed $model
+     * @param mixed $id
      */
-    public function store(Request $request)
-    {
+    public function store(Request $request, $model, $id) {
+        $model = urldecode(base64_decode($model));
+
+        $accepted_models = config('lorekeeper.allowed_comment_models');
+        if (!count($accepted_models)) {
+            flash('Invalid Models')->error();
+
+            return redirect()->back();
+        }
+
+        if (!in_array($model, $accepted_models)) {
+            abort(404);
+        }
 
         // If guest commenting is turned off, authorize this action.
-        if (Config::get('comments.guest_commenting') == false) {
+        if (config('comments.guest_commenting') == false) {
             Gate::authorize('create-comment', Comment::class);
         }
 
         // Define guest rules if user is not logged in.
         if (!Auth::check()) {
             $guest_rules = [
-                'guest_name' => 'required|string|max:255',
+                'guest_name'  => 'required|string|max:255',
                 'guest_email' => 'required|string|email|max:255',
             ];
         }
 
         // Merge guest rules, if any, with normal validation rules.
         Validator::make($request->all(), array_merge($guest_rules ?? [], [
-            'commentable_type' => 'required|string',
-            'commentable_id' => 'required|string|min:1',
-            'message' => 'required|string'
+            'message'          => 'required|string',
         ]))->validate();
 
-        $model = $request->commentable_type::findOrFail($request->commentable_id);
+        $base = $model::findOrFail($id);
+        if (isset($base->is_visible) && !$base->is_visible) {
+            flash('Invalid Model')->error();
+
+            return redirect()->back();
+        }
 
-        $commentClass = Config::get('comments.model');
+        $commentClass = config('comments.model');
         $comment = new $commentClass;
 
         if (!Auth::check()) {
@@ -76,10 +87,12 @@ public function store(Request $request)
             $comment->commenter()->associate(Auth::user());
         }
 
-        $comment->commentable()->associate($model);
-        $comment->comment = $request->message;
-        $comment->approved = !Config::get('comments.approval_required');
-        $comment->type = isset($request['type']) && $request['type'] ? $request['type'] : "User-User";
+        $comment->commentable()->associate($base);
+
+        $comment->comment = config('lorekeeper.settings.wysiwyg_comments') ? parse($request->message) : $request->message;
+        $comment->approved = !config('comments.approval_required');
+
+        $comment->type = isset($request['type']) && $request['type'] ? $request['type'] : 'User-User';
         $comment->save();
 
         $recipient = null;
@@ -89,90 +102,107 @@ public function store(Request $request)
         $sender = User::find($comment->commenter_id);
         $type = $comment->type;
 
-        switch($model_type) {
+        switch ($model) {
             case 'App\Models\User\UserProfile':
                 $recipient = User::find($comment->commentable_id);
                 $post = 'your profile';
-                $link = $recipient->url . '/#comment-' . $comment->getKey();
+                $link = $recipient->url.'/#comment-'.$comment->getKey();
                 break;
             case 'App\Models\Sales\Sales':
                 $sale = Sales::find($comment->commentable_id);
                 $recipient = $sale->user; // User that has been commented on (or owner of sale post)
                 $post = 'your sales post'; // Simple message to show if it's profile/sales/news
-                $link = $sale->url . '/#comment-' . $comment->getKey();
+                $link = $sale->url.'/#comment-'.$comment->getKey();
                 break;
             case 'App\Models\News':
                 $news = News::find($comment->commentable_id);
                 $recipient = $news->user; // User that has been commented on (or owner of sale post)
                 $post = 'your news post'; // Simple message to show if it's profile/sales/news
-                $link = $news->url . '/#comment-' . $comment->getKey();
+                $link = $news->url.'/#comment-'.$comment->getKey();
                 break;
             case 'App\Models\Report\Report':
                 $report = Report::find($comment->commentable_id);
                 $recipients = $report->user; // User that has been commented on (or owner of sale post)
                 $post = 'your report'; // Simple message to show if it's profile/sales/news
-                $link = 'reports/view/' . $report->id . '/#comment-' . $comment->getKey();
-                if($recipients == $sender) $recipient = (isset($report->staff_id) ? $report->staff : User::find(Settings::get('admin_user')));
-                else  $recipient = $recipients;
+                $link = 'reports/view/'.$report->id.'/#comment-'.$comment->getKey();
+                if ($recipients == $sender) {
+                    $recipient = (isset($report->staff_id) ? $report->staff : User::find(Settings::get('admin_user')));
+                } else {
+                    $recipient = $recipients;
+                }
                 break;
             case 'App\Models\SitePage':
                 $page = SitePage::find($comment->commentable_id);
                 $recipient = User::find(Settings::get('admin_user'));
                 $post = 'your site page';
-                $link = $page->url . '/#comment-' . $comment->getKey();
+                $link = $page->url.'/#comment-'.$comment->getKey();
                 break;
             case 'App\Models\Gallery\GallerySubmission':
                 $submission = GallerySubmission::find($comment->commentable_id);
-                if($type == 'Staff-Staff') $recipient = User::find(Settings::get('admin_user'));
-                else $recipient = $submission->user;
+                if ($type == 'Staff-Staff') {
+                    $recipient = User::find(Settings::get('admin_user'));
+                } else {
+                    $recipient = $submission->user;
+                }
                 $post = (($type != 'User-User') ? 'your gallery submission\'s staff comments' : 'your gallery submission');
-                $link = (($type != 'User-User') ? $submission->queueUrl . '/#comment-' . $comment->getKey() : $submission->url . '/#comment-' . $comment->getKey());
+                $link = (($type != 'User-User') ? $submission->queueUrl.'/#comment-'.$comment->getKey() : $submission->url.'/#comment-'.$comment->getKey());
                 break;
-            }
-
+            default:
+                throw new \Exception('Comment type not supported.');
+                break;
+        }
 
-        if($recipient != $sender) {
+        if ($recipient != $sender) {
             Notifications::create('COMMENT_MADE', $recipient, [
                 'comment_url' => $link,
-                'post_type' => $post,
-                'sender' => $sender->name,
-                'sender_url' => $sender->url,
+                'post_type'   => $post,
+                'sender'      => $sender->name,
+                'sender_url'  => $sender->url,
             ]);
-          }
-          return Redirect::to(URL::previous() . '#comment-' . $comment->getKey());
+        }
+
+        return Redirect::to(URL::previous().'#comment-'.$comment->getKey());
     }
 
     /**
      * Updates the message of the comment.
      */
-    public function update(Request $request, Comment $comment)
-    {
+    public function update(Request $request, Comment $comment) {
         Gate::authorize('edit-comment', $comment);
 
         Validator::make($request->all(), [
-            'message' => 'required|string'
+            'message' => 'required|string',
         ])->validate();
 
+        // add history
+        $comment->edits()->create([
+            'user_id'    => Auth::user()->id,
+            'comment_id' => $comment->id,
+            'data'       => json_encode([
+                'action'      => 'edit',
+                'old_comment' => config('lorekeeper.settings.wysiwyg_comments') ? parse($comment->comment) : $comment->comment,
+                'new_comment' => config('lorekeeper.settings.wysiwyg_comments') ? parse($request->message) : $request->message,
+            ]),
+        ]);
+
         $comment->update([
-            'comment' => $request->message
+            'comment' => config('lorekeeper.settings.wysiwyg_comments') ? parse($request->message) : $request->message,
         ]);
 
-        return Redirect::to(URL::previous() . '#comment-' . $comment->getKey());
+        return Redirect::to(URL::previous().'#comment-'.$comment->getKey());
     }
 
     /**
      * Deletes a comment.
      */
-    public function destroy(Comment $comment)
-    {
+    public function destroy(Comment $comment) {
         Gate::authorize('delete-comment', $comment);
 
-        if (Config::get('comments.soft_deletes') == true) {
-			$comment->delete();
-		}
-		else {
-			$comment->forceDelete();
-		}
+        if (config('comments.soft_deletes') == true) {
+            $comment->delete();
+        } else {
+            $comment->forceDelete();
+        }
 
         return Redirect::back();
     }
@@ -180,53 +210,97 @@ public function destroy(Comment $comment)
     /**
      * Creates a reply "comment" to a comment.
      */
-    public function reply(Request $request, Comment $comment)
-    {
+    public function reply(Request $request, Comment $comment) {
         Gate::authorize('reply-to-comment', $comment);
 
         Validator::make($request->all(), [
-            'message' => 'required|string'
+            'message' => 'required|string',
         ])->validate();
 
-        $commentClass = Config::get('comments.model');
+        $commentClass = config('comments.model');
         $reply = new $commentClass;
         $reply->commenter()->associate(Auth::user());
         $reply->commentable()->associate($comment->commentable);
         $reply->parent()->associate($comment);
-        $reply->comment = $request->message;
+        $reply->comment = config('lorekeeper.settings.wysiwyg_comments') ? parse($request->message) : $request->message;
         $reply->type = $comment->type;
-        $reply->approved = !Config::get('comments.approval_required');
+        $reply->approved = !config('comments.approval_required');
         $reply->save();
 
-            // url = url('comments/32')
+        // url = url('comments/32')
 
         $sender = User::find($reply->commenter_id);
         $recipient = User::find($comment->commenter_id);
 
         // if($sender == $recipient)
-        if($recipient != $sender) {
+        if ($recipient != $sender) {
             Notifications::create('COMMENT_REPLY', $recipient, [
-            'sender_url' => $sender->url,
-            'sender' => $sender->name,
-            'comment_url' => $comment->id,
+                'sender_url'  => $sender->url,
+                'sender'      => $sender->name,
+                'comment_url' => $comment->id,
             ]);
         }
 
-        return Redirect::to(URL::previous() . '#comment-' . $reply->getKey());
+        return Redirect::to(URL::previous().'#comment-'.$reply->getKey());
     }
 
     /**
-     * Is featured for comments
+     * Is featured for comments.
+     *
+     * @param mixed $id
      */
     public function feature($id) {
         $comment = Comment::find($id);
-        if($comment->is_featured == 0) {
+        if ($comment->is_featured == 0) {
             $comment->update(['is_featured' => 1]);
-        }
-        else {
+        } else {
             $comment->update(['is_featured' => 0]);
         }
 
-        return Redirect::to(URL::previous() . '#comment-' . $comment->getKey());
+        return Redirect::to(URL::previous().'#comment-'.$comment->getKey());
+    }
+
+    /**
+     * Likes / Unlikes a comment.
+     *
+     * @param mixed $id
+     * @param mixed $action
+     */
+    public function like(Request $request, $id, $action = 1) {
+        $user = Auth::user();
+        if (!$user) {
+            return Redirect::back();
+        }
+        $comment = Comment::findOrFail($id);
+
+        if ($comment->likes()->where('user_id', $user->id)->exists()) {
+            if ($action == $comment->likes()->where('user_id', $user->id)->first()->is_like) {
+                $comment->likes()->where('user_id', $user->id)->delete();
+            }
+            // else invert the bool
+            else {
+                $comment->likes()->where('user_id', $user->id)->update(['is_like' => !$comment->likes()->where('user_id', $user->id)->first()->is_like]);
+            }
+
+            return Redirect::to(URL::previous().'#comment-'.$comment->getKey());
+        }
+
+        $comment->likes()->create([
+            'user_id' => $user->id,
+            'is_like' => $action,
+        ]);
+
+        return Redirect::to(URL::previous().'#comment-'.$comment->getKey());
+    }
+
+    /**
+     * Shows a user's liked comments.
+     *
+     * @return \Illuminate\Contracts\Support\Renderable
+     */
+    public function getLikedComments(Request $request) {
+        return view('home.liked_comments', [
+            'user' => Auth::user(),
+        ]);
     }
 }
diff --git a/app/Http/Controllers/Comments/CommentControllerInterface.php b/app/Http/Controllers/Comments/CommentControllerInterface.php
deleted file mode 100644
index 9caa8bfc61..0000000000
--- a/app/Http/Controllers/Comments/CommentControllerInterface.php
+++ /dev/null
@@ -1,29 +0,0 @@
-<?php
-
-namespace App\Http\Controllers\Comments;
-
-use Illuminate\Http\Request;
-use App\Models\Comment;
-
-interface CommentControllerInterface
-{
-    /**
-     * Creates a new comment for given model.
-     */
-    public function store(Request $request);
-
-    /**
-     * Updates the message of the comment.
-     */
-    public function update(Request $request, Comment $comment);
-
-    /**
-     * Deletes a comment.
-     */
-    public function destroy(Comment $comment);
-
-    /**
-     * Creates a reply "comment" to a comment.
-     */
-    public function reply(Request $request, Comment $comment);
-}
\ No newline at end of file
diff --git a/app/Http/Controllers/Controller.php b/app/Http/Controllers/Controller.php
index ab5a3b08f7..86454a9790 100644
--- a/app/Http/Controllers/Controller.php
+++ b/app/Http/Controllers/Controller.php
@@ -2,19 +2,16 @@
 
 namespace App\Http\Controllers;
 
+use Illuminate\Foundation\Auth\Access\AuthorizesRequests;
 use Illuminate\Foundation\Bus\DispatchesJobs;
-use Illuminate\Routing\Controller as BaseController;
 use Illuminate\Foundation\Validation\ValidatesRequests;
-use Illuminate\Foundation\Auth\Access\AuthorizesRequests;
+use Illuminate\Routing\Controller as BaseController;
 
-class Controller extends BaseController
-{
+class Controller extends BaseController {
     use AuthorizesRequests, DispatchesJobs, ValidatesRequests;
 
     /**
      * Creates a new controller instance.
-     *
-     * @return void
      */
     public function __construct() {
     }
diff --git a/app/Http/Controllers/GalleryController.php b/app/Http/Controllers/GalleryController.php
index c5dd2658d7..fcace01dc5 100644
--- a/app/Http/Controllers/GalleryController.php
+++ b/app/Http/Controllers/GalleryController.php
@@ -1,23 +1,21 @@
-<?php namespace App\Http\Controllers;
+<?php
 
-use Settings;
-use Config;
-use Auth;
-use View;
-use Illuminate\Http\Request;
-use App\Models\Gallery\Gallery;
-use App\Models\Gallery\GallerySubmission;
+namespace App\Http\Controllers;
 
-use App\Models\User\User;
+use App\Facades\Settings;
 use App\Models\Character\Character;
-use App\Models\Prompt\Prompt;
+use App\Models\Comment\Comment;
 use App\Models\Currency\Currency;
-use App\Models\Comment;
-
+use App\Models\Gallery\Gallery;
+use App\Models\Gallery\GallerySubmission;
+use App\Models\Prompt\Prompt;
+use App\Models\User\User;
 use App\Services\GalleryManager;
+use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Auth;
+use View;
 
-class GalleryController extends Controller
-{
+class GalleryController extends Controller {
     /*
     |--------------------------------------------------------------------------
     | Gallery Controller
@@ -29,11 +27,8 @@ class GalleryController extends Controller
 
     /**
      * Create a new controller instance.
-     *
-     * @return void
      */
-    public function __construct()
-    {
+    public function __construct() {
         parent::__construct();
         View::share('sidebarGalleries', Gallery::whereNull('parent_id')->visible()->sort()->get());
     }
@@ -43,38 +38,41 @@ public function __construct()
      *
      * @return \Illuminate\Contracts\Support\Renderable
      */
-    public function getGalleryIndex()
-    {
+    public function getGalleryIndex() {
         return view('galleries.index', [
-            'galleries' => Gallery::sort()->active()->whereNull('parent_id')->paginate(10),
+            'galleries'   => Gallery::sort()->active()->whereNull('parent_id')->paginate(10),
             'galleryPage' => false,
-            'sideGallery' => null
+            'sideGallery' => null,
         ]);
     }
 
     /**
      * Shows a given gallery.
      *
-     * @param  int  $id
-     * @param  \Illuminate\Http\Request  $request
+     * @param int $id
+     *
      * @return \Illuminate\Contracts\Support\Renderable
      */
-    public function getGallery($id, Request $request)
-    {
+    public function getGallery($id, Request $request) {
         $gallery = Gallery::visible()->where('id', $id)->first();
-        if(!$gallery) abort(404);
+        if (!$gallery) {
+            abort(404);
+        }
 
         $query = GallerySubmission::where('gallery_id', $gallery->id)->visible(Auth::check() ? Auth::user() : null)->accepted();
         $sort = $request->only(['sort']);
 
-        if($request->get('title')) $query->where(function($query) use ($request) {
-            $query->where('gallery_submissions.title', 'LIKE', '%' . $request->get('title') . '%');
-        });
-        if($request->get('prompt_id')) $query->where('prompt_id', $request->get('prompt_id'));
+        if ($request->get('title')) {
+            $query->where(function ($query) use ($request) {
+                $query->where('gallery_submissions.title', 'LIKE', '%'.$request->get('title').'%');
+            });
+        }
+        if ($request->get('prompt_id')) {
+            $query->where('prompt_id', $request->get('prompt_id'));
+        }
 
-        if(isset($sort['sort']))
-        {
-            switch($sort['sort']) {
+        if (isset($sort['sort'])) {
+            switch ($sort['sort']) {
                 case 'alpha':
                     $query->orderBy('title');
                     break;
@@ -94,55 +92,117 @@ public function getGallery($id, Request $request)
                     $query->orderBy('created_at', 'ASC');
                     break;
             }
+        } else {
+            $query->orderBy('created_at', 'DESC');
         }
-        else $query->orderBy('created_at', 'DESC');
 
         return view('galleries.gallery', [
-            'gallery' => $gallery,
-            'submissions' => $query->paginate(20)->appends($request->query()),
-            'prompts' => [0 => 'Any Prompt'] + Prompt::whereIn('id', GallerySubmission::where('gallery_id', $gallery->id)->visible(Auth::check() ? Auth::user() : null)->accepted()->whereNotNull('prompt_id')->pluck('prompt_id')->toArray())->orderBy('name')->pluck('name', 'id')->toArray(),
+            'gallery'          => $gallery,
+            'submissions'      => $query->paginate(20)->appends($request->query()),
+            'prompts'          => [0 => 'Any Prompt'] + Prompt::whereIn('id', GallerySubmission::where('gallery_id', $gallery->id)->visible(Auth::check() ? Auth::user() : null)->accepted()->whereNotNull('prompt_id')->pluck('prompt_id')->toArray())->orderBy('name')->pluck('name', 'id')->toArray(),
             'childSubmissions' => GallerySubmission::whereIn('gallery_id', $gallery->children->pluck('id')->toArray())->where('is_visible', 1)->where('status', 'Accepted'),
-            'galleryPage' => true,
-            'sideGallery' => $gallery
+            'galleryPage'      => true,
+            'sideGallery'      => $gallery,
+        ]);
+    }
+
+    /**
+     * Shows all recent submissions.
+     *
+     * @return \Illuminate\Contracts\Support\Renderable
+     */
+    public function getAll(Request $request) {
+        if (!config('lorekeeper.extensions.show_all_recent_submissions.enable')) {
+            abort(404);
+        }
+
+        $query = GallerySubmission::visible(Auth::check() ? Auth::user() : null)->accepted();
+        $sort = $request->only(['sort']);
+
+        if ($request->get('title')) {
+            $query->where(function ($query) use ($request) {
+                $query->where('gallery_submissions.title', 'LIKE', '%'.$request->get('title').'%');
+            });
+        }
+        if ($request->get('prompt_id')) {
+            $query->where('prompt_id', $request->get('prompt_id'));
+        }
+
+        if (isset($sort['sort'])) {
+            switch ($sort['sort']) {
+                case 'alpha':
+                    $query->orderBy('title');
+                    break;
+                case 'alpha-reverse':
+                    $query->orderBy('title', 'DESC');
+                    break;
+                case 'prompt':
+                    $query->orderBy('prompt_id', 'DESC');
+                    break;
+                case 'prompt-reverse':
+                    $query->orderBy('prompt_id', 'ASC');
+                    break;
+                case 'newest':
+                    $query->orderBy('created_at', 'DESC');
+                    break;
+                case 'oldest':
+                    $query->orderBy('created_at', 'ASC');
+                    break;
+            }
+        } else {
+            $query->orderBy('created_at', 'DESC');
+        }
+
+        return view('galleries.showall', [
+            'submissions' => $query->paginate(20)->appends($request->query()),
+            'prompts'     => [0 => 'Any Prompt'] + Prompt::whereIn('id', GallerySubmission::visible(Auth::check() ? Auth::user() : null)->accepted()->whereNotNull('prompt_id')->pluck('prompt_id')->toArray())->orderBy('name')->pluck('name', 'id')->toArray(),
+            'galleryPage' => false,
         ]);
     }
 
     /**
      * Shows a given submission.
      *
-     * @param  int  $id
+     * @param int $id
+     *
      * @return \Illuminate\Contracts\Support\Renderable
      */
-    public function getSubmission($id)
-    {
+    public function getSubmission($id) {
         $submission = GallerySubmission::find($id);
-        if(!$submission) abort(404);
+        if (!$submission) {
+            abort(404);
+        }
 
-        if(!$submission->isVisible) {
-            if(!Auth::check()) abort(404);
+        if (!$submission->isVisible) {
+            if (!Auth::check()) {
+                abort(404);
+            }
             $isMod = Auth::user()->hasPower('manage_submissions');
             $isOwner = ($submission->user_id == Auth::user()->id);
             $isCollaborator = $submission->collaborators->where('user_id', Auth::user()->id)->first() != null;
-            if(!$isMod && (!$isOwner && !$isCollaborator)) abort(404);
+            if (!$isMod && (!$isOwner && !$isCollaborator)) {
+                abort(404);
+            }
         }
 
         return view('galleries.submission', [
-            'submission' => $submission,
+            'submission'   => $submission,
             'commentCount' => Comment::where('commentable_type', 'App\Models\Gallery\GallerySubmission')->where('commentable_id', $submission->id)->where('type', 'User-User')->count(),
-            'galleryPage' => true,
-            'sideGallery' => $submission->gallery
+            'galleryPage'  => true,
+            'sideGallery'  => $submission->gallery,
         ]);
     }
 
     /**
      * Gets the submission favorites list modal.
      *
-     * @param  int  $id
+     * @param int $id
+     *
      * @return \Illuminate\Contracts\Support\Renderable
      */
-    public function getSubmissionFavorites($id)
-    {
+    public function getSubmissionFavorites($id) {
         $submission = GallerySubmission::find($id);
+
         return view('galleries._submission_favorites', [
             'submission' => $submission,
         ]);
@@ -151,112 +211,129 @@ public function getSubmissionFavorites($id)
     /**
      * Shows a given submission's detailed queue log.
      *
-     * @param  int  $id
+     * @param int $id
+     *
      * @return \Illuminate\Contracts\Support\Renderable
      */
-    public function getSubmissionLog($id)
-    {
+    public function getSubmissionLog($id) {
         $submission = GallerySubmission::find($id);
-        if(!$submission) abort(404);
+        if (!$submission) {
+            abort(404);
+        }
 
-        if(!Auth::check()) abort(404);
+        if (!Auth::check()) {
+            abort(404);
+        }
         $isMod = Auth::user()->hasPower('manage_submissions');
         $isOwner = ($submission->user_id == Auth::user()->id);
         $isCollaborator = $submission->collaborators->where('user_id', Auth::user()->id)->first() != null ? true : false;
-        if(!$isMod && !$isOwner && !$isCollaborator) abort(404);
+        if (!$isMod && !$isOwner && !$isCollaborator) {
+            abort(404);
+        }
 
         return view('galleries.submission_log', [
-            'submission' => $submission,
-            'currency' => Currency::find(Settings::get('group_currency')),
+            'submission'  => $submission,
+            'currency'    => Currency::find(Settings::get('group_currency')),
             'galleryPage' => true,
-            'sideGallery' => $submission->gallery
+            'sideGallery' => $submission->gallery,
         ]);
     }
 
     /**
      * Shows the user's gallery submission log.
      *
-     * @param  \Illuminate\Http\Request  $request
+     * @param mixed $type
+     *
      * @return \Illuminate\Contracts\Support\Renderable
      */
-    public function getUserSubmissions(Request $request, $type)
-    {
+    public function getUserSubmissions(Request $request, $type) {
         $submissions = GallerySubmission::userSubmissions(Auth::user());
-        if(!$type) $type = 'Pending';
+        if (!$type) {
+            $type = 'Pending';
+        }
 
         $submissions = $submissions->where('status', ucfirst($type));
 
         return view('galleries.submissions', [
             'submissions' => $submissions->orderBy('id', 'DESC')->paginate(10),
-            'galleries' => Gallery::sort()->whereNull('parent_id')->paginate(10),
+            'galleries'   => Gallery::sort()->whereNull('parent_id')->paginate(10),
             'galleryPage' => false,
-            'sideGallery' => null
+            'sideGallery' => null,
         ]);
     }
 
     /**
      * Shows the submit page.
      *
-     * @param  \Illuminate\Http\Request  $request
+     * @param mixed $id
+     *
      * @return \Illuminate\Contracts\Support\Renderable
      */
-    public function getNewGallerySubmission(Request $request, $id)
-    {
-        if(!Auth::check()) abort(404);
+    public function getNewGallerySubmission(Request $request, $id) {
+        if (!Auth::check()) {
+            abort(404);
+        }
         $gallery = Gallery::find($id);
         $closed = !Settings::get('gallery_submissions_open');
+
         return view('galleries.create_edit_submission', [
             'closed' => $closed,
         ] + ($closed ? [] : [
-            'gallery' => $gallery,
-            'submission' => new GallerySubmission,
-            'prompts' => Prompt::active()->sortAlphabetical()->pluck('name', 'id')->toArray(),
-            'users' => User::visible()->orderBy('name')->pluck('name', 'id')->toArray(),
-            'currency' => Currency::find(Settings::get('group_currency')),
+            'gallery'     => $gallery,
+            'submission'  => new GallerySubmission,
+            'prompts'     => Prompt::active()->sortAlphabetical()->pluck('name', 'id')->toArray(),
+            'users'       => User::visible()->orderBy('name')->pluck('name', 'id')->toArray(),
+            'currency'    => Currency::find(Settings::get('group_currency')),
             'galleryPage' => true,
-            'sideGallery' => $gallery
+            'sideGallery' => $gallery,
         ]));
     }
 
     /**
      * Shows the edit submission page.
      *
-     * @param  integer  $id
+     * @param int $id
+     *
      * @return \Illuminate\Contracts\Support\Renderable
      */
-    public function getEditGallerySubmission($id)
-    {
-        if(!Auth::check()) abort(404);
+    public function getEditGallerySubmission($id) {
+        if (!Auth::check()) {
+            abort(404);
+        }
         $submission = GallerySubmission::find($id);
-        if(!$submission) abort(404);
+        if (!$submission) {
+            abort(404);
+        }
         $isMod = Auth::user()->hasPower('manage_submissions');
         $isOwner = ($submission->user_id == Auth::user()->id);
-        if(!$isMod && !$isOwner) abort(404);
+        if (!$isMod && !$isOwner) {
+            abort(404);
+        }
 
         // Show inactive prompts in the event of being edited by an admin after acceptance
         $prompts = Auth::user()->hasPower('manage_submissions') && $submission->status == 'Pending' ? Prompt::query() : Prompt::active();
 
         return view('galleries.create_edit_submission', [
-            'closed' => false,
-            'gallery' => $submission->gallery,
+            'closed'         => false,
+            'gallery'        => $submission->gallery,
             'galleryOptions' => Gallery::orderBy('name')->pluck('name', 'id')->toArray(),
-            'prompts' => $prompts->sortAlphabetical()->pluck('name', 'id')->toArray(),
-            'submission' => $submission,
-            'users' => User::visible()->orderBy('name')->pluck('name', 'id')->toArray(),
-            'currency' => Currency::find(Settings::get('group_currency')),
-            'galleryPage' => true,
-            'sideGallery' => $submission->gallery
+            'prompts'        => $prompts->sortAlphabetical()->pluck('name', 'id')->toArray(),
+            'submission'     => $submission,
+            'users'          => User::visible()->orderBy('name')->pluck('name', 'id')->toArray(),
+            'currency'       => Currency::find(Settings::get('group_currency')),
+            'galleryPage'    => true,
+            'sideGallery'    => $submission->gallery,
         ]);
     }
 
     /**
      * Shows character information.
      *
-     * @param  string  $slug
+     * @param string $slug
+     *
      * @return \Illuminate\Contracts\Support\Renderable
      */
-    public function getCharacterInfo($slug)
-    {
+    public function getCharacterInfo($slug) {
         $character = Character::visible()->where('slug', $slug)->first();
 
         return view('galleries._character', [
@@ -267,12 +344,13 @@ public function getCharacterInfo($slug)
     /**
      * Gets the submission archival modal.
      *
-     * @param  int  $id
+     * @param int $id
+     *
      * @return \Illuminate\Contracts\Support\Renderable
      */
-    public function getArchiveSubmission($id)
-    {
+    public function getArchiveSubmission($id) {
         $submission = GallerySubmission::find($id);
+
         return view('galleries._archive_submission', [
             'submission' => $submission,
         ]);
@@ -281,85 +359,94 @@ public function getArchiveSubmission($id)
     /**
      * Creates or edits a new gallery submission.
      *
-     * @param  \Illuminate\Http\Request        $request
-     * @param  App\Services\GalleryManager  $service
+     * @param App\Services\GalleryManager $service
+     * @param mixed|null                  $id
+     *
      * @return \Illuminate\Http\RedirectResponse
      */
-    public function postCreateEditGallerySubmission(Request $request, GalleryManager $service, $id = null)
-    {
+    public function postCreateEditGallerySubmission(Request $request, GalleryManager $service, $id = null) {
         $id ? $request->validate(GallerySubmission::$updateRules) : $request->validate(GallerySubmission::$createRules);
         $data = $request->only(['image', 'text', 'title', 'description', 'slug', 'collaborator_id', 'collaborator_data', 'participant_id', 'participant_type', 'gallery_id', 'alert_user', 'prompt_id', 'content_warning']);
 
-        if(!$id && Settings::get('gallery_submissions_reward_currency')) $currencyFormData = $request->only(collect(Config::get('lorekeeper.group_currency_form'))->keys()->toArray());
-        else $currencyFormData = null;
+        if (!$id && Settings::get('gallery_submissions_reward_currency')) {
+            $currencyFormData = $request->only(collect(config('lorekeeper.group_currency_form'))->keys()->toArray());
+        } else {
+            $currencyFormData = null;
+        }
 
-        if($id && $service->updateSubmission(GallerySubmission::find($id), $data, Auth::user())) {
+        if ($id && $service->updateSubmission(GallerySubmission::find($id), $data, Auth::user())) {
             flash('Submission updated successfully.')->success();
-        }
-        else if (!$id && $gallery = $service->createSubmission($data, $currencyFormData, Auth::user())) {
+        } elseif (!$id && $gallery = $service->createSubmission($data, $currencyFormData, Auth::user())) {
             flash('Submission created successfully.')->success();
+
             return redirect()->to('gallery/submissions/pending');
+        } else {
+            foreach ($service->errors()->getMessages()['error'] as $error) {
+                flash($error)->error();
+            }
         }
-        else {
-            foreach($service->errors()->getMessages()['error'] as $error) flash($error)->error();
-        }
+
         return redirect()->back();
     }
 
     /**
      * Archives a submission.
      *
-     * @param  \Illuminate\Http\Request    $request
-     * @param  App\Services\GalleryManager $service
-     * @param  int                         $id
+     * @param App\Services\GalleryManager $service
+     * @param int                         $id
+     *
      * @return \Illuminate\Http\RedirectResponse
      */
-    public function postArchiveSubmission(Request $request, GalleryManager $service, $id)
-    {
-        if($id && $service->archiveSubmission(GallerySubmission::find($id), Auth::user())) {
+    public function postArchiveSubmission(Request $request, GalleryManager $service, $id) {
+        if ($id && $service->archiveSubmission(GallerySubmission::find($id), Auth::user())) {
             flash('Submission updated successfully.')->success();
+        } else {
+            foreach ($service->errors()->getMessages()['error'] as $error) {
+                flash($error)->error();
+            }
         }
-        else {
-            foreach($service->errors()->getMessages()['error'] as $error) flash($error)->error();
-        }
+
         return redirect()->back();
     }
 
     /**
      * Edits/approves collaborator contributions to a submission.
      *
-     * @param  \Illuminate\Http\Request        $request
-     * @param  App\Services\GalleryManager  $service
+     * @param App\Services\GalleryManager $service
+     * @param mixed                       $id
+     *
      * @return \Illuminate\Http\RedirectResponse
      */
-    public function postEditCollaborator(Request $request, GalleryManager $service, $id)
-    {
+    public function postEditCollaborator(Request $request, GalleryManager $service, $id) {
         $data = $request->only(['collaborator_data', 'remove_user']);
-        if($service->editCollaborator(GallerySubmission::find($id), $data, Auth::user())) {
+        if ($service->editCollaborator(GallerySubmission::find($id), $data, Auth::user())) {
             flash('Collaborator info edited successfully.')->success();
+        } else {
+            foreach ($service->errors()->getMessages()['error'] as $error) {
+                flash($error)->error();
+            }
         }
-        else {
-            foreach($service->errors()->getMessages()['error'] as $error) flash($error)->error();
-        }
+
         return redirect()->back();
     }
 
     /**
      * Favorites/unfavorites a gallery submission.
      *
-     * @param  \Illuminate\Http\Request        $request
-     * @param  App\Services\GalleryManager  $service
+     * @param App\Services\GalleryManager $service
+     * @param mixed                       $id
+     *
      * @return \Illuminate\Http\RedirectResponse
      */
-    public function postFavoriteSubmission(Request $request, GalleryManager $service, $id)
-    {
-        if($service->favoriteSubmission(GallerySubmission::find($id), Auth::user())) {
+    public function postFavoriteSubmission(Request $request, GalleryManager $service, $id) {
+        if ($service->favoriteSubmission(GallerySubmission::find($id), Auth::user())) {
             flash('Favorite updated successfully.')->success();
+        } else {
+            foreach ($service->errors()->getMessages()['error'] as $error) {
+                flash($error)->error();
+            }
         }
-        else {
-            foreach($service->errors()->getMessages()['error'] as $error) flash($error)->error();
-        }
+
         return redirect()->back();
     }
-
 }
diff --git a/app/Http/Controllers/HomeController.php b/app/Http/Controllers/HomeController.php
index 27b613141b..7a9c34b369 100644
--- a/app/Http/Controllers/HomeController.php
+++ b/app/Http/Controllers/HomeController.php
@@ -2,18 +2,16 @@
 
 namespace App\Http\Controllers;
 
+use App\Models\Gallery\GallerySubmission;
 use App\Models\SitePage;
 use App\Services\LinkService;
 use App\Services\UserService;
-use Auth;
-use Carbon\Carbon;
-use Config;
-use DB;
 use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Auth;
+use Illuminate\Support\Facades\DB;
 use Laravel\Socialite\Facades\Socialite;
 
-class HomeController extends Controller
-{
+class HomeController extends Controller {
     /*
     |--------------------------------------------------------------------------
     | Home Controller
@@ -28,10 +26,17 @@ class HomeController extends Controller
      *
      * @return \Illuminate\Contracts\Support\Renderable
      */
-    public function getIndex()
-    {
+    public function getIndex() {
+        if (config('lorekeeper.extensions.show_all_recent_submissions.enable')) {
+            $query = GallerySubmission::visible(Auth::check() ? Auth::user() : null)->accepted()->orderBy('created_at', 'DESC');
+            $gallerySubmissions = $query->get()->take(8);
+        } else {
+            $gallerySubmissions = [];
+        }
+
         return view('welcome', [
-            'about' => SitePage::where('key', 'about')->first(),
+            'about'               => SitePage::where('key', 'about')->first(),
+            'gallerySubmissions'  => $gallerySubmissions,
         ]);
     }
 
@@ -40,8 +45,7 @@ public function getIndex()
      *
      * @return \Illuminate\Contracts\Support\Renderable
      */
-    public function getLink(Request $request)
-    {
+    public function getLink(Request $request) {
         // If the user already has a username associated with their account, redirect them
         if (Auth::check() && Auth::user()->hasAlias) {
             redirect()->to('home');
@@ -56,8 +60,7 @@ public function getLink(Request $request)
      *
      * @param string $provider
      */
-    public function getAuthRedirect(LinkService $service, $provider)
-    {
+    public function getAuthRedirect(LinkService $service, $provider) {
         if (!$this->checkProvider($provider, Auth::user())) {
             flash($this->error)->error();
 
@@ -73,8 +76,7 @@ public function getAuthRedirect(LinkService $service, $provider)
      *
      * @param string $provider
      */
-    public function getAuthCallback(LinkService $service, $provider)
-    {
+    public function getAuthCallback(LinkService $service, $provider) {
         if (!$this->checkProvider($provider, Auth::user())) {
             flash($this->error)->error();
 
@@ -106,8 +108,7 @@ public function getAuthCallback(LinkService $service, $provider)
      *
      * @return \Illuminate\Contracts\Support\Renderable
      */
-    public function getBirthday(Request $request)
-    {
+    public function getBirthday(Request $request) {
         // If the user already has a username associated with their account, redirect them
         if (Auth::check() && Auth::user()->birthday) {
             return redirect()->to('/');
@@ -122,15 +123,12 @@ public function getBirthday(Request $request)
      *
      * @return \Illuminate\Contracts\Support\Renderable
      */
-    public function postBirthday(Request $request)
-    {
+    public function postBirthday(Request $request) {
         $service = new UserService;
         // Make birthday into format we can store
         $data = $request->input('dob');
-        $date = $data['day'].'-'.$data['month'].'-'.$data['year'];
-        $formatDate = Carbon::parse($date);
 
-        if ($service->updateBirthday($formatDate, Auth::user())) {
+        if ($service->updateBirthday($data, Auth::user())) {
             flash('Birthday added successfully!');
 
             return redirect()->to('/');
@@ -148,8 +146,7 @@ public function postBirthday(Request $request)
      *
      * @return \Illuminate\Contracts\Support\Renderable
      */
-    public function getBirthdayBlocked(Request $request)
-    {
+    public function getBirthdayBlocked(Request $request) {
         // If the user already has a username associated with their account, redirect them
         if (Auth::check() && Auth::user()->checkBirthday) {
             return redirect()->to('/');
@@ -163,11 +160,10 @@ public function getBirthdayBlocked(Request $request)
         return view('auth.blocked');
     }
 
-    private function checkProvider($provider, $user)
-    {
+    private function checkProvider($provider, $user) {
         // Check if the site can be used for authentication
         $isAllowed = false;
-        foreach (Config::get('lorekeeper.sites') as $key => $site) {
+        foreach (config('lorekeeper.sites') as $key => $site) {
             if ($key == $provider && isset($site['auth'])) {
                 // require a primary alias if the user does not already have one
                 if (!Auth::user()->has_alias && (!isset($site['primary_alias']) || !$site['primary_alias'])) {
diff --git a/app/Http/Controllers/NewsController.php b/app/Http/Controllers/NewsController.php
index e5e2945d05..a45040c37d 100644
--- a/app/Http/Controllers/NewsController.php
+++ b/app/Http/Controllers/NewsController.php
@@ -2,15 +2,11 @@
 
 namespace App\Http\Controllers;
 
-use Auth;
-
-use Illuminate\Http\Request;
-use App\Http\Controllers\Controller;
-
 use App\Models\News;
+use Illuminate\Support\Facades\Auth;
+use Illuminate\Support\Facades\View;
 
-class NewsController extends Controller
-{
+class NewsController extends Controller {
     /*
     |--------------------------------------------------------------------------
     | News Controller
@@ -20,28 +16,40 @@ class NewsController extends Controller
     |
     */
 
+    /**
+     * Create a new controller instance.
+     */
+    public function __construct() {
+        View::share('recentnews', News::visible()->orderBy('updated_at', 'DESC')->take(10)->get());
+    }
+
     /**
      * Shows the news index.
      *
      * @return \Illuminate\Contracts\Support\Renderable
      */
-    public function getIndex()
-    {
-        if(Auth::check() && Auth::user()->is_news_unread) Auth::user()->update(['is_news_unread' => 0]);
+    public function getIndex() {
+        if (Auth::check() && Auth::user()->is_news_unread) {
+            Auth::user()->update(['is_news_unread' => 0]);
+        }
+
         return view('news.index', ['newses' => News::visible()->orderBy('updated_at', 'DESC')->paginate(10)]);
     }
-    
+
     /**
      * Shows a news post.
      *
-     * @param  int          $id
-     * @param  string|null  $slug
+     * @param int         $id
+     * @param string|null $slug
+     *
      * @return \Illuminate\Contracts\Support\Renderable
      */
-    public function getNews($id, $slug = null)
-    {
+    public function getNews($id, $slug = null) {
         $news = News::where('id', $id)->where('is_visible', 1)->first();
-        if(!$news) abort(404);
+        if (!$news) {
+            abort(404);
+        }
+
         return view('news.news', ['news' => $news]);
     }
 }
diff --git a/app/Http/Controllers/PageController.php b/app/Http/Controllers/PageController.php
index 720938c307..1cf1294634 100644
--- a/app/Http/Controllers/PageController.php
+++ b/app/Http/Controllers/PageController.php
@@ -2,16 +2,10 @@
 
 namespace App\Http\Controllers;
 
-use Auth;
-use DB;
-
-use Illuminate\Http\Request;
-use App\Http\Controllers\Controller;
-
 use App\Models\SitePage;
+use Illuminate\Support\Facades\DB;
 
-class PageController extends Controller
-{
+class PageController extends Controller {
     /*
     |--------------------------------------------------------------------------
     | Page Controller
@@ -24,28 +18,28 @@ class PageController extends Controller
     /**
      * Shows the page with the given key.
      *
-     * @param  string  $key
+     * @param string $key
+     *
      * @return \Illuminate\Contracts\Support\Renderable
      */
-    public function getPage($key)
-    {
+    public function getPage($key) {
         $page = SitePage::where('key', $key)->where('is_visible', 1)->first();
-        if(!$page) abort(404);
+        if (!$page) {
+            abort(404);
+        }
+
         return view('pages.page', ['page' => $page]);
     }
-    
 
     /**
      * Shows the credits page.
      *
      * @return \Illuminate\Contracts\Support\Renderable
      */
-    public function getCreditsPage()
-    {
+    public function getCreditsPage() {
         return view('pages.credits', [
-            'credits' => SitePage::where('key', 'credits')->first(),
-            'extensions' => DB::table('site_extensions')->get()
+            'credits'    => SitePage::where('key', 'credits')->first(),
+            'extensions' => DB::table('site_extensions')->get(),
         ]);
     }
-    
 }
diff --git a/app/Http/Controllers/PermalinkController.php b/app/Http/Controllers/PermalinkController.php
index 377cd2c950..f27c7bc36a 100644
--- a/app/Http/Controllers/PermalinkController.php
+++ b/app/Http/Controllers/PermalinkController.php
@@ -2,72 +2,91 @@
 
 namespace App\Http\Controllers;
 
-use Auth;
-use DB;
-
-use Illuminate\Http\Request;
-use App\Http\Controllers\Controller;
-use App\Models\User\User;
+use App\Models\Comment\Comment;
 use App\Models\Gallery\GallerySubmission;
-use App\Models\Model;
-
-use App\Models\Comment;
 use App\Models\Report\Report;
+use Illuminate\Support\Facades\Auth;
 
-class PermalinkController extends Controller
-{
-     /**
-     * returns replies recursively
+class PermalinkController extends Controller {
+    /**
+     * returns replies recursively.
+     *
+     * @param mixed $id
      *
      * @return \Illuminate\Contracts\Support\Renderable
      */
-     public function getComment($id) {
-
-        $comments = Comment::all();
+    public function getComment($id) {
+        $comments = Comment::withTrashed();
         //$comments = $comments->sortByDesc('created_at');
         $comment = $comments->find($id);
 
-        if(!$comment) abort(404);
-        if(!$comment->commentable) abort(404);
+        if (!$comment) {
+            abort(404);
+        }
+        if (!$comment->commentable) {
+            abort(404);
+        }
+
+        if (isset($comment->commentable->is_visible) && !$comment->commentable->is_visible) {
+            abort(404);
+        }
 
         // Check if the comment can be viewed
-        switch($comment->type) {
-            case "Staff-User":
-                if(!Auth::check()) abort(404);
-                switch($comment->commentable_type) {
+        switch ($comment->type) {
+            case 'Staff-User':
+                if (!Auth::check()) {
+                    abort(404);
+                }
+                switch ($comment->commentable_type) {
                     case 'App\Models\Gallery\GallerySubmission':
                         $submission = GallerySubmission::where('id', $comment->commentable_id)->first();
                         $isMod = Auth::user()->hasPower('manage_submissions');
                         $isOwner = ($submission->user_id == Auth::user()->id);
                         $isCollaborator = $submission->collaborators->where('user_id', Auth::user()->id)->first() != null ? true : false;
-                        if(!$isMod && !$isOwner && !$isCollaborator) abort(404);
+                        if (!$isMod && !$isOwner && !$isCollaborator) {
+                            abort(404);
+                        }
                         break;
                     case 'App\Models\Report\Report':
                         $report = Report::where('id', $comment->commentable_id)->first();
                         $isMod = Auth::user()->hasPower('manage_reports');
                         $isOwner = ($report->user_id == Auth::user()->id);
-                        if(!$isMod && !$isOwner) abort(404);
+                        if (!$isMod && !$isOwner) {
+                            abort(404);
+                        }
                         break;
                     default:
-                        if(!Auth::user()->isStaff) abort(404);
+                        if (!Auth::user()->isStaff) {
+                            abort(404);
+                        }
                         break;
                 }
-            case "Staff-Staff":
-                if(!Auth::check()) abort(404);
-                if(!Auth::user()->isStaff) abort(404);
+                break;
+            case 'Staff-Staff':
+                if (!Auth::check()) {
+                    abort(404);
+                }
+                if (!Auth::user()->isStaff) {
+                    abort(404);
+                }
                 // More specific filtering depending on circumstance
-                switch($comment->commentable_type) {
+                switch ($comment->commentable_type) {
                     case 'App\Models\Gallery\GallerySubmission':
-                        if(!Auth::user()->hasPower('manage_submissions')) abort(404);
+                        if (!Auth::user()->hasPower('manage_submissions')) {
+                            abort(404);
+                        }
                         break;
                 }
                 break;
         }
 
-        if($comment->commentable_type == 'App\Models\User\UserProfile') $comment->location = $comment->commentable->user->url;
-        else $comment->location = $comment->commentable->url;
+        if ($comment->commentable_type == 'App\Models\User\UserProfile') {
+            $comment->location = $comment->commentable->user->url;
+        } else {
+            $comment->location = $comment->commentable->url;
+        }
 
-        return view('comments._perma_layout',[
+        return view('comments._perma_layout', [
             'comment' => $comment,
         ]);
     }
diff --git a/app/Http/Controllers/PromptsController.php b/app/Http/Controllers/PromptsController.php
index 530c24d6cd..6901122c02 100644
--- a/app/Http/Controllers/PromptsController.php
+++ b/app/Http/Controllers/PromptsController.php
@@ -2,16 +2,12 @@
 
 namespace App\Http\Controllers;
 
-use Illuminate\Http\Request;
-
-use App\Models\Currency\Currency;
-use App\Models\Item\ItemCategory;
-use App\Models\Item\Item;
-use App\Models\Prompt\PromptCategory;
 use App\Models\Prompt\Prompt;
+use App\Models\Prompt\PromptCategory;
+use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Auth;
 
-class PromptsController extends Controller
-{
+class PromptsController extends Controller {
     /*
     |--------------------------------------------------------------------------
     | Prompts Controller
@@ -27,23 +23,23 @@ class PromptsController extends Controller
      *
      * @return \Illuminate\Contracts\Support\Renderable
      */
-    public function getIndex()
-    {
+    public function getIndex() {
         return view('prompts.index');
     }
 
     /**
      * Shows the prompt categories page.
      *
-     * @param  \Illuminate\Http\Request  $request
      * @return \Illuminate\Contracts\Support\Renderable
      */
-    public function getPromptCategories(Request $request)
-    {
+    public function getPromptCategories(Request $request) {
         $query = PromptCategory::query();
         $name = $request->get('name');
-        if($name) $query->where('name', 'LIKE', '%'.$name.'%');
-        return view('prompts.prompt_categories', [  
+        if ($name) {
+            $query->where('name', 'LIKE', '%'.$name.'%');
+        }
+
+        return view('prompts.prompt_categories', [
             'categories' => $query->orderBy('sort', 'DESC')->paginate(20)->appends($request->query()),
         ]);
     }
@@ -51,21 +47,39 @@ public function getPromptCategories(Request $request)
     /**
      * Shows the prompts page.
      *
-     * @param  \Illuminate\Http\Request  $request
      * @return \Illuminate\Contracts\Support\Renderable
      */
-    public function getPrompts(Request $request)
-    {
-        $query = Prompt::active()->with('category');
-        $data = $request->only(['prompt_category_id', 'name', 'sort']);
-        if(isset($data['prompt_category_id']) && $data['prompt_category_id'] != 'none') 
-            $query->where('prompt_category_id', $data['prompt_category_id']);
-        if(isset($data['name'])) 
+    public function getPrompts(Request $request) {
+        $query = Prompt::active()->staffOnly(Auth::check() ? Auth::user() : null)->with('category');
+        $data = $request->only(['prompt_category_id', 'name', 'sort', 'open_prompts']);
+        if (isset($data['prompt_category_id']) && $data['prompt_category_id'] != 'none') {
+            if ($data['prompt_category_id'] == 'withoutOption') {
+                $query->whereNull('prompt_category_id');
+            } else {
+                $query->where('prompt_category_id', $data['prompt_category_id']);
+            }
+        }
+        if (isset($data['name'])) {
             $query->where('name', 'LIKE', '%'.$data['name'].'%');
+        }
+
+        if (isset($data['open_prompts'])) {
+            switch ($data['open_prompts']) {
+                case 'open':
+                    $query->open(true);
+                    break;
+                case 'closed':
+                    $query->open(false);
+                    break;
+                case 'any':
+                default:
+                    // Don't filter
+                    break;
+            }
+        }
 
-        if(isset($data['sort'])) 
-        {
-            switch($data['sort']) {
+        if (isset($data['sort'])) {
+            switch ($data['sort']) {
                 case 'alpha':
                     $query->sortAlphabetical();
                     break;
@@ -94,12 +108,32 @@ public function getPrompts(Request $request)
                     $query->sortEnd(true);
                     break;
             }
-        } 
-        else $query->sortCategory();
+        } else {
+            $query->sortCategory();
+        }
 
         return view('prompts.prompts', [
-            'prompts' => $query->paginate(20)->appends($request->query()),
-            'categories' => ['none' => 'Any Category'] + PromptCategory::orderBy('sort', 'DESC')->pluck('name', 'id')->toArray()
+            'prompts'    => $query->paginate(20)->appends($request->query()),
+            'categories' => ['none' => 'Any Category'] + ['withoutOption' => 'Without Category'] + PromptCategory::orderBy('sort', 'DESC')->pluck('name', 'id')->toArray(),
+        ]);
+    }
+
+    /**
+     * Shows an individual prompt.
+     *
+     * @param mixed $id
+     *
+     * @return \Illuminate\Contracts\Support\Renderable
+     */
+    public function getPrompt(Request $request, $id) {
+        $prompt = Prompt::active()->where('id', $id)->first();
+
+        if (!$prompt) {
+            abort(404);
+        }
+
+        return view('prompts.prompt', [
+            'prompt' => $prompt,
         ]);
     }
 }
diff --git a/app/Http/Controllers/RaffleController.php b/app/Http/Controllers/RaffleController.php
index 048334e398..d8fc98ff0e 100644
--- a/app/Http/Controllers/RaffleController.php
+++ b/app/Http/Controllers/RaffleController.php
@@ -1,13 +1,13 @@
-<?php namespace App\Http\Controllers;
+<?php
+
+namespace App\Http\Controllers;
 
-use Auth;
-use Request; 
-use App\Models\Raffle\RaffleGroup;
 use App\Models\Raffle\Raffle;
-use App\Models\Raffle\RaffleTicket;
+use App\Models\Raffle\RaffleGroup;
+use Illuminate\Support\Facades\Auth;
+use Request;
 
-class RaffleController extends Controller
-{
+class RaffleController extends Controller {
     /*
     |--------------------------------------------------------------------------
     | Raffle Controller
@@ -22,38 +22,42 @@ class RaffleController extends Controller
      *
      * @return \Illuminate\Contracts\Support\Renderable
      */
-    public function getRaffleIndex()
-    {
+    public function getRaffleIndex() {
         $raffles = Raffle::query();
-        if (Request::get('view') == 'completed') $raffles->where('is_active', 2);
-        else $raffles->where('is_active', '=', 1);
+        if (Request::get('view') == 'completed') {
+            $raffles->where('is_active', 2);
+        } else {
+            $raffles->where('is_active', '=', 1);
+        }
         $raffles = $raffles->orderBy('group_id')->orderBy('order');
 
         return view('raffles.index', [
             'raffles' => $raffles->get(),
-            'groups' => RaffleGroup::whereIn('id', $raffles->pluck('group_id')->toArray())->get()->keyBy('id')
+            'groups'  => RaffleGroup::whereIn('id', $raffles->pluck('group_id')->toArray())->get()->keyBy('id'),
         ]);
     }
 
     /**
      * Shows tickets for a given raffle.
      *
-     * @param  int  $id
+     * @param int $id
+     *
      * @return \Illuminate\Contracts\Support\Renderable
      */
-    public function getRaffleTickets($id)
-    {
+    public function getRaffleTickets($id) {
         $raffle = Raffle::find($id);
-        if(!$raffle || !$raffle->is_active) abort(404);
+        if (!$raffle || !$raffle->is_active) {
+            abort(404);
+        }
         $userCount = Auth::check() ? $raffle->tickets()->where('user_id', Auth::user()->id)->count() : 0;
         $count = $raffle->tickets()->count();
 
         return view('raffles.ticket_index', [
-            'raffle' => $raffle,
-            'tickets' => $raffle->tickets()->with('user')->orderBy('id')->paginate(100),
-            'count' => $count,
-            'userCount' => $userCount, 
-            "page" => Request::get('page') ? Request::get('page') - 1 : 0
+            'raffle'    => $raffle,
+            'tickets'   => $raffle->tickets()->with('user')->orderBy('id')->paginate(100),
+            'count'     => $count,
+            'userCount' => $userCount,
+            'page'      => Request::get('page') ? Request::get('page') - 1 : 0,
         ]);
     }
 }
diff --git a/app/Http/Controllers/SalesController.php b/app/Http/Controllers/SalesController.php
index 02cfa47e75..851df41697 100644
--- a/app/Http/Controllers/SalesController.php
+++ b/app/Http/Controllers/SalesController.php
@@ -2,15 +2,12 @@
 
 namespace App\Http\Controllers;
 
-use Auth;
-
-use Illuminate\Http\Request;
-use App\Http\Controllers\Controller;
-
 use App\Models\Sales\Sales;
+use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Auth;
+use Illuminate\Support\Facades\View;
 
-class SalesController extends Controller
-{
+class SalesController extends Controller {
     /*
     |--------------------------------------------------------------------------
     | sales Controller
@@ -20,28 +17,77 @@ class SalesController extends Controller
     |
     */
 
+    /**
+     * Create a new controller instance.
+     */
+    public function __construct() {
+        View::share('forsale', Sales::visible()->orderBy('updated_at', 'DESC')->where('is_open', 1)->get());
+        View::share('recentsales', Sales::visible()->orderBy('updated_at', 'DESC')->take(10)->get());
+    }
+
     /**
      * Shows the sales index.
      *
      * @return \Illuminate\Contracts\Support\Renderable
      */
-    public function getIndex()
-    {
-        if(Auth::check() && Auth::user()->is_sales_unread) Auth::user()->update(['is_sales_unread' => 0]);
-        return view('sales.index', ['saleses' => Sales::visible()->orderBy('id', 'DESC')->paginate(10)]);
+    public function getIndex(Request $request) {
+        if (Auth::check() && Auth::user()->is_sales_unread) {
+            Auth::user()->update(['is_sales_unread' => 0]);
+        }
+
+        $query = Sales::visible();
+        $data = $request->only(['title', 'is_open', 'sort']);
+        if (isset($data['is_open']) && $data['is_open'] != 'none') {
+            $query->where('is_open', $data['is_open']);
+        }
+        if (isset($data['title'])) {
+            $query->where('title', 'LIKE', '%'.$data['title'].'%');
+        }
+
+        if (isset($data['sort'])) {
+            switch ($data['sort']) {
+                case 'alpha':
+                    $query->sortAlphabetical();
+                    break;
+                case 'alpha-reverse':
+                    $query->sortAlphabetical(true);
+                    break;
+                case 'newest':
+                    $query->sortNewest();
+                    break;
+                case 'oldest':
+                    $query->sortOldest();
+                    break;
+                case 'bump':
+                    $query->sortBump();
+                    break;
+                case 'bump-reverse':
+                    $query->sortBump(true);
+                    break;
+            }
+        } else {
+            $query->sortBump(true);
+        }
+
+        return view('sales.index', [
+            'saleses' => $query->paginate(10)->appends($request->query()),
+        ]);
     }
 
     /**
      * Shows a sales post.
      *
-     * @param  int          $id
-     * @param  string|null  $slug
+     * @param int         $id
+     * @param string|null $slug
+     *
      * @return \Illuminate\Contracts\Support\Renderable
      */
-    public function getSales($id, $slug = null)
-    {
+    public function getSales($id, $slug = null) {
         $sales = Sales::where('id', $id)->where('is_visible', 1)->first();
-        if(!$sales) abort(404);
+        if (!$sales) {
+            abort(404);
+        }
+
         return view('sales.sales', ['sales' => $sales]);
     }
 }
diff --git a/app/Http/Controllers/ShopController.php b/app/Http/Controllers/ShopController.php
index d37c40fb9c..1d32ae0b13 100644
--- a/app/Http/Controllers/ShopController.php
+++ b/app/Http/Controllers/ShopController.php
@@ -2,23 +2,18 @@
 
 namespace App\Http\Controllers;
 
-use Auth;
-
-use Illuminate\Http\Request;
-use App\Http\Controllers\Controller;
-
-use App\Services\ShopManager;
-
-use App\Models\Shop\Shop;
-use App\Models\Shop\ShopStock;
-use App\Models\Shop\ShopLog;
-use App\Models\Item\Item;
 use App\Models\Currency\Currency;
+use App\Models\Item\Item;
 use App\Models\Item\ItemCategory;
+use App\Models\Shop\Shop;
+use App\Models\Shop\ShopLog;
+use App\Models\Shop\ShopStock;
 use App\Models\User\UserItem;
+use App\Services\ShopManager;
+use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Auth;
 
-class ShopController extends Controller
-{
+class ShopController extends Controller {
     /*
     |--------------------------------------------------------------------------
     | Shop Controller
@@ -33,83 +28,97 @@ class ShopController extends Controller
      *
      * @return \Illuminate\Contracts\Support\Renderable
      */
-    public function getIndex()
-    {
+    public function getIndex() {
         return view('shops.index', [
-            'shops' => Shop::where('is_active', 1)->orderBy('sort', 'DESC')->get()
-            ]);
+            'shops' => Shop::where('is_active', 1)->orderBy('sort', 'DESC')->get(),
+        ]);
     }
 
     /**
      * Shows a shop.
      *
-     * @param  int  $id
+     * @param int $id
+     *
      * @return \Illuminate\Contracts\Support\Renderable
      */
-    public function getShop($id)
-    {
-        $categories = ItemCategory::orderBy('sort', 'DESC')->get();
+    public function getShop($id) {
+        $categories = ItemCategory::visible(Auth::check() ? Auth::user() : null)->orderBy('sort', 'DESC')->get();
         $shop = Shop::where('id', $id)->where('is_active', 1)->first();
-        if(!$shop) abort(404);
-        $items = count($categories) ? $shop->displayStock()->orderByRaw('FIELD(item_category_id,'.implode(',', $categories->pluck('id')->toArray()).')')->orderBy('name')->get()->groupBy('item_category_id') : $shop->displayStock()->orderBy('name')->get()->groupBy('item_category_id');
+        if (!$shop) {
+            abort(404);
+        }
+
+        $query = $shop->displayStock()->where(function ($query) use ($categories) {
+            $query->whereIn('item_category_id', $categories->pluck('id')->toArray())
+                ->orWhereNull('item_category_id');
+        });
+
+        $items = count($categories) ? $query->orderByRaw('FIELD(item_category_id,'.implode(',', $categories->pluck('id')->toArray()).')')->orderBy('name')->get()->groupBy('item_category_id') : $shop->displayStock()->orderBy('name')->get()->groupBy('item_category_id');
+
         return view('shops.shop', [
-            'shop' => $shop,
+            'shop'       => $shop,
             'categories' => $categories->keyBy('id'),
-            'items' => $items,
-            'shops' => Shop::where('is_active', 1)->orderBy('sort', 'DESC')->get(),
-            'currencies' => Currency::whereIn('id', ShopStock::where('shop_id', $shop->id)->pluck('currency_id')->toArray())->get()->keyBy('id')
+            'items'      => $items,
+            'shops'      => Shop::where('is_active', 1)->orderBy('sort', 'DESC')->get(),
+            'currencies' => Currency::whereIn('id', ShopStock::where('shop_id', $shop->id)->pluck('currency_id')->toArray())->get()->keyBy('id'),
         ]);
     }
 
     /**
      * Gets the shop stock modal.
      *
-     * @param  App\Services\ShopManager  $service
-     * @param  int                       $id
-     * @param  int                       $stockId
+     * @param App\Services\ShopManager $service
+     * @param int                      $id
+     * @param int                      $stockId
+     *
      * @return \Illuminate\Contracts\Support\Renderable
      */
-    public function getShopStock(ShopManager $service, $id, $stockId)
-    {
+    public function getShopStock(ShopManager $service, $id, $stockId) {
         $shop = Shop::where('id', $id)->where('is_active', 1)->first();
         $stock = ShopStock::with('item')->where('id', $stockId)->where('shop_id', $id)->first();
 
         $user = Auth::user();
-        $quantityLimit = 0; $userPurchaseCount = 0; $purchaseLimitReached = false;
-        if($user){
+        $quantityLimit = 0;
+        $userPurchaseCount = 0;
+        $purchaseLimitReached = false;
+        if ($user) {
             $quantityLimit = $service->getStockPurchaseLimit($stock, Auth::user());
             $userPurchaseCount = $service->checkUserPurchases($stock, Auth::user());
             $purchaseLimitReached = $service->checkPurchaseLimitReached($stock, Auth::user());
             $userOwned = UserItem::where('user_id', $user->id)->where('item_id', $stock->item->id)->where('count', '>', 0)->get();
         }
 
-        if(!$shop) abort(404);
+        if (!$shop) {
+            abort(404);
+        }
+
         return view('shops._stock_modal', [
-            'shop' => $shop,
-            'stock' => $stock,
-            'quantityLimit' => $quantityLimit,
-            'userPurchaseCount' => $userPurchaseCount,
+            'shop'                 => $shop,
+            'stock'                => $stock,
+            'quantityLimit'        => $quantityLimit,
+            'userPurchaseCount'    => $userPurchaseCount,
             'purchaseLimitReached' => $purchaseLimitReached,
-            'userOwned' => $user ? $userOwned : null
-		]);
+            'userOwned'            => $user ? $userOwned : null,
+        ]);
     }
 
     /**
      * Buys an item from a shop.
      *
-     * @param  \Illuminate\Http\Request  $request
-     * @param  App\Services\ShopManager  $service
+     * @param App\Services\ShopManager $service
+     *
      * @return \Illuminate\Http\RedirectResponse
      */
-    public function postBuy(Request $request, ShopManager $service)
-    {
+    public function postBuy(Request $request, ShopManager $service) {
         $request->validate(ShopLog::$createRules);
-        if($service->buyStock($request->only(['stock_id', 'shop_id', 'slug', 'bank', 'quantity']), Auth::user())) {
+        if ($service->buyStock($request->only(['stock_id', 'shop_id', 'slug', 'bank', 'quantity']), Auth::user())) {
             flash('Successfully purchased item.')->success();
+        } else {
+            foreach ($service->errors()->getMessages()['error'] as $error) {
+                flash($error)->error();
+            }
         }
-        else {
-            foreach($service->errors()->getMessages()['error'] as $error) flash($error)->error();
-        }
+
         return redirect()->back();
     }
 
@@ -118,13 +127,10 @@ public function postBuy(Request $request, ShopManager $service)
      *
      * @return \Illuminate\Contracts\Support\Renderable
      */
-    public function getPurchaseHistory()
-    {
+    public function getPurchaseHistory() {
         return view('shops.purchase_history', [
-            'logs' => Auth::user()->getShopLogs(0),
+            'logs'  => Auth::user()->getShopLogs(0),
             'shops' => Shop::where('is_active', 1)->orderBy('sort', 'DESC')->get(),
         ]);
     }
 }
-
-
diff --git a/app/Http/Controllers/Users/AccountController.php b/app/Http/Controllers/Users/AccountController.php
index 8a3175e816..2d6b1b2d7b 100644
--- a/app/Http/Controllers/Users/AccountController.php
+++ b/app/Http/Controllers/Users/AccountController.php
@@ -2,24 +2,25 @@
 
 namespace App\Http\Controllers\Users;
 
-use Auth;
-use File;
-use Image;
-
+use App\Http\Controllers\Controller;
+use App\Models\Notification;
 use App\Models\User\User;
 use App\Models\User\UserAlias;
-
-use Illuminate\Http\Request;
-use Illuminate\Support\Facades\Storage;
-use App\Models\Notification;
-
-use App\Services\UserService;
 use App\Services\LinkService;
+use App\Services\UserService;
+use BaconQrCode\Renderer\Color\Rgb;
+use BaconQrCode\Renderer\Image\SvgImageBackEnd;
+use BaconQrCode\Renderer\ImageRenderer;
+use BaconQrCode\Renderer\RendererStyle\Fill;
+use BaconQrCode\Renderer\RendererStyle\RendererStyle;
+use BaconQrCode\Writer;
+use Illuminate\Http\Request;
+use Illuminate\Support\Collection;
+use Illuminate\Support\Facades\Auth;
+use Laravel\Fortify\Contracts\TwoFactorAuthenticationProvider;
+use Laravel\Fortify\RecoveryCode;
 
-use App\Http\Controllers\Controller;
-
-class AccountController extends Controller
-{
+class AccountController extends Controller {
     /*
     |--------------------------------------------------------------------------
     | Account Controller
@@ -34,12 +35,25 @@ class AccountController extends Controller
      *
      * @return \Illuminate\Contracts\Support\Renderable|\Illuminate\Http\RedirectResponse
      */
-    public function getBanned()
-    {
-        if(Auth::user()->is_banned)
+    public function getBanned() {
+        if (Auth::user()->is_banned) {
             return view('account.banned');
-        else 
+        } else {
+            return redirect()->to('/');
+        }
+    }
+
+    /**
+     * Shows the deactivation page.
+     *
+     * @return \Illuminate\Contracts\Support\Renderable
+     */
+    public function getDeactivated() {
+        if (!Auth::user()->is_deactivated) {
             return redirect()->to('/');
+        } else {
+            return view('account.deactivated');
+        }
     }
 
     /**
@@ -47,102 +61,217 @@ public function getBanned()
      *
      * @return \Illuminate\Contracts\Support\Renderable
      */
-    public function getSettings()
-    {
+    public function getSettings() {
         return view('account.settings');
     }
-    
+
     /**
      * Edits the user's profile.
      *
-     * @param  \Illuminate\Http\Request  $request
      * @return \Illuminate\Http\RedirectResponse
      */
-    public function postProfile(Request $request)
-    {
+    public function postProfile(Request $request) {
         Auth::user()->profile->update([
-            'text' => $request->get('text'),
-            'parsed_text' => parse($request->get('text'))
+            'text'        => $request->get('text'),
+            'parsed_text' => parse($request->get('text')),
         ]);
         flash('Profile updated successfully.')->success();
+
         return redirect()->back();
     }
 
     /**
      * Edits the user's avatar.
      *
-     * @param  \Illuminate\Http\Request  $request
      * @return \Illuminate\Http\RedirectResponse
      */
-    public function postAvatar(Request $request, UserService $service)
-    {
-        if($service->updateAvatar($request->file('avatar'), Auth::user())) {
+    public function postAvatar(Request $request, UserService $service) {
+        if ($service->updateAvatar($request->file('avatar'), Auth::user())) {
             flash('Avatar updated successfully.')->success();
+        } else {
+            foreach ($service->errors()->getMessages()['error'] as $error) {
+                flash($error)->error();
+            }
         }
-        else {
-            foreach($service->errors()->getMessages()['error'] as $error) flash($error)->error();
+
+        return redirect()->back();
+    }
+
+    /**
+     * Edits the user's username.
+     *
+     * @return \Illuminate\Http\RedirectResponse
+     */
+    public function postUsername(Request $request, UserService $service) {
+        if ($service->updateUsername($request->get('username'), Auth::user())) {
+            flash('Username updated successfully.')->success();
+        } else {
+            foreach ($service->errors()->getMessages()['error'] as $error) {
+                flash($error)->error();
+            }
         }
+
         return redirect()->back();
     }
-    
+
     /**
      * Changes the user's password.
      *
-     * @param  \Illuminate\Http\Request  $request
-     * @param  App\Services\UserService  $service
+     * @param App\Services\UserService $service
+     *
      * @return \Illuminate\Http\RedirectResponse
      */
-    public function postPassword(Request $request, UserService $service)
-    {
-        $request->validate( [
-            'old_password' => 'required|string',
-            'new_password' => 'required|string|min:8|confirmed'
-        ]);
-        if($service->updatePassword($request->only(['old_password', 'new_password', 'new_password_confirmation']), Auth::user())) {
-            flash('Password updated successfully.')->success();
+    public function postPassword(Request $request, UserService $service) {
+        $user = Auth::user();
+        if (!isset($user->password) && (!isset($user->email) || !isset($user->email_verified_at))) {
+            flash('Please set and verify an email before setting a password for email login.')->error();
+
+            return redirect()->back();
         }
-        else {
-            foreach($service->errors()->getMessages()['error'] as $error) flash($error)->error();
+
+        $request->validate([
+            'new_password' => 'required|string|min:8|confirmed',
+        ] + (isset($user->password) ? ['old_password' => 'required|string'] : []));
+        if ($service->updatePassword($request->only(['old_password', 'new_password', 'new_password_confirmation']), Auth::user())) {
+            flash('Password updated successfully.')->success();
+        } else {
+            foreach ($service->errors()->getMessages()['error'] as $error) {
+                flash($error)->error();
+            }
         }
+
         return redirect()->back();
     }
-    
+
     /**
      * Changes the user's email address and sends a verification email.
      *
-     * @param  \Illuminate\Http\Request  $request
-     * @param  App\Services\UserService  $service
+     * @param App\Services\UserService $service
+     *
      * @return \Illuminate\Http\RedirectResponse
      */
-    public function postEmail(Request $request, UserService $service)
-    {
-        $request->validate( [
-            'email' => 'required|string|email|max:255|unique:users'
+    public function postEmail(Request $request, UserService $service) {
+        $request->validate([
+            'email' => 'required|string|email|max:255|unique:users',
         ]);
-        if($service->updateEmail($request->only(['email']), Auth::user())) {
+        if ($service->updateEmail($request->only(['email']), Auth::user())) {
             flash('Email updated successfully. A verification email has been sent to your new email address.')->success();
+        } else {
+            foreach ($service->errors()->getMessages()['error'] as $error) {
+                flash($error)->error();
+            }
         }
-        else {
-            foreach($service->errors()->getMessages()['error'] as $error) flash($error)->error();
-        }
+
         return redirect()->back();
     }
 
     /**
-     * Changes user birthday setting
+     * Changes user birthday setting.
+     *
+     * @param App\Services\UserService $service
      *
-     * @param  \Illuminate\Http\Request  $request
-     * @param  App\Services\UserService  $service
      * @return \Illuminate\Http\RedirectResponse
      */
-    public function postBirthday(Request $request, UserService $service)
-    {
-        if($service->updateDOB($request->input('birthday_setting'), Auth::user())) {
+    public function postBirthday(Request $request, UserService $service) {
+        if ($service->updateBirthdayVisibilitySetting($request->input('birthday_setting'), Auth::user())) {
             flash('Setting updated successfully.')->success();
+        } else {
+            foreach ($service->errors()->getMessages()['error'] as $error) {
+                flash($error)->error();
+            }
+        }
+
+        return redirect()->back();
+    }
+
+    /**
+     * Enables the user's two factor auth.
+     *
+     * @param App\Services\UserService $service
+     *
+     * @return \Illuminate\Http\RedirectResponse
+     */
+    public function postEnableTwoFactor(Request $request, UserService $service) {
+        if (!$request->session()->put([
+            'two_factor_secret'         => encrypt(app(TwoFactorAuthenticationProvider::class)->generateSecretKey()),
+            'two_factor_recovery_codes' => encrypt(json_encode(Collection::times(8, function () {
+                return RecoveryCode::generate();
+            })->all())),
+        ])) {
+            flash('2FA info generated. Please confirm to enable 2FA.')->success();
+        } else {
+            foreach ($service->errors()->getMessages()['error'] as $error) {
+                flash($error)->error();
+            }
+        }
+
+        return redirect()->to('account/two-factor/confirm');
+    }
+
+    /**
+     * Shows the confirm two-factor auth page.
+     *
+     * @return \Illuminate\Contracts\Support\Renderable
+     */
+    public function getConfirmTwoFactor(Request $request) {
+        // Assemble URL and QR Code svg from session information
+        $qrUrl = app(TwoFactorAuthenticationProvider::class)->qrCodeUrl(config('app.name'), Auth::user()->email, decrypt($request->session()->get('two_factor_secret')));
+        $qrCode = (new Writer(
+            new ImageRenderer(
+                new RendererStyle(192, 0, null, null, Fill::uniformColor(new Rgb(255, 255, 255), new Rgb(45, 55, 72))),
+                new SvgImageBackEnd
+            )
+        ))->writeString($qrUrl);
+        $qrCode = trim(substr($qrCode, strpos($qrCode, "\n") + 1));
+
+        return view('auth.confirm_two_factor', [
+            'qrCode'        => $qrCode,
+            'recoveryCodes' => json_decode(decrypt($request->session()->get('two_factor_recovery_codes'))),
+        ]);
+    }
+
+    /**
+     * Confirms and fully enables the user's two factor auth.
+     *
+     * @param App\Services\UserService $service
+     *
+     * @return \Illuminate\Http\RedirectResponse
+     */
+    public function postConfirmTwoFactor(Request $request, UserService $service) {
+        $request->validate([
+            'code' => 'required',
+        ]);
+        if ($service->confirmTwoFactor($request->only(['code']), $request->session()->only(['two_factor_secret', 'two_factor_recovery_codes']), Auth::user())) {
+            flash('2FA enabled succesfully.')->success();
+            $request->session()->forget(['two_factor_secret', 'two_factor_recovery_codes']);
+        } else {
+            foreach ($service->errors()->getMessages()['error'] as $error) {
+                flash($error)->error();
+            }
         }
-        else {
-            foreach($service->errors()->getMessages()['error'] as $error) flash($error)->error();
+
+        return redirect()->to('account/settings');
+    }
+
+    /**
+     * Confirms and disables the user's two factor auth.
+     *
+     * @param App\Services\UserService $service
+     *
+     * @return \Illuminate\Http\RedirectResponse
+     */
+    public function postDisableTwoFactor(Request $request, UserService $service) {
+        $request->validate([
+            'code' => 'required',
+        ]);
+        if ($service->disableTwoFactor($request->only(['code']), Auth::user())) {
+            flash('2FA disabled succesfully.')->success();
+        } else {
+            foreach ($service->errors()->getMessages()['error'] as $error) {
+                flash($error)->error();
+            }
         }
+
         return redirect()->back();
     }
 
@@ -151,40 +280,48 @@ public function postBirthday(Request $request, UserService $service)
      *
      * @return \Illuminate\Contracts\Support\Renderable
      */
-    public function getNotifications()
-    {
+    public function getNotifications() {
         $notifications = Auth::user()->notifications()->orderBy('id', 'DESC')->paginate(30);
         Auth::user()->notifications()->update(['is_unread' => 0]);
         Auth::user()->notifications_unread = 0;
         Auth::user()->save();
 
         return view('account.notifications', [
-            'notifications' => $notifications
+            'notifications' => $notifications,
         ]);
     }
-    
+
     /**
      * Deletes a notification and returns a response.
      *
+     * @param mixed $id
+     *
      * @return \Illuminate\Http\Response
      */
-    public function getDeleteNotification($id)
-    {
+    public function getDeleteNotification($id) {
         $notification = Notification::where('id', $id)->where('user_id', Auth::user()->id)->first();
-        if($notification) $notification->delete();
+        if ($notification) {
+            $notification->delete();
+        }
+
         return response(200);
     }
 
     /**
      * Deletes all of the user's notifications.
      *
+     * @param mixed|null $type
+     *
      * @return \Illuminate\Http\RedirectResponse
      */
-    public function postClearNotifications($type = null)
-    {
-        if(isset($type) && $type) Auth::user()->notifications()->where('notification_type_id', $type)->delete();
-        else Auth::user()->notifications()->delete();
+    public function postClearNotifications($type = null) {
+        if (isset($type)) {
+            Auth::user()->notifications()->where('notification_type_id', $type)->delete();
+        } else {
+            Auth::user()->notifications()->delete();
+        }
         flash('Notifications cleared successfully.')->success();
+
         return redirect()->back();
     }
 
@@ -193,86 +330,149 @@ public function postClearNotifications($type = null)
      *
      * @return \Illuminate\Contracts\Support\Renderable
      */
-    public function getAliases()
-    {
+    public function getAliases() {
         return view('account.aliases');
     }
 
     /**
      * Shows the make primary alias modal.
      *
+     * @param mixed $id
+     *
      * @return \Illuminate\Contracts\Support\Renderable
      */
-    public function getMakePrimary($id)
-    {
+    public function getMakePrimary($id) {
         return view('account._make_primary_modal', ['alias' => UserAlias::where('id', $id)->where('user_id', Auth::user()->id)->first()]);
     }
 
     /**
      * Makes an alias the user's primary alias.
      *
+     * @param mixed $id
+     *
      * @return \Illuminate\Http\RedirectResponse
      */
-    public function postMakePrimary(LinkService $service, $id)
-    {
-        if($service->makePrimary($id, Auth::user())) {
+    public function postMakePrimary(LinkService $service, $id) {
+        if ($service->makePrimary($id, Auth::user())) {
             flash('Your primary alias has been changed successfully.')->success();
+        } else {
+            foreach ($service->errors()->getMessages()['error'] as $error) {
+                flash($error)->error();
+            }
         }
-        else {
-            foreach($service->errors()->getMessages()['error'] as $error) flash($error)->error();
-        }
+
         return redirect()->back();
     }
 
     /**
      * Shows the hide alias modal.
      *
+     * @param mixed $id
+     *
      * @return \Illuminate\Contracts\Support\Renderable
      */
-    public function getHideAlias($id)
-    {
+    public function getHideAlias($id) {
         return view('account._hide_alias_modal', ['alias' => UserAlias::where('id', $id)->where('user_id', Auth::user()->id)->first()]);
     }
 
     /**
      * Hides or unhides the selected alias from public view.
      *
+     * @param mixed $id
+     *
      * @return \Illuminate\Http\RedirectResponse
      */
-    public function postHideAlias(LinkService $service, $id)
-    {
-        if($service->hideAlias($id, Auth::user())) {
+    public function postHideAlias(LinkService $service, $id) {
+        if ($service->hideAlias($id, Auth::user())) {
             flash('Your alias\'s visibility setting has been changed successfully.')->success();
+        } else {
+            foreach ($service->errors()->getMessages()['error'] as $error) {
+                flash($error)->error();
+            }
         }
-        else {
-            foreach($service->errors()->getMessages()['error'] as $error) flash($error)->error();
-        }
+
         return redirect()->back();
     }
 
     /**
      * Shows the remove alias modal.
      *
+     * @param mixed $id
+     *
      * @return \Illuminate\Contracts\Support\Renderable
      */
-    public function getRemoveAlias($id)
-    {
+    public function getRemoveAlias($id) {
         return view('account._remove_alias_modal', ['alias' => UserAlias::where('id', $id)->where('user_id', Auth::user()->id)->first()]);
     }
 
     /**
      * Removes the selected alias from the user's account.
      *
+     * @param mixed $id
+     *
      * @return \Illuminate\Http\RedirectResponse
      */
-    public function postRemoveAlias(LinkService $service, $id)
-    {
-        if($service->removeAlias($id, Auth::user())) {
+    public function postRemoveAlias(LinkService $service, $id) {
+        if ($service->removeAlias($id, Auth::user())) {
             flash('Your alias has been removed successfully.')->success();
+        } else {
+            foreach ($service->errors()->getMessages()['error'] as $error) {
+                flash($error)->error();
+            }
+        }
+
+        return redirect()->back();
+    }
+
+    /**
+     * Show a user's deactivate confirmation page.
+     *
+     * @return \Illuminate\Contracts\Support\Renderable
+     */
+    public function getDeactivate() {
+        return view('account.deactivate');
+    }
+
+    /**
+     * Show a user's deactivate confirmation page.
+     *
+     * @return \Illuminate\Contracts\Support\Renderable
+     */
+    public function getDeactivateConfirmation() {
+        return view('account._deactivate_confirmation');
+    }
+
+    public function postDeactivate(Request $request, UserService $service) {
+        $wasDeactivated = Auth::user()->is_deactivated;
+        if ($service->deactivate(['deactivate_reason' => $request->get('deactivate_reason')], Auth::user(), null)) {
+            flash($wasDeactivated ? 'Deactivation reason edited successfully.' : 'Your account has successfully been deactivated. We hope to see you again and wish you the best!')->success();
+        } else {
+            foreach ($service->errors()->getMessages()['error'] as $error) {
+                flash($error)->error();
+            }
         }
-        else {
-            foreach($service->errors()->getMessages()['error'] as $error) flash($error)->error();
+
+        return redirect()->back();
+    }
+
+    /**
+     * Show a user's reactivate confirmation page.
+     *
+     * @return \Illuminate\Contracts\Support\Renderable
+     */
+    public function getReactivateConfirmation() {
+        return view('account._reactivate_confirmation');
+    }
+
+    public function postReactivate(Request $request, UserService $service) {
+        if ($service->reactivate(Auth::user(), null)) {
+            flash('You have reactivated successfully.')->success();
+        } else {
+            foreach ($service->errors()->getMessages()['error'] as $error) {
+                flash($error)->error();
+            }
         }
+
         return redirect()->back();
     }
 }
diff --git a/app/Http/Controllers/Users/BankController.php b/app/Http/Controllers/Users/BankController.php
index 6c3c49a3cc..7efe080ec3 100644
--- a/app/Http/Controllers/Users/BankController.php
+++ b/app/Http/Controllers/Users/BankController.php
@@ -2,20 +2,15 @@
 
 namespace App\Http\Controllers\Users;
 
-use Illuminate\Http\Request;
-
-use DB;
-use Auth;
+use App\Http\Controllers\Controller;
+use App\Models\Currency\Currency;
 use App\Models\User\User;
 use App\Models\User\UserCurrency;
-use App\Models\Currency\Currency;
-use App\Models\Currency\CurrencyLog;
 use App\Services\CurrencyManager;
+use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Auth;
 
-use App\Http\Controllers\Controller;
-
-class BankController extends Controller
-{
+class BankController extends Controller {
     /*
     |--------------------------------------------------------------------------
     | Bank Controller
@@ -30,30 +25,30 @@ class BankController extends Controller
      *
      * @return \Illuminate\Contracts\Support\Renderable
      */
-    public function getIndex()
-    {
+    public function getIndex() {
         return view('home.bank', [
             'currencyOptions' => Currency::where('allow_user_to_user', 1)->where('is_user_owned', 1)->whereIn('id', UserCurrency::where('user_id', Auth::user()->id)->pluck('currency_id')->toArray())->orderBy('sort_user', 'DESC')->pluck('name', 'id')->toArray(),
-            'userOptions' => User::visible()->where('id', '!=', Auth::user()->id)->orderBy('name')->pluck('name', 'id')->toArray()
+            'userOptions'     => User::visible()->where('id', '!=', Auth::user()->id)->orderBy('name')->pluck('name', 'id')->toArray(),
 
         ]);
     }
-    
+
     /**
      * Transfers currency from the user to another.
      *
-     * @param  \Illuminate\Http\Request      $request
-     * @param  App\Services\CurrencyManager  $service
+     * @param App\Services\CurrencyManager $service
+     *
      * @return \Illuminate\Http\RedirectResponse
      */
-    public function postTransfer(Request $request, CurrencyManager $service)
-    {
-        if($service->transferCurrency(Auth::user(), User::visible()->where('id', $request->get('user_id'))->first(), Currency::where('allow_user_to_user', 1)->where('id', $request->get('currency_id'))->first(), $request->get('quantity'))) {
+    public function postTransfer(Request $request, CurrencyManager $service) {
+        if ($service->transferCurrency(Auth::user(), User::visible()->where('id', $request->get('user_id'))->first(), Currency::where('allow_user_to_user', 1)->where('id', $request->get('currency_id'))->first(), $request->get('quantity'))) {
             flash('Currency transferred successfully.')->success();
+        } else {
+            foreach ($service->errors()->getMessages()['error'] as $error) {
+                flash($error)->error();
+            }
         }
-        else {
-            foreach($service->errors()->getMessages()['error'] as $error) flash($error)->error();
-        }
+
         return redirect()->back();
     }
 }
diff --git a/app/Http/Controllers/Users/BookmarkController.php b/app/Http/Controllers/Users/BookmarkController.php
index 7e10d3cf8b..79603f3a4a 100644
--- a/app/Http/Controllers/Users/BookmarkController.php
+++ b/app/Http/Controllers/Users/BookmarkController.php
@@ -2,17 +2,13 @@
 
 namespace App\Http\Controllers\Users;
 
-use Auth;
-
-use Illuminate\Http\Request;
-
-use App\Services\BookmarkManager;
-use App\Models\Character\CharacterBookmark;
-
 use App\Http\Controllers\Controller;
+use App\Models\Character\CharacterBookmark;
+use App\Services\BookmarkManager;
+use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Auth;
 
-class BookmarkController extends Controller
-{
+class BookmarkController extends Controller {
     /*
     |--------------------------------------------------------------------------
     | Bookmark Controller
@@ -25,17 +21,15 @@ class BookmarkController extends Controller
     /**
      * Shows the bookmarks page.
      *
-     * @param  \Illuminate\Http\Request  $request
      * @return \Illuminate\Contracts\Support\Renderable
      */
-    public function getBookmarks(Request $request)
-    {
+    public function getBookmarks(Request $request) {
         $query = CharacterBookmark::join('characters', 'character_bookmarks.character_id', '=', 'characters.id')
-        ->join('character_images', 'characters.character_image_id', '=', 'character_images.id')
-        ->with('character.image')->with('character.user')->visible()
-        ->where('character_bookmarks.user_id', Auth::user()->id);
+            ->join('character_images', 'characters.character_image_id', '=', 'character_images.id')
+            ->with('character.image')->with('character.user')->visible()
+            ->where('character_bookmarks.user_id', Auth::user()->id);
 
-        switch($request->get('sort')) {
+        switch ($request->get('sort')) {
             case 'number_desc':
                 $query->orderBy('characters.number', 'DESC');
                 break;
@@ -83,7 +77,7 @@ public function getBookmarks(Request $request)
         }
 
         return view('account.bookmarks', [
-            'bookmarks' => $query->paginate(20)->appends($request->query())
+            'bookmarks' => $query->paginate(20)->appends($request->query()),
         ]);
     }
 
@@ -92,8 +86,7 @@ public function getBookmarks(Request $request)
      *
      * @return \Illuminate\Contracts\Support\Renderable
      */
-    public function getCreateBookmark()
-    {
+    public function getCreateBookmark() {
         return view('account.bookmarks._create_edit_bookmark', [
             'bookmark' => new CharacterBookmark,
         ]);
@@ -102,13 +95,16 @@ public function getCreateBookmark()
     /**
      * Gets the bookmark editing modal.
      *
-     * @param  int  $id
+     * @param int $id
+     *
      * @return \Illuminate\Contracts\Support\Renderable
      */
-    public function getEditBookmark($id)
-    {
+    public function getEditBookmark($id) {
         $bookmark = CharacterBookmark::with('character')->where('id', $id)->where('user_id', Auth::user()->id)->first();
-        if(!$bookmark) abort(404);
+        if (!$bookmark) {
+            abort(404);
+        }
+
         return view('account.bookmarks._create_edit_bookmark', [
             'bookmark' => $bookmark,
         ]);
@@ -117,40 +113,44 @@ public function getEditBookmark($id)
     /**
      * Creates or edits a bookmark.
      *
-     * @param  \Illuminate\Http\Request      $request
-     * @param  App\Services\BookmarkManager  $service
-     * @param  int|null                      $id
+     * @param App\Services\BookmarkManager $service
+     * @param int|null                     $id
+     *
      * @return \Illuminate\Http\RedirectResponse
      */
-    public function postCreateEditBookmark(Request $request, BookmarkManager $service, $id = null)
-    {
+    public function postCreateEditBookmark(Request $request, BookmarkManager $service, $id = null) {
         $id ? $request->validate(CharacterBookmark::$updateRules) : $request->validate(CharacterBookmark::$createRules);
         $data = $request->only([
-            'character_id', 'notify_on_trade_status', 'notify_on_gift_art_status', 'notify_on_gift_writing_status', 'notify_on_transfer', 'notify_on_image', 'comment'
+            'character_id', 'notify_on_trade_status', 'notify_on_gift_art_status', 'notify_on_gift_writing_status', 'notify_on_transfer', 'notify_on_image', 'comment',
         ]);
-        if($id && $service->updateBookmark($data + ['bookmark_id' => $id], Auth::user())) {
+        if ($id && $service->updateBookmark($data + ['bookmark_id' => $id], Auth::user())) {
             flash('Bookmark updated successfully.')->success();
-        }
-        else if (!$id && $bookmark = $service->createBookmark($data, Auth::user())) {
+        } elseif (!$id && $bookmark = $service->createBookmark($data, Auth::user())) {
             flash('Bookmark created successfully.')->success();
+
             return redirect()->back();
+        } else {
+            foreach ($service->errors()->getMessages()['error'] as $error) {
+                flash($error)->error();
+            }
         }
-        else {
-            foreach($service->errors()->getMessages()['error'] as $error) flash($error)->error();
-        }
+
         return redirect()->back();
     }
 
     /**
      * Gets the bookmark deletion modal.
      *
-     * @param  int  $id
+     * @param int $id
+     *
      * @return \Illuminate\Contracts\Support\Renderable
      */
-    public function getDeleteBookmark($id)
-    {
+    public function getDeleteBookmark($id) {
         $bookmark = CharacterBookmark::with('character')->where('id', $id)->where('user_id', Auth::user()->id)->first();
-        if(!$bookmark) abort(404);
+        if (!$bookmark) {
+            abort(404);
+        }
+
         return view('account.bookmarks._delete_bookmark', [
             'bookmark' => $bookmark,
         ]);
@@ -159,19 +159,20 @@ public function getDeleteBookmark($id)
     /**
      * Deletes a bookmark.
      *
-     * @param  \Illuminate\Http\Request      $request
-     * @param  App\Services\BookmarkManager  $service
-     * @param  int                           $id
+     * @param App\Services\BookmarkManager $service
+     * @param int                          $id
+     *
      * @return \Illuminate\Http\RedirectResponse
      */
-    public function postDeleteBookmark(Request $request, BookmarkManager $service, $id)
-    {
-        if($id && $service->deleteBookmark(['bookmark_id' => $id], Auth::user())) {
+    public function postDeleteBookmark(Request $request, BookmarkManager $service, $id) {
+        if ($id && $service->deleteBookmark(['bookmark_id' => $id], Auth::user())) {
             flash('Bookmark deleted successfully.')->success();
+        } else {
+            foreach ($service->errors()->getMessages()['error'] as $error) {
+                flash($error)->error();
+            }
         }
-        else {
-            foreach($service->errors()->getMessages()['error'] as $error) flash($error)->error();
-        }
+
         return redirect()->back();
     }
 }
diff --git a/app/Http/Controllers/Users/CharacterController.php b/app/Http/Controllers/Users/CharacterController.php
index fffb42a843..36a81aa407 100644
--- a/app/Http/Controllers/Users/CharacterController.php
+++ b/app/Http/Controllers/Users/CharacterController.php
@@ -2,27 +2,16 @@
 
 namespace App\Http\Controllers\Users;
 
-use Illuminate\Http\Request;
-
-use DB;
-use Auth;
-use Route;
-use Settings;
-use App\Models\User\User;
+use App\Facades\Settings;
+use App\Http\Controllers\Controller;
 use App\Models\Character\Character;
-use App\Models\Currency\Currency;
-use App\Models\Currency\CurrencyLog;
-use App\Models\User\UserCurrency;
-use App\Models\Character\CharacterCurrency;
 use App\Models\Character\CharacterTransfer;
-
-use App\Services\CurrencyManager;
+use App\Models\User\User;
 use App\Services\CharacterManager;
+use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Auth;
 
-use App\Http\Controllers\Controller;
-
-class CharacterController extends Controller
-{
+class CharacterController extends Controller {
     /*
     |--------------------------------------------------------------------------
     | Character Controller
@@ -37,8 +26,7 @@ class CharacterController extends Controller
      *
      * @return \Illuminate\Contracts\Support\Renderable
      */
-    public function getIndex()
-    {
+    public function getIndex() {
         $characters = Auth::user()->characters()->with('image')->visible()->whereNull('trade_id')->get();
 
         return view('home.characters', [
@@ -51,8 +39,7 @@ public function getIndex()
      *
      * @return \Illuminate\Contracts\Support\Renderable
      */
-    public function getMyos()
-    {
+    public function getMyos() {
         $slots = Auth::user()->myoSlots()->with('image')->get();
 
         return view('home.myos', [
@@ -63,34 +50,36 @@ public function getMyos()
     /**
      * Sorts the user's characters.
      *
-     * @param  \Illuminate\Http\Request       $request
-     * @param  App\Services\CharacterManager  $service
+     * @param App\Services\CharacterManager $service
+     *
      * @return \Illuminate\Http\RedirectResponse
      */
-    public function postSortCharacters(Request $request, CharacterManager $service)
-    {
+    public function postSortCharacters(Request $request, CharacterManager $service) {
         if ($service->sortCharacters($request->only(['sort']), Auth::user())) {
             flash('Characters sorted successfully.')->success();
+
             return redirect()->back();
+        } else {
+            foreach ($service->errors()->getMessages()['error'] as $error) {
+                flash($error)->error();
+            }
         }
-        else {
-            foreach($service->errors()->getMessages()['error'] as $error) flash($error)->error();
-        }
+
         return redirect()->back();
     }
 
     /**
      * Shows the user's transfers.
      *
-     * @param  string  $type
+     * @param string $type
+     *
      * @return \Illuminate\Contracts\Support\Renderable
      */
-    public function getTransfers($type = 'incoming')
-    {
+    public function getTransfers($type = 'incoming') {
         $transfers = CharacterTransfer::with('sender.rank')->with('recipient.rank')->with('character.image');
         $user = Auth::user();
 
-        switch($type) {
+        switch ($type) {
             case 'incoming':
                 $transfers->where('recipient_id', $user->id)->active();
                 break;
@@ -98,14 +87,14 @@ public function getTransfers($type = 'incoming')
                 $transfers->where('sender_id', $user->id)->active();
                 break;
             case 'completed':
-                $transfers->where(function($query) use ($user) {
+                $transfers->where(function ($query) use ($user) {
                     $query->where('recipient_id', $user->id)->orWhere('sender_id', $user->id);
                 })->completed();
                 break;
         }
 
         return view('home.character_transfers', [
-            'transfers' => $transfers->orderBy('id', 'DESC')->paginate(20),
+            'transfers'      => $transfers->orderBy('id', 'DESC')->paginate(20),
             'transfersQueue' => Settings::get('open_transfers_queue'),
         ]);
     }
@@ -113,31 +102,32 @@ public function getTransfers($type = 'incoming')
     /**
      * Transfers one of the user's own characters.
      *
-     * @param  \Illuminate\Http\Request       $request
-     * @param  App\Services\CharacterManager  $service
-     * @param  int                            $id
+     * @param App\Services\CharacterManager $service
+     * @param int                           $id
+     *
      * @return \Illuminate\Http\RedirectResponse
      */
-    public function postHandleTransfer(Request $request, CharacterManager $service, $id)
-    {
-        if(!Auth::check()) abort(404);
+    public function postHandleTransfer(Request $request, CharacterManager $service, $id) {
+        if (!Auth::check()) {
+            abort(404);
+        }
 
         $action = $request->get('action');
 
-        if($action == 'Cancel' && $service->cancelTransfer(['transfer_id' => $id], Auth::user())) {
+        if ($action == 'Cancel' && $service->cancelTransfer(['transfer_id' => $id], Auth::user())) {
             flash('Transfer cancelled.')->success();
-        }
-        else if($service->processTransfer($request->only(['action']) + ['transfer_id' => $id], Auth::user())) {
-            if(strtolower($action) == 'approve'){
-                flash('Transfer ' . strtolower($action) . 'd.')->success();
+        } elseif ($service->processTransfer($request->only(['action']) + ['transfer_id' => $id], Auth::user())) {
+            if (strtolower($action) == 'approve') {
+                flash('Transfer '.strtolower($action).'d.')->success();
+            } else {
+                flash('Transfer '.strtolower($action).'ed.')->success();
             }
-            else {
-                flash('Transfer ' . strtolower($action) . 'ed.')->success();
+        } else {
+            foreach ($service->errors()->getMessages()['error'] as $error) {
+                flash($error)->error();
             }
         }
-        else {
-            foreach($service->errors()->getMessages()['error'] as $error) flash($error)->error();
-        }
+
         return redirect()->back();
     }
 }
diff --git a/app/Http/Controllers/Users/InventoryController.php b/app/Http/Controllers/Users/InventoryController.php
index 88c935faa3..0baf34bdc4 100644
--- a/app/Http/Controllers/Users/InventoryController.php
+++ b/app/Http/Controllers/Users/InventoryController.php
@@ -2,27 +2,21 @@
 
 namespace App\Http\Controllers\Users;
 
-use Illuminate\Http\Request;
-
-use DB;
-use Auth;
-use App\Models\User\User;
-use App\Models\User\UserItem;
-use App\Models\Item\Item;
-use App\Models\Item\ItemCategory;
-use App\Models\Item\UserItemLog;
+use App\Http\Controllers\Controller;
 use App\Models\Character\Character;
-use App\Models\Character\CharacterItem;
-use App\Services\InventoryManager;
-
-use App\Models\Trade;
 use App\Models\Character\CharacterDesignUpdate;
+use App\Models\Character\CharacterItem;
+use App\Models\Item\Item;
+use App\Models\Item\ItemCategory;
 use App\Models\Submission\Submission;
+use App\Models\Trade;
+use App\Models\User\User;
+use App\Models\User\UserItem;
+use App\Services\InventoryManager;
+use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Auth;
 
-use App\Http\Controllers\Controller;
-
-class InventoryController extends Controller
-{
+class InventoryController extends Controller {
     /*
     |--------------------------------------------------------------------------
     | Inventory Controller
@@ -37,9 +31,8 @@ class InventoryController extends Controller
      *
      * @return \Illuminate\Contracts\Support\Renderable
      */
-    public function getIndex()
-    {
-        $categories = ItemCategory::orderBy('sort', 'DESC')->get();
+    public function getIndex() {
+        $categories = ItemCategory::visible(Auth::check() ? Auth::user() : null)->orderBy('sort', 'DESC')->get();
         $items = count($categories) ?
             Auth::user()->items()
                 ->where('count', '>', 0)
@@ -54,47 +47,46 @@ public function getIndex()
                 ->orderBy('updated_at')
                 ->get()
                 ->groupBy(['item_category_id', 'id']);
+
         return view('home.inventory', [
-            'categories' => $categories->keyBy('id'),
-            'items' => $items,
+            'categories'  => $categories->keyBy('id'),
+            'items'       => $items,
             'userOptions' => User::visible()->where('id', '!=', Auth::user()->id)->orderBy('name')->pluck('name', 'id')->toArray(),
-            'user' => Auth::user()
+            'user'        => Auth::user(),
         ]);
     }
 
     /**
      * Shows the inventory stack modal.
      *
-     * @param  \Illuminate\Http\Request  $request
-     * @param  int                       $id
+     * @param int $id
+     *
      * @return \Illuminate\Contracts\Support\Renderable
      */
-    public function getStack(Request $request, $id)
-    {
+    public function getStack(Request $request, $id) {
         $first_instance = UserItem::withTrashed()->where('id', $id)->first();
-        $readOnly = $request->get('read_only') ? : ((Auth::check() && $first_instance && ($first_instance->user_id == Auth::user()->id || Auth::user()->hasPower('edit_inventories'))) ? 0 : 1);
+        $readOnly = $request->get('read_only') ?: ((Auth::check() && $first_instance && ($first_instance->user_id == Auth::user()->id || Auth::user()->hasPower('edit_inventories'))) ? 0 : 1);
         $stack = UserItem::where([['user_id', $first_instance->user_id], ['item_id', $first_instance->item_id], ['count', '>', 0]])->get();
         $item = Item::where('id', $first_instance->item_id)->first();
 
         return view('home._inventory_stack', [
-            'stack' => $stack,
-            'item' => $item,
-            'user' => Auth::user(),
-            'userOptions' => ['' => 'Select User'] + User::visible()->where('id', '!=', $first_instance ? $first_instance->user_id : 0)->orderBy('name')->get()->pluck('verified_name', 'id')->toArray(),
-            'readOnly' => $readOnly,
-            'characterOptions' => Character::visible()->myo(0)->where('user_id', optional(Auth::user())->id)->orderBy('sort','DESC')->get()->pluck('fullName','id')->toArray(),
+            'stack'            => $stack,
+            'item'             => $item,
+            'user'             => Auth::user(),
+            'userOptions'      => ['' => 'Select User'] + User::visible()->where('id', '!=', $first_instance ? $first_instance->user_id : 0)->orderBy('name')->get()->pluck('verified_name', 'id')->toArray(),
+            'readOnly'         => $readOnly,
+            'characterOptions' => Character::visible()->myo(0)->where('user_id', optional(Auth::user())->id)->orderBy('sort', 'DESC')->get()->pluck('fullName', 'id')->toArray(),
         ]);
     }
 
     /**
      * Shows the inventory stack modal, for characters.
      *
-     * @param  \Illuminate\Http\Request  $request
-     * @param  int                       $id
+     * @param int $id
+     *
      * @return \Illuminate\Contracts\Support\Renderable
      */
-    public function getCharacterStack(Request $request, $id)
-    {
+    public function getCharacterStack(Request $request, $id) {
         $first_instance = CharacterItem::withTrashed()->where('id', $id)->first();
         $stack = CharacterItem::where([['character_id', $first_instance->character_id], ['item_id', $first_instance->item_id], ['count', '>', 0]])->get();
         $item = Item::where('id', $first_instance->item_id)->first();
@@ -104,33 +96,36 @@ public function getCharacterStack(Request $request, $id)
         $ownerId = $stack->first()->character->user_id : null;
 
         $hasPower = Auth::check() ? Auth::user()->hasPower('edit_inventories') : false;
-        $readOnly = $request->get('read_only') ? : ((Auth::check() && $first_instance && (isset($ownerId) == TRUE || $hasPower == TRUE)) ? 0 : 1);
+        $readOnly = $request->get('read_only') ?: ((Auth::check() && $first_instance && (isset($ownerId) == true || $hasPower == true)) ? 0 : 1);
 
         return view('character._inventory_stack', [
-            'stack' => $stack,
-            'item' => $item,
-            'user' => Auth::user(),
+            'stack'     => $stack,
+            'item'      => $item,
+            'user'      => Auth::user(),
             'has_power' => $hasPower,
-            'readOnly' => $readOnly,
+            'readOnly'  => $readOnly,
             'character' => $character,
-            'owner_id' => isset($ownerId) ? $ownerId : null,
+            'owner_id'  => $ownerId ?? null,
         ]);
     }
 
     /**
      * Edits the inventory of involved users.
      *
-     * @param  \Illuminate\Http\Request       $request
-     * @param  App\Services\InventoryManager  $service
+     * @param App\Services\InventoryManager $service
+     *
      * @return \Illuminate\Http\RedirectResponse
      */
-    public function postEdit(Request $request, InventoryManager $service)
-    {
-        if(!$request->ids) { flash('No items selected.')->error(); }
-        if(!$request->quantities) { flash('Quantities not set.')->error(); }
+    public function postEdit(Request $request, InventoryManager $service) {
+        if (!$request->ids) {
+            flash('No items selected.')->error();
+        }
+        if (!$request->quantities) {
+            flash('Quantities not set.')->error();
+        }
 
-        if($request->ids && $request->quantities) {
-            switch($request->action) {
+        if ($request->ids && $request->quantities) {
+            switch ($request->action) {
                 default:
                     flash('Invalid action selected.')->error();
                     break;
@@ -151,148 +146,241 @@ public function postEdit(Request $request, InventoryManager $service)
                     break;
             }
         }
+
         return redirect()->back();
     }
 
     /**
-     * Transfers inventory items to another user.
+     * Shows the inventory selection widget.
      *
-     * @param  \Illuminate\Http\Request       $request
-     * @param  App\Services\InventoryManager  $service
-     * @return \Illuminate\Http\RedirectResponse
+     * @param int $id
+     *
+     * @return \Illuminate\Contracts\Support\Renderable
      */
-    private function postTransfer(Request $request, InventoryManager $service)
-    {
-        if($service->transferStack(Auth::user(), User::visible()->where('id', $request->get('user_id'))->first(), UserItem::find($request->get('ids')), $request->get('quantities'))) {
-            flash('Item transferred successfully.')->success();
+    public function getSelector($id) {
+        return view('widgets._inventory_select', [
+            'user' => Auth::user(),
+        ]);
+    }
+
+    /**
+     * Show the account search page.
+     *
+     * @return \Illuminate\Contracts\Support\Renderable
+     */
+    public function getAccountSearch(Request $request) {
+        $item = Item::released()->find($request->only(['item_id']))->first();
+        $user = Auth::user();
+
+        if ($item) {
+            // Gather all instances of this item in the user's inventory
+            $userItems = UserItem::where('user_id', $user->id)->where('item_id', $item->id)->where('count', '>', 0)->get();
+
+            // Gather the user's characters and the items they own
+            $characters = Character::where('user_id', $user->id)->orderBy('slug', 'ASC')->get();
+            $characterItems = CharacterItem::whereIn('character_id', $characters->pluck('id')->toArray())->where('item_id', $item->id)->where('count', '>', 0)->get();
+
+            // Gather hold locations
+            $designUpdates = CharacterDesignUpdate::where('user_id', $user->id)->whereNotNull('data')->get();
+            $trades = Trade::where('sender_id', $user->id)->orWhere('recipient_id', $user->id)->get();
+            $submissions = Submission::where('user_id', $user->id)->whereNotNull('data')->get();
+        }
+
+        return view('home.account_search', [
+            'item'           => $item ? $item : null,
+            'items'          => Item::orderBy('name')->released()->pluck('name', 'id'),
+            'userItems'      => $item ? $userItems : null,
+            'characterItems' => $item ? $characterItems : null,
+            'characters'     => $item ? $characters : null,
+            'designUpdates'  => $item ? $designUpdates : null,
+            'trades'         => $item ? $trades : null,
+            'submissions'    => $item ? $submissions : null,
+        ]);
+    }
+
+    /**
+     * Show the full inventory page.
+     *
+     * @return \Illuminate\Contracts\Support\Renderable
+     */
+    public function getFullInventory() {
+        $user = Auth::user();
+
+        // Gather the user's characters
+        $characters = $user->allCharacters;
+
+        if (!Auth::check() || !$user->hasPower('manage_characters')) {
+            $characters = $characters->where('is_visible', 1);
         }
-        else {
-            foreach($service->errors()->getMessages()['error'] as $error) flash($error)->error();
+
+        // Set up Categories
+        $categories = ItemCategory::visible(Auth::check() ? Auth::user() : null)->orderBy('sort', 'DESC')->get();
+
+        if (count($categories)) {
+            $items =
+                Auth::user()->items()
+                    ->where('count', '>', 0)
+                    ->orderByRaw('FIELD(item_category_id,'.implode(',', $categories->pluck('id')->toArray()).')')
+                    ->orderBy('name')
+                    ->orderBy('updated_at')
+                    ->get();
+            foreach ($characters as $character) {
+                $itemCollect = $character->items()
+                    ->where('count', '>', 0)
+                    ->orderByRaw('FIELD(item_category_id,'.implode(',', $categories->pluck('id')->toArray()).')')
+                    ->orderBy('name')
+                    ->orderBy('updated_at')
+                    ->get();
+                isset($items) ? $items = $items->mergeRecursive($itemCollect) : $items = $itemCollect;
+            }
+        } else {
+            $items =
+                Auth::user()->items()
+                    ->where('count', '>', 0)
+                    ->orderBy('name')
+                    ->orderBy('updated_at')
+                    ->get();
+            foreach ($characters as $character) {
+                $itemCollect = $character->items()
+                    ->where('count', '>', 0)
+                    ->orderBy('name')
+                    ->orderBy('updated_at')
+                    ->get();
+                isset($items) ? $items = $items->mergeRecursive($itemCollect) : $items = $itemCollect;
+            }
         }
+
+        return view('home.inventory_full', [
+            'categories' => $categories->keyBy('id'),
+            'items'      => $items->sortBy('name')->sortBy('updated_at')->groupBy(['item_category_id', 'id']),
+            'user'       => $user,
+            'characters' => $characters,
+        ]);
+    }
+
+    /**
+     * Shows the confirmation modal for inventory consolidation.
+     *
+     * @return \Illuminate\Contracts\Support\Renderable
+     */
+    public function getConsolidateInventory(Request $request) {
+        return view('home._inventory_consolidate');
+    }
+
+    /**
+     * Consolidates the user's inventory.
+     *
+     * @param App\Services\InventoryManager $service
+     *
+     * @return \Illuminate\Http\RedirectResponse
+     */
+    public function postConsolidateInventory(Request $request, InventoryManager $service) {
+        if ($service->consolidateInventory(Auth::user())) {
+            flash('Inventory consolidated.')->success();
+        } else {
+            foreach ($service->errors()->getMessages()['error'] as $error) {
+                flash($error)->error();
+            }
+        }
+
         return redirect()->back();
     }
 
     /**
      * Transfers inventory items to another user.
      *
-     * @param  \Illuminate\Http\Request       $request
-     * @param  App\Services\InventoryManager  $service
+     * @param App\Services\InventoryManager $service
+     *
      * @return \Illuminate\Http\RedirectResponse
      */
-    private function postTransferToCharacter(Request $request, InventoryManager $service)
-    {
-        if($service->transferCharacterStack(Auth::user(), Character::visible()->where('id', $request->get('character_id'))->first(), UserItem::find($request->get('ids')), $request->get('quantities'))) {
+    private function postTransfer(Request $request, InventoryManager $service) {
+        if ($service->transferStack(Auth::user(), User::visible()->where('id', $request->get('user_id'))->first(), UserItem::find($request->get('ids')), $request->get('quantities'))) {
             flash('Item transferred successfully.')->success();
+        } else {
+            foreach ($service->errors()->getMessages()['error'] as $error) {
+                flash($error)->error();
+            }
         }
-        else {
-            foreach($service->errors()->getMessages()['error'] as $error) flash($error)->error();
-        }
+
         return redirect()->back();
     }
 
     /**
-     * Deletes an inventory stack.
+     * Transfers inventory items to a character.
+     *
+     * @param App\Services\InventoryManager $service
      *
-     * @param  \Illuminate\Http\Request       $request
-     * @param  App\Services\InventoryManager  $service
      * @return \Illuminate\Http\RedirectResponse
      */
-    private function postDelete(Request $request, InventoryManager $service)
-    {
-        if($service->deleteStack(Auth::user(), UserItem::find($request->get('ids')), $request->get('quantities'))) {
-            flash('Item deleted successfully.')->success();
-        }
-        else {
-            foreach($service->errors()->getMessages()['error'] as $error) flash($error)->error();
+    private function postTransferToCharacter(Request $request, InventoryManager $service) {
+        if ($service->transferCharacterStack(Auth::user(), Character::visible()->where('id', $request->get('character_id'))->first(), UserItem::find($request->get('ids')), $request->get('quantities'), Auth::user())) {
+            flash('Item transferred successfully.')->success();
+        } else {
+            foreach ($service->errors()->getMessages()['error'] as $error) {
+                flash($error)->error();
+            }
         }
+
         return redirect()->back();
     }
 
     /**
-     * Sells an inventory stack.
+     * Deletes an inventory stack.
+     *
+     * @param App\Services\InventoryManager $service
      *
-     * @param  \Illuminate\Http\Request       $request
-     * @param  App\Services\InventoryManager  $service
      * @return \Illuminate\Http\RedirectResponse
      */
-    private function postResell(Request $request, InventoryManager $service)
-    {
-        if($service->resellStack(Auth::user(), UserItem::find($request->get('ids')), $request->get('quantities'))) {
-            flash('Item sold successfully.')->success();
-        }
-        else {
-            foreach($service->errors()->getMessages()['error'] as $error) flash($error)->error();
+    private function postDelete(Request $request, InventoryManager $service) {
+        if ($service->deleteStack(Auth::user(), UserItem::find($request->get('ids')), $request->get('quantities'), Auth::user())) {
+            flash('Item deleted successfully.')->success();
+        } else {
+            foreach ($service->errors()->getMessages()['error'] as $error) {
+                flash($error)->error();
+            }
         }
+
         return redirect()->back();
     }
 
     /**
-     * Shows the inventory selection widget.
+     * Sells an inventory stack.
      *
-     * @param  int  $id
-     * @return \Illuminate\Contracts\Support\Renderable
+     * @param App\Services\InventoryManager $service
+     *
+     * @return \Illuminate\Http\RedirectResponse
      */
-    public function getSelector($id)
-    {
-        return view('widgets._inventory_select', [
-            'user' => Auth::user(),
-        ]);
+    private function postResell(Request $request, InventoryManager $service) {
+        if ($service->resellStack(Auth::user(), UserItem::find($request->get('ids')), $request->get('quantities'))) {
+            flash('Item sold successfully.')->success();
+        } else {
+            foreach ($service->errors()->getMessages()['error'] as $error) {
+                flash($error)->error();
+            }
+        }
+
+        return redirect()->back();
     }
 
     /**
      * Acts on an item based on the item's tag.
      *
-     * @param  \Illuminate\Http\Request       $request
      * @return \Illuminate\Http\RedirectResponse
      */
-    private function postAct(Request $request)
-    {
+    private function postAct(Request $request) {
         $stacks = UserItem::with('item')->find($request->get('ids'));
         $tag = $request->get('tag');
         $service = $stacks->first()->item->hasTag($tag) ? $stacks->first()->item->tag($tag)->service : null;
-        if($service && $service->act($stacks, Auth::user(), $request->all())) {
+        if ($service && $service->act($stacks, Auth::user(), $request->all())) {
             flash('Item used successfully.')->success();
-        }
-        else if(!$stacks->first()->item->hasTag($tag)) flash('Invalid action selected.')->error();
-        else {
-            foreach($service->errors()->getMessages()['error'] as $error) flash($error)->error();
-        }
-        return redirect()->back();
-    }
-
-    /**
-     * Show the account search page.
-     *
-     * @return \Illuminate\Contracts\Support\Renderable
-     */
-    public function getAccountSearch(Request $request)
-    {
-        $item = Item::released()->find($request->only(['item_id']))->first();
-        $user = Auth::user();
-
-        if($item) {
-            // Gather all instances of this item in the user's inventory
-            $userItems = UserItem::where('user_id', $user->id)->where('item_id', $item->id)->where('count', '>', 0)->get();
-
-            // Gather the user's characters and the items they own
-            $characters = Character::where('user_id', $user->id)->orderBy('slug', 'ASC')->get();
-            $characterItems = CharacterItem::whereIn('character_id', $characters->pluck('id')->toArray())->where('item_id', $item->id)->where('count', '>', 0)->get();
-
-            // Gather hold locations
-            $designUpdates = CharacterDesignUpdate::where('user_id', $user->id)->whereNotNull('data')->get();
-            $trades = Trade::where('sender_id', $user->id)->orWhere('recipient_id', $user->id)->get();
-            $submissions = Submission::where('user_id', $user->id)->whereNotNull('data')->get();
+        } elseif (!$stacks->first()->item->hasTag($tag)) {
+            flash('Invalid action selected.')->error();
+        } else {
+            foreach ($service->errors()->getMessages()['error'] as $error) {
+                flash($error)->error();
+            }
         }
 
-        return view('home.account_search', [
-            'item' => $item ? $item : null,
-            'items' => Item::orderBy('name')->released()->pluck('name', 'id'),
-            'userItems' => $item ? $userItems : null,
-            'characterItems' => $item ? $characterItems : null,
-            'characters' => $item ? $characters : null,
-            'designUpdates' => $item ? $designUpdates :null,
-            'trades' => $item ? $trades : null,
-            'submissions' => $item ? $submissions : null,
-        ]);
+        return redirect()->back();
     }
 }
diff --git a/app/Http/Controllers/Users/ReportController.php b/app/Http/Controllers/Users/ReportController.php
index a23b425129..65a8d8bda8 100644
--- a/app/Http/Controllers/Users/ReportController.php
+++ b/app/Http/Controllers/Users/ReportController.php
@@ -2,24 +2,15 @@
 
 namespace App\Http\Controllers\Users;
 
-use Illuminate\Http\Request;
-
-use DB;
-use Auth;
-use Settings;
-use App\Models\User\User;
-use App\Models\Character\Character;
-use App\Models\Item\Item;
-use App\Models\Currency\Currency;
+use App\Facades\Settings;
+use App\Http\Controllers\Controller;
 use App\Models\Report\Report;
-use App\Models\Prompt\Prompt;
-
+use App\Models\User\User;
 use App\Services\ReportManager;
+use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Auth;
 
-use App\Http\Controllers\Controller;
-
-class ReportController extends Controller
-{
+class ReportController extends Controller {
     /**********************************************************************************************
 
         REPORTS
@@ -29,14 +20,14 @@ class ReportController extends Controller
     /**
      * Shows the user's report log.
      *
-     * @param  \Illuminate\Http\Request  $request
      * @return \Illuminate\Contracts\Support\Renderable
      */
-    public function getReportsIndex(Request $request)
-    {
+    public function getReportsIndex(Request $request) {
         $reports = Report::where('user_id', Auth::user()->id);
         $type = $request->get('type');
-        if(!$type) $type = 'Pending';
+        if (!$type) {
+            $type = 'Pending';
+        }
 
         $reports = $reports->where('status', ucfirst($type));
 
@@ -48,17 +39,16 @@ public function getReportsIndex(Request $request)
     /**
      * Shows the bug report log.
      *
-     * @param  \Illuminate\Http\Request  $request
      * @return \Illuminate\Contracts\Support\Renderable
      */
-    public function getBugIndex(Request $request)
-    {
+    public function getBugIndex(Request $request) {
         $reports = Report::where('is_br', 1);
 
         $data = $request->only(['url']);
 
-        if(isset($data['url']))
+        if (isset($data['url'])) {
             $reports->where('url', 'LIKE', '%'.$data['url'].'%');
+        }
 
         return view('home.bug_report_index', [
             'reports' => $reports->orderBy('id', 'DESC')->paginate(20)->appends($request->query()),
@@ -68,28 +58,30 @@ public function getBugIndex(Request $request)
     /**
      * Shows the report page.
      *
-     * @param  int  $id
+     * @param int $id
+     *
      * @return \Illuminate\Contracts\Support\Renderable
      */
-    public function getReport($id)
-    {
+    public function getReport($id) {
         $report = Report::viewable(Auth::check() ? Auth::user() : null)->where('id', $id)->first();
-        if(!$report) abort(404);
+        if (!$report) {
+            abort(404);
+        }
+
         return view('home.report', [
             'report' => $report,
-            'user' => $report->user
+            'user'   => $report->user,
         ]);
     }
 
     /**
      * Shows the submit report page.
      *
-     * @param  \Illuminate\Http\Request  $request
      * @return \Illuminate\Contracts\Support\Renderable
      */
-    public function getNewReport(Request $request)
-    {
+    public function getNewReport(Request $request) {
         $closed = !Settings::get('is_reports_open');
+
         return view('home.create_report', [
             'closed' => $closed,
         ]);
@@ -98,21 +90,22 @@ public function getNewReport(Request $request)
     /**
      * Creates a new report.
      *
-     * @param  \Illuminate\Http\Request        $request
-     * @param  App\Services\ReportManager  $service
+     * @param App\Services\ReportManager $service
+     *
      * @return \Illuminate\Http\RedirectResponse
      */
-    public function postNewReport(Request $request, ReportManager $service)
-    {
+    public function postNewReport(Request $request, ReportManager $service) {
         $request->validate(Report::$createRules);
         $request['url'] = strip_tags($request['url']);
 
-        if($service->createReport($request->only(['url', 'comments', 'is_br', 'error']), Auth::user(), true)) {
+        if ($service->createReport($request->only(['url', 'comments', 'is_br', 'error']), Auth::user(), true)) {
             flash('Report submitted successfully.')->success();
+        } else {
+            foreach ($service->errors()->getMessages()['error'] as $error) {
+                flash($error)->error();
+            }
         }
-        else {
-            foreach($service->errors()->getMessages()['error'] as $error) flash($error)->error();
-        }
+
         return redirect()->to('reports');
     }
 }
diff --git a/app/Http/Controllers/Users/SubmissionController.php b/app/Http/Controllers/Users/SubmissionController.php
index 2a9713cc99..4e19889b83 100644
--- a/app/Http/Controllers/Users/SubmissionController.php
+++ b/app/Http/Controllers/Users/SubmissionController.php
@@ -2,29 +2,22 @@
 
 namespace App\Http\Controllers\Users;
 
-use Illuminate\Http\Request;
-
-use DB;
-use Auth;
-use Config;
-use Settings;
-use App\Models\User\User;
-use App\Models\User\UserItem;
+use App\Facades\Settings;
+use App\Http\Controllers\Controller;
 use App\Models\Character\Character;
+use App\Models\Currency\Currency;
 use App\Models\Item\Item;
-use App\Models\Raffle\Raffle;
 use App\Models\Item\ItemCategory;
-use App\Models\Currency\Currency;
-use App\Models\Submission\Submission;
-use App\Models\Submission\SubmissionCharacter;
 use App\Models\Prompt\Prompt;
-
+use App\Models\Raffle\Raffle;
+use App\Models\Submission\Submission;
+use App\Models\User\User;
+use App\Models\User\UserItem;
 use App\Services\SubmissionManager;
+use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Auth;
 
-use App\Http\Controllers\Controller;
-
-class SubmissionController extends Controller
-{
+class SubmissionController extends Controller {
     /*
     |--------------------------------------------------------------------------
     | Submission Controller
@@ -43,79 +36,117 @@ class SubmissionController extends Controller
     /**
      * Shows the user's submission log.
      *
-     * @param  \Illuminate\Http\Request  $request
      * @return \Illuminate\Contracts\Support\Renderable
      */
-    public function getIndex(Request $request)
-    {
+    public function getIndex(Request $request) {
         $submissions = Submission::with('prompt')->where('user_id', Auth::user()->id)->whereNotNull('prompt_id');
         $type = $request->get('type');
-        if(!$type) $type = 'Pending';
+        if (!$type) {
+            $type = 'Pending';
+        }
 
         $submissions = $submissions->where('status', ucfirst($type));
 
         return view('home.submissions', [
             'submissions' => $submissions->orderBy('id', 'DESC')->paginate(20)->appends($request->query()),
-            'isClaims' => false
+            'isClaims'    => false,
         ]);
     }
 
     /**
      * Shows the submission page.
      *
-     * @param  int  $id
+     * @param int $id
+     *
      * @return \Illuminate\Contracts\Support\Renderable
      */
-    public function getSubmission($id)
-    {
+    public function getSubmission($id) {
         $submission = Submission::viewable(Auth::user())->where('id', $id)->whereNotNull('prompt_id')->first();
         $inventory = isset($submission->data['user']) ? parseAssetData($submission->data['user']) : null;
-        if(!$submission) abort(404);
+        if (!$submission) {
+            abort(404);
+        }
+
         return view('home.submission', [
             'submission' => $submission,
-            'user' => $submission->user,
+            'user'       => $submission->user,
             'categories' => ItemCategory::orderBy('sort', 'DESC')->get(),
-            'inventory' => $inventory,
-            'itemsrow' => Item::all()->keyBy('id')
+            'inventory'  => $inventory,
+            'itemsrow'   => Item::all()->keyBy('id'),
+            'isClaim'    => false,
         ]);
     }
 
     /**
      * Shows the submit page.
      *
-     * @param  \Illuminate\Http\Request  $request
      * @return \Illuminate\Contracts\Support\Renderable
      */
-    public function getNewSubmission(Request $request)
-    {
+    public function getNewSubmission(Request $request) {
         $closed = !Settings::get('is_prompts_open');
         $inventory = UserItem::with('item')->whereNull('deleted_at')->where('count', '>', '0')->where('user_id', Auth::user()->id)->get();
+
         return view('home.create_submission', [
-            'closed' => $closed,
+            'closed'  => $closed,
             'isClaim' => false,
         ] + ($closed ? [] : [
-            'submission' => new Submission,
-            'prompts' => Prompt::active()->sortAlphabetical()->pluck('name', 'id')->toArray(),
+            'submission'          => new Submission,
+            'prompts'             => Prompt::active()->sortAlphabetical()->pluck('name', 'id')->toArray(),
             'characterCurrencies' => Currency::where('is_character_owned', 1)->orderBy('sort_character', 'DESC')->pluck('name', 'id'),
-            'categories' => ItemCategory::orderBy('sort', 'DESC')->get(),
-            'item_filter' => Item::orderBy('name')->released()->get()->keyBy('id'),
-            'items' => Item::orderBy('name')->released()->pluck('name', 'id'),
-            'character_items' => Item::whereIn('item_category_id', ItemCategory::where('is_character_owned',1)->pluck('id')->toArray() )->orderBy('name')->released()->pluck('name', 'id'),
-            'currencies' => Currency::where('is_user_owned', 1)->orderBy('name')->pluck('name', 'id'),
-            'inventory' => $inventory,
-            'page' => 'submission',
-            'expanded_rewards' => Config::get('lorekeeper.extensions.character_reward_expansion.expanded')
+            'categories'          => ItemCategory::visible(Auth::check() ? Auth::user() : null)->orderBy('sort', 'DESC')->get(),
+            'item_filter'         => Item::orderBy('name')->released()->get()->keyBy('id'),
+            'items'               => Item::orderBy('name')->released()->pluck('name', 'id'),
+            'character_items'     => Item::whereIn('item_category_id', ItemCategory::where('is_character_owned', 1)->pluck('id')->toArray())->orderBy('name')->released()->pluck('name', 'id'),
+            'currencies'          => Currency::where('is_user_owned', 1)->orderBy('name')->pluck('name', 'id'),
+            'inventory'           => $inventory,
+            'page'                => 'submission',
+            'expanded_rewards'    => config('lorekeeper.extensions.character_reward_expansion.expanded'),
+        ]));
+    }
+
+    /**
+     * Shows the edit submission page.
+     *
+     * @param mixed $id
+     *
+     * @return \Illuminate\Contracts\Support\Renderable
+     */
+    public function getEditSubmission(Request $request, $id) {
+        $closed = !Settings::get('is_prompts_open');
+        $inventory = UserItem::with('item')->whereNull('deleted_at')->where('count', '>', '0')->where('user_id', Auth::user()->id)->get();
+        $submission = Submission::where('id', $id)->where('status', 'Draft')->where('user_id', Auth::user()->id)->first();
+        if (!$submission) {
+            abort(404);
+        }
+
+        return view('home.edit_submission', [
+            'closed'              => $closed,
+            'isClaim'             => false,
+        ] + ($closed ? [] : [
+            'submission'          => $submission,
+            'prompts'             => Prompt::active()->sortAlphabetical()->pluck('name', 'id')->toArray(),
+            'characterCurrencies' => Currency::where('is_character_owned', 1)->orderBy('sort_character', 'DESC')->pluck('name', 'id'),
+            'categories'          => ItemCategory::orderBy('sort', 'DESC')->get(),
+            'item_filter'         => Item::orderBy('name')->released()->get()->keyBy('id'),
+            'items'               => Item::orderBy('name')->released()->pluck('name', 'id'),
+            'character_items'     => Item::whereIn('item_category_id', ItemCategory::where('is_character_owned', 1)->pluck('id')->toArray())->orderBy('name')->released()->pluck('name', 'id'),
+            'currencies'          => Currency::where('is_user_owned', 1)->orderBy('name')->pluck('name', 'id'),
+            'inventory'           => $inventory,
+            'page'                => 'submission',
+            'expanded_rewards'    => config('lorekeeper.extensions.character_reward_expansion.expanded'),
+            'selectedInventory'   => isset($submission->data['user']) ? parseAssetData($submission->data['user']) : null,
+            'count'               => Submission::where('prompt_id', $submission->prompt_id)->where('status', 'Approved')->where('user_id', $submission->user_id)->count(),
         ]));
     }
 
     /**
      * Shows character information.
      *
-     * @param  string  $slug
+     * @param string $slug
+     *
      * @return \Illuminate\Contracts\Support\Renderable
      */
-    public function getCharacterInfo($slug)
-    {
+    public function getCharacterInfo($slug) {
         $character = Character::visible()->where('slug', $slug)->first();
 
         return view('home._character', [
@@ -126,38 +157,138 @@ public function getCharacterInfo($slug)
     /**
      * Shows prompt information.
      *
-     * @param  int  $id
+     * @param int $id
+     *
      * @return \Illuminate\Contracts\Support\Renderable
      */
-    public function getPromptInfo($id)
-    {
+    public function getPromptInfo($id) {
         $prompt = Prompt::active()->where('id', $id)->first();
-        if(!$prompt) return response(404);
+        if (!$prompt) {
+            return response(404);
+        }
 
         return view('home._prompt', [
             'prompt' => $prompt,
-            'count' => Submission::where('prompt_id', $id)->where('status', 'Approved')->where('user_id', Auth::user()->id)->count()
+            'count'  => Submission::where('prompt_id', $id)->where('status', 'Approved')->where('user_id', Auth::user()->id)->count(),
         ]);
     }
 
     /**
      * Creates a new submission.
      *
-     * @param  \Illuminate\Http\Request        $request
-     * @param  App\Services\SubmissionManager  $service
+     * @param App\Services\SubmissionManager $service
+     * @param mixed                          $draft
+     *
      * @return \Illuminate\Http\RedirectResponse
      */
-    public function postNewSubmission(Request $request, SubmissionManager $service)
-    {
+    public function postNewSubmission(Request $request, SubmissionManager $service, $draft = false) {
         $request->validate(Submission::$createRules);
-        if($service->createSubmission($request->only(['url', 'prompt_id', 'comments', 'slug', 'character_rewardable_type', 'character_rewardable_id', 'character_rewardable_quantity', 'rewardable_type', 'rewardable_id', 'quantity', 'stack_id', 'stack_quantity', 'currency_id', 'currency_quantity']), Auth::user())) {
-            flash('Prompt submitted successfully.')->success();
+        if ($submission = $service->createSubmission($request->only(['url', 'prompt_id', 'comments', 'slug', 'character_rewardable_type', 'character_rewardable_id', 'character_rewardable_quantity', 'rewardable_type', 'rewardable_id', 'quantity', 'stack_id', 'stack_quantity', 'currency_id', 'currency_quantity']), Auth::user(), false, $draft)) {
+            if ($submission->status == 'Draft') {
+                flash('Draft created successfully.')->success();
+
+                return redirect()->to('submissions/draft/'.$submission->id);
+            } else {
+                flash('Prompt submitted successfully.')->success();
+
+                return redirect()->to('submissions/view/'.$submission->id);
+            }
+        } else {
+            foreach ($service->errors()->getMessages()['error'] as $error) {
+                flash($error)->error();
+            }
+
+            return redirect()->back()->withInput();
         }
-        else {
-            foreach($service->errors()->getMessages()['error'] as $error) flash($error)->error();
+
+        return redirect()->to('submissions');
+    }
+
+    /**
+     * Edits a submission draft.
+     *
+     * @param App\Services\SubmissionManager $service
+     * @param mixed                          $id
+     * @param mixed                          $submit
+     *
+     * @return \Illuminate\Http\RedirectResponse
+     */
+    public function postEditSubmission(Request $request, SubmissionManager $service, $id, $submit = false) {
+        $submission = Submission::where('id', $id)->where('status', 'Draft')->where('user_id', Auth::user()->id)->first();
+        if (!$submission) {
+            abort(404);
+        }
+
+        $request->validate(Submission::$updateRules);
+        if ($submit && $service->editSubmission($submission, $request->only(['url', 'prompt_id', 'comments', 'slug', 'character_rewardable_type', 'character_rewardable_id', 'character_rewardable_quantity', 'rewardable_type', 'rewardable_id', 'quantity', 'stack_id', 'stack_quantity', 'currency_id', 'currency_quantity']), Auth::user(), false, $submit)) {
+            flash('Draft submitted successfully.')->success();
+        } elseif ($service->editSubmission($submission, $request->only(['url', 'prompt_id', 'comments', 'slug', 'character_rewardable_type', 'character_rewardable_id', 'character_rewardable_quantity', 'rewardable_type', 'rewardable_id', 'quantity', 'stack_id', 'stack_quantity', 'currency_id', 'currency_quantity']), Auth::user())) {
+            flash('Draft saved successfully.')->success();
+
             return redirect()->back();
+        } else {
+            foreach ($service->errors()->getMessages()['error'] as $error) {
+                flash($error)->error();
+            }
+
+            return redirect()->back()->withInput();
         }
-        return redirect()->to('submissions');
+
+        return redirect()->to('submissions/view/'.$submission->id);
+    }
+
+    /**
+     * Deletes a submission draft.
+     *
+     * @param App\Services\SubmissionManager $service
+     * @param mixed                          $id
+     *
+     * @return \Illuminate\Http\RedirectResponse
+     */
+    public function postDeleteSubmission(Request $request, SubmissionManager $service, $id) {
+        $submission = Submission::where('id', $id)->where('status', 'Draft')->where('user_id', Auth::user()->id)->first();
+        if (!$submission) {
+            abort(404);
+        }
+
+        if ($service->deleteSubmission($submission, Auth::user())) {
+            flash('Draft deleted successfully.')->success();
+        } else {
+            foreach ($service->errors()->getMessages()['error'] as $error) {
+                flash($error)->error();
+            }
+
+            return redirect()->back();
+        }
+
+        return redirect()->to('submissions?type=draft');
+    }
+
+    /**
+     * Cancels a submission and makes it into a draft again.
+     *
+     * @param App\Services\SubmissionManager $service
+     * @param mixed                          $id
+     *
+     * @return \Illuminate\Http\RedirectResponse
+     */
+    public function postCancelSubmission(Request $request, SubmissionManager $service, $id) {
+        $submission = Submission::where('id', $id)->where('status', 'Pending')->where('user_id', Auth::user()->id)->first();
+        if (!$submission) {
+            abort(404);
+        }
+
+        if ($service->cancelSubmission($submission, Auth::user())) {
+            flash('Submission returned to drafts successfully. If you wish to delete the draft entirely you may do so from the Edit Draft page.')->success();
+        } else {
+            foreach ($service->errors()->getMessages()['error'] as $error) {
+                flash($error)->error();
+            }
+
+            return redirect()->back();
+        }
+
+        return redirect()->to('submissions/draft/'.$submission->id);
     }
 
     /**********************************************************************************************
@@ -169,87 +300,222 @@ public function postNewSubmission(Request $request, SubmissionManager $service)
     /**
      * Shows the user's claim log.
      *
-     * @param  \Illuminate\Http\Request  $request
      * @return \Illuminate\Contracts\Support\Renderable
      */
-    public function getClaimsIndex(Request $request)
-    {
+    public function getClaimsIndex(Request $request) {
         $submissions = Submission::where('user_id', Auth::user()->id)->whereNull('prompt_id');
         $type = $request->get('type');
-        if(!$type) $type = 'Pending';
+        if (!$type) {
+            $type = 'Pending';
+        }
 
         $submissions = $submissions->where('status', ucfirst($type));
 
         return view('home.submissions', [
             'submissions' => $submissions->orderBy('id', 'DESC')->paginate(20)->appends($request->query()),
-            'isClaims' => true
+            'isClaims'    => true,
         ]);
     }
 
     /**
      * Shows the claim page.
      *
-     * @param  int  $id
+     * @param int $id
+     *
      * @return \Illuminate\Contracts\Support\Renderable
      */
-    public function getClaim($id)
-    {
+    public function getClaim($id) {
         $submission = Submission::viewable(Auth::user())->where('id', $id)->whereNull('prompt_id')->first();
         $inventory = isset($submission->data['user']) ? parseAssetData($submission->data['user']) : null;
-        if(!$submission) abort(404);
+        if (!$submission) {
+            abort(404);
+        }
+
         return view('home.submission', [
             'submission' => $submission,
-            'user' => $submission->user,
+            'user'       => $submission->user,
             'categories' => ItemCategory::orderBy('sort', 'DESC')->get(),
-            'itemsrow' => Item::all()->keyBy('id'),
-            'inventory' => $inventory
+            'itemsrow'   => Item::all()->keyBy('id'),
+            'inventory'  => $inventory,
+            'isClaim'    => true,
         ]);
     }
 
     /**
      * Shows the submit claim page.
      *
-     * @param  \Illuminate\Http\Request  $request
      * @return \Illuminate\Contracts\Support\Renderable
      */
-    public function getNewClaim(Request $request)
-    {
+    public function getNewClaim(Request $request) {
         $closed = !Settings::get('is_claims_open');
         $inventory = UserItem::with('item')->whereNull('deleted_at')->where('count', '>', '0')->where('user_id', Auth::user()->id)->get();
+
         return view('home.create_submission', [
-            'closed' => $closed,
+            'closed'  => $closed,
             'isClaim' => true,
         ] + ($closed ? [] : [
-            'submission' => new Submission,
+            'submission'          => new Submission,
             'characterCurrencies' => Currency::where('is_character_owned', 1)->orderBy('sort_character', 'DESC')->pluck('name', 'id'),
-            'categories' => ItemCategory::orderBy('sort', 'DESC')->get(),
-            'inventory' => $inventory,
-            'item_filter' => Item::orderBy('name')->released()->get()->keyBy('id'),
-            'items' => Item::orderBy('name')->released()->pluck('name', 'id'),
-            'currencies' => Currency::where('is_user_owned', 1)->orderBy('name')->pluck('name', 'id'),
-            'raffles' => Raffle::where('rolled_at', null)->where('is_active', 1)->orderBy('name')->pluck('name', 'id'),
-            'page' => 'submission',
-            'expanded_rewards' => Config::get('lorekeeper.extensions.character_reward_expansion.expanded')
+            'categories'          => ItemCategory::visible(Auth::check() ? Auth::user() : null)->orderBy('sort', 'DESC')->get(),
+            'inventory'           => $inventory,
+            'item_filter'         => Item::orderBy('name')->released()->get()->keyBy('id'),
+            'items'               => Item::orderBy('name')->released()->pluck('name', 'id'),
+            'currencies'          => Currency::where('is_user_owned', 1)->orderBy('name')->pluck('name', 'id'),
+            'raffles'             => Raffle::where('rolled_at', null)->where('is_active', 1)->orderBy('name')->pluck('name', 'id'),
+            'page'                => 'submission',
+            'expanded_rewards'    => config('lorekeeper.extensions.character_reward_expansion.expanded'),
+        ]));
+    }
+
+    /**
+     * Shows the edit submission page.
+     *
+     * @param mixed $id
+     *
+     * @return \Illuminate\Contracts\Support\Renderable
+     */
+    public function getEditClaim(Request $request, $id) {
+        $closed = !Settings::get('is_claims_open');
+        $inventory = UserItem::with('item')->whereNull('deleted_at')->where('count', '>', '0')->where('user_id', Auth::user()->id)->get();
+        $submission = Submission::where('id', $id)->where('status', 'Draft')->where('user_id', Auth::user()->id)->first();
+        if (!$submission) {
+            abort(404);
+        }
+
+        return view('home.edit_submission', [
+            'closed'                => $closed,
+            'isClaim'               => true,
+        ] + ($closed ? [] : [
+            'submission'            => $submission,
+            'characterCurrencies'   => Currency::where('is_character_owned', 1)->orderBy('sort_character', 'DESC')->pluck('name', 'id'),
+            'character_items'       => Item::whereIn('item_category_id', ItemCategory::where('is_character_owned', 1)->pluck('id')->toArray())->orderBy('name')->released()->pluck('name', 'id'),
+            'categories'            => ItemCategory::orderBy('sort', 'DESC')->get(),
+            'currencies'            => Currency::where('is_user_owned', 1)->orderBy('name')->pluck('name', 'id'),
+            'item_filter'           => Item::orderBy('name')->released()->get()->keyBy('id'),
+            'items'                 => Item::orderBy('name')->released()->pluck('name', 'id'),
+            'inventory'             => $inventory,
+            'raffles'               => Raffle::where('rolled_at', null)->where('is_active', 1)->orderBy('name')->pluck('name', 'id'),
+            'page'                  => 'submission',
+            'expanded_rewards'      => config('lorekeeper.extensions.character_reward_expansion.expanded'),
+            'selectedInventory'     => isset($submission->data['user']) ? parseAssetData($submission->data['user']) : null,
         ]));
     }
 
     /**
      * Creates a new claim.
      *
-     * @param  \Illuminate\Http\Request        $request
-     * @param  App\Services\SubmissionManager  $service
+     * @param App\Services\SubmissionManager $service
+     * @param mixed                          $draft
+     *
+     * @return \Illuminate\Http\RedirectResponse
+     */
+    public function postNewClaim(Request $request, SubmissionManager $service, $draft = false) {
+        $request->validate(Submission::$createRules);
+        if ($submission = $service->createSubmission($request->only(['url', 'comments', 'stack_id', 'stack_quantity', 'slug', 'character_rewardable_type', 'character_rewardable_id', 'character_rewardable_quantity', 'rewardable_type', 'rewardable_id', 'quantity', 'currency_id', 'currency_quantity']), Auth::user(), true, $draft)) {
+            if ($submission->status == 'Draft') {
+                flash('Draft created successfully.')->success();
+
+                return redirect()->to('claims/draft/'.$submission->id);
+            } else {
+                flash('Claim submitted successfully.')->success();
+
+                return redirect()->to('claims/view/'.$submission->id);
+            }
+        } else {
+            foreach ($service->errors()->getMessages()['error'] as $error) {
+                flash($error)->error();
+            }
+
+            return redirect()->back()->withInput();
+        }
+
+        return redirect()->to('claims');
+    }
+
+    /**
+     * Edits a claim draft.
+     *
+     * @param App\Services\SubmissionManager $service
+     * @param mixed                          $id
+     * @param mixed                          $submit
+     *
      * @return \Illuminate\Http\RedirectResponse
      */
-    public function postNewClaim(Request $request, SubmissionManager $service)
-    {
+    public function postEditClaim(Request $request, SubmissionManager $service, $id, $submit = false) {
+        $submission = Submission::where('id', $id)->where('status', 'Draft')->where('user_id', Auth::user()->id)->first();
+        if (!$submission) {
+            abort(404);
+        }
+
         $request->validate(Submission::$createRules);
-        if($service->createSubmission($request->only(['url', 'comments', 'stack_id', 'stack_quantity', 'slug', 'character_rewardable_type', 'character_rewardable_id', 'character_rewardable_quantity', 'rewardable_type','rewardable_id', 'quantity', 'currency_id', 'currency_quantity']), Auth::user(), true)) {
-            flash('Claim submitted successfully.')->success();
+        if ($submit && $service->editSubmission($submission, $request->only(['url', 'comments', 'stack_id', 'stack_quantity', 'slug', 'character_rewardable_type', 'character_rewardable_id', 'character_rewardable_quantity', 'rewardable_type', 'rewardable_id', 'quantity', 'currency_id', 'currency_quantity']), Auth::user(), true, $submit)) {
+            flash('Draft submitted successfully.')->success();
+
+            return redirect()->to('claims/draft/'.$submission->id);
+        } elseif ($service->editSubmission($submission, $request->only(['url', 'comments', 'slug', 'character_rewardable_type', 'character_rewardable_id', 'character_rewardable_quantity', 'rewardable_type', 'rewardable_id', 'quantity', 'stack_id', 'stack_quantity', 'currency_id', 'currency_quantity']), Auth::user(), true)) {
+            flash('Draft saved successfully.')->success();
+        } else {
+            foreach ($service->errors()->getMessages()['error'] as $error) {
+                flash($error)->error();
+            }
+
+            return redirect()->back()->withInput();
         }
-        else {
-            foreach($service->errors()->getMessages()['error'] as $error) flash($error)->error();
+
+        return redirect()->to('claims?type=draft');
+    }
+
+    /**
+     * Deletes a claim draft.
+     *
+     * @param App\Services\SubmissionManager $service
+     * @param mixed                          $id
+     *
+     * @return \Illuminate\Http\RedirectResponse
+     */
+    public function postDeleteClaim(Request $request, SubmissionManager $service, $id) {
+        $submission = Submission::where('id', $id)->where('status', 'Draft')->where('user_id', Auth::user()->id)->first();
+        if (!$submission) {
+            abort(404);
+        }
+
+        if ($service->deleteSubmission($submission, Auth::user())) {
+            flash('Draft deleted successfully.')->success();
+        } else {
+            foreach ($service->errors()->getMessages()['error'] as $error) {
+                flash($error)->error();
+            }
+
             return redirect()->back();
         }
-        return redirect()->to('claims');
+
+        return redirect()->to('claims?type=draft');
+    }
+
+    /**
+     * Cancels a claim and makes it into a draft again.
+     *
+     * @param App\Services\SubmissionManager $service
+     * @param mixed                          $id
+     *
+     * @return \Illuminate\Http\RedirectResponse
+     */
+    public function postCancelClaim(Request $request, SubmissionManager $service, $id) {
+        $submission = Submission::where('id', $id)->where('status', 'Pending')->where('user_id', Auth::user()->id)->first();
+        if (!$submission) {
+            abort(404);
+        }
+
+        if ($service->cancelSubmission($submission, Auth::user())) {
+            flash('Claim returned to drafts successfully. You may wish to delete the draft completely, you may do that from the Edit Draft page below.')->success();
+        } else {
+            foreach ($service->errors()->getMessages()['error'] as $error) {
+                flash($error)->error();
+            }
+
+            return redirect()->back();
+        }
+
+        return redirect()->to('claims/draft/'.$submission->id);
     }
 }
diff --git a/app/Http/Controllers/Users/TradeController.php b/app/Http/Controllers/Users/TradeController.php
index 87c847eaaa..afc9020993 100644
--- a/app/Http/Controllers/Users/TradeController.php
+++ b/app/Http/Controllers/Users/TradeController.php
@@ -2,23 +2,18 @@
 
 namespace App\Http\Controllers\Users;
 
-use Auth;
-
-use Illuminate\Http\Request;
 use App\Http\Controllers\Controller;
-
-use App\Models\Trade;
-use App\Models\Item\ItemCategory;
+use App\Models\Character\CharacterCategory;
 use App\Models\Item\Item;
+use App\Models\Item\ItemCategory;
+use App\Models\Trade;
 use App\Models\User\User;
 use App\Models\User\UserItem;
-use App\Models\Currency\Currency;
-use App\Models\Character\CharacterCategory;
-
 use App\Services\TradeManager;
+use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Auth;
 
-class TradeController extends Controller
-{
+class TradeController extends Controller {
     /*
     |--------------------------------------------------------------------------
     | Trade Controller
@@ -31,26 +26,26 @@ class TradeController extends Controller
     /**
      * Shows the user's trades.
      *
-     * @param  string  $type
+     * @param mixed $status
+     *
      * @return \Illuminate\Contracts\Support\Renderable
      */
-    public function getIndex($status = 'open')
-    {
+    public function getIndex($status = 'open') {
         $user = Auth::user();
-        $trades = Trade::with('recipient')->with('sender')->with('staff')->where(function($query) {
+        $trades = Trade::with('recipient')->with('sender')->with('staff')->where(function ($query) {
             $query->where('recipient_id', Auth::user()->id)->orWhere('sender_id', Auth::user()->id);
         })->where('status', ucfirst($status))->orderBy('id', 'DESC');
 
-        $stacks = array();
-        foreach($trades->get() as $trade) {
-            foreach($trade->data as $side=>$assets) {
-                if(isset($assets['user_items'])) {
+        $stacks = [];
+        foreach ($trades->get() as $trade) {
+            foreach ($trade->data as $side=> $assets) {
+                if (isset($assets['user_items'])) {
                     $user_items = UserItem::with('item')->find(array_keys($assets['user_items']));
-                    $items = array();
-                    foreach($assets['user_items'] as $id=>$quantity) {
+                    $items = [];
+                    foreach ($assets['user_items'] as $id=> $quantity) {
                         $user_item = $user_items->find($id);
                         $user_item['quantity'] = $quantity;
-                        array_push($items,$user_item);
+                        array_push($items, $user_item);
                     }
                     $items = collect($items)->groupBy('item_id');
                     $stacks[$trade->id][$side] = $items;
@@ -60,235 +55,252 @@ public function getIndex($status = 'open')
 
         return view('home.trades.index', [
             'trades' => $trades->paginate(20),
-            'stacks' => $stacks
+            'stacks' => $stacks,
         ]);
     }
 
     /**
      * Shows a trade.
      *
-     * @param  integer  $id
+     * @param int $id
+     *
      * @return \Illuminate\Contracts\Support\Renderable
      */
-    public function getTrade($id)
-    {
+    public function getTrade($id) {
         $trade = Trade::find($id);
-        
-        if($trade->status != 'Completed' && !Auth::user()->hasPower('manage_characters') && !($trade->sender_id == Auth::user()->id || $trade->recipient_id == Auth::user()->id))   $trade = null;
 
-        if(!$trade) abort(404);
+        if ($trade->status != 'Completed' && !Auth::user()->hasPower('manage_characters') && !($trade->sender_id == Auth::user()->id || $trade->recipient_id == Auth::user()->id)) {
+            $trade = null;
+        }
+
+        if (!$trade) {
+            abort(404);
+        }
+
         return view('home.trades.trade', [
-            'trade' => $trade,
-            'partner' => (Auth::user()->id == $trade->sender_id) ? $trade->recipient : $trade->sender,
-            'senderData' => isset($trade->data['sender']) ? parseAssetData($trade->data['sender']) : null,
+            'trade'         => $trade,
+            'partner'       => (Auth::user()->id == $trade->sender_id) ? $trade->recipient : $trade->sender,
+            'senderData'    => isset($trade->data['sender']) ? parseAssetData($trade->data['sender']) : null,
             'recipientData' => isset($trade->data['recipient']) ? parseAssetData($trade->data['recipient']) : null,
-            'items' => Item::all()->keyBy('id')
+            'items'         => Item::all()->keyBy('id'),
         ]);
     }
 
     /**
      * Shows the trade creation page.
      *
-     * @param  integer  $id
      * @return \Illuminate\Contracts\Support\Renderable
      */
-    public function getCreateTrade()
-    {
+    public function getCreateTrade() {
         $inventory = UserItem::with('item')->whereNull('deleted_at')->where('count', '>', '0')->where('user_id', Auth::user()->id)
-        ->get()
-        ->filter(function($userItem){
-            return $userItem->isTransferrable == true;
-        })
-        ->sortBy('item.name');;
+            ->get()
+            ->filter(function ($userItem) {
+                return $userItem->isTransferrable == true;
+            })
+            ->sortBy('item.name');
+
         return view('home.trades.create_trade', [
-            'categories' => ItemCategory::orderBy('sort', 'DESC')->get(),
-            'item_filter' => Item::orderBy('name')->get()->keyBy('id'),
-            'inventory' => $inventory,
-            'userOptions' => User::visible()->where('id', '!=', Auth::user()->id)->orderBy('name')->pluck('name', 'id')->toArray(),
-            'characters' => Auth::user()->allCharacters()->visible()->tradable()->with('designUpdate')->get(),
-            'characterCategories' => CharacterCategory::orderBy('sort', 'DESC')->get(),
-            'page' => 'trade'
+            'categories'          => ItemCategory::visible(Auth::check() ? Auth::user() : null)->orderBy('sort', 'DESC')->get(),
+            'item_filter'         => Item::orderBy('name')->get()->keyBy('id'),
+            'inventory'           => $inventory,
+            'userOptions'         => User::visible()->where('id', '!=', Auth::user()->id)->orderBy('name')->pluck('name', 'id')->toArray(),
+            'characters'          => Auth::user()->allCharacters()->visible()->tradable()->with('designUpdate')->get(),
+            'characterCategories' => CharacterCategory::visible(Auth::check() ? Auth::user() : null)->orderBy('sort', 'DESC')->get(),
+            'page'                => 'trade',
         ]);
     }
 
     /**
      * Shows the trade edit page.
      *
-     * @param  integer  $id
+     * @param int $id
+     *
      * @return \Illuminate\Contracts\Support\Renderable
      */
-    public function getEditTrade($id)
-    {
-        $trade = Trade::where('id', $id)->where(function($query) {
+    public function getEditTrade($id) {
+        $trade = Trade::where('id', $id)->where(function ($query) {
             $query->where('recipient_id', Auth::user()->id)->orWhere('sender_id', Auth::user()->id);
         })->where('status', 'Open')->first();
 
-        if($trade)
+        if ($trade) {
             $inventory = UserItem::with('item')->whereNull('deleted_at')->where('count', '>', '0')->where('user_id', Auth::user()->id)
-            ->get()
-            ->filter(function($userItem){
-                return $userItem->isTransferrable == true;
-            })
-            ->sortBy('item.name');
-        else $trade = null;
+                ->get()
+                ->filter(function ($userItem) {
+                    return $userItem->isTransferrable == true;
+                })
+                ->sortBy('item.name');
+        } else {
+            $trade = null;
+        }
+
         return view('home.trades.edit_trade', [
-            'trade' => $trade,
-            'partner' => (Auth::user()->id == $trade->sender_id) ? $trade->recipient : $trade->sender,
-            'categories' => ItemCategory::orderBy('sort', 'DESC')->get(),
-            'item_filter' => Item::orderBy('name')->get()->keyBy('id'),
-            'inventory' => $inventory,
-            'userOptions' => User::visible()->orderBy('name')->pluck('name', 'id')->toArray(),
-            'characters' => Auth::user()->allCharacters()->visible()->with('designUpdate')->get(),
-            'characterCategories' => CharacterCategory::orderBy('sort', 'DESC')->get(),
-            'page' => 'trade'
+            'trade'               => $trade,
+            'partner'             => (Auth::user()->id == $trade->sender_id) ? $trade->recipient : $trade->sender,
+            'categories'          => ItemCategory::visible(Auth::check() ? Auth::user() : null)->orderBy('sort', 'DESC')->get(),
+            'item_filter'         => Item::orderBy('name')->get()->keyBy('id'),
+            'inventory'           => $inventory,
+            'userOptions'         => User::visible()->orderBy('name')->pluck('name', 'id')->toArray(),
+            'characters'          => Auth::user()->allCharacters()->visible()->with('designUpdate')->get(),
+            'characterCategories' => CharacterCategory::visible(Auth::check() ? Auth::user() : null)->orderBy('sort', 'DESC')->get(),
+            'page'                => 'trade',
         ]);
     }
-    
+
     /**
      * Creates a new trade.
      *
-     * @param  \Illuminate\Http\Request   $request
-     * @param  App\Services\TradeManager  $service
+     * @param App\Services\TradeManager $service
+     *
      * @return \Illuminate\Http\RedirectResponse
      */
-    public function postCreateTrade(Request $request, TradeManager $service)
-    {
-        if($trade = $service->createTrade($request->only(['recipient_id', 'comments', 'stack_id', 'stack_quantity', 'currency_id', 'currency_quantity', 'character_id']), Auth::user())) {
+    public function postCreateTrade(Request $request, TradeManager $service) {
+        if ($trade = $service->createTrade($request->only(['recipient_id', 'comments', 'stack_id', 'stack_quantity', 'currency_id', 'currency_quantity', 'character_id']), Auth::user())) {
             flash('Trade created successfully.')->success();
+
             return redirect()->to($trade->url);
+        } else {
+            foreach ($service->errors()->getMessages()['error'] as $error) {
+                flash($error)->error();
+            }
         }
-        else {
-            foreach($service->errors()->getMessages()['error'] as $error) flash($error)->error();
-        }
+
         return redirect()->back();
     }
-    
+
     /**
      * Edits a trade.
      *
-     * @param  \Illuminate\Http\Request   $request
-     * @param  App\Services\TradeManager  $service
-     * @param  integer  $id
+     * @param App\Services\TradeManager $service
+     * @param int                       $id
+     *
      * @return \Illuminate\Http\RedirectResponse
      */
-    public function postEditTrade(Request $request, TradeManager $service, $id)
-    {
-        if($trade = $service->editTrade($request->only(['comments', 'stack_id', 'stack_quantity', 'currency_id', 'currency_quantity', 'character_id']) + ['id' => $id], Auth::user())) {
+    public function postEditTrade(Request $request, TradeManager $service, $id) {
+        if ($trade = $service->editTrade($request->only(['comments', 'stack_id', 'stack_quantity', 'currency_id', 'currency_quantity', 'character_id']) + ['id' => $id], Auth::user())) {
             flash('Trade offer edited successfully.')->success();
+        } else {
+            foreach ($service->errors()->getMessages()['error'] as $error) {
+                flash($error)->error();
+            }
         }
-        else {
-            foreach($service->errors()->getMessages()['error'] as $error) flash($error)->error();
-        }
+
         return redirect()->back();
     }
 
     /**
      * Shows the offer confirmation modal.
      *
-     * @param  integer  $id
+     * @param int $id
+     *
      * @return \Illuminate\Contracts\Support\Renderable
      */
-    public function getConfirmOffer($id)
-    {
-        $trade = Trade::where('id', $id)->where(function($query) {
+    public function getConfirmOffer($id) {
+        $trade = Trade::where('id', $id)->where(function ($query) {
             $query->where('recipient_id', Auth::user()->id)->orWhere('sender_id', Auth::user()->id);
         })->where('status', 'Open')->first();
-        
+
         return view('home.trades._confirm_offer_modal', [
-            'trade' => $trade
+            'trade' => $trade,
         ]);
     }
-    
+
     /**
      * Confirms or unconfirms an offer.
      *
-     * @param  \Illuminate\Http\Request   $request
-     * @param  App\Services\TradeManager  $service
+     * @param App\Services\TradeManager $service
+     * @param mixed                     $id
+     *
      * @return \Illuminate\Http\RedirectResponse
      */
-    public function postConfirmOffer(Request $request, TradeManager $service, $id)
-    {
-        if($trade = $service->confirmOffer(['id' => $id], Auth::user())) {
+    public function postConfirmOffer(Request $request, TradeManager $service, $id) {
+        if ($trade = $service->confirmOffer(['id' => $id], Auth::user())) {
             flash('Trade offer confirmation edited successfully.')->success();
+
             return redirect()->back();
+        } else {
+            foreach ($service->errors()->getMessages()['error'] as $error) {
+                flash($error)->error();
+            }
         }
-        else {
-            foreach($service->errors()->getMessages()['error'] as $error) flash($error)->error();
-        }
+
         return redirect()->back();
     }
 
     /**
      * Shows the trade confirmation modal.
      *
-     * @param  integer  $id
+     * @param int $id
+     *
      * @return \Illuminate\Contracts\Support\Renderable
      */
-    public function getConfirmTrade($id)
-    {
-        $trade = Trade::where('id', $id)->where(function($query) {
+    public function getConfirmTrade($id) {
+        $trade = Trade::where('id', $id)->where(function ($query) {
             $query->where('recipient_id', Auth::user()->id)->orWhere('sender_id', Auth::user()->id);
         })->where('status', 'Open')->first();
-        
+
         return view('home.trades._confirm_trade_modal', [
-            'trade' => $trade
+            'trade' => $trade,
         ]);
     }
-    
+
     /**
      * Confirms or unconfirms a trade.
      *
-     * @param  \Illuminate\Http\Request   $request
-     * @param  App\Services\TradeManager  $service
+     * @param App\Services\TradeManager $service
+     * @param mixed                     $id
+     *
      * @return \Illuminate\Http\RedirectResponse
      */
-    public function postConfirmTrade(Request $request, TradeManager $service, $id)
-    {
-        if($trade = $service->confirmTrade(['id' => $id], Auth::user())) {
+    public function postConfirmTrade(Request $request, TradeManager $service, $id) {
+        if ($trade = $service->confirmTrade(['id' => $id], Auth::user())) {
             flash('Trade confirmed successfully.')->success();
+
             return redirect()->back();
+        } else {
+            foreach ($service->errors()->getMessages()['error'] as $error) {
+                flash($error)->error();
+            }
         }
-        else {
-            foreach($service->errors()->getMessages()['error'] as $error) flash($error)->error();
-        }
+
         return redirect()->back();
     }
 
     /**
      * Shows the trade cancellation modal.
      *
-     * @param  integer  $id
+     * @param int $id
+     *
      * @return \Illuminate\Contracts\Support\Renderable
      */
-    public function getCancelTrade($id)
-    {
-        $trade = Trade::where('id', $id)->where(function($query) {
+    public function getCancelTrade($id) {
+        $trade = Trade::where('id', $id)->where(function ($query) {
             $query->where('recipient_id', Auth::user()->id)->orWhere('sender_id', Auth::user()->id);
         })->where('status', 'Open')->first();
-        
+
         return view('home.trades._cancel_trade_modal', [
-            'trade' => $trade
+            'trade' => $trade,
         ]);
     }
-    
+
     /**
      * Cancels a trade.
      *
-     * @param  \Illuminate\Http\Request   $request
-     * @param  App\Services\TradeManager  $service
+     * @param App\Services\TradeManager $service
+     * @param mixed                     $id
+     *
      * @return \Illuminate\Http\RedirectResponse
      */
-    public function postCancelTrade(Request $request, TradeManager $service, $id)
-    {
-        if($trade = $service->cancelTrade(['id' => $id], Auth::user())) {
+    public function postCancelTrade(Request $request, TradeManager $service, $id) {
+        if ($trade = $service->cancelTrade(['id' => $id], Auth::user())) {
             flash('Trade canceled successfully.')->success();
+
             return redirect()->back();
+        } else {
+            foreach ($service->errors()->getMessages()['error'] as $error) {
+                flash($error)->error();
+            }
         }
-        else {
-            foreach($service->errors()->getMessages()['error'] as $error) flash($error)->error();
-        }
+
         return redirect()->back();
     }
 }
-
-
diff --git a/app/Http/Controllers/Users/UserController.php b/app/Http/Controllers/Users/UserController.php
index 2293b96382..4077f7c17f 100644
--- a/app/Http/Controllers/Users/UserController.php
+++ b/app/Http/Controllers/Users/UserController.php
@@ -2,35 +2,25 @@
 
 namespace App\Http\Controllers\Users;
 
-use Illuminate\Http\Request;
-
-use DB;
-use Auth;
-use Route;
-use App\Models\User\User;
-
-use App\Models\User\UserCurrency;
+use App\Http\Controllers\Controller;
+use App\Models\Character\Character;
+use App\Models\Character\CharacterImage;
+use App\Models\Character\Sublist;
 use App\Models\Currency\Currency;
-use App\Models\Currency\CurrencyLog;
 use App\Models\Gallery\Gallery;
+use App\Models\Gallery\GalleryCharacter;
 use App\Models\Gallery\GallerySubmission;
-
-use App\Models\User\UserItem;
 use App\Models\Item\Item;
 use App\Models\Item\ItemCategory;
-use App\Models\Gallery\GalleryFavorite;
-use App\Models\Gallery\GalleryCharacter;
-use App\Models\Item\ItemLog;
-
-use App\Models\Character\CharacterCategory;
-use App\Models\Character\CharacterImage;
-use App\Models\Character\Character;
-use App\Models\Character\Sublist;
-
-use App\Http\Controllers\Controller;
+use App\Models\User\User;
+use App\Models\User\UserCurrency;
+use App\Models\User\UserUpdateLog;
+use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Auth;
+use Illuminate\Support\Facades\View;
+use Route;
 
-class UserController extends Controller
-{
+class UserController extends Controller {
     /*
     |--------------------------------------------------------------------------
     | User Controller
@@ -42,14 +32,20 @@ class UserController extends Controller
 
     /**
      * Create a new controller instance.
-     *
-     * @return void
      */
-    public function __construct()
-    {
+    public function __construct() {
+        parent::__construct();
         $name = Route::current()->parameter('name');
         $this->user = User::where('name', $name)->first();
-        if(!$this->user) abort(404);
+        // check previous usernames (only grab the latest change)
+        if (!$this->user) {
+            $this->user = UserUpdateLog::whereIn('type', ['Username Changed', 'Name/Rank Change'])->where('data', 'like', '%"old_name":"'.$name.'"%')->orderBy('id', 'DESC')->first()->user ?? null;
+        }
+        if (!$this->user) {
+            abort(404);
+        }
+
+        View::share('sublists', Sublist::orderBy('sort', 'DESC')->get());
 
         $this->user->updateCharacters();
         $this->user->updateArtDesignCredits();
@@ -58,35 +54,45 @@ public function __construct()
     /**
      * Shows a user's profile.
      *
-     * @param  string  $name
+     * @param string $name
+     *
      * @return \Illuminate\Contracts\Support\Renderable
      */
-    public function getUser($name)
-    {
+    public function getUser($name) {
         $characters = $this->user->characters();
-        if(!Auth::check() || !(Auth::check() && Auth::user()->hasPower('manage_characters'))) $characters->visible();
-        
+        if (!Auth::check() || !(Auth::check() && Auth::user()->hasPower('manage_characters'))) {
+            $characters->visible();
+        }
+
+        $aliases = $this->user->aliases();
+        if (!Auth::check() || !(Auth::check() && Auth::user()->hasPower('edit_user_info'))) {
+            $aliases->visible();
+        }
+
         return view('user.profile', [
-            'user' => $this->user,
-            'items' => $this->user->items()->where('count', '>', 0)->orderBy('user_items.updated_at', 'DESC')->take(4)->get(),
-            'sublists' => Sublist::orderBy('sort', 'DESC')->get(),
+            'user'       => $this->user,
+            'name'       => $name,
+            'items'      => $this->user->items()->where('count', '>', 0)->orderBy('user_items.updated_at', 'DESC')->take(4)->get(),
             'characters' => $characters,
+            'aliases'    => $aliases->orderBy('is_primary_alias', 'DESC')->orderBy('site')->get(),
         ]);
     }
 
     /**
      * Shows a user's aliases.
      *
-     * @param  string  $name
+     * @param string $name
+     *
      * @return \Illuminate\Contracts\Support\Renderable
      */
-    public function getUserAliases($name)
-    {
+    public function getUserAliases($name) {
         $aliases = $this->user->aliases();
-        if(!Auth::check() || !(Auth::check() && Auth::user()->hasPower('edit_user_info'))) $aliases->visible();
-        
+        if (!Auth::check() || !(Auth::check() && Auth::user()->hasPower('edit_user_info'))) {
+            $aliases->visible();
+        }
+
         return view('user.aliases', [
-            'user' => $this->user,
+            'user'    => $this->user,
             'aliases' => $aliases->orderBy('is_primary_alias', 'DESC')->orderBy('site')->get(),
         ]);
     }
@@ -94,21 +100,21 @@ public function getUserAliases($name)
     /**
      * Shows a user's characters.
      *
-     * @param  string  $name
+     * @param string $name
+     *
      * @return \Illuminate\Contracts\Support\Renderable
      */
-    public function getUserCharacters($name)
-    {
+    public function getUserCharacters($name) {
         $query = Character::myo(0)->where('user_id', $this->user->id);
         $imageQuery = CharacterImage::images(Auth::check() ? Auth::user() : null)->with('features')->with('rarity')->with('species')->with('features');
 
-        if($sublists = Sublist::where('show_main', 0)->get())
-        $subCategories = []; $subSpecies = [];
-        {   foreach($sublists as $sublist)
-            {
-                $subCategories = array_merge($subCategories, $sublist->categories->pluck('id')->toArray());
-                $subSpecies = array_merge($subSpecies, $sublist->species->pluck('id')->toArray());
-            }
+        if ($sublists = Sublist::where('show_main', 0)->get()) {
+            $subCategories = [];
+        }
+        $subSpecies = [];
+        foreach ($sublists as $sublist) {
+            $subCategories = array_merge($subCategories, $sublist->categories->pluck('id')->toArray());
+            $subSpecies = array_merge($subSpecies, $sublist->species->pluck('id')->toArray());
         }
 
         $query->whereNotIn('character_category_id', $subCategories);
@@ -116,73 +122,83 @@ public function getUserCharacters($name)
 
         $query->whereIn('id', $imageQuery->pluck('character_id'));
 
-        if(!Auth::check() || !(Auth::check() && Auth::user()->hasPower('manage_characters'))) $query->visible();
+        if (!Auth::check() || !(Auth::check() && Auth::user()->hasPower('manage_characters'))) {
+            $query->visible();
+        }
 
         return view('user.characters', [
-            'user' => $this->user,
+            'user'       => $this->user,
             'characters' => $query->orderBy('sort', 'DESC')->get(),
-            'sublists' => Sublist::orderBy('sort', 'DESC')->get()
         ]);
     }
 
     /**
      * Shows a user's sublist characters.
      *
-     * @param  string  $name
+     * @param string $name
+     * @param mixed  $key
+     *
      * @return \Illuminate\Contracts\Support\Renderable
      */
-    public function getUserSublist($name, $key)
-    {
+    public function getUserSublist($name, $key) {
         $query = Character::myo(0)->where('user_id', $this->user->id);
         $imageQuery = CharacterImage::images(Auth::check() ? Auth::user() : null)->with('features')->with('rarity')->with('species')->with('features');
 
         $sublist = Sublist::where('key', $key)->first();
-        if(!$sublist) abort(404);
+        if (!$sublist) {
+            abort(404);
+        }
         $subCategories = $sublist->categories->pluck('id')->toArray();
         $subSpecies = $sublist->species->pluck('id')->toArray();
 
-        if($subCategories) $query->whereIn('character_category_id', $subCategories);
-        if($subSpecies) $imageQuery->whereIn('species_id', $subSpecies);
+        if ($subCategories) {
+            $query->whereIn('character_category_id', $subCategories);
+        }
+        if ($subSpecies) {
+            $imageQuery->whereIn('species_id', $subSpecies);
+        }
 
         $query->whereIn('id', $imageQuery->pluck('character_id'));
 
-        if(!Auth::check() || !(Auth::check() && Auth::user()->hasPower('manage_characters'))) $query->visible();
+        if (!Auth::check() || !(Auth::check() && Auth::user()->hasPower('manage_characters'))) {
+            $query->visible();
+        }
 
         return view('user.sublist', [
-            'user' => $this->user,
+            'user'       => $this->user,
             'characters' => $query->orderBy('sort', 'DESC')->get(),
-            'sublist' => $sublist,
-            'sublists' => Sublist::orderBy('sort', 'DESC')->get()
+            'sublist'    => $sublist,
         ]);
     }
 
     /**
      * Shows a user's MYO slots.
      *
-     * @param  string  $name
+     * @param string $name
+     *
      * @return \Illuminate\Contracts\Support\Renderable
      */
-    public function getUserMyoSlots($name)
-    {
+    public function getUserMyoSlots($name) {
         $myo = $this->user->myoSlots();
-        if(!Auth::check() || !(Auth::check() && Auth::user()->hasPower('manage_characters'))) $myo->visible();
+        if (!Auth::check() || !(Auth::check() && Auth::user()->hasPower('manage_characters'))) {
+            $myo->visible();
+        }
 
         return view('user.myo_slots', [
             'user' => $this->user,
             'myos' => $myo->get(),
-            'sublists' => Sublist::orderBy('sort', 'DESC')->get()
         ]);
     }
 
     /**
      * Shows a user's inventory.
      *
-     * @param  string  $name
+     * @param string $name
+     *
      * @return \Illuminate\Contracts\Support\Renderable
      */
-    public function getUserInventory($name)
-    {
-        $categories = ItemCategory::orderBy('sort', 'DESC')->get();
+    public function getUserInventory($name) {
+        $categories = ItemCategory::visible(Auth::check() ? Auth::user() : null)->orderBy('sort', 'DESC')->get();
         $items = count($categories) ?
             $this->user->items()
                 ->where('count', '>', 0)
@@ -197,146 +213,141 @@ public function getUserInventory($name)
                 ->orderBy('updated_at')
                 ->get()
                 ->groupBy(['item_category_id', 'id']);
+
         return view('user.inventory', [
-            'user' => $this->user,
-            'categories' => $categories->keyBy('id'),
-            'items' => $items,
+            'user'        => $this->user,
+            'categories'  => $categories->keyBy('id'),
+            'items'       => $items,
             'userOptions' => User::where('id', '!=', $this->user->id)->orderBy('name')->pluck('name', 'id')->toArray(),
-            'user' => $this->user,
-            'logs' => $this->user->getItemLogs(),
-            'sublists' => Sublist::orderBy('sort', 'DESC')->get()
+            'user'        => $this->user,
+            'logs'        => $this->user->getItemLogs(),
         ]);
     }
 
     /**
-     * Shows a user's profile.
+     * Shows a user's Bank.
+     *
+     * @param string $name
      *
-     * @param  string  $name
      * @return \Illuminate\Contracts\Support\Renderable
      */
-    public function getUserBank($name)
-    {
+    public function getUserBank($name) {
         $user = $this->user;
+
         return view('user.bank', [
             'user' => $this->user,
             'logs' => $this->user->getCurrencyLogs(),
-            'sublists' => Sublist::orderBy('sort', 'DESC')->get()
         ] + (Auth::check() && Auth::user()->id == $this->user->id ? [
             'currencyOptions' => Currency::where('allow_user_to_user', 1)->where('is_user_owned', 1)->whereIn('id', UserCurrency::where('user_id', $this->user->id)->pluck('currency_id')->toArray())->orderBy('sort_user', 'DESC')->pluck('name', 'id')->toArray(),
-            'userOptions' => User::where('id', '!=', Auth::user()->id)->orderBy('name')->pluck('name', 'id')->toArray()
+            'userOptions'     => User::where('id', '!=', Auth::user()->id)->orderBy('name')->pluck('name', 'id')->toArray(),
         ] : []));
     }
 
     /**
      * Shows a user's currency logs.
      *
-     * @param  string  $name
+     * @param string $name
+     *
      * @return \Illuminate\Contracts\Support\Renderable
      */
-    public function getUserCurrencyLogs($name)
-    {
+    public function getUserCurrencyLogs($name) {
         $user = $this->user;
+
         return view('user.currency_logs', [
             'user' => $this->user,
             'logs' => $this->user->getCurrencyLogs(0),
-            'sublists' => Sublist::orderBy('sort', 'DESC')->get()
         ]);
     }
 
     /**
      * Shows a user's item logs.
      *
-     * @param  string  $name
+     * @param string $name
+     *
      * @return \Illuminate\Contracts\Support\Renderable
      */
-    public function getUserItemLogs($name)
-    {
+    public function getUserItemLogs($name) {
         $user = $this->user;
+
         return view('user.item_logs', [
             'user' => $this->user,
             'logs' => $this->user->getItemLogs(0),
-            'sublists' => Sublist::orderBy('sort', 'DESC')->get()
         ]);
     }
 
     /**
      * Shows a user's character ownership logs.
      *
-     * @param  string  $name
+     * @param string $name
+     *
      * @return \Illuminate\Contracts\Support\Renderable
      */
-    public function getUserOwnershipLogs($name)
-    {
+    public function getUserOwnershipLogs($name) {
         return view('user.ownership_logs', [
             'user' => $this->user,
             'logs' => $this->user->getOwnershipLogs(),
-            'sublists' => Sublist::orderBy('sort', 'DESC')->get()
         ]);
     }
 
     /**
      * Shows a user's submissions.
      *
-     * @param  string  $name
+     * @param string $name
+     *
      * @return \Illuminate\Contracts\Support\Renderable
      */
-    public function getUserSubmissions($name)
-    {
+    public function getUserSubmissions($name) {
         return view('user.submission_logs', [
             'user' => $this->user,
             'logs' => $this->user->getSubmissions(Auth::check() ? Auth::user() : null),
-            'sublists' => Sublist::orderBy('sort', 'DESC')->get()
         ]);
     }
 
     /**
      * Shows a user's gallery submissions.
      *
-     * @param  string  $name
+     * @param string $name
+     *
      * @return \Illuminate\Contracts\Support\Renderable
      */
-    public function getUserGallery($name)
-    {
+    public function getUserGallery(Request $request, $name) {
         return view('user.gallery', [
-            'user' => $this->user,
-            'submissions' => $this->user->gallerySubmissions()->paginate(20),
-            'sublists' => Sublist::orderBy('sort', 'DESC')->get()
+            'user'        => $this->user,
+            'submissions' => $this->user->gallerySubmissions()->paginate(20)->appends($request->query()),
         ]);
     }
 
     /**
      * Shows a user's gallery submission favorites.
      *
-     * @param  string  $name
+     * @param string $name
+     *
      * @return \Illuminate\Contracts\Support\Renderable
      */
-    public function getUserFavorites($name)
-    {
+    public function getUserFavorites(Request $request, $name) {
         return view('user.favorites', [
-            'user' => $this->user,
+            'user'       => $this->user,
             'characters' => false,
-            'favorites' => GallerySubmission::whereIn('id', $this->user->galleryFavorites()->pluck('gallery_submission_id')->toArray())->visible(Auth::check() ? Auth::user() : null)->accepted()->orderBy('created_at', 'DESC')->paginate(20),
-            'sublists' => Sublist::orderBy('sort', 'DESC')->get()
+            'favorites'  => GallerySubmission::whereIn('id', $this->user->galleryFavorites()->pluck('gallery_submission_id')->toArray())->visible(Auth::check() ? Auth::user() : null)->accepted()->orderBy('created_at', 'DESC')->paginate(20)->appends($request->query()),
         ]);
     }
 
     /**
      * Shows a user's gallery submission favorites that contain characters they own.
      *
-     * @param  string  $name
+     * @param string $name
+     *
      * @return \Illuminate\Contracts\Support\Renderable
      */
-    public function getUserOwnCharacterFavorites($name)
-    {
+    public function getUserOwnCharacterFavorites(Request $request, $name) {
         $user = $this->user;
         $userCharacters = $user->characters()->pluck('id')->toArray();
         $userFavorites = $user->galleryFavorites()->pluck('gallery_submission_id')->toArray();
 
         return view('user.favorites', [
-            'user' => $this->user,
+            'user'       => $this->user,
             'characters' => true,
-            'favorites' => $this->user->characters->count() ? GallerySubmission::whereIn('id', $userFavorites)->whereIn('id', GalleryCharacter::whereIn('character_id', $userCharacters)->pluck('gallery_submission_id')->toArray())->visible(Auth::check() ? Auth::user() : null)->accepted()->orderBy('created_at', 'DESC')->paginate(20) : null,
-            'sublists' => Sublist::orderBy('sort', 'DESC')->get()
+            'favorites'  => $this->user->characters->count() ? GallerySubmission::whereIn('id', $userFavorites)->whereIn('id', GalleryCharacter::whereIn('character_id', $userCharacters)->pluck('gallery_submission_id')->toArray())->visible(Auth::check() ? Auth::user() : null)->accepted()->orderBy('created_at', 'DESC')->paginate(20)->appends($request->query()) : null,
         ]);
     }
 }
diff --git a/app/Http/Controllers/WorldController.php b/app/Http/Controllers/WorldController.php
index d6489411de..9ca4e20c59 100644
--- a/app/Http/Controllers/WorldController.php
+++ b/app/Http/Controllers/WorldController.php
@@ -2,27 +2,23 @@
 
 namespace App\Http\Controllers;
 
-use Illuminate\Http\Request;
-use Config;
-
-use App\Models\Currency\Currency;
-use App\Models\Rarity;
-use App\Models\Species\Species;
-use App\Models\Species\Subtype;
-use App\Models\Item\ItemCategory;
-use App\Models\Item\Item;
-use App\Models\Feature\FeatureCategory;
-use App\Models\Feature\Feature;
 use App\Models\Character\CharacterCategory;
 use App\Models\Character\CharacterTitle;
-use App\Models\Prompt\PromptCategory;
-use App\Models\Prompt\Prompt;
+use App\Models\Currency\Currency;
+use App\Models\Feature\Feature;
+use App\Models\Feature\FeatureCategory;
+use App\Models\Item\Item;
+use App\Models\Item\ItemCategory;
+use App\Models\Rarity;
 use App\Models\Shop\Shop;
 use App\Models\Shop\ShopStock;
+use App\Models\Species\Species;
+use App\Models\Species\Subtype;
 use App\Models\User\User;
+use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Auth;
 
-class WorldController extends Controller
-{
+class WorldController extends Controller {
     /*
     |--------------------------------------------------------------------------
     | World Controller
@@ -38,131 +34,152 @@ class WorldController extends Controller
      *
      * @return \Illuminate\Contracts\Support\Renderable
      */
-    public function getIndex()
-    {
+    public function getIndex() {
         return view('world.index');
     }
 
     /**
      * Shows the currency page.
      *
-     * @param  \Illuminate\Http\Request  $request
      * @return \Illuminate\Contracts\Support\Renderable
      */
-    public function getCurrencies(Request $request)
-    {
+    public function getCurrencies(Request $request) {
         $query = Currency::query();
         $name = $request->get('name');
-        if($name) $query->where('name', 'LIKE', '%'.$name.'%')->orWhere('abbreviation', 'LIKE', '%'.$name.'%');
+        if ($name) {
+            $query->where('name', 'LIKE', '%'.$name.'%')->orWhere('abbreviation', 'LIKE', '%'.$name.'%');
+        }
+
         return view('world.currencies', [
-            'currencies' => $query->orderBy('name')->paginate(20)->appends($request->query()),
+            'currencies' => $query->orderBy('name')->orderBy('id')->paginate(20)->appends($request->query()),
         ]);
     }
 
     /**
      * Shows the rarity page.
      *
-     * @param  \Illuminate\Http\Request  $request
      * @return \Illuminate\Contracts\Support\Renderable
      */
-    public function getRarities(Request $request)
-    {
+    public function getRarities(Request $request) {
         $query = Rarity::query();
         $name = $request->get('name');
-        if($name) $query->where('name', 'LIKE', '%'.$name.'%');
+        if ($name) {
+            $query->where('name', 'LIKE', '%'.$name.'%');
+        }
+
         return view('world.rarities', [
-            'rarities' => $query->orderBy('sort', 'DESC')->paginate(20)->appends($request->query()),
+            'rarities' => $query->orderBy('sort', 'DESC')->orderBy('id')->paginate(20)->appends($request->query()),
         ]);
     }
 
     /**
      * Shows the species page.
      *
-     * @param  \Illuminate\Http\Request  $request
      * @return \Illuminate\Contracts\Support\Renderable
      */
-    public function getSpecieses(Request $request)
-    {
+    public function getSpecieses(Request $request) {
         $query = Species::query();
         $name = $request->get('name');
-        if($name) $query->where('name', 'LIKE', '%'.$name.'%');
+        if ($name) {
+            $query->where('name', 'LIKE', '%'.$name.'%');
+        }
+
         return view('world.specieses', [
-            'specieses' => $query->with(['subtypes' => function($query) {
-                $query->orderBy('sort', 'DESC');
-            }])->orderBy('sort', 'DESC')->paginate(20)->appends($request->query()),
+            'specieses' => $query->with(['subtypes' => function ($query) {
+                $query->visible(Auth::check() ? Auth::user() : null)->orderBy('sort', 'DESC');
+            }])->visible(Auth::check() ? Auth::user() : null)->orderBy('sort', 'DESC')->orderBy('id')->paginate(20)->appends($request->query()),
         ]);
     }
 
     /**
      * Shows the subtypes page.
      *
-     * @param  \Illuminate\Http\Request  $request
      * @return \Illuminate\Contracts\Support\Renderable
      */
-    public function getSubtypes(Request $request)
-    {
+    public function getSubtypes(Request $request) {
         $query = Subtype::query();
         $name = $request->get('name');
-        if($name) $query->where('name', 'LIKE', '%'.$name.'%');
+        if ($name) {
+            $query->where('name', 'LIKE', '%'.$name.'%');
+        }
+
         return view('world.subtypes', [
-            'subtypes' => $query->with('species')->orderBy('sort', 'DESC')->paginate(20)->appends($request->query()),
+            'subtypes' => $query->with('species')->visible(Auth::check() ? Auth::user() : null)->orderBy('sort', 'DESC')->orderBy('id')->paginate(20)->appends($request->query()),
         ]);
     }
 
     /**
      * Shows the item categories page.
      *
-     * @param  \Illuminate\Http\Request  $request
      * @return \Illuminate\Contracts\Support\Renderable
      */
-    public function getItemCategories(Request $request)
-    {
+    public function getItemCategories(Request $request) {
         $query = ItemCategory::query();
         $name = $request->get('name');
-        if($name) $query->where('name', 'LIKE', '%'.$name.'%');
+        if ($name) {
+            $query->where('name', 'LIKE', '%'.$name.'%');
+        }
+
         return view('world.item_categories', [
-            'categories' => $query->orderBy('sort', 'DESC')->paginate(20)->appends($request->query()),
+            'categories' => $query->visible(Auth::check() ? Auth::user() : null)->orderBy('sort', 'DESC')->orderBy('id')->paginate(20)->appends($request->query()),
         ]);
     }
 
     /**
      * Shows the trait categories page.
      *
-     * @param  \Illuminate\Http\Request  $request
      * @return \Illuminate\Contracts\Support\Renderable
      */
-    public function getFeatureCategories(Request $request)
-    {
+    public function getFeatureCategories(Request $request) {
         $query = FeatureCategory::query();
         $name = $request->get('name');
-        if($name) $query->where('name', 'LIKE', '%'.$name.'%');
+        if ($name) {
+            $query->where('name', 'LIKE', '%'.$name.'%');
+        }
+
         return view('world.feature_categories', [
-            'categories' => $query->orderBy('sort', 'DESC')->paginate(20)->appends($request->query()),
+            'categories' => $query->visible(Auth::check() ? Auth::user() : null)->orderBy('sort', 'DESC')->orderBy('id')->paginate(20)->appends($request->query()),
         ]);
     }
 
     /**
      * Shows the traits page.
      *
-     * @param  \Illuminate\Http\Request  $request
      * @return \Illuminate\Contracts\Support\Renderable
      */
-    public function getFeatures(Request $request)
-    {
-        $query = Feature::with('category')->with('rarity')->with('species');
-        $data = $request->only(['rarity_id', 'feature_category_id', 'species_id', 'name', 'sort']);
-        if(isset($data['rarity_id']) && $data['rarity_id'] != 'none')
+    public function getFeatures(Request $request) {
+        $query = Feature::visible(Auth::check() ? Auth::user() : null)->with('category')->with('rarity')->with('species');
+        $data = $request->only(['rarity_id', 'feature_category_id', 'species_id', 'subtype_id', 'name', 'sort']);
+        if (isset($data['rarity_id']) && $data['rarity_id'] != 'none') {
             $query->where('rarity_id', $data['rarity_id']);
-        if(isset($data['feature_category_id']) && $data['feature_category_id'] != 'none')
-            $query->where('feature_category_id', $data['feature_category_id']);
-        if(isset($data['species_id']) && $data['species_id'] != 'none')
-            $query->where('species_id', $data['species_id']);
-        if(isset($data['name']))
+        }
+        if (isset($data['feature_category_id']) && $data['feature_category_id'] != 'none') {
+            if ($data['feature_category_id'] == 'withoutOption') {
+                $query->whereNull('feature_category_id');
+            } else {
+                $query->where('feature_category_id', $data['feature_category_id']);
+            }
+        }
+        if (isset($data['species_id']) && $data['species_id'] != 'none') {
+            if ($data['species_id'] == 'withoutOption') {
+                $query->whereNull('species_id');
+            } else {
+                $query->where('species_id', $data['species_id']);
+            }
+        }
+        if (isset($data['subtype_id']) && $data['subtype_id'] != 'none') {
+            if ($data['subtype_id'] == 'withoutOption') {
+                $query->whereNull('subtype_id');
+            } else {
+                $query->where('subtype_id', $data['subtype_id']);
+            }
+        }
+        if (isset($data['name'])) {
             $query->where('name', 'LIKE', '%'.$data['name'].'%');
+        }
 
-        if(isset($data['sort']))
-        {
-            switch($data['sort']) {
+        if (isset($data['sort'])) {
+            switch ($data['sort']) {
                 case 'alpha':
                     $query->sortAlphabetical();
                     break;
@@ -181,6 +198,9 @@ public function getFeatures(Request $request)
                 case 'species':
                     $query->sortSpecies();
                     break;
+                case 'subtypes':
+                    $query->sortSubtype();
+                    break;
                 case 'newest':
                     $query->sortNewest();
                     break;
@@ -188,74 +208,129 @@ public function getFeatures(Request $request)
                     $query->sortOldest();
                     break;
             }
+        } else {
+            $query->sortCategory();
         }
-        else $query->sortCategory();
 
         return view('world.features', [
-            'features' => $query->paginate(20)->appends($request->query()),
-            'rarities' => ['none' => 'Any Rarity'] + Rarity::orderBy('sort', 'DESC')->pluck('name', 'id')->toArray(),
-            'specieses' => ['none' => 'Any Species'] + Species::orderBy('sort', 'DESC')->pluck('name', 'id')->toArray(),
-            'categories' => ['none' => 'Any Category'] + FeatureCategory::orderBy('sort', 'DESC')->pluck('name', 'id')->toArray()
+            'features'   => $query->orderBy('id')->paginate(20)->appends($request->query()),
+            'rarities'   => ['none' => 'Any Rarity'] + Rarity::orderBy('sort', 'DESC')->pluck('name', 'id')->toArray(),
+            'specieses'  => ['none' => 'Any Species'] + ['withoutOption' => 'Without Species'] + Species::visible(Auth::check() ? Auth::user() : null)->orderBy('sort', 'DESC')->pluck('name', 'id')->toArray(),
+            'subtypes'   => ['none' => 'Any Subtype'] + ['withoutOption' => 'Without Subtype'] + Subtype::visible(Auth::check() ? Auth::user() : null)->orderBy('sort', 'DESC')->pluck('name', 'id')->toArray(),
+            'categories' => ['none' => 'Any Category'] + ['withoutOption' => 'Without Category'] + FeatureCategory::visible(Auth::check() ? Auth::user() : null)->orderBy('sort', 'DESC')->pluck('name', 'id')->toArray(),
         ]);
     }
 
     /**
      * Shows a species' visual trait list.
      *
-     * @param  \Illuminate\Http\Request  $request
+     * @param mixed $id
+     *
      * @return \Illuminate\Contracts\Support\Renderable
      */
-    public function getSpeciesFeatures($id)
-    {
+    public function getSpeciesFeatures($id) {
         $categories = FeatureCategory::orderBy('sort', 'DESC')->get();
         $rarities = Rarity::orderBy('sort', 'ASC')->get();
-        $species = Species::where('id', $id)->first();
-        if(!$species) abort(404);
-        if(!Config::get('lorekeeper.extensions.species_trait_index')) abort(404);
+        $species = Species::visible(Auth::check() ? Auth::user() : null)->where('id', $id)->first();
+        if (!$species) {
+            abort(404);
+        }
+        if (!config('lorekeeper.extensions.species_trait_index.enable')) {
+            abort(404);
+        }
 
         $features = count($categories) ?
             $species->features()
+                ->visible(Auth::check() ? Auth::user() : null)
                 ->orderByRaw('FIELD(feature_category_id,'.implode(',', $categories->pluck('id')->toArray()).')')
                 ->orderByRaw('FIELD(rarity_id,'.implode(',', $rarities->pluck('id')->toArray()).')')
                 ->orderBy('has_image', 'DESC')
                 ->orderBy('name')
                 ->get()
+                ->filter(function ($feature) {
+                    if ($feature->subtype) {
+                        return $feature->subtype->is_visible;
+                    }
+
+                    return true;
+                })
                 ->groupBy(['feature_category_id', 'id']) :
             $species->features()
+                ->visible(Auth::check() ? Auth::user() : null)
                 ->orderByRaw('FIELD(rarity_id,'.implode(',', $rarities->pluck('id')->toArray()).')')
                 ->orderBy('has_image', 'DESC')
                 ->orderBy('name')
                 ->get()
+                ->filter(function ($feature) {
+                    if ($feature->subtype) {
+                        return $feature->subtype->is_visible;
+                    }
+
+                    return true;
+                })
                 ->groupBy(['feature_category_id', 'id']);
 
         return view('world.species_features', [
-            'species' => $species,
+            'species'    => $species,
             'categories' => $categories->keyBy('id'),
-            'rarities' => $rarities->keyBy('id'),
-            'features' => $features,
+            'rarities'   => $rarities->keyBy('id'),
+            'features'   => $features,
+        ]);
+    }
+
+    /**
+     * Provides a single trait's description html for use in a modal.
+     *
+     * @param mixed $speciesId
+     * @param mixed $id
+     *
+     * @return \Illuminate\Contracts\Support\Renderable
+     */
+    public function getSpeciesFeatureDetail($speciesId, $id) {
+        $feature = Feature::where('id', $id)->first();
+
+        if (!$feature) {
+            abort(404);
+        }
+        if (!config('lorekeeper.extensions.species_trait_index.trait_modals')) {
+            abort(404);
+        }
+
+        return view('world._feature_entry', [
+            'feature' => $feature,
         ]);
     }
 
     /**
      * Shows the items page.
      *
-     * @param  \Illuminate\Http\Request  $request
      * @return \Illuminate\Contracts\Support\Renderable
      */
-    public function getItems(Request $request)
-    {
-        $query = Item::with('category')->released();
+    public function getItems(Request $request) {
+        $query = Item::with('category')->released(Auth::user() ?? null);
+
+        $categoryVisibleCheck = ItemCategory::visible(Auth::check() ? Auth::user() : null)->pluck('id', 'name')->toArray();
+        // query where category is visible, or, no category and released
+        $query->where(function ($query) use ($categoryVisibleCheck) {
+            $query->whereIn('item_category_id', $categoryVisibleCheck)->orWhereNull('item_category_id');
+        });
         $data = $request->only(['item_category_id', 'name', 'sort', 'artist']);
-        if(isset($data['item_category_id']) && $data['item_category_id'] != 'none')
-            $query->where('item_category_id', $data['item_category_id']);
-        if(isset($data['name']))
+        if (isset($data['item_category_id']) && $data['item_category_id'] != 'none') {
+            if ($data['item_category_id'] == 'withoutOption') {
+                $query->whereNull('item_category_id');
+            } else {
+                $query->where('item_category_id', $data['item_category_id']);
+            }
+        }
+        if (isset($data['name'])) {
             $query->where('name', 'LIKE', '%'.$data['name'].'%');
-        if(isset($data['artist']) && $data['artist'] != 'none')
+        }
+        if (isset($data['artist']) && $data['artist'] != 'none') {
             $query->where('artist_id', $data['artist']);
+        }
 
-        if(isset($data['sort']))
-        {
-            switch($data['sort']) {
+        if (isset($data['sort'])) {
+            switch ($data['sort']) {
                 case 'alpha':
                     $query->sortAlphabetical();
                     break;
@@ -272,52 +347,46 @@ public function getItems(Request $request)
                     $query->sortOldest();
                     break;
             }
+        } else {
+            $query->sortCategory();
         }
-        else $query->sortCategory();
 
         return view('world.items', [
-            'items' => $query->paginate(20)->appends($request->query()),
-            'categories' => ['none' => 'Any Category'] + ItemCategory::orderBy('sort', 'DESC')->pluck('name', 'id')->toArray(),
-            'shops' => Shop::orderBy('sort', 'DESC')->get(),
-            'artists' => ['none' => 'Any Artist'] + User::whereIn('id', Item::whereNotNull('artist_id')->pluck('artist_id')->toArray())->pluck('name', 'id')->toArray()
+            'items'      => $query->orderBy('id')->paginate(20)->appends($request->query()),
+            'categories' => ['none' => 'Any Category'] + ['withoutOption' => 'Without Category'] + ItemCategory::visible(Auth::check() ? Auth::user() : null)->orderBy('sort', 'DESC')->pluck('name', 'id')->toArray(),
+            'shops'      => Shop::orderBy('sort', 'DESC')->get(),
+            'artists'    => ['none' => 'Any Artist'] + User::whereIn('id', Item::whereNotNull('artist_id')->pluck('artist_id')->toArray())->pluck('name', 'id')->toArray(),
         ]);
     }
 
     /**
      * Shows an individual item's page.
      *
-     * @param  int  $id
+     * @param int $id
+     *
      * @return \Illuminate\Contracts\Support\Renderable
      */
-    public function getItem($id)
-    {
+    public function getItem($id) {
         $categories = ItemCategory::orderBy('sort', 'DESC')->get();
-        $item = Item::where('id', $id)->released()->first();
-        if(!$item) abort(404);
+
+        $item = Item::where('id', $id)->released(Auth::user() ?? null)->first();
+
+        if (!$item) {
+            abort(404);
+        }
+        if ($item->category && !$item->category->is_visible) {
+            if (Auth::check() ? !Auth::user()->isStaff : true) {
+                abort(404);
+            }
+        }
 
         return view('world.item_page', [
-            'item' => $item,
-            'imageUrl' => $item->imageUrl,
-            'name' => $item->displayName,
+            'item'        => $item,
+            'imageUrl'    => $item->imageUrl,
+            'name'        => $item->displayName,
             'description' => $item->parsed_description,
-            'categories' => $categories->keyBy('id'),
-            'shops' => Shop::whereIn('id', ShopStock::where('item_id', $item->id)->pluck('shop_id')->unique()->toArray())->orderBy('sort', 'DESC')->get()
-        ]);
-    }
-
-    /**
-     * Shows the character categories page.
-     *
-     * @param  \Illuminate\Http\Request  $request
-     * @return \Illuminate\Contracts\Support\Renderable
-     */
-    public function getCharacterCategories(Request $request)
-    {
-        $query = CharacterCategory::query();
-        $name = $request->get('name');
-        if($name) $query->where('name', 'LIKE', '%'.$name.'%')->orWhere('code', 'LIKE', '%'.$name.'%');
-        return view('world.character_categories', [
-            'categories' => $query->orderBy('sort', 'DESC')->paginate(20)->appends($request->query()),
+            'categories'  => $categories->keyBy('id'),
+            'shops'       => Shop::whereIn('id', ShopStock::where('item_id', $item->id)->pluck('shop_id')->unique()->toArray())->orderBy('sort', 'DESC')->get(),
         ]);
     }
 
@@ -343,73 +412,19 @@ public function getCharacterTitles(Request $request)
     }
 
     /**
-     * Shows the prompt categories page.
+     * Shows the character categories page.
      *
-     * @param  \Illuminate\Http\Request  $request
      * @return \Illuminate\Contracts\Support\Renderable
      */
-    public function getPromptCategories(Request $request)
-    {
-        $query = PromptCategory::query();
+    public function getCharacterCategories(Request $request) {
+        $query = CharacterCategory::query();
         $name = $request->get('name');
-        if($name) $query->where('name', 'LIKE', '%'.$name.'%');
-        return view('world.prompt_categories', [
-            'categories' => $query->orderBy('sort', 'DESC')->paginate(20)->appends($request->query()),
-        ]);
-    }
-
-    /**
-     * Shows the prompts page.
-     *
-     * @param  \Illuminate\Http\Request  $request
-     * @return \Illuminate\Contracts\Support\Renderable
-     */
-    public function getPrompts(Request $request)
-    {
-        $query = Prompt::active()->with('category');
-        $data = $request->only(['prompt_category_id', 'name', 'sort']);
-        if(isset($data['prompt_category_id']) && $data['prompt_category_id'] != 'none')
-            $query->where('prompt_category_id', $data['prompt_category_id']);
-        if(isset($data['name']))
-            $query->where('name', 'LIKE', '%'.$data['name'].'%');
-
-        if(isset($data['sort']))
-        {
-            switch($data['sort']) {
-                case 'alpha':
-                    $query->sortAlphabetical();
-                    break;
-                case 'alpha-reverse':
-                    $query->sortAlphabetical(true);
-                    break;
-                case 'category':
-                    $query->sortCategory();
-                    break;
-                case 'newest':
-                    $query->sortNewest();
-                    break;
-                case 'oldest':
-                    $query->sortOldest();
-                    break;
-                case 'start':
-                    $query->sortStart();
-                    break;
-                case 'start-reverse':
-                    $query->sortStart(true);
-                    break;
-                case 'end':
-                    $query->sortEnd();
-                    break;
-                case 'end-reverse':
-                    $query->sortEnd(true);
-                    break;
-            }
+        if ($name) {
+            $query->where('name', 'LIKE', '%'.$name.'%')->orWhere('code', 'LIKE', '%'.$name.'%');
         }
-        else $query->sortCategory();
 
-        return view('world.prompts', [
-            'prompts' => $query->paginate(20)->appends($request->query()),
-            'categories' => ['none' => 'Any Category'] + PromptCategory::orderBy('sort', 'DESC')->pluck('name', 'id')->toArray()
+        return view('world.character_categories', [
+            'categories' => $query->visible(Auth::check() ? Auth::user() : null)->orderBy('sort', 'DESC')->orderBy('id')->paginate(20)->appends($request->query()),
         ]);
     }
 }
diff --git a/app/Http/Kernel.php b/app/Http/Kernel.php
index f7dd61d8d2..c1de5fc42b 100644
--- a/app/Http/Kernel.php
+++ b/app/Http/Kernel.php
@@ -4,8 +4,7 @@
 
 use Illuminate\Foundation\Http\Kernel as HttpKernel;
 
-class Kernel extends HttpKernel
-{
+class Kernel extends HttpKernel {
     /**
      * The application's global HTTP middleware stack.
      *
@@ -52,19 +51,19 @@ class Kernel extends HttpKernel
      * @var array
      */
     protected $routeMiddleware = [
-        'auth' => \App\Http\Middleware\Authenticate::class,
-        'auth.basic' => \Illuminate\Auth\Middleware\AuthenticateWithBasicAuth::class,
-        'bindings' => \Illuminate\Routing\Middleware\SubstituteBindings::class,
+        'auth'          => \App\Http\Middleware\Authenticate::class,
+        'auth.basic'    => \Illuminate\Auth\Middleware\AuthenticateWithBasicAuth::class,
+        'bindings'      => \Illuminate\Routing\Middleware\SubstituteBindings::class,
         'cache.headers' => \Illuminate\Http\Middleware\SetCacheHeaders::class,
-        'can' => \Illuminate\Auth\Middleware\Authorize::class,
-        'alias' => \App\Http\Middleware\CheckAlias::class,
-        'power' => \App\Http\Middleware\CheckPower::class,
-        'admin' => \App\Http\Middleware\CheckAdmin::class,
-        'staff' => \App\Http\Middleware\CheckStaff::class,
-        'guest' => \App\Http\Middleware\RedirectIfAuthenticated::class,
-        'signed' => \Illuminate\Routing\Middleware\ValidateSignature::class,
-        'throttle' => \Illuminate\Routing\Middleware\ThrottleRequests::class,
-        'verified' => \Illuminate\Auth\Middleware\EnsureEmailIsVerified::class,
+        'can'           => \Illuminate\Auth\Middleware\Authorize::class,
+        'alias'         => \App\Http\Middleware\CheckAlias::class,
+        'power'         => \App\Http\Middleware\CheckPower::class,
+        'admin'         => \App\Http\Middleware\CheckAdmin::class,
+        'staff'         => \App\Http\Middleware\CheckStaff::class,
+        'guest'         => \App\Http\Middleware\RedirectIfAuthenticated::class,
+        'signed'        => \Illuminate\Routing\Middleware\ValidateSignature::class,
+        'throttle'      => \Illuminate\Routing\Middleware\ThrottleRequests::class,
+        'verified'      => \Illuminate\Auth\Middleware\EnsureEmailIsVerified::class,
     ];
 
     /**
diff --git a/app/Http/Middleware/Authenticate.php b/app/Http/Middleware/Authenticate.php
index a4be5c587e..77c91f7306 100644
--- a/app/Http/Middleware/Authenticate.php
+++ b/app/Http/Middleware/Authenticate.php
@@ -4,17 +4,16 @@
 
 use Illuminate\Auth\Middleware\Authenticate as Middleware;
 
-class Authenticate extends Middleware
-{
+class Authenticate extends Middleware {
     /**
      * Get the path the user should be redirected to when they are not authenticated.
      *
-     * @param  \Illuminate\Http\Request  $request
+     * @param \Illuminate\Http\Request $request
+     *
      * @return string
      */
-    protected function redirectTo($request)
-    {
-        if (! $request->expectsJson()) {
+    protected function redirectTo($request) {
+        if (!$request->expectsJson()) {
             return route('login');
         }
     }
diff --git a/app/Http/Middleware/CheckAdmin.php b/app/Http/Middleware/CheckAdmin.php
index c8a4d96b8a..1dc98076e2 100644
--- a/app/Http/Middleware/CheckAdmin.php
+++ b/app/Http/Middleware/CheckAdmin.php
@@ -4,19 +4,18 @@
 
 use Closure;
 
-class CheckAdmin
-{
+class CheckAdmin {
     /**
      * Redirect non-admins to the home page.
      *
-     * @param  \Illuminate\Http\Request  $request
-     * @param  \Closure  $next
+     * @param \Illuminate\Http\Request $request
+     *
      * @return mixed
      */
-    public function handle($request, Closure $next)
-    {
+    public function handle($request, Closure $next) {
         if (!$request->user()->isAdmin) {
             flash('You do not have the permission to access this page.')->error();
+
             return redirect('/');
         }
 
diff --git a/app/Http/Middleware/CheckAlias.php b/app/Http/Middleware/CheckAlias.php
index 4f7eff0b91..764b1749d0 100644
--- a/app/Http/Middleware/CheckAlias.php
+++ b/app/Http/Middleware/CheckAlias.php
@@ -2,32 +2,37 @@
 
 namespace App\Http\Middleware;
 
+use App\Facades\Settings;
 use Closure;
 
-class CheckAlias
-{
+class CheckAlias {
     /**
      * Redirects users without an alias to the dA account linking page,
      * and banned users to the ban page.
      *
-     * @param  \Illuminate\Http\Request  $request
-     * @param  \Closure  $next
+     * @param \Illuminate\Http\Request $request
+     *
      * @return mixed
      */
-    public function handle($request, Closure $next)
-    {
-        if(!$request->user()->has_alias) {
+    public function handle($request, Closure $next) {
+        if (Settings::get('is_maintenance_mode') == 1 && !$request->user()->hasPower('maintenance_access')) {
+            return redirect('/');
+        }
+        if (!$request->user()->hasAlias) {
             return redirect('/link');
         }
-        if(!$request->user()->birthday) {
+        if (!$request->user()->birthday) {
             return redirect('/birthday');
         }
-        if(!$request->user()->checkBirthday) {
+        if (!$request->user()->checkBirthday) {
             return redirect('/blocked');
         }
-        if($request->user()->is_banned) {
+        if ($request->user()->is_banned) {
             return redirect('/banned');
         }
+        if ($request->user()->is_deactivated) {
+            return redirect('/deactivated');
+        }
 
         return $next($request);
     }
diff --git a/app/Http/Middleware/CheckForMaintenanceMode.php b/app/Http/Middleware/CheckForMaintenanceMode.php
index 35b9824bae..86fa3eb97f 100644
--- a/app/Http/Middleware/CheckForMaintenanceMode.php
+++ b/app/Http/Middleware/CheckForMaintenanceMode.php
@@ -4,8 +4,7 @@
 
 use Illuminate\Foundation\Http\Middleware\CheckForMaintenanceMode as Middleware;
 
-class CheckForMaintenanceMode extends Middleware
-{
+class CheckForMaintenanceMode extends Middleware {
     /**
      * The URIs that should be reachable while maintenance mode is enabled.
      *
diff --git a/app/Http/Middleware/CheckPower.php b/app/Http/Middleware/CheckPower.php
index ecec711f85..b5eb7770f8 100644
--- a/app/Http/Middleware/CheckPower.php
+++ b/app/Http/Middleware/CheckPower.php
@@ -4,19 +4,19 @@
 
 use Closure;
 
-class CheckPower
-{
+class CheckPower {
     /**
      * Check if the user has the power to access the current page.
      *
-     * @param  \Illuminate\Http\Request  $request
-     * @param  \Closure  $next
+     * @param \Illuminate\Http\Request $request
+     * @param mixed                    $power
+     *
      * @return mixed
      */
-    public function handle($request, Closure $next, $power)
-    {
+    public function handle($request, Closure $next, $power) {
         if (!$request->user()->hasPower($power)) {
             flash('You do not have the permission to access this page.')->error();
+
             return redirect('/');
         }
 
diff --git a/app/Http/Middleware/CheckStaff.php b/app/Http/Middleware/CheckStaff.php
index 481587bd00..966e007b71 100644
--- a/app/Http/Middleware/CheckStaff.php
+++ b/app/Http/Middleware/CheckStaff.php
@@ -4,19 +4,18 @@
 
 use Closure;
 
-class CheckStaff
-{
+class CheckStaff {
     /**
      * Check if the user is a staff member.
      *
-     * @param  \Illuminate\Http\Request  $request
-     * @param  \Closure  $next
+     * @param \Illuminate\Http\Request $request
+     *
      * @return mixed
      */
-    public function handle($request, Closure $next)
-    {
+    public function handle($request, Closure $next) {
         if (!$request->user()->isStaff) {
             flash('You do not have the permission to access this page.')->error();
+
             return redirect('/');
         }
 
diff --git a/app/Http/Middleware/EncryptCookies.php b/app/Http/Middleware/EncryptCookies.php
index 033136ad12..61dc55764c 100644
--- a/app/Http/Middleware/EncryptCookies.php
+++ b/app/Http/Middleware/EncryptCookies.php
@@ -4,8 +4,7 @@
 
 use Illuminate\Cookie\Middleware\EncryptCookies as Middleware;
 
-class EncryptCookies extends Middleware
-{
+class EncryptCookies extends Middleware {
     /**
      * The names of the cookies that should not be encrypted.
      *
diff --git a/app/Http/Middleware/ParsePostRequestFields.php b/app/Http/Middleware/ParsePostRequestFields.php
index d97998609e..e8f6774c46 100644
--- a/app/Http/Middleware/ParsePostRequestFields.php
+++ b/app/Http/Middleware/ParsePostRequestFields.php
@@ -5,14 +5,13 @@
 use Closure;
 use Illuminate\Http\Request;
 
-class ParsePostRequestFields
-{
+class ParsePostRequestFields {
     /**
      * Handle an incoming request.
      *
-     * @param  \Illuminate\Http\Request  $request
-     * @param  \Closure(\Illuminate\Http\Request): (\Illuminate\Http\Response|\Illuminate\Http\RedirectResponse)  $next
-     * @return \Illuminate\Http\Response|\Illuminate\Http\RedirectResponse
+     * @param \Closure(\Illuminate\Http\Request): (\Illuminate\Http\RedirectResponse|\Illuminate\Http\Response) $next
+     *
+     * @return \Illuminate\Http\RedirectResponse|\Illuminate\Http\Response
      */
     public function handle(Request $request, Closure $next) {
         if ($request->isMethod('post')) {
@@ -44,12 +43,8 @@ public function handle(Request $request, Closure $next) {
 
     /**
      * Recursively parse array values.
-     *
-     * @param  array  $array
-     * @param  array  $strippedFields
-     * @return array
      */
-    private function parseArray(array $array, array $strippedFields) : array {
+    private function parseArray(array $array, array $strippedFields): array {
         foreach ($array as $key => $value) {
             if (is_numeric($value)) {
                 continue;
diff --git a/app/Http/Middleware/RedirectIfAuthenticated.php b/app/Http/Middleware/RedirectIfAuthenticated.php
index e27860e24e..7c83bcbaef 100644
--- a/app/Http/Middleware/RedirectIfAuthenticated.php
+++ b/app/Http/Middleware/RedirectIfAuthenticated.php
@@ -5,18 +5,16 @@
 use Closure;
 use Illuminate\Support\Facades\Auth;
 
-class RedirectIfAuthenticated
-{
+class RedirectIfAuthenticated {
     /**
      * Handle an incoming request.
      *
-     * @param  \Illuminate\Http\Request  $request
-     * @param  \Closure  $next
-     * @param  string|null  $guard
+     * @param \Illuminate\Http\Request $request
+     * @param string|null              $guard
+     *
      * @return mixed
      */
-    public function handle($request, Closure $next, $guard = null)
-    {
+    public function handle($request, Closure $next, $guard = null) {
         if (Auth::guard($guard)->check()) {
             return redirect('/');
         }
diff --git a/app/Http/Middleware/TrimStrings.php b/app/Http/Middleware/TrimStrings.php
index 5a50e7b5c8..da84164695 100644
--- a/app/Http/Middleware/TrimStrings.php
+++ b/app/Http/Middleware/TrimStrings.php
@@ -4,8 +4,7 @@
 
 use Illuminate\Foundation\Http\Middleware\TrimStrings as Middleware;
 
-class TrimStrings extends Middleware
-{
+class TrimStrings extends Middleware {
     /**
      * The names of the attributes that should not be trimmed.
      *
diff --git a/app/Http/Middleware/TrustProxies.php b/app/Http/Middleware/TrustProxies.php
index 7daf51f165..f9774276c4 100644
--- a/app/Http/Middleware/TrustProxies.php
+++ b/app/Http/Middleware/TrustProxies.php
@@ -2,15 +2,14 @@
 
 namespace App\Http\Middleware;
 
+use Illuminate\Http\Middleware\TrustProxies as Middleware;
 use Illuminate\Http\Request;
-use Fideloper\Proxy\TrustProxies as Middleware;
 
-class TrustProxies extends Middleware
-{
+class TrustProxies extends Middleware {
     /**
      * The trusted proxies for this application.
      *
-     * @var array
+     * @var array|string|null
      */
     protected $proxies;
 
@@ -19,5 +18,10 @@ class TrustProxies extends Middleware
      *
      * @var int
      */
-    protected $headers = Request::HEADER_X_FORWARDED_ALL;
+    protected $headers =
+        Request::HEADER_X_FORWARDED_FOR |
+        Request::HEADER_X_FORWARDED_HOST |
+        Request::HEADER_X_FORWARDED_PORT |
+        Request::HEADER_X_FORWARDED_PROTO |
+        Request::HEADER_X_FORWARDED_AWS_ELB;
 }
diff --git a/app/Http/Middleware/VerifyCsrfToken.php b/app/Http/Middleware/VerifyCsrfToken.php
index 324a166bc9..4b2fc45403 100644
--- a/app/Http/Middleware/VerifyCsrfToken.php
+++ b/app/Http/Middleware/VerifyCsrfToken.php
@@ -4,8 +4,7 @@
 
 use Illuminate\Foundation\Http\Middleware\VerifyCsrfToken as Middleware;
 
-class VerifyCsrfToken extends Middleware
-{
+class VerifyCsrfToken extends Middleware {
     /**
      * Indicates whether the XSRF-TOKEN cookie should be set on the response.
      *
diff --git a/app/Models/AdminLog.php b/app/Models/AdminLog.php
new file mode 100644
index 0000000000..47ec347cf6
--- /dev/null
+++ b/app/Models/AdminLog.php
@@ -0,0 +1,49 @@
+<?php
+
+namespace App\Models;
+
+use App\Models\User\User;
+
+class AdminLog extends Model {
+    /**
+     * The attributes that are mass assignable.
+     *
+     * @var array
+     */
+    protected $fillable = [
+        'user_id', 'action', 'action_details',
+    ];
+
+    /**
+     * The table associated with the model.
+     *
+     * @var string
+     */
+    protected $table = 'admin_log';
+    /**
+     * The primary key of the model.
+     *
+     * @var string
+     */
+    public $primaryKey = 'user_id';
+
+    /**
+     * Whether the model contains timestamps to be saved and updated.
+     *
+     * @var string
+     */
+    public $timestamps = true;
+
+    /**********************************************************************************************
+
+        RELATIONS
+
+    **********************************************************************************************/
+
+    /**
+     * Get the staff who preformed the action.
+     */
+    public function user() {
+        return $this->belongsTo(User::class, 'user_id');
+    }
+}
diff --git a/app/Models/Character/Character.php b/app/Models/Character/Character.php
index f567747a8c..642d095865 100644
--- a/app/Models/Character/Character.php
+++ b/app/Models/Character/Character.php
@@ -2,35 +2,23 @@
 
 namespace App\Models\Character;
 
-use Config;
-use DB;
-use Settings;
-use Carbon\Carbon;
-use Notifications;
-use App\Models\Model;
-
-use App\Models\User\User;
-use App\Models\User\UserCharacterLog;
-
-use App\Models\Character\Character;
-use App\Models\Character\CharacterCategory;
-use App\Models\Character\CharacterTransfer;
-use App\Models\Character\CharacterBookmark;
-
-use App\Models\Character\CharacterCurrency;
+use App\Facades\Notifications;
 use App\Models\Currency\Currency;
 use App\Models\Currency\CurrencyLog;
-
-use App\Models\Character\CharacterItem;
+use App\Models\Gallery\GalleryCharacter;
 use App\Models\Item\Item;
 use App\Models\Item\ItemLog;
-
+use App\Models\Model;
+use App\Models\Rarity;
 use App\Models\Submission\Submission;
 use App\Models\Submission\SubmissionCharacter;
+use App\Models\Trade;
+use App\Models\User\User;
+use App\Models\User\UserCharacterLog;
+use Carbon\Carbon;
 use Illuminate\Database\Eloquent\SoftDeletes;
 
-class Character extends Model
-{
+class Character extends Model {
     use SoftDeletes;
 
     /**
@@ -44,7 +32,7 @@ class Character extends Model
         'is_sellable', 'is_tradeable', 'is_giftable',
         'sale_value', 'transferrable_at', 'is_visible',
         'is_gift_art_allowed', 'is_gift_writing_allowed', 'is_trading', 'sort',
-        'is_myo_slot', 'name', 'trade_id', 'owner_url'
+        'is_myo_slot', 'name', 'trade_id', 'owner_url',
     ];
 
     /**
@@ -55,18 +43,20 @@ class Character extends Model
     protected $table = 'characters';
 
     /**
-     * Whether the model contains timestamps to be saved and updated.
+     * The attributes that should be cast to native types.
      *
-     * @var string
+     * @var array
      */
-    public $timestamps = true;
+    protected $casts = [
+        'transferrable_at' => 'datetime',
+    ];
 
     /**
-     * Dates on the model to convert to Carbon instances.
+     * Whether the model contains timestamps to be saved and updated.
      *
-     * @var array
+     * @var string
      */
-    public $dates = ['transferrable_at'];
+    public $timestamps = true;
 
     /**
      * Accessors to append to the model.
@@ -82,15 +72,15 @@ class Character extends Model
      */
     public static $createRules = [
         'character_category_id' => 'required',
-        'rarity_id' => 'required',
-        'user_id' => 'nullable',
-        'number' => 'required',
-        'slug' => 'required|alpha_dash',
-        'description' => 'nullable',
-        'sale_value' => 'nullable',
-        'image' => 'required|mimes:jpeg,jpg,gif,png|max:20000',
-        'thumbnail' => 'nullable|mimes:jpeg,jpg,gif,png|max:20000',
-        'owner_url' => 'url|nullable',
+        'rarity_id'             => 'required',
+        'user_id'               => 'nullable',
+        'number'                => 'required',
+        'slug'                  => 'required|alpha_dash',
+        'description'           => 'nullable',
+        'sale_value'            => 'nullable',
+        'image'                 => 'required|mimes:jpeg,jpg,gif,png|max:2048',
+        'thumbnail'             => 'nullable|mimes:jpeg,jpg,gif,png|max:2048',
+        'owner_url'             => 'url|nullable',
     ];
 
     /**
@@ -100,10 +90,12 @@ class Character extends Model
      */
     public static $updateRules = [
         'character_category_id' => 'required',
-        'number' => 'required',
-        'slug' => 'required',
-        'description' => 'nullable',
-        'sale_value' => 'nullable',
+        'number'                => 'required',
+        'slug'                  => 'required',
+        'description'           => 'nullable',
+        'sale_value'            => 'nullable',
+        'image'                 => 'nullable|mimes:jpeg,jpg,gif,png|max:2048',
+        'thumbnail'             => 'nullable|mimes:jpeg,jpg,gif,png|max:2048',
     ];
 
     /**
@@ -112,15 +104,15 @@ class Character extends Model
      * @var array
      */
     public static $myoRules = [
-        'rarity_id' => 'nullable',
-        'user_id' => 'nullable',
-        'number' => 'nullable',
-        'slug' => 'nullable',
+        'rarity_id'   => 'nullable',
+        'user_id'     => 'nullable',
+        'number'      => 'nullable',
+        'slug'        => 'nullable',
         'description' => 'nullable',
-        'sale_value' => 'nullable',
-        'name' => 'required',
-        'image' => 'nullable|mimes:jpeg,gif,png|max:20000',
-        'thumbnail' => 'nullable|mimes:jpeg,gif,png|max:20000',
+        'sale_value'  => 'nullable',
+        'name'        => 'required',
+        'image'       => 'nullable|mimes:jpeg,gif,png|max:2048',
+        'thumbnail'   => 'nullable|mimes:jpeg,gif,png|max:2048',
     ];
 
     /**********************************************************************************************
@@ -132,81 +124,73 @@ class Character extends Model
     /**
      * Get the user who owns the character.
      */
-    public function user()
-    {
-        return $this->belongsTo('App\Models\User\User', 'user_id');
+    public function user() {
+        return $this->belongsTo(User::class, 'user_id');
     }
 
     /**
      * Get the category the character belongs to.
      */
-    public function category()
-    {
-        return $this->belongsTo('App\Models\Character\CharacterCategory', 'character_category_id');
+    public function category() {
+        return $this->belongsTo(CharacterCategory::class, 'character_category_id');
     }
 
     /**
      * Get the masterlist image of the character.
      */
-    public function image()
-    {
-        return $this->belongsTo('App\Models\Character\CharacterImage', 'character_image_id');
+    public function image() {
+        return $this->belongsTo(CharacterImage::class, 'character_image_id');
     }
 
     /**
      * Get all images associated with the character.
+     *
+     * @param mixed|null $user
      */
-    public function images($user = null)
-    {
-        return $this->hasMany('App\Models\Character\CharacterImage', 'character_id')->images($user);
+    public function images($user = null) {
+        return $this->hasMany(CharacterImage::class, 'character_id')->images($user);
     }
 
     /**
      * Get the user-editable profile data of the character.
      */
-    public function profile()
-    {
-        return $this->hasOne('App\Models\Character\CharacterProfile', 'character_id');
+    public function profile() {
+        return $this->hasOne(CharacterProfile::class, 'character_id');
     }
 
     /**
      * Get the character's active design update.
      */
-    public function designUpdate()
-    {
-        return $this->hasMany('App\Models\Character\CharacterDesignUpdate', 'character_id');
+    public function designUpdate() {
+        return $this->hasMany(CharacterDesignUpdate::class, 'character_id');
     }
 
     /**
      * Get the trade this character is attached to.
      */
-    public function trade()
-    {
-        return $this->belongsTo('App\Models\Trade', 'trade_id');
+    public function trade() {
+        return $this->belongsTo(Trade::class, 'trade_id');
     }
 
     /**
      * Get the rarity of this character.
      */
-    public function rarity()
-    {
-        return $this->belongsTo('App\Models\Rarity', 'rarity_id');
+    public function rarity() {
+        return $this->belongsTo(Rarity::class, 'rarity_id');
     }
 
     /**
      * Get the character's associated gallery submissions.
      */
-    public function gallerySubmissions()
-    {
-        return $this->hasMany('App\Models\Gallery\GalleryCharacter', 'character_id');
+    public function gallerySubmissions() {
+        return $this->hasMany(GalleryCharacter::class, 'character_id');
     }
 
     /**
      * Get the character's items.
      */
-    public function items()
-    {
-        return $this->belongsToMany('App\Models\Item\Item', 'character_items')->withPivot('count', 'data', 'updated_at', 'id')->whereNull('character_items.deleted_at');
+    public function items() {
+        return $this->belongsToMany(Item::class, 'character_items')->withPivot('count', 'data', 'updated_at', 'id')->whereNull('character_items.deleted_at');
     }
 
     /**********************************************************************************************
@@ -218,49 +202,54 @@ public function items()
     /**
      * Scope a query to only include either characters of MYO slots.
      *
-     * @param  \Illuminate\Database\Eloquent\Builder  $query
-     * @param  bool                                   $isMyo
+     * @param \Illuminate\Database\Eloquent\Builder $query
+     * @param bool                                  $isMyo
+     *
      * @return \Illuminate\Database\Eloquent\Builder
      */
-    public function scopeMyo($query, $isMyo = false)
-    {
+    public function scopeMyo($query, $isMyo = false) {
         return $query->where('is_myo_slot', $isMyo);
     }
 
     /**
      * Scope a query to only include visible characters.
      *
-     * @param  \Illuminate\Database\Eloquent\Builder  $query
+     * @param \Illuminate\Database\Eloquent\Builder $query
+     * @param mixed|null                            $user
+     *
      * @return \Illuminate\Database\Eloquent\Builder
      */
-    public function scopeVisible($query)
-    {
+    public function scopeVisible($query, $user = null) {
+        if ($user && $user->hasPower('manage_characters')) {
+            return $query;
+        }
+
         return $query->where('is_visible', 1);
     }
 
     /**
      * Scope a query to only include characters that the owners are interested in trading.
      *
-     * @param  \Illuminate\Database\Eloquent\Builder  $query
+     * @param \Illuminate\Database\Eloquent\Builder $query
+     *
      * @return \Illuminate\Database\Eloquent\Builder
      */
-    public function scopeTrading($query)
-    {
+    public function scopeTrading($query) {
         return $query->where('is_trading', 1);
     }
 
     /**
      * Scope a query to only include characters that can be traded.
      *
-     * @param  \Illuminate\Database\Eloquent\Builder  $query
+     * @param \Illuminate\Database\Eloquent\Builder $query
+     *
      * @return \Illuminate\Database\Eloquent\Builder
      */
-    public function scopeTradable($query)
-    {
-        return $query->where(function($query) {
+    public function scopeTradable($query) {
+        return $query->where(function ($query) {
             $query->whereNull('transferrable_at')->orWhere('transferrable_at', '<', Carbon::now());
-        })->where(function($query) {
-          $query->where('is_sellable', 1)->orWhere('is_tradeable', 1)->orWhere('is_giftable', 1);
+        })->where(function ($query) {
+            $query->where('is_sellable', 1)->orWhere('is_tradeable', 1)->orWhere('is_giftable', 1);
         });
     }
 
@@ -275,11 +264,17 @@ public function scopeTradable($query)
      *
      * @return bool
      */
-    public function getIsAvailableAttribute()
-    {
-        if($this->designUpdate()->active()->exists()) return false;
-        if($this->trade_id) return false;
-        if(CharacterTransfer::active()->where('character_id', $this->id)->exists()) return false;
+    public function getIsAvailableAttribute() {
+        if ($this->designUpdate()->active()->exists()) {
+            return false;
+        }
+        if ($this->trade_id) {
+            return false;
+        }
+        if (CharacterTransfer::active()->where('character_id', $this->id)->exists()) {
+            return false;
+        }
+
         return true;
     }
 
@@ -289,10 +284,12 @@ public function getIsAvailableAttribute()
      *
      * @return string
      */
-    public function getDisplayOwnerAttribute()
-    {
-        if($this->user_id) return $this->user->displayName;
-        else return prettyProfileLink($this->owner_url);
+    public function getDisplayOwnerAttribute() {
+        if ($this->user_id) {
+            return $this->user->displayName;
+        } else {
+            return prettyProfileLink($this->owner_url);
+        }
     }
 
     /**
@@ -301,10 +298,12 @@ public function getDisplayOwnerAttribute()
      *
      * @return string
      */
-    public function getSlugAttribute()
-    {
-        if($this->is_myo_slot) return $this->name;
-        else return $this->attributes['slug'];
+    public function getSlugAttribute() {
+        if ($this->is_myo_slot) {
+            return $this->name;
+        } else {
+            return $this->attributes['slug'];
+        }
     }
 
     /**
@@ -312,8 +311,7 @@ public function getSlugAttribute()
      *
      * @return string
      */
-    public function getDisplayNameAttribute()
-    {
+    public function getDisplayNameAttribute() {
         return '<a href="'.$this->url.'" class="display-character">'.$this->fullName.'</a>';
     }
 
@@ -323,10 +321,12 @@ public function getDisplayNameAttribute()
      *
      * @return string
      */
-    public function getFullNameAttribute()
-    {
-        if($this->is_myo_slot) return $this->name;
-        else return $this->slug . ($this->name ? ': '.$this->name : '');
+    public function getFullNameAttribute() {
+        if ($this->is_myo_slot) {
+            return $this->name;
+        } else {
+            return $this->slug.($this->name ? ': '.$this->name : '');
+        }
     }
 
     /**
@@ -334,10 +334,12 @@ public function getFullNameAttribute()
      *
      * @return string
      */
-    public function getUrlAttribute()
-    {
-        if($this->is_myo_slot) return url('myo/'.$this->id);
-        else return url('character/'.$this->slug);
+    public function getUrlAttribute() {
+        if ($this->is_myo_slot) {
+            return url('myo/'.$this->id);
+        } else {
+            return url('character/'.$this->slug);
+        }
     }
 
     /**
@@ -345,8 +347,7 @@ public function getUrlAttribute()
      *
      * @return string
      */
-    public function getAssetTypeAttribute()
-    {
+    public function getAssetTypeAttribute() {
         return 'characters';
     }
 
@@ -355,8 +356,7 @@ public function getAssetTypeAttribute()
      *
      * @return string
      */
-    public function getLogTypeAttribute()
-    {
+    public function getLogTypeAttribute() {
         return 'Character';
     }
 
@@ -369,14 +369,15 @@ public function getLogTypeAttribute()
     /**
      * Checks if the character's owner has registered on the site and updates ownership accordingly.
      */
-    public function updateOwner()
-    {
+    public function updateOwner() {
         // Return if the character has an owner on the site already.
-        if($this->user_id) return;
+        if ($this->user_id) {
+            return;
+        }
 
         // Check if the owner has an account and update the character's user ID for them.
         $owner = checkAlias($this->owner_url);
-        if(is_object($owner)) {
+        if (is_object($owner)) {
             $this->user_id = $owner->id;
             $this->owner_url = null;
             $this->save();
@@ -389,11 +390,11 @@ public function updateOwner()
     /**
      * Get the character's held currencies.
      *
-     * @param  bool  $displayedOnly
+     * @param bool $showAll
+     *
      * @return \Illuminate\Support\Collection
      */
-    public function getCurrencies($displayedOnly = false)
-    {
+    public function getCurrencies($showAll = false) {
         // Get a list of currencies that need to be displayed
         // On profile: only ones marked is_displayed
         // In bank: ones marked is_displayed + the ones the user has
@@ -401,15 +402,18 @@ public function getCurrencies($displayedOnly = false)
         $owned = CharacterCurrency::where('character_id', $this->id)->pluck('quantity', 'currency_id')->toArray();
 
         $currencies = Currency::where('is_character_owned', 1);
-        if($displayedOnly) $currencies->where(function($query) use($owned) {
-            $query->where('is_displayed', 1)->orWhereIn('id', array_keys($owned));
-        });
-        else $currencies = $currencies->where('is_displayed', 1);
+        if ($showAll) {
+            $currencies->where(function ($query) use ($owned) {
+                $query->where('is_displayed', 1)->orWhereIn('id', array_keys($owned));
+            });
+        } else {
+            $currencies = $currencies->where('is_displayed', 1);
+        }
 
         $currencies = $currencies->orderBy('sort_character', 'DESC')->get();
 
-        foreach($currencies as $currency) {
-            $currency->quantity = isset($owned[$currency->id]) ? $owned[$currency->id] : 0;
+        foreach ($currencies as $currency) {
+            $currency->quantity = $owned[$currency->id] ?? 0;
         }
 
         return $currencies;
@@ -420,47 +424,52 @@ public function getCurrencies($displayedOnly = false)
      *
      * @return array
      */
-    public function getCurrencySelect()
-    {
+    public function getCurrencySelect() {
         return CharacterCurrency::where('character_id', $this->id)->leftJoin('currencies', 'character_currencies.currency_id', '=', 'currencies.id')->orderBy('currencies.sort_character', 'DESC')->get()->pluck('name_with_quantity', 'currency_id')->toArray();
     }
 
     /**
      * Get the character's currency logs.
      *
-     * @param  int  $limit
-     * @return \Illuminate\Support\Collection|\Illuminate\Pagination\LengthAwarePaginator
+     * @param int $limit
+     *
+     * @return \Illuminate\Pagination\LengthAwarePaginator|\Illuminate\Support\Collection
      */
-    public function getCurrencyLogs($limit = 10)
-    {
+    public function getCurrencyLogs($limit = 10) {
         $character = $this;
-        $query = CurrencyLog::with('currency')->where(function($query) use ($character) {
+        $query = CurrencyLog::with('currency')->where(function ($query) use ($character) {
             $query->with('sender.rank')->where('sender_type', 'Character')->where('sender_id', $character->id)->where('log_type', '!=', 'Staff Grant');
-        })->orWhere(function($query) use ($character) {
+        })->orWhere(function ($query) use ($character) {
             $query->with('recipient.rank')->where('recipient_type', 'Character')->where('recipient_id', $character->id)->where('log_type', '!=', 'Staff Removal');
         })->orderBy('id', 'DESC');
-        if($limit) return $query->take($limit)->get();
-        else return $query->paginate(30);
+        if ($limit) {
+            return $query->take($limit)->get();
+        } else {
+            return $query->paginate(30);
+        }
     }
 
     /**
      * Get the character's item logs.
      *
-     * @param  int  $limit
-     * @return \Illuminate\Support\Collection|\Illuminate\Pagination\LengthAwarePaginator
+     * @param int $limit
+     *
+     * @return \Illuminate\Pagination\LengthAwarePaginator|\Illuminate\Support\Collection
      */
-    public function getItemLogs($limit = 10)
-    {
+    public function getItemLogs($limit = 10) {
         $character = $this;
 
-        $query = ItemLog::with('item')->where(function($query) use ($character) {
+        $query = ItemLog::with('item')->where(function ($query) use ($character) {
             $query->with('sender.rank')->where('sender_type', 'Character')->where('sender_id', $character->id)->where('log_type', '!=', 'Staff Grant');
-        })->orWhere(function($query) use ($character) {
+        })->orWhere(function ($query) use ($character) {
             $query->with('recipient.rank')->where('recipient_type', 'Character')->where('recipient_id', $character->id)->where('log_type', '!=', 'Staff Removal');
         })->orderBy('id', 'DESC');
 
-        if($limit) return $query->take($limit)->get();
-        else return $query->paginate(30);
+        if ($limit) {
+            return $query->take($limit)->get();
+        } else {
+            return $query->paginate(30);
+        }
     }
 
     /**
@@ -468,9 +477,9 @@ public function getItemLogs($limit = 10)
      *
      * @return \Illuminate\Pagination\LengthAwarePaginator
      */
-    public function getOwnershipLogs()
-    {
+    public function getOwnershipLogs() {
         $query = UserCharacterLog::with('sender.rank')->with('recipient.rank')->where('character_id', $this->id)->orderBy('id', 'DESC');
+
         return $query->paginate(30);
     }
 
@@ -479,9 +488,9 @@ public function getOwnershipLogs()
      *
      * @return \Illuminate\Pagination\LengthAwarePaginator
      */
-    public function getCharacterLogs()
-    {
+    public function getCharacterLogs() {
         $query = CharacterLog::with('sender.rank')->where('character_id', $this->id)->orderBy('id', 'DESC');
+
         return $query->paginate(30);
     }
 
@@ -490,8 +499,7 @@ public function getCharacterLogs()
      *
      * @return \Illuminate\Pagination\LengthAwarePaginator
      */
-    public function getSubmissions()
-    {
+    public function getSubmissions() {
         return Submission::with('user.rank')->with('prompt')->where('status', 'Approved')->whereIn('id', SubmissionCharacter::where('character_id', $this->id)->pluck('submission_id')->toArray())->paginate(30);
 
         // Untested
@@ -507,13 +515,14 @@ public function getSubmissions()
 
     /**
      * Notifies character's bookmarkers in case of a change.
+     *
+     * @param mixed $type
      */
-    public function notifyBookmarkers($type)
-    {
+    public function notifyBookmarkers($type) {
         // Bookmarkers will not be notified if the character is set to not visible
-        if($this->is_visible) {
+        if ($this->is_visible) {
             $column = null;
-            switch($type) {
+            switch ($type) {
                 case 'BOOKMARK_TRADING':
                     $column = 'notify_on_trade_status';
                     break;
@@ -534,17 +543,20 @@ public function notifyBookmarkers($type)
             // The owner of the character themselves will not be notified, in the case that
             // they still have a bookmark on the character after it was transferred to them
             $bookmarkers = CharacterBookmark::where('character_id', $this->id)->where('user_id', '!=', $this->user_id);
-            if($column) $bookmarkers = $bookmarkers->where($column, 1);
+            if ($column) {
+                $bookmarkers = $bookmarkers->where($column, 1);
+            }
 
             $bookmarkers = User::whereIn('id', $bookmarkers->pluck('user_id')->toArray())->get();
 
             // This may have to be redone more efficiently in the case of large numbers of bookmarkers,
             // but since we're not expecting many users on the site to begin with it should be fine
-            foreach($bookmarkers as $bookmarker)
+            foreach ($bookmarkers as $bookmarker) {
                 Notifications::create($type, $bookmarker, [
-                    'character_url' => $this->url,
-                    'character_name' => $this->fullName
+                    'character_url'  => $this->url,
+                    'character_name' => $this->fullName,
                 ]);
+            }
         }
     }
 }
diff --git a/app/Models/Character/CharacterBookmark.php b/app/Models/Character/CharacterBookmark.php
index 11eddc19ec..ab1ea479f0 100644
--- a/app/Models/Character/CharacterBookmark.php
+++ b/app/Models/Character/CharacterBookmark.php
@@ -3,26 +3,24 @@
 namespace App\Models\Character;
 
 use App\Models\Model;
+use App\Models\User\User;
 
-class CharacterBookmark extends Model
-{
-
+class CharacterBookmark extends Model {
     /**
      * The attributes that are mass assignable.
      *
      * @var array
      */
     protected $fillable = [
-        'user_id', 'character_id', 'notify_on_trade_status', 'notify_on_gift_art_status', 'notify_on_gift_writing_status', 'notify_on_transfer', 'notify_on_image', 'comment'
+        'user_id', 'character_id', 'notify_on_trade_status', 'notify_on_gift_art_status', 'notify_on_gift_writing_status', 'notify_on_transfer', 'notify_on_image', 'comment',
     ];
-    
+
     /**
      * The table associated with the model.
      *
      * @var string
      */
     protected $table = 'character_bookmarks';
-    
     /**
      * Validation rules for creation.
      *
@@ -30,20 +28,20 @@ class CharacterBookmark extends Model
      */
     public static $createRules = [
         'character_id' => 'required',
-        'comment' => 'string|nullable|max:500'
+        'comment'      => 'string|nullable|max:500',
     ];
-    
+
     /**
      * Validation rules for updating.
      *
      * @var array
      */
     public static $updateRules = [
-        'comment' => 'string|nullable|max:500'
+        'comment' => 'string|nullable|max:500',
     ];
 
     /**********************************************************************************************
-    
+
         SCOPES
 
     **********************************************************************************************/
@@ -51,18 +49,18 @@ class CharacterBookmark extends Model
     /**
      * Scope a query to only include visible characters.
      *
-     * @param  \Illuminate\Database\Eloquent\Builder  $query
+     * @param \Illuminate\Database\Eloquent\Builder $query
+     *
      * @return \Illuminate\Database\Eloquent\Builder
      */
-    public function scopeVisible($query)
-    {
-        return $query->whereHas('character', function($query) {
+    public function scopeVisible($query) {
+        return $query->whereHas('character', function ($query) {
             $query->where('is_visible', 1);
         });
     }
 
     /**********************************************************************************************
-    
+
         RELATIONS
 
     **********************************************************************************************/
@@ -70,16 +68,14 @@ public function scopeVisible($query)
     /**
      * Get the character the record belongs to.
      */
-    public function character() 
-    {
-        return $this->belongsTo('App\Models\Character\Character');
+    public function character() {
+        return $this->belongsTo(Character::class);
     }
-    
+
     /**
      * Get the user the record belongs to.
      */
-    public function user() 
-    {
-        return $this->belongsTo('App\Models\User\User');
+    public function user() {
+        return $this->belongsTo(User::class);
     }
 }
diff --git a/app/Models/Character/CharacterCategory.php b/app/Models/Character/CharacterCategory.php
index a045426e44..e5c8dbeb7a 100644
--- a/app/Models/Character/CharacterCategory.php
+++ b/app/Models/Character/CharacterCategory.php
@@ -2,18 +2,16 @@
 
 namespace App\Models\Character;
 
-use Config;
 use App\Models\Model;
 
-class CharacterCategory extends Model
-{
+class CharacterCategory extends Model {
     /**
      * The attributes that are mass assignable.
      *
      * @var array
      */
     protected $fillable = [
-        'code', 'name', 'sort', 'has_image', 'description', 'parsed_description', 'masterlist_sub_id'
+        'code', 'name', 'sort', 'has_image', 'description', 'parsed_description', 'masterlist_sub_id', 'is_visible', 'hash',
     ];
 
     /**
@@ -22,58 +20,78 @@ class CharacterCategory extends Model
      * @var string
      */
     protected $table = 'character_categories';
-    
+
     /**
      * Validation rules for creation.
      *
      * @var array
      */
     public static $createRules = [
-        'name' => 'required|unique:character_categories|between:3,100',
-        'code' => 'required|unique:character_categories|between:1,25',
+        'name'        => 'required|unique:character_categories|between:3,100',
+        'code'        => 'required|unique:character_categories|between:1,25',
         'description' => 'nullable',
-        'image' => 'mimes:png',
+        'image'       => 'mimes:png',
     ];
-    
+
     /**
      * Validation rules for updating.
      *
      * @var array
      */
     public static $updateRules = [
-        'name' => 'required|between:3,100',
-        'code' => 'required|between:1,25',
+        'name'        => 'required|between:3,100',
+        'code'        => 'required|between:1,25',
         'description' => 'nullable',
-        'image' => 'mimes:png',
+        'image'       => 'mimes:png',
     ];
 
     /**********************************************************************************************
-    
+
         RELATIONS
 
     **********************************************************************************************/
-    
+
     /**
      * Get the sub masterlist for this species.
      */
-    public function sublist() 
-    {
-        return $this->belongsTo('App\Models\Character\Sublist', 'masterlist_sub_id');
+    public function sublist() {
+        return $this->belongsTo(Sublist::class, 'masterlist_sub_id');
+    }
+
+    /**********************************************************************************************
+
+        SCOPES
+
+    **********************************************************************************************/
+
+    /**
+     * Scope a query to show only visible categories.
+     *
+     * @param \Illuminate\Database\Eloquent\Builder $query
+     * @param mixed|null                            $user
+     *
+     * @return \Illuminate\Database\Eloquent\Builder
+     */
+    public function scopeVisible($query, $user = null) {
+        if ($user && $user->hasPower('edit_data')) {
+            return $query;
+        }
+
+        return $query->where('is_visible', 1);
     }
 
     /**********************************************************************************************
-    
+
         ACCESSORS
 
     **********************************************************************************************/
-    
+
     /**
      * Displays the model's name, linked to its encyclopedia page.
      *
      * @return string
      */
-    public function getDisplayNameAttribute()
-    {
+    public function getDisplayNameAttribute() {
         return '<a href="'.$this->url.'" class="display-category">'.$this->name.' ('.$this->code.')</a>';
     }
 
@@ -82,8 +100,7 @@ public function getDisplayNameAttribute()
      *
      * @return string
      */
-    public function getImageDirectoryAttribute()
-    {
+    public function getImageDirectoryAttribute() {
         return 'images/data/character-categories';
     }
 
@@ -92,9 +109,8 @@ public function getImageDirectoryAttribute()
      *
      * @return string
      */
-    public function getCategoryImageFileNameAttribute()
-    {
-        return $this->id . '-image.png';
+    public function getCategoryImageFileNameAttribute() {
+        return $this->hash.$this->id.'-image.png';
     }
 
     /**
@@ -102,20 +118,21 @@ public function getCategoryImageFileNameAttribute()
      *
      * @return string
      */
-    public function getCategoryImagePathAttribute()
-    {
+    public function getCategoryImagePathAttribute() {
         return public_path($this->imageDirectory);
     }
-    
+
     /**
      * Gets the URL of the model's image.
      *
      * @return string
      */
-    public function getCategoryImageUrlAttribute()
-    {
-        if (!$this->has_image) return null;
-        return asset($this->imageDirectory . '/' . $this->categoryImageFileName);
+    public function getCategoryImageUrlAttribute() {
+        if (!$this->has_image) {
+            return null;
+        }
+
+        return asset($this->imageDirectory.'/'.$this->categoryImageFileName);
     }
 
     /**
@@ -123,8 +140,7 @@ public function getCategoryImageUrlAttribute()
      *
      * @return string
      */
-    public function getUrlAttribute()
-    {
+    public function getUrlAttribute() {
         return url('world/character-categories?name='.$this->name);
     }
 
@@ -133,11 +149,29 @@ public function getUrlAttribute()
      *
      * @return string
      */
-    public function getSearchUrlAttribute()
-    {
-        if($this->masterlist_sub_id != 0 && $this->sublist->show_main == 0)
-        return url('sublist/'.$this->sublist->key.'?character_category_id='.$this->id);
-        else
-        return url('masterlist?character_category_id='.$this->id);
+    public function getSearchUrlAttribute() {
+        if ($this->masterlist_sub_id != 0 && $this->sublist->show_main == 0) {
+            return url('sublist/'.$this->sublist->key.'?character_category_id='.$this->id);
+        } else {
+            return url('masterlist?character_category_id='.$this->id);
+        }
+    }
+
+    /**
+     * Gets the admin edit URL.
+     *
+     * @return string
+     */
+    public function getAdminUrlAttribute() {
+        return url('admin/data/character-categories/edit/'.$this->id);
+    }
+
+    /**
+     * Gets the power required to edit this model.
+     *
+     * @return string
+     */
+    public function getAdminPowerAttribute() {
+        return 'edit_data';
     }
 }
diff --git a/app/Models/Character/CharacterCurrency.php b/app/Models/Character/CharacterCurrency.php
index 75366234bc..a4ca7f61ac 100644
--- a/app/Models/Character/CharacterCurrency.php
+++ b/app/Models/Character/CharacterCurrency.php
@@ -2,20 +2,19 @@
 
 namespace App\Models\Character;
 
+use App\Models\Currency\Currency;
 use App\Models\Model;
 
-class CharacterCurrency extends Model
-{
-
+class CharacterCurrency extends Model {
     /**
      * The attributes that are mass assignable.
      *
      * @var array
      */
     protected $fillable = [
-        'quantity', 'character_id', 'currency_id'
+        'quantity', 'character_id', 'currency_id',
     ];
-    
+
     /**
      * The table associated with the model.
      *
@@ -24,7 +23,7 @@ class CharacterCurrency extends Model
     protected $table = 'character_currencies';
 
     /**********************************************************************************************
-    
+
         RELATIONS
 
     **********************************************************************************************/
@@ -32,32 +31,29 @@ class CharacterCurrency extends Model
     /**
      * Get the character the record belongs to.
      */
-    public function character() 
-    {
-        return $this->belongsTo('App\Models\Character\Character');
+    public function character() {
+        return $this->belongsTo(Character::class);
     }
-    
+
     /**
      * Get the currency associated with this record.
      */
-    public function currency() 
-    {
-        return $this->belongsTo('App\Models\Currency\Currency');
+    public function currency() {
+        return $this->belongsTo(Currency::class);
     }
 
     /**********************************************************************************************
-    
+
         ACCESSORS
 
     **********************************************************************************************/
 
     /**
      * Get the name of the currency formatted with the quantity owned.
-     * 
+     *
      * @return string
      */
-    public function getNameWithQuantityAttribute()
-    {
-        return $this->currency->name . ' [Owned: ' . $this->quantity . ']';
+    public function getNameWithQuantityAttribute() {
+        return $this->currency->name.' [Owned: '.$this->quantity.']';
     }
 }
diff --git a/app/Models/Character/CharacterDesignUpdate.php b/app/Models/Character/CharacterDesignUpdate.php
index dbfcbfb089..79411ce694 100644
--- a/app/Models/Character/CharacterDesignUpdate.php
+++ b/app/Models/Character/CharacterDesignUpdate.php
@@ -2,15 +2,15 @@
 
 namespace App\Models\Character;
 
-use Config;
-use DB;
-use App\Models\Model;
 use App\Models\Currency\Currency;
-use App\Models\Feature\FeatureCategory;
+use App\Models\Model;
+use App\Models\Rarity;
+use App\Models\Species\Species;
+use App\Models\Species\Subtype;
+use App\Models\User\User;
 use Illuminate\Database\Eloquent\SoftDeletes;
 
-class CharacterDesignUpdate extends Model
-{
+class CharacterDesignUpdate extends Model {
     use SoftDeletes;
 
     /**
@@ -25,7 +25,7 @@ class CharacterDesignUpdate extends Model
         'hash', 'species_id', 'subtype_id', 'rarity_id',
         'has_comments', 'has_image', 'has_addons', 'has_features',
         'submitted_at', 'update_type', 'fullsize_hash',
-        'approval_votes', 'rejection_votes', 'title_id', 'title_data'
+        'approval_votes', 'rejection_votes', 'title_id', 'title_data',
     ];
 
     /**
@@ -36,18 +36,20 @@ class CharacterDesignUpdate extends Model
     protected $table = 'design_updates';
 
     /**
-     * Whether the model contains timestamps to be saved and updated.
+     * The attributes that should be cast to native types.
      *
-     * @var string
+     * @var array
      */
-    public $timestamps = true;
+    protected $casts = [
+        'submitted_at' => 'datetime',
+    ];
 
     /**
-     * Dates on the model to convert to Carbon instances.
+     * Whether the model contains timestamps to be saved and updated.
      *
-     * @var array
+     * @var string
      */
-    public $dates = ['submitted_at'];
+    public $timestamps = true;
 
     /**
      * Validation rules for uploaded images.
@@ -55,10 +57,10 @@ class CharacterDesignUpdate extends Model
      * @var array
      */
     public static $imageRules = [
-        'image' => 'nullable|mimes:jpeg,gif,png',
-        'thumbnail' => 'nullable|mimes:jpeg,gif,png',
-        'artist_url.*' => 'nullable|url',
-        'designer_url.*' => 'nullable|url'
+        'image'          => 'nullable|mimes:jpeg,gif,png',
+        'thumbnail'      => 'nullable|mimes:jpeg,gif,png',
+        'artist_url.*'   => 'nullable|url',
+        'designer_url.*' => 'nullable|url',
     ];
 
     /**********************************************************************************************
@@ -70,49 +72,43 @@ class CharacterDesignUpdate extends Model
     /**
      * Get the character associated with the design update.
      */
-    public function character()
-    {
-        return $this->belongsTo('App\Models\Character\Character', 'character_id');
+    public function character() {
+        return $this->belongsTo(Character::class, 'character_id');
     }
 
     /**
      * Get the user who created the design update.
      */
-    public function user()
-    {
-        return $this->belongsTo('App\Models\User\User', 'user_id');
+    public function user() {
+        return $this->belongsTo(User::class, 'user_id');
     }
 
     /**
      * Get the staff who processed the design update.
      */
-    public function staff()
-    {
-        return $this->belongsTo('App\Models\User\User', 'staff_id');
+    public function staff() {
+        return $this->belongsTo(User::class, 'staff_id');
     }
 
     /**
      * Get the species of the design update.
      */
-    public function species()
-    {
-        return $this->belongsTo('App\Models\Species\Species', 'species_id');
+    public function species() {
+        return $this->belongsTo(Species::class, 'species_id');
     }
 
     /**
      * Get the subtype of the design update.
      */
-    public function subtype()
-    {
-        return $this->belongsTo('App\Models\Species\Subtype', 'subtype_id');
+    public function subtype() {
+        return $this->belongsTo(Subtype::class, 'subtype_id');
     }
 
     /**
      * Get the rarity of the design update.
      */
-    public function rarity()
-    {
-        return $this->belongsTo('App\Models\Rarity', 'rarity_id');
+    public function rarity() {
+        return $this->belongsTo(Rarity::class, 'rarity_id');
     }
 
     /**
@@ -126,37 +122,35 @@ public function title()
     /**
      * Get the features (traits) attached to the design update, ordered by display order.
      */
-    public function features()
-    {
-        $ids = FeatureCategory::orderBy('sort', 'DESC')->pluck('id')->toArray();
+    public function features() {
+        $query = $this
+            ->hasMany(CharacterFeature::class, 'character_image_id')->where('character_features.character_type', 'Update')
+            ->join('features', 'features.id', '=', 'character_features.feature_id')
+            ->leftJoin('feature_categories', 'feature_categories.id', '=', 'features.feature_category_id')
+            ->select(['character_features.*', 'features.*', 'character_features.id AS character_feature_id', 'feature_categories.sort']);
 
-        $query = $this->hasMany('App\Models\Character\CharacterFeature', 'character_image_id')->where('character_features.character_type', 'Update')->join('features', 'features.id', '=', 'character_features.feature_id')->select(['character_features.*', 'features.*', 'character_features.id AS character_feature_id']);
-
-        return count($ids) ? $query->orderByRaw(DB::raw('FIELD(features.feature_category_id, '.implode(',', $ids).')')) : $query;
+        return $query->orderByDesc('sort');
     }
 
     /**
      * Get the features (traits) attached to the design update with no extra sorting.
      */
-    public function rawFeatures()
-    {
-        return $this->hasMany('App\Models\Character\CharacterFeature', 'character_image_id')->where('character_features.character_type', 'Update');
+    public function rawFeatures() {
+        return $this->hasMany(CharacterFeature::class, 'character_image_id')->where('character_features.character_type', 'Update');
     }
 
     /**
      * Get the designers attached to the design update.
      */
-    public function designers()
-    {
-        return $this->hasMany('App\Models\Character\CharacterImageCreator', 'character_image_id')->where('type', 'Designer')->where('character_type', 'Update');
+    public function designers() {
+        return $this->hasMany(CharacterImageCreator::class, 'character_image_id')->where('type', 'Designer')->where('character_type', 'Update');
     }
 
     /**
      * Get the artists attached to the design update.
      */
-    public function artists()
-    {
-        return $this->hasMany('App\Models\Character\CharacterImageCreator', 'character_image_id')->where('type', 'Artist')->where('character_type', 'Update');
+    public function artists() {
+        return $this->hasMany(CharacterImageCreator::class, 'character_image_id')->where('type', 'Artist')->where('character_type', 'Update');
     }
 
     /**********************************************************************************************
@@ -168,36 +162,58 @@ public function artists()
     /**
      * Scope a query to only include active (Open or Pending) update requests.
      *
-     * @param  \Illuminate\Database\Eloquent\Builder  $query
+     * @param \Illuminate\Database\Eloquent\Builder $query
+     *
      * @return \Illuminate\Database\Eloquent\Builder
      */
-    public function scopeActive($query)
-    {
+    public function scopeActive($query) {
         return $query->where('status', '!=', 'Approved')->where('status', '!=', 'Rejected');
     }
 
     /**
      * Scope a query to only include MYO slot approval requests.
      *
-     * @param  \Illuminate\Database\Eloquent\Builder  $query
+     * @param \Illuminate\Database\Eloquent\Builder $query
+     *
      * @return \Illuminate\Database\Eloquent\Builder
      */
-    public function scopeMyos($query)
-    {
+    public function scopeMyos($query) {
         $query->select('design_updates.*')->where('update_type', 'MYO');
     }
 
     /**
      * Scope a query to only include character design update requests.
      *
-     * @param  \Illuminate\Database\Eloquent\Builder  $query
+     * @param \Illuminate\Database\Eloquent\Builder $query
+     *
      * @return \Illuminate\Database\Eloquent\Builder
      */
-    public function scopeCharacters($query)
-    {
+    public function scopeCharacters($query) {
         $query->select('design_updates.*')->where('update_type', 'Character');
     }
 
+    /**
+     * Scope a query to sort updates by oldest first.
+     *
+     * @param \Illuminate\Database\Eloquent\Builder $query
+     *
+     * @return \Illuminate\Database\Eloquent\Builder
+     */
+    public function scopeSortOldest($query) {
+        return $query->orderBy('id');
+    }
+
+    /**
+     * Scope a query to sort updates by newest first.
+     *
+     * @param \Illuminate\Database\Eloquent\Builder $query
+     *
+     * @return \Illuminate\Database\Eloquent\Builder
+     */
+    public function scopeSortNewest($query) {
+        return $query->orderBy('id', 'DESC');
+    }
+
     /**********************************************************************************************
 
         ACCESSORS
@@ -209,8 +225,7 @@ public function scopeCharacters($query)
      *
      * @return array
      */
-    public function getDataAttribute()
-    {
+    public function getDataAttribute() {
         return json_decode($this->attributes['data'], true);
     }
 
@@ -219,8 +234,7 @@ public function getDataAttribute()
      *
      * @return array
      */
-    public function getInventoryAttribute()
-    {
+    public function getInventoryAttribute() {
         // This is for showing the addons page
         // just need to retrieve a list of stack IDs to tell which ones to check
 
@@ -232,8 +246,7 @@ public function getInventoryAttribute()
      *
      * @return array
      */
-    public function getUserBankAttribute()
-    {
+    public function getUserBankAttribute() {
         return $this->data && isset($this->data['user']['currencies']) ? $this->data['user']['currencies'] : [];
     }
 
@@ -242,8 +255,7 @@ public function getUserBankAttribute()
      *
      * @return array
      */
-    public function getCharacterBankAttribute()
-    {
+    public function getCharacterBankAttribute() {
         return $this->data && isset($this->data['character']['currencies']) ? $this->data['character']['currencies'] : [];
     }
 
@@ -252,9 +264,8 @@ public function getCharacterBankAttribute()
      *
      * @return bool
      */
-    public function getIsCompleteAttribute()
-    {
-        return ($this->has_comments && $this->has_image && $this->has_addons && $this->has_features);
+    public function getIsCompleteAttribute() {
+        return $this->has_comments && $this->has_image && $this->has_addons && $this->has_features;
     }
 
     /**
@@ -262,8 +273,7 @@ public function getIsCompleteAttribute()
      *
      * @return string
      */
-    public function getImageDirectoryAttribute()
-    {
+    public function getImageDirectoryAttribute() {
         return 'images/character-updates/'.floor($this->id / 1000);
     }
 
@@ -272,9 +282,8 @@ public function getImageDirectoryAttribute()
      *
      * @return string
      */
-    public function getImageFileNameAttribute()
-    {
-        return $this->id . '_'.$this->hash.'.'.$this->extension;
+    public function getImageFileNameAttribute() {
+        return $this->id.'_'.$this->hash.'.'.$this->extension;
     }
 
     /**
@@ -282,8 +291,7 @@ public function getImageFileNameAttribute()
      *
      * @return string
      */
-    public function getImagePathAttribute()
-    {
+    public function getImagePathAttribute() {
         return public_path($this->imageDirectory);
     }
 
@@ -292,9 +300,8 @@ public function getImagePathAttribute()
      *
      * @return string
      */
-    public function getImageUrlAttribute()
-    {
-        return asset($this->imageDirectory . '/' . $this->imageFileName);
+    public function getImageUrlAttribute() {
+        return asset($this->imageDirectory.'/'.$this->imageFileName);
     }
 
     /**
@@ -302,9 +309,8 @@ public function getImageUrlAttribute()
      *
      * @return string
      */
-    public function getThumbnailFileNameAttribute()
-    {
-        return $this->id . '_'.$this->hash.'_th.'.$this->extension;
+    public function getThumbnailFileNameAttribute() {
+        return $this->id.'_'.$this->hash.'_th.'.$this->extension;
     }
 
     /**
@@ -312,8 +318,7 @@ public function getThumbnailFileNameAttribute()
      *
      * @return string
      */
-    public function getThumbnailPathAttribute()
-    {
+    public function getThumbnailPathAttribute() {
         return $this->imagePath;
     }
 
@@ -322,9 +327,8 @@ public function getThumbnailPathAttribute()
      *
      * @return string
      */
-    public function getThumbnailUrlAttribute()
-    {
-        return asset($this->imageDirectory . '/' . $this->thumbnailFileName);
+    public function getThumbnailUrlAttribute() {
+        return asset($this->imageDirectory.'/'.$this->thumbnailFileName);
     }
 
     /**
@@ -332,8 +336,7 @@ public function getThumbnailUrlAttribute()
      *
      * @return string
      */
-    public function getUrlAttribute()
-    {
+    public function getUrlAttribute() {
         return url('designs/'.$this->id);
     }
 
@@ -342,8 +345,7 @@ public function getUrlAttribute()
      *
      * @return string
      */
-    public function getVoteDataAttribute()
-    {
+    public function getVoteDataAttribute() {
         return collect(json_decode($this->attributes['vote_data'], true));
     }
 
@@ -366,20 +368,25 @@ public function getTitleDataAttribute()
     /**
      * Get the available currencies that the user can attach to this update request.
      *
-     * @param  string  $type
+     * @param string $type
+     *
      * @return array
      */
-    public function getBank($type)
-    {
-        if($type == 'user') $currencies = $this->userBank;
-        else $currencies = $this->characterBank;
-        if(!count($currencies)) return [];
+    public function getBank($type) {
+        if ($type == 'user') {
+            $currencies = $this->userBank;
+        } else {
+            $currencies = $this->characterBank;
+        }
+        if (!count($currencies)) {
+            return [];
+        }
         $ids = array_keys($currencies);
         $result = Currency::whereIn('id', $ids)->get();
-        foreach($result as $i=>$currency)
-        {
+        foreach ($result as $i=> $currency) {
             $currency->quantity = $currencies[$currency->id];
         }
+
         return $result;
     }
 }
diff --git a/app/Models/Character/CharacterFeature.php b/app/Models/Character/CharacterFeature.php
index 823fc209e7..43a71d0bab 100644
--- a/app/Models/Character/CharacterFeature.php
+++ b/app/Models/Character/CharacterFeature.php
@@ -2,21 +2,17 @@
 
 namespace App\Models\Character;
 
-use Config;
-use DB;
+use App\Models\Feature\Feature;
 use App\Models\Model;
-use App\Models\Character\CharacterCategory;
-
-class CharacterFeature extends Model
-{
 
+class CharacterFeature extends Model {
     /**
      * The attributes that are mass assignable.
      *
      * @var array
      */
     protected $fillable = [
-        'character_image_id', 'feature_id', 'data', 'character_type'
+        'character_image_id', 'feature_id', 'data', 'character_type',
     ];
 
     /**
@@ -24,10 +20,17 @@ class CharacterFeature extends Model
      *
      * @var string
      */
-    protected $table = 'character_features';    
-    
+    protected $table = 'character_features';
+
+    /**
+     * The relationships that should always be loaded.
+     *
+     * @var array
+     */
+    protected $with = ['feature'];
+
     /**********************************************************************************************
-    
+
         RELATIONS
 
     **********************************************************************************************/
@@ -35,16 +38,14 @@ class CharacterFeature extends Model
     /**
      * Get the image associated with this record.
      */
-    public function image() 
-    {
-        return $this->belongsTo('App\Models\Character\CharacterImage', 'character_image_id');
+    public function image() {
+        return $this->belongsTo(CharacterImage::class, 'character_image_id');
     }
-    
+
     /**
      * Get the feature (character trait) associated with this record.
      */
-    public function feature() 
-    {
-        return $this->belongsTo('App\Models\Feature\Feature', 'feature_id');
+    public function feature() {
+        return $this->belongsTo(Feature::class, 'feature_id');
     }
 }
diff --git a/app/Models/Character/CharacterImage.php b/app/Models/Character/CharacterImage.php
index 4bab19fb19..4522fa07f0 100644
--- a/app/Models/Character/CharacterImage.php
+++ b/app/Models/Character/CharacterImage.php
@@ -2,15 +2,14 @@
 
 namespace App\Models\Character;
 
-use Config;
-use DB;
 use App\Models\Model;
-use App\Models\Feature\FeatureCategory;
-use App\Models\Character\CharacterCategory;
+use App\Models\Rarity;
+use App\Models\Species\Species;
+use App\Models\Species\Subtype;
+use App\Models\User\User;
 use Illuminate\Database\Eloquent\SoftDeletes;
 
-class CharacterImage extends Model
-{
+class CharacterImage extends Model {
     use SoftDeletes;
 
     /**
@@ -19,11 +18,11 @@ class CharacterImage extends Model
      * @var array
      */
     protected $fillable = [
-        'character_id', 'user_id', 'species_id', 'subtype_id', 'rarity_id', 'title_id', 'title_data', 'url',
-        'extension', 'use_cropper', 'hash', 'fullsize_hash', 'sort',
+        'character_id', 'user_id', 'species_id', 'subtype_id', 'rarity_id', 'url',
+        'extension', 'use_cropper', 'hash', 'fullsize_hash', 'fullsize_extension', 'sort',
         'x0', 'x1', 'y0', 'y1',
         'description', 'parsed_description',
-        'is_valid',
+        'is_valid', 'title_id', 'title_data',
     ];
 
     /**
@@ -47,9 +46,9 @@ class CharacterImage extends Model
      */
     public static $createRules = [
         'species_id' => 'required',
-        'rarity_id' => 'required',
-        'image' => 'required|mimes:jpeg,jpg,gif,png|max:20000',
-        'thumbnail' => 'nullable|mimes:jpeg,jpg,gif,png|max:20000',
+        'rarity_id'  => 'required',
+        'image'      => 'required|mimes:jpeg,jpg,gif,png,webp|max:2048',
+        'thumbnail'  => 'nullable|mimes:jpeg,jpg,gif,png,webp|max:2048',
     ];
 
     /**
@@ -59,10 +58,12 @@ class CharacterImage extends Model
      */
     public static $updateRules = [
         'character_id' => 'required',
-        'user_id' => 'required',
-        'species_id' => 'required',
-        'rarity_id' => 'required',
-        'description' => 'nullable',
+        'user_id'      => 'required',
+        'species_id'   => 'required',
+        'rarity_id'    => 'required',
+        'description'  => 'nullable',
+        'image'        => 'mimes:jpeg,jpg,gif,png,webp|max:2048',
+        'thumbnail'    => 'nullable|mimes:jpeg,jpg,gif,png,webp|max:2048',
     ];
 
     /**********************************************************************************************
@@ -74,41 +75,36 @@ class CharacterImage extends Model
     /**
      * Get the character associated with the image.
      */
-    public function character()
-    {
-        return $this->belongsTo('App\Models\Character\Character', 'character_id');
+    public function character() {
+        return $this->belongsTo(Character::class, 'character_id');
     }
 
     /**
      * Get the user who owned the character at the time of image creation.
      */
-    public function user()
-    {
-        return $this->belongsTo('App\Models\User\User', 'user_id');
+    public function user() {
+        return $this->belongsTo(User::class, 'user_id');
     }
 
     /**
      * Get the species of the character image.
      */
-    public function species()
-    {
-        return $this->belongsTo('App\Models\Species\Species', 'species_id');
+    public function species() {
+        return $this->belongsTo(Species::class, 'species_id');
     }
 
     /**
      * Get the subtype of the character image.
      */
-    public function subtype()
-    {
-        return $this->belongsTo('App\Models\Species\Subtype', 'subtype_id');
+    public function subtype() {
+        return $this->belongsTo(Subtype::class, 'subtype_id');
     }
 
     /**
      * Get the rarity of the character image.
      */
-    public function rarity()
-    {
-        return $this->belongsTo('App\Models\Rarity', 'rarity_id');
+    public function rarity() {
+        return $this->belongsTo(Rarity::class, 'rarity_id');
     }
 
     /**
@@ -122,37 +118,35 @@ public function title()
     /**
      * Get the features (traits) attached to the character image, ordered by display order.
      */
-    public function features()
-    {
-        $ids = FeatureCategory::orderBy('sort', 'DESC')->pluck('id')->toArray();
-
-        $query = $this->hasMany('App\Models\Character\CharacterFeature', 'character_image_id')->where('character_features.character_type', 'Character')->join('features', 'features.id', '=', 'character_features.feature_id')->select(['character_features.*', 'features.*', 'character_features.id AS character_feature_id']);
-
-        return count($ids) ? $query->orderByRaw(DB::raw('FIELD(features.feature_category_id, '.implode(',', $ids).')')) : $query;
+    public function features() {
+        $query = $this
+            ->hasMany(CharacterFeature::class, 'character_image_id')->where('character_features.character_type', 'Character')
+            ->join('features', 'features.id', '=', 'character_features.feature_id')
+            ->leftJoin('feature_categories', 'feature_categories.id', '=', 'features.feature_category_id')
+            ->select(['character_features.*', 'features.*', 'character_features.id AS character_feature_id', 'feature_categories.sort']);
+
+        return $query->orderByDesc('sort');
     }
 
     /**
      * Get the designers/artists attached to the character image.
      */
-    public function creators()
-    {
-        return $this->hasMany('App\Models\Character\CharacterImageCreator', 'character_image_id');
+    public function creators() {
+        return $this->hasMany(CharacterImageCreator::class, 'character_image_id');
     }
 
     /**
      * Get the designers attached to the character image.
      */
-    public function designers()
-    {
-        return $this->hasMany('App\Models\Character\CharacterImageCreator', 'character_image_id')->where('type', 'Designer')->where('character_type', 'Character');
+    public function designers() {
+        return $this->hasMany(CharacterImageCreator::class, 'character_image_id')->where('type', 'Designer')->where('character_type', 'Character');
     }
 
     /**
      * Get the artists attached to the character image.
      */
-    public function artists()
-    {
-        return $this->hasMany('App\Models\Character\CharacterImageCreator', 'character_image_id')->where('type', 'Artist')->where('character_type', 'Character');
+    public function artists() {
+        return $this->hasMany(CharacterImageCreator::class, 'character_image_id')->where('type', 'Artist')->where('character_type', 'Character');
     }
 
     /**********************************************************************************************
@@ -164,13 +158,17 @@ public function artists()
     /**
      * Scope a query to only include images visible to guests and regular logged-in users.
      *
-     * @param  \Illuminate\Database\Eloquent\Builder  $query
+     * @param \Illuminate\Database\Eloquent\Builder $query
+     * @param mixed|null                            $user
+     *
      * @return \Illuminate\Database\Eloquent\Builder
      */
-    public function scopeImages($query, $user = null)
-    {
-        if(!$user || !$user->hasPower('manage_characters')) return $query->where('is_visible', 1)->orderBy('sort')->orderBy('id', 'DESC');
-        else return $query->orderBy('sort')->orderBy('id', 'DESC');
+    public function scopeImages($query, $user = null) {
+        if (!$user || !$user->hasPower('manage_characters')) {
+            return $query->where('is_visible', 1)->orderBy('sort')->orderBy('id', 'DESC');
+        } else {
+            return $query->orderBy('sort')->orderBy('id', 'DESC');
+        }
     }
 
     /**********************************************************************************************
@@ -184,8 +182,7 @@ public function scopeImages($query, $user = null)
      *
      * @return string
      */
-    public function getImageDirectoryAttribute()
-    {
+    public function getImageDirectoryAttribute() {
         return 'images/characters/'.floor($this->id / 1000);
     }
 
@@ -194,9 +191,8 @@ public function getImageDirectoryAttribute()
      *
      * @return string
      */
-    public function getImageFileNameAttribute()
-    {
-        return $this->id . '_'.$this->hash.'.'.$this->extension;
+    public function getImageFileNameAttribute() {
+        return $this->id.'_'.$this->hash.'.'.$this->extension;
     }
 
     /**
@@ -204,8 +200,7 @@ public function getImageFileNameAttribute()
      *
      * @return string
      */
-    public function getImagePathAttribute()
-    {
+    public function getImagePathAttribute() {
         return public_path($this->imageDirectory);
     }
 
@@ -214,9 +209,8 @@ public function getImagePathAttribute()
      *
      * @return string
      */
-    public function getImageUrlAttribute()
-    {
-        return asset($this->imageDirectory . '/' . $this->imageFileName);
+    public function getImageUrlAttribute() {
+        return asset($this->imageDirectory.'/'.$this->imageFileName);
     }
 
     /**
@@ -224,9 +218,9 @@ public function getImageUrlAttribute()
      *
      * @return string
      */
-    public function getFullsizeFileNameAttribute()
-    {
-        return $this->id . '_'.$this->hash.'_'.$this->fullsize_hash.'_full.'.$this->extension;
+    public function getFullsizeFileNameAttribute() {
+        // Backwards compatibility pre v3
+        return $this->id.'_'.$this->hash.'_'.$this->fullsize_hash.'_full.'.($this->fullsize_extension ?? $this->extension);
     }
 
     /**
@@ -234,22 +228,24 @@ public function getFullsizeFileNameAttribute()
      *
      * @return string
      */
-    public function getFullsizeUrlAttribute()
-    {
-        return asset($this->imageDirectory . '/' . $this->fullsizeFileName);
+    public function getFullsizeUrlAttribute() {
+        return asset($this->imageDirectory.'/'.$this->fullsizeFileName);
     }
 
     /**
      * Gets the file name of the model's fullsize image.
      *
-     * @param  user
+     * @param  User
+     * @param mixed|null $user
+     *
      * @return string
      */
-    public function canViewFull($user = null)
-    {
-        if(((isset($this->character->user_id) && ($user ? $this->character->user->id == $user->id : false)) || ($user ? $user->hasPower('manage_characters') : false)))
-        return true;
-        else return false;
+    public function canViewFull($user = null) {
+        if (((isset($this->character->user_id) && ($user ? $this->character->user->id == $user->id : false)) || ($user ? $user->hasPower('manage_characters') : false))) {
+            return true;
+        } else {
+            return false;
+        }
     }
 
     /**
@@ -257,9 +253,8 @@ public function canViewFull($user = null)
      *
      * @return string
      */
-    public function getThumbnailFileNameAttribute()
-    {
-        return $this->id . '_'.$this->hash.'_th.'.$this->extension;
+    public function getThumbnailFileNameAttribute() {
+        return $this->id.'_'.$this->hash.'_th.'.$this->extension;
     }
 
     /**
@@ -267,8 +262,7 @@ public function getThumbnailFileNameAttribute()
      *
      * @return string
      */
-    public function getThumbnailPathAttribute()
-    {
+    public function getThumbnailPathAttribute() {
         return $this->imagePath;
     }
 
@@ -277,9 +271,8 @@ public function getThumbnailPathAttribute()
      *
      * @return string
      */
-    public function getThumbnailUrlAttribute()
-    {
-        return asset($this->imageDirectory . '/' . $this->thumbnailFileName);
+    public function getThumbnailUrlAttribute() {
+        return asset($this->imageDirectory.'/'.$this->thumbnailFileName);
     }
 
     /**
diff --git a/app/Models/Character/CharacterImageCreator.php b/app/Models/Character/CharacterImageCreator.php
index 26f3027ce9..d696493117 100644
--- a/app/Models/Character/CharacterImageCreator.php
+++ b/app/Models/Character/CharacterImageCreator.php
@@ -2,22 +2,17 @@
 
 namespace App\Models\Character;
 
-use Config;
-use DB;
 use App\Models\Model;
 use App\Models\User\User;
-use App\Models\Character\CharacterCategory;
-
-class CharacterImageCreator extends Model
-{
 
+class CharacterImageCreator extends Model {
     /**
      * The attributes that are mass assignable.
      *
      * @var array
      */
     protected $fillable = [
-        'character_image_id', 'type', 'url', 'alias', 'character_type', 'user_id'
+        'character_image_id', 'type', 'url', 'alias', 'character_type', 'user_id',
     ];
 
     /**
@@ -26,63 +21,58 @@ class CharacterImageCreator extends Model
      * @var string
      */
     protected $table = 'character_image_creators';
-
     /**
      * Whether the model contains timestamps to be saved and updated.
      *
      * @var string
      */
     public $timestamps = false;
-    
+
     /**********************************************************************************************
-    
+
         RELATIONS
 
     **********************************************************************************************/
-    
+
     /**
      * Get the image associated with this record.
      */
-    public function image() 
-    {
-        return $this->belongsTo('App\Models\Character\CharacterImage', 'character_image_id');
+    public function image() {
+        return $this->belongsTo(CharacterImage::class, 'character_image_id');
     }
 
     /**
      * Get the user associated with this record.
      */
-    public function user()
-    {
-        return $this->belongsTo('App\Models\User\User', 'user_id');
+    public function user() {
+        return $this->belongsTo(User::class, 'user_id');
     }
 
     /**********************************************************************************************
-    
+
         OTHER FUNCTIONS
 
     **********************************************************************************************/
 
     /**
      * Displays a link using the creator's URL.
-     * 
+     *
      * @return string
      */
-    public function displayLink()
-    {
-        if($this->user_id)
-        {
+    public function displayLink() {
+        if ($this->user_id) {
             $user = User::find($this->user_id);
+
             return $user->displayName;
-        }
-        else if ($this->url)
-        {
+        } elseif ($this->url) {
             return prettyProfileLink($this->url);
-        }
-        else if($this->alias)
-        {
+        } elseif ($this->alias) {
             $user = User::where('alias', trim($this->alias))->first();
-            if($user) return $user->displayName;
-            else return '<a href="https://www.deviantart.com/'.$this->alias.'">'.$this->alias.'@dA</a>';
+            if ($user) {
+                return $user->displayName;
+            } else {
+                return '<a href="https://www.deviantart.com/'.$this->alias.'">'.$this->alias.'@dA</a>';
+            }
         }
     }
 }
diff --git a/app/Models/Character/CharacterItem.php b/app/Models/Character/CharacterItem.php
index 8fd0b7c5e8..dde652a0e2 100644
--- a/app/Models/Character/CharacterItem.php
+++ b/app/Models/Character/CharacterItem.php
@@ -2,11 +2,11 @@
 
 namespace App\Models\Character;
 
+use App\Models\Item\Item;
 use App\Models\Model;
 use Illuminate\Database\Eloquent\SoftDeletes;
 
-class CharacterItem extends Model
-{
+class CharacterItem extends Model {
     use SoftDeletes;
 
     /**
@@ -15,25 +15,25 @@ class CharacterItem extends Model
      * @var array
      */
     protected $fillable = [
-        'data', 'item_id', 'character_id', 'stack_name'
+        'data', 'item_id', 'character_id', 'stack_name',
     ];
 
     /**
-     * Whether the model contains timestamps to be saved and updated.
+     * The table associated with the model.
      *
      * @var string
      */
-    public $timestamps = true;
+    protected $table = 'character_items';
 
     /**
-     * The table associated with the model.
+     * Whether the model contains timestamps to be saved and updated.
      *
      * @var string
      */
-    protected $table = 'character_items';
+    public $timestamps = true;
 
     /**********************************************************************************************
-    
+
         RELATIONS
 
     **********************************************************************************************/
@@ -41,21 +41,19 @@ class CharacterItem extends Model
     /**
      * Get the character who owns the stack.
      */
-    public function character() 
-    {
-        return $this->belongsTo('App\Models\Character\Character');
+    public function character() {
+        return $this->belongsTo(Character::class);
     }
 
     /**
      * Get the item associated with this item stack.
      */
-    public function item() 
-    {
-        return $this->belongsTo('App\Models\Item\Item');
+    public function item() {
+        return $this->belongsTo(Item::class);
     }
 
     /**********************************************************************************************
-    
+
         ACCESSORS
 
     **********************************************************************************************/
@@ -65,19 +63,20 @@ public function item()
      *
      * @return array
      */
-    public function getDataAttribute() 
-    {
+    public function getDataAttribute() {
         return json_decode($this->attributes['data'], true);
     }
-    
+
     /**
      * Checks if the stack is transferrable.
      *
      * @return array
      */
-    public function getIsTransferrableAttribute()
-    {
-        if(!isset($this->data['disallow_transfer']) && $this->item->allow_transfer) return true;
+    public function getIsTransferrableAttribute() {
+        if (!isset($this->data['disallow_transfer']) && $this->item->allow_transfer) {
+            return true;
+        }
+
         return false;
     }
 
@@ -86,9 +85,8 @@ public function getIsTransferrableAttribute()
      *
      * @return int
      */
-    public function getAvailableQuantityAttribute()
-    {
-        return ($this->count);
+    public function getAvailableQuantityAttribute() {
+        return $this->count;
     }
 
     /**
@@ -96,8 +94,7 @@ public function getAvailableQuantityAttribute()
      *
      * @return string
      */
-    public function getAssetTypeAttribute()
-    {
+    public function getAssetTypeAttribute() {
         return 'character_items';
     }
 }
diff --git a/app/Models/Character/CharacterLog.php b/app/Models/Character/CharacterLog.php
index 519894a20f..343306f5fc 100644
--- a/app/Models/Character/CharacterLog.php
+++ b/app/Models/Character/CharacterLog.php
@@ -2,11 +2,10 @@
 
 namespace App\Models\Character;
 
-use Config;
 use App\Models\Model;
+use App\Models\User\User;
 
-class CharacterLog extends Model
-{
+class CharacterLog extends Model {
     /**
      * The attributes that are mass assignable.
      *
@@ -14,7 +13,7 @@ class CharacterLog extends Model
      */
     protected $fillable = [
         'character_id', 'sender_id', 'sender_alias', 'recipient_id', 'recipient_alias',
-        'log', 'log_type', 'data', 'change_log', 'sender_url', 'recipient_url'
+        'log', 'log_type', 'data', 'change_log', 'sender_url', 'recipient_url',
     ];
 
     /**
@@ -23,7 +22,6 @@ class CharacterLog extends Model
      * @var string
      */
     protected $table = 'character_log';
-
     /**
      * Whether the model contains timestamps to be saved and updated.
      *
@@ -32,7 +30,7 @@ class CharacterLog extends Model
     public $timestamps = true;
 
     /**********************************************************************************************
-    
+
         RELATIONS
 
     **********************************************************************************************/
@@ -40,29 +38,26 @@ class CharacterLog extends Model
     /**
      * Get the user who initiated the logged action.
      */
-    public function sender() 
-    {
-        return $this->belongsTo('App\Models\User\User', 'sender_id');
+    public function sender() {
+        return $this->belongsTo(User::class, 'sender_id');
     }
 
     /**
      * Get the user who received the logged action.
      */
-    public function recipient() 
-    {
-        return $this->belongsTo('App\Models\User\User', 'recipient_id');
+    public function recipient() {
+        return $this->belongsTo(User::class, 'recipient_id');
     }
 
     /**
      * Get the character that is the target of the action.
      */
-    public function character() 
-    {
-        return $this->belongsTo('App\Models\Character\Character');
+    public function character() {
+        return $this->belongsTo(Character::class);
     }
 
     /**********************************************************************************************
-    
+
         ACCESSORS
 
     **********************************************************************************************/
@@ -72,11 +67,12 @@ public function character()
      *
      * @return string
      */
-    public function getDisplayRecipientAliasAttribute()
-    {
-        if($this->recipient_url)
+    public function getDisplayRecipientAliasAttribute() {
+        if ($this->recipient_url) {
             return prettyProfileLink($this->recipient_url);
-        else return '---';
+        } else {
+            return '---';
+        }
     }
 
     /**
@@ -84,8 +80,7 @@ public function getDisplayRecipientAliasAttribute()
      *
      * @return array
      */
-    public function getChangedDataAttribute()
-    {
+    public function getChangedDataAttribute() {
         return json_decode($this->change_log, true);
     }
 }
diff --git a/app/Models/Character/CharacterProfile.php b/app/Models/Character/CharacterProfile.php
index b249115862..1e58dc4002 100644
--- a/app/Models/Character/CharacterProfile.php
+++ b/app/Models/Character/CharacterProfile.php
@@ -2,21 +2,16 @@
 
 namespace App\Models\Character;
 
-use Config;
-use DB;
 use App\Models\Model;
-use App\Models\Character\CharacterCategory;
-
-class CharacterProfile extends Model
-{
 
+class CharacterProfile extends Model {
     /**
      * The attributes that are mass assignable.
      *
      * @var array
      */
     protected $fillable = [
-        'character_id', 'text', 'parsed_text', 'link'
+        'character_id', 'text', 'parsed_text', 'link',
     ];
 
     /**
@@ -25,7 +20,6 @@ class CharacterProfile extends Model
      * @var string
      */
     protected $table = 'character_profiles';
-
     /**
      * The primary key of the model.
      *
@@ -39,7 +33,7 @@ class CharacterProfile extends Model
      * @var array
      */
     public static $rules = [
-        'link' => 'url|nullable'
+        'link' => 'url|nullable',
     ];
 
     /**********************************************************************************************
@@ -51,8 +45,7 @@ class CharacterProfile extends Model
     /**
      * Get the character this profile belongs to.
      */
-    public function character()
-    {
-        return $this->belongsTo('App\Models\Character\Character', 'character_id');
+    public function character() {
+        return $this->belongsTo(Character::class, 'character_id');
     }
 }
diff --git a/app/Models/Character/CharacterTransfer.php b/app/Models/Character/CharacterTransfer.php
index 09fe1d955c..5ecf904fab 100644
--- a/app/Models/Character/CharacterTransfer.php
+++ b/app/Models/Character/CharacterTransfer.php
@@ -2,12 +2,11 @@
 
 namespace App\Models\Character;
 
-use Config;
-use Settings;
+use App\Facades\Settings;
 use App\Models\Model;
+use App\Models\User\User;
 
-class CharacterTransfer extends Model
-{
+class CharacterTransfer extends Model {
     /**
      * The attributes that are mass assignable.
      *
@@ -15,7 +14,7 @@ class CharacterTransfer extends Model
      */
     protected $fillable = [
         'character_id', 'sender_id', 'user_reason', 'recipient_id',
-        'status', 'is_approved', 'reason', 'data'
+        'status', 'is_approved', 'reason', 'data',
     ];
 
     /**
@@ -24,7 +23,6 @@ class CharacterTransfer extends Model
      * @var string
      */
     protected $table = 'character_transfers';
-
     /**
      * Whether the model contains timestamps to be saved and updated.
      *
@@ -41,25 +39,22 @@ class CharacterTransfer extends Model
     /**
      * Get the user who initiated the transfer.
      */
-    public function sender()
-    {
-        return $this->belongsTo('App\Models\User\User', 'sender_id');
+    public function sender() {
+        return $this->belongsTo(User::class, 'sender_id');
     }
 
     /**
      * Get the user who received the transfer.
      */
-    public function recipient()
-    {
-        return $this->belongsTo('App\Models\User\User', 'recipient_id');
+    public function recipient() {
+        return $this->belongsTo(User::class, 'recipient_id');
     }
 
     /**
      * Get the character to be transferred.
      */
-    public function character()
-    {
-        return $this->belongsTo('App\Models\Character\Character');
+    public function character() {
+        return $this->belongsTo(Character::class);
     }
 
     /**********************************************************************************************
@@ -71,15 +66,15 @@ public function character()
     /**
      * Scope a query to only include pending trades, as well as trades pending staff approval.
      *
-     * @param  \Illuminate\Database\Eloquent\Builder  $query
+     * @param \Illuminate\Database\Eloquent\Builder $query
+     *
      * @return \Illuminate\Database\Eloquent\Builder
      */
-    public function scopeActive($query)
-    {
+    public function scopeActive($query) {
         $query->where('status', 'Pending');
 
-        if(Settings::get('open_transfers_queue')) {
-            $query->orWhere(function($query) {
+        if (Settings::get('open_transfers_queue')) {
+            $query->orWhere(function ($query) {
                 $query->where('status', 'Accepted')->where('is_approved', 0);
             });
         }
@@ -90,17 +85,40 @@ public function scopeActive($query)
     /**
      * Scope a query to only include completed trades.
      *
-     * @param  \Illuminate\Database\Eloquent\Builder  $query
+     * @param \Illuminate\Database\Eloquent\Builder $query
+     *
      * @return \Illuminate\Database\Eloquent\Builder
      */
-    public function scopeCompleted($query)
-    {
-        $query->where('status', 'Rejected')->orWhere('status', 'Canceled')->orWhere(function($query) {
+    public function scopeCompleted($query) {
+        $query->where('status', 'Rejected')->orWhere('status', 'Canceled')->orWhere(function ($query) {
             $query->where('status', 'Accepted')->where('is_approved', 1);
-        });;
+        });
+
         return $query;
     }
 
+    /**
+     * Scope a query to sort transfers by oldest first.
+     *
+     * @param \Illuminate\Database\Eloquent\Builder $query
+     *
+     * @return \Illuminate\Database\Eloquent\Builder
+     */
+    public function scopeSortOldest($query) {
+        return $query->orderBy('id');
+    }
+
+    /**
+     * Scope a query to sort transfers by newest first.
+     *
+     * @param \Illuminate\Database\Eloquent\Builder $query
+     *
+     * @return \Illuminate\Database\Eloquent\Builder
+     */
+    public function scopeSortNewest($query) {
+        return $query->orderBy('id', 'DESC');
+    }
+
     /**********************************************************************************************
 
         ACCESSORS
@@ -112,10 +130,13 @@ public function scopeCompleted($query)
      *
      * @return bool
      */
-    public function getIsActiveAttribute()
-    {
-        if($this->status == 'Pending') return true;
-        if(($this->status == 'Accepted') && $this->is_approved == 0) return true;
+    public function getIsActiveAttribute() {
+        if ($this->status == 'Pending') {
+            return true;
+        }
+        if (($this->status == 'Accepted') && $this->is_approved == 0) {
+            return true;
+        }
 
         return false;
     }
@@ -125,8 +146,7 @@ public function getIsActiveAttribute()
      *
      * @return array
      */
-    public function getDataAttribute()
-    {
+    public function getDataAttribute() {
         return json_decode($this->attributes['data'], true);
     }
 }
diff --git a/app/Models/Character/Sublist.php b/app/Models/Character/Sublist.php
index bb59a4a608..a9d6f2ba0e 100644
--- a/app/Models/Character/Sublist.php
+++ b/app/Models/Character/Sublist.php
@@ -3,21 +3,16 @@
 namespace App\Models\Character;
 
 use App\Models\Model;
-
-use App\Models\Character\Character;
-use App\Models\Character\CharacterImage;
-use App\Models\Character\CharacterCategory;
 use App\Models\Species\Species;
 
-class Sublist extends Model
-{
+class Sublist extends Model {
     /**
      * The attributes that are mass assignable.
      *
      * @var array
      */
     protected $fillable = [
-        'name', 'key', 'show_main', 'sort'
+        'name', 'key', 'show_main', 'sort',
     ];
 
     /**
@@ -26,7 +21,6 @@ class Sublist extends Model
      * @var string
      */
     protected $table = 'masterlist_sub';
-
     /**
      * Validation rules for creation.
      *
@@ -34,9 +28,9 @@ class Sublist extends Model
      */
     public static $createRules = [
         'name' => 'required|unique:masterlist_sub|between:3,25',
-        'key' => 'required|unique:masterlist_sub|between:3,25|alpha_dash'
+        'key'  => 'required|unique:masterlist_sub|between:3,25|alpha_dash',
     ];
-    
+
     /**
      * Validation rules for updating.
      *
@@ -44,33 +38,31 @@ class Sublist extends Model
      */
     public static $updateRules = [
         'name' => 'required|between:3,25',
-        'key' => 'required|between:3,25|alpha_dash'
+        'key'  => 'required|between:3,25|alpha_dash',
     ];
 
     /**********************************************************************************************
-    
+
         RELATIONS
 
     **********************************************************************************************/
-    
+
     /**
      * Get all character categories associated with the sub list.
      */
-    public function categories() 
-    {
-        return $this->hasMany('App\Models\Character\CharacterCategory', 'masterlist_sub_id');
+    public function categories() {
+        return $this->hasMany(CharacterCategory::class, 'masterlist_sub_id');
     }
 
     /**
      * Get all character categories associated with the sub list.
      */
-    public function species() 
-    {
-        return $this->hasMany('App\Models\Species\Species', 'masterlist_sub_id');
+    public function species() {
+        return $this->hasMany(Species::class, 'masterlist_sub_id');
     }
 
     /**********************************************************************************************
-    
+
         ACCESSORS
 
     **********************************************************************************************/
@@ -80,8 +72,7 @@ public function species()
      *
      * @return string
      */
-    public function getUrlAttribute()
-    {
+    public function getUrlAttribute() {
         return url('sublist/'.$this->key);
     }
 }
diff --git a/app/Models/Comment.php b/app/Models/Comment.php
deleted file mode 100644
index fd212a1e72..0000000000
--- a/app/Models/Comment.php
+++ /dev/null
@@ -1,115 +0,0 @@
-<?php
-
-namespace App\Models;
-use App\Models\Model;
-
-use App\Events\CommentCreated;
-use App\Events\CommentUpdated;
-use App\Events\CommentDeleted;
-use Illuminate\Database\Eloquent\SoftDeletes;
-use Illuminate\Support\Facades\Config;
-
-class Comment extends Model
-{
-	use SoftDeletes;
-
-    /**
-     * The relations to eager load on every query.
-     *
-     * @var array
-     */
-    protected $with = [
-        'commenter'
-    ];
-
-    /**
-     * The attributes that are mass assignable.
-     *
-     * @var array
-     */
-    protected $fillable = [
-        'comment', 'approved', 'guest_name', 'guest_email', 'is_featured', 'type'
-    ];
-
-    /**
-     * Whether the model contains timestamps to be saved and updated.
-     *
-     * @var string
-     */
-    public $timestamps = true;
-
-
-    /**
-     * The attributes that should be cast to native types.
-     *
-     * @var array
-     */
-    protected $casts = [
-        'approved' => 'boolean'
-    ];
-
-    /**
-     * The event map for the model.
-     *
-     * @var array
-     */
-    protected $dispatchesEvents = [
-        'created' => CommentCreated::class,
-        'updated' => CommentUpdated::class,
-        'deleted' => CommentDeleted::class,
-    ];
-
-    /**
-     * The user who posted the comment.
-     */
-    public function commenter()
-    {
-        return $this->morphTo();
-    }
-
-    /**
-     * The model that was commented upon.
-     */
-    public function commentable()
-    {
-        return $this->morphTo();
-    }
-
-    /**
-     * Returns all comments that this comment is the parent of.
-     */
-    public function children()
-    {
-        return $this->hasMany('App\Models\Comment', 'child_id');
-    }
-
-    /**
-     * Returns the comment to which this comment belongs to.
-     */
-    public function parent()
-    {
-        return $this->belongsTo('App\Models\Comment', 'child_id');
-    }
-
-    /**
-     * Gets / Creates permalink for comments - allows user to go directly to comment
-     *
-     * @return string
-     */
-    public function getUrlAttribute()
-    {
-        return url('comment/' . $this->id);
-    }
-
-    /**
-     * Gets top comment
-     *
-     * @return string
-     */
-    public function getTopCommentAttribute()
-    {
-        if(!$this->parent) { return $this; }
-        else {return $this->parent->topComment;}
-    }
-
-}
diff --git a/app/Models/Comment/Comment.php b/app/Models/Comment/Comment.php
new file mode 100644
index 0000000000..a275354f9a
--- /dev/null
+++ b/app/Models/Comment/Comment.php
@@ -0,0 +1,134 @@
+<?php
+
+namespace App\Models\Comment;
+
+use App\Events\CommentCreated;
+use App\Events\CommentDeleted;
+use App\Events\CommentUpdated;
+use App\Models\Model;
+use Illuminate\Database\Eloquent\SoftDeletes;
+
+class Comment extends Model {
+    use SoftDeletes;
+
+    /**
+     * The relations to eager load on every query.
+     *
+     * @var array
+     */
+    protected $with = [
+        'commenter',
+    ];
+
+    /**
+     * The attributes that are mass assignable.
+     *
+     * @var array
+     */
+    protected $fillable = [
+        'comment', 'approved', 'guest_name', 'guest_email', 'is_featured', 'type',
+    ];
+
+    /**
+     * The attributes that should be cast to native types.
+     *
+     * @var array
+     */
+    protected $casts = [
+        'approved' => 'boolean',
+    ];
+
+    /**
+     * The event map for the model.
+     *
+     * @var array
+     */
+    protected $dispatchesEvents = [
+        'created' => CommentCreated::class,
+        'updated' => CommentUpdated::class,
+        'deleted' => CommentDeleted::class,
+    ];
+
+    /**
+     * Whether the model contains timestamps to be saved and updated.
+     *
+     * @var string
+     */
+    public $timestamps = true;
+
+    /**********************************************************************************************
+
+        RELATIONS
+
+     **********************************************************************************************/
+
+    /**
+     * The user who posted the comment.
+     */
+    public function commenter() {
+        return $this->morphTo();
+    }
+
+    /**
+     * The model that was commented upon.
+     */
+    public function commentable() {
+        return $this->morphTo()->withTrashed();
+    }
+
+    /**
+     * Returns all comments that this comment is the parent of.
+     */
+    public function children() {
+        return $this->hasMany(self::class, 'child_id')->withTrashed();
+    }
+
+    /**
+     * Returns the comment to which this comment belongs to.
+     */
+    public function parent() {
+        return $this->belongsTo(self::class, 'child_id')->withTrashed();
+    }
+
+    /**
+     * Gets the likes for this comment.
+     */
+    public function likes() {
+        return $this->hasMany(CommentLike::class);
+    }
+
+    /**
+     * Get the edit history of the comment.
+     */
+    public function edits() {
+        return $this->hasMany(CommentEdit::class)->orderBy('created_at', 'desc');
+    }
+
+    /**********************************************************************************************
+
+        ATTRIBUTES
+
+     **********************************************************************************************/
+
+    /**
+     * Gets / Creates permalink for comments - allows user to go directly to comment.
+     *
+     * @return string
+     */
+    public function getUrlAttribute() {
+        return url('comment/'.$this->id);
+    }
+
+    /**
+     * Gets top comment.
+     *
+     * @return string
+     */
+    public function getTopCommentAttribute() {
+        if (!$this->parent) {
+            return $this;
+        } else {
+            return $this->parent->topComment;
+        }
+    }
+}
diff --git a/app/Models/Comment/CommentEdit.php b/app/Models/Comment/CommentEdit.php
new file mode 100644
index 0000000000..cb50384018
--- /dev/null
+++ b/app/Models/Comment/CommentEdit.php
@@ -0,0 +1,70 @@
+<?php
+
+namespace App\Models\Comment;
+
+use App\Models\Model;
+use App\Models\User\User;
+
+class CommentEdit extends Model {
+    /**
+     * The attributes that are mass assignable.
+     *
+     * @var array
+     */
+    protected $fillable = [
+        'user_id', 'comment_id', 'data',
+    ];
+
+    /**
+     * The table associated with the model.
+     *
+     * @var string
+     */
+    protected $table = 'comment_edits';
+
+    /**
+     * Whether the model contains timestamps to be saved and updated.
+     *
+     * @var string
+     */
+    public $timestamps = true;
+
+    /**********************************************************************************************
+
+        RELATIONS
+
+    **********************************************************************************************/
+
+    /**
+     * Get the comment.
+     */
+    public function comment() {
+        return $this->belongsTo(Comment::class);
+    }
+
+    /**
+     * Get the user.
+     */
+    public function user() {
+        return $this->belongsTo(User::class);
+    }
+
+    /**********************************************************************************************
+
+        ATTRIBUTES
+
+     **********************************************************************************************/
+
+    /**
+     * Get the data attribute as an associative array.
+     *
+     * @return array
+     */
+    public function getDataAttribute() {
+        if (!$this->id) {
+            return null;
+        }
+
+        return json_decode($this->attributes['data'], true);
+    }
+}
diff --git a/app/Models/Comment/CommentLike.php b/app/Models/Comment/CommentLike.php
new file mode 100644
index 0000000000..30ad4836c8
--- /dev/null
+++ b/app/Models/Comment/CommentLike.php
@@ -0,0 +1,44 @@
+<?php
+
+namespace App\Models\Comment;
+
+use App\Models\Model;
+use App\Models\User\User;
+
+class CommentLike extends Model {
+    /**
+     * The attributes that are mass assignable.
+     *
+     * @var array
+     */
+    protected $fillable = [
+        'user_id', 'comment_id', 'is_like',
+    ];
+
+    /**
+     * The table associated with the model.
+     *
+     * @var string
+     */
+    protected $table = 'comment_likes';
+
+    /**********************************************************************************************
+
+        RELATIONS
+
+    **********************************************************************************************/
+
+    /**
+     * Get the comment.
+     */
+    public function comment() {
+        return $this->belongsTo(Comment::class);
+    }
+
+    /**
+     * Get the user who liked the comment.
+     */
+    public function user() {
+        return $this->belongsTo(User::class);
+    }
+}
diff --git a/app/Models/Currency/Currency.php b/app/Models/Currency/Currency.php
index 46658f6781..86776a09b0 100644
--- a/app/Models/Currency/Currency.php
+++ b/app/Models/Currency/Currency.php
@@ -2,11 +2,9 @@
 
 namespace App\Models\Currency;
 
-use Config;
 use App\Models\Model;
 
-class Currency extends Model
-{
+class Currency extends Model {
     /**
      * The attributes that are mass assignable.
      *
@@ -16,7 +14,7 @@ class Currency extends Model
         'is_user_owned', 'is_character_owned',
         'name', 'abbreviation', 'description', 'parsed_description', 'sort_user', 'sort_character',
         'is_displayed', 'allow_user_to_user', 'allow_user_to_character', 'allow_character_to_user',
-        'has_icon', 'has_image'
+        'has_icon', 'has_image', 'hash',
     ];
 
     /**
@@ -25,18 +23,17 @@ class Currency extends Model
      * @var string
      */
     protected $table = 'currencies';
-
     /**
      * Validation rules for creation.
      *
      * @var array
      */
     public static $createRules = [
-        'name' => 'required|unique:currencies|between:3,100',
+        'name'         => 'required|unique:currencies|between:3,100',
         'abbreviation' => 'nullable|unique:currencies|between:1,25',
-        'description' => 'nullable',
-        'icon' => 'mimes:png',
-        'image' => 'mimes:png'
+        'description'  => 'nullable',
+        'icon'         => 'mimes:png',
+        'image'        => 'mimes:png',
     ];
 
     /**
@@ -45,11 +42,11 @@ class Currency extends Model
      * @var array
      */
     public static $updateRules = [
-        'name' => 'required|between:3,100',
+        'name'         => 'required|between:3,100',
         'abbreviation' => 'nullable|between:1,25',
-        'description' => 'nullable',
-        'icon' => 'mimes:png',
-        'image' => 'mimes:png'
+        'description'  => 'nullable',
+        'icon'         => 'mimes:png',
+        'image'        => 'mimes:png',
     ];
 
     /**********************************************************************************************
@@ -63,9 +60,8 @@ class Currency extends Model
      *
      * @return string
      */
-    public function getDisplayIconAttribute()
-    {
-        return '<img src="'.$this->currencyIconUrl.'" title="'.$this->name . ($this->abbreviation ? ' ('.$this->abbreviation.')' : '') .'" data-toggle="tooltip" alt="'.$this->name.'"/>';
+    public function getDisplayIconAttribute() {
+        return '<img src="'.$this->currencyIconUrl.'" title="'.$this->name.($this->abbreviation ? ' ('.$this->abbreviation.')' : '').'" data-toggle="tooltip" alt="'.$this->name.'"/>';
     }
 
     /**
@@ -73,8 +69,7 @@ public function getDisplayIconAttribute()
      *
      * @return string
      */
-    public function getImageDirectoryAttribute()
-    {
+    public function getImageDirectoryAttribute() {
         return 'images/data/currencies';
     }
 
@@ -83,9 +78,8 @@ public function getImageDirectoryAttribute()
      *
      * @return string
      */
-    public function getCurrencyImageFileNameAttribute()
-    {
-        return $this->id . '-image.png';
+    public function getCurrencyImageFileNameAttribute() {
+        return $this->hash.$this->id.'-image.png';
     }
 
     /**
@@ -93,9 +87,8 @@ public function getCurrencyImageFileNameAttribute()
      *
      * @return string
      */
-    public function getCurrencyIconFileNameAttribute()
-    {
-        return $this->id . '-icon.png';
+    public function getCurrencyIconFileNameAttribute() {
+        return $this->hash.$this->id.'-icon.png';
     }
 
     /**
@@ -103,8 +96,7 @@ public function getCurrencyIconFileNameAttribute()
      *
      * @return string
      */
-    public function getCurrencyImagePathAttribute()
-    {
+    public function getCurrencyImagePathAttribute() {
         return public_path($this->imageDirectory);
     }
 
@@ -113,8 +105,7 @@ public function getCurrencyImagePathAttribute()
      *
      * @return string
      */
-    public function getCurrencyIconPathAttribute()
-    {
+    public function getCurrencyIconPathAttribute() {
         return public_path($this->imageDirectory);
     }
 
@@ -123,10 +114,12 @@ public function getCurrencyIconPathAttribute()
      *
      * @return string
      */
-    public function getCurrencyImageUrlAttribute()
-    {
-        if (!$this->has_image) return null;
-        return asset($this->imageDirectory . '/' . $this->currencyImageFileName);
+    public function getCurrencyImageUrlAttribute() {
+        if (!$this->has_image) {
+            return null;
+        }
+
+        return asset($this->imageDirectory.'/'.$this->currencyImageFileName);
     }
 
     /**
@@ -134,10 +127,12 @@ public function getCurrencyImageUrlAttribute()
      *
      * @return string
      */
-    public function getCurrencyIconUrlAttribute()
-    {
-        if (!$this->has_icon) return null;
-        return asset($this->imageDirectory . '/' . $this->currencyIconFileName);
+    public function getCurrencyIconUrlAttribute() {
+        if (!$this->has_icon) {
+            return null;
+        }
+
+        return asset($this->imageDirectory.'/'.$this->currencyIconFileName);
     }
 
     /**********************************************************************************************
@@ -151,8 +146,7 @@ public function getCurrencyIconUrlAttribute()
      *
      * @return string
      */
-    public function getDisplayNameAttribute()
-    {
+    public function getDisplayNameAttribute() {
         return '<a href="'.$this->url.'" class="display-currency">'.$this->name.'</a>';
     }
 
@@ -161,8 +155,7 @@ public function getDisplayNameAttribute()
      *
      * @return string
      */
-    public function getUrlAttribute()
-    {
+    public function getUrlAttribute() {
         return url('world/currencies?name='.$this->name);
     }
 
@@ -171,11 +164,28 @@ public function getUrlAttribute()
      *
      * @return string
      */
-    public function getAssetTypeAttribute()
-    {
+    public function getAssetTypeAttribute() {
         return 'currencies';
     }
 
+    /**
+     * Gets the admin edit URL.
+     *
+     * @return string
+     */
+    public function getAdminUrlAttribute() {
+        return url('admin/data/currencies/edit/'.$this->id);
+    }
+
+    /**
+     * Gets the power required to edit this model.
+     *
+     * @return string
+     */
+    public function getAdminPowerAttribute() {
+        return 'edit_data';
+    }
+
     /**********************************************************************************************
 
         OTHER FUNCTIONS
@@ -185,14 +195,20 @@ public function getAssetTypeAttribute()
     /**
      * Displays a given value of the currency with icon, abbreviation or name.
      *
+     * @param mixed $value
+     *
      * @return string
      */
-    public function display($value)
-    {
-        $ret = '<span class="display-currency">' . $value . ' ';
-        if($this->has_icon) $ret .= $this->displayIcon;
-        elseif ($this->abbreviation) $ret .= $this->abbreviation;
-        else $ret .= $this->name;
-        return $ret . '</span>';
+    public function display($value) {
+        $ret = '<span class="display-currency">'.$value.' ';
+        if ($this->has_icon) {
+            $ret .= $this->displayIcon;
+        } elseif ($this->abbreviation) {
+            $ret .= $this->abbreviation;
+        } else {
+            $ret .= $this->name;
+        }
+
+        return $ret.'</span>';
     }
 }
diff --git a/app/Models/Currency/CurrencyLog.php b/app/Models/Currency/CurrencyLog.php
index 13db13eb32..01a2de4270 100644
--- a/app/Models/Currency/CurrencyLog.php
+++ b/app/Models/Currency/CurrencyLog.php
@@ -2,11 +2,11 @@
 
 namespace App\Models\Currency;
 
-use Config;
+use App\Models\Character\Character;
 use App\Models\Model;
+use App\Models\User\User;
 
-class CurrencyLog extends Model
-{
+class CurrencyLog extends Model {
     /**
      * The attributes that are mass assignable.
      *
@@ -16,7 +16,7 @@ class CurrencyLog extends Model
         'sender_id', 'sender_type',
         'recipient_id', 'recipient_type',
         'log', 'log_type', 'data',
-        'currency_id', 'quantity'
+        'currency_id', 'quantity',
     ];
 
     /**
@@ -25,7 +25,6 @@ class CurrencyLog extends Model
      * @var string
      */
     protected $table = 'currencies_log';
-
     /**
      * Whether the model contains timestamps to be saved and updated.
      *
@@ -34,7 +33,7 @@ class CurrencyLog extends Model
     public $timestamps = true;
 
     /**********************************************************************************************
-    
+
         RELATIONS
 
     **********************************************************************************************/
@@ -42,27 +41,29 @@ class CurrencyLog extends Model
     /**
      * Get the user who initiated the logged action.
      */
-    public function sender() 
-    {
-        if($this->sender_type == 'User') return $this->belongsTo('App\Models\User\User', 'sender_id');
-        return $this->belongsTo('App\Models\Character\Character', 'sender_id');
+    public function sender() {
+        if ($this->sender_type == 'User') {
+            return $this->belongsTo(User::class, 'sender_id');
+        }
+
+        return $this->belongsTo(Character::class, 'sender_id');
     }
 
     /**
      * Get the user who received the logged action.
      */
-    public function recipient() 
-    {
-        if($this->recipient_type == 'User') return $this->belongsTo('App\Models\User\User', 'recipient_id');
-        return $this->belongsTo('App\Models\Character\Character', 'recipient_id');
+    public function recipient() {
+        if ($this->recipient_type == 'User') {
+            return $this->belongsTo(User::class, 'recipient_id');
+        }
+
+        return $this->belongsTo(Character::class, 'recipient_id');
     }
 
     /**
      * Get the currency that is the target of the action.
      */
-    public function currency() 
-    {
-        return $this->belongsTo('App\Models\Currency\Currency');
+    public function currency() {
+        return $this->belongsTo(Currency::class);
     }
-
 }
diff --git a/app/Models/Feature/Feature.php b/app/Models/Feature/Feature.php
index 2c8bdec12b..f943491026 100644
--- a/app/Models/Feature/Feature.php
+++ b/app/Models/Feature/Feature.php
@@ -2,22 +2,20 @@
 
 namespace App\Models\Feature;
 
-use Config;
-use DB;
 use App\Models\Model;
-use App\Models\Feature\FeatureCategory;
-use App\Models\Species\Species;
 use App\Models\Rarity;
+use App\Models\Species\Species;
+use App\Models\Species\Subtype;
+use Illuminate\Support\Facades\DB;
 
-class Feature extends Model
-{
+class Feature extends Model {
     /**
      * The attributes that are mass assignable.
      *
      * @var array
      */
     protected $fillable = [
-        'feature_category_id', 'species_id', 'subtype_id', 'rarity_id', 'name', 'has_image', 'description', 'parsed_description'
+        'feature_category_id', 'species_id', 'subtype_id', 'rarity_id', 'name', 'has_image', 'description', 'parsed_description', 'is_visible', 'hash',
     ];
 
     /**
@@ -26,7 +24,6 @@ class Feature extends Model
      * @var string
      */
     protected $table = 'features';
-
     /**
      * Validation rules for creation.
      *
@@ -34,12 +31,12 @@ class Feature extends Model
      */
     public static $createRules = [
         'feature_category_id' => 'nullable',
-        'species_id' => 'nullable',
-        'subtype_id' => 'nullable',
-        'rarity_id' => 'required|exists:rarities,id',
-        'name' => 'required|unique:features|between:3,100',
-        'description' => 'nullable',
-        'image' => 'mimes:png',
+        'species_id'          => 'nullable',
+        'subtype_id'          => 'nullable',
+        'rarity_id'           => 'required|exists:rarities,id',
+        'name'                => 'required|unique:features|between:3,100',
+        'description'         => 'nullable',
+        'image'               => 'mimes:png',
     ];
 
     /**
@@ -49,12 +46,12 @@ class Feature extends Model
      */
     public static $updateRules = [
         'feature_category_id' => 'nullable',
-        'species_id' => 'nullable',
-        'subtype_id' => 'nullable',
-        'rarity_id' => 'required|exists:rarities,id',
-        'name' => 'required|between:3,100',
-        'description' => 'nullable',
-        'image' => 'mimes:png',
+        'species_id'          => 'nullable',
+        'subtype_id'          => 'nullable',
+        'rarity_id'           => 'required|exists:rarities,id',
+        'name'                => 'required|between:3,100',
+        'description'         => 'nullable',
+        'image'               => 'mimes:png',
     ];
 
     /**********************************************************************************************
@@ -66,33 +63,29 @@ class Feature extends Model
     /**
      * Get the rarity of this feature.
      */
-    public function rarity()
-    {
-        return $this->belongsTo('App\Models\Rarity');
+    public function rarity() {
+        return $this->belongsTo(Rarity::class);
     }
 
     /**
      * Get the species the feature belongs to.
      */
-    public function species()
-    {
-        return $this->belongsTo('App\Models\Species\Species');
+    public function species() {
+        return $this->belongsTo(Species::class);
     }
 
     /**
      * Get the subtype the feature belongs to.
      */
-    public function subtype()
-    {
-        return $this->belongsTo('App\Models\Species\Subtype');
+    public function subtype() {
+        return $this->belongsTo(Subtype::class);
     }
 
     /**
      * Get the category the feature belongs to.
      */
-    public function category()
-    {
-        return $this->belongsTo('App\Models\Feature\FeatureCategory', 'feature_category_id');
+    public function category() {
+        return $this->belongsTo(FeatureCategory::class, 'feature_category_id');
     }
 
     /**********************************************************************************************
@@ -104,76 +97,108 @@ public function category()
     /**
      * Scope a query to sort features in alphabetical order.
      *
-     * @param  \Illuminate\Database\Eloquent\Builder  $query
-     * @param  bool                                   $reverse
+     * @param \Illuminate\Database\Eloquent\Builder $query
+     * @param bool                                  $reverse
+     *
      * @return \Illuminate\Database\Eloquent\Builder
      */
-    public function scopeSortAlphabetical($query, $reverse = false)
-    {
+    public function scopeSortAlphabetical($query, $reverse = false) {
         return $query->orderBy('name', $reverse ? 'DESC' : 'ASC');
     }
 
     /**
      * Scope a query to sort features in category order.
      *
-     * @param  \Illuminate\Database\Eloquent\Builder  $query
-     * @param  bool                                   $reverse
+     * @param \Illuminate\Database\Eloquent\Builder $query
+     *
      * @return \Illuminate\Database\Eloquent\Builder
      */
-    public function scopeSortCategory($query)
-    {
-        $ids = FeatureCategory::orderBy('sort', 'DESC')->pluck('id')->toArray();
-        return count($ids) ? $query->orderByRaw(DB::raw('FIELD(feature_category_id, '.implode(',', $ids).')')) : $query;
+    public function scopeSortCategory($query) {
+        if (FeatureCategory::all()->count()) {
+            return $query->orderBy(FeatureCategory::select('sort')->whereColumn('features.feature_category_id', 'feature_categories.id'), 'DESC');
+        }
+
+        return $query;
     }
 
     /**
      * Scope a query to sort features in species order.
      *
-     * @param  \Illuminate\Database\Eloquent\Builder  $query
-     * @param  bool                                   $reverse
+     * @param \Illuminate\Database\Eloquent\Builder $query
+     *
      * @return \Illuminate\Database\Eloquent\Builder
      */
-    public function scopeSortSpecies($query)
-    {
+    public function scopeSortSpecies($query) {
         $ids = Species::orderBy('sort', 'DESC')->pluck('id')->toArray();
-        return count($ids) ? $query->orderByRaw(DB::raw('FIELD(species_id, '.implode(',', $ids).')')) : $query;
+
+        return count($ids) ? $query->orderBy(DB::raw('FIELD(species_id, '.implode(',', $ids).')')) : $query;
+    }
+
+    /**
+     * Scope a query to sort features in subtype order.
+     *
+     * @param \Illuminate\Database\Eloquent\Builder $query
+     *
+     * @return \Illuminate\Database\Eloquent\Builder
+     */
+    public function scopeSortSubtype($query) {
+        $ids = Subtype::orderBy('sort', 'DESC')->pluck('id')->toArray();
+
+        return count($ids) ? $query->orderBy(DB::raw('FIELD(subtype_id, '.implode(',', $ids).')')) : $query;
     }
 
     /**
      * Scope a query to sort features in rarity order.
      *
-     * @param  \Illuminate\Database\Eloquent\Builder  $query
-     * @param  bool                                   $reverse
+     * @param \Illuminate\Database\Eloquent\Builder $query
+     * @param bool                                  $reverse
+     *
      * @return \Illuminate\Database\Eloquent\Builder
      */
-    public function scopeSortRarity($query, $reverse = false)
-    {
+    public function scopeSortRarity($query, $reverse = false) {
         $ids = Rarity::orderBy('sort', $reverse ? 'ASC' : 'DESC')->pluck('id')->toArray();
-        return count($ids) ? $query->orderByRaw(DB::raw('FIELD(rarity_id, '.implode(',', $ids).')')) : $query;
+
+        return count($ids) ? $query->orderBy(DB::raw('FIELD(rarity_id, '.implode(',', $ids).')')) : $query;
     }
 
     /**
      * Scope a query to sort features by newest first.
      *
-     * @param  \Illuminate\Database\Eloquent\Builder  $query
+     * @param \Illuminate\Database\Eloquent\Builder $query
+     *
      * @return \Illuminate\Database\Eloquent\Builder
      */
-    public function scopeSortNewest($query)
-    {
+    public function scopeSortNewest($query) {
         return $query->orderBy('id', 'DESC');
     }
 
     /**
      * Scope a query to sort features oldest first.
      *
-     * @param  \Illuminate\Database\Eloquent\Builder  $query
+     * @param \Illuminate\Database\Eloquent\Builder $query
+     *
      * @return \Illuminate\Database\Eloquent\Builder
      */
-    public function scopeSortOldest($query)
-    {
+    public function scopeSortOldest($query) {
         return $query->orderBy('id');
     }
 
+    /**
+     * Scope a query to show only visible features.
+     *
+     * @param \Illuminate\Database\Eloquent\Builder $query
+     * @param mixed|null                            $user
+     *
+     * @return \Illuminate\Database\Eloquent\Builder
+     */
+    public function scopeVisible($query, $user = null) {
+        if ($user && $user->hasPower('edit_data')) {
+            return $query;
+        }
+
+        return $query->where('is_visible', 1);
+    }
+
     /**********************************************************************************************
 
         ACCESSORS
@@ -185,9 +210,8 @@ public function scopeSortOldest($query)
      *
      * @return string
      */
-    public function getDisplayNameAttribute()
-    {
-        return '<a href="'.$this->url.'" class="display-trait">'.$this->name.'</a>'.($this->rarity? ' (' . $this->rarity->displayName . ')' : '');
+    public function getDisplayNameAttribute() {
+        return '<a href="'.$this->url.'" class="display-trait">'.$this->name.'</a>'.($this->rarity ? ' ('.$this->rarity->displayName.')' : '');
     }
 
     /**
@@ -195,8 +219,7 @@ public function getDisplayNameAttribute()
      *
      * @return string
      */
-    public function getImageDirectoryAttribute()
-    {
+    public function getImageDirectoryAttribute() {
         return 'images/data/traits';
     }
 
@@ -205,9 +228,8 @@ public function getImageDirectoryAttribute()
      *
      * @return string
      */
-    public function getImageFileNameAttribute()
-    {
-        return $this->id . '-image.png';
+    public function getImageFileNameAttribute() {
+        return $this->hash.$this->id.'-image.png';
     }
 
     /**
@@ -215,8 +237,7 @@ public function getImageFileNameAttribute()
      *
      * @return string
      */
-    public function getImagePathAttribute()
-    {
+    public function getImagePathAttribute() {
         return public_path($this->imageDirectory);
     }
 
@@ -225,10 +246,12 @@ public function getImagePathAttribute()
      *
      * @return string
      */
-    public function getImageUrlAttribute()
-    {
-        if (!$this->has_image) return null;
-        return asset($this->imageDirectory . '/' . $this->imageFileName);
+    public function getImageUrlAttribute() {
+        if (!$this->has_image) {
+            return null;
+        }
+
+        return asset($this->imageDirectory.'/'.$this->imageFileName);
     }
 
     /**
@@ -236,8 +259,7 @@ public function getImageUrlAttribute()
      *
      * @return string
      */
-    public function getUrlAttribute()
-    {
+    public function getUrlAttribute() {
         return url('world/traits?name='.$this->name);
     }
 
@@ -246,8 +268,67 @@ public function getUrlAttribute()
      *
      * @return string
      */
-    public function getSearchUrlAttribute()
-    {
+    public function getSearchUrlAttribute() {
         return url('masterlist?feature_id[]='.$this->id);
     }
+
+    /**
+     * Gets the admin edit URL.
+     *
+     * @return string
+     */
+    public function getAdminUrlAttribute() {
+        return url('admin/data/traits/edit/'.$this->id);
+    }
+
+    /**
+     * Gets the power required to edit this model.
+     *
+     * @return string
+     */
+    public function getAdminPowerAttribute() {
+        return 'edit_data';
+    }
+
+    /**********************************************************************************************
+
+        Other Functions
+
+    **********************************************************************************************/
+
+    public static function getDropdownItems($withHidden = 0) {
+        $visibleOnly = 1;
+        if ($withHidden) {
+            $visibleOnly = 0;
+        }
+
+        if (config('lorekeeper.extensions.organised_traits_dropdown')) {
+            $sorted_feature_categories = collect(FeatureCategory::all()->where('is_visible', '>=', $visibleOnly)->sortBy('sort')->pluck('name')->toArray());
+
+            $grouped = self::where('is_visible', '>=', $visibleOnly)->select('name', 'id', 'feature_category_id')->with('category')->orderBy('name')->get()->keyBy('id')->groupBy('category.name', $preserveKeys = true)->toArray();
+            if (isset($grouped[''])) {
+                if (!$sorted_feature_categories->contains('Miscellaneous')) {
+                    $sorted_feature_categories->push('Miscellaneous');
+                }
+                $grouped['Miscellaneous'] ??= [] + $grouped[''];
+            }
+
+            $sorted_feature_categories = $sorted_feature_categories->filter(function ($value, $key) use ($grouped) {
+                return in_array($value, array_keys($grouped), true);
+            });
+
+            foreach ($grouped as $category => $features) {
+                foreach ($features as $id  => $feature) {
+                    $grouped[$category][$id] = $feature['name'];
+                }
+            }
+            $features_by_category = $sorted_feature_categories->map(function ($category) use ($grouped) {
+                return [$category => $grouped[$category]];
+            });
+
+            return $features_by_category;
+        } else {
+            return self::where('is_visible', '>=', $visibleOnly)->orderBy('name')->pluck('name', 'id')->toArray();
+        }
+    }
 }
diff --git a/app/Models/Feature/FeatureCategory.php b/app/Models/Feature/FeatureCategory.php
index 9e44328eb4..babda9e390 100644
--- a/app/Models/Feature/FeatureCategory.php
+++ b/app/Models/Feature/FeatureCategory.php
@@ -2,18 +2,16 @@
 
 namespace App\Models\Feature;
 
-use Config;
 use App\Models\Model;
 
-class FeatureCategory extends Model
-{
+class FeatureCategory extends Model {
     /**
      * The attributes that are mass assignable.
      *
      * @var array
      */
     protected $fillable = [
-        'name', 'sort', 'has_image', 'description', 'parsed_description'
+        'name', 'sort', 'has_image', 'description', 'parsed_description', 'is_visible', 'hash',
     ];
 
     /**
@@ -22,42 +20,63 @@ class FeatureCategory extends Model
      * @var string
      */
     protected $table = 'feature_categories';
-    
+
     /**
      * Validation rules for creation.
      *
      * @var array
      */
     public static $createRules = [
-        'name' => 'required|unique:feature_categories|between:3,100',
+        'name'        => 'required|unique:feature_categories|between:3,100',
         'description' => 'nullable',
-        'image' => 'mimes:png',
+        'image'       => 'mimes:png',
     ];
-    
+
     /**
      * Validation rules for updating.
      *
      * @var array
      */
     public static $updateRules = [
-        'name' => 'required|between:3,100',
+        'name'        => 'required|between:3,100',
         'description' => 'nullable',
-        'image' => 'mimes:png',
+        'image'       => 'mimes:png',
     ];
 
     /**********************************************************************************************
-    
+
+        SCOPES
+
+    **********************************************************************************************/
+
+    /**
+     * Scope a query to show only visible categories.
+     *
+     * @param \Illuminate\Database\Eloquent\Builder $query
+     * @param mixed|null                            $user
+     *
+     * @return \Illuminate\Database\Eloquent\Builder
+     */
+    public function scopeVisible($query, $user = null) {
+        if ($user && $user->hasPower('edit_data')) {
+            return $query;
+        }
+
+        return $query->where('is_visible', 1);
+    }
+
+    /**********************************************************************************************
+
         ACCESSORS
 
     **********************************************************************************************/
-    
+
     /**
      * Displays the model's name, linked to its encyclopedia page.
      *
      * @return string
      */
-    public function getDisplayNameAttribute()
-    {
+    public function getDisplayNameAttribute() {
         return '<a href="'.$this->url.'" class="display-category">'.$this->name.'</a>';
     }
 
@@ -66,8 +85,7 @@ public function getDisplayNameAttribute()
      *
      * @return string
      */
-    public function getImageDirectoryAttribute()
-    {
+    public function getImageDirectoryAttribute() {
         return 'images/data/trait-categories';
     }
 
@@ -76,9 +94,8 @@ public function getImageDirectoryAttribute()
      *
      * @return string
      */
-    public function getCategoryImageFileNameAttribute()
-    {
-        return $this->id . '-image.png';
+    public function getCategoryImageFileNameAttribute() {
+        return $this->hash.$this->id.'-image.png';
     }
 
     /**
@@ -86,20 +103,21 @@ public function getCategoryImageFileNameAttribute()
      *
      * @return string
      */
-    public function getCategoryImagePathAttribute()
-    {
+    public function getCategoryImagePathAttribute() {
         return public_path($this->imageDirectory);
     }
-    
+
     /**
      * Gets the URL of the model's image.
      *
      * @return string
      */
-    public function getCategoryImageUrlAttribute()
-    {
-        if (!$this->has_image) return null;
-        return asset($this->imageDirectory . '/' . $this->categoryImageFileName);
+    public function getCategoryImageUrlAttribute() {
+        if (!$this->has_image) {
+            return null;
+        }
+
+        return asset($this->imageDirectory.'/'.$this->categoryImageFileName);
     }
 
     /**
@@ -107,8 +125,7 @@ public function getCategoryImageUrlAttribute()
      *
      * @return string
      */
-    public function getUrlAttribute()
-    {
+    public function getUrlAttribute() {
         return url('world/trait-categories?name='.$this->name);
     }
 
@@ -117,8 +134,25 @@ public function getUrlAttribute()
      *
      * @return string
      */
-    public function getSearchUrlAttribute()
-    {
+    public function getSearchUrlAttribute() {
         return url('world/traits?feature_category_id='.$this->id);
     }
+
+    /**
+     * Gets the admin edit URL.
+     *
+     * @return string
+     */
+    public function getAdminUrlAttribute() {
+        return url('admin/data/trait-categories/edit/'.$this->id);
+    }
+
+    /**
+     * Gets the power required to edit this model.
+     *
+     * @return string
+     */
+    public function getAdminPowerAttribute() {
+        return 'edit_data';
+    }
 }
diff --git a/app/Models/Gallery/Gallery.php b/app/Models/Gallery/Gallery.php
index 9623614d35..bb1207eab1 100644
--- a/app/Models/Gallery/Gallery.php
+++ b/app/Models/Gallery/Gallery.php
@@ -2,14 +2,11 @@
 
 namespace App\Models\Gallery;
 
-use Settings;
-use Config;
-use DB;
-use Carbon\Carbon;
+use App\Facades\Settings;
 use App\Models\Model;
+use Carbon\Carbon;
 
-class Gallery extends Model
-{
+class Gallery extends Model {
     /**
      * The attributes that are mass assignable.
      *
@@ -18,7 +15,7 @@ class Gallery extends Model
     protected $fillable = [
         'id', 'parent_id', 'name', 'sort', 'description',
         'currency_enabled', 'votes_required', 'submissions_open',
-        'start_at', 'end_at', 'hide_before_start', 'prompt_selection'
+        'start_at', 'end_at', 'hide_before_start', 'prompt_selection',
     ];
 
     /**
@@ -29,11 +26,14 @@ class Gallery extends Model
     protected $table = 'galleries';
 
     /**
-     * Dates on the model to convert to Carbon instances.
+     * The attributes that should be cast to native types.
      *
      * @var array
      */
-    public $dates = ['start_at', 'end_at'];
+    protected $casts = [
+        'start_at' => 'datetime',
+        'end_at'   => 'datetime',
+    ];
 
     /**
      * Validation rules for character creation.
@@ -41,7 +41,7 @@ class Gallery extends Model
      * @var array
      */
     public static $createRules = [
-        'name' => 'required|unique:galleries|between:3,50',
+        'name'        => 'required|unique:galleries|between:3,50',
         'description' => 'nullable',
     ];
 
@@ -51,7 +51,7 @@ class Gallery extends Model
      * @var array
      */
     public static $updateRules = [
-        'name' => 'required|between:3,50',
+        'name'        => 'required|between:3,50',
         'description' => 'nullable',
     ];
 
@@ -64,25 +64,44 @@ class Gallery extends Model
     /**
      * Get the parent gallery.
      */
-    public function parent()
-    {
-        return $this->belongsTo('App\Models\Gallery\Gallery', 'parent_id');
+    public function parent() {
+        return $this->belongsTo(self::class, 'parent_id');
     }
 
     /**
      * Get the child galleries of this gallery.
      */
-    public function children()
-    {
-        return $this->hasMany('App\Models\Gallery\Gallery', 'parent_id')->sort();
+    public function children() {
+        return $this->hasMany(self::class, 'parent_id')->sort();
+    }
+
+    /**
+     * Get the sibling galleries of this gallery.
+     */
+    public function siblings() {
+        if ($this->parent) {
+            return $this->parent->hasMany(self::class, 'parent_id')->sort();
+        }
+
+        return null;
+    }
+
+    /**
+     * Get the avunculi galleries of this gallery.
+     */
+    public function avunculi() {
+        if ($this->parent && $this->parent->siblings()) {
+            return $this->parent->siblings()->sort();
+        }
+
+        return null;
     }
 
     /**
      * Get the submissions made to this gallery.
      */
-    public function submissions()
-    {
-        return $this->hasMany('App\Models\Gallery\GallerySubmission', 'gallery_id')->visible()->orderBy('created_at', 'DESC');
+    public function submissions() {
+        return $this->hasMany(GallerySubmission::class, 'gallery_id')->visible()->orderBy('created_at', 'DESC');
     }
 
     /**********************************************************************************************
@@ -94,50 +113,48 @@ public function submissions()
     /**
      * Scope a query to return galleries sorted first by sort number and then name.
      *
-     * @param  \Illuminate\Database\Eloquent\Builder  $query
+     * @param \Illuminate\Database\Eloquent\Builder $query
+     *
      * @return \Illuminate\Database\Eloquent\Builder
      */
-    public function scopeSort($query)
-    {
+    public function scopeSort($query) {
         return $query->orderByRaw('ISNULL(sort), sort ASC')->orderBy('name', 'ASC');
     }
 
     /**
      * Scope a query to only include active galleries.
      *
-     * @param  \Illuminate\Database\Eloquent\Builder  $query
+     * @param \Illuminate\Database\Eloquent\Builder $query
+     *
      * @return \Illuminate\Database\Eloquent\Builder
      */
-    public function scopeActive($query)
-    {
+    public function scopeActive($query) {
         return $query
-            ->where(function($query) {
-                $query->whereNull('start_at')->orWhere('start_at', '<', Carbon::now())->orWhere(function($query) {
+            ->where(function ($query) {
+                $query->whereNull('start_at')->orWhere('start_at', '<', Carbon::now())->orWhere(function ($query) {
                     $query->where('start_at', '>=', Carbon::now())->where('hide_before_start', 0);
                 });
-        })->where(function($query) {
-                $query->whereNull('end_at')->orWhere('end_at', '>', Carbon::now())->orWhere(function($query) {
+            })->where(function ($query) {
+                $query->whereNull('end_at')->orWhere('end_at', '>', Carbon::now())->orWhere(function ($query) {
                     $query->where('end_at', '<=', Carbon::now());
                 });
-        });
-
+            });
     }
 
     /**
      * Scope a query to only include visible galleries.
      *
-     * @param  \Illuminate\Database\Eloquent\Builder  $query
+     * @param \Illuminate\Database\Eloquent\Builder $query
+     *
      * @return \Illuminate\Database\Eloquent\Builder
      */
-    public function scopeVisible($query)
-    {
+    public function scopeVisible($query) {
         return $query
-            ->where(function($query) {
-                $query->whereNull('start_at')->orWhere('start_at', '<', Carbon::now())->orWhere(function($query) {
+            ->where(function ($query) {
+                $query->whereNull('start_at')->orWhere('start_at', '<', Carbon::now())->orWhere(function ($query) {
                     $query->where('start_at', '>=', Carbon::now())->where('hide_before_start', 0);
                 });
-        });
-
+            });
     }
 
     /**********************************************************************************************
@@ -151,8 +168,7 @@ public function scopeVisible($query)
      *
      * @return string
      */
-    public function getDisplayNameAttribute()
-    {
+    public function getDisplayNameAttribute() {
         return '<a href="'.$this->url.'" class="display-prompt">'.$this->name.'</a>';
     }
 
@@ -161,24 +177,46 @@ public function getDisplayNameAttribute()
      *
      * @return string
      */
-    public function getUrlAttribute()
-    {
+    public function getUrlAttribute() {
         return url('gallery/'.$this->id);
     }
 
+    /**
+     * Gets the admin edit URL.
+     *
+     * @return string
+     */
+    public function getAdminUrlAttribute() {
+        return url('admin/data/galleries/edit/'.$this->id);
+    }
+
+    /**
+     * Gets the power required to edit this model.
+     *
+     * @return string
+     */
+    public function getAdminPowerAttribute() {
+        return 'edit_data';
+    }
+
     /**
      * Gets whether or not the user can submit to the gallery.
      *
+     * @param mixed|null $user
+     *
      * @return string
      */
-    public function canSubmit($user = null)
-    {
-        if(Settings::get('gallery_submissions_open')) {
-            if((isset($this->start_at) && $this->start_at->isFuture()) || (isset($this->end_at) && $this->end_at->isPast())) return false;
-            elseif($user && $user->hasPower('manage_submissions')) return true;
-            elseif($this->submissions_open) return true;
+    public function canSubmit($user = null) {
+        if (Settings::get('gallery_submissions_open')) {
+            if ((isset($this->start_at) && $this->start_at->isFuture()) || (isset($this->end_at) && $this->end_at->isPast())) {
+                return false;
+            } elseif ($user && $user->hasPower('manage_submissions')) {
+                return true;
+            } elseif ($this->submissions_open) {
+                return true;
+            }
+        } else {
+            return false;
         }
-        else return false;
     }
-
 }
diff --git a/app/Models/Gallery/GalleryCharacter.php b/app/Models/Gallery/GalleryCharacter.php
index 8ce8d4ac1b..592fb73dec 100644
--- a/app/Models/Gallery/GalleryCharacter.php
+++ b/app/Models/Gallery/GalleryCharacter.php
@@ -2,20 +2,17 @@
 
 namespace App\Models\Gallery;
 
-use Config;
-use DB;
-use Carbon\Carbon;
+use App\Models\Character\Character;
 use App\Models\Model;
 
-class GalleryCharacter extends Model
-{
+class GalleryCharacter extends Model {
     /**
      * The attributes that are mass assignable.
      *
      * @var array
      */
     protected $fillable = [
-        'gallery_submission_id', 'character_id'
+        'gallery_submission_id', 'character_id',
     ];
 
     /**
@@ -24,21 +21,18 @@ class GalleryCharacter extends Model
      * @var string
      */
     protected $table = 'gallery_submission_characters';
-    
+
     /**
      * Get the submission this is attached to.
      */
-    public function submission() 
-    {
-        return $this->belongsTo('App\Models\Gallery\GallerySubmission', 'gallery_submission_id');
+    public function submission() {
+        return $this->belongsTo(GallerySubmission::class, 'gallery_submission_id');
     }
-    
+
     /**
      * Get the character being attached to the submission.
      */
-    public function character() 
-    {
-        return $this->belongsTo('App\Models\Character\Character', 'character_id');
+    public function character() {
+        return $this->belongsTo(Character::class, 'character_id');
     }
-
 }
diff --git a/app/Models/Gallery/GalleryCollaborator.php b/app/Models/Gallery/GalleryCollaborator.php
index f74d01d73a..6007773a97 100644
--- a/app/Models/Gallery/GalleryCollaborator.php
+++ b/app/Models/Gallery/GalleryCollaborator.php
@@ -2,25 +2,20 @@
 
 namespace App\Models\Gallery;
 
-use Settings;
-use Config;
-use DB;
-use Carbon\Carbon;
-
+use App\Facades\Settings;
 use App\Models\Currency\Currency;
-
 use App\Models\Model;
+use App\Models\User\User;
 
-class GalleryCollaborator extends Model
-{
+class GalleryCollaborator extends Model {
     /**
      * The attributes that are mass assignable.
      *
      * @var array
      */
     protected $fillable = [
-        'gallery_submission_id', 'user_id', 
-        'has_approved', 'data', 'type'
+        'gallery_submission_id', 'user_id',
+        'has_approved', 'data', 'type',
     ];
 
     /**
@@ -31,29 +26,27 @@ class GalleryCollaborator extends Model
     protected $table = 'gallery_submission_collaborators';
 
     /**********************************************************************************************
-    
+
         RELATIONS
 
     **********************************************************************************************/
-    
+
     /**
      * Get the submission this is attached to.
      */
-    public function submission() 
-    {
-        return $this->belongsTo('App\Models\Gallery\GallerySubmission', 'gallery_submission_id');
+    public function submission() {
+        return $this->belongsTo(GallerySubmission::class, 'gallery_submission_id');
     }
-    
+
     /**
      * Get the user being attached to the submission.
      */
-    public function user() 
-    {
-        return $this->belongsTo('App\Models\User\User', 'user_id');
+    public function user() {
+        return $this->belongsTo(User::class, 'user_id');
     }
 
     /**********************************************************************************************
-    
+
         ACCESSORS
 
     **********************************************************************************************/
@@ -63,9 +56,8 @@ public function user()
      *
      * @return string
      */
-    public function getDisplayTypeAttribute()
-    {
-        switch($this->type) {
+    public function getDisplayTypeAttribute() {
+        switch ($this->type) {
             default:
                 flash('Invalid type selected.')->error();
                 break;
@@ -86,5 +78,4 @@ public function getDisplayTypeAttribute()
                 break;
         }
     }
-
 }
diff --git a/app/Models/Gallery/GalleryFavorite.php b/app/Models/Gallery/GalleryFavorite.php
index bf4905f924..c3aee7fba1 100644
--- a/app/Models/Gallery/GalleryFavorite.php
+++ b/app/Models/Gallery/GalleryFavorite.php
@@ -2,20 +2,17 @@
 
 namespace App\Models\Gallery;
 
-use Config;
-use DB;
-use Carbon\Carbon;
 use App\Models\Model;
+use App\Models\User\User;
 
-class GalleryFavorite extends Model
-{
+class GalleryFavorite extends Model {
     /**
      * The attributes that are mass assignable.
      *
      * @var array
      */
     protected $fillable = [
-        'user_id', 'gallery_submission_id'
+        'user_id', 'gallery_submission_id',
     ];
 
     /**
@@ -28,17 +25,14 @@ class GalleryFavorite extends Model
     /**
      * Get the character being attached to the submission.
      */
-    public function user() 
-    {
-        return $this->belongsTo('App\Models\User\User', 'user_id');
+    public function user() {
+        return $this->belongsTo(User::class, 'user_id');
     }
-    
+
     /**
      * Get the submission this is attached to.
      */
-    public function submission() 
-    {
-        return $this->belongsTo('App\Models\Gallery\GallerySubmission', 'gallery_submission_id');
+    public function submission() {
+        return $this->belongsTo(GallerySubmission::class, 'gallery_submission_id');
     }
-
 }
diff --git a/app/Models/Gallery/GallerySubmission.php b/app/Models/Gallery/GallerySubmission.php
index e23ae6201f..8607b7e93e 100644
--- a/app/Models/Gallery/GallerySubmission.php
+++ b/app/Models/Gallery/GallerySubmission.php
@@ -2,19 +2,15 @@
 
 namespace App\Models\Gallery;
 
-use Config;
-use DB;
-use Settings;
-use Carbon\Carbon;
+use App\Facades\Settings;
 use App\Models\Currency\Currency;
+use App\Models\Model;
 use App\Models\Prompt\Prompt;
 use App\Models\Submission\Submission;
-use App\Models\Model;
-
+use App\Models\User\User;
 use App\Traits\Commentable;
 
-class GallerySubmission extends Model
-{
+class GallerySubmission extends Model {
     use Commentable;
 
     /**
@@ -28,7 +24,7 @@ class GallerySubmission extends Model
         'title', 'description', 'parsed_description',
         'prompt_id', 'data', 'is_visible', 'status',
         'vote_data', 'staff_id', 'is_valued',
-        'staff_comments', 'parsed_staff_comments'
+        'staff_comments', 'parsed_staff_comments',
     ];
 
     /**
@@ -51,9 +47,9 @@ class GallerySubmission extends Model
      * @var array
      */
     public static $createRules = [
-        'title' => 'required|between:3,200',
-        'image' => 'required_without:text|mimes:png,jpeg,jpg,gif|max:3000',
-        'text' => 'required_without:image',
+        'title'       => 'required|between:3,200',
+        'image'       => 'required_without:text|mimes:png,jpeg,jpg,gif,webp|max:3000',
+        'text'        => 'required_without:image',
         'description' => 'nullable',
     ];
 
@@ -63,9 +59,9 @@ class GallerySubmission extends Model
      * @var array
      */
     public static $updateRules = [
-        'title' => 'required|between:3,200',
+        'title'       => 'required|between:3,200',
         'description' => 'nullable',
-        'image' => 'mimes:png,jpeg,jpg,gif|max:3000'
+        'image'       => 'mimes:png,jpeg,jpg,gif,webp|max:3000',
     ];
 
     /**********************************************************************************************
@@ -77,65 +73,57 @@ class GallerySubmission extends Model
     /**
      * Get the user who made the submission.
      */
-    public function user()
-    {
-        return $this->belongsTo('App\Models\User\User', 'user_id');
+    public function user() {
+        return $this->belongsTo(User::class, 'user_id');
     }
 
     /**
      * Get the staff member who last edited the submission's comments.
      */
-    public function staff()
-    {
-        return $this->belongsTo('App\Models\User\User', 'staff_id');
+    public function staff() {
+        return $this->belongsTo(User::class, 'staff_id');
     }
 
     /**
      * Get the collaborating users on the submission.
      */
-    public function collaborators()
-    {
-        return $this->hasMany('App\Models\Gallery\GalleryCollaborator', 'gallery_submission_id')->where('type', 'Collab');
+    public function collaborators() {
+        return $this->hasMany(GalleryCollaborator::class, 'gallery_submission_id')->where('type', 'Collab');
     }
 
     /**
      * Get the user(s) who are related to the submission in some way.
      */
-    public function participants()
-    {
-        return $this->hasMany('App\Models\Gallery\GalleryCollaborator', 'gallery_submission_id')->where('type', '!=', 'Collab');
+    public function participants() {
+        return $this->hasMany(GalleryCollaborator::class, 'gallery_submission_id')->where('type', '!=', 'Collab');
     }
 
     /**
      * Get the characters associated with the submission.
      */
-    public function characters()
-    {
-        return $this->hasMany('App\Models\Gallery\GalleryCharacter', 'gallery_submission_id');
+    public function characters() {
+        return $this->hasMany(GalleryCharacter::class, 'gallery_submission_id');
     }
 
     /**
      * Get any favorites on the submission.
      */
-    public function favorites()
-    {
-        return $this->hasMany('App\Models\Gallery\GalleryFavorite', 'gallery_submission_id');
+    public function favorites() {
+        return $this->hasMany(GalleryFavorite::class, 'gallery_submission_id');
     }
 
     /**
      * Get the gallery this submission is in.
      */
-    public function gallery()
-    {
-        return $this->belongsTo('App\Models\Gallery\Gallery', 'gallery_id');
+    public function gallery() {
+        return $this->belongsTo(Gallery::class, 'gallery_id');
     }
 
     /**
      * Get the prompt this submission is for if relevant.
      */
-    public function prompt()
-    {
-        return $this->belongsTo('App\Models\Prompt\Prompt', 'prompt_id');
+    public function prompt() {
+        return $this->belongsTo(Prompt::class, 'prompt_id');
     }
 
     /**********************************************************************************************
@@ -147,83 +135,112 @@ public function prompt()
     /**
      * Scope a query to only include pending submissions.
      *
-     * @param  \Illuminate\Database\Eloquent\Builder  $query
+     * @param \Illuminate\Database\Eloquent\Builder $query
+     *
      * @return \Illuminate\Database\Eloquent\Builder
      */
-    public function scopePending($query)
-    {
+    public function scopePending($query) {
         return $query->where('status', 'Pending');
     }
 
     /**
      * Scope a query to only include submissions where all collaborators have approved.
      *
-     * @param  \Illuminate\Database\Eloquent\Builder  $query
+     * @param \Illuminate\Database\Eloquent\Builder $query
+     *
      * @return \Illuminate\Database\Eloquent\Builder
      */
-    public function scopeCollaboratorApproved($query)
-    {
+    public function scopeCollaboratorApproved($query) {
         return $query->whereNotIn('id', GalleryCollaborator::where('has_approved', 0)->pluck('gallery_submission_id')->toArray());
     }
 
     /**
      * Scope a query to only include accepted submissions.
      *
-     * @param  \Illuminate\Database\Eloquent\Builder  $query
+     * @param \Illuminate\Database\Eloquent\Builder $query
+     *
      * @return \Illuminate\Database\Eloquent\Builder
      */
-    public function scopeAccepted($query)
-    {
+    public function scopeAccepted($query) {
         return $query->where('status', 'Accepted');
     }
 
     /**
      * Scope a query to only include rejected submissions.
      *
-     * @param  \Illuminate\Database\Eloquent\Builder  $query
+     * @param \Illuminate\Database\Eloquent\Builder $query
+     *
      * @return \Illuminate\Database\Eloquent\Builder
      */
-    public function scopeRejected($query)
-    {
+    public function scopeRejected($query) {
         return $query->where('status', 'Rejected');
     }
 
     /**
      * Scope a query to only include submissions that require currency awards.
      *
-     * @param  \Illuminate\Database\Eloquent\Builder  $query
+     * @param \Illuminate\Database\Eloquent\Builder $query
+     *
      * @return \Illuminate\Database\Eloquent\Builder
      */
-    public function scopeRequiresAward($query)
-    {
-        if(!Settings::get('gallery_submissions_reward_currency')) return $query->whereNull('id');
+    public function scopeRequiresAward($query) {
+        if (!Settings::get('gallery_submissions_reward_currency')) {
+            return $query->whereNull('id');
+        }
+
         return $query->where('status', 'Accepted')->whereIn('gallery_id', Gallery::where('currency_enabled', 1)->pluck('id')->toArray());
     }
 
     /**
      * Scope a query to only include submissions the user has either submitted or collaborated on.
      *
-     * @param  \Illuminate\Database\Eloquent\Builder  $query
-     * @param                                         $user
+     * @param \Illuminate\Database\Eloquent\Builder $query
+     * @param mixed                                 $user
+     *
      * @return \Illuminate\Database\Eloquent\Builder
      */
-    public function scopeUserSubmissions($query, $user)
-    {
+    public function scopeUserSubmissions($query, $user) {
         return $query->where('user_id', $user->id)->orWhereIn('id', GalleryCollaborator::where('user_id', $user->id)->where('type', 'Collab')->pluck('gallery_submission_id')->toArray());
     }
 
     /**
      * Scope a query to only include submissions visible within the gallery.
      *
-     * @param  \Illuminate\Database\Eloquent\Builder  $query
+     * @param \Illuminate\Database\Eloquent\Builder $query
+     * @param mixed|null                            $user
+     *
      * @return \Illuminate\Database\Eloquent\Builder
      */
-    public function scopeVisible($query, $user = null)
-    {
-        if($user && $user->hasPower('manage_submissions')) return $query->where('status', 'Accepted');
+    public function scopeVisible($query, $user = null) {
+        if ($user && $user->hasPower('manage_submissions')) {
+            return $query->where('status', 'Accepted');
+        }
+
         return $query->where('status', 'Accepted')->where('is_visible', 1);
     }
 
+    /**
+     * Scope a query to sort submissions oldest first.
+     *
+     * @param \Illuminate\Database\Eloquent\Builder $query
+     *
+     * @return \Illuminate\Database\Eloquent\Builder
+     */
+    public function scopeSortOldest($query) {
+        return $query->orderBy('id');
+    }
+
+    /**
+     * Scope a query to sort submissions by newest first.
+     *
+     * @param \Illuminate\Database\Eloquent\Builder $query
+     *
+     * @return \Illuminate\Database\Eloquent\Builder
+     */
+    public function scopeSortNewest($query) {
+        return $query->orderBy('id', 'DESC');
+    }
+
     /**********************************************************************************************
 
         ACCESSORS
@@ -235,8 +252,7 @@ public function scopeVisible($query, $user = null)
      *
      * @return string
      */
-    public function getImageDirectoryAttribute()
-    {
+    public function getImageDirectoryAttribute() {
         return 'images/gallery/'.floor($this->id / 1000);
     }
 
@@ -245,9 +261,8 @@ public function getImageDirectoryAttribute()
      *
      * @return string
      */
-    public function getImageFileNameAttribute()
-    {
-        return $this->id . '_'.$this->hash.'.'.$this->extension;
+    public function getImageFileNameAttribute() {
+        return $this->id.'_'.$this->hash.'.'.$this->extension;
     }
 
     /**
@@ -255,8 +270,7 @@ public function getImageFileNameAttribute()
      *
      * @return string
      */
-    public function getImagePathAttribute()
-    {
+    public function getImagePathAttribute() {
         return public_path($this->imageDirectory);
     }
 
@@ -265,10 +279,12 @@ public function getImagePathAttribute()
      *
      * @return string
      */
-    public function getImageUrlAttribute()
-    {
-        if(!isset($this->hash)) return null;
-        return asset($this->imageDirectory . '/' . $this->imageFileName);
+    public function getImageUrlAttribute() {
+        if (!isset($this->hash)) {
+            return null;
+        }
+
+        return asset($this->imageDirectory.'/'.$this->imageFileName);
     }
 
     /**
@@ -276,9 +292,8 @@ public function getImageUrlAttribute()
      *
      * @return string
      */
-    public function getThumbnailFileNameAttribute()
-    {
-        return $this->id . '_'.$this->hash.'_th.'.$this->extension;
+    public function getThumbnailFileNameAttribute() {
+        return $this->id.'_'.$this->hash.'_th.'.$this->extension;
     }
 
     /**
@@ -286,8 +301,7 @@ public function getThumbnailFileNameAttribute()
      *
      * @return string
      */
-    public function getThumbnailPathAttribute()
-    {
+    public function getThumbnailPathAttribute() {
         return $this->imagePath;
     }
 
@@ -296,10 +310,12 @@ public function getThumbnailPathAttribute()
      *
      * @return string
      */
-    public function getThumbnailUrlAttribute()
-    {
-        if(!isset($this->hash)) return null;
-        return asset($this->imageDirectory . '/' . $this->thumbnailFileName);
+    public function getThumbnailUrlAttribute() {
+        if (!isset($this->hash)) {
+            return null;
+        }
+
+        return asset($this->imageDirectory.'/'.$this->thumbnailFileName);
     }
 
     /**
@@ -307,8 +323,7 @@ public function getThumbnailUrlAttribute()
      *
      * @return array
      */
-    public function getDataAttribute()
-    {
+    public function getDataAttribute() {
         return json_decode($this->attributes['data'], true);
     }
 
@@ -317,8 +332,7 @@ public function getDataAttribute()
      *
      * @return string
      */
-    public function getVoteDataAttribute()
-    {
+    public function getVoteDataAttribute() {
         return collect(json_decode($this->attributes['vote_data'], true));
     }
 
@@ -327,8 +341,7 @@ public function getVoteDataAttribute()
      *
      * @return string
      */
-    public function getDisplayTitleAttribute()
-    {
+    public function getDisplayTitleAttribute() {
         return $this->prefix.$this->attributes['title'];
     }
 
@@ -337,8 +350,7 @@ public function getDisplayTitleAttribute()
      *
      * @return string
      */
-    public function getDisplayNameAttribute()
-    {
+    public function getDisplayNameAttribute() {
         return '<a href="'.$this->url.'">'.$this->displayTitle.'</a>';
     }
 
@@ -347,8 +359,7 @@ public function getDisplayNameAttribute()
      *
      * @return string
      */
-    public function getUrlAttribute()
-    {
+    public function getUrlAttribute() {
         return url('gallery/view/'.$this->id);
     }
 
@@ -357,15 +368,19 @@ public function getUrlAttribute()
      *
      * @return string
      */
-    public function getPrefixAttribute()
-    {
+    public function getPrefixAttribute() {
         $currencyName = Currency::find(Settings::get('group_currency'))->abbreviation ? Currency::find(Settings::get('group_currency'))->abbreviation : Currency::find(Settings::get('group_currency'))->name;
 
         $prefixList = [];
-        if($this->promptSubmissions->count()) foreach($this->prompts as $prompt) isset($prompt->prefix) ? ($prefixList[] = $prompt->prefix) : null;
-        elseif(isset($this->prompt_id)) isset($this->prompt->prefix) ? $prefixList[] = $this->prompt->prefix : null;
-        foreach($this->participants as $participant) {
-            switch($participant->type) {
+        if ($this->promptSubmissions->count()) {
+            foreach ($this->prompts as $prompt) {
+                isset($prompt->prefix) ? ($prefixList[] = $prompt->prefix) : null;
+            }
+        } elseif (isset($this->prompt_id)) {
+            isset($this->prompt->prefix) ? $prefixList[] = $this->prompt->prefix : null;
+        }
+        foreach ($this->participants as $participant) {
+            switch ($participant->type) {
                 case 'Collab':
                     $prefixList[] = 'Collab';
                     break;
@@ -383,7 +398,10 @@ public function getPrefixAttribute()
                     break;
             }
         }
-        if($prefixList != null) return '['.implode(' : ', array_unique($prefixList)).'] ';
+        if ($prefixList != null) {
+            return '['.implode(' : ', array_unique($prefixList)).'] ';
+        }
+
         return null;
     }
 
@@ -392,8 +410,7 @@ public function getPrefixAttribute()
      *
      * @return string
      */
-    public function getQueueUrlAttribute()
-    {
+    public function getQueueUrlAttribute() {
         return url('gallery/queue/'.$this->id);
     }
 
@@ -402,9 +419,10 @@ public function getQueueUrlAttribute()
      *
      * @return bool
      */
-    public function getIsVisibleAttribute()
-    {
-        if($this->attributes['is_visible'] && $this->status == 'Accepted') return true;
+    public function getIsVisibleAttribute() {
+        if ($this->attributes['is_visible'] && $this->status == 'Accepted') {
+            return true;
+        }
     }
 
     /**
@@ -412,15 +430,16 @@ public function getIsVisibleAttribute()
      *
      * @return string
      */
-    public function getCreditsAttribute()
-    {
-        if($this->collaborators->count()) {
-            foreach($this->collaborators as $count=>$collaborator) {
+    public function getCreditsAttribute() {
+        if ($this->collaborators->count()) {
+            foreach ($this->collaborators as $count=> $collaborator) {
                 $collaboratorList[] = $collaborator->user->displayName;
             }
+
             return implode(', ', $collaboratorList);
+        } else {
+            return $this->user->displayName;
         }
-        else return $this->user->displayName;
     }
 
     /**
@@ -428,15 +447,16 @@ public function getCreditsAttribute()
      *
      * @return string
      */
-    public function getCreditsPlainAttribute()
-    {
-        if($this->collaborators->count()) {
-            foreach($this->collaborators as $count=>$collaborator) {
+    public function getCreditsPlainAttribute() {
+        if ($this->collaborators->count()) {
+            foreach ($this->collaborators as $count=> $collaborator) {
                 $collaboratorList[] = $collaborator->user->name;
             }
+
             return implode(', ', $collaboratorList);
+        } else {
+            return $this->user->name;
         }
-        else return $this->user->name;
     }
 
     /**
@@ -444,9 +464,11 @@ public function getCreditsPlainAttribute()
      *
      * @return string
      */
-    public function getCollaboratorApprovedAttribute()
-    {
-        if($this->collaborators->where('has_approved', 0)->count()) return false;
+    public function getCollaboratorApprovedAttribute() {
+        if ($this->collaborators->where('has_approved', 0)->count()) {
+            return false;
+        }
+
         return true;
     }
 
@@ -455,8 +477,7 @@ public function getCollaboratorApprovedAttribute()
      *
      * @return array
      */
-    public function getPromptSubmissionsAttribute()
-    {
+    public function getPromptSubmissionsAttribute() {
         // Only returns submissions which are viewable to everyone,
         // but given that this is for the sake of public display, that's fine
         return Submission::viewable()->whereNotNull('prompt_id')->where('url', $this->url)->get();
@@ -467,8 +488,7 @@ public function getPromptSubmissionsAttribute()
      *
      * @return array
      */
-    public function getPromptsAttribute()
-    {
+    public function getPromptsAttribute() {
         // Only returns submissions which are viewable to everyone,
         // but given that this is for the sake of public display, that's fine
         return Prompt::whereIn('id', $this->promptSubmissions->pluck('prompt_id'))->get();
@@ -479,10 +499,11 @@ public function getPromptsAttribute()
      *
      * @return string
      */
-    public function getExcerptAttribute()
-    {
-        if(!isset($this->parsed_text)) return null;
-        else return strip_tags(substr($this->parsed_text, 0, 500)).(strlen($this->parsed_text) > 500 ? '...' : '');
+    public function getExcerptAttribute() {
+        if (!isset($this->parsed_text)) {
+            return null;
+        } else {
+            return strip_tags(substr($this->parsed_text, 0, 500)).(strlen($this->parsed_text) > 500 ? '...' : '');
+        }
     }
-
 }
diff --git a/app/Models/Invitation.php b/app/Models/Invitation.php
index 788464817f..f124fdd051 100644
--- a/app/Models/Invitation.php
+++ b/app/Models/Invitation.php
@@ -2,17 +2,16 @@
 
 namespace App\Models;
 
-use App\Models\Model;
+use App\Models\User\User;
 
-class Invitation extends Model
-{
+class Invitation extends Model {
     /**
      * The attributes that are mass assignable.
      *
      * @var array
      */
     protected $fillable = [
-        'code', 'user_id', 'recipient_id'
+        'code', 'user_id', 'recipient_id',
     ];
 
     /**
@@ -21,7 +20,6 @@ class Invitation extends Model
      * @var string
      */
     protected $table = 'invitations';
-
     /**
      * Whether the model contains timestamps to be saved and updated.
      *
@@ -29,26 +27,23 @@ class Invitation extends Model
      */
     public $timestamps = true;
 
-
     /**********************************************************************************************
-    
+
         RELATIONS
 
     **********************************************************************************************/
-    
+
     /**
      * Get the user who generated the invitation code.
      */
-    public function user() 
-    {
-        return $this->belongsTo('App\Models\User\User');
+    public function user() {
+        return $this->belongsTo(User::class);
     }
 
     /**
      * Get the user who created their account using the invitation code.
      */
-    public function recipient() 
-    {
-        return $this->belongsTo('App\Models\User\User', 'recipient_id');
+    public function recipient() {
+        return $this->belongsTo(User::class, 'recipient_id');
     }
 }
diff --git a/app/Models/Item/Item.php b/app/Models/Item/Item.php
index 7761c4914d..d2f9d13148 100644
--- a/app/Models/Item/Item.php
+++ b/app/Models/Item/Item.php
@@ -2,18 +2,12 @@
 
 namespace App\Models\Item;
 
-use Config;
-use DB;
 use App\Models\Model;
-use App\Models\Item\ItemCategory;
-
-use App\Models\User\User;
-use App\Models\Shop\Shop;
 use App\Models\Prompt\Prompt;
-use App\Models\User\UserItem;
+use App\Models\Shop\Shop;
+use App\Models\User\User;
 
-class Item extends Model
-{
+class Item extends Model {
     /**
      * The attributes that are mass assignable.
      *
@@ -21,7 +15,7 @@ class Item extends Model
      */
     protected $fillable = [
         'item_category_id', 'name', 'has_image', 'description', 'parsed_description', 'allow_transfer',
-        'data', 'reference_url', 'artist_alias', 'artist_url', 'artist_id', 'is_released'
+        'data', 'reference_url', 'artist_alias', 'artist_url', 'artist_id', 'is_released', 'hash',
     ];
 
     protected $appends = ['image_url'];
@@ -32,21 +26,20 @@ class Item extends Model
      * @var string
      */
     protected $table = 'items';
-
     /**
      * Validation rules for creation.
      *
      * @var array
      */
     public static $createRules = [
-        'item_category_id' => 'nullable',
-        'name' => 'required|unique:items|between:3,100',
-        'description' => 'nullable',
-        'image' => 'mimes:png',
-        'rarity' => 'nullable',
-        'reference_url' => 'nullable|between:3,200',
-        'uses' => 'nullable|between:3,250',
-        'release' => 'nullable|between:3,100',
+        'item_category_id'  => 'nullable',
+        'name'              => 'required|unique:items|between:3,100',
+        'description'       => 'nullable',
+        'image'             => 'mimes:png',
+        'rarity'            => 'nullable',
+        'reference_url'     => 'nullable|between:3,200',
+        'uses'              => 'nullable|between:3,250',
+        'release'           => 'nullable|between:3,100',
         'currency_quantity' => 'nullable|integer|min:1',
     ];
 
@@ -56,13 +49,13 @@ class Item extends Model
      * @var array
      */
     public static $updateRules = [
-        'item_category_id' => 'nullable',
-        'name' => 'required|between:3,100',
-        'description' => 'nullable',
-        'image' => 'mimes:png',
-        'reference_url' => 'nullable|between:3,200',
-        'uses' => 'nullable|between:3,250',
-        'release' => 'nullable|between:3,100',
+        'item_category_id'  => 'nullable',
+        'name'              => 'required|between:3,100',
+        'description'       => 'nullable',
+        'image'             => 'mimes:png',
+        'reference_url'     => 'nullable|between:3,200',
+        'uses'              => 'nullable|between:3,250',
+        'release'           => 'nullable|between:3,100',
         'currency_quantity' => 'nullable|integer|min:1',
     ];
 
@@ -75,25 +68,22 @@ class Item extends Model
     /**
      * Get the category the item belongs to.
      */
-    public function category()
-    {
-        return $this->belongsTo('App\Models\Item\ItemCategory', 'item_category_id');
+    public function category() {
+        return $this->belongsTo(ItemCategory::class, 'item_category_id');
     }
 
     /**
      * Get the item's tags.
      */
-    public function tags()
-    {
-        return $this->hasMany('App\Models\Item\ItemTag', 'item_id');
+    public function tags() {
+        return $this->hasMany(ItemTag::class, 'item_id');
     }
 
     /**
      * Get the user that drew the item art.
      */
-    public function artist()
-    {
-        return $this->belongsTo('App\Models\User\User', 'artist_id');
+    public function artist() {
+        return $this->belongsTo(User::class, 'artist_id');
     }
 
     /**********************************************************************************************
@@ -105,58 +95,66 @@ public function artist()
     /**
      * Scope a query to sort items in alphabetical order.
      *
-     * @param  \Illuminate\Database\Eloquent\Builder  $query
-     * @param  bool                                   $reverse
+     * @param \Illuminate\Database\Eloquent\Builder $query
+     * @param bool                                  $reverse
+     *
      * @return \Illuminate\Database\Eloquent\Builder
      */
-    public function scopeSortAlphabetical($query, $reverse = false)
-    {
+    public function scopeSortAlphabetical($query, $reverse = false) {
         return $query->orderBy('name', $reverse ? 'DESC' : 'ASC');
     }
 
     /**
      * Scope a query to sort items in category order.
      *
-     * @param  \Illuminate\Database\Eloquent\Builder  $query
+     * @param \Illuminate\Database\Eloquent\Builder $query
+     *
      * @return \Illuminate\Database\Eloquent\Builder
      */
-    public function scopeSortCategory($query)
-    {
-        $ids = ItemCategory::orderBy('sort', 'DESC')->pluck('id')->toArray();
-        return count($ids) ? $query->orderByRaw(DB::raw('FIELD(item_category_id, '.implode(',', $ids).')')) : $query;
+    public function scopeSortCategory($query) {
+        if (ItemCategory::all()->count()) {
+            return $query->orderBy(ItemCategory::select('sort')->whereColumn('items.item_category_id', 'item_categories.id'), 'DESC');
+        }
+
+        return $query;
     }
 
     /**
      * Scope a query to sort items by newest first.
      *
-     * @param  \Illuminate\Database\Eloquent\Builder  $query
+     * @param \Illuminate\Database\Eloquent\Builder $query
+     *
      * @return \Illuminate\Database\Eloquent\Builder
      */
-    public function scopeSortNewest($query)
-    {
+    public function scopeSortNewest($query) {
         return $query->orderBy('id', 'DESC');
     }
 
     /**
      * Scope a query to sort features oldest first.
      *
-     * @param  \Illuminate\Database\Eloquent\Builder  $query
+     * @param \Illuminate\Database\Eloquent\Builder $query
+     *
      * @return \Illuminate\Database\Eloquent\Builder
      */
-    public function scopeSortOldest($query)
-    {
+    public function scopeSortOldest($query) {
         return $query->orderBy('id');
     }
 
     /**
      * Scope a query to show only released or "released" (at least one user-owned stack has ever existed) items.
      *
-     * @param  \Illuminate\Database\Eloquent\Builder  $query
+     * @param \Illuminate\Database\Eloquent\Builder $query
+     * @param mixed|null                            $user
+     *
      * @return \Illuminate\Database\Eloquent\Builder
      */
-    public function scopeReleased($query)
-    {
-        return $query->whereIn('id', UserItem::pluck('item_id')->toArray())->orWhere('is_released', 1);
+    public function scopeReleased($query, $user = null) {
+        if ($user && $user->hasPower('edit_data')) {
+            return $query;
+        }
+
+        return $query->where('is_released', 1);
     }
 
     /**********************************************************************************************
@@ -170,8 +168,7 @@ public function scopeReleased($query)
      *
      * @return string
      */
-    public function getDisplayNameAttribute()
-    {
+    public function getDisplayNameAttribute() {
         return '<a href="'.$this->url.'" class="display-item">'.$this->name.'</a>';
     }
 
@@ -180,8 +177,7 @@ public function getDisplayNameAttribute()
      *
      * @return string
      */
-    public function getImageDirectoryAttribute()
-    {
+    public function getImageDirectoryAttribute() {
         return 'images/data/items';
     }
 
@@ -190,9 +186,8 @@ public function getImageDirectoryAttribute()
      *
      * @return string
      */
-    public function getImageFileNameAttribute()
-    {
-        return $this->id . '-image.png';
+    public function getImageFileNameAttribute() {
+        return $this->hash.$this->id.'-image.png';
     }
 
     /**
@@ -200,8 +195,7 @@ public function getImageFileNameAttribute()
      *
      * @return string
      */
-    public function getImagePathAttribute()
-    {
+    public function getImagePathAttribute() {
         return public_path($this->imageDirectory);
     }
 
@@ -210,10 +204,12 @@ public function getImagePathAttribute()
      *
      * @return string
      */
-    public function getImageUrlAttribute()
-    {
-        if (!$this->has_image) return null;
-        return asset($this->imageDirectory . '/' . $this->imageFileName);
+    public function getImageUrlAttribute() {
+        if (!$this->has_image) {
+            return null;
+        }
+
+        return asset($this->imageDirectory.'/'.$this->imageFileName);
     }
 
     /**
@@ -221,8 +217,7 @@ public function getImageUrlAttribute()
      *
      * @return string
      */
-    public function getUrlAttribute()
-    {
+    public function getUrlAttribute() {
         return url('world/items?name='.$this->name);
     }
 
@@ -231,8 +226,7 @@ public function getUrlAttribute()
      *
      * @return string
      */
-    public function getIdUrlAttribute()
-    {
+    public function getIdUrlAttribute() {
         return url('world/items/'.$this->id);
     }
 
@@ -241,8 +235,7 @@ public function getIdUrlAttribute()
      *
      * @return string
      */
-    public function getAssetTypeAttribute()
-    {
+    public function getAssetTypeAttribute() {
         return 'items';
     }
 
@@ -251,24 +244,22 @@ public function getAssetTypeAttribute()
      *
      * @return string
      */
-    public function getItemArtistAttribute()
-    {
-        if(!$this->artist_url && !$this->artist_id) return null;
+    public function getItemArtistAttribute() {
+        if (!$this->artist_url && !$this->artist_id) {
+            return null;
+        }
 
         // Check to see if the artist exists on site
         $artist = checkAlias($this->artist_url, false);
-        if(is_object($artist)) {
+        if (is_object($artist)) {
             $this->artist_id = $artist->id;
             $this->artist_url = null;
             $this->save();
         }
 
-        if($this->artist_id)
-        {
+        if ($this->artist_id) {
             return $this->artist->displayName;
-        }
-        else if ($this->artist_url)
-        {
+        } elseif ($this->artist_url) {
             return prettyProfileLink($this->artist_url);
         }
     }
@@ -278,9 +269,11 @@ public function getItemArtistAttribute()
      *
      * @return string
      */
-    public function getReferenceAttribute()
-    {
-        if (!$this->reference_url) return null;
+    public function getReferenceAttribute() {
+        if (!$this->reference_url) {
+            return null;
+        }
+
         return $this->reference_url;
     }
 
@@ -289,9 +282,11 @@ public function getReferenceAttribute()
      *
      * @return array
      */
-    public function getDataAttribute()
-    {
-        if (!$this->id) return null;
+    public function getDataAttribute() {
+        if (!$this->id) {
+            return null;
+        }
+
         return json_decode($this->attributes['data'], true);
     }
 
@@ -300,9 +295,11 @@ public function getDataAttribute()
      *
      * @return string
      */
-    public function getRarityAttribute()
-    {
-        if (!isset($this->data) || !isset($this->data['rarity'])) return null;
+    public function getRarityAttribute() {
+        if (!isset($this->data) || !isset($this->data['rarity'])) {
+            return null;
+        }
+
         return $this->data['rarity'];
     }
 
@@ -311,9 +308,11 @@ public function getRarityAttribute()
      *
      * @return string
      */
-    public function getUsesAttribute()
-    {
-        if (!$this->data) return null;
+    public function getUsesAttribute() {
+        if (!$this->data) {
+            return null;
+        }
+
         return $this->data['uses'];
     }
 
@@ -322,9 +321,11 @@ public function getUsesAttribute()
      *
      * @return string
      */
-    public function getSourceAttribute()
-    {
-        if (!$this->data) return null;
+    public function getSourceAttribute() {
+        if (!$this->data) {
+            return null;
+        }
+
         return $this->data['release'];
     }
 
@@ -333,9 +334,11 @@ public function getSourceAttribute()
      *
      * @return string
      */
-    public function getResellAttribute()
-    {
-        if (!$this->data) return null;
+    public function getResellAttribute() {
+        if (!$this->data) {
+            return null;
+        }
+
         return collect($this->data['resell']);
     }
 
@@ -344,10 +347,12 @@ public function getResellAttribute()
      *
      * @return array
      */
-    public function getShopsAttribute()
-    {
-        if (!$this->data) return null;
+    public function getShopsAttribute() {
+        if (!$this->data) {
+            return null;
+        }
         $itemShops = $this->data['shops'];
+
         return Shop::whereIn('id', $itemShops)->get();
     }
 
@@ -356,13 +361,33 @@ public function getShopsAttribute()
      *
      * @return array
      */
-    public function getPromptsAttribute()
-    {
-        if (!$this->data) return null;
+    public function getPromptsAttribute() {
+        if (!$this->data) {
+            return null;
+        }
         $itemPrompts = $this->data['prompts'];
+
         return Prompt::whereIn('id', $itemPrompts)->get();
     }
 
+    /**
+     * Gets the admin edit URL.
+     *
+     * @return string
+     */
+    public function getAdminUrlAttribute() {
+        return url('admin/data/items/edit/'.$this->id);
+    }
+
+    /**
+     * Gets the power required to edit this model.
+     *
+     * @return string
+     */
+    public function getAdminPowerAttribute() {
+        return 'edit_data';
+    }
+
     /**********************************************************************************************
 
         OTHER FUNCTIONS
@@ -372,20 +397,22 @@ public function getPromptsAttribute()
     /**
      * Checks if the item has a particular tag.
      *
+     * @param mixed $tag
+     *
      * @return bool
      */
-    public function hasTag($tag)
-    {
+    public function hasTag($tag) {
         return $this->tags()->where('tag', $tag)->where('is_active', 1)->exists();
     }
 
     /**
      * Gets a particular tag attached to the item.
      *
+     * @param mixed $tag
+     *
      * @return \App\Models\Item\ItemTag
      */
-    public function tag($tag)
-    {
+    public function tag($tag) {
         return $this->tags()->where('tag', $tag)->where('is_active', 1)->first();
     }
 }
diff --git a/app/Models/Item/ItemCategory.php b/app/Models/Item/ItemCategory.php
index 3dc336ff06..fc48cd19bf 100644
--- a/app/Models/Item/ItemCategory.php
+++ b/app/Models/Item/ItemCategory.php
@@ -2,18 +2,16 @@
 
 namespace App\Models\Item;
 
-use Config;
 use App\Models\Model;
 
-class ItemCategory extends Model
-{
+class ItemCategory extends Model {
     /**
      * The attributes that are mass assignable.
      *
      * @var array
      */
     protected $fillable = [
-        'name', 'sort', 'has_image', 'description', 'parsed_description', 'is_character_owned', 'character_limit', 'can_name'
+        'name', 'sort', 'has_image', 'description', 'parsed_description', 'is_character_owned', 'character_limit', 'can_name', 'is_visible', 'hash',
     ];
 
     /**
@@ -22,31 +20,53 @@ class ItemCategory extends Model
      * @var string
      */
     protected $table = 'item_categories';
-    
+
     /**
      * Validation rules for creation.
      *
      * @var array
      */
     public static $createRules = [
-        'name' => 'required|unique:item_categories|between:3,100',
+        'name'        => 'required|unique:item_categories|between:3,100',
         'description' => 'nullable',
-        'image' => 'mimes:png',
+        'image'       => 'mimes:png',
     ];
-    
+
     /**
      * Validation rules for updating.
      *
      * @var array
      */
     public static $updateRules = [
-        'name' => 'required|between:3,100',
+        'name'        => 'required|between:3,100',
         'description' => 'nullable',
-        'image' => 'mimes:png',
+        'image'       => 'mimes:png',
     ];
 
     /**********************************************************************************************
-    
+
+        SCOPES
+
+    **********************************************************************************************/
+
+    /**
+     * Scope a query to show only visible categories.
+     *
+     * @param \Illuminate\Database\Eloquent\Builder $query
+     * @param mixed|null                            $user
+     *
+     * @return \Illuminate\Database\Eloquent\Builder
+     */
+    public function scopeVisible($query, $user = null) {
+        if ($user && $user->hasPower('edit_data')) {
+            return $query;
+        }
+
+        return $query->where('is_visible', 1);
+    }
+
+    /**********************************************************************************************
+
         ACCESSORS
 
     **********************************************************************************************/
@@ -56,8 +76,7 @@ class ItemCategory extends Model
      *
      * @return string
      */
-    public function getDisplayNameAttribute()
-    {
+    public function getDisplayNameAttribute() {
         return '<a href="'.$this->url.'" class="display-category">'.$this->name.'</a>';
     }
 
@@ -66,8 +85,7 @@ public function getDisplayNameAttribute()
      *
      * @return string
      */
-    public function getImageDirectoryAttribute()
-    {
+    public function getImageDirectoryAttribute() {
         return 'images/data/item-categories';
     }
 
@@ -76,9 +94,8 @@ public function getImageDirectoryAttribute()
      *
      * @return string
      */
-    public function getCategoryImageFileNameAttribute()
-    {
-        return $this->id . '-image.png';
+    public function getCategoryImageFileNameAttribute() {
+        return $this->hash.$this->id.'-image.png';
     }
 
     /**
@@ -86,20 +103,21 @@ public function getCategoryImageFileNameAttribute()
      *
      * @return string
      */
-    public function getCategoryImagePathAttribute()
-    {
+    public function getCategoryImagePathAttribute() {
         return public_path($this->imageDirectory);
     }
-    
+
     /**
      * Gets the URL of the model's image.
      *
      * @return string
      */
-    public function getCategoryImageUrlAttribute()
-    {
-        if (!$this->has_image) return null;
-        return asset($this->imageDirectory . '/' . $this->categoryImageFileName);
+    public function getCategoryImageUrlAttribute() {
+        if (!$this->has_image) {
+            return null;
+        }
+
+        return asset($this->imageDirectory.'/'.$this->categoryImageFileName);
     }
 
     /**
@@ -107,8 +125,7 @@ public function getCategoryImageUrlAttribute()
      *
      * @return string
      */
-    public function getUrlAttribute()
-    {
+    public function getUrlAttribute() {
         return url('world/item-categories?name='.$this->name);
     }
 
@@ -117,8 +134,25 @@ public function getUrlAttribute()
      *
      * @return string
      */
-    public function getSearchUrlAttribute()
-    {
+    public function getSearchUrlAttribute() {
         return url('world/items?item_category_id='.$this->id);
     }
+
+    /**
+     * Gets the admin edit URL.
+     *
+     * @return string
+     */
+    public function getAdminUrlAttribute() {
+        return url('admin/data/item-categories/edit/'.$this->id);
+    }
+
+    /**
+     * Gets the power required to edit this model.
+     *
+     * @return string
+     */
+    public function getAdminPowerAttribute() {
+        return 'edit_data';
+    }
 }
diff --git a/app/Models/Item/ItemLog.php b/app/Models/Item/ItemLog.php
index 8c719bd421..b7559daee9 100644
--- a/app/Models/Item/ItemLog.php
+++ b/app/Models/Item/ItemLog.php
@@ -2,21 +2,21 @@
 
 namespace App\Models\Item;
 
-use Config;
+use App\Models\Character\Character;
 use App\Models\Model;
+use App\Models\User\User;
 
-class ItemLog extends Model
-{
+class ItemLog extends Model {
     /**
      * The attributes that are mass assignable.
      *
      * @var array
      */
     protected $fillable = [
-        'sender_id', 'recipient_id', 
+        'sender_id', 'recipient_id',
         'log', 'log_type', 'data',
         'item_id', 'quantity', 'stack_id',
-        'sender_type', 'recipient_type'
+        'sender_type', 'recipient_type',
     ];
 
     /**
@@ -25,7 +25,6 @@ class ItemLog extends Model
      * @var string
      */
     protected $table = 'items_log';
-
     /**
      * Whether the model contains timestamps to be saved and updated.
      *
@@ -34,7 +33,7 @@ class ItemLog extends Model
     public $timestamps = true;
 
     /**********************************************************************************************
-    
+
         RELATIONS
 
     **********************************************************************************************/
@@ -42,26 +41,29 @@ class ItemLog extends Model
     /**
      * Get the user who initiated the logged action.
      */
-    public function sender() 
-    {
-        if($this->sender_type == 'User') return $this->belongsTo('App\Models\User\User', 'sender_id');
-        return $this->belongsTo('App\Models\Character\Character', 'sender_id');
+    public function sender() {
+        if ($this->sender_type == 'User') {
+            return $this->belongsTo(User::class, 'sender_id');
+        }
+
+        return $this->belongsTo(Character::class, 'sender_id');
     }
 
     /**
      * Get the user who received the logged action.
      */
-    public function recipient() 
-    {
-        if($this->recipient_type == 'User') return $this->belongsTo('App\Models\User\User', 'recipient_id');
-        return $this->belongsTo('App\Models\Character\Character', 'recipient_id');
+    public function recipient() {
+        if ($this->recipient_type == 'User') {
+            return $this->belongsTo(User::class, 'recipient_id');
+        }
+
+        return $this->belongsTo(Character::class, 'recipient_id');
     }
 
     /**
      * Get the item that is the target of the action.
      */
-    public function item() 
-    {
-        return $this->belongsTo('App\Models\Item\Item');
+    public function item() {
+        return $this->belongsTo(Item::class);
     }
 }
diff --git a/app/Models/Item/ItemTag.php b/app/Models/Item/ItemTag.php
index 896aad0794..5f5bc5b815 100644
--- a/app/Models/Item/ItemTag.php
+++ b/app/Models/Item/ItemTag.php
@@ -2,19 +2,17 @@
 
 namespace App\Models\Item;
 
-use Config;
-use DB;
 use App\Models\Model;
+use Illuminate\Support\Facades\Config;
 
-class ItemTag extends Model
-{
+class ItemTag extends Model {
     /**
      * The attributes that are mass assignable.
      *
      * @var array
      */
     protected $fillable = [
-        'item_id', 'tag', 'data', 'is_active'
+        'item_id', 'tag', 'data', 'is_active',
     ];
 
     /**
@@ -25,7 +23,7 @@ class ItemTag extends Model
     protected $table = 'item_tags';
 
     /**********************************************************************************************
-    
+
         RELATIONS
 
     **********************************************************************************************/
@@ -33,13 +31,12 @@ class ItemTag extends Model
     /**
      * Get the item that this tag is attached to.
      */
-    public function item() 
-    {
-        return $this->belongsTo('App\Models\Item\Item');
+    public function item() {
+        return $this->belongsTo(Item::class);
     }
 
     /**********************************************************************************************
-    
+
         SCOPES
 
     **********************************************************************************************/
@@ -47,41 +44,43 @@ public function item()
     /**
      * Scope a query to retrieve only active tags.
      *
-     * @param  \Illuminate\Database\Eloquent\Builder  $query
+     * @param \Illuminate\Database\Eloquent\Builder $query
+     *
      * @return \Illuminate\Database\Eloquent\Builder
      */
-    public function scopeActive($query)
-    {
+    public function scopeActive($query) {
         return $query->where('is_active', 1);
     }
 
     /**
      * Scope a query to retrieve only a certain tag.
      *
-     * @param  \Illuminate\Database\Eloquent\Builder  $query
-     * @param  string                                 $tag
+     * @param \Illuminate\Database\Eloquent\Builder $query
+     * @param string                                $tag
+     *
      * @return \Illuminate\Database\Eloquent\Builder
      */
-    public function scopeType($query, $tag)
-    {
+    public function scopeType($query, $tag) {
         return $query->where('tag', $tag);
     }
 
     /**********************************************************************************************
-    
+
         ACCESSORS
 
     **********************************************************************************************/
-    
+
     /**
      * Displays the tag name formatted according to its colours as defined in the config file.
      *
      * @return string
      */
-    public function getDisplayTagAttribute()
-    {
-        $tag = Config::get('lorekeeper.item_tags.' . $this->tag);
-        if($tag) return '<span class="badge" style="color: '.$tag['text_color'].';background-color: '.$tag['background_color'].';">'.$tag['name'].'</span>';
+    public function getDisplayTagAttribute() {
+        $tag = config('lorekeeper.item_tags.'.$this->tag);
+        if ($tag) {
+            return '<span class="badge" style="color: '.$tag['text_color'].';background-color: '.$tag['background_color'].';">'.$tag['name'].'</span>';
+        }
+
         return null;
     }
 
@@ -90,9 +89,8 @@ public function getDisplayTagAttribute()
      *
      * @return mixed
      */
-    public function getName()
-    {
-        return Config::get('lorekeeper.item_tags.' . $this->tag.'.name');
+    public function getName() {
+        return config('lorekeeper.item_tags.'.$this->tag.'.name');
     }
 
     /**
@@ -100,8 +98,7 @@ public function getName()
      *
      * @return string
      */
-    public function getAdminUrlAttribute()
-    {
+    public function getAdminUrlAttribute() {
         return url('admin/data/items/tag/'.$this->item_id.'/'.$this->tag);
     }
 
@@ -110,8 +107,7 @@ public function getAdminUrlAttribute()
      *
      * @return array
      */
-    public function getDataAttribute()
-    {
+    public function getDataAttribute() {
         return json_decode($this->attributes['data'], true);
     }
 
@@ -120,14 +116,14 @@ public function getDataAttribute()
      *
      * @return mixed
      */
-    public function getServiceAttribute()
-    {
+    public function getServiceAttribute() {
         $class = 'App\Services\Item\\'.str_replace(' ', '', ucwords(str_replace('_', ' ', $this->tag))).'Service';
-        return (new $class());
+
+        return new $class();
     }
 
     /**********************************************************************************************
-    
+
         OTHER FUNCTIONS
 
     **********************************************************************************************/
@@ -137,8 +133,7 @@ public function getServiceAttribute()
      *
      * @return mixed
      */
-    public function getEditData()
-    {
+    public function getEditData() {
         return $this->service->getEditData();
     }
 
@@ -147,8 +142,7 @@ public function getEditData()
      *
      * @return mixed
      */
-    public function getData()
-    {
+    public function getData() {
         return $this->service->getTagData($this);
     }
 }
diff --git a/app/Models/Loot/Loot.php b/app/Models/Loot/Loot.php
index 2409f23f70..d69bae2243 100644
--- a/app/Models/Loot/Loot.php
+++ b/app/Models/Loot/Loot.php
@@ -2,11 +2,12 @@
 
 namespace App\Models\Loot;
 
-use Config;
+use App\Models\Currency\Currency;
+use App\Models\Item\Item;
+use App\Models\Item\ItemCategory;
 use App\Models\Model;
 
-class Loot extends Model
-{
+class Loot extends Model {
     /**
      * The attributes that are mass assignable.
      *
@@ -14,7 +15,7 @@ class Loot extends Model
      */
     protected $fillable = [
         'loot_table_id', 'rewardable_type', 'rewardable_id',
-        'quantity', 'weight', 'data'
+        'quantity', 'weight', 'data',
     ];
 
     /**
@@ -23,7 +24,6 @@ class Loot extends Model
      * @var string
      */
     protected $table = 'loots';
-
     /**
      * Validation rules for creation.
      *
@@ -31,9 +31,9 @@ class Loot extends Model
      */
     public static $createRules = [
         'rewardable_type' => 'required',
-        'rewardable_id' => 'required',
-        'quantity' => 'required|integer|min:1',
-        'weight' => 'required|integer|min:1',
+        'rewardable_id'   => 'required',
+        'quantity'        => 'required|integer|min:1',
+        'weight'          => 'required|integer|min:1',
     ];
 
     /**
@@ -43,9 +43,9 @@ class Loot extends Model
      */
     public static $updateRules = [
         'rewardable_type' => 'required',
-        'rewardable_id' => 'required',
-        'quantity' => 'required|integer|min:1',
-        'weight' => 'required|integer|min:1',
+        'rewardable_id'   => 'required',
+        'quantity'        => 'required|integer|min:1',
+        'weight'          => 'required|integer|min:1',
     ];
 
     /**********************************************************************************************
@@ -57,26 +57,25 @@ class Loot extends Model
     /**
      * Get the reward attached to the loot entry.
      */
-    public function reward()
-    {
-        switch ($this->rewardable_type)
-        {
+    public function reward() {
+        switch ($this->rewardable_type) {
             case 'Item':
-                return $this->belongsTo('App\Models\Item\Item', 'rewardable_id');
+                return $this->belongsTo(Item::class, 'rewardable_id');
             case 'ItemRarity':
-                return $this->belongsTo('App\Models\Item\Item', 'rewardable_id');
+                return $this->belongsTo(Item::class, 'rewardable_id');
             case 'Currency':
-                return $this->belongsTo('App\Models\Currency\Currency', 'rewardable_id');
+                return $this->belongsTo(Currency::class, 'rewardable_id');
             case 'LootTable':
-                return $this->belongsTo('App\Models\Loot\LootTable', 'rewardable_id');
+                return $this->belongsTo(LootTable::class, 'rewardable_id');
             case 'ItemCategory':
-                return $this->belongsTo('App\Models\Item\ItemCategory', 'rewardable_id');
+                return $this->belongsTo(ItemCategory::class, 'rewardable_id');
             case 'ItemCategoryRarity':
-                return $this->belongsTo('App\Models\Item\ItemCategory', 'rewardable_id');
+                return $this->belongsTo(ItemCategory::class, 'rewardable_id');
             case 'None':
                 // Laravel requires a relationship instance to be returned (cannot return null), so returning one that doesn't exist here.
-                return $this->belongsTo('App\Models\Loot\Loot', 'rewardable_id', 'loot_table_id')->whereNull('loot_table_id');
+                return $this->belongsTo(self::class, 'rewardable_id', 'loot_table_id')->whereNull('loot_table_id');
         }
+
         return null;
     }
 
@@ -91,9 +90,11 @@ public function reward()
      *
      * @return array
      */
-    public function getDataAttribute()
-    {
-        if (!$this->attributes['data']) return null;
+    public function getDataAttribute() {
+        if (!$this->attributes['data']) {
+            return null;
+        }
+
         return json_decode($this->attributes['data'], true);
     }
 }
diff --git a/app/Models/Loot/LootTable.php b/app/Models/Loot/LootTable.php
index 4e264acde0..b66a6a0232 100644
--- a/app/Models/Loot/LootTable.php
+++ b/app/Models/Loot/LootTable.php
@@ -2,13 +2,10 @@
 
 namespace App\Models\Loot;
 
-use Config;
 use App\Models\Item\Item;
-
 use App\Models\Model;
 
-class LootTable extends Model
-{
+class LootTable extends Model {
     /**
      * The attributes that are mass assignable.
      *
@@ -24,14 +21,13 @@ class LootTable extends Model
      * @var string
      */
     protected $table = 'loot_tables';
-
     /**
      * Validation rules for creation.
      *
      * @var array
      */
     public static $createRules = [
-        'name' => 'required',
+        'name'         => 'required',
         'display_name' => 'required',
     ];
 
@@ -41,7 +37,7 @@ class LootTable extends Model
      * @var array
      */
     public static $updateRules = [
-        'name' => 'required',
+        'name'         => 'required',
         'display_name' => 'required',
     ];
 
@@ -54,9 +50,8 @@ class LootTable extends Model
     /**
      * Get the loot data for this loot table.
      */
-    public function loot()
-    {
-        return $this->hasMany('App\Models\Loot\Loot', 'loot_table_id');
+    public function loot() {
+        return $this->hasMany(Loot::class, 'loot_table_id');
     }
 
     /**********************************************************************************************
@@ -70,8 +65,7 @@ public function loot()
      *
      * @return string
      */
-    public function getDisplayNameAttribute()
-    {
+    public function getDisplayNameAttribute() {
         return '<span class="display-loot">'.$this->attributes['display_name'].'</span> '.add_help('This reward is random.');
     }
 
@@ -80,11 +74,28 @@ public function getDisplayNameAttribute()
      *
      * @return string
      */
-    public function getAssetTypeAttribute()
-    {
+    public function getAssetTypeAttribute() {
         return 'loot_tables';
     }
 
+    /**
+     * Gets the admin edit URL.
+     *
+     * @return string
+     */
+    public function getAdminUrlAttribute() {
+        return url('admin/data/loot-tables/edit/'.$this->id);
+    }
+
+    /**
+     * Gets the power required to edit this model.
+     *
+     * @return string
+     */
+    public function getAdminPowerAttribute() {
+        return 'edit_data';
+    }
+
     /**********************************************************************************************
 
         OTHER FUNCTIONS
@@ -94,110 +105,128 @@ public function getAssetTypeAttribute()
     /**
      * Rolls on the loot table and consolidates the rewards.
      *
-     * @param  int  $quantity
+     * @param int $quantity
+     *
      * @return \Illuminate\Support\Collection
      */
-    public function roll($quantity = 1)
-    {
+    public function roll($quantity = 1) {
         $rewards = createAssetsArray();
 
         $loot = $this->loot;
         $totalWeight = 0;
-        foreach($loot as $l) $totalWeight += $l->weight;
+        foreach ($loot as $l) {
+            $totalWeight += $l->weight;
+        }
 
-        for($i = 0; $i < $quantity; $i++)
-        {
+        for ($i = 0; $i < $quantity; $i++) {
             $roll = mt_rand(0, $totalWeight - 1);
             $result = null;
             $prev = null;
             $count = 0;
-            foreach($loot as $l)
-            {
+            foreach ($loot as $l) {
                 $count += $l->weight;
 
-                if($roll < $count)
-                {
+                if ($roll < $count) {
                     $result = $l;
                     break;
                 }
                 $prev = $l;
             }
-            if(!$result) $result = $prev;
+            if (!$result) {
+                $result = $prev;
+            }
 
-            if($result) {
+            if ($result) {
                 // If this is chained to another loot table, roll on that table
-                if($result->rewardable_type == 'LootTable') $rewards = mergeAssetsArrays($rewards, $result->reward->roll($result->quantity));
-                elseif($result->rewardable_type == 'ItemCategory' || $result->rewardable_type == 'ItemCategoryRarity') $rewards = mergeAssetsArrays($rewards, $this->rollCategory($result->rewardable_id, $result->quantity, (isset($result->data['criteria']) ? $result->data['criteria'] : null), (isset($result->data['rarity']) ? $result->data['rarity'] : null)));
-                elseif($result->rewardable_type == 'ItemRarity') $rewards = mergeAssetsArrays($rewards, $this->rollRarityItem($result->quantity, $result->data['criteria'], $result->data['rarity']));
-                else addAsset($rewards, $result->reward, $result->quantity);
+                if ($result->rewardable_type == 'LootTable') {
+                    $rewards = mergeAssetsArrays($rewards, $result->reward->roll($result->quantity));
+                } elseif ($result->rewardable_type == 'ItemCategory' || $result->rewardable_type == 'ItemCategoryRarity') {
+                    $rewards = mergeAssetsArrays($rewards, $this->rollCategory($result->rewardable_id, $result->quantity, ($result->data['criteria'] ?? null), ($result->data['rarity'] ?? null)));
+                } elseif ($result->rewardable_type == 'ItemRarity') {
+                    $rewards = mergeAssetsArrays($rewards, $this->rollRarityItem($result->quantity, $result->data['criteria'], $result->data['rarity']));
+                } else {
+                    addAsset($rewards, $result->reward, $result->quantity);
+                }
             }
         }
+
         return $rewards;
     }
 
     /**
      * Rolls on an item category.
      *
-     * @param  int    $id
-     * @param  int    $quantity
-     * @param  string $condition
-     * @param  string $rarity
+     * @param int        $id
+     * @param int        $quantity
+     * @param string     $rarity
+     * @param mixed|null $criteria
+     *
      * @return \Illuminate\Support\Collection
      */
-    public function rollCategory($id, $quantity = 1, $criteria = null, $rarity = null)
-    {
+    public function rollCategory($id, $quantity = 1, $criteria = null, $rarity = null) {
         $rewards = createAssetsArray();
 
-        if(isset($criteria) && $criteria && isset($rarity) && $rarity) {
-            if(Config::get('lorekeeper.extensions.item_entry_expansion.loot_tables.alternate_filtering')) $loot = Item::where('item_category_id', $id)->released()->whereNotNull('data')->where('data->rarity', $criteria, $rarity)->get();
-            else $loot = Item::where('item_category_id', $id)->released()->whereNotNull('data')->whereRaw('JSON_EXTRACT(`data`, \'$.rarity\')'. $criteria . $rarity)->get();
+        if (isset($criteria) && $criteria && isset($rarity) && $rarity) {
+            if (config('lorekeeper.extensions.item_entry_expansion.loot_tables.alternate_filtering')) {
+                $loot = Item::where('item_category_id', $id)->released()->whereNotNull('data')->where('data->rarity', $criteria, $rarity)->get();
+            } else {
+                $loot = Item::where('item_category_id', $id)->released()->whereNotNull('data')->whereRaw('JSON_EXTRACT(`data`, \'$.rarity\')'.$criteria.$rarity)->get();
+            }
+        } else {
+            $loot = Item::where('item_category_id', $id)->released()->get();
+        }
+        if (!$loot->count()) {
+            throw new \Exception('There are no items to select from!');
         }
-        else $loot = Item::where('item_category_id', $id)->released()->get();
-        if(!$loot->count()) throw new \Exception('There are no items to select from!');
 
         $totalWeight = $loot->count();
 
-        for($i = 0; $i < $quantity; $i++)
-        {
+        for ($i = 0; $i < $quantity; $i++) {
             $roll = mt_rand(0, $totalWeight - 1);
             $result = $loot[$roll];
 
-            if($result) {
+            if ($result) {
                 // If this is chained to another loot table, roll on that table
                 addAsset($rewards, $result, 1);
             }
         }
+
         return $rewards;
     }
 
     /**
      * Rolls on an item rarity.
      *
-     * @param  int    $quantity
-     * @param  string $condition
-     * @param  string $rarity
+     * @param int    $quantity
+     * @param string $rarity
+     * @param mixed  $criteria
+     *
      * @return \Illuminate\Support\Collection
      */
-    public function rollRarityItem($quantity = 1, $criteria, $rarity)
-    {
+    public function rollRarityItem($quantity, $criteria, $rarity) {
         $rewards = createAssetsArray();
 
-        if(Config::get('lorekeeper.extensions.item_entry_expansion.loot_tables.alternate_filtering')) $loot = Item::released()->whereNotNull('data')->where('data->rarity', $criteria, $rarity)->get();
-        else $loot = Item::released()->whereNotNull('data')->whereRaw('JSON_EXTRACT(`data`, \'$.rarity\')'. $criteria . $rarity)->get();
-        if(!$loot->count()) throw new \Exception('There are no items to select from!');
+        if (config('lorekeeper.extensions.item_entry_expansion.loot_tables.alternate_filtering')) {
+            $loot = Item::released()->whereNotNull('data')->where('data->rarity', $criteria, $rarity)->get();
+        } else {
+            $loot = Item::released()->whereNotNull('data')->whereRaw('JSON_EXTRACT(`data`, \'$.rarity\')'.$criteria.$rarity)->get();
+        }
+        if (!$loot->count()) {
+            throw new \Exception('There are no items to select from!');
+        }
 
         $totalWeight = $loot->count();
 
-        for($i = 0; $i < $quantity; $i++)
-        {
+        for ($i = 0; $i < $quantity; $i++) {
             $roll = mt_rand(0, $totalWeight - 1);
             $result = $loot[$roll];
 
-            if($result) {
+            if ($result) {
                 // If this is chained to another loot table, roll on that table
                 addAsset($rewards, $result, 1);
             }
         }
+
         return $rewards;
     }
 }
diff --git a/app/Models/Model.php b/app/Models/Model.php
index addde921b0..7525891258 100644
--- a/app/Models/Model.php
+++ b/app/Models/Model.php
@@ -4,8 +4,7 @@
 
 use Illuminate\Database\Eloquent\Model as EloquentModel;
 
-class Model extends EloquentModel
-{
+class Model extends EloquentModel {
     /**
      * Whether the model contains timestamps to be saved and updated.
      *
diff --git a/app/Models/News.php b/app/Models/News.php
index 340538dce4..770ba85eec 100644
--- a/app/Models/News.php
+++ b/app/Models/News.php
@@ -2,15 +2,14 @@
 
 namespace App\Models;
 
+use App\Models\User\User;
+use App\Traits\Commentable;
 use Carbon\Carbon;
-use Config;
-use App\Models\Model;
 use Illuminate\Support\Str;
+use Spatie\Feed\Feedable;
+use Spatie\Feed\FeedItem;
 
-use App\Traits\Commentable;
-
-class News extends Model
-{
+class News extends Model implements Feedable {
     use Commentable;
     /**
      * The attributes that are mass assignable.
@@ -18,7 +17,7 @@ class News extends Model
      * @var array
      */
     protected $fillable = [
-        'user_id', 'text', 'parsed_text', 'title', 'is_visible', 'post_at'
+        'user_id', 'text', 'parsed_text', 'title', 'is_visible', 'post_at',
     ];
 
     /**
@@ -29,18 +28,20 @@ class News extends Model
     protected $table = 'news';
 
     /**
-     * Whether the model contains timestamps to be saved and updated.
+     * The attributes that should be cast to native types.
      *
-     * @var string
+     * @var array
      */
-    public $timestamps = true;
+    protected $casts = [
+        'post_at' => 'datetime',
+    ];
 
     /**
-     * Dates on the model to convert to Carbon instances.
+     * Whether the model contains timestamps to be saved and updated.
      *
-     * @var array
+     * @var string
      */
-    public $dates = ['post_at'];
+    public $timestamps = true;
 
     /**
      * Validation rules for creation.
@@ -49,9 +50,9 @@ class News extends Model
      */
     public static $createRules = [
         'title' => 'required|between:3,100',
-        'text' => 'required',
+        'text'  => 'required',
     ];
-    
+
     /**
      * Validation rules for updating.
      *
@@ -59,25 +60,24 @@ class News extends Model
      */
     public static $updateRules = [
         'title' => 'required|between:3,100',
-        'text' => 'required',
+        'text'  => 'required',
     ];
 
     /**********************************************************************************************
-    
+
         RELATIONS
 
     **********************************************************************************************/
-    
+
     /**
      * Get the user who created the news post.
      */
-    public function user() 
-    {
-        return $this->belongsTo('App\Models\User\User');
+    public function user() {
+        return $this->belongsTo(User::class);
     }
 
     /**********************************************************************************************
-    
+
         SCOPES
 
     **********************************************************************************************/
@@ -85,27 +85,27 @@ public function user()
     /**
      * Scope a query to only include visible posts.
      *
-     * @param  \Illuminate\Database\Eloquent\Builder  $query
+     * @param \Illuminate\Database\Eloquent\Builder $query
+     *
      * @return \Illuminate\Database\Eloquent\Builder
      */
-    public function scopeVisible($query)
-    {
+    public function scopeVisible($query) {
         return $query->where('is_visible', 1);
     }
 
     /**
      * Scope a query to only include posts that are scheduled to be posted and are ready to post.
      *
-     * @param  \Illuminate\Database\Eloquent\Builder  $query
+     * @param \Illuminate\Database\Eloquent\Builder $query
+     *
      * @return \Illuminate\Database\Eloquent\Builder
      */
-    public function scopeShouldBeVisible($query)
-    {
+    public function scopeShouldBeVisible($query) {
         return $query->whereNotNull('post_at')->where('post_at', '<', Carbon::now())->where('is_visible', 0);
     }
 
     /**********************************************************************************************
-    
+
         ACCESSORS
 
     **********************************************************************************************/
@@ -115,9 +115,8 @@ public function scopeShouldBeVisible($query)
      *
      * @return bool
      */
-    public function getSlugAttribute()
-    {
-        return $this->id . '.' . Str::slug($this->title);
+    public function getSlugAttribute() {
+        return $this->id.'.'.Str::slug($this->title);
     }
 
     /**
@@ -125,8 +124,7 @@ public function getSlugAttribute()
      *
      * @return string
      */
-    public function getDisplayNameAttribute()
-    {
+    public function getDisplayNameAttribute() {
         return '<a href="'.$this->url.'">'.$this->title.'</a>';
     }
 
@@ -135,8 +133,55 @@ public function getDisplayNameAttribute()
      *
      * @return string
      */
-    public function getUrlAttribute()
-    {
+    public function getUrlAttribute() {
         return url('news/'.$this->slug);
     }
+
+    /**
+     * Gets the admin edit URL.
+     *
+     * @return string
+     */
+    public function getAdminUrlAttribute() {
+        return url('admin/news/edit/'.$this->id);
+    }
+
+    /**
+     * Gets the power required to edit this model.
+     *
+     * @return string
+     */
+    public function getAdminPowerAttribute() {
+        return 'edit_pages';
+    }
+
+    /**********************************************************************************************
+
+        OTHER FUNCTIONS
+
+    **********************************************************************************************/
+
+    /**
+     * Returns all feed items.
+     */
+    public static function getFeedItems() {
+        return self::visible()->get();
+    }
+
+    /**
+     * Generates feed item information.
+     *
+     * @return /Spatie/Feed/FeedItem;
+     */
+    public function toFeedItem(): FeedItem {
+        return FeedItem::create([
+            'id'         => '/news/'.$this->id,
+            'title'      => $this->title,
+            'summary'    => $this->parsed_text,
+            'updated'    => $this->updated_at,
+            'link'       => $this->url,
+            'author'     => $this->user->name,
+            'authorName' => $this->user->name,
+        ]);
+    }
 }
diff --git a/app/Models/Notification.php b/app/Models/Notification.php
index d140bbfa9c..519d55ff0a 100644
--- a/app/Models/Notification.php
+++ b/app/Models/Notification.php
@@ -2,18 +2,16 @@
 
 namespace App\Models;
 
-use Config;
-use App\Models\Model;
+use App\Models\User\User;
 
-class Notification extends Model
-{
+class Notification extends Model {
     /**
      * The attributes that are mass assignable.
      *
      * @var array
      */
     protected $fillable = [
-        'user_id', 'notification_type_id', 'is_unread', 'data'
+        'user_id', 'notification_type_id', 'is_unread', 'data',
     ];
 
     /**
@@ -30,23 +28,21 @@ class Notification extends Model
      */
     public $timestamps = true;
 
-
     /**********************************************************************************************
-    
+
         RELATIONS
 
     **********************************************************************************************/
-    
+
     /**
      * Get the user who owns notification.
      */
-    public function user() 
-    {
-        return $this->belongsTo('App\Models\User\User');
+    public function user() {
+        return $this->belongsTo(User::class);
     }
 
     /**********************************************************************************************
-    
+
         ACCESSORS
 
     **********************************************************************************************/
@@ -56,8 +52,7 @@ public function user()
      *
      * @return array
      */
-    public function getDataAttribute()
-    {
+    public function getDataAttribute() {
         return json_decode($this->attributes['data'], true);
     }
 
@@ -66,19 +61,18 @@ public function getDataAttribute()
      *
      * @return array
      */
-    public function getMessageAttribute()
-    {
-        $notification = Config::get('lorekeeper.notifications.'.$this->notification_type_id);
+    public function getMessageAttribute() {
+        $notification = config('lorekeeper.notifications.'.$this->notification_type_id);
 
         $message = $notification['message'];
 
-        // Replace the URL... 
+        // Replace the URL...
         $message = str_replace('{url}', url($notification['url']), $message);
 
-        // Replace any variables in data... 
+        // Replace any variables in data...
         $data = $this->data;
-        if($data && count($data)) {
-            foreach($data as $key => $value) {
+        if ($data && count($data)) {
+            foreach ($data as $key => $value) {
                 $message = str_replace('{'.$key.'}', $value, $message);
             }
         }
@@ -89,74 +83,78 @@ public function getMessageAttribute()
     /**
      * Get the notification ID from type.
      *
+     * @param mixed $type
+     *
      * @return array
      */
-    public static function getNotificationId($type)
-    {
-        return constant('self::'. $type);
+    public static function getNotificationId($type) {
+        return constant('self::'.$type);
     }
-
     /**********************************************************************************************
-    
+
         CONSTANTS
 
     **********************************************************************************************/
 
-    const CURRENCY_GRANT                    = 0;
-    const ITEM_GRANT                        = 1;
-    const CURRENCY_REMOVAL                  = 2;
-    const ITEM_REMOVAL                      = 3;
-    const CURRENCY_TRANSFER                 = 4;
-    const ITEM_TRANSFER                     = 5;
-    const FORCED_ITEM_TRANSFER              = 6;
-    const CHARACTER_UPLOAD                  = 7;
-    const CHARACTER_CURRENCY_GRANT          = 8;
-    const CHARACTER_CURRENCY_REMOVAL        = 9;
-    const CHARACTER_PROFILE_EDIT            = 10;
-    const IMAGE_UPLOAD                      = 11;
-    const CHARACTER_TRANSFER_RECEIVED       = 12;
-    const CHARACTER_TRANSFER_REJECTED       = 13;
-    const CHARACTER_TRANSFER_CANCELED       = 14;
-    const CHARACTER_TRANSFER_DENIED         = 15;
-    const CHARACTER_TRANSFER_ACCEPTED       = 16;
-    const CHARACTER_TRANSFER_APPROVED       = 17;
-    const CHARACTER_SENT                    = 18;
-    const CHARACTER_RECEIVED                = 19;
-    const SUBMISSION_APPROVED               = 20;
-    const SUBMISSION_REJECTED               = 21;
-    const CLAIM_APPROVED                    = 22;
-    const CLAIM_REJECTED                    = 23;
-    const MYO_GRANT                         = 24;
-    const DESIGN_APPROVED                   = 25;
-    const DESIGN_REJECTED                   = 26;
-    const DESIGN_CANCELED                   = 27;
-    const TRADE_RECEIVED                    = 28;
-    const TRADE_UPDATE                      = 29;
-    const TRADE_CANCELED                    = 30;
-    const TRADE_COMPLETED                   = 31;
-    const TRADE_REJECTED                    = 32;
-    const TRADE_CONFIRMED                   = 33;
-    const BOOKMARK_TRADING                  = 34;
-    const BOOKMARK_GIFTS                    = 35;
-    const BOOKMARK_OWNER                    = 36;
-    const BOOKMARK_IMAGE                    = 37;
-    const CHARACTER_TRANSFER_ACCEPTABLE     = 38;
-    const BOOKMARK_GIFT_WRITING             = 39;
-    const REPORT_ASSIGNED                   = 220;
-    const REPORT_CLOSED                     = 221;
-    const COMMENT_MADE                      = 239;
-    const COMMENT_REPLY                     = 240;
-    const CHARACTER_ITEM_GRANT              = 501;
-    const CHARACTER_ITEM_REMOVAL            = 502;
-    const GALLERY_SUBMISSION_COLLABORATOR   = 505;
-    const GALLERY_COLLABORATORS_APPROVED    = 506;
-    const GALLERY_SUBMISSION_ACCEPTED       = 507;
-    const GALLERY_SUBMISSION_REJECTED       = 508;
-    const GALLERY_SUBMISSION_VALUED         = 509;
-    const GALLERY_SUBMISSION_MOVED          = 510;
-    const GALLERY_SUBMISSION_CHARACTER      = 511;
-    const GALLERY_SUBMISSION_FAVORITE       = 512;
-    const GALLERY_SUBMISSION_STAFF_COMMENTS = 513;
-    const GALLERY_SUBMISSION_EDITED         = 514;
-    const GALLERY_SUBMISSION_PARTICIPANT    = 515;
+    public const CURRENCY_GRANT = 0;
+    public const ITEM_GRANT = 1;
+    public const CURRENCY_REMOVAL = 2;
+    public const ITEM_REMOVAL = 3;
+    public const CURRENCY_TRANSFER = 4;
+    public const ITEM_TRANSFER = 5;
+    public const FORCED_ITEM_TRANSFER = 6;
+    public const CHARACTER_UPLOAD = 7;
+    public const CHARACTER_CURRENCY_GRANT = 8;
+    public const CHARACTER_CURRENCY_REMOVAL = 9;
+    public const CHARACTER_PROFILE_EDIT = 10;
+    public const IMAGE_UPLOAD = 11;
+    public const CHARACTER_TRANSFER_RECEIVED = 12;
+    public const CHARACTER_TRANSFER_REJECTED = 13;
+    public const CHARACTER_TRANSFER_CANCELED = 14;
+    public const CHARACTER_TRANSFER_DENIED = 15;
+    public const CHARACTER_TRANSFER_ACCEPTED = 16;
+    public const CHARACTER_TRANSFER_APPROVED = 17;
+    public const CHARACTER_SENT = 18;
+    public const CHARACTER_RECEIVED = 19;
+    public const SUBMISSION_APPROVED = 20;
+    public const SUBMISSION_REJECTED = 21;
+    public const CLAIM_APPROVED = 22;
+    public const CLAIM_REJECTED = 23;
+    public const MYO_GRANT = 24;
+    public const DESIGN_APPROVED = 25;
+    public const DESIGN_REJECTED = 26;
+    public const DESIGN_CANCELED = 27;
+    public const TRADE_RECEIVED = 28;
+    public const TRADE_UPDATE = 29;
+    public const TRADE_CANCELED = 30;
+    public const TRADE_COMPLETED = 31;
+    public const TRADE_REJECTED = 32;
+    public const TRADE_CONFIRMED = 33;
+    public const BOOKMARK_TRADING = 34;
+    public const BOOKMARK_GIFTS = 35;
+    public const BOOKMARK_OWNER = 36;
+    public const BOOKMARK_IMAGE = 37;
+    public const CHARACTER_TRANSFER_ACCEPTABLE = 38;
+    public const BOOKMARK_GIFT_WRITING = 39;
+    public const USER_REACTIVATED = 103;
+    public const USER_DEACTIVATED = 104;
+    public const SUBMISSION_CANCELLED = 108;
+    public const CLAIM_CANCELLED = 109;
+    public const REPORT_ASSIGNED = 220;
+    public const REPORT_CLOSED = 221;
+    public const COMMENT_MADE = 239;
+    public const COMMENT_REPLY = 240;
+    public const CHARACTER_ITEM_GRANT = 501;
+    public const CHARACTER_ITEM_REMOVAL = 502;
+    public const GALLERY_SUBMISSION_COLLABORATOR = 505;
+    public const GALLERY_COLLABORATORS_APPROVED = 506;
+    public const GALLERY_SUBMISSION_ACCEPTED = 507;
+    public const GALLERY_SUBMISSION_REJECTED = 508;
+    public const GALLERY_SUBMISSION_VALUED = 509;
+    public const GALLERY_SUBMISSION_MOVED = 510;
+    public const GALLERY_SUBMISSION_CHARACTER = 511;
+    public const GALLERY_SUBMISSION_FAVORITE = 512;
+    public const GALLERY_SUBMISSION_STAFF_COMMENTS = 513;
+    public const GALLERY_SUBMISSION_EDITED = 514;
+    public const GALLERY_SUBMISSION_PARTICIPANT = 515;
 }
diff --git a/app/Models/Prompt/Prompt.php b/app/Models/Prompt/Prompt.php
index 168f994fd7..bd78af27ef 100644
--- a/app/Models/Prompt/Prompt.php
+++ b/app/Models/Prompt/Prompt.php
@@ -2,14 +2,10 @@
 
 namespace App\Models\Prompt;
 
-use Config;
-use DB;
-use Carbon\Carbon;
 use App\Models\Model;
-use App\Models\Prompt\PromptCategory;
+use Carbon\Carbon;
 
-class Prompt extends Model
-{
+class Prompt extends Model {
     /**
      * The attributes that are mass assignable.
      *
@@ -18,7 +14,7 @@ class Prompt extends Model
     protected $fillable = [
         'prompt_category_id', 'name', 'summary', 'description', 'parsed_description', 'is_active',
         'start_at', 'end_at', 'hide_before_start', 'hide_after_end', 'has_image', 'prefix',
-        'hide_submissions'
+        'hide_submissions', 'staff_only', 'hash',
     ];
 
     /**
@@ -29,11 +25,14 @@ class Prompt extends Model
     protected $table = 'prompts';
 
     /**
-     * Dates on the model to convert to Carbon instances.
+     * The attributes that should be cast to native types.
      *
      * @var array
      */
-    public $dates = ['start_at', 'end_at'];
+    protected $casts = [
+        'start_at' => 'datetime',
+        'end_at'   => 'datetime',
+    ];
 
     /**
      * Validation rules for character creation.
@@ -42,11 +41,11 @@ class Prompt extends Model
      */
     public static $createRules = [
         'prompt_category_id' => 'nullable',
-        'name' => 'required|unique:prompts|between:3,100',
-        'prefix' => 'nullable|unique:prompts|between:2,10',
-        'summary' => 'nullable',
-        'description' => 'nullable',
-        'image' => 'mimes:png',
+        'name'               => 'required|unique:prompts|between:3,100',
+        'prefix'             => 'nullable|unique:prompts|between:2,10',
+        'summary'            => 'nullable',
+        'description'        => 'nullable',
+        'image'              => 'mimes:png',
     ];
 
     /**
@@ -56,11 +55,11 @@ class Prompt extends Model
      */
     public static $updateRules = [
         'prompt_category_id' => 'nullable',
-        'name' => 'required|between:3,100',
-        'prefix' => 'nullable|between:2,10',
-        'summary' => 'nullable',
-        'description' => 'nullable',
-        'image' => 'mimes:png',
+        'name'               => 'required|between:3,100',
+        'prefix'             => 'nullable|between:2,10',
+        'summary'            => 'nullable',
+        'description'        => 'nullable',
+        'image'              => 'mimes:png',
     ];
 
     /**********************************************************************************************
@@ -72,17 +71,15 @@ class Prompt extends Model
     /**
      * Get the category the prompt belongs to.
      */
-    public function category()
-    {
-        return $this->belongsTo('App\Models\Prompt\PromptCategory', 'prompt_category_id');
+    public function category() {
+        return $this->belongsTo(PromptCategory::class, 'prompt_category_id');
     }
 
     /**
      * Get the rewards attached to this prompt.
      */
-    public function rewards()
-    {
-        return $this->hasMany('App\Models\Prompt\PromptReward', 'prompt_id');
+    public function rewards() {
+        return $this->hasMany(PromptReward::class, 'prompt_id');
     }
 
     /**********************************************************************************************
@@ -94,91 +91,137 @@ public function rewards()
     /**
      * Scope a query to only include active prompts.
      *
-     * @param  \Illuminate\Database\Eloquent\Builder  $query
+     * @param \Illuminate\Database\Eloquent\Builder $query
+     *
      * @return \Illuminate\Database\Eloquent\Builder
      */
-    public function scopeActive($query)
-    {
+    public function scopeActive($query) {
         return $query->where('is_active', 1)
-            ->where(function($query) {
-                $query->whereNull('start_at')->orWhere('start_at', '<', Carbon::now())->orWhere(function($query) {
+            ->where(function ($query) {
+                $query->whereNull('start_at')->orWhere('start_at', '<', Carbon::now())->orWhere(function ($query) {
                     $query->where('start_at', '>=', Carbon::now())->where('hide_before_start', 0);
                 });
-        })->where(function($query) {
-                $query->whereNull('end_at')->orWhere('end_at', '>', Carbon::now())->orWhere(function($query) {
+            })->where(function ($query) {
+                $query->whereNull('end_at')->orWhere('end_at', '>', Carbon::now())->orWhere(function ($query) {
                     $query->where('end_at', '<=', Carbon::now())->where('hide_after_end', 0);
                 });
-        });
+            });
+    }
 
+    /**
+     * Scope a query to open or closed prompts.
+     *
+     * @param \Illuminate\Database\Eloquent\Builder $query
+     * @param bool                                  $isOpen
+     *
+     * @return \Illuminate\Database\Eloquent\Builder
+     */
+    public function scopeOpen($query, $isOpen) {
+        if ($isOpen) {
+            $query->where(function ($query) {
+                $query->whereNull('end_at')->where('start_at', '<', Carbon::now());
+            })->orWhere(function ($query) {
+                $query->whereNull('start_at')->where('end_at', '>', Carbon::now());
+            })->orWhere(function ($query) {
+                $query->where('start_at', '<', Carbon::now())->where('end_at', '>', Carbon::now());
+            })->orWhere(function ($query) {
+                $query->whereNull('end_at')->whereNull('start_at');
+            });
+        } else {
+            $query->where(function ($query) {
+                $query->whereNull('end_at')->where('start_at', '>', Carbon::now());
+            })->orWhere(function ($query) {
+                $query->whereNull('start_at')->where('end_at', '<', Carbon::now());
+            })->orWhere('start_at', '>', Carbon::now())->orWhere('end_at', '<', Carbon::now());
+        }
+    }
+
+    /**
+     * Scope a query to include or exclude staff-only prompts.
+     *
+     * @param \Illuminate\Database\Eloquent\Builder $query
+     * @param \App\Models\User\User                 $user
+     *
+     * @return \Illuminate\Database\Eloquent\Builder
+     */
+    public function scopeStaffOnly($query, $user) {
+        if ($user && $user->isStaff) {
+            return $query;
+        }
+
+        return $query->where('staff_only', 0);
     }
 
     /**
      * Scope a query to sort prompts in alphabetical order.
      *
-     * @param  \Illuminate\Database\Eloquent\Builder  $query
-     * @param  bool                                   $reverse
+     * @param \Illuminate\Database\Eloquent\Builder $query
+     * @param bool                                  $reverse
+     *
      * @return \Illuminate\Database\Eloquent\Builder
      */
-    public function scopeSortAlphabetical($query, $reverse = false)
-    {
+    public function scopeSortAlphabetical($query, $reverse = false) {
         return $query->orderBy('name', $reverse ? 'DESC' : 'ASC');
     }
 
     /**
      * Scope a query to sort prompts in category order.
      *
-     * @param  \Illuminate\Database\Eloquent\Builder  $query
+     * @param \Illuminate\Database\Eloquent\Builder $query
+     *
      * @return \Illuminate\Database\Eloquent\Builder
      */
-    public function scopeSortCategory($query)
-    {
-        $ids = PromptCategory::orderBy('sort', 'DESC')->pluck('id')->toArray();
-        return count($ids) ? $query->orderByRaw(DB::raw('FIELD(prompt_category_id, '.implode(',', $ids).')')) : $query;
+    public function scopeSortCategory($query) {
+        if (PromptCategory::all()->count()) {
+            return $query->orderBy(PromptCategory::select('sort')->whereColumn('prompts.prompt_category_id', 'prompt_categories.id'), 'DESC');
+        }
+
+        return $query;
     }
 
     /**
      * Scope a query to sort features by newest first.
      *
-     * @param  \Illuminate\Database\Eloquent\Builder  $query
+     * @param \Illuminate\Database\Eloquent\Builder $query
+     *
      * @return \Illuminate\Database\Eloquent\Builder
      */
-    public function scopeSortNewest($query)
-    {
+    public function scopeSortNewest($query) {
         return $query->orderBy('id', 'DESC');
     }
 
     /**
      * Scope a query to sort features oldest first.
      *
-     * @param  \Illuminate\Database\Eloquent\Builder  $query
+     * @param \Illuminate\Database\Eloquent\Builder $query
+     *
      * @return \Illuminate\Database\Eloquent\Builder
      */
-    public function scopeSortOldest($query)
-    {
+    public function scopeSortOldest($query) {
         return $query->orderBy('id');
     }
 
     /**
      * Scope a query to sort prompts by start date.
      *
-     * @param  \Illuminate\Database\Eloquent\Builder  $query
-     * @param  bool                                   $reverse
+     * @param \Illuminate\Database\Eloquent\Builder $query
+     * @param bool                                  $reverse
+     *
      * @return \Illuminate\Database\Eloquent\Builder
      */
-    public function scopeSortStart($query, $reverse = false)
-    {
+    public function scopeSortStart($query, $reverse = false) {
         return $query->orderBy('start_at', $reverse ? 'DESC' : 'ASC');
     }
 
     /**
      * Scope a query to sort prompts by end date.
      *
-     * @param  \Illuminate\Database\Eloquent\Builder  $query
-     * @param  bool                                   $reverse
+     * @param \Illuminate\Database\Eloquent\Builder $query
+     * @param bool                                  $reverse
+     *
      * @return \Illuminate\Database\Eloquent\Builder
      */
-    public function scopeSortEnd($query, $reverse = false)
-    {
+    public function scopeSortEnd($query, $reverse = false) {
         return $query->orderBy('end_at', $reverse ? 'DESC' : 'ASC');
     }
 
@@ -193,8 +236,7 @@ public function scopeSortEnd($query, $reverse = false)
      *
      * @return string
      */
-    public function getDisplayNameAttribute()
-    {
+    public function getDisplayNameAttribute() {
         return '<a href="'.$this->url.'" class="display-prompt">'.$this->name.'</a>';
     }
 
@@ -203,8 +245,7 @@ public function getDisplayNameAttribute()
      *
      * @return string
      */
-    public function getImageDirectoryAttribute()
-    {
+    public function getImageDirectoryAttribute() {
         return 'images/data/prompts';
     }
 
@@ -213,9 +254,8 @@ public function getImageDirectoryAttribute()
      *
      * @return string
      */
-    public function getImageFileNameAttribute()
-    {
-        return $this->id . '-image.png';
+    public function getImageFileNameAttribute() {
+        return $this->hash.$this->id.'-image.png';
     }
 
     /**
@@ -223,8 +263,7 @@ public function getImageFileNameAttribute()
      *
      * @return string
      */
-    public function getImagePathAttribute()
-    {
+    public function getImagePathAttribute() {
         return public_path($this->imageDirectory);
     }
 
@@ -233,10 +272,12 @@ public function getImagePathAttribute()
      *
      * @return string
      */
-    public function getImageUrlAttribute()
-    {
-        if (!$this->has_image) return null;
-        return asset($this->imageDirectory . '/' . $this->imageFileName);
+    public function getImageUrlAttribute() {
+        if (!$this->has_image) {
+            return null;
+        }
+
+        return asset($this->imageDirectory.'/'.$this->imageFileName);
     }
 
     /**
@@ -244,8 +285,7 @@ public function getImageUrlAttribute()
      *
      * @return string
      */
-    public function getUrlAttribute()
-    {
+    public function getUrlAttribute() {
         return url('prompts/prompts?name='.$this->name);
     }
 
@@ -254,8 +294,25 @@ public function getUrlAttribute()
      *
      * @return string
      */
-    public function getAssetTypeAttribute()
-    {
+    public function getAssetTypeAttribute() {
         return 'prompts';
     }
+
+    /**
+     * Gets the admin edit URL.
+     *
+     * @return string
+     */
+    public function getAdminUrlAttribute() {
+        return url('admin/data/prompts/edit/'.$this->id);
+    }
+
+    /**
+     * Gets the power required to edit this model.
+     *
+     * @return string
+     */
+    public function getAdminPowerAttribute() {
+        return 'edit_data';
+    }
 }
diff --git a/app/Models/Prompt/PromptCategory.php b/app/Models/Prompt/PromptCategory.php
index d189dde110..6f0924eb2d 100644
--- a/app/Models/Prompt/PromptCategory.php
+++ b/app/Models/Prompt/PromptCategory.php
@@ -2,18 +2,16 @@
 
 namespace App\Models\Prompt;
 
-use Config;
 use App\Models\Model;
 
-class PromptCategory extends Model
-{
+class PromptCategory extends Model {
     /**
      * The attributes that are mass assignable.
      *
      * @var array
      */
     protected $fillable = [
-        'name', 'sort', 'has_image', 'description', 'parsed_description'
+        'name', 'sort', 'has_image', 'description', 'parsed_description', 'hash',
     ];
 
     /**
@@ -22,42 +20,40 @@ class PromptCategory extends Model
      * @var string
      */
     protected $table = 'prompt_categories';
-    
     /**
      * Validation rules for creation.
      *
      * @var array
      */
     public static $createRules = [
-        'name' => 'required|unique:prompt_categories|between:3,100',
+        'name'        => 'required|unique:prompt_categories|between:3,100',
         'description' => 'nullable',
-        'image' => 'mimes:png',
+        'image'       => 'mimes:png',
     ];
-    
+
     /**
      * Validation rules for updating.
      *
      * @var array
      */
     public static $updateRules = [
-        'name' => 'required|between:3,100',
+        'name'        => 'required|between:3,100',
         'description' => 'nullable',
-        'image' => 'mimes:png',
+        'image'       => 'mimes:png',
     ];
 
     /**********************************************************************************************
-    
+
         ACCESSORS
 
     **********************************************************************************************/
-    
+
     /**
      * Displays the model's name, linked to its encyclopedia page.
      *
      * @return string
      */
-    public function getDisplayNameAttribute()
-    {
+    public function getDisplayNameAttribute() {
         return '<a href="'.$this->url.'" class="display-category">'.$this->name.'</a>';
     }
 
@@ -66,8 +62,7 @@ public function getDisplayNameAttribute()
      *
      * @return string
      */
-    public function getImageDirectoryAttribute()
-    {
+    public function getImageDirectoryAttribute() {
         return 'images/data/prompt-categories';
     }
 
@@ -76,9 +71,8 @@ public function getImageDirectoryAttribute()
      *
      * @return string
      */
-    public function getCategoryImageFileNameAttribute()
-    {
-        return $this->id . '-image.png';
+    public function getCategoryImageFileNameAttribute() {
+        return $this->hash.$this->id.'-image.png';
     }
 
     /**
@@ -86,20 +80,21 @@ public function getCategoryImageFileNameAttribute()
      *
      * @return string
      */
-    public function getCategoryImagePathAttribute()
-    {
+    public function getCategoryImagePathAttribute() {
         return public_path($this->imageDirectory);
     }
-    
+
     /**
      * Gets the URL of the model's image.
      *
      * @return string
      */
-    public function getCategoryImageUrlAttribute()
-    {
-        if (!$this->has_image) return null;
-        return asset($this->imageDirectory . '/' . $this->categoryImageFileName);
+    public function getCategoryImageUrlAttribute() {
+        if (!$this->has_image) {
+            return null;
+        }
+
+        return asset($this->imageDirectory.'/'.$this->categoryImageFileName);
     }
 
     /**
@@ -107,8 +102,7 @@ public function getCategoryImageUrlAttribute()
      *
      * @return string
      */
-    public function getUrlAttribute()
-    {
+    public function getUrlAttribute() {
         return url('prompts/prompt-categories?name='.$this->name);
     }
 
@@ -117,8 +111,25 @@ public function getUrlAttribute()
      *
      * @return string
      */
-    public function getSearchUrlAttribute()
-    {
+    public function getSearchUrlAttribute() {
         return url('prompts/prompts?prompt_category_id='.$this->id);
     }
+
+    /**
+     * Gets the admin edit URL.
+     *
+     * @return string
+     */
+    public function getAdminUrlAttribute() {
+        return url('admin/data/prompt-categories/edit/'.$this->id);
+    }
+
+    /**
+     * Gets the power required to edit this model.
+     *
+     * @return string
+     */
+    public function getAdminPowerAttribute() {
+        return 'edit_data';
+    }
 }
diff --git a/app/Models/Prompt/PromptReward.php b/app/Models/Prompt/PromptReward.php
index bfec899b20..15512ec071 100644
--- a/app/Models/Prompt/PromptReward.php
+++ b/app/Models/Prompt/PromptReward.php
@@ -2,18 +2,20 @@
 
 namespace App\Models\Prompt;
 
-use Config;
+use App\Models\Currency\Currency;
+use App\Models\Item\Item;
+use App\Models\Loot\LootTable;
 use App\Models\Model;
+use App\Models\Raffle\Raffle;
 
-class PromptReward extends Model
-{
+class PromptReward extends Model {
     /**
      * The attributes that are mass assignable.
      *
      * @var array
      */
     protected $fillable = [
-        'prompt_id', 'rewardable_type', 'rewardable_id', 'quantity'
+        'prompt_id', 'rewardable_type', 'rewardable_id', 'quantity',
     ];
 
     /**
@@ -22,7 +24,6 @@ class PromptReward extends Model
      * @var string
      */
     protected $table = 'prompt_rewards';
-    
     /**
      * Validation rules for creation.
      *
@@ -30,10 +31,10 @@ class PromptReward extends Model
      */
     public static $createRules = [
         'rewardable_type' => 'required',
-        'rewardable_id' => 'required',
-        'quantity' => 'required|integer|min:1',
+        'rewardable_id'   => 'required',
+        'quantity'        => 'required|integer|min:1',
     ];
-    
+
     /**
      * Validation rules for updating.
      *
@@ -41,36 +42,35 @@ class PromptReward extends Model
      */
     public static $updateRules = [
         'rewardable_type' => 'required',
-        'rewardable_id' => 'required',
-        'quantity' => 'required|integer|min:1',
+        'rewardable_id'   => 'required',
+        'quantity'        => 'required|integer|min:1',
     ];
 
     /**********************************************************************************************
-    
+
         RELATIONS
 
     **********************************************************************************************/
-    
+
     /**
      * Get the reward attached to the prompt reward.
      */
-    public function reward() 
-    {
-        switch ($this->rewardable_type)
-        {
+    public function reward() {
+        switch ($this->rewardable_type) {
             case 'Item':
-                return $this->belongsTo('App\Models\Item\Item', 'rewardable_id');
+                return $this->belongsTo(Item::class, 'rewardable_id');
                 break;
             case 'Currency':
-                return $this->belongsTo('App\Models\Currency\Currency', 'rewardable_id');
+                return $this->belongsTo(Currency::class, 'rewardable_id');
                 break;
             case 'LootTable':
-                return $this->belongsTo('App\Models\Loot\LootTable', 'rewardable_id');
+                return $this->belongsTo(LootTable::class, 'rewardable_id');
                 break;
             case 'Raffle':
-                return $this->belongsTo('App\Models\Raffle\Raffle', 'rewardable_id');
+                return $this->belongsTo(Raffle::class, 'rewardable_id');
                 break;
         }
+
         return null;
     }
 }
diff --git a/app/Models/Raffle/Raffle.php b/app/Models/Raffle/Raffle.php
index 5760da68e2..146779219a 100644
--- a/app/Models/Raffle/Raffle.php
+++ b/app/Models/Raffle/Raffle.php
@@ -1,17 +1,17 @@
-<?php namespace App\Models\Raffle;
+<?php
+
+namespace App\Models\Raffle;
 
 use App\Models\Model;
-use DB;
 
-class Raffle extends Model
-{
+class Raffle extends Model {
     /**
      * The attributes that are mass assignable.
      *
      * @var array
      */
     protected $fillable = [
-        'name', 'is_active', 'winner_count', 'group_id', 'order'
+        'name', 'is_active', 'winner_count', 'group_id', 'order', 'ticket_cap',
     ];
 
     /**
@@ -22,11 +22,13 @@ class Raffle extends Model
     protected $table = 'raffles';
 
     /**
-     * Dates on the model to convert to Carbon instances.
+     * The attributes that should be cast to native types.
      *
      * @var array
      */
-    public $dates = ['rolled_at'];
+    protected $casts = [
+        'rolled_at' => 'datetime',
+    ];
 
     /**
      * Accessors to append to the model.
@@ -40,32 +42,30 @@ class Raffle extends Model
      *
      * @var string
      */
-    public $timestamps = false; 
+    public $timestamps = false;
 
     /**********************************************************************************************
-    
+
         RELATIONS
 
     **********************************************************************************************/
-    
+
     /**
      * Get the raffle tickets attached to this raffle.
      */
-    public function tickets()
-    {
-        return $this->hasMany('App\Models\Raffle\RaffleTicket');
+    public function tickets() {
+        return $this->hasMany(RaffleTicket::class);
     }
-    
+
     /**
      * Get the group that this raffle belongs to.
      */
-    public function group()
-    {
-        return $this->belongsTo('App\Models\Raffle\RaffleGroup', 'group_id');
+    public function group() {
+        return $this->belongsTo(RaffleGroup::class, 'group_id');
     }
 
     /**********************************************************************************************
-    
+
         ACCESSORS
 
     **********************************************************************************************/
@@ -75,8 +75,7 @@ public function group()
      *
      * @return string
      */
-    public function getDisplayNameAttribute()
-    {
+    public function getDisplayNameAttribute() {
         return $this->displayName();
     }
 
@@ -85,33 +84,48 @@ public function getDisplayNameAttribute()
      *
      * @return string
      */
-    public function getNameWithGroupAttribute()
-    {
-        return ($this->group_id ? '[' . $this->group->name . '] ' : '') . $this->name;
+    public function getNameWithGroupAttribute() {
+        return ($this->group_id ? '['.$this->group->name.'] ' : '').$this->name;
     }
 
     /**
-     * Gets the raffle's asset type for asset management. 
+     * Gets the raffle's asset type for asset management.
      *
      * @return string
      */
-    public function getAssetTypeAttribute()
-    {
+    public function getAssetTypeAttribute() {
         return 'raffle_tickets';
     }
 
     /**
-     * Gets the raffle's url. 
+     * Gets the raffle's url.
      *
      * @return string
      */
-    public function getUrlAttribute()
-    {
+    public function getUrlAttribute() {
         return url('raffles/view/'.$this->id);
     }
 
+    /**
+     * Gets the admin edit URL.
+     *
+     * @return string
+     */
+    public function getAdminUrlAttribute() {
+        return url('admin/raffles'); // Raffles are edited via a modal so don't have a unique raffle edit page
+    }
+
+    /**
+     * Gets the power required to edit this model.
+     *
+     * @return string
+     */
+    public function getAdminPowerAttribute() {
+        return 'manage_raffles';
+    }
+
     /**********************************************************************************************
-    
+
         OTHER FUNCTIONS
 
     **********************************************************************************************/
@@ -119,10 +133,11 @@ public function getUrlAttribute()
     /**
      * Displays the raffle's name, linked to the raffle page.
      *
+     * @param mixed $asReward
+     *
      * @return string
      */
-    public function displayName($asReward = true)
-    {
+    public function displayName($asReward = true) {
         return '<a href="'.$this->url.'" class="display-raffle">'.$this->name.($asReward ? ' (Raffle Ticket)' : '').'</a>';
     }
 }
diff --git a/app/Models/Raffle/RaffleGroup.php b/app/Models/Raffle/RaffleGroup.php
index 7df75a4252..b1b5e23704 100644
--- a/app/Models/Raffle/RaffleGroup.php
+++ b/app/Models/Raffle/RaffleGroup.php
@@ -1,17 +1,17 @@
-<?php namespace App\Models\Raffle;
+<?php
+
+namespace App\Models\Raffle;
 
 use App\Models\Model;
-use DB;
 
-class RaffleGroup extends Model
-{
+class RaffleGroup extends Model {
     /**
      * The attributes that are mass assignable.
      *
      * @var array
      */
     protected $fillable = [
-        'name', 'is_active'
+        'name', 'is_active',
     ];
 
     /**
@@ -20,17 +20,15 @@ class RaffleGroup extends Model
      * @var string
      */
     protected $table = 'raffle_groups';
-
     /**
      * Whether the model contains timestamps to be saved and updated.
      *
      * @var string
      */
-    public $timestamps = false; 
-
+    public $timestamps = false;
 
     /**********************************************************************************************
-    
+
         RELATIONS
 
     **********************************************************************************************/
@@ -38,8 +36,7 @@ class RaffleGroup extends Model
     /**
      * Get the raffles in this group.
      */
-    public function raffles()
-    {
-        return $this->hasMany('App\Models\Raffle\Raffle', 'group_id')->orderBy('order');
+    public function raffles() {
+        return $this->hasMany(Raffle::class, 'group_id')->orderBy('order');
     }
 }
diff --git a/app/Models/Raffle/RaffleTicket.php b/app/Models/Raffle/RaffleTicket.php
index 5d4f71e837..75c2667a24 100644
--- a/app/Models/Raffle/RaffleTicket.php
+++ b/app/Models/Raffle/RaffleTicket.php
@@ -1,17 +1,18 @@
-<?php namespace App\Models\Raffle;
+<?php
+
+namespace App\Models\Raffle;
 
 use App\Models\Model;
-use DB;
+use App\Models\User\User;
 
-class RaffleTicket extends Model
-{
+class RaffleTicket extends Model {
     /**
      * The attributes that are mass assignable.
      *
      * @var array
      */
     protected $fillable = [
-        'user_id', 'raffle_id', 'position', 'created_at', 'alias'
+        'user_id', 'raffle_id', 'position', 'created_at', 'alias',
     ];
 
     /**
@@ -22,15 +23,27 @@ class RaffleTicket extends Model
     protected $table = 'raffle_tickets';
 
     /**
-     * Dates on the model to convert to Carbon instances.
+     * The attributes that should be cast to native types.
      *
      * @var array
      */
-    protected $dates = ['created_at'];
+    protected $casts = [
+        'created_at' => 'datetime',
+    ];
 
+    /**
+     * Validation rules for creation.
+     *
+     * @var array
+     */
+    public static $createRules = [
+        'user_id.*'      => 'required_without:alias.*',
+        'alias.*'        => 'required_without:user_id.*',
+        'ticket_count.*' => 'required',
+    ];
 
     /**********************************************************************************************
-    
+
         RELATIONS
 
     **********************************************************************************************/
@@ -38,51 +51,51 @@ class RaffleTicket extends Model
     /**
      * Get the raffle this ticket is for.
      */
-    public function raffle()
-    {
-        return $this->belongsTo('App\Models\Raffle\Raffle');
+    public function raffle() {
+        return $this->belongsTo(Raffle::class);
     }
 
     /**
      * Get the user who owns the raffle ticket.
      */
-    public function user()
-    {
-        return $this->belongsTo('App\Models\User\User');
+    public function user() {
+        return $this->belongsTo(User::class);
     }
 
     /**********************************************************************************************
-    
+
         SCOPES
 
     **********************************************************************************************/
-    
+
     /**
      * Scope a query to only include the winning tickets in order of drawing.
      *
-     * @param  \Illuminate\Database\Eloquent\Builder  $query
+     * @param \Illuminate\Database\Eloquent\Builder $query
+     *
      * @return \Illuminate\Database\Eloquent\Builder
      */
-    public function scopeWinners($query)
-    {
+    public function scopeWinners($query) {
         $query->whereNotNull('position')->orderBy('position');
     }
 
     /**********************************************************************************************
-    
+
         OTHER FUNCTIONS
 
     **********************************************************************************************/
-    
+
     /**
-     * Display the ticket holder's name. 
+     * Display the ticket holder's name.
      * If the owner is not a registered user on the site, this displays the ticket holder's dA name.
      *
      * @return string
      */
-    public function getDisplayHolderNameAttribute()
-    {
-        if ($this->user_id) return $this->user->displayName;
-        return '<a href="http://'.$this->alias.'.deviantart.com">'.$this->alias.'@dA</a>';
+    public function getDisplayHolderNameAttribute() {
+        if ($this->user_id) {
+            return $this->user->displayName;
+        }
+
+        return $this->alias.' (Off-site user)';
     }
 }
diff --git a/app/Models/Rank/Rank.php b/app/Models/Rank/Rank.php
index 6a3b5da895..83e48eb7d4 100644
--- a/app/Models/Rank/Rank.php
+++ b/app/Models/Rank/Rank.php
@@ -2,20 +2,17 @@
 
 namespace App\Models\Rank;
 
-use Config;
 use App\Models\Model;
 use Illuminate\Support\Arr;
 
-class Rank extends Model
-{
-
+class Rank extends Model {
     /**
      * The attributes that are mass assignable.
      *
      * @var array
      */
     protected $fillable = [
-        'name', 'description', 'parsed_description', 'sort', 'color', 'icon'
+        'name', 'description', 'parsed_description', 'sort', 'color', 'icon',
     ];
 
     /**
@@ -24,21 +21,20 @@ class Rank extends Model
      * @var string
      */
     protected $table = 'ranks';
-    
     /**
      * Validation rules for ranks.
      *
      * @var array
      */
     public static $rules = [
-        'name' => 'required|between:3,100',
+        'name'        => 'required|between:3,100',
         'description' => 'nullable',
-        'color' => 'nullable|regex:/^#?[0-9a-fA-F]{6}$/i',
-        'icon' => 'nullable'
+        'color'       => 'nullable|regex:/^#?[0-9a-fA-F]{6}$/i',
+        'icon'        => 'nullable',
     ];
 
     /**********************************************************************************************
-    
+
         RELATIONS
 
     **********************************************************************************************/
@@ -46,13 +42,12 @@ class Rank extends Model
     /**
      * Get the powers attached to this rank.
      */
-    public function powers() 
-    {
-        return $this->hasMany('App\Models\Rank\RankPower');
+    public function powers() {
+        return $this->hasMany(RankPower::class);
     }
 
     /**********************************************************************************************
-    
+
         ACCESSORS
 
     **********************************************************************************************/
@@ -62,9 +57,11 @@ public function powers()
      *
      * @return string
      */
-    public function getDisplayNameAttribute() 
-    {
-        if($this->color) return '<strong style="color: #'.$this->color.'">'.$this->name.'</strong>';
+    public function getDisplayNameAttribute() {
+        if ($this->color) {
+            return '<strong style="color: #'.$this->color.'">'.$this->name.'</strong>';
+        }
+
         return $this->name;
     }
 
@@ -73,14 +70,16 @@ public function getDisplayNameAttribute()
      *
      * @return bool
      */
-    public function getIsAdminAttribute()
-    {
-        if($this->id == Rank::orderBy('sort', 'DESC')->first()->id) return true;
+    public function getIsAdminAttribute() {
+        if ($this->id == self::orderBy('sort', 'DESC')->first()->id) {
+            return true;
+        }
+
         return false;
     }
 
     /**********************************************************************************************
-    
+
         OTHER FUNCTIONS
 
     **********************************************************************************************/
@@ -88,32 +87,43 @@ public function getIsAdminAttribute()
     /**
      * Checks if the current rank is high enough to edit a given rank.
      *
-     * @param  \App\Models\Rank\Rank $rank
+     * @param \App\Models\Rank\Rank $rank
+     *
      * @return int
      */
-    public function canEditRank($rank)
-    {
-        if(is_numeric($rank)) $rank = Rank::find($rank);
-        if($this->hasPower('edit_ranks')) {
-            if($this->isAdmin) {
-                if($rank->id != $this->id) return 1; // can edit everything
-                else return 2; // limited edit: cannot edit sort order/powers
+    public function canEditRank($rank) {
+        if (is_numeric($rank)) {
+            $rank = self::find($rank);
+        }
+        if ($this->hasPower('edit_ranks')) {
+            if ($this->isAdmin) {
+                if ($rank->id != $this->id) {
+                    return 1;
+                } // can edit everything
+                else {
+                    return 2;
+                } // limited edit: cannot edit sort order/powers
+            } elseif ($this->sort > $rank->sort) {
+                return 1;
             }
-            else if ($this->sort > $rank->sort) return 1;
         }
+
         return 0;
     }
 
     /**
      * Checks if the rank has a given power.
      *
-     * @param  \App\Models\Rank\RankPower $power
+     * @param \App\Models\Rank\RankPower $power
+     *
      * @return bool
      */
-    public function hasPower($power)
-    {
-        if($this->isAdmin) return true;
-        return $this->powers()->where('power', $power)->exists(); 
+    public function hasPower($power) {
+        if ($this->isAdmin) {
+            return true;
+        }
+
+        return $this->powers()->where('power', $power)->exists();
     }
 
     /**
@@ -121,10 +131,12 @@ public function hasPower($power)
      *
      * @return array
      */
-    public function getPowers()
-    {
-        if($this->isAdmin) return Config::get('lorekeeper.powers');
+    public function getPowers() {
+        if ($this->isAdmin) {
+            return config('lorekeeper.powers');
+        }
         $powers = $this->powers->pluck('power')->toArray();
-        return Arr::only(Config::get('lorekeeper.powers'), $powers);
+
+        return Arr::only(config('lorekeeper.powers'), $powers);
     }
 }
diff --git a/app/Models/Rank/RankPower.php b/app/Models/Rank/RankPower.php
index b0f8ac6b9c..429ce7cea4 100644
--- a/app/Models/Rank/RankPower.php
+++ b/app/Models/Rank/RankPower.php
@@ -4,16 +4,14 @@
 
 use App\Models\Model;
 
-class RankPower extends Model
-{
-
+class RankPower extends Model {
     /**
      * The attributes that are mass assignable.
      *
      * @var array
      */
     protected $fillable = [
-        'rank_id', 'power'
+        'rank_id', 'power',
     ];
 
     /**
diff --git a/app/Models/Rarity.php b/app/Models/Rarity.php
index 8e35f7da09..ad4017b076 100644
--- a/app/Models/Rarity.php
+++ b/app/Models/Rarity.php
@@ -2,18 +2,14 @@
 
 namespace App\Models;
 
-use Config;
-use App\Models\Model;
-
-class Rarity extends Model
-{
+class Rarity extends Model {
     /**
      * The attributes that are mass assignable.
      *
      * @var array
      */
     protected $fillable = [
-        'name', 'sort', 'color', 'has_image', 'description', 'parsed_description'
+        'name', 'sort', 'color', 'has_image', 'description', 'parsed_description', 'hash',
     ];
 
     /**
@@ -22,44 +18,42 @@ class Rarity extends Model
      * @var string
      */
     protected $table = 'rarities';
-    
     /**
      * Validation rules for creation.
      *
      * @var array
      */
     public static $createRules = [
-        'name' => 'required|unique:rarities|between:3,100',
-        'color' => 'nullable|regex:/^#?[0-9a-fA-F]{6}$/i',
+        'name'        => 'required|unique:rarities|between:3,100',
+        'color'       => 'nullable|regex:/^#?[0-9a-fA-F]{6}$/i',
         'description' => 'nullable',
-        'image' => 'mimes:png',
+        'image'       => 'mimes:png',
     ];
-    
+
     /**
      * Validation rules for updating.
      *
      * @var array
      */
     public static $updateRules = [
-        'name' => 'required|between:3,100',
-        'color' => 'nullable|regex:/^#?[0-9a-fA-F]{6}$/i',
+        'name'        => 'required|between:3,100',
+        'color'       => 'nullable|regex:/^#?[0-9a-fA-F]{6}$/i',
         'description' => 'nullable',
-        'image' => 'mimes:png',
+        'image'       => 'mimes:png',
     ];
 
     /**********************************************************************************************
-    
+
         ACCESSORS
 
     **********************************************************************************************/
-    
+
     /**
      * Displays the model's name, linked to its encyclopedia page.
      *
      * @return string
      */
-    public function getDisplayNameAttribute()
-    {
+    public function getDisplayNameAttribute() {
         return '<a href="'.$this->url.'" class="display-rarity" '.($this->color ? 'style="color: #'.$this->color.';"' : '').'>'.$this->name.'</a>';
     }
 
@@ -68,8 +62,7 @@ public function getDisplayNameAttribute()
      *
      * @return string
      */
-    public function getImageDirectoryAttribute()
-    {
+    public function getImageDirectoryAttribute() {
         return 'images/data/rarities';
     }
 
@@ -78,9 +71,8 @@ public function getImageDirectoryAttribute()
      *
      * @return string
      */
-    public function getRarityImageFileNameAttribute()
-    {
-        return $this->id . '-image.png';
+    public function getRarityImageFileNameAttribute() {
+        return $this->hash.$this->id.'-image.png';
     }
 
     /**
@@ -88,20 +80,21 @@ public function getRarityImageFileNameAttribute()
      *
      * @return string
      */
-    public function getRarityImagePathAttribute()
-    {
+    public function getRarityImagePathAttribute() {
         return public_path($this->imageDirectory);
     }
-    
+
     /**
      * Gets the URL of the model's image.
      *
      * @return string
      */
-    public function getRarityImageUrlAttribute()
-    {
-        if (!$this->has_image) return null;
-        return asset($this->imageDirectory . '/' . $this->rarityImageFileName);
+    public function getRarityImageUrlAttribute() {
+        if (!$this->has_image) {
+            return null;
+        }
+
+        return asset($this->imageDirectory.'/'.$this->rarityImageFileName);
     }
 
     /**
@@ -109,28 +102,43 @@ public function getRarityImageUrlAttribute()
      *
      * @return string
      */
-    public function getUrlAttribute()
-    {
+    public function getUrlAttribute() {
         return url('world/rarities?name='.$this->name);
     }
-    
+
     /**
      * Gets the URL for an encyclopedia search of features (character traits) in this category.
      *
      * @return string
      */
-    public function getSearchFeaturesUrlAttribute()
-    {
+    public function getSearchFeaturesUrlAttribute() {
         return url('world/traits?rarity_id='.$this->id);
     }
-    
+
     /**
      * Gets the URL for a masterlist search of characters of this rarity.
      *
      * @return string
      */
-    public function getSearchCharactersUrlAttribute()
-    {
+    public function getSearchCharactersUrlAttribute() {
         return url('masterlist?rarity_id='.$this->id);
     }
+
+    /**
+     * Gets the admin edit URL.
+     *
+     * @return string
+     */
+    public function getAdminUrlAttribute() {
+        return url('admin/data/rarities/edit/'.$this->id);
+    }
+
+    /**
+     * Gets the power required to edit this model.
+     *
+     * @return string
+     */
+    public function getAdminPowerAttribute() {
+        return 'edit_data';
+    }
 }
diff --git a/app/Models/Report/Report.php b/app/Models/Report/Report.php
index b711c05bd1..5c9e76733b 100644
--- a/app/Models/Report/Report.php
+++ b/app/Models/Report/Report.php
@@ -2,14 +2,11 @@
 
 namespace App\Models\Report;
 
-use Config;
-use DB;
-use Carbon\Carbon;
 use App\Models\Model;
+use App\Models\User\User;
 use App\Traits\Commentable;
 
-class Report extends Model
-{
+class Report extends Model {
     use Commentable;
 
     /**
@@ -20,7 +17,7 @@ class Report extends Model
     protected $fillable = [
         'user_id', 'staff_id', 'url',
         'comments', 'staff_comments', 'parsed_staff_comments',
-        'status', 'data', 'error_type', 'is_br'
+        'status', 'data', 'error_type', 'is_br',
     ];
 
     /**
@@ -36,7 +33,7 @@ class Report extends Model
      * @var string
      */
     public $timestamps = true;
-    
+
     /**
      * Validation rules for report creation.
      *
@@ -45,7 +42,7 @@ class Report extends Model
     public static $createRules = [
         'url' => 'required',
     ];
-    
+
     /**
      * Validation rules for report updating.
      *
@@ -56,28 +53,26 @@ class Report extends Model
     ];
 
     /**********************************************************************************************
-    
+
         RELATIONS
 
     **********************************************************************************************/
     /**
      * Get the user who made the report.
      */
-    public function user() 
-    {
-        return $this->belongsTo('App\Models\User\User', 'user_id');
+    public function user() {
+        return $this->belongsTo(User::class, 'user_id');
     }
-    
+
     /**
      * Get the staff who processed the report.
      */
-    public function staff() 
-    {
-        return $this->belongsTo('App\Models\User\User', 'staff_id');
+    public function staff() {
+        return $this->belongsTo(User::class, 'staff_id');
     }
 
     /**********************************************************************************************
-    
+
         SCOPES
 
     **********************************************************************************************/
@@ -85,53 +80,72 @@ public function staff()
     /**
      * Scope a query to only include pending reports.
      *
-     * @param  \Illuminate\Database\Eloquent\Builder  $query
+     * @param \Illuminate\Database\Eloquent\Builder $query
+     *
      * @return \Illuminate\Database\Eloquent\Builder
      */
-    public function scopeActive($query)
-    {
+    public function scopeActive($query) {
         return $query->where('status', 'Pending');
     }
 
     /**
      * Scope a query to only include reports assigned to a given user.
      *
-     * @param  \Illuminate\Database\Eloquent\Builder  $query
+     * @param \Illuminate\Database\Eloquent\Builder $query
+     * @param mixed                                 $user
+     *
      * @return \Illuminate\Database\Eloquent\Builder
      */
-    public function scopeAssignedToMe($query, $user)
-    {
+    public function scopeAssignedToMe($query, $user) {
         return $query->where('status', 'Assigned')->where('staff_id', $user->id);
     }
 
     /**
      * Scope a query to only include viewable reports.
      *
-     * @param  \Illuminate\Database\Eloquent\Builder  $query
+     * @param \Illuminate\Database\Eloquent\Builder $query
+     * @param mixed                                 $user
+     *
      * @return \Illuminate\Database\Eloquent\Builder
      */
-    public function scopeViewable($query, $user)
-    {
-        if($user && $user->hasPower('manage_reports')) return $query;
-        return $query->where(function($query) use ($user) {
-            if($user) $query->where('user_id', $user->id)->orWhere('error_type', '!=', 'exploit');
-            else $query->where('error_type', '!=', 'exploit');
+    public function scopeViewable($query, $user) {
+        if ($user && $user->hasPower('manage_reports')) {
+            return $query;
+        }
+
+        return $query->where(function ($query) use ($user) {
+            if ($user) {
+                $query->where('user_id', $user->id)->orWhere('error_type', '!=', 'exploit');
+            } else {
+                $query->where('error_type', '!=', 'exploit');
+            }
         });
     }
 
     /**
-     * Scope a query to sort reports oldest first.
+     * Scope a query to sort reports by oldest first.
+     *
+     * @param \Illuminate\Database\Eloquent\Builder $query
      *
-     * @param  \Illuminate\Database\Eloquent\Builder  $query
      * @return \Illuminate\Database\Eloquent\Builder
      */
-    public function scopeSortOldest($query)
-    {
+    public function scopeSortOldest($query) {
         return $query->orderBy('id');
     }
 
+    /**
+     * Scope a query to sort reports by newest first.
+     *
+     * @param \Illuminate\Database\Eloquent\Builder $query
+     *
+     * @return \Illuminate\Database\Eloquent\Builder
+     */
+    public function scopeSortNewest($query) {
+        return $query->orderBy('id', 'DESC');
+    }
+
     /**********************************************************************************************
-    
+
         ACCESSORS
 
     **********************************************************************************************/
@@ -141,8 +155,7 @@ public function scopeSortOldest($query)
      *
      * @return array
      */
-    public function getDataAttribute()
-    {
+    public function getDataAttribute() {
         return json_decode($this->attributes['data'], true);
     }
 
@@ -151,8 +164,7 @@ public function getDataAttribute()
      *
      * @return string
      */
-    public function getViewUrlAttribute()
-    {
+    public function getViewUrlAttribute() {
         return url('reports/view/'.$this->id);
     }
 
@@ -161,8 +173,7 @@ public function getViewUrlAttribute()
      *
      * @return string
      */
-    public function getAdminUrlAttribute()
-    {
+    public function getAdminUrlAttribute() {
         return url('admin/reports/edit/'.$this->id);
     }
 
@@ -171,9 +182,7 @@ public function getAdminUrlAttribute()
      *
      * @return string
      */
-    public function getDisplayNameAttribute()
-    {
-        return '<a href="'.$this->viewurl.'">'.'Report #-' . $this->id.'</a>';
+    public function getDisplayNameAttribute() {
+        return '<a href="'.$this->viewurl.'">'.'Report #-'.$this->id.'</a>';
     }
-
 }
diff --git a/app/Models/Sales/Sales.php b/app/Models/Sales/Sales.php
index 4744b8af76..3655337ae3 100644
--- a/app/Models/Sales/Sales.php
+++ b/app/Models/Sales/Sales.php
@@ -2,14 +2,15 @@
 
 namespace App\Models\Sales;
 
-use Carbon\Carbon;
-use Config;
 use App\Models\Model;
+use App\Models\User\User;
 use App\Traits\Commentable;
+use Carbon\Carbon;
 use Illuminate\Support\Str;
+use Spatie\Feed\Feedable;
+use Spatie\Feed\FeedItem;
 
-class Sales extends Model
-{
+class Sales extends Model implements Feedable {
     use Commentable;
     /**
      * The attributes that are mass assignable.
@@ -18,7 +19,7 @@ class Sales extends Model
      */
     protected $fillable = [
         'user_id', 'text', 'parsed_text', 'title', 'is_visible', 'post_at',
-        'is_open', 'comments_open_at'
+        'is_open', 'comments_open_at',
     ];
 
     /**
@@ -29,18 +30,21 @@ class Sales extends Model
     protected $table = 'sales';
 
     /**
-     * Whether the model contains timestamps to be saved and updated.
+     * The attributes that should be cast to native types.
      *
-     * @var string
+     * @var array
      */
-    public $timestamps = true;
+    protected $casts = [
+        'post_at'          => 'datetime',
+        'comments_open_at' => 'datetime',
+    ];
 
     /**
-     * Dates on the model to convert to Carbon instances.
+     * Whether the model contains timestamps to be saved and updated.
      *
-     * @var array
+     * @var string
      */
-    public $dates = ['post_at', 'comments_open_at'];
+    public $timestamps = true;
 
     /**
      * Validation rules for creation.
@@ -49,7 +53,7 @@ class Sales extends Model
      */
     public static $createRules = [
         'title' => 'required|between:3,100',
-        'text' => 'required',
+        'text'  => 'required',
     ];
 
     /**
@@ -59,7 +63,7 @@ class Sales extends Model
      */
     public static $updateRules = [
         'title' => 'required|between:3,100',
-        'text' => 'required',
+        'text'  => 'required',
     ];
 
     /**********************************************************************************************
@@ -71,17 +75,15 @@ class Sales extends Model
     /**
      * Get the user who created the Sales post.
      */
-    public function user()
-    {
-        return $this->belongsTo('App\Models\User\User');
+    public function user() {
+        return $this->belongsTo(User::class);
     }
 
     /**
      * Get the characters associated with the sales post.
      */
-    public function characters()
-    {
-        return $this->hasMany('App\Models\Sales\SalesCharacter', 'sales_id');
+    public function characters() {
+        return $this->hasMany(SalesCharacter::class, 'sales_id');
     }
 
     /**********************************************************************************************
@@ -93,25 +95,71 @@ public function characters()
     /**
      * Scope a query to only include visible posts.
      *
-     * @param  \Illuminate\Database\Eloquent\Builder  $query
+     * @param \Illuminate\Database\Eloquent\Builder $query
+     *
      * @return \Illuminate\Database\Eloquent\Builder
      */
-    public function scopeVisible($query)
-    {
-        return $query->orderBy('updated_at', 'DESC')->where('is_visible', 1);
+    public function scopeVisible($query) {
+        return $query->where('is_visible', 1);
     }
 
     /**
      * Scope a query to only include posts that are scheduled to be posted and are ready to post.
      *
-     * @param  \Illuminate\Database\Eloquent\Builder  $query
+     * @param \Illuminate\Database\Eloquent\Builder $query
+     *
      * @return \Illuminate\Database\Eloquent\Builder
      */
-    public function scopeShouldBeVisible($query)
-    {
+    public function scopeShouldBeVisible($query) {
         return $query->whereNotNull('post_at')->where('post_at', '<', Carbon::now())->where('is_visible', 0);
     }
 
+    /**
+     * Scope a query to sort sales in alphabetical order.
+     *
+     * @param \Illuminate\Database\Eloquent\Builder $query
+     * @param bool                                  $reverse
+     *
+     * @return \Illuminate\Database\Eloquent\Builder
+     */
+    public function scopeSortAlphabetical($query, $reverse = false) {
+        return $query->orderBy('title', $reverse ? 'DESC' : 'ASC');
+    }
+
+    /**
+     * Scope a query to sort sales by newest first.
+     *
+     * @param \Illuminate\Database\Eloquent\Builder $query
+     *
+     * @return \Illuminate\Database\Eloquent\Builder
+     */
+    public function scopeSortNewest($query) {
+        return $query->orderBy('id', 'DESC');
+    }
+
+    /**
+     * Scope a query to sort sales oldest first.
+     *
+     * @param \Illuminate\Database\Eloquent\Builder $query
+     *
+     * @return \Illuminate\Database\Eloquent\Builder
+     */
+    public function scopeSortOldest($query) {
+        return $query->orderBy('id');
+    }
+
+    /**
+     * Scope a query to sort sales by bump date.
+     *
+     * @param \Illuminate\Database\Eloquent\Builder $query
+     * @param bool                                  $reverse
+     *
+     * @return \Illuminate\Database\Eloquent\Builder
+     */
+    public function scopeSortBump($query, $reverse = false) {
+        return $query->orderBy('updated_at', $reverse ? 'DESC' : 'ASC');
+    }
+
     /**********************************************************************************************
 
         ACCESSORS
@@ -123,9 +171,8 @@ public function scopeShouldBeVisible($query)
      *
      * @return bool
      */
-    public function getSlugAttribute()
-    {
-        return $this->id . '.' . Str::slug($this->title);
+    public function getSlugAttribute() {
+        return $this->id.'.'.Str::slug($this->title);
     }
 
     /**
@@ -133,8 +180,7 @@ public function getSlugAttribute()
      *
      * @return string
      */
-    public function getDisplayNameAttribute()
-    {
+    public function getDisplayNameAttribute() {
         return '<a href="'.$this->url.'"> ['.($this->is_open ? (isset($this->comments_open_at) && $this->comments_open_at > Carbon::now() ? 'Preview' : 'Open') : 'Closed').'] '.$this->title.'</a>';
     }
 
@@ -143,8 +189,57 @@ public function getDisplayNameAttribute()
      *
      * @return string
      */
-    public function getUrlAttribute()
-    {
+    public function getUrlAttribute() {
         return url('sales/'.$this->slug);
     }
+
+    /**
+     * Gets the admin edit URL.
+     *
+     * @return string
+     */
+    public function getAdminUrlAttribute() {
+        return url('admin/sales/edit/'.$this->id);
+    }
+
+    /**
+     * Gets the power required to edit this model.
+     *
+     * @return string
+     */
+    public function getAdminPowerAttribute() {
+        return 'edit_pages';
+    }
+
+    /**********************************************************************************************
+
+        OTHER FUNCTIONS
+
+    **********************************************************************************************/
+
+    /**
+     * Returns all feed items.
+     */
+    public static function getFeedItems() {
+        return self::visible()->get();
+    }
+
+    /**
+     * Generates feed item information.
+     *
+     * @return /Spatie/Feed/FeedItem;
+     */
+    public function toFeedItem(): FeedItem {
+        $summary = ($this->characters->count() ? $this->characters->count().' character'.($this->characters->count() > 1 ? 's are' : ' is').' associated with this sale. Click through to read more.<hr/>' : '').$this->parsed_text;
+
+        return FeedItem::create([
+            'id'         => '/sales/'.$this->id,
+            'title'      => $this->title,
+            'summary'    => $summary,
+            'updated'    => $this->updated_at,
+            'link'       => $this->url,
+            'author'     => $this->user->name,
+            'authorName' => $this->user->name,
+        ]);
+    }
 }
diff --git a/app/Models/Sales/SalesCharacter.php b/app/Models/Sales/SalesCharacter.php
index 1682e9950e..6cfa1d699d 100644
--- a/app/Models/Sales/SalesCharacter.php
+++ b/app/Models/Sales/SalesCharacter.php
@@ -2,22 +2,18 @@
 
 namespace App\Models\Sales;
 
-use Config;
-use DB;
-use Carbon\Carbon;
+use App\Models\Character\Character;
 use App\Models\Character\CharacterImage;
-
 use App\Models\Model;
 
-class SalesCharacter extends Model
-{
+class SalesCharacter extends Model {
     /**
      * The attributes that are mass assignable.
      *
      * @var array
      */
     protected $fillable = [
-        'sales_id', 'character_id', 'description', 'type', 'data', 'link', 'is_open'
+        'sales_id', 'character_id', 'image_id', 'description', 'type', 'data', 'link', 'is_open',
     ];
 
     /**
@@ -26,23 +22,22 @@ class SalesCharacter extends Model
      * @var string
      */
     protected $table = 'sales_characters';
-
     /**
      * Validation rules.
      *
      * @var array
      */
     public static $rules = [
-        'type' => 'required',
-        'link' => 'nullable|url',
+        'type'          => 'required',
+        'link'          => 'nullable|url',
 
         // Flatsale
-        'price' => 'required_if:sale_type,flat',
+        'price'         => 'required_if:sale_type,flat',
 
         // Auction/XTA
-        'starting_bid' => 'required_if:type,auction',
+        'starting_bid'  => 'required_if:type,auction',
         'min_increment' => 'required_if:type,auction',
-        'end_point' => 'exclude_unless:type,auction,xta,ota|max:255'
+        'end_point'     => 'exclude_unless:type,auction,xta,ota|max:255',
     ];
 
     /**********************************************************************************************
@@ -54,17 +49,22 @@ class SalesCharacter extends Model
     /**
      * Get the sale this is attached to.
      */
-    public function sales()
-    {
-        return $this->belongsTo('App\Models\Sales\Sales', 'sales_id');
+    public function sales() {
+        return $this->belongsTo(Sales::class, 'sales_id');
     }
 
     /**
      * Get the character being attached to the sale.
      */
-    public function character()
-    {
-        return $this->belongsTo('App\Models\Character\Character', 'character_id');
+    public function character() {
+        return $this->belongsTo(Character::class, 'character_id')->withTrashed();
+    }
+
+    /**
+     * Get the image being attached to the sale.
+     */
+    public function image() {
+        return $this->belongsTo(CharacterImage::class, 'image_id');
     }
 
     /**********************************************************************************************
@@ -78,8 +78,7 @@ public function character()
      *
      * @return array
      */
-    public function getDataAttribute()
-    {
+    public function getDataAttribute() {
         return json_decode($this->attributes['data'], true);
     }
 
@@ -88,9 +87,8 @@ public function getDataAttribute()
      *
      * @return string
      */
-    public function getDisplayTypeAttribute()
-    {
-        switch($this->attributes['type']) {
+    public function getDisplayTypeAttribute() {
+        switch ($this->attributes['type']) {
             case 'flatsale':
                 return 'Flatsale';
                 break;
@@ -120,9 +118,8 @@ public function getDisplayTypeAttribute()
      *
      * @return string
      */
-    public function getTypeLinkAttribute()
-    {
-        switch($this->attributes['type']) {
+    public function getTypeLinkAttribute() {
+        switch ($this->attributes['type']) {
             case 'flatsale':
                 return 'Claim Here';
                 break;
@@ -152,34 +149,34 @@ public function getTypeLinkAttribute()
      *
      * @return string
      */
-    public function getPriceAttribute()
-    {
-        if($this->type == 'raffle') return null;
-        $symbol = Config::get('lorekeeper.settings.currency_symbol');
+    public function getPriceAttribute() {
+        if ($this->type == 'raffle') {
+            return null;
+        }
+        $symbol = config('lorekeeper.settings.currency_symbol');
 
-        switch($this->type) {
+        switch ($this->type) {
             case 'flatsale':
                 return 'Price: '.$symbol.$this->data['price'];
                 break;
             case 'auction':
                 return 'Starting Bid: '.$symbol.$this->data['starting_bid'].'<br/>'.
                 'Minimum Increment: '.$symbol.$this->data['min_increment'].
-                (isset($this->data['autobuy']) ? '<br/>Autobuy: '.$symbol.$this->data['autobuy'] : '')
-                ;
+                (isset($this->data['autobuy']) ? '<br/>Autobuy: '.$symbol.$this->data['autobuy'] : '');
                 break;
             case 'ota':
                 return (isset($this->data['autobuy']) ? 'Autobuy: '.$symbol.$this->data['autobuy'].'<br/>' : '').
-				(isset($this->data['minimum']) ? 'Minimum: '.$symbol.$this->data['minimum'].'<br/>' : '');
+                (isset($this->data['minimum']) ? 'Minimum: '.$symbol.$this->data['minimum'].'<br/>' : '');
                 break;
             case 'xta':
                 return (isset($this->data['autobuy']) ? 'Autobuy: '.$symbol.$this->data['autobuy'].'<br/>' : '').
-				(isset($this->data['minimum']) ? 'Minimum: '.$symbol.$this->data['minimum'].'<br/>' : '');
+                (isset($this->data['minimum']) ? 'Minimum: '.$symbol.$this->data['minimum'].'<br/>' : '');
                 break;
             case 'flaffle':
                 return 'Price: '.$symbol.$this->data['price'];
                 break;
             case 'pwyw':
-                return (isset($this->data['minimum']) ? 'Minimum: '.$symbol.$this->data['minimum'].'<br/>' : '');
+                return isset($this->data['minimum']) ? 'Minimum: '.$symbol.$this->data['minimum'].'<br/>' : '';
                 break;
         }
     }
@@ -189,9 +186,9 @@ public function getPriceAttribute()
      *
      * @return App\Models\Character\CharacterImage
      */
-    public function getImageAttribute()
-    {
-        return CharacterImage::where('is_visible', 1)->where('character_id', $this->character_id)->orderBy('created_at')->first();
+    public function getImageAttribute() {
+        // Have to call the relationship function or it doesn't grab it correctly
+        // likely because of the function name override
+        return $this->image()->first() ?? CharacterImage::where('is_visible', 1)->where('character_id', $this->character_id)->orderBy('created_at')->first();
     }
-
 }
diff --git a/app/Models/Shop/Shop.php b/app/Models/Shop/Shop.php
index 35bf7ef0ab..4f1b9457fc 100644
--- a/app/Models/Shop/Shop.php
+++ b/app/Models/Shop/Shop.php
@@ -2,18 +2,17 @@
 
 namespace App\Models\Shop;
 
-use Config;
+use App\Models\Item\Item;
 use App\Models\Model;
 
-class Shop extends Model
-{
+class Shop extends Model {
     /**
      * The attributes that are mass assignable.
      *
      * @var array
      */
     protected $fillable = [
-        'name', 'sort', 'has_image', 'description', 'parsed_description', 'is_active'
+        'name', 'sort', 'has_image', 'description', 'parsed_description', 'is_active', 'hash',
     ];
 
     /**
@@ -22,31 +21,30 @@ class Shop extends Model
      * @var string
      */
     protected $table = 'shops';
-    
     /**
      * Validation rules for creation.
      *
      * @var array
      */
     public static $createRules = [
-        'name' => 'required|unique:item_categories|between:3,100',
+        'name'        => 'required|unique:item_categories|between:3,100',
         'description' => 'nullable',
-        'image' => 'mimes:png',
+        'image'       => 'mimes:png',
     ];
-    
+
     /**
      * Validation rules for updating.
      *
      * @var array
      */
     public static $updateRules = [
-        'name' => 'required|between:3,100',
+        'name'        => 'required|between:3,100',
         'description' => 'nullable',
-        'image' => 'mimes:png',
+        'image'       => 'mimes:png',
     ];
 
     /**********************************************************************************************
-    
+
         RELATIONS
 
     **********************************************************************************************/
@@ -54,32 +52,29 @@ class Shop extends Model
     /**
      * Get the shop stock.
      */
-    public function stock() 
-    {
-        return $this->hasMany('App\Models\Shop\ShopStock');
+    public function stock() {
+        return $this->hasMany(ShopStock::class);
     }
-    
+
     /**
      * Get the shop stock as items for display purposes.
      */
-    public function displayStock()
-    {
-        return $this->belongsToMany('App\Models\Item\Item', 'shop_stock')->withPivot('item_id', 'currency_id', 'cost', 'use_user_bank', 'use_character_bank', 'is_limited_stock', 'quantity', 'purchase_limit', 'id');
+    public function displayStock() {
+        return $this->belongsToMany(Item::class, 'shop_stock')->withPivot('item_id', 'currency_id', 'cost', 'use_user_bank', 'use_character_bank', 'is_limited_stock', 'quantity', 'purchase_limit', 'id');
     }
 
     /**********************************************************************************************
-    
+
         ACCESSORS
 
     **********************************************************************************************/
-    
+
     /**
      * Displays the shop's name, linked to its purchase page.
      *
      * @return string
      */
-    public function getDisplayNameAttribute()
-    {
+    public function getDisplayNameAttribute() {
         return '<a href="'.$this->url.'" class="display-shop">'.$this->name.'</a>';
     }
 
@@ -88,8 +83,7 @@ public function getDisplayNameAttribute()
      *
      * @return string
      */
-    public function getImageDirectoryAttribute()
-    {
+    public function getImageDirectoryAttribute() {
         return 'images/data/shops';
     }
 
@@ -98,9 +92,8 @@ public function getImageDirectoryAttribute()
      *
      * @return string
      */
-    public function getShopImageFileNameAttribute()
-    {
-        return $this->id . '-image.png';
+    public function getShopImageFileNameAttribute() {
+        return $this->hash.$this->id.'-image.png';
     }
 
     /**
@@ -108,20 +101,21 @@ public function getShopImageFileNameAttribute()
      *
      * @return string
      */
-    public function getShopImagePathAttribute()
-    {
+    public function getShopImagePathAttribute() {
         return public_path($this->imageDirectory);
     }
-    
+
     /**
      * Gets the URL of the model's image.
      *
      * @return string
      */
-    public function getShopImageUrlAttribute()
-    {
-        if (!$this->has_image) return null;
-        return asset($this->imageDirectory . '/' . $this->shopImageFileName);
+    public function getShopImageUrlAttribute() {
+        if (!$this->has_image) {
+            return null;
+        }
+
+        return asset($this->imageDirectory.'/'.$this->shopImageFileName);
     }
 
     /**
@@ -129,8 +123,25 @@ public function getShopImageUrlAttribute()
      *
      * @return string
      */
-    public function getUrlAttribute()
-    {
+    public function getUrlAttribute() {
         return url('shops/'.$this->id);
     }
+
+    /**
+     * Gets the admin edit URL.
+     *
+     * @return string
+     */
+    public function getAdminUrlAttribute() {
+        return url('admin/data/shops/edit/'.$this->id);
+    }
+
+    /**
+     * Gets the power required to edit this model.
+     *
+     * @return string
+     */
+    public function getAdminPowerAttribute() {
+        return 'edit_data';
+    }
 }
diff --git a/app/Models/Shop/ShopLog.php b/app/Models/Shop/ShopLog.php
index ae37e6fd91..0e9f41266c 100644
--- a/app/Models/Shop/ShopLog.php
+++ b/app/Models/Shop/ShopLog.php
@@ -2,18 +2,20 @@
 
 namespace App\Models\Shop;
 
+use App\Models\Character\Character;
+use App\Models\Currency\Currency;
+use App\Models\Item\Item;
 use App\Models\Model;
+use App\Models\User\User;
 
-class ShopLog extends Model
-{
-
+class ShopLog extends Model {
     /**
      * The attributes that are mass assignable.
      *
      * @var array
      */
     protected $fillable = [
-        'shop_id', 'character_id', 'user_id', 'currency_id', 'cost', 'item_id', 'quantity'
+        'shop_id', 'character_id', 'user_id', 'currency_id', 'cost', 'item_id', 'quantity',
     ];
 
     /**
@@ -22,14 +24,13 @@ class ShopLog extends Model
      * @var string
      */
     protected $table = 'shop_log';
-
     /**
      * Whether the model contains timestamps to be saved and updated.
      *
      * @var string
      */
     public $timestamps = true;
-    
+
     /**
      * Validation rules for creation.
      *
@@ -37,57 +38,53 @@ class ShopLog extends Model
      */
     public static $createRules = [
         'stock_id' => 'required',
-        'shop_id' => 'required',
-        'bank' => 'required|in:user,character'
+        'shop_id'  => 'required',
+        'bank'     => 'required|in:user,character',
     ];
 
     /**********************************************************************************************
-    
+
         RELATIONS
 
     **********************************************************************************************/
-    
+
     /**
      * Get the user who purchased the item.
      */
-    public function user() 
-    {
-        return $this->belongsTo('App\Models\User\User');
+    public function user() {
+        return $this->belongsTo(User::class);
     }
-    
+
     /**
      * Get the character who purchased the item.
      */
-    public function character() 
-    {
-        return $this->belongsTo('App\Models\Character\Character');
+    public function character() {
+        return $this->belongsTo(Character::class);
     }
+
     /**
      * Get the purchased item.
      */
-    public function item() 
-    {
-        return $this->belongsTo('App\Models\Item\Item');
+    public function item() {
+        return $this->belongsTo(Item::class);
     }
 
     /**
      * Get the shop the item was purchased from.
      */
-    public function shop() 
-    {
-        return $this->belongsTo('App\Models\Shop\Shop');
+    public function shop() {
+        return $this->belongsTo(Shop::class);
     }
 
     /**
      * Get the currency used to purchase the item.
      */
-    public function currency() 
-    {
-        return $this->belongsTo('App\Models\Currency\Currency');
+    public function currency() {
+        return $this->belongsTo(Currency::class);
     }
 
     /**********************************************************************************************
-    
+
         ACCESSORS
 
     **********************************************************************************************/
@@ -97,8 +94,7 @@ public function currency()
      *
      * @return string
      */
-    public function getItemDataAttribute()
-    {
-        return 'Purchased from '.$this->shop->name.' by '.($this->character_id ? $this->character->slug . ' (owned by ' . $this->user->name . ')' : $this->user->displayName) . ' for ' . $this->cost . ' ' . $this->currency->name . '.';
+    public function getItemDataAttribute() {
+        return 'Purchased from '.$this->shop->name.' by '.($this->character_id ? $this->character->slug.' (owned by '.$this->user->name.')' : $this->user->displayName).' for '.$this->cost.' '.$this->currency->name.'.';
     }
 }
diff --git a/app/Models/Shop/ShopStock.php b/app/Models/Shop/ShopStock.php
index e2009d745d..9a096bee6f 100644
--- a/app/Models/Shop/ShopStock.php
+++ b/app/Models/Shop/ShopStock.php
@@ -2,18 +2,18 @@
 
 namespace App\Models\Shop;
 
+use App\Models\Currency\Currency;
+use App\Models\Item\Item;
 use App\Models\Model;
 
-class ShopStock extends Model
-{
-
+class ShopStock extends Model {
     /**
      * The attributes that are mass assignable.
      *
      * @var array
      */
     protected $fillable = [
-        'shop_id', 'item_id', 'currency_id', 'cost', 'use_user_bank', 'use_character_bank', 'is_limited_stock', 'quantity', 'sort', 'purchase_limit'
+        'shop_id', 'item_id', 'currency_id', 'cost', 'use_user_bank', 'use_character_bank', 'is_limited_stock', 'quantity', 'sort', 'purchase_limit',
     ];
 
     /**
@@ -24,32 +24,29 @@ class ShopStock extends Model
     protected $table = 'shop_stock';
 
     /**********************************************************************************************
-    
+
         RELATIONS
 
     **********************************************************************************************/
-    
+
     /**
      * Get the item being stocked.
      */
-    public function item() 
-    {
-        return $this->belongsTo('App\Models\Item\Item');
+    public function item() {
+        return $this->belongsTo(Item::class);
     }
-    
+
     /**
      * Get the shop that holds this item.
      */
-    public function shop() 
-    {
-        return $this->belongsTo('App\Models\Shop\Shop');
+    public function shop() {
+        return $this->belongsTo(Shop::class);
     }
-    
+
     /**
      * Get the currency the item must be purchased with.
      */
-    public function currency() 
-    {
-        return $this->belongsTo('App\Models\Currency\Currency');
+    public function currency() {
+        return $this->belongsTo(Currency::class);
     }
 }
diff --git a/app/Models/SitePage.php b/app/Models/SitePage.php
index a17b7090dd..252c42cddc 100644
--- a/app/Models/SitePage.php
+++ b/app/Models/SitePage.php
@@ -2,13 +2,9 @@
 
 namespace App\Models;
 
-use Config;
-use App\Models\Model;
-
 use App\Traits\Commentable;
 
-class SitePage extends Model
-{
+class SitePage extends Model {
     use Commentable;
 
     /**
@@ -17,7 +13,7 @@ class SitePage extends Model
      * @var array
      */
     protected $fillable = [
-        'key', 'title', 'text', 'parsed_text', 'is_visible', 'can_comment'
+        'key', 'title', 'text', 'parsed_text', 'is_visible', 'can_comment', 'allow_dislikes',
     ];
 
     /**
@@ -33,27 +29,27 @@ class SitePage extends Model
      * @var string
      */
     public $timestamps = true;
-    
+
     /**
      * Validation rules for creation.
      *
      * @var array
      */
     public static $createRules = [
-        'key' => 'required|unique:site_pages|between:3,25|alpha_dash',
+        'key'   => 'required|unique:site_pages|between:3,25|alpha_dash',
         'title' => 'required|between:3,100',
-        'text' => 'nullable',
+        'text'  => 'nullable',
     ];
-    
+
     /**
      * Validation rules for updating.
      *
      * @var array
      */
     public static $updateRules = [
-        'key' => 'required|between:3,25|alpha_dash',
+        'key'   => 'required|between:3,25|alpha_dash',
         'title' => 'required|between:3,100',
-        'text' => 'nullable',
+        'text'  => 'nullable',
     ];
 
     /**
@@ -61,8 +57,7 @@ class SitePage extends Model
      *
      * @return string
      */
-    public function getUrlAttribute()
-    {
+    public function getUrlAttribute() {
         return url('info/'.$this->key);
     }
 
@@ -71,8 +66,25 @@ public function getUrlAttribute()
      *
      * @return string
      */
-    public function getDisplayNameAttribute()
-    {
+    public function getDisplayNameAttribute() {
         return '<a href="'.$this->url.'">'.$this->title.'</a>';
     }
+
+    /**
+     * Gets the admin edit URL.
+     *
+     * @return string
+     */
+    public function getAdminUrlAttribute() {
+        return url('admin/pages/edit/'.$this->id);
+    }
+
+    /**
+     * Gets the power required to edit this model.
+     *
+     * @return string
+     */
+    public function getAdminPowerAttribute() {
+        return 'edit_pages';
+    }
 }
diff --git a/app/Models/Species/Species.php b/app/Models/Species/Species.php
index 8e11082c8b..5656e890eb 100644
--- a/app/Models/Species/Species.php
+++ b/app/Models/Species/Species.php
@@ -2,18 +2,18 @@
 
 namespace App\Models\Species;
 
-use Config;
+use App\Models\Character\Sublist;
+use App\Models\Feature\Feature;
 use App\Models\Model;
 
-class Species extends Model
-{
+class Species extends Model {
     /**
      * The attributes that are mass assignable.
      *
      * @var array
      */
     protected $fillable = [
-        'name', 'sort', 'has_image', 'description', 'parsed_description', 'masterlist_sub_id'
+        'name', 'sort', 'has_image', 'description', 'parsed_description', 'masterlist_sub_id', 'is_visible', 'hash',
     ];
 
     /**
@@ -22,33 +22,30 @@ class Species extends Model
      * @var string
      */
     protected $table = 'specieses';
-    
-    
     /**
      * Validation rules for creation.
      *
      * @var array
      */
     public static $createRules = [
-        'name' => 'required|unique:specieses|between:3,100',
+        'name'        => 'required|unique:specieses|between:3,100',
         'description' => 'nullable',
-        'image' => 'mimes:png',
+        'image'       => 'mimes:png',
     ];
-    
-    
+
     /**
      * Validation rules for updating.
      *
      * @var array
      */
     public static $updateRules = [
-        'name' => 'required|between:3,100',
+        'name'        => 'required|between:3,100',
         'description' => 'nullable',
-        'image' => 'mimes:png',
+        'image'       => 'mimes:png',
     ];
 
     /**********************************************************************************************
-    
+
         RELATIONS
 
     **********************************************************************************************/
@@ -56,40 +53,58 @@ class Species extends Model
     /**
      * Get the subtypes for this species.
      */
-    public function subtypes() 
-    {
-        return $this->hasMany('App\Models\Species\Subtype');
+    public function subtypes() {
+        return $this->hasMany(Subtype::class);
     }
 
     /**
      * Get the sub masterlist for this species.
      */
-    public function sublist() 
-    {
-        return $this->belongsTo('App\Models\Character\Sublist', 'masterlist_sub_id');
+    public function sublist() {
+        return $this->belongsTo(Sublist::class, 'masterlist_sub_id');
     }
-    
+
     /**
      * Get the features associated with this species.
      */
-    public function features() 
-    {
-        return $this->hasMany('App\Models\Feature\Feature');
+    public function features() {
+        return $this->hasMany(Feature::class);
+    }
+
+    /**********************************************************************************************
+
+        SCOPES
+
+    **********************************************************************************************/
+
+    /**
+     * Scope a query to show only visible species.
+     *
+     * @param \Illuminate\Database\Eloquent\Builder $query
+     * @param mixed|null                            $user
+     *
+     * @return \Illuminate\Database\Eloquent\Builder
+     */
+    public function scopeVisible($query, $user = null) {
+        if ($user && $user->hasPower('edit_data')) {
+            return $query;
+        }
+
+        return $query->where('is_visible', 1);
     }
 
     /**********************************************************************************************
-    
+
         ACCESSORS
 
     **********************************************************************************************/
-    
+
     /**
      * Displays the model's name, linked to its encyclopedia page.
      *
      * @return string
      */
-    public function getDisplayNameAttribute()
-    {
+    public function getDisplayNameAttribute() {
         return '<a href="'.$this->url.'" class="display-species">'.$this->name.'</a>';
     }
 
@@ -98,8 +113,7 @@ public function getDisplayNameAttribute()
      *
      * @return string
      */
-    public function getImageDirectoryAttribute()
-    {
+    public function getImageDirectoryAttribute() {
         return 'images/data/species';
     }
 
@@ -108,9 +122,8 @@ public function getImageDirectoryAttribute()
      *
      * @return string
      */
-    public function getSpeciesImageFileNameAttribute()
-    {
-        return $this->id . '-image.png';
+    public function getSpeciesImageFileNameAttribute() {
+        return $this->hash.$this->id.'-image.png';
     }
 
     /**
@@ -118,20 +131,21 @@ public function getSpeciesImageFileNameAttribute()
      *
      * @return string
      */
-    public function getSpeciesImagePathAttribute()
-    {
+    public function getSpeciesImagePathAttribute() {
         return public_path($this->imageDirectory);
     }
-    
+
     /**
      * Gets the URL of the model's image.
      *
      * @return string
      */
-    public function getSpeciesImageUrlAttribute()
-    {
-        if (!$this->has_image) return null;
-        return asset($this->imageDirectory . '/' . $this->speciesImageFileName);
+    public function getSpeciesImageUrlAttribute() {
+        if (!$this->has_image) {
+            return null;
+        }
+
+        return asset($this->imageDirectory.'/'.$this->speciesImageFileName);
     }
 
     /**
@@ -139,8 +153,7 @@ public function getSpeciesImageUrlAttribute()
      *
      * @return string
      */
-    public function getUrlAttribute()
-    {
+    public function getUrlAttribute() {
         return url('world/species?name='.$this->name);
     }
 
@@ -149,12 +162,12 @@ public function getUrlAttribute()
      *
      * @return string
      */
-    public function getSearchUrlAttribute()
-    {
-        if($this->masterlist_sub_id != 0 && $this->sublist->show_main == 0)
-        return url('sublist/'.$this->sublist->key.'?species_id='.$this->id);
-        else
-        return url('masterlist?species_id='.$this->id);
+    public function getSearchUrlAttribute() {
+        if ($this->masterlist_sub_id != 0 && $this->sublist->show_main == 0) {
+            return url('sublist/'.$this->sublist->key.'?species_id='.$this->id);
+        } else {
+            return url('masterlist?species_id='.$this->id);
+        }
     }
 
     /**
@@ -162,8 +175,25 @@ public function getSearchUrlAttribute()
      *
      * @return string
      */
-    public function getVisualTraitsUrlAttribute()
-    {
+    public function getVisualTraitsUrlAttribute() {
         return url('/world/species/'.$this->id.'/traits');
     }
+
+    /**
+     * Gets the admin edit URL.
+     *
+     * @return string
+     */
+    public function getAdminUrlAttribute() {
+        return url('admin/data/species/edit/'.$this->id);
+    }
+
+    /**
+     * Gets the power required to edit this model.
+     *
+     * @return string
+     */
+    public function getAdminPowerAttribute() {
+        return 'edit_data';
+    }
 }
diff --git a/app/Models/Species/Subtype.php b/app/Models/Species/Subtype.php
index 6824c2db75..51fadd4e6c 100644
--- a/app/Models/Species/Subtype.php
+++ b/app/Models/Species/Subtype.php
@@ -2,18 +2,16 @@
 
 namespace App\Models\Species;
 
-use Config;
 use App\Models\Model;
 
-class Subtype extends Model
-{
+class Subtype extends Model {
     /**
      * The attributes that are mass assignable.
      *
      * @var array
      */
     protected $fillable = [
-        'species_id', 'name', 'sort', 'has_image', 'description', 'parsed_description'
+        'species_id', 'name', 'sort', 'has_image', 'description', 'parsed_description', 'is_visible', 'hash',
     ];
 
     /**
@@ -22,58 +20,76 @@ class Subtype extends Model
      * @var string
      */
     protected $table = 'subtypes';
-    
-    
+
     /**
-     * Validation rules for creation.
+     * Accessors to append to the model.
      *
      * @var array
      */
-    public static $createRules = [
-        'species_id' => 'required',
-        'name' => 'required|between:3,100',
-        'description' => 'nullable',
-        'image' => 'mimes:png',
+    protected $appends = [
+        'name_with_species',
     ];
-    
-    
     /**
-     * Validation rules for updating.
+     * Validation rules for creation.
      *
      * @var array
      */
-    public static $updateRules = [
-        'species_id' => 'required',
-        'name' => 'required|between:3,100',
+    public static $createRules = [
+        'species_id'  => 'required',
+        'name'        => 'required|between:3,100',
         'description' => 'nullable',
-        'image' => 'mimes:png',
+        'image'       => 'mimes:png',
     ];
-    
+
     /**
-     * Accessors to append to the model.
+     * Validation rules for updating.
      *
      * @var array
      */
-    protected $appends = [
-        'name_with_species'
+    public static $updateRules = [
+        'species_id'  => 'required',
+        'name'        => 'required|between:3,100',
+        'description' => 'nullable',
+        'image'       => 'mimes:png',
     ];
 
     /**********************************************************************************************
-    
+
         RELATIONS
 
     **********************************************************************************************/
-    
+
     /**
      * Get the species the subtype belongs to.
      */
-    public function species() 
-    {
-        return $this->belongsTo('App\Models\Species\Species', 'species_id');
+    public function species() {
+        return $this->belongsTo(Species::class, 'species_id');
+    }
+
+    /**********************************************************************************************
+
+            SCOPES
+
+    **********************************************************************************************/
+
+    /**
+     * Scope a query to show only visible subtypes.
+     *
+     * @param \Illuminate\Database\Eloquent\Builder $query
+     * @param mixed|null                            $user
+     *
+     * @return \Illuminate\Database\Eloquent\Builder
+     */
+    public function scopeVisible($query, $user = null) {
+        if ($user && $user->hasPower('edit_data')) {
+            return $query;
+        }
+
+        return $query->where('is_visible', 1);
     }
 
     /**********************************************************************************************
-    
+
         ACCESSORS
 
     **********************************************************************************************/
@@ -83,18 +99,16 @@ public function species()
      *
      * @return string
      */
-    public function getNameWithSpeciesAttribute()
-    {
-        return $this->name . ' [' . $this->species->name . ' Subtype]';
+    public function getNameWithSpeciesAttribute() {
+        return $this->name.' ['.$this->species->name.' Subtype]';
     }
-    
+
     /**
      * Displays the model's name, linked to its encyclopedia page.
      *
      * @return string
      */
-    public function getDisplayNameAttribute()
-    {
+    public function getDisplayNameAttribute() {
         return '<a href="'.$this->url.'" class="display-subtype">'.$this->name.'</a>';
     }
 
@@ -103,8 +117,7 @@ public function getDisplayNameAttribute()
      *
      * @return string
      */
-    public function getImageDirectoryAttribute()
-    {
+    public function getImageDirectoryAttribute() {
         return 'images/data/subtypes';
     }
 
@@ -113,9 +126,8 @@ public function getImageDirectoryAttribute()
      *
      * @return string
      */
-    public function getSubtypeImageFileNameAttribute()
-    {
-        return $this->id . '-image.png';
+    public function getSubtypeImageFileNameAttribute() {
+        return $this->hash.$this->id.'-image.png';
     }
 
     /**
@@ -123,20 +135,21 @@ public function getSubtypeImageFileNameAttribute()
      *
      * @return string
      */
-    public function getSubtypeImagePathAttribute()
-    {
+    public function getSubtypeImagePathAttribute() {
         return public_path($this->imageDirectory);
     }
-    
+
     /**
      * Gets the URL of the model's image.
      *
      * @return string
      */
-    public function getSubtypeImageUrlAttribute()
-    {
-        if (!$this->has_image) return null;
-        return asset($this->imageDirectory . '/' . $this->subtypeImageFileName);
+    public function getSubtypeImageUrlAttribute() {
+        if (!$this->has_image) {
+            return null;
+        }
+
+        return asset($this->imageDirectory.'/'.$this->subtypeImageFileName);
     }
 
     /**
@@ -144,8 +157,7 @@ public function getSubtypeImageUrlAttribute()
      *
      * @return string
      */
-    public function getUrlAttribute()
-    {
+    public function getUrlAttribute() {
         return url('world/subtypes?name='.$this->name);
     }
 
@@ -154,8 +166,25 @@ public function getUrlAttribute()
      *
      * @return string
      */
-    public function getSearchUrlAttribute()
-    {
+    public function getSearchUrlAttribute() {
         return url('masterlist?subtype_id='.$this->id);
     }
+
+    /**
+     * Gets the admin edit URL.
+     *
+     * @return string
+     */
+    public function getAdminUrlAttribute() {
+        return url('admin/data/subtypes/edit/'.$this->id);
+    }
+
+    /**
+     * Gets the power required to edit this model.
+     *
+     * @return string
+     */
+    public function getAdminPowerAttribute() {
+        return 'edit_data';
+    }
 }
diff --git a/app/Models/Submission/Submission.php b/app/Models/Submission/Submission.php
index 36ec8bdfa4..e21ccde578 100644
--- a/app/Models/Submission/Submission.php
+++ b/app/Models/Submission/Submission.php
@@ -2,13 +2,12 @@
 
 namespace App\Models\Submission;
 
-use Config;
-use DB;
-use Carbon\Carbon;
 use App\Models\Model;
+use App\Models\Prompt\Prompt;
+use App\Models\User\User;
+use Carbon\Carbon;
 
-class Submission extends Model
-{
+class Submission extends Model {
     /**
      * The attributes that are mass assignable.
      *
@@ -17,7 +16,7 @@ class Submission extends Model
     protected $fillable = [
         'prompt_id', 'user_id', 'staff_id', 'url',
         'comments', 'staff_comments', 'parsed_staff_comments',
-        'status', 'data'
+        'status', 'data',
     ];
 
     /**
@@ -26,7 +25,6 @@ class Submission extends Model
      * @var string
      */
     protected $table = 'submissions';
-
     /**
      * Whether the model contains timestamps to be saved and updated.
      *
@@ -61,33 +59,29 @@ class Submission extends Model
     /**
      * Get the prompt this submission is for.
      */
-    public function prompt()
-    {
-        return $this->belongsTo('App\Models\Prompt\Prompt', 'prompt_id');
+    public function prompt() {
+        return $this->belongsTo(Prompt::class, 'prompt_id');
     }
 
     /**
      * Get the user who made the submission.
      */
-    public function user()
-    {
-        return $this->belongsTo('App\Models\User\User', 'user_id');
+    public function user() {
+        return $this->belongsTo(User::class, 'user_id');
     }
 
     /**
      * Get the staff who processed the submission.
      */
-    public function staff()
-    {
-        return $this->belongsTo('App\Models\User\User', 'staff_id');
+    public function staff() {
+        return $this->belongsTo(User::class, 'staff_id');
     }
 
     /**
      * Get the characters attached to the submission.
      */
-    public function characters()
-    {
-        return $this->hasMany('App\Models\Submission\SubmissionCharacter', 'submission_id');
+    public function characters() {
+        return $this->hasMany(SubmissionCharacter::class, 'submission_id');
     }
 
     /**********************************************************************************************
@@ -99,57 +93,75 @@ public function characters()
     /**
      * Scope a query to only include pending submissions.
      *
-     * @param  \Illuminate\Database\Eloquent\Builder  $query
+     * @param \Illuminate\Database\Eloquent\Builder $query
+     *
      * @return \Illuminate\Database\Eloquent\Builder
      */
-    public function scopeActive($query)
-    {
+    public function scopeActive($query) {
         return $query->where('status', 'Pending');
     }
 
+    /**
+     * Scope a query to only include drafted submissions.
+     *
+     * @param \Illuminate\Database\Eloquent\Builder $query
+     *
+     * @return \Illuminate\Database\Eloquent\Builder
+     */
+    public function scopeDrafts($query) {
+        return $query->where('status', 'Drafts');
+    }
+
     /**
      * Scope a query to only include viewable submissions.
      *
-     * @param  \Illuminate\Database\Eloquent\Builder  $query
+     * @param \Illuminate\Database\Eloquent\Builder $query
+     * @param mixed|null                            $user
+     *
      * @return \Illuminate\Database\Eloquent\Builder
      */
-    public function scopeViewable($query, $user = null)
-    {
+    public function scopeViewable($query, $user = null) {
         $forbiddenSubmissions = $this
-        ->whereHas('prompt', function($q) {
-            $q->where('hide_submissions', 1)->whereNotNull('end_at')->where('end_at', '>', Carbon::now());
-        })
-        ->orWhereHas('prompt', function($q) {
-            $q->where('hide_submissions', 2);
-        })
-        ->orWhere('status', '!=', 'Approved')->pluck('id')->toArray();
-
-        if($user && $user->hasPower('manage_submissions')) return $query;
-        else return $query->where(function($query) use ($user, $forbiddenSubmissions) {
-            if($user) $query->whereNotIn('id', $forbiddenSubmissions)->orWhere('user_id', $user->id);
-            else $query->whereNotIn('id', $forbiddenSubmissions);
-        });
+            ->whereHas('prompt', function ($q) {
+                $q->where('hide_submissions', 1)->whereNotNull('end_at')->where('end_at', '>', Carbon::now());
+            })
+            ->orWhereHas('prompt', function ($q) {
+                $q->where('hide_submissions', 2);
+            })
+            ->orWhere('status', '!=', 'Approved')->pluck('id')->toArray();
+
+        if ($user && $user->hasPower('manage_submissions')) {
+            return $query;
+        } else {
+            return $query->where(function ($query) use ($user, $forbiddenSubmissions) {
+                if ($user) {
+                    $query->whereNotIn('id', $forbiddenSubmissions)->orWhere('user_id', $user->id);
+                } else {
+                    $query->whereNotIn('id', $forbiddenSubmissions);
+                }
+            });
+        }
     }
 
     /**
      * Scope a query to sort submissions oldest first.
      *
-     * @param  \Illuminate\Database\Eloquent\Builder  $query
+     * @param \Illuminate\Database\Eloquent\Builder $query
+     *
      * @return \Illuminate\Database\Eloquent\Builder
      */
-    public function scopeSortOldest($query)
-    {
+    public function scopeSortOldest($query) {
         return $query->orderBy('id');
     }
 
     /**
      * Scope a query to sort submissions by newest first.
      *
-     * @param  \Illuminate\Database\Eloquent\Builder  $query
+     * @param \Illuminate\Database\Eloquent\Builder $query
+     *
      * @return \Illuminate\Database\Eloquent\Builder
      */
-    public function scopeSortNewest($query)
-    {
+    public function scopeSortNewest($query) {
         return $query->orderBy('id', 'DESC');
     }
 
@@ -164,30 +176,29 @@ public function scopeSortNewest($query)
      *
      * @return array
      */
-    public function getDataAttribute()
-    {
+    public function getDataAttribute() {
         return json_decode($this->attributes['data'], true);
     }
 
     /**
      * Gets the inventory of the user for selection.
      *
+     * @param mixed $user
+     *
      * @return array
      */
-    public function getInventory($user)
-    {
+    public function getInventory($user) {
         return $this->data && isset($this->data['user']['user_items']) ? $this->data['user']['user_items'] : [];
-        return $inventory;
     }
 
     /**
      * Gets the currencies of the given user for selection.
      *
-     * @param  \App\Models\User\User $user
+     * @param \App\Models\User\User $user
+     *
      * @return array
      */
-    public function getCurrencies($user)
-    {
+    public function getCurrencies($user) {
         return $this->data && isset($this->data['user']) && isset($this->data['user']['currencies']) ? $this->data['user']['currencies'] : [];
     }
 
@@ -196,9 +207,8 @@ public function getCurrencies($user)
      *
      * @return string
      */
-    public function getViewUrlAttribute()
-    {
-        return url(($this->prompt_id ? 'submissions' : 'claims') . '/view/'.$this->id);
+    public function getViewUrlAttribute() {
+        return url(($this->prompt_id ? 'submissions' : 'claims').'/view/'.$this->id);
     }
 
     /**
@@ -206,9 +216,8 @@ public function getViewUrlAttribute()
      *
      * @return string
      */
-    public function getAdminUrlAttribute()
-    {
-        return url('admin/' . ($this->prompt_id ? 'submissions' : 'claims') . '/edit/'.$this->id);
+    public function getAdminUrlAttribute() {
+        return url('admin/'.($this->prompt_id ? 'submissions' : 'claims').'/edit/'.$this->id);
     }
 
     /**
@@ -216,25 +225,24 @@ public function getAdminUrlAttribute()
      *
      * @return array
      */
-    public function getRewardsAttribute()
-    {
-        if(isset($this->data['rewards']))
-        $assets = parseAssetData($this->data['rewards']);
-        else
-        $assets = parseAssetData($this->data);
+    public function getRewardsAttribute() {
+        if (isset($this->data['rewards'])) {
+            $assets = parseAssetData($this->data['rewards']);
+        } else {
+            $assets = parseAssetData($this->data);
+        }
         $rewards = [];
-        foreach($assets as $type => $a)
-        {
+        foreach ($assets as $type => $a) {
             $class = getAssetModelString($type, false);
-            foreach($a as $id => $asset)
-            {
-                $rewards[] = (object)[
+            foreach ($a as $id => $asset) {
+                $rewards[] = (object) [
                     'rewardable_type' => $class,
-                    'rewardable_id' => $id,
-                    'quantity' => $asset['quantity']
+                    'rewardable_id'   => $id,
+                    'quantity'        => $asset['quantity'],
                 ];
             }
         }
+
         return $rewards;
     }
 }
diff --git a/app/Models/Submission/SubmissionCharacter.php b/app/Models/Submission/SubmissionCharacter.php
index 9cb32dc945..006adccdc6 100644
--- a/app/Models/Submission/SubmissionCharacter.php
+++ b/app/Models/Submission/SubmissionCharacter.php
@@ -2,20 +2,17 @@
 
 namespace App\Models\Submission;
 
-use Config;
-use DB;
-use Carbon\Carbon;
+use App\Models\Character\Character;
 use App\Models\Model;
 
-class SubmissionCharacter extends Model
-{
+class SubmissionCharacter extends Model {
     /**
      * The attributes that are mass assignable.
      *
      * @var array
      */
     protected $fillable = [
-        'submission_id', 'character_id', 'data'
+        'submission_id', 'character_id', 'data',
     ];
 
     /**
@@ -34,17 +31,15 @@ class SubmissionCharacter extends Model
     /**
      * Get the submission this is attached to.
      */
-    public function submission()
-    {
-        return $this->belongsTo('App\Models\Submission\Submission', 'submission_id');
+    public function submission() {
+        return $this->belongsTo(Submission::class, 'submission_id');
     }
 
     /**
      * Get the character being attached to the submission.
      */
-    public function character()
-    {
-        return $this->belongsTo('App\Models\Character\Character', 'character_id');
+    public function character() {
+        return $this->belongsTo(Character::class, 'character_id');
     }
 
     /**********************************************************************************************
@@ -58,8 +53,7 @@ public function character()
      *
      * @return array
      */
-    public function getDataAttribute()
-    {
+    public function getDataAttribute() {
         return json_decode($this->attributes['data'], true);
     }
 
@@ -68,22 +62,20 @@ public function getDataAttribute()
      *
      * @return array
      */
-    public function getRewardsAttribute()
-    {
+    public function getRewardsAttribute() {
         $assets = parseAssetData($this->data);
         $rewards = [];
-        foreach($assets as $type => $a)
-        {
+        foreach ($assets as $type => $a) {
             $class = getAssetModelString($type, false);
-            foreach($a as $id => $asset)
-            {
-                $rewards[] = (object)[
+            foreach ($a as $id => $asset) {
+                $rewards[] = (object) [
                     'rewardable_type' => $class,
-                    'rewardable_id' => $id,
-                    'quantity' => $asset['quantity']
+                    'rewardable_id'   => $id,
+                    'quantity'        => $asset['quantity'],
                 ];
             }
         }
+
         return $rewards;
     }
 }
diff --git a/app/Models/Trade.php b/app/Models/Trade.php
index 2d7f3a9c55..58a56c7e88 100644
--- a/app/Models/Trade.php
+++ b/app/Models/Trade.php
@@ -2,15 +2,11 @@
 
 namespace App\Models;
 
-use Config;
-use Settings;
-
+use App\Facades\Settings;
 use App\Models\Character\Character;
+use App\Models\User\User;
 
-use App\Models\Model;
-
-class Trade extends Model
-{
+class Trade extends Model {
     /**
      * The attributes that are mass assignable.
      *
@@ -19,7 +15,7 @@ class Trade extends Model
     protected $fillable = [
         'sender_id', 'recipient_id', 'comments',
         'status', 'is_sender_confirmed', 'is_recipient_confirmed', 'is_sender_trade_confirmed', 'is_recipient_trade_confirmed',
-        'is_approved', 'reason', 'data'
+        'is_approved', 'reason', 'data',
     ];
 
     /**
@@ -28,7 +24,6 @@ class Trade extends Model
      * @var string
      */
     protected $table = 'trades';
-
     /**
      * Whether the model contains timestamps to be saved and updated.
      *
@@ -37,7 +32,7 @@ class Trade extends Model
     public $timestamps = true;
 
     /**********************************************************************************************
-    
+
         RELATIONS
 
     **********************************************************************************************/
@@ -45,40 +40,36 @@ class Trade extends Model
     /**
      * Get the user who initiated the trade.
      */
-    public function sender() 
-    {
-        return $this->belongsTo('App\Models\User\User', 'sender_id');
+    public function sender() {
+        return $this->belongsTo(User::class, 'sender_id');
     }
 
     /**
      * Get the user who received the trade.
      */
-    public function recipient() 
-    {
-        return $this->belongsTo('App\Models\User\User', 'recipient_id');
+    public function recipient() {
+        return $this->belongsTo(User::class, 'recipient_id');
     }
 
     /**
      * Get the staff member who approved the character transfer.
      */
-    public function staff() 
-    {
-        return $this->belongsTo('App\Models\User\User', 'staff_id');
+    public function staff() {
+        return $this->belongsTo(User::class, 'staff_id');
     }
 
     /**********************************************************************************************
-    
+
         SCOPES
 
     **********************************************************************************************/
 
-    public function scopeCompleted($query)
-    {
+    public function scopeCompleted($query) {
         return $query->where('status', 'Completed')->orWhere('status', 'Rejected');
     }
 
     /**********************************************************************************************
-    
+
         ACCESSORS
 
     **********************************************************************************************/
@@ -88,12 +79,15 @@ public function scopeCompleted($query)
      *
      * @return bool
      */
-    public function getIsActiveAttribute()
-    {
-        if($this->status == 'Pending') return true;
+    public function getIsActiveAttribute() {
+        if ($this->status == 'Pending') {
+            return true;
+        }
 
-        if(Settings::get('open_transfers_queue')) {
-            if($this->status == 'Accepted' && $this->is_approved == 0) return true;
+        if (Settings::get('open_transfers_queue')) {
+            if ($this->status == 'Accepted' && $this->is_approved == 0) {
+                return true;
+            }
         }
 
         return false;
@@ -104,9 +98,11 @@ public function getIsActiveAttribute()
      *
      * @return bool
      */
-    public function getIsConfirmableAttribute()
-    {
-        if($this->is_sender_confirmed && $this->is_recipient_confirmed) return true;
+    public function getIsConfirmableAttribute() {
+        if ($this->is_sender_confirmed && $this->is_recipient_confirmed) {
+            return true;
+        }
+
         return false;
     }
 
@@ -115,8 +111,7 @@ public function getIsConfirmableAttribute()
      *
      * @return array
      */
-    public function getDataAttribute()
-    {
+    public function getDataAttribute() {
         return json_decode($this->attributes['data'], true);
     }
 
@@ -125,63 +120,66 @@ public function getDataAttribute()
      *
      * @return string
      */
-    public function getUrlAttribute()
-    {
+    public function getUrlAttribute() {
         return url('trades/'.$this->id);
     }
 
     /**********************************************************************************************
-    
+
         OTHER FUNCTIONS
 
     **********************************************************************************************/
-    
+
     /**
      * Gets all characters involved in the trade.
      *
      * @return \Illuminate\Support\Collection
      */
-    public function getCharacterData()
-    {
+    public function getCharacterData() {
         return Character::with('user')->whereIn('id', array_merge($this->getCharacters($this->sender), $this->getCharacters($this->recipient)))->get();
     }
 
     /**
      * Gets the inventory of the given user for selection.
      *
-     * @param  \App\Models\User\User $user
+     * @param \App\Models\User\User $user
+     *
      * @return array
      */
-    public function getInventory($user)
-    {
+    public function getInventory($user) {
         $type = $this->sender_id == $user->id ? 'sender' : 'recipient';
         $inventory = $this->data && isset($this->data[$type]) && isset($this->data[$type]['user_items']) ? $this->data[$type]['user_items'] : [];
+
         return $inventory;
     }
 
     /**
      * Gets the characters of the given user for selection.
      *
-     * @param  \App\Models\User\User $user
+     * @param \App\Models\User\User $user
+     *
      * @return array
      */
-    public function getCharacters($user)
-    {
+    public function getCharacters($user) {
         $type = $this->sender_id == $user->id ? 'sender' : 'recipient';
         $characters = $this->data && isset($this->data[$type]) && isset($this->data[$type]['characters']) ? $this->data[$type]['characters'] : [];
-        if($characters) $characters = array_keys($characters);
+        if ($characters) {
+            $characters = array_keys($characters);
+        }
+
         return $characters;
     }
 
     /**
      * Gets the currencies of the given user for selection.
      *
-     * @param  \App\Models\User\User $user
+     * @param \App\Models\User\User $user
+     *
      * @return array
      */
-    public function getCurrencies($user)
-    {
+    public function getCurrencies($user) {
         $type = $this->sender_id == $user->id ? 'sender' : 'recipient';
+
         return $this->data && isset($this->data[$type]) && isset($this->data[$type]['currencies']) ? $this->data[$type]['currencies'] : [];
     }
 }
diff --git a/app/Models/User/User.php b/app/Models/User/User.php
index 43d7bd63db..58f629fd70 100644
--- a/app/Models/User/User.php
+++ b/app/Models/User/User.php
@@ -2,32 +2,32 @@
 
 namespace App\Models\User;
 
-use Illuminate\Notifications\Notifiable;
-use Illuminate\Contracts\Auth\MustVerifyEmail;
-use Illuminate\Foundation\Auth\User as Authenticatable;
-use Auth;
-use Config;
-use Carbon\Carbon;
-
 use App\Models\Character\Character;
+use App\Models\Character\CharacterBookmark;
 use App\Models\Character\CharacterImageCreator;
-use App\Models\Rank\RankPower;
+use App\Models\Comment\CommentLike;
 use App\Models\Currency\Currency;
 use App\Models\Currency\CurrencyLog;
+use App\Models\Gallery\GalleryCollaborator;
+use App\Models\Gallery\GalleryFavorite;
+use App\Models\Gallery\GallerySubmission;
+use App\Models\Item\Item;
 use App\Models\Item\ItemLog;
+use App\Models\Notification;
+use App\Models\Rank\Rank;
+use App\Models\Rank\RankPower;
 use App\Models\Shop\ShopLog;
-use App\Models\User\UserCharacterLog;
 use App\Models\Submission\Submission;
-use App\Models\Submission\SubmissionCharacter;
-use App\Models\Character\CharacterBookmark;
-use App\Models\Gallery\GallerySubmission;
-use App\Models\Gallery\GalleryCollaborator;
-use App\Models\Gallery\GalleryFavorite;
 use App\Traits\Commenter;
+use Carbon\Carbon;
+use Illuminate\Contracts\Auth\MustVerifyEmail;
+use Illuminate\Foundation\Auth\User as Authenticatable;
+use Illuminate\Notifications\Notifiable;
+use Illuminate\Support\Facades\Auth;
+use Laravel\Fortify\TwoFactorAuthenticatable;
 
-class User extends Authenticatable implements MustVerifyEmail
-{
-    use Notifiable, Commenter;
+class User extends Authenticatable implements MustVerifyEmail {
+    use Commenter, Notifiable, TwoFactorAuthenticatable;
 
     /**
      * The attributes that are mass assignable.
@@ -35,7 +35,8 @@ class User extends Authenticatable implements MustVerifyEmail
      * @var array
      */
     protected $fillable = [
-        'name', 'alias', 'rank_id', 'email', 'password', 'is_news_unread', 'is_banned', 'has_alias', 'avatar', 'is_sales_unread', 'birthday'
+        'name', 'alias', 'rank_id', 'email', 'email_verified_at', 'password', 'is_news_unread', 'is_banned', 'has_alias', 'avatar', 'is_sales_unread', 'birthday',
+        'is_deactivated', 'deactivater_id',
     ];
 
     /**
@@ -54,22 +55,16 @@ class User extends Authenticatable implements MustVerifyEmail
      */
     protected $casts = [
         'email_verified_at' => 'datetime',
+        'birthday'          => 'datetime',
     ];
 
-    /**
-     * Dates on the model to convert to Carbon instances.
-     *
-     * @var array
-     */
-    protected $dates = ['birthday'];
-
     /**
      * Accessors to append to the model.
      *
      * @var array
      */
     protected $appends = [
-        'verified_name'
+        'verified_name',
     ];
 
     /**
@@ -83,143 +78,177 @@ class User extends Authenticatable implements MustVerifyEmail
 
         RELATIONS
 
-    **********************************************************************************************/
+     **********************************************************************************************/
+
+    /**
+     * Get all of the user's update logs.
+     */
+    public function logs() {
+        return $this->hasMany('App\Models\User\UserUpdateLog');
+    }
 
     /**
      * Get user settings.
      */
-    public function settings()
-    {
-        return $this->hasOne('App\Models\User\UserSettings');
+    public function settings() {
+        return $this->hasOne(UserSettings::class);
     }
 
     /**
      * Get user-editable profile data.
      */
-    public function profile()
-    {
-        return $this->hasOne('App\Models\User\UserProfile');
+    public function profile() {
+        return $this->hasOne(UserProfile::class);
+    }
+
+    /**
+     * Gets the account that deactivated this account.
+     */
+    public function deactivater() {
+        return $this->belongsTo(self::class, 'deactivater_id');
     }
 
     /**
      * Get the user's aliases.
      */
-    public function aliases()
-    {
-        return $this->hasMany('App\Models\User\UserAlias');
+    public function aliases() {
+        return $this->hasMany(UserAlias::class);
     }
 
     /**
      * Get the user's primary alias.
      */
-    public function primaryAlias()
-    {
-        return $this->hasOne('App\Models\User\UserAlias')->where('is_primary_alias', 1);
+    public function primaryAlias() {
+        return $this->hasOne(UserAlias::class)->where('is_primary_alias', 1);
     }
 
     /**
      * Get the user's notifications.
      */
-    public function notifications()
-    {
-        return $this->hasMany('App\Models\Notification');
+    public function notifications() {
+        return $this->hasMany(Notification::class);
     }
 
     /**
      * Get all the user's characters, regardless of whether they are full characters of myo slots.
      */
-    public function allCharacters()
-    {
-        return $this->hasMany('App\Models\Character\Character')->orderBy('sort', 'DESC');
+    public function allCharacters() {
+        return $this->hasMany(Character::class)->orderBy('sort', 'DESC');
     }
 
     /**
      * Get the user's characters.
      */
-    public function characters()
-    {
-        return $this->hasMany('App\Models\Character\Character')->where('is_myo_slot', 0)->orderBy('sort', 'DESC');
+    public function characters() {
+        return $this->hasMany(Character::class)->where('is_myo_slot', 0)->orderBy('sort', 'DESC');
     }
 
     /**
      * Get the user's MYO slots.
      */
-    public function myoSlots()
-    {
-        return $this->hasMany('App\Models\Character\Character')->where('is_myo_slot', 1)->orderBy('id', 'DESC');
+    public function myoSlots() {
+        return $this->hasMany(Character::class)->where('is_myo_slot', 1)->orderBy('id', 'DESC');
     }
 
     /**
      * Get the user's rank data.
      */
-    public function rank()
-    {
-        return $this->belongsTo('App\Models\Rank\Rank');
+    public function rank() {
+        return $this->belongsTo(Rank::class);
     }
 
     /**
      * Get the user's items.
      */
-    public function items()
-    {
-        return $this->belongsToMany('App\Models\Item\Item', 'user_items')->withPivot('count', 'data', 'updated_at', 'id')->whereNull('user_items.deleted_at');
+    public function items() {
+        return $this->belongsToMany(Item::class, 'user_items')->withPivot('count', 'data', 'updated_at', 'id')->whereNull('user_items.deleted_at');
     }
 
     /**
      * Get all of the user's gallery submissions.
      */
-    public function gallerySubmissions()
-    {
-        return $this->hasMany('App\Models\Gallery\GallerySubmission')->where('user_id', $this->id)->orWhereIn('id', GalleryCollaborator::where('user_id', $this->id)->where('type', 'Collab')->pluck('gallery_submission_id')->toArray())->visible($this)->accepted()->orderBy('created_at', 'DESC');
+    public function gallerySubmissions() {
+        return $this->hasMany(GallerySubmission::class)
+            ->where('user_id', $this->id)
+            ->orWhereIn('id', GalleryCollaborator::where('user_id', $this->id)->where('type', 'Collab')->pluck('gallery_submission_id')->toArray())
+            ->visible($this)->accepted()->orderBy('created_at', 'DESC');
     }
 
     /**
      * Get all of the user's favorited gallery submissions.
      */
-    public function galleryFavorites()
-    {
-        return $this->hasMany('App\Models\Gallery\GalleryFavorite')->where('user_id', $this->id);
+    public function galleryFavorites() {
+        return $this->hasMany(GalleryFavorite::class)->where('user_id', $this->id);
     }
-    
+
     /**
      * Get all of the user's character bookmarks.
      */
-    public function bookmarks() 
-    {
-        return $this->hasMany('App\Models\Character\CharacterBookmark')->where('user_id', $this->id);
+    public function bookmarks() {
+        return $this->hasMany(CharacterBookmark::class)->where('user_id', $this->id);
+    }
+
+    /**
+     * Gets all of a user's liked / disliked comments.
+     */
+    public function commentLikes() {
+        return $this->hasMany(CommentLike::class);
     }
 
     /**********************************************************************************************
 
         SCOPES
 
-    **********************************************************************************************/
+     **********************************************************************************************/
 
     /**
      * Scope a query to only include visible (non-banned) users.
      *
-     * @param  \Illuminate\Database\Eloquent\Builder  $query
+     * @param \Illuminate\Database\Eloquent\Builder $query
+     *
+     * @return \Illuminate\Database\Eloquent\Builder
+     */
+    public function scopeVisible($query) {
+        return $query->where('is_banned', 0)->where('is_deactivated', 0);
+    }
+
+    /**
+     * Scope a query to only show deactivated accounts.
+     *
+     * @param \Illuminate\Database\Eloquent\Builder $query
+     *
      * @return \Illuminate\Database\Eloquent\Builder
      */
-    public function scopeVisible($query)
-    {
-        return $query->where('is_banned', 0);
+    public function scopeDisabled($query) {
+        return $query->where('is_deactivated', 1);
+    }
+
+    /**
+     * Scope a query based on the user's primary alias.
+     *
+     * @param \Illuminate\Database\Eloquent\Builder $query
+     * @param mixed                                 $reverse
+     *
+     * @return \Illuminate\Database\Eloquent\Builder
+     */
+    public function scopeAliasSort($query, $reverse = false) {
+        return $query->leftJoin('user_aliases', 'users.id', '=', 'user_aliases.user_id')
+            ->orderByRaw('user_aliases.alias IS NULL ASC, user_aliases.alias '.($reverse ? 'DESC' : 'ASC'));
     }
 
     /**********************************************************************************************
 
         ACCESSORS
 
-    **********************************************************************************************/
+     **********************************************************************************************/
 
     /**
      * Get the user's alias.
      *
      * @return string
      */
-    public function getVerifiedNameAttribute()
-    {
-        return $this->name . ($this->hasAlias ? '' : ' (Unverified)');
+    public function getVerifiedNameAttribute() {
+        return $this->name.($this->hasAlias ? '' : ' (Unverified)');
     }
 
     /**
@@ -227,8 +256,11 @@ public function getVerifiedNameAttribute()
      *
      * @return bool
      */
-    public function getHasAliasAttribute()
-    {
+    public function getHasAliasAttribute() {
+        if (!config('lorekeeper.settings.require_alias')) {
+            return true;
+        }
+
         return $this->attributes['has_alias'];
     }
 
@@ -237,8 +269,7 @@ public function getHasAliasAttribute()
      *
      * @return bool
      */
-    public function getIsAdminAttribute()
-    {
+    public function getIsAdminAttribute() {
         return $this->rank->isAdmin;
     }
 
@@ -247,18 +278,18 @@ public function getIsAdminAttribute()
      *
      * @return bool
      */
-    public function getIsStaffAttribute()
-    {
-        return (RankPower::where('rank_id', $this->rank_id)->exists() || $this->isAdmin);
+    public function getIsStaffAttribute() {
+        return RankPower::where('rank_id', $this->rank_id)->exists() || $this->isAdmin;
     }
 
     /**
      * Checks if the user has the given power.
      *
+     * @param mixed $power
+     *
      * @return bool
      */
-    public function hasPower($power)
-    {
+    public function hasPower($power) {
         return $this->rank->hasPower($power);
     }
 
@@ -267,8 +298,7 @@ public function hasPower($power)
      *
      * @return array
      */
-    public function getPowers()
-    {
+    public function getPowers() {
         return $this->rank->getPowers();
     }
 
@@ -277,8 +307,7 @@ public function getPowers()
      *
      * @return string
      */
-    public function getUrlAttribute()
-    {
+    public function getUrlAttribute() {
         return url('user/'.$this->name);
     }
 
@@ -287,8 +316,7 @@ public function getUrlAttribute()
      *
      * @return string
      */
-    public function getAdminUrlAttribute()
-    {
+    public function getAdminUrlAttribute() {
         return url('admin/users/'.$this->name.'/edit');
     }
 
@@ -297,19 +325,32 @@ public function getAdminUrlAttribute()
      *
      * @return string
      */
-    public function getDisplayNameAttribute()
-    {
-        return ($this->is_banned ? '<strike>' : '') . '<a href="'.$this->url.'" class="display-user" '.($this->rank->color ? 'style="color: #'.$this->rank->color.';"' : '').'>'.$this->name.'</a>' . ($this->is_banned ? '</strike>' : '');
+    public function getDisplayNameAttribute() {
+        return ($this->is_banned ? '<strike>' : '').'<a href="'.$this->url.'" class="display-user" style="'.($this->rank->color ? 'color: #'.$this->rank->color.';' : '').($this->is_deactivated ? 'opacity: 0.5;' : '').'"><i class="'.($this->rank->icon ? $this->rank->icon : 'fas fa-user').' mr-1" style="opacity: 50%;"></i>'.$this->name.'</a>'.($this->is_banned ? '</strike>' : '');
+    }
+
+    /**
+     * Gets the user's last username change.
+     *
+     * @return string
+     */
+    public function getPreviousUsernameAttribute() {
+        // get highest id
+        $log = $this->logs()->whereIn('type', ['Username Changed', 'Name/Rank Change'])->orderBy('id', 'DESC')->first();
+        if (!$log) {
+            return null;
+        }
+
+        return $log->data['old_name'];
     }
 
-        /**
+    /**
      * Displays the user's name, linked to their profile page.
      *
      * @return string
      */
-    public function getCommentDisplayNameAttribute()
-    {
-        return '<small><a href="'. $this->url .'" class="btn btn-primary btn-sm"'.($this->rank->color ? 'style="background-color: #'.$this->rank->color.'!important;color:#000!important;"' : '').'><i class="'.($this->rank->icon ? $this->rank->icon : 'fas fa-user').' mr-1" style="opacity: 50%;"></i>'. $this->name .'</a></small>';
+    public function getCommentDisplayNameAttribute() {
+        return ($this->is_banned ? '<strike>' : '').'<small><a href="'.$this->url.'" class="btn btn-primary btn-sm"'.($this->rank->color ? 'style="background-color: #'.$this->rank->color.'!important;color:#000!important;' : '').($this->is_deactivated ? 'opacity: 0.5;' : '').'"><i class="'.($this->rank->icon ? $this->rank->icon : 'fas fa-user').' mr-1" style="opacity: 50%;"></i>'.$this->name.'</a></small>'.($this->is_banned ? '</strike>' : '');
     }
 
     /**
@@ -317,20 +358,46 @@ public function getCommentDisplayNameAttribute()
      *
      * @return string
      */
-    public function getDisplayAliasAttribute()
-    {
-        if (!$this->hasAlias) return '(Unverified)';
+    public function getDisplayAliasAttribute() {
+        if (!config('lorekeeper.settings.require_alias') && !$this->attributes['has_alias']) {
+            return '(No Alias)';
+        }
+        if (!$this->hasAlias) {
+            return '(Unverified)';
+        }
+
         return $this->primaryAlias->displayAlias;
     }
 
     /**
-     * Displays the user's avatar
+     * Displays the user's avatar.
      *
      * @return string
      */
-    public function getAvatar()
-    {
-        return ($this->avatar);
+    public function getAvatar() {
+        return $this->avatar;
+    }
+
+    /**
+     * Gets the display URL for a user's avatar, or the default avatar if they don't have one.
+     *
+     * @return url
+     */
+    public function getAvatarUrlAttribute() {
+        if ($this->avatar == 'default.jpg' && config('lorekeeper.extensions.use_gravatar')) {
+            // check if a gravatar exists
+            $hash = md5(strtolower(trim($this->email)));
+            $url = 'https://www.gravatar.com/avatar/'.$hash.'??d=mm&s=200';
+            $headers = @get_headers($url);
+
+            if (!preg_match('|200|', $headers[0])) {
+                return url('images/avatars/default.jpg');
+            } else {
+                return 'https://www.gravatar.com/avatar/'.$hash.'?d=mm&s=200';
+            }
+        }
+
+        return url('images/avatars/'.$this->avatar.'?v='.filemtime(public_path('images/avatars/'.$this->avatar)));
     }
 
     /**
@@ -338,72 +405,79 @@ public function getAvatar()
      *
      * @return string
      */
-    public function getLogTypeAttribute()
-    {
+    public function getLogTypeAttribute() {
         return 'User';
     }
 
     /**
-     * Get's user birthday setting
+     * Get's user birthday setting.
      */
-    public function getBirthdayDisplayAttribute()
-    {
+    public function getBirthdayDisplayAttribute() {
         //
         $icon = null;
         $bday = $this->birthday;
-        if(!isset($bday)) return 'N/A';
+        if (!isset($bday)) {
+            return 'N/A';
+        }
 
-        if($bday->format('d M') == carbon::now()->format('d M')) $icon = '<i class="fas fa-birthday-cake ml-1"></i>';
+        if ($bday->format('d M') == Carbon::now()->format('d M')) {
+            $icon = '<i class="fas fa-birthday-cake ml-1"></i>';
+        }
         //
-        switch($this->settings->birthday_setting) {
+        switch ($this->settings->birthday_setting) {
             case 0:
                 return null;
-            break;
+                break;
             case 1:
-                if(Auth::check()) return $bday->format('d M') . $icon;
-            break;
+                if (Auth::check()) {
+                    return $bday->format('d M').$icon;
+                }
+                break;
             case 2:
-                return $bday->format('d M') . $icon;
-            break;
+                return $bday->format('d M').$icon;
+                break;
             case 3:
-                return $bday->format('d M Y') . $icon;
-            break;
+                return $bday->format('d M Y').$icon;
+                break;
         }
     }
 
     /**
-     * Check if user is of age
+     * Check if user is of age.
      */
-    public function getcheckBirthdayAttribute()
-    {
-        $bday = $this->birthday; 
-        if(!$bday || $bday->diffInYears(carbon::now()) < 13) return false;
-        else return true;
+    public function getcheckBirthdayAttribute() {
+        $bday = $this->birthday;
+        if (!$bday || $bday->diffInYears(carbon::now()) < 13) {
+            return false;
+        } else {
+            return true;
+        }
     }
     /**********************************************************************************************
 
         OTHER FUNCTIONS
 
-    **********************************************************************************************/
+     **********************************************************************************************/
 
     /**
      * Checks if the user can edit the given rank.
      *
+     * @param mixed $rank
+     *
      * @return bool
      */
-    public function canEditRank($rank)
-    {
+    public function canEditRank($rank) {
         return $this->rank->canEditRank($rank);
     }
 
     /**
      * Get the user's held currencies.
      *
-     * @param  bool  $showAll
+     * @param bool $showAll
+     *
      * @return \Illuminate\Support\Collection
      */
-    public function getCurrencies($showAll = false)
-    {
+    public function getCurrencies($showAll = false) {
         // Get a list of currencies that need to be displayed
         // On profile: only ones marked is_displayed
         // In bank: ones marked is_displayed + the ones the user has
@@ -411,15 +485,18 @@ public function getCurrencies($showAll = false)
         $owned = UserCurrency::where('user_id', $this->id)->pluck('quantity', 'currency_id')->toArray();
 
         $currencies = Currency::where('is_user_owned', 1);
-        if($showAll) $currencies->where(function($query) use($owned) {
-            $query->where('is_displayed', 1)->orWhereIn('id', array_keys($owned));
-        });
-        else $currencies = $currencies->where('is_displayed', 1);
+        if ($showAll) {
+            $currencies->where(function ($query) use ($owned) {
+                $query->where('is_displayed', 1)->orWhereIn('id', array_keys($owned));
+            });
+        } else {
+            $currencies = $currencies->where('is_displayed', 1);
+        }
 
         $currencies = $currencies->orderBy('sort_user', 'DESC')->get();
 
-        foreach($currencies as $currency) {
-            $currency->quantity = isset($owned[$currency->id]) ? $owned[$currency->id] : 0;
+        foreach ($currencies as $currency) {
+            $currency->quantity = $owned[$currency->id] ?? 0;
         }
 
         return $currencies;
@@ -428,63 +505,76 @@ public function getCurrencies($showAll = false)
     /**
      * Get the user's held currencies as an array for select inputs.
      *
+     * @param mixed $isTransferrable
+     *
      * @return array
      */
-    public function getCurrencySelect($isTransferrable = false)
-    {
+    public function getCurrencySelect($isTransferrable = false) {
         $query = UserCurrency::query()->where('user_id', $this->id)->leftJoin('currencies', 'user_currencies.currency_id', '=', 'currencies.id')->orderBy('currencies.sort_user', 'DESC');
-        if($isTransferrable) $query->where('currencies.allow_user_to_user', 1);
+        if ($isTransferrable) {
+            $query->where('currencies.allow_user_to_user', 1);
+        }
+
         return $query->get()->pluck('name_with_quantity', 'currency_id')->toArray();
     }
 
     /**
      * Get the user's currency logs.
      *
-     * @param  int  $limit
-     * @return \Illuminate\Support\Collection|\Illuminate\Pagination\LengthAwarePaginator
+     * @param int $limit
+     *
+     * @return \Illuminate\Pagination\LengthAwarePaginator|\Illuminate\Support\Collection
      */
-    public function getCurrencyLogs($limit = 10)
-    {
+    public function getCurrencyLogs($limit = 10) {
         $user = $this;
-        $query = CurrencyLog::with('currency')->where(function($query) use ($user) {
+        $query = CurrencyLog::with('currency')->where(function ($query) use ($user) {
             $query->with('sender')->where('sender_type', 'User')->where('sender_id', $user->id)->whereNotIn('log_type', ['Staff Grant', 'Prompt Rewards', 'Claim Rewards', 'Gallery Submission Reward']);
-        })->orWhere(function($query) use ($user) {
+        })->orWhere(function ($query) use ($user) {
             $query->with('recipient')->where('recipient_type', 'User')->where('recipient_id', $user->id)->where('log_type', '!=', 'Staff Removal');
         })->orderBy('id', 'DESC');
-        if($limit) return $query->take($limit)->get();
-        else return $query->paginate(30);
+        if ($limit) {
+            return $query->take($limit)->get();
+        } else {
+            return $query->paginate(30);
+        }
     }
 
     /**
      * Get the user's item logs.
      *
-     * @param  int  $limit
-     * @return \Illuminate\Support\Collection|\Illuminate\Pagination\LengthAwarePaginator
+     * @param int $limit
+     *
+     * @return \Illuminate\Pagination\LengthAwarePaginator|\Illuminate\Support\Collection
      */
-    public function getItemLogs($limit = 10)
-    {
+    public function getItemLogs($limit = 10) {
         $user = $this;
-        $query = ItemLog::with('item')->where(function($query) use ($user) {
+        $query = ItemLog::with('item')->where(function ($query) use ($user) {
             $query->with('sender')->where('sender_type', 'User')->where('sender_id', $user->id)->whereNotIn('log_type', ['Staff Grant', 'Prompt Rewards', 'Claim Rewards']);
-        })->orWhere(function($query) use ($user) {
+        })->orWhere(function ($query) use ($user) {
             $query->with('recipient')->where('recipient_type', 'User')->where('recipient_id', $user->id)->where('log_type', '!=', 'Staff Removal');
         })->orderBy('id', 'DESC');
-        if($limit) return $query->take($limit)->get();
-        else return $query->paginate(30);
+        if ($limit) {
+            return $query->take($limit)->get();
+        } else {
+            return $query->paginate(30);
+        }
     }
 
     /**
      * Get the user's shop purchase logs.
      *
-     * @param  int  $limit
-     * @return \Illuminate\Support\Collection|\Illuminate\Pagination\LengthAwarePaginator
+     * @param int $limit
+     *
+     * @return \Illuminate\Pagination\LengthAwarePaginator|\Illuminate\Support\Collection
      */
-    public function getShopLogs($limit = 10)
-    {
+    public function getShopLogs($limit = 10) {
         $user = $this;
         $query = ShopLog::where('user_id', $this->id)->with('character')->with('shop')->with('item')->with('currency')->orderBy('id', 'DESC');
-        if($limit) return $query->take($limit)->get();
-        else return $query->paginate(30);
+        if ($limit) {
+            return $query->take($limit)->get();
+        } else {
+            return $query->paginate(30);
+        }
     }
 
     /**
@@ -492,36 +582,45 @@ public function getShopLogs($limit = 10)
      *
      * @return \Illuminate\Pagination\LengthAwarePaginator
      */
-    public function getOwnershipLogs()
-    {
+    public function getOwnershipLogs() {
         $user = $this;
-        $query = UserCharacterLog::with('sender.rank')->with('recipient.rank')->with('character')->where(function($query) use ($user) {
+        $query = UserCharacterLog::with('sender.rank')->with('recipient.rank')->with('character')->where(function ($query) use ($user) {
             $query->where('sender_id', $user->id)->whereNotIn('log_type', ['Character Created', 'MYO Slot Created', 'Character Design Updated', 'MYO Design Approved']);
-        })->orWhere(function($query) use ($user) {
+        })->orWhere(function ($query) use ($user) {
             $query->where('recipient_id', $user->id);
         })->orderBy('id', 'DESC');
+
         return $query->paginate(30);
     }
 
     /**
      * Checks if there are characters credited to the user's alias and updates ownership to their account accordingly.
      */
-    public function updateCharacters()
-    {
-        if(!$this->hasAlias) return;
+    public function updateCharacters() {
+        if (!$this->attributes['has_alias']) {
+            return;
+        }
 
         // Pluck alias from url and check for matches
-        $urlCharacters = Character::whereNotNull('owner_url')->pluck('owner_url','id');
-        $matches = []; $count = 0;
-        foreach($this->aliases as $alias) {
+        $urlCharacters = Character::whereNotNull('owner_url')->pluck('owner_url', 'id');
+        $matches = [];
+        $count = 0;
+        foreach ($this->aliases as $alias) {
             // Find all urls from the same site as this alias
-            foreach($urlCharacters as $key=>$character) preg_match_all(Config::get('lorekeeper.sites.'.$alias->site.'.regex'), $character, $matches[$key]);
+            foreach ($urlCharacters as $key=> $character) {
+                preg_match_all(config('lorekeeper.sites.'.$alias->site.'.regex'), $character, $matches[$key]);
+            }
             // Find all alias matches within those, and update the character's owner
-            foreach($matches as $key=>$match) if($match[1] != [] && strtolower($match[1][0]) == strtolower($alias->alias)) {Character::find($key)->update(['owner_url' => null, 'user_id' => $this->id]); $count += 1;}
+            foreach ($matches as $key=> $match) {
+                if ($match[1] != [] && strtolower($match[1][0]) == strtolower($alias->alias)) {
+                    Character::find($key)->update(['owner_url' => null, 'user_id' => $this->id]);
+                    $count += 1;
+                }
+            }
         }
 
         //
-        if($count > 0) {
+        if ($count > 0) {
             $this->settings->is_fto = 0;
         }
         $this->settings->save();
@@ -530,28 +629,36 @@ public function updateCharacters()
     /**
      * Checks if there are art or design credits credited to the user's alias and credits them to their account accordingly.
      */
-    public function updateArtDesignCredits()
-    {
-        if(!$this->hasAlias) return;
+    public function updateArtDesignCredits() {
+        if (!$this->attributes['has_alias']) {
+            return;
+        }
 
         // Pluck alias from url and check for matches
-        $urlCreators = CharacterImageCreator::whereNotNull('url')->pluck('url','id');
+        $urlCreators = CharacterImageCreator::whereNotNull('url')->pluck('url', 'id');
         $matches = [];
-        foreach($this->aliases as $alias) {
+        foreach ($this->aliases as $alias) {
             // Find all urls from the same site as this alias
-            foreach($urlCreators as $key=>$creator) preg_match_all(Config::get('lorekeeper.sites.'.$alias->site.'.regex'), $creator, $matches[$key]);
+            foreach ($urlCreators as $key=> $creator) {
+                preg_match_all(config('lorekeeper.sites.'.$alias->site.'.regex'), $creator, $matches[$key]);
+            }
             // Find all alias matches within those, and update the relevant CharacterImageCreator
-            foreach($matches as $key=>$match) if($match[1] != [] && strtolower($match[1][0]) == strtolower($alias->alias)) CharacterImageCreator::find($key)->update(['url' => null, 'user_id' => $this->id]);
+            foreach ($matches as $key=> $match) {
+                if ($match[1] != [] && strtolower($match[1][0]) == strtolower($alias->alias)) {
+                    CharacterImageCreator::find($key)->update(['url' => null, 'user_id' => $this->id]);
+                }
+            }
         }
     }
 
     /**
      * Get the user's submissions.
      *
+     * @param mixed|null $user
+     *
      * @return \Illuminate\Pagination\LengthAwarePaginator
      */
-    public function getSubmissions($user = null)
-    {
+    public function getSubmissions($user = null) {
         return Submission::with('user')->with('prompt')->viewable($user ? $user : null)->where('user_id', $this->id)->orderBy('id', 'DESC')->paginate(30);
     }
 
@@ -559,10 +666,11 @@ public function getSubmissions($user = null)
      * Checks if the user has bookmarked a character.
      * Returns the bookmark if one exists.
      *
+     * @param mixed $character
+     *
      * @return \App\Models\Character\CharacterBookmark
      */
-    public function hasBookmarked($character)
-    {
+    public function hasBookmarked($character) {
         return CharacterBookmark::where('user_id', $this->id)->where('character_id', $character->id)->first();
     }
 }
diff --git a/app/Models/User/UserAlias.php b/app/Models/User/UserAlias.php
index e4e0677c6a..ec410fac46 100644
--- a/app/Models/User/UserAlias.php
+++ b/app/Models/User/UserAlias.php
@@ -2,19 +2,16 @@
 
 namespace App\Models\User;
 
-use Config;
 use App\Models\Model;
 
-class UserAlias extends Model
-{
-
+class UserAlias extends Model {
     /**
      * The attributes that are mass assignable.
      *
      * @var array
      */
     protected $fillable = [
-        'user_id', 'site', 'alias', 'is_visible', 'is_primary_alias'
+        'user_id', 'site', 'alias', 'is_visible', 'is_primary_alias', 'user_snowflake',
     ];
 
     /**
@@ -28,30 +25,29 @@ class UserAlias extends Model
 
         RELATIONS
 
-    **********************************************************************************************/
+     **********************************************************************************************/
 
     /**
      * Get the user this set of settings belongs to.
      */
-    public function user()
-    {
-        return $this->belongsTo('App\Models\User\User', 'user_id');
+    public function user() {
+        return $this->belongsTo(User::class, 'user_id');
     }
 
     /**********************************************************************************************
 
         SCOPES
 
-    **********************************************************************************************/
+     **********************************************************************************************/
 
     /**
      * Scope a query to only include visible aliases.
      *
-     * @param  \Illuminate\Database\Eloquent\Builder  $query
+     * @param \Illuminate\Database\Eloquent\Builder $query
+     *
      * @return \Illuminate\Database\Eloquent\Builder
      */
-    public function scopeVisible($query)
-    {
+    public function scopeVisible($query) {
         return $query->where('is_visible', 1);
     }
 
@@ -59,17 +55,21 @@ public function scopeVisible($query)
 
         ACCESSORS
 
-    **********************************************************************************************/
+     **********************************************************************************************/
 
     /**
      * Gets the URL for the user's account on a given site.
      *
      * @return string
      */
-    public function getUrlAttribute()
-    {
-        if($this->site == 'tumblr') return 'https://'.$this->alias.Config::get('lorekeeper.sites.tumblr.link');
-        else return 'https://'.Config::get('lorekeeper.sites.'.$this->site.'.link').'/'.$this->alias;
+    public function getUrlAttribute() {
+        if ($this->site == 'tumblr') {
+            return 'https://'.$this->alias.'.'.config('lorekeeper.sites.tumblr.link');
+        } elseif ($this->site == 'discord') {
+            return null;
+        } else {
+            return 'https://'.config('lorekeeper.sites.'.$this->site.'.link').'/'.$this->alias;
+        }
     }
 
     /**
@@ -77,9 +77,12 @@ public function getUrlAttribute()
      *
      * @return string
      */
-    public function getDisplayAliasAttribute()
-    {
-        return '<a href="'.$this->url.'">'.$this->alias.'@'.$this->siteDisplayName.'</a>';
+    public function getDisplayAliasAttribute() {
+        if ($this->site == 'discord') {
+            return '<span>'.$this->alias.'@'.$this->siteDisplayName.'</span>';
+        } else {
+            return '<a href="'.$this->url.'">'.$this->alias.'@'.$this->siteDisplayName.'</a>';
+        }
     }
 
     /**
@@ -87,9 +90,8 @@ public function getDisplayAliasAttribute()
      *
      * @return string
      */
-    public function getConfigAttribute()
-    {
-        return Config::get('lorekeeper.sites.' . $this->site);
+    public function getConfigAttribute() {
+        return config('lorekeeper.sites.'.$this->site);
     }
 
     /**
@@ -97,9 +99,8 @@ public function getConfigAttribute()
      *
      * @return string
      */
-    public function getSiteDisplayNameAttribute()
-    {
-        return Config::get('lorekeeper.sites.' . $this->site . '.display_name');
+    public function getSiteDisplayNameAttribute() {
+        return config('lorekeeper.sites.'.$this->site.'.display_name');
     }
 
     /**
@@ -107,8 +108,7 @@ public function getSiteDisplayNameAttribute()
      *
      * @return string
      */
-    public function getCanMakePrimaryAttribute()
-    {
-        return Config::get('lorekeeper.sites.' . $this->site . '.primary_alias');
+    public function getCanMakePrimaryAttribute() {
+        return config('lorekeeper.sites.'.$this->site.'.primary_alias');
     }
 }
diff --git a/app/Models/User/UserCharacterLog.php b/app/Models/User/UserCharacterLog.php
index ca8de48768..66d3b2bd13 100644
--- a/app/Models/User/UserCharacterLog.php
+++ b/app/Models/User/UserCharacterLog.php
@@ -2,11 +2,10 @@
 
 namespace App\Models\User;
 
-use Config;
+use App\Models\Character\Character;
 use App\Models\Model;
 
-class UserCharacterLog extends Model
-{
+class UserCharacterLog extends Model {
     /**
      * The attributes that are mass assignable.
      *
@@ -14,7 +13,7 @@ class UserCharacterLog extends Model
      */
     protected $fillable = [
         'character_id', 'sender_id', 'sender_alias', 'recipient_id', 'recipient_alias',
-        'log', 'log_type', 'data', 'sender_url', 'recipient_url'
+        'log', 'log_type', 'data', 'sender_url', 'recipient_url',
     ];
 
     /**
@@ -23,7 +22,6 @@ class UserCharacterLog extends Model
      * @var string
      */
     protected $table = 'user_character_log';
-
     /**
      * Whether the model contains timestamps to be saved and updated.
      *
@@ -32,37 +30,34 @@ class UserCharacterLog extends Model
     public $timestamps = true;
 
     /**********************************************************************************************
-    
+
         RELATIONS
 
     **********************************************************************************************/
-    
+
     /**
      * Get the user who initiated the logged action.
      */
-    public function sender() 
-    {
-        return $this->belongsTo('App\Models\User\User', 'sender_id');
+    public function sender() {
+        return $this->belongsTo(User::class, 'sender_id');
     }
 
     /**
      * Get the user who received the logged action.
      */
-    public function recipient() 
-    {
-        return $this->belongsTo('App\Models\User\User', 'recipient_id');
+    public function recipient() {
+        return $this->belongsTo(User::class, 'recipient_id');
     }
 
     /**
      * Get the character that is the target of the action.
      */
-    public function character() 
-    {
-        return $this->belongsTo('App\Models\Character\Character');
+    public function character() {
+        return $this->belongsTo(Character::class);
     }
 
     /**********************************************************************************************
-    
+
         ACCESSORS
 
     **********************************************************************************************/
@@ -72,19 +67,16 @@ public function character()
      *
      * @return string
      */
-    public function getDisplaySenderAliasAttribute()
-    {
+    public function getDisplaySenderAliasAttribute() {
         return prettyProfileLink($this->sender_url);
     }
-    
+
     /**
      * Displays the recipient's alias, linked to their profile.
      *
      * @return string
      */
-    public function getDisplayRecipientAliasAttribute()
-    {
+    public function getDisplayRecipientAliasAttribute() {
         return prettyProfileLink($this->recipient_url);
     }
-
 }
diff --git a/app/Models/User/UserCurrency.php b/app/Models/User/UserCurrency.php
index 43cccb5b9c..395b1b8ef5 100644
--- a/app/Models/User/UserCurrency.php
+++ b/app/Models/User/UserCurrency.php
@@ -2,27 +2,26 @@
 
 namespace App\Models\User;
 
+use App\Models\Currency\Currency;
 use App\Models\Model;
 
-class UserCurrency extends Model
-{
-
+class UserCurrency extends Model {
     /**
      * The attributes that are mass assignable.
      *
      * @var array
      */
     protected $fillable = [
-        'quantity', 'user_id', 'currency_id'
+        'quantity', 'user_id', 'currency_id',
     ];
-    
+
     /**
      * Accessors to append to the model.
      *
      * @var array
      */
     protected $appends = [
-        'name_with_quantity'
+        'name_with_quantity',
     ];
 
     /**
@@ -33,7 +32,7 @@ class UserCurrency extends Model
     protected $table = 'user_currencies';
 
     /**********************************************************************************************
-    
+
         RELATIONS
 
     **********************************************************************************************/
@@ -41,21 +40,19 @@ class UserCurrency extends Model
     /**
      * Get the user who owns the currency.
      */
-    public function user() 
-    {
-        return $this->belongsTo('App\Models\User\User');
+    public function user() {
+        return $this->belongsTo(User::class);
     }
 
     /**
      * Get the currency associated with this record.
      */
-    public function currency() 
-    {
-        return $this->belongsTo('App\Models\Currency\Currency');
+    public function currency() {
+        return $this->belongsTo(Currency::class);
     }
 
     /**********************************************************************************************
-    
+
         ACCESSORS
 
     **********************************************************************************************/
@@ -65,8 +62,7 @@ public function currency()
      *
      * @return string
      */
-    public function getNameWithQuantityAttribute()
-    {
-        return $this->currency->name . ' [Owned: ' . $this->quantity . ']';
+    public function getNameWithQuantityAttribute() {
+        return $this->currency->name.' [Owned: '.$this->quantity.']';
     }
 }
diff --git a/app/Models/User/UserItem.php b/app/Models/User/UserItem.php
index 9d6f957547..41bef1ba7c 100644
--- a/app/Models/User/UserItem.php
+++ b/app/Models/User/UserItem.php
@@ -2,11 +2,11 @@
 
 namespace App\Models\User;
 
+use App\Models\Item\Item;
 use App\Models\Model;
 use Illuminate\Database\Eloquent\SoftDeletes;
 
-class UserItem extends Model
-{
+class UserItem extends Model {
     use SoftDeletes;
 
     /**
@@ -15,25 +15,25 @@ class UserItem extends Model
      * @var array
      */
     protected $fillable = [
-        'data', 'item_id', 'user_id'
+        'data', 'item_id', 'user_id',
     ];
 
     /**
-     * Whether the model contains timestamps to be saved and updated.
+     * The table associated with the model.
      *
      * @var string
      */
-    public $timestamps = true;
+    protected $table = 'user_items';
 
     /**
-     * The table associated with the model.
+     * Whether the model contains timestamps to be saved and updated.
      *
      * @var string
      */
-    protected $table = 'user_items';
+    public $timestamps = true;
 
     /**********************************************************************************************
-    
+
         RELATIONS
 
     **********************************************************************************************/
@@ -41,21 +41,19 @@ class UserItem extends Model
     /**
      * Get the user who owns the stack.
      */
-    public function user() 
-    {
-        return $this->belongsTo('App\Models\User\User');
+    public function user() {
+        return $this->belongsTo(User::class);
     }
 
     /**
      * Get the item associated with this item stack.
      */
-    public function item() 
-    {
-        return $this->belongsTo('App\Models\Item\Item');
+    public function item() {
+        return $this->belongsTo(Item::class);
     }
 
     /**********************************************************************************************
-    
+
         ACCESSORS
 
     **********************************************************************************************/
@@ -65,19 +63,20 @@ public function item()
      *
      * @return array
      */
-    public function getDataAttribute() 
-    {
+    public function getDataAttribute() {
         return json_decode($this->attributes['data'], true);
     }
-    
+
     /**
      * Checks if the stack is transferrable.
      *
      * @return array
      */
-    public function getIsTransferrableAttribute()
-    {
-        if(!isset($this->data['disallow_transfer']) && $this->item->allow_transfer) return true;
+    public function getIsTransferrableAttribute() {
+        if (!isset($this->data['disallow_transfer']) && $this->item->allow_transfer) {
+            return true;
+        }
+
         return false;
     }
 
@@ -86,9 +85,8 @@ public function getIsTransferrableAttribute()
      *
      * @return int
      */
-    public function getAvailableQuantityAttribute()
-    {
-        return ($this->count - $this->trade_count - $this->update_count- $this->submission_count);
+    public function getAvailableQuantityAttribute() {
+        return $this->count - $this->trade_count - $this->update_count - $this->submission_count;
     }
 
     /**
@@ -96,43 +94,58 @@ public function getAvailableQuantityAttribute()
      *
      * @return string
      */
-    public function getAssetTypeAttribute()
-    {
+    public function getAssetTypeAttribute() {
         return 'user_items';
     }
 
     /**
-     * Returns string stating amount held elsewhere
+     * Returns string stating amount held elsewhere.
+     *
+     * @param mixed $tradeCount
+     * @param mixed $updateCount
+     * @param mixed $submissionCount
      *
      * @return string
      */
-    public function getOthers($tradeCount = 0, $updateCount = 0, $submissionCount = 0)
-    {
+    public function getOthers($tradeCount = 0, $updateCount = 0, $submissionCount = 0) {
         return $this->getHeldString($this->trade_count - $tradeCount, $this->update_count - $updateCount, $this->submission_count - $submissionCount);
     }
 
     /**
-     * Gets the available quantity based on input context (either trade count or update count)
+     * Gets the available quantity based on input context (either trade count or update count).
+     *
+     * @param mixed $count
      *
      * @return int
      */
-    public function getAvailableContextQuantity($count)
-    {
-        return ($this->getAvailableQuantityAttribute() + $count);
+    public function getAvailableContextQuantity($count) {
+        return $this->getAvailableQuantityAttribute() + $count;
     }
 
     /**
-     * Construct string stating held items
-     * 
+     * Construct string stating held items.
+     *
+     * @param mixed $tradeCount
+     * @param mixed $updateCount
+     * @param mixed $submissionCount
+     *
      * @return string
      */
-    private function getHeldString($tradeCount, $updateCount, $submissionCount)
-    {
-        if(!$tradeCount && !$updateCount && !$submissionCount) return null;
+    private function getHeldString($tradeCount, $updateCount, $submissionCount) {
+        if (!$tradeCount && !$updateCount && !$submissionCount) {
+            return null;
+        }
         $held = [];
-        if($tradeCount) array_push($held, $tradeCount.' held in Trades');
-        if($updateCount) array_push($held, $updateCount.' held in Design Updates');
-        if($submissionCount) array_push($held, $submissionCount.' held in Submissions');
-        return ('('.implode(', ',$held).')');
+        if ($tradeCount) {
+            array_push($held, $tradeCount.' held in Trades');
+        }
+        if ($updateCount) {
+            array_push($held, $updateCount.' held in Design Updates');
+        }
+        if ($submissionCount) {
+            array_push($held, $submissionCount.' held in Submissions');
+        }
+
+        return '('.implode(', ', $held).')';
     }
 }
diff --git a/app/Models/User/UserProfile.php b/app/Models/User/UserProfile.php
index 7ab4e34719..d70809e04e 100644
--- a/app/Models/User/UserProfile.php
+++ b/app/Models/User/UserProfile.php
@@ -5,9 +5,7 @@
 use App\Models\Model;
 use App\Traits\Commentable;
 
-class UserProfile extends Model
-{
-
+class UserProfile extends Model {
     use Commentable;
 
     /**
@@ -16,34 +14,33 @@ class UserProfile extends Model
      * @var array
      */
     protected $fillable = [
-        'text', 'parsed_text'
+        'text', 'parsed_text',
     ];
 
     /**
-     * The primary key of the model.
+     * The table associated with the model.
      *
      * @var string
      */
-    public $primaryKey = 'user_id';
+    protected $table = 'user_profiles';
 
     /**
-     * The table associated with the model.
+     * The primary key of the model.
      *
      * @var string
      */
-    protected $table = 'user_profiles';
+    public $primaryKey = 'user_id';
 
     /**********************************************************************************************
-    
+
         RELATIONS
 
     **********************************************************************************************/
-    
+
     /**
      * Get the user this profile belongs to.
      */
-    public function user() 
-    {
-        return $this->belongsTo('App\Models\User\User');
+    public function user() {
+        return $this->belongsTo(User::class);
     }
 }
diff --git a/app/Models/User/UserSettings.php b/app/Models/User/UserSettings.php
index 5c29a7cabe..3d8edd1804 100644
--- a/app/Models/User/UserSettings.php
+++ b/app/Models/User/UserSettings.php
@@ -4,50 +4,51 @@
 
 use App\Models\Model;
 
-class UserSettings extends Model
-{
-
+class UserSettings extends Model {
     /**
      * The attributes that are mass assignable.
      *
      * @var array
      */
     protected $fillable = [
-        'is_fto', 'submission_count', 'banned_at', 'ban_reason', 'birthday_setting'
+        'is_fto', 'submission_count', 'banned_at', 'ban_reason', 'birthday_setting',
+        'deactivate_reason', 'deactivated_at',
     ];
 
     /**
-     * The primary key of the model.
+     * The table associated with the model.
      *
      * @var string
      */
-    public $primaryKey = 'user_id';
+    protected $table = 'user_settings';
 
     /**
-     * The table associated with the model.
+     * The attributes that should be cast to native types.
      *
-     * @var string
+     * @var array
      */
-    protected $table = 'user_settings';
+    protected $casts = [
+        'banned_at'      => 'datetime',
+        'deactivated_at' => 'datetime',
+    ];
 
     /**
-     * Dates on the model to convert to Carbon instances.
+     * The primary key of the model.
      *
-     * @var array
+     * @var string
      */
-    protected $dates = ['banned_at'];
+    public $primaryKey = 'user_id';
 
     /**********************************************************************************************
-    
+
         RELATIONS
 
     **********************************************************************************************/
-    
+
     /**
      * Get the user this set of settings belongs to.
      */
-    public function user() 
-    {
-        return $this->belongsTo('App\Models\User\User');
+    public function user() {
+        return $this->belongsTo(User::class);
     }
 }
diff --git a/app/Models/User/UserUpdateLog.php b/app/Models/User/UserUpdateLog.php
index a750d302ad..79cac5e28a 100644
--- a/app/Models/User/UserUpdateLog.php
+++ b/app/Models/User/UserUpdateLog.php
@@ -4,63 +4,58 @@
 
 use App\Models\Model;
 
-class UserUpdateLog extends Model
-{
-
+class UserUpdateLog extends Model {
     /**
      * The attributes that are mass assignable.
      *
      * @var array
      */
     protected $fillable = [
-        'staff_id', 'user_id', 'data', 'type'
+        'staff_id', 'user_id', 'data', 'type',
     ];
 
     /**
-     * The primary key of the model.
+     * The table associated with the model.
      *
      * @var string
      */
-    public $primaryKey = 'user_id';
-
+    protected $table = 'user_update_log';
     /**
-     * Whether the model contains timestamps to be saved and updated.
+     * The primary key of the model.
      *
      * @var string
      */
-    public $timestamps = true;
+    public $primaryKey = 'user_id';
 
     /**
-     * The table associated with the model.
+     * Whether the model contains timestamps to be saved and updated.
      *
      * @var string
      */
-    protected $table = 'user_update_log';
+    public $timestamps = true;
 
     /**********************************************************************************************
-    
+
         RELATIONS
 
     **********************************************************************************************/
-    
+
     /**
      * Get the staff who updated the user.
      */
-    public function staff() 
-    {
-        return $this->belongsTo('App\Models\User\User', 'staff_id');
+    public function staff() {
+        return $this->belongsTo(User::class, 'staff_id');
     }
-    
+
     /**
      * Get the user that was updated.
      */
-    public function user() 
-    {
-        return $this->belongsTo('App\Models\User\User', 'user_id');
+    public function user() {
+        return $this->belongsTo(User::class, 'user_id');
     }
 
     /**********************************************************************************************
-    
+
         ACCESSORS
 
     **********************************************************************************************/
@@ -70,8 +65,7 @@ public function user()
      *
      * @return array
      */
-    public function getDataAttribute()
-    {
+    public function getDataAttribute() {
         return json_decode($this->attributes['data'], true);
     }
 }
diff --git a/app/Policies/CommentPolicy.php b/app/Policies/CommentPolicy.php
index 5b554228ed..9d8e361ec0 100644
--- a/app/Policies/CommentPolicy.php
+++ b/app/Policies/CommentPolicy.php
@@ -2,61 +2,47 @@
 
 namespace App\Policies;
 
-use Auth;
-use App\Models\Comment;
+use App\Models\Comment\Comment;
+use Illuminate\Support\Facades\Auth;
 
-class CommentPolicy
-{
+class CommentPolicy {
     /**
-     * Can user create the comment
+     * Can user create the comment.
      *
-     * @param $user
-     * @return bool
+     * @param mixed $user
      */
-    public function create($user) : bool
-    {
+    public function create($user): bool {
         return true;
     }
 
     /**
-     * Can user delete the comment
+     * Can user delete the comment.
      *
-     * @param $user
-     * @param Comment $comment
-     * @return bool
+     * @param mixed $user
      */
-    public function delete($user, Comment $comment) : bool
-    {
-            if(Auth::user()->isStaff) {
-                return true;
-            }
-            else {
-                return false;
-            }
+    public function delete($user, Comment $comment): bool {
+        if (Auth::user()->isStaff) {
+            return true;
+        } else {
+            return false;
+        }
     }
 
     /**
-     * Can user update the comment
+     * Can user update the comment.
      *
-     * @param $user
-     * @param Comment $comment
-     * @return bool
+     * @param mixed $user
      */
-    public function update($user, Comment $comment) : bool
-    {
+    public function update($user, Comment $comment): bool {
         return $user->getKey() == $comment->commenter_id;
     }
 
     /**
-     * Can user reply to the comment
+     * Can user reply to the comment.
      *
-     * @param $user
-     * @param Comment $comment
-     * @return bool
+     * @param mixed $user
      */
-    public function reply($user, Comment $comment) : bool
-    {
+    public function reply($user, Comment $comment): bool {
         return $user->getKey();
     }
 }
-
diff --git a/app/Providers/AppServiceProvider.php b/app/Providers/AppServiceProvider.php
index 9524a3c3d0..e4606065fd 100644
--- a/app/Providers/AppServiceProvider.php
+++ b/app/Providers/AppServiceProvider.php
@@ -9,24 +9,22 @@
 use Illuminate\Support\Facades\Schema;
 use Illuminate\Support\ServiceProvider;
 
-class AppServiceProvider extends ServiceProvider
-{
+class AppServiceProvider extends ServiceProvider {
     /**
      * Register any application services.
      */
-    public function register()
-    {
+    public function register() {
         //
     }
 
     /**
      * Bootstrap any application services.
      */
-    public function boot()
-    {
+    public function boot() {
         //
         Schema::defaultStringLength(191);
-        Paginator::useBootstrap();
+        Paginator::defaultView('layouts._pagination');
+        Paginator::defaultSimpleView('layouts._simple-pagination');
 
         /*
          * Paginate a standard Laravel Collection.
@@ -58,8 +56,7 @@ public function boot()
     /**
      * Boot Toyhouse Socialite provider.
      */
-    private function bootToyhouseSocialite()
-    {
+    private function bootToyhouseSocialite() {
         $socialite = $this->app->make('Laravel\Socialite\Contracts\Factory');
         $socialite->extend(
             'toyhouse',
diff --git a/app/Providers/AuthServiceProvider.php b/app/Providers/AuthServiceProvider.php
index 9784b1a300..d11bb4740c 100644
--- a/app/Providers/AuthServiceProvider.php
+++ b/app/Providers/AuthServiceProvider.php
@@ -2,27 +2,22 @@
 
 namespace App\Providers;
 
-use Illuminate\Support\Facades\Gate;
 use Illuminate\Foundation\Support\Providers\AuthServiceProvider as ServiceProvider;
 
-class AuthServiceProvider extends ServiceProvider
-{
+class AuthServiceProvider extends ServiceProvider {
     /**
      * The policy mappings for the application.
      *
      * @var array
      */
     protected $policies = [
-        'App\Model' => 'App\Policies\ModelPolicy',
+        // 'App\Model' => 'App\Policies\ModelPolicy',
     ];
 
     /**
      * Register any authentication / authorization services.
-     *
-     * @return void
      */
-    public function boot()
-    {
+    public function boot() {
         $this->registerPolicies();
 
         //
diff --git a/app/Providers/BroadcastServiceProvider.php b/app/Providers/BroadcastServiceProvider.php
index 352cce44a3..13b63a4e52 100644
--- a/app/Providers/BroadcastServiceProvider.php
+++ b/app/Providers/BroadcastServiceProvider.php
@@ -2,18 +2,14 @@
 
 namespace App\Providers;
 
-use Illuminate\Support\ServiceProvider;
 use Illuminate\Support\Facades\Broadcast;
+use Illuminate\Support\ServiceProvider;
 
-class BroadcastServiceProvider extends ServiceProvider
-{
+class BroadcastServiceProvider extends ServiceProvider {
     /**
      * Bootstrap any application services.
-     *
-     * @return void
      */
-    public function boot()
-    {
+    public function boot() {
         Broadcast::routes();
 
         require base_path('routes/channels.php');
diff --git a/app/Providers/CommentProvider.php b/app/Providers/CommentProvider.php
index 972d769ff4..19eb5581c5 100644
--- a/app/Providers/CommentProvider.php
+++ b/app/Providers/CommentProvider.php
@@ -2,50 +2,43 @@
 
 namespace App\Providers;
 
-use Illuminate\Support\ServiceProvider;
-use Illuminate\Support\Facades\App;
-use Illuminate\Support\Facades\Route;
 use Illuminate\Support\Facades\Blade;
 use Illuminate\Support\Facades\Config;
 use Illuminate\Support\Facades\Gate;
+use Illuminate\Support\Facades\Route;
+use Illuminate\Support\ServiceProvider;
 
-class CommentProvider extends ServiceProvider
-{
-
-    /**
-     * If for some reason you want to override the component.
-     */
-    protected function includeBladeComponent()
-    {
-        Blade::include('comments::comments', 'comments');
-    }
-
-    /**
-     * Define permission defined in the config.
-     */
-    protected function definePermissions()
-    {
-        foreach(Config::get('lorekeeper.comments.permissions', []) as $permission => $policy) {
-            Gate::define($permission, $policy);
-        }
-    }
-
-    public function boot()
-    {
+class CommentProvider extends ServiceProvider {
+    public function boot() {
         $this->loadViewsFrom(base_path('resources/views/comments'), 'comments');
 
         $this->includeBladeComponent();
 
         $this->definePermissions();
 
-        Route::model('comment', 'App\Models\Comment');
+        Route::model('comment', 'App\Models\Comment\Comment');
     }
 
-    public function register()
-    {
+    public function register() {
         $this->mergeConfigFrom(
             base_path('config/lorekeeper/comments.php'),
             'comments'
         ); // Swapped to / instead of \ because for some reason Dreamhost was Not Happy if it was \
     }
+
+    /**
+     * If for some reason you want to override the component.
+     */
+    protected function includeBladeComponent() {
+        Blade::include('comments::comments', 'comments');
+    }
+
+    /**
+     * Define permission defined in the config.
+     */
+    protected function definePermissions() {
+        foreach (config('lorekeeper.comments.permissions', []) as $permission => $policy) {
+            Gate::define($permission, $policy);
+        }
+    }
 }
diff --git a/app/Providers/EventServiceProvider.php b/app/Providers/EventServiceProvider.php
index 245624ea06..b1b7aece31 100644
--- a/app/Providers/EventServiceProvider.php
+++ b/app/Providers/EventServiceProvider.php
@@ -2,40 +2,36 @@
 
 namespace App\Providers;
 
-use Illuminate\Support\Facades\Event;
 use Illuminate\Auth\Events\Registered;
 use Illuminate\Auth\Listeners\SendEmailVerificationNotification;
 use Illuminate\Foundation\Support\Providers\EventServiceProvider as ServiceProvider;
+use Illuminate\Support\Facades\Event;
 
-class EventServiceProvider extends ServiceProvider
-{
+class EventServiceProvider extends ServiceProvider {
     /**
      * The event listener mappings for the application.
      *
      * @var array
      */
     protected $listen = [
-        Registered::class => [
+        Registered::class                                     => [
             SendEmailVerificationNotification::class,
         ],
-        
+
         \SocialiteProviders\Manager\SocialiteWasCalled::class => [
             'SocialiteProviders\\Deviantart\\DeviantartExtendSocialite@handle',
-            'SocialiteProviders\\Twitter\\TwitterExtendSocialite@handle',
             'SocialiteProviders\\Instagram\\InstagramExtendSocialite@handle',
             'SocialiteProviders\\Tumblr\\TumblrExtendSocialite@handle',
             'SocialiteProviders\\Imgur\\ImgurExtendSocialite@handle',
             'SocialiteProviders\\Twitch\\TwitchExtendSocialite@handle',
-        ]
+            'SocialiteProviders\\Discord\\DiscordExtendSocialite@handle',
+        ],
     ];
 
     /**
      * Register any events for your application.
-     *
-     * @return void
      */
-    public function boot()
-    {
+    public function boot() {
         parent::boot();
 
         //
diff --git a/app/Providers/FortifyServiceProvider.php b/app/Providers/FortifyServiceProvider.php
new file mode 100644
index 0000000000..5dd644e399
--- /dev/null
+++ b/app/Providers/FortifyServiceProvider.php
@@ -0,0 +1,84 @@
+<?php
+
+namespace App\Providers;
+
+use App\Actions\Fortify\CreateNewUser;
+use App\Actions\Fortify\ResetUserPassword;
+use App\Actions\Fortify\UpdateUserPassword;
+use App\Actions\Fortify\UpdateUserProfileInformation;
+use App\Models\User\User;
+use Illuminate\Cache\RateLimiting\Limit;
+use Illuminate\Http\Request;
+use Illuminate\Support\Facades\RateLimiter;
+use Illuminate\Support\ServiceProvider;
+use Laravel\Fortify\Fortify;
+use Route;
+
+class FortifyServiceProvider extends ServiceProvider {
+    /**
+     * Register any application services.
+     */
+    public function register() {
+        //
+    }
+
+    /**
+     * Bootstrap any application services.
+     */
+    public function boot() {
+        $this->configureRoutes();
+
+        Fortify::createUsersUsing(CreateNewUser::class);
+        Fortify::updateUserProfileInformationUsing(UpdateUserProfileInformation::class);
+        Fortify::updateUserPasswordsUsing(UpdateUserPassword::class);
+        Fortify::resetUserPasswordsUsing(ResetUserPassword::class);
+
+        RateLimiter::for('login', function (Request $request) {
+            return Limit::perMinute(5)->by($request->email.$request->ip());
+        });
+
+        RateLimiter::for('two-factor', function (Request $request) {
+            return Limit::perMinute(5)->by($request->session()->get('login.id'));
+        });
+
+        $altRegistrations = array_filter(config('lorekeeper.sites'), function ($item) {
+            return isset($item['login']) && $item['login'] === 1 && $item['display_name'] != 'tumblr';
+        });
+        Fortify::registerView(fn () => view('auth.register', [
+            'userCount'        => User::count(),
+            'altRegistrations' => $altRegistrations,
+        ]));
+
+        $altLogins = array_filter(config('lorekeeper.sites'), function ($item) {
+            return isset($item['login']) && $item['login'] === 1 && $item['display_name'] != 'tumblr';
+        });
+        Fortify::loginView(fn () => view('auth.login', [
+            'userCount' => User::count(),
+            'altLogins' => $altLogins,
+        ]));
+
+        Fortify::requestPasswordResetLinkView(fn () => view('auth.passwords.forgot'));
+        Fortify::resetPasswordView(fn () => view('auth.passwords.reset'));
+        Fortify::verifyEmailView(fn () => view('auth.verify'));
+        Fortify::confirmPasswordView(fn () => view('auth.passwords.confirm'));
+
+        Fortify::twoFactorChallengeView(function () {
+            return view('auth.two-factor-challenge');
+        });
+    }
+
+    /**
+     * Configure the routes offered by the application.
+     */
+    protected function configureRoutes() {
+        if (Fortify::$registersRoutes) {
+            Route::group([
+                'namespace' => 'Laravel\Fortify\Http\Controllers',
+                'domain'    => config('fortify.domain', null),
+                'prefix'    => config('fortify.path'),
+            ], function () {
+                $this->loadRoutesFrom(base_path('routes/fortify.php'));
+            });
+        }
+    }
+}
diff --git a/app/Providers/NotificationsProvider.php b/app/Providers/NotificationsProvider.php
index fcb4b784e2..bd96deda59 100644
--- a/app/Providers/NotificationsProvider.php
+++ b/app/Providers/NotificationsProvider.php
@@ -2,31 +2,23 @@
 
 namespace App\Providers;
 
-use Illuminate\Support\ServiceProvider;
 use Illuminate\Support\Facades\App;
+use Illuminate\Support\ServiceProvider;
 
-class NotificationsProvider extends ServiceProvider
-{
+class NotificationsProvider extends ServiceProvider {
     /**
      * Register services.
-     *
-     * @return void
      */
-    public function register()
-    {
+    public function register() {
         //
     }
 
     /**
      * Bootstrap services.
-     *
-     * @return void
      */
-    public function boot()
-    {
+    public function boot() {
         //
-        App::bind('notifications', function()
-        {
+        App::bind('notifications', function () {
             return new \App\Helpers\Notifications;
         });
     }
diff --git a/app/Providers/RouteServiceProvider.php b/app/Providers/RouteServiceProvider.php
index 5ea48d39d4..0d5133c055 100644
--- a/app/Providers/RouteServiceProvider.php
+++ b/app/Providers/RouteServiceProvider.php
@@ -2,11 +2,10 @@
 
 namespace App\Providers;
 
-use Illuminate\Support\Facades\Route;
 use Illuminate\Foundation\Support\Providers\RouteServiceProvider as ServiceProvider;
+use Illuminate\Support\Facades\Route;
 
-class RouteServiceProvider extends ServiceProvider
-{
+class RouteServiceProvider extends ServiceProvider {
     /**
      * This namespace is applied to your controller routes.
      *
@@ -18,11 +17,8 @@ class RouteServiceProvider extends ServiceProvider
 
     /**
      * Define your route model bindings, pattern filters, etc.
-     *
-     * @return void
      */
-    public function boot()
-    {
+    public function boot() {
         //
 
         parent::boot();
@@ -30,11 +26,8 @@ public function boot()
 
     /**
      * Define the routes for the application.
-     *
-     * @return void
      */
-    public function map()
-    {
+    public function map() {
         $this->mapApiRoutes();
 
         $this->mapWebRoutes();
@@ -46,28 +39,29 @@ public function map()
      * Define the "web" routes for the application.
      *
      * These routes all receive session state, CSRF protection, etc.
-     *
-     * @return void
      */
-    protected function mapWebRoutes()
-    {
+    protected function mapWebRoutes() {
         Route::middleware('web')
-             ->namespace($this->namespace)
-             ->group(base_path('routes/web.php'));
+            ->namespace($this->namespace)
+            ->group(base_path('routes/web.php'));
     }
 
     /**
      * Define the "api" routes for the application.
      *
      * These routes are typically stateless.
-     *
-     * @return void
      */
-    protected function mapApiRoutes()
-    {
+    protected function mapApiRoutes() {
         Route::prefix('api')
-             ->middleware('api')
-             ->namespace($this->namespace)
-             ->group(base_path('routes/api.php'));
+            ->middleware('api')
+            ->namespace($this->namespace)
+            ->group(base_path('routes/api.php'));
     }
+
+    /**
+     * The path to the "home" route for your application.
+     *
+     * @var string
+     */
+    public const HOME = '/';
 }
diff --git a/app/Providers/SettingsProvider.php b/app/Providers/SettingsProvider.php
index 0401b025ed..b9c0aaf49b 100644
--- a/app/Providers/SettingsProvider.php
+++ b/app/Providers/SettingsProvider.php
@@ -2,31 +2,23 @@
 
 namespace App\Providers;
 
-use Illuminate\Support\ServiceProvider;
 use Illuminate\Support\Facades\App;
+use Illuminate\Support\ServiceProvider;
 
-class SettingsProvider extends ServiceProvider
-{
+class SettingsProvider extends ServiceProvider {
     /**
      * Register services.
-     *
-     * @return void
      */
-    public function register()
-    {
+    public function register() {
         //
     }
 
     /**
      * Bootstrap services.
-     *
-     * @return void
      */
-    public function boot()
-    {
+    public function boot() {
         //
-        App::bind('settings', function()
-        {
+        App::bind('settings', function () {
             return new \App\Helpers\Settings;
         });
     }
diff --git a/app/Providers/Socialite/ToyhouseProvider.php b/app/Providers/Socialite/ToyhouseProvider.php
index ffac5235ce..0ce2bc79cf 100644
--- a/app/Providers/Socialite/ToyhouseProvider.php
+++ b/app/Providers/Socialite/ToyhouseProvider.php
@@ -7,10 +7,13 @@
 use Laravel\Socialite\Two\ProviderInterface;
 use Laravel\Socialite\Two\User;
 
-class ToyhouseProvider extends AbstractProvider implements ProviderInterface
-{
+class ToyhouseProvider extends AbstractProvider implements ProviderInterface {
     protected $scopes = [];
 
+    public function getRedirectUrl() {
+        return $this->redirectUrl;
+    }
+
     /**
      * Get the authentication URL for the provider.
      *
@@ -18,8 +21,7 @@ class ToyhouseProvider extends AbstractProvider implements ProviderInterface
      *
      * @return string
      */
-    protected function getAuthUrl($state)
-    {
+    protected function getAuthUrl($state) {
         return $this->buildAuthUrlFromBase('https://toyhou.se/~oauth/authorize', $state);
     }
 
@@ -28,8 +30,7 @@ protected function getAuthUrl($state)
      *
      * @return string
      */
-    protected function getTokenUrl()
-    {
+    protected function getTokenUrl() {
         return 'https://toyhou.se/~oauth/token';
     }
 
@@ -40,8 +41,7 @@ protected function getTokenUrl()
      *
      * @return array
      */
-    protected function getUserByToken($token)
-    {
+    protected function getUserByToken($token) {
         $response = $this->getHttpClient()->get(
             'https://toyhou.se/~api/v1/me',
             [
@@ -59,8 +59,7 @@ protected function getUserByToken($token)
      *
      * @return \Laravel\Socialite\Two\User
      */
-    protected function mapUserToObject(array $user)
-    {
+    protected function mapUserToObject(array $user) {
         return (new User)->setRaw($user)->map([
             'id'   => $user['id'], 'nickname' => $user['username'],
             'name' => null, 'email' => null, 'avatar' => $user['avatar'],
diff --git a/app/Services/BookmarkManager.php b/app/Services/BookmarkManager.php
index 17a2fde9e1..ba03f1293f 100644
--- a/app/Services/BookmarkManager.php
+++ b/app/Services/BookmarkManager.php
@@ -1,13 +1,12 @@
-<?php namespace App\Services;
+<?php
 
-use DB;
+namespace App\Services;
 
-use App\Services\Service;
-use App\Models\Character\CharacterBookmark;
 use App\Models\Character\Character;
+use App\Models\Character\CharacterBookmark;
+use Illuminate\Support\Facades\DB;
 
-class BookmarkManager extends Service
-{
+class BookmarkManager extends Service {
     /*
     |--------------------------------------------------------------------------
     | Bookmark Manager
@@ -16,99 +15,116 @@ class BookmarkManager extends Service
     | Handles creation, modification and usage of character bookmarks.
     |
     */
-    
+
     /**
      * Create a bookmark.
      *
-     * @param  array                 $data
-     * @param  \App\Models\User\User $user
+     * @param array                 $data
+     * @param \App\Models\User\User $user
+     *
      * @return \App\Models\Character\CharacterBookmark|bool
      */
-    public function createBookmark($data, $user)
-    {
+    public function createBookmark($data, $user) {
         DB::beginTransaction();
 
         try {
-            if(!isset($data['character_id'])) throw new \Exception("Invalid character selected.");
+            if (!isset($data['character_id'])) {
+                throw new \Exception('Invalid character selected.');
+            }
 
             $character = Character::where('id', $data['character_id'])->visible()->first();
-            if(!$character) throw new \Exception("Invalid character selected.");
+            if (!$character) {
+                throw new \Exception('Invalid character selected.');
+            }
+
+            if ($user->hasBookmarked($character)) {
+                throw new \Exception('You have already bookmarked this character.');
+            }
 
-            if($user->hasBookmarked($character)) throw new \Exception("You have already bookmarked this character.");
-            
             $bookmark = CharacterBookmark::create([
-                'character_id' => $character->id,
-                'user_id' => $user->id,
-                'sort' => 0,
-                'notify_on_trade_status' => isset($data['notify_on_trade_status']) ? $data['notify_on_trade_status'] : 0, 
-                'notify_on_gift_art_status' => isset($data['notify_on_gift_art_status']) ? $data['notify_on_gift_art_status'] : 0,
-                'notify_on_gift_writing_status' => isset($data['notify_on_gift_writing_status']) ? $data['notify_on_gift_writing_status'] : 0, 
-                'notify_on_transfer' => isset($data['notify_on_transfer']) ? $data['notify_on_transfer'] : 0, 
-                'notify_on_image' => isset($data['notify_on_image']) ? $data['notify_on_image'] : 0, 
-                'comment' => $data['comment']
+                'character_id'                  => $character->id,
+                'user_id'                       => $user->id,
+                'sort'                          => 0,
+                'notify_on_trade_status'        => $data['notify_on_trade_status'] ?? 0,
+                'notify_on_gift_art_status'     => $data['notify_on_gift_art_status'] ?? 0,
+                'notify_on_gift_writing_status' => $data['notify_on_gift_writing_status'] ?? 0,
+                'notify_on_transfer'            => $data['notify_on_transfer'] ?? 0,
+                'notify_on_image'               => $data['notify_on_image'] ?? 0,
+                'comment'                       => $data['comment'],
             ]);
 
             return $this->commitReturn($bookmark);
-        } catch(\Exception $e) { 
+        } catch (\Exception $e) {
             $this->setError('error', $e->getMessage());
         }
+
         return $this->rollbackReturn(false);
     }
-    
+
     /**
      * Update a bookmark.
      *
-     * @param  array                 $data
-     * @param  \App\Models\User\User $user
+     * @param array                 $data
+     * @param \App\Models\User\User $user
+     *
      * @return \App\Models\Character\CharacterBookmark|bool
      */
-    public function updateBookmark($data, $user)
-    {
+    public function updateBookmark($data, $user) {
         DB::beginTransaction();
 
         try {
-            if(!isset($data['bookmark_id'])) throw new \Exception("Invalid bookmark selected.");
+            if (!isset($data['bookmark_id'])) {
+                throw new \Exception('Invalid bookmark selected.');
+            }
             $bookmark = CharacterBookmark::with('character')->where('id', $data['bookmark_id'])->visible()->where('user_id', $user->id)->first();
-            if(!$bookmark || !$bookmark->character->is_visible) throw new \Exception("Invalid bookmark selected.");
+            if (!$bookmark || !$bookmark->character->is_visible) {
+                throw new \Exception('Invalid bookmark selected.');
+            }
 
             $bookmark->update([
-                'notify_on_trade_status' => isset($data['notify_on_trade_status']) ? $data['notify_on_trade_status'] : 0, 
-                'notify_on_gift_art_status' => isset($data['notify_on_gift_art_status']) ? $data['notify_on_gift_art_status'] : 0,
-                'notify_on_gift_writing_status' => isset($data['notify_on_gift_writing_status']) ? $data['notify_on_gift_writing_status'] : 0, 
-                'notify_on_transfer' => isset($data['notify_on_transfer']) ? $data['notify_on_transfer'] : 0,
-                'notify_on_image' => isset($data['notify_on_image']) ? $data['notify_on_image'] : 0,  
-                'comment' => $data['comment']
+                'notify_on_trade_status'        => $data['notify_on_trade_status'] ?? 0,
+                'notify_on_gift_art_status'     => $data['notify_on_gift_art_status'] ?? 0,
+                'notify_on_gift_writing_status' => $data['notify_on_gift_writing_status'] ?? 0,
+                'notify_on_transfer'            => $data['notify_on_transfer'] ?? 0,
+                'notify_on_image'               => $data['notify_on_image'] ?? 0,
+                'comment'                       => $data['comment'],
             ]);
 
             return $this->commitReturn($bookmark);
-        } catch(\Exception $e) { 
+        } catch (\Exception $e) {
             $this->setError('error', $e->getMessage());
         }
+
         return $this->rollbackReturn(false);
     }
-    
+
     /**
      * Delete a bookmark.
      *
-     * @param  array                 $data
-     * @param  \App\Models\User\User $user
+     * @param array                 $data
+     * @param \App\Models\User\User $user
+     *
      * @return bool
      */
-    public function deleteBookmark($data, $user)
-    {
+    public function deleteBookmark($data, $user) {
         DB::beginTransaction();
 
         try {
-            if(!isset($data['bookmark_id'])) throw new \Exception("Invalid bookmark selected.");
+            if (!isset($data['bookmark_id'])) {
+                throw new \Exception('Invalid bookmark selected.');
+            }
             $bookmark = CharacterBookmark::with('character')->where('id', $data['bookmark_id'])->visible()->where('user_id', $user->id)->first();
-            if(!$bookmark || !$bookmark->character->is_visible) throw new \Exception("Invalid bookmark selected.");
+            if (!$bookmark || !$bookmark->character->is_visible) {
+                throw new \Exception('Invalid bookmark selected.');
+            }
 
             $bookmark->delete();
 
             return $this->commitReturn(true);
-        } catch(\Exception $e) { 
+        } catch (\Exception $e) {
             $this->setError('error', $e->getMessage());
         }
+
         return $this->rollbackReturn(false);
     }
 
@@ -116,20 +132,21 @@ public function deleteBookmark($data, $user)
      * Deletes bookmarks associated with a character.
      * For use when a character is deleted.
      *
-     * @param  \App\Models\Character\Character $character
+     * @param \App\Models\Character\Character $character
+     *
      * @return bool
      */
-    public function deleteBookmarks($character)
-    {
+    public function deleteBookmarks($character) {
         DB::beginTransaction();
 
         try {
             CharacterBookmark::where('character_id', $character->id)->delete();
 
             return $this->commitReturn(true);
-        } catch(\Exception $e) { 
+        } catch (\Exception $e) {
             $this->setError('error', $e->getMessage());
         }
+
         return $this->rollbackReturn(false);
     }
-}
\ No newline at end of file
+}
diff --git a/app/Services/CharacterCategoryService.php b/app/Services/CharacterCategoryService.php
index c5cfc8be63..8bb6cbc0b3 100644
--- a/app/Services/CharacterCategoryService.php
+++ b/app/Services/CharacterCategoryService.php
@@ -1,15 +1,12 @@
-<?php namespace App\Services;
+<?php
 
-use App\Services\Service;
-
-use DB;
-use Config;
+namespace App\Services;
 
 use App\Models\Character\Character;
 use App\Models\Character\CharacterCategory;
+use Illuminate\Support\Facades\DB;
 
-class CharacterCategoryService extends Service
-{
+class CharacterCategoryService extends Service {
     /*
     |--------------------------------------------------------------------------
     | Character Category Service
@@ -22,141 +19,178 @@ class CharacterCategoryService extends Service
     /**
      * Create a category.
      *
-     * @param  array  $data
+     * @param array $data
+     * @param mixed $user
+     *
      * @return \App\Models\Character\CharacterCategory|bool
      */
-    public function createCharacterCategory($data)
-    {
+    public function createCharacterCategory($data, $user) {
         DB::beginTransaction();
 
         try {
             $data = $this->populateCategoryData($data);
 
             $image = null;
-            if(isset($data['image']) && $data['image']) {
+            if (isset($data['image']) && $data['image']) {
                 $data['has_image'] = 1;
+                $data['hash'] = randomString(10);
                 $image = $data['image'];
                 unset($data['image']);
+            } else {
+                $data['has_image'] = 0;
             }
-            else $data['has_image'] = 0;
 
             $category = CharacterCategory::create($data);
 
-            if ($image) $this->handleImage($image, $category->categoryImagePath, $category->categoryImageFileName);
+            if (!$this->logAdminAction($user, 'Created Character Category', 'Created '.$category->displayName)) {
+                throw new \Exception('Failed to log admin action.');
+            }
+
+            if ($image) {
+                $this->handleImage($image, $category->categoryImagePath, $category->categoryImageFileName);
+            }
 
             return $this->commitReturn($category);
-        } catch(\Exception $e) { 
+        } catch (\Exception $e) {
             $this->setError('error', $e->getMessage());
         }
+
         return $this->rollbackReturn(false);
     }
 
     /**
      * Update a category.
      *
-     * @param  \App\Models\Character\CharacterCategory  $category
-     * @param  array                                    $data
+     * @param \App\Models\Character\CharacterCategory $category
+     * @param array                                   $data
+     * @param mixed                                   $user
+     *
      * @return \App\Models\Character\CharacterCategory|bool
      */
-    public function updateCharacterCategory($category, $data)
-    {
+    public function updateCharacterCategory($category, $data, $user) {
         DB::beginTransaction();
 
         try {
-            if(CharacterCategory::where('name', $data['name'])->where('id', '!=', $category->id)->exists()) throw new \Exception("The name has already been taken.");
-            if(CharacterCategory::where('code', $data['code'])->where('id', '!=', $category->id)->exists()) throw new \Exception("The code has already been taken.");
+            if (CharacterCategory::where('name', $data['name'])->where('id', '!=', $category->id)->exists()) {
+                throw new \Exception('The name has already been taken.');
+            }
+            if (CharacterCategory::where('code', $data['code'])->where('id', '!=', $category->id)->exists()) {
+                throw new \Exception('The code has already been taken.');
+            }
 
             $data = $this->populateCategoryData($data, $category);
 
-            $image = null;            
-            if(isset($data['image']) && $data['image']) {
+            $image = null;
+            if (isset($data['image']) && $data['image']) {
                 $data['has_image'] = 1;
+                $data['hash'] = randomString(10);
                 $image = $data['image'];
                 unset($data['image']);
             }
 
             $category->update($data);
 
-            if ($category) $this->handleImage($image, $category->categoryImagePath, $category->categoryImageFileName);
+            if (!$this->logAdminAction($user, 'Edited Character Category', 'Edited '.$category->displayName)) {
+                throw new \Exception('Failed to log admin action.');
+            }
+
+            if ($category) {
+                $this->handleImage($image, $category->categoryImagePath, $category->categoryImageFileName);
+            }
 
             return $this->commitReturn($category);
-        } catch(\Exception $e) { 
+        } catch (\Exception $e) {
             $this->setError('error', $e->getMessage());
         }
-        return $this->rollbackReturn(false);
-    }
 
-    /**
-     * Handle category data.
-     *
-     * @param  array                                         $data
-     * @param  \App\Models\Character\CharacterCategory|null  $category
-     * @return array
-     */
-    private function populateCategoryData($data, $category = null)
-    {
-        if(isset($data['description']) && $data['description']) $data['parsed_description'] = parse($data['description']);
-        
-        if(isset($data['remove_image']))
-        {
-            if($category && $category->has_image && $data['remove_image']) 
-            { 
-                $data['has_image'] = 0; 
-                $this->deleteImage($category->categoryImagePath, $category->categoryImageFileName); 
-            }
-            unset($data['remove_image']);
-        }
-
-        return $data;
+        return $this->rollbackReturn(false);
     }
 
     /**
      * Delete a category.
      *
-     * @param  \App\Models\Character\CharacterCategory  $category
+     * @param \App\Models\Character\CharacterCategory $category
+     * @param mixed                                   $user
+     *
      * @return bool
      */
-    public function deleteCharacterCategory($category)
-    {
+    public function deleteCharacterCategory($category, $user) {
         DB::beginTransaction();
 
         try {
             // Check first if the category is currently in use
-            if(Character::where('character_category_id', $category->id)->exists()) throw new \Exception("An character with this category exists. Please change its category first.");
-            
-            if($category->has_image) $this->deleteImage($category->categoryImagePath, $category->categoryImageFileName); 
+            if (Character::where('character_category_id', $category->id)->exists()) {
+                throw new \Exception('An character with this category exists. Please change its category first.');
+            }
+
+            if (!$this->logAdminAction($user, 'Deleted Character Category', 'Deleted '.$category->name)) {
+                throw new \Exception('Failed to log admin action.');
+            }
+
+            if ($category->has_image) {
+                $this->deleteImage($category->categoryImagePath, $category->categoryImageFileName);
+            }
             $category->delete();
 
             return $this->commitReturn(true);
-        } catch(\Exception $e) { 
+        } catch (\Exception $e) {
             $this->setError('error', $e->getMessage());
         }
+
         return $this->rollbackReturn(false);
     }
 
     /**
      * Sorts category order.
      *
-     * @param  array  $data
+     * @param array $data
+     *
      * @return bool
      */
-    public function sortCharacterCategory($data)
-    {
+    public function sortCharacterCategory($data) {
         DB::beginTransaction();
 
         try {
             // explode the sort array and reverse it since the order is inverted
             $sort = array_reverse(explode(',', $data));
 
-            foreach($sort as $key => $s) {
+            foreach ($sort as $key => $s) {
                 CharacterCategory::where('id', $s)->update(['sort' => $key]);
             }
 
             return $this->commitReturn(true);
-        } catch(\Exception $e) { 
+        } catch (\Exception $e) {
             $this->setError('error', $e->getMessage());
         }
+
         return $this->rollbackReturn(false);
     }
 
-}
\ No newline at end of file
+    /**
+     * Handle category data.
+     *
+     * @param array                                        $data
+     * @param \App\Models\Character\CharacterCategory|null $category
+     *
+     * @return array
+     */
+    private function populateCategoryData($data, $category = null) {
+        if (isset($data['description']) && $data['description']) {
+            $data['parsed_description'] = parse($data['description']);
+        }
+
+        if (!isset($data['is_visible'])) {
+            $data['is_visible'] = 0;
+        }
+
+        if (isset($data['remove_image'])) {
+            if ($category && $category->has_image && $data['remove_image']) {
+                $data['has_image'] = 0;
+                $this->deleteImage($category->categoryImagePath, $category->categoryImageFileName);
+            }
+            unset($data['remove_image']);
+        }
+
+        return $data;
+    }
+}
diff --git a/app/Services/CharacterManager.php b/app/Services/CharacterManager.php
index fe2a126dc1..33f9b4da2b 100644
--- a/app/Services/CharacterManager.php
+++ b/app/Services/CharacterManager.php
@@ -1,40 +1,28 @@
-<?php namespace App\Services;
+<?php
 
-use App\Services\Service;
+namespace App\Services;
 
-use Carbon\Carbon;
-
-use DB;
-use Config;
-use Image;
-use Notifications;
-use Settings;
-use File;
-
-use App\Services\CurrencyManager;
-use App\Services\InventoryManager;
-
-use Illuminate\Support\Arr;
-use App\Models\User\User;
-use App\Models\User\UserItem;
+use App\Facades\Notifications;
+use App\Facades\Settings;
 use App\Models\Character\Character;
-use App\Models\Character\CharacterCurrency;
+use App\Models\Character\CharacterBookmark;
 use App\Models\Character\CharacterCategory;
+use App\Models\Character\CharacterCurrency;
+use App\Models\Character\CharacterDesignUpdate;
 use App\Models\Character\CharacterFeature;
 use App\Models\Character\CharacterImage;
-use App\Models\Character\CharacterTransfer;
-use App\Models\Character\CharacterDesignUpdate;
-use App\Models\Character\CharacterBookmark;
-use App\Models\User\UserCharacterLog;
 use App\Models\Character\CharacterTitle;
-use App\Models\Species\Species;
+use App\Models\Character\CharacterTransfer;
+use App\Models\Sales\SalesCharacter;
 use App\Models\Species\Subtype;
-use App\Models\Rarity;
-use App\Models\Currency\Currency;
-use App\Models\Feature\Feature;
+use App\Models\User\User;
+use Carbon\Carbon;
+use Illuminate\Support\Arr;
+use Illuminate\Support\Facades\Config;
+use Illuminate\Support\Facades\DB;
+use Intervention\Image\Facades\Image;
 
-class CharacterManager extends Service
-{
+class CharacterManager extends Service {
     /*
     |--------------------------------------------------------------------------
     | Character Manager
@@ -47,28 +35,33 @@ class CharacterManager extends Service
     /**
      * Retrieves the next number to be used for a character's masterlist code.
      *
-     * @param  int  $categoryId
+     * @param int $categoryId
+     *
      * @return string
      */
-    public function pullNumber($categoryId)
-    {
-        $digits = Config::get('lorekeeper.settings.character_number_digits');
+    public function pullNumber($categoryId) {
+        $digits = config('lorekeeper.settings.character_number_digits');
         $result = str_pad('', $digits, '0'); // A default value, in case
         $number = 0;
 
         // First check if the number needs to be the overall next
         // or next in category, and retrieve the highest number
-        if(Config::get('lorekeeper.settings.character_pull_number') == 'all')
-        {
+        if (config('lorekeeper.settings.character_pull_number') == 'all') {
             $character = Character::myo(0)->orderBy('number', 'DESC')->first();
-            if($character) $number = ltrim($character->number, 0);
-            if(!strlen($number)) $number = '0';
-        }
-        else if (Config::get('lorekeeper.settings.character_pull_number') == 'category' && $categoryId)
-        {
+            if ($character) {
+                $number = ltrim($character->number, 0);
+            }
+            if (!strlen($number)) {
+                $number = '0';
+            }
+        } elseif (config('lorekeeper.settings.character_pull_number') == 'category' && $categoryId) {
             $character = Character::myo(0)->where('character_category_id', $categoryId)->orderBy('number', 'DESC')->first();
-            if($character) $number = ltrim($character->number, 0);
-            if(!strlen($number)) $number = '0';
+            if ($character) {
+                $number = ltrim($character->number, 0);
+            }
+            if (!strlen($number)) {
+                $number = '0';
+            }
         }
 
         $result = format_masterlist_number($number + 1, $digits);
@@ -79,55 +72,71 @@ public function pullNumber($categoryId)
     /**
      * Creates a new character or MYO slot.
      *
-     * @param  array                  $data
-     * @param  \App\Models\User\User  $user
-     * @param  bool                   $isMyo
+     * @param array                 $data
+     * @param \App\Models\User\User $user
+     * @param bool                  $isMyo
+     *
      * @return \App\Models\Character\Character|bool
      */
-    public function createCharacter($data, $user, $isMyo = false)
-    {
+    public function createCharacter($data, $user, $isMyo = false) {
         DB::beginTransaction();
 
         try {
-            if(!$isMyo && Character::where('slug', $data['slug'])->exists()) throw new \Exception("Please enter a unique character code.");
+            if (!$isMyo && Character::where('slug', $data['slug'])->exists()) {
+                throw new \Exception('Please enter a unique character code.');
+            }
 
-            if(!(isset($data['user_id']) && $data['user_id']) && !(isset($data['owner_url']) && $data['owner_url']))
-                throw new \Exception("Please select an owner.");
-            if(!$isMyo)
-            {
-                if(!(isset($data['species_id']) && $data['species_id'])) throw new \Exception('Characters require a species.');
-                if(!(isset($data['rarity_id']) && $data['rarity_id'])) throw new \Exception('Characters require a rarity.');
+            if (!(isset($data['user_id']) && $data['user_id']) && !(isset($data['owner_url']) && $data['owner_url'])) {
+                throw new \Exception('Please select an owner.');
+            }
+            if (!$isMyo) {
+                if (!(isset($data['species_id']) && $data['species_id'])) {
+                    throw new \Exception('Characters require a species.');
+                }
+                if (!(isset($data['rarity_id']) && $data['rarity_id'])) {
+                    throw new \Exception('Characters require a rarity.');
+                }
             }
-            if(isset($data['subtype_id']) && $data['subtype_id'])
-            {
+            if (isset($data['subtype_id']) && $data['subtype_id']) {
                 $subtype = Subtype::find($data['subtype_id']);
-                if(!(isset($data['species_id']) && $data['species_id'])) throw new \Exception('Species must be selected to select a subtype.');
-                if(!$subtype || $subtype->species_id != $data['species_id']) throw new \Exception('Selected subtype invalid or does not match species.');
+                if (!(isset($data['species_id']) && $data['species_id'])) {
+                    throw new \Exception('Species must be selected to select a subtype.');
+                }
+                if (!$subtype || $subtype->species_id != $data['species_id']) {
+                    throw new \Exception('Selected subtype invalid or does not match species.');
+                }
+            } else {
+                $data['subtype_id'] = null;
             }
-            else $data['subtype_id'] = null;
 
             // Get owner info
             $url = null;
             $recipientId = null;
-            if(isset($data['user_id']) && $data['user_id']) $recipient = User::find($data['user_id']);
-            elseif(isset($data['owner_url']) && $data['owner_url']) $recipient = checkAlias($data['owner_url']);
+            if (isset($data['user_id']) && $data['user_id']) {
+                $recipient = User::find($data['user_id']);
+            } elseif (isset($data['owner_url']) && $data['owner_url']) {
+                $recipient = checkAlias($data['owner_url']);
+            }
 
-            if(is_object($recipient)) {
+            if (is_object($recipient)) {
                 $recipientId = $recipient->id;
                 $data['user_id'] = $recipient->id;
-            }
-            else {
+            } else {
                 $url = $recipient;
             }
 
             // Create character
             $character = $this->handleCharacter($data, $isMyo);
-            if(!$character) throw new \Exception("Error happened while trying to create character.");
+            if (!$character) {
+                throw new \Exception('Error happened while trying to create character.');
+            }
 
             // Create character image
             $data['is_valid'] = true; // New image of new characters are always valid
             $image = $this->handleCharacterImage($data, $character, $isMyo);
-            if(!$image) throw new \Exception("Error happened while trying to create image.");
+            if (!$image) {
+                throw new \Exception('Error happened while trying to create image.');
+            }
 
             // Update the character's image ID
             $character->character_image_id = $image->id;
@@ -142,258 +151,92 @@ public function createCharacter($data, $user, $isMyo = false)
             $this->createLog($user->id, null, $recipientId, $url, $character->id, $isMyo ? 'MYO Slot Created' : 'Character Created', 'Initial upload', 'user');
 
             // Update the user's FTO status and character count
-            if(is_object($recipient)) {
-                if(!$isMyo) {
+            if (is_object($recipient)) {
+                if (!$isMyo) {
                     $recipient->settings->is_fto = 0; // MYO slots don't affect the FTO status - YMMV
                 }
                 $recipient->settings->save();
             }
 
             // If the recipient has an account, send them a notification
-            if(is_object($recipient) && $user->id != $recipient->id) {
+            if (is_object($recipient) && $user->id != $recipient->id) {
                 Notifications::create($isMyo ? 'MYO_GRANT' : 'CHARACTER_UPLOAD', $recipient, [
                     'character_url' => $character->url,
-                ] + ($isMyo ?
+                ] + (
+                    $isMyo ?
                     ['name' => $character->name] :
                     ['character_slug' => $character->slug]
                 ));
             }
 
-            return $this->commitReturn($character);
-        } catch(\Exception $e) {
-            $this->setError('error', $e->getMessage());
-        }
-        return $this->rollbackReturn(false);
-    }
-
-    /**
-     * Handles character data.
-     *
-     * @param  array                  $data
-     * @param  bool                   $isMyo
-     * @return \App\Models\Character\Character|bool
-     */
-    private function handleCharacter($data, $isMyo = false)
-    {
-        try {
-            if($isMyo)
-            {
-                $data['character_category_id'] = null;
-                $data['number'] = null;
-                $data['slug'] = null;
-                $data['species_id'] = isset($data['species_id']) && $data['species_id'] ? $data['species_id'] : null;
-                $data['subtype_id'] = isset($data['subtype_id']) && $data['subtype_id'] ? $data['subtype_id'] : null;
-                $data['rarity_id'] = isset($data['rarity_id']) && $data['rarity_id'] ? $data['rarity_id'] : null;
-            }
-
-            $characterData = Arr::only($data, [
-                'character_category_id', 'rarity_id', 'user_id',
-                'number', 'slug', 'description',
-                'sale_value', 'transferrable_at', 'is_visible'
-            ]);
-
-            $characterData['name'] = ($isMyo && isset($data['name'])) ? $data['name'] : null;
-            $characterData['owner_url'] = isset($characterData['user_id']) ? null : $data['owner_url'];
-            $characterData['is_sellable'] = isset($data['is_sellable']);
-            $characterData['is_tradeable'] = isset($data['is_tradeable']);
-            $characterData['is_giftable'] = isset($data['is_giftable']);
-            $characterData['is_visible'] = isset($data['is_visible']);
-            $characterData['sale_value'] = isset($data['sale_value']) ? $data['sale_value'] : 0;
-            $characterData['is_gift_art_allowed'] = 0;
-            $characterData['is_gift_writing_allowed'] = 0;
-            $characterData['is_trading'] = 0;
-            $characterData['parsed_description'] = parse($data['description']);
-            if($isMyo) $characterData['is_myo_slot'] = 1;
-
-            $character = Character::create($characterData);
-
-            // Create character profile row
-            $character->profile()->create([]);
-
-            return $character;
-        } catch(\Exception $e) {
-            $this->setError('error', $e->getMessage());
-        }
-        return false;
-    }
-
-    /**
-     * Handles character image data.
-     *
-     * @param  array                            $data
-     * @return \App\Models\Character\Character  $character
-     * @param  bool                             $isMyo
-     * @return \App\Models\Character\CharacterImage|bool
-     */
-    private function handleCharacterImage($data, $character, $isMyo = false)
-    {
-        try {
-            if($isMyo)
-            {
-                $data['species_id'] = (isset($data['species_id']) && $data['species_id']) ? $data['species_id'] : null;
-                $data['subtype_id'] = isset($data['subtype_id']) && $data['subtype_id'] ? $data['subtype_id'] : null;
-                $data['rarity_id'] = (isset($data['rarity_id']) && $data['rarity_id']) ? $data['rarity_id'] : null;
-
-                // Use default images for MYO slots without an image provided
-                if(!isset($data['image']))
-                {
-                    $data['image'] = public_path('images/myo.png');
-                    $data['thumbnail'] = public_path('images/myo-th.png');
-                    $data['extension'] = 'png';
-                    $data['default_image'] = true;
-                    unset($data['use_cropper']);
-                }
-            }
-            $imageData = Arr::only($data, [
-                'species_id', 'subtype_id', 'rarity_id', 'use_cropper',
-                'x0', 'x1', 'y0', 'y1', 'title_id', 'title_data'
-            ]);
-            $imageData['use_cropper'] = isset($data['use_cropper']) ;
-            $imageData['description'] = isset($data['image_description']) ? $data['image_description'] : null;
-            $imageData['parsed_description'] = parse($imageData['description']);
-            $imageData['hash'] = randomString(10);
-            $imageData['fullsize_hash'] = randomString(15);
-            $imageData['sort'] = 0;
-            $imageData['is_valid'] = isset($data['is_valid']);
-            $imageData['is_visible'] = isset($data['is_visible']);
-            $imageData['extension'] = (Config::get('lorekeeper.settings.masterlist_image_format') ? Config::get('lorekeeper.settings.masterlist_image_format') : (isset($data['extension']) ? $data['extension'] : $data['image']->getClientOriginalExtension()));
-            $imageData['character_id'] = $character->id;
-            $imageData['title_id'] = isset($data['title_id']) && $data['title_id'] ? ($data['title_id'] != 'custom' ? $data['title_id'] : null) : null;
-            $imageData['title_data'] = isset($data['title_data']) && $data['title_data'] && isset($data['title_data']['full']) ? json_encode($data['title_data']) : null;
-
-            $image = CharacterImage::create($imageData);
-
-            // Check if entered url(s) have aliases associated with any on-site users
-            foreach($data['designer_url'] as $key=>$url) {
-                $recipient = checkAlias($url, false);
-                if(is_object($recipient)) {
-                    $data['designer_id'][$key] = $recipient->id;
-                    $data['designer_url'][$key] = null;
-                }
-            }
-            foreach($data['artist_url'] as $key=>$url) {
-                $recipient = checkAlias($url, false);
-                if(is_object($recipient)) {
-                    $data['artist_id'][$key] = $recipient->id;
-                    $data['artist_url'][$key] = null;
-                }
-            }
-
-            // Check that users with the specified id(s) exist on site
-            foreach($data['designer_id'] as $id) {
-                if(isset($id) && $id) {
-                    $user = User::find($id);
-                    if(!$user) throw new \Exception('One or more designers is invalid.');
-                }
-            }
-            foreach($data['artist_id'] as $id) {
-                if(isset($id) && $id) {
-                    $user = $user = User::find($id);
-                    if(!$user) throw new \Exception('One or more artists is invalid.');
-                }
-            }
-
-            // Attach artists/designers
-            foreach($data['designer_id'] as $key => $id) {
-                if($id || $data['designer_url'][$key])
-                    DB::table('character_image_creators')->insert([
-                        'character_image_id' => $image->id,
-                        'type' => 'Designer',
-                        'url' => $data['designer_url'][$key],
-                        'user_id' => $id
-                    ]);
-            }
-            foreach($data['artist_id'] as $key => $id) {
-                if($id || $data['artist_url'][$key])
-                    DB::table('character_image_creators')->insert([
-                        'character_image_id' => $image->id,
-                        'type' => 'Artist',
-                        'url' => $data['artist_url'][$key],
-                        'user_id' => $id
-                    ]);
-            }
-
-            // Save image
-            $this->handleImage($data['image'], $image->imageDirectory, $image->imageFileName, null, isset($data['default_image']));
-
-            // Save thumbnail first before processing full image
-            if(isset($data['use_cropper'])) $this->cropThumbnail(Arr::only($data, ['x0','x1','y0','y1']), $image, $isMyo);
-            else $this->handleImage($data['thumbnail'], $image->imageDirectory, $image->thumbnailFileName, null, isset($data['default_image']));
-
-            // Process and save the image itself
-            if(!$isMyo) $this->processImage($image);
-
-            // Attach features
-            foreach($data['feature_id'] as $key => $featureId) {
-                if($featureId) {
-                    $feature = CharacterFeature::create(['character_image_id' => $image->id, 'feature_id' => $featureId, 'data' => $data['feature_data'][$key]]);
-                }
+            if (!$this->logAdminAction($user, 'Created Character', 'Created '.$character->displayName)) {
+                throw new \Exception('Failed to log admin action.');
             }
 
-            return $image;
-        } catch(\Exception $e) {
+            return $this->commitReturn($character);
+        } catch (\Exception $e) {
             $this->setError('error', $e->getMessage());
         }
-        return false;
 
+        return $this->rollbackReturn(false);
     }
 
     /**
      * Trims and optionally resizes and watermarks an image.
      *
-     *
-     * @param  \App\Models\Character\CharacterImage  $characterImage
+     * @param \App\Models\Character\CharacterImage $characterImage
      */
-    private function processImage($characterImage)
-    {
+    public function processImage($characterImage) {
+        $imageProperties = getimagesize($characterImage->imagePath.'/'.$characterImage->imageFileName);
+        if ($imageProperties[0] > 2000 || $imageProperties[1] > 2000) {
+            // For large images (in terms of dimensions),
+            // use imagick instead, as it's better at handling them
+            Config::set('image.driver', 'imagick');
+        }
+
         // Trim transparent parts of image.
-        $image = Image::make($characterImage->imagePath . '/' . $characterImage->imageFileName)->trim('transparent');
+        $image = Image::make($characterImage->imagePath.'/'.$characterImage->imageFileName)->trim('transparent');
 
-        if (Config::get('lorekeeper.settings.masterlist_image_automation') == 1)
-        {
+        if (config('lorekeeper.settings.masterlist_image_automation') == 1) {
             // Make the image be square
             $imageWidth = $image->width();
             $imageHeight = $image->height();
 
-            if( $imageWidth > $imageHeight) {
+            if ($imageWidth > $imageHeight) {
                 // Landscape
                 $canvas = Image::canvas($image->width(), $image->width());
                 $image = $canvas->insert($image, 'center');
-            }
-            else {
+            } else {
                 // Portrait
                 $canvas = Image::canvas($image->height(), $image->height());
                 $image = $canvas->insert($image, 'center');
             }
         }
 
-        if(Config::get('lorekeeper.settings.masterlist_image_format') != 'png' && Config::get('lorekeeper.settings.masterlist_image_format') != null && Config::get('lorekeeper.settings.masterlist_image_background') != null) {
-            $canvas = Image::canvas($image->width(), $image->height(), Config::get('lorekeeper.settings.masterlist_image_background'));
+        // Add background fill if destination format is not transparent
+        if (!in_array(config('lorekeeper.settings.masterlist_image_format'), ['png', 'webp']) && config('lorekeeper.settings.masterlist_image_format') != null && config('lorekeeper.settings.masterlist_image_background') != null) {
+            $canvas = Image::canvas($image->width(), $image->height(), config('lorekeeper.settings.masterlist_image_background'));
             $image = $canvas->insert($image, 'center');
         }
 
-        if(Config::get('lorekeeper.settings.store_masterlist_fullsizes') == 1) {
+        if (config('lorekeeper.settings.store_masterlist_fullsizes') == 1) {
             // Generate fullsize hash if not already generated,
             // then save the full-sized image
-            if(!$characterImage->fullsize_hash) {
+            if (!$characterImage->fullsize_hash) {
                 $characterImage->fullsize_hash = randomString(15);
                 $characterImage->save();
             }
 
-            if(Config::get('lorekeeper.settings.masterlist_fullsizes_cap') != 0) {
-                $imageWidth = $image->width();
-                $imageHeight = $image->height();
-
-                if( $imageWidth > $imageHeight) {
+            if (config('lorekeeper.settings.masterlist_fullsizes_cap') != 0) {
+                if ($image->width() > $image->height()) {
                     // Landscape
-                    $image->resize(Config::get('lorekeeper.settings.masterlist_fullsizes_cap'), null, function ($constraint) {
+                    $image->resize(config('lorekeeper.settings.masterlist_fullsizes_cap'), null, function ($constraint) {
                         $constraint->aspectRatio();
                         $constraint->upsize();
                     });
-                }
-                else {
+                } else {
                     // Portrait
-                    $image->resize(null, Config::get('lorekeeper.settings.masterlist_fullsizes_cap'), function ($constraint) {
+                    $image->resize(null, config('lorekeeper.settings.masterlist_fullsizes_cap'), function ($constraint) {
                         $constraint->aspectRatio();
                         $constraint->upsize();
                     });
@@ -401,83 +244,129 @@ private function processImage($characterImage)
             }
 
             // Save the processed image
-            $image->save($characterImage->imagePath . '/' . $characterImage->fullsizeFileName, 100, Config::get('lorekeeper.settings.masterlist_image_format'));
-        }
-        else {
+            $image->save($characterImage->imagePath.'/'.$characterImage->fullsizeFileName, 100, config('lorekeeper.settings.masterlist_fullsizes_format'));
+        } else {
             // Delete fullsize if it was previously created.
-            if(isset($characterImage->fullsize_hash) ? file_exists( public_path($characterImage->imageDirectory.'/'.$characterImage->fullsizeFileName)) : FALSE) unlink($characterImage->imagePath . '/' . $characterImage->fullsizeFileName);
+            if (isset($characterImage->fullsize_hash) ? file_exists(public_path($characterImage->imageDirectory.'/'.$characterImage->fullsizeFileName)) : false) {
+                unlink($characterImage->imagePath.'/'.$characterImage->fullsizeFileName);
+            }
         }
 
         // Resize image if desired
-        if(Config::get('lorekeeper.settings.masterlist_image_dimension') != 0) {
-            $imageWidth = $image->width();
-            $imageHeight = $image->height();
-
-            if( $imageWidth > $imageHeight) {
+        if (config('lorekeeper.settings.masterlist_image_dimension') != 0) {
+            if ($image->width() > $image->height()) {
                 // Landscape
-                $image->resize(null, Config::get('lorekeeper.settings.masterlist_image_dimension'), function ($constraint) {
-                    $constraint->aspectRatio();
-                    $constraint->upsize();
-                });
-            }
-            else {
+                if (config('lorekeeper.settings.masterlist_image_dimension_target') == 'short') {
+                    $image->resize(null, config('lorekeeper.settings.masterlist_image_dimension'), function ($constraint) {
+                        $constraint->aspectRatio();
+                        $constraint->upsize();
+                    });
+                } else {
+                    $image->resize(config('lorekeeper.settings.masterlist_image_dimension'), null, function ($constraint) {
+                        $constraint->aspectRatio();
+                        $constraint->upsize();
+                    });
+                }
+            } else {
                 // Portrait
-                $image->resize(Config::get('lorekeeper.settings.masterlist_image_dimension'), null, function ($constraint) {
-                    $constraint->aspectRatio();
-                    $constraint->upsize();
-                });
+                if (config('lorekeeper.settings.masterlist_image_dimension_target') == 'short') {
+                    $image->resize(config('lorekeeper.settings.masterlist_image_dimension'), null, function ($constraint) {
+                        $constraint->aspectRatio();
+                        $constraint->upsize();
+                    });
+                } else {
+                    $image->resize(null, config('lorekeeper.settings.masterlist_image_dimension'), function ($constraint) {
+                        $constraint->aspectRatio();
+                        $constraint->upsize();
+                    });
+                }
             }
         }
         // Watermark the image if desired
-        if(Config::get('lorekeeper.settings.watermark_masterlist_images') == 1) {
+        if (config('lorekeeper.settings.watermark_masterlist_images') == 1) {
             $watermark = Image::make('images/watermark.png');
+
+            if (config('lorekeeper.settings.watermark_resizing') == 1) {
+                $imageWidth = $image->width();
+                $imageHeight = $image->height();
+
+                $wmWidth = $watermark->width();
+                $wmHeight = $watermark->height();
+
+                $wmScale = config('lorekeeper.settings.watermark_percent');
+
+                //Assume Landscape by Default
+                $maxSize = $imageWidth * $wmScale;
+
+                if ($imageWidth > $imageHeight) {
+                    //Landscape
+                    $maxSize = $imageWidth * $wmScale;
+                } else {
+                    // Portrait
+                    $maxSize = $imageHeight * $wmScale;
+                }
+
+                if ($wmWidth > $wmHeight) {
+                    //Landscape
+                    $watermark->resize($maxSize, null, function ($constraint) {
+                        $constraint->aspectRatio();
+                    });
+                } else {
+                    // Portrait
+                    $watermark->resize(null, $maxSize, function ($constraint) {
+                        $constraint->aspectRatio();
+                    });
+                }
+            }
             $image->insert($watermark, 'center');
         }
 
         // Save the processed image
-        $image->save($characterImage->imagePath . '/' . $characterImage->imageFileName, 100, Config::get('lorekeeper.settings.masterlist_image_format'));
+        $image->save($characterImage->imagePath.'/'.$characterImage->imageFileName, 100, config('lorekeeper.settings.masterlist_image_format'));
     }
 
     /**
      * Crops a thumbnail for the given image.
      *
-     * @param  array                                 $points
-     * @param  \App\Models\Character\CharacterImage  $characterImage
+     * @param array                                $points
+     * @param \App\Models\Character\CharacterImage $characterImage
+     * @param mixed                                $isMyo
      */
-    private function cropThumbnail($points, $characterImage, $isMyo = false)
-    {
-        $image = Image::make($characterImage->imagePath . '/' . $characterImage->imageFileName);
+    public function cropThumbnail($points, $characterImage, $isMyo = false) {
+        $imageProperties = getimagesize($characterImage->imagePath.'/'.$characterImage->imageFileName);
+        if ($imageProperties[0] > 2000 || $imageProperties[1] > 2000) {
+            // For large images (in terms of dimensions),
+            // use imagick instead, as it's better at handling them
+            Config::set('image.driver', 'imagick');
+        }
 
-        if(Config::get('lorekeeper.settings.masterlist_image_format') != 'png' && Config::get('lorekeeper.settings.masterlist_image_format') != null && Config::get('lorekeeper.settings.masterlist_image_background') != null) {
-            $canvas = Image::canvas($image->width(), $image->height(), Config::get('lorekeeper.settings.masterlist_image_background'));
+        $image = Image::make($characterImage->imagePath.'/'.$characterImage->imageFileName);
+
+        if (!in_array(config('lorekeeper.settings.masterlist_image_format'), ['png', 'webp']) && config('lorekeeper.settings.masterlist_image_format') != null && config('lorekeeper.settings.masterlist_image_background') != null) {
+            $canvas = Image::canvas($image->width(), $image->height(), config('lorekeeper.settings.masterlist_image_background'));
             $image = $canvas->insert($image, 'center');
-            $trimColor = TRUE;
+            $trimColor = true;
         }
 
-        if(Config::get('lorekeeper.settings.watermark_masterlist_thumbnails') == 1 && !$isMyo) {
+        if (config('lorekeeper.settings.watermark_masterlist_thumbnails') == 1 && !$isMyo) {
             // Trim transparent parts of image.
             $image->trim(isset($trimColor) && $trimColor ? 'top-left' : 'transparent');
 
-            if (Config::get('lorekeeper.settings.masterlist_image_automation') == 1)
-            {
+            if (config('lorekeeper.settings.masterlist_image_automation') == 1) {
                 // Make the image be square
-                $imageWidth = $image->width();
-                $imageHeight = $image->height();
-
-                if( $imageWidth > $imageHeight) {
+                if ($image->width() > $image->height()) {
                     // Landscape
                     $canvas = Image::canvas($image->width(), $image->width());
                     $image = $canvas->insert($image, 'center');
-                }
-                else {
+                } else {
                     // Portrait
                     $canvas = Image::canvas($image->height(), $image->height());
                     $image = $canvas->insert($image, 'center');
                 }
             }
 
-            $cropWidth = Config::get('lorekeeper.settings.masterlist_thumbnails.width');
-            $cropHeight = Config::get('lorekeeper.settings.masterlist_thumbnails.height');
+            $cropWidth = config('lorekeeper.settings.masterlist_thumbnails.width');
+            $cropHeight = config('lorekeeper.settings.masterlist_thumbnails.height');
 
             $imageWidthOld = $image->width();
             $imageHeightOld = $image->height();
@@ -485,118 +374,155 @@ private function cropThumbnail($points, $characterImage, $isMyo = false)
             $trimOffsetX = $imageWidthOld - $image->width();
             $trimOffsetY = $imageHeightOld - $image->height();
 
-            if(Config::get('lorekeeper.settings.watermark_masterlist_images') == 1) {
+            if (config('lorekeeper.settings.watermark_masterlist_images') == 1) {
                 // Resize image if desired, so that the watermark is applied to the correct size of image
-                if(Config::get('lorekeeper.settings.masterlist_image_dimension') != 0) {
-                    $imageWidth = $image->width();
-                    $imageHeight = $image->height();
-
-                    if( $imageWidth > $imageHeight) {
+                if (config('lorekeeper.settings.masterlist_image_dimension') != 0) {
+                    if ($image->width() > $image->height()) {
                         // Landscape
-                        $image->resize(null, Config::get('lorekeeper.settings.masterlist_image_dimension'), function ($constraint) {
+                        $image->resize(null, config('lorekeeper.settings.masterlist_image_dimension'), function ($constraint) {
                             $constraint->aspectRatio();
                             $constraint->upsize();
                         });
-                    }
-                    else {
+                    } else {
                         // Portrait
-                        $image->resize(Config::get('lorekeeper.settings.masterlist_image_dimension'), null, function ($constraint) {
+                        $image->resize(config('lorekeeper.settings.masterlist_image_dimension'), null, function ($constraint) {
                             $constraint->aspectRatio();
                             $constraint->upsize();
                         });
                     }
                 }
-            // Watermark the image
+                // Watermark the image
                 $watermark = Image::make('images/watermark.png');
-                $image->insert($watermark, 'center');
-            }
-            // Now shrink the image
-            {
-                $imageWidth = $image->width();
-                $imageHeight = $image->height();
 
-                if( $imageWidth > $imageHeight) {
-                    // Landscape
-                    $image->resize(null, $cropWidth, function ($constraint) {
-                        $constraint->aspectRatio();
-                        $constraint->upsize();
-                    });
-                }
-                else {
-                    // Portrait
-                    $image->resize($cropHeight, null, function ($constraint) {
-                        $constraint->aspectRatio();
-                        $constraint->upsize();
-                    });
-                }
-            }
-            if (Config::get('lorekeeper.settings.masterlist_image_automation') == 0)
-            {
-                $xOffset = 0 + (($points['x0'] - $trimOffsetX) > 0 ? ($points['x0'] - $trimOffsetX) : 0);
-                if(($xOffset + $cropWidth) > $image->width()) $xOffsetNew = $cropWidth - ($image->width() - $xOffset);
-                if(isset($xOffsetNew)) if(($xOffsetNew + $cropWidth) > $image->width()) $xOffsetNew = $image->width() - $cropWidth;
-                $yOffset = 0 + (($points['y0'] - $trimOffsetY) > 0 ? ($points['y0'] - $trimOffsetY) : 0);
-                if(($yOffset + $cropHeight) > $image->height()) $yOffsetNew = $cropHeight - ($image->height() - $yOffset);
-                if(isset($yOffsetNew)) if(($yOffsetNew + $cropHeight) > $image->height()) $yOffsetNew = $image->height() - $cropHeight;
+                if (config('lorekeeper.settings.watermark_resizing_thumb') == 1) {
+                    $imageWidth = $image->width();
+                    $imageHeight = $image->height();
 
-                // Crop according to the selected area
-                $image->crop($cropWidth, $cropHeight, isset($xOffsetNew) ? $xOffsetNew : $xOffset, isset($yOffsetNew) ? $yOffsetNew : $yOffset);
-            }
-        }
-        else {
-            $cropWidth = $points['x1'] - $points['x0'];
-            $cropHeight = $points['y1'] - $points['y0'];
+                    $wmWidth = $watermark->width();
+                    $wmHeight = $watermark->height();
 
-            if (Config::get('lorekeeper.settings.masterlist_image_automation') == 0)
-            {
-                // Crop according to the selected area
-                $image->crop($cropWidth, $cropHeight, $points['x0'], $points['y0']);
-            }
+                    $wmScale = config('lorekeeper.settings.watermark_percent');
 
-            // Resize to fit the thumbnail size
-            $image->resize(Config::get('lorekeeper.settings.masterlist_thumbnails.width'), Config::get('lorekeeper.settings.masterlist_thumbnails.height'));
-        }
+                    //Assume Landscape by Default
+                    $maxSize = $imageWidth * $wmScale;
 
-        // Save the thumbnail
-        $image->save($characterImage->thumbnailPath . '/' . $characterImage->thumbnailFileName, 100, Config::get('lorekeeper.settings.masterlist_image_format'));
-    }
+                    if ($imageWidth > $imageHeight) {
+                        //Landscape
+                        $maxSize = $imageWidth * $wmScale;
+                    } else {
+                        // Portrait
+                        $maxSize = $imageHeight * $wmScale;
+                    }
 
-    /**
-     * Creates a character log.
-     *
-     * @param  int     $senderId
-     * @param  string  $senderUrl
-     * @param  int     $recipientId
-     * @param  string  $recipientUrl
-     * @param  int     $characterId
-     * @param  string  $type
-     * @param  string  $data
-     * @param  string  $logType
-     * @param  bool    $isUpdate
-     * @param  string  $oldData
-     * @param  string  $newData
-     * @return bool
-     */
-    public function createLog($senderId, $senderUrl, $recipientId, $recipientUrl, $characterId, $type, $data, $logType, $isUpdate = false, $oldData = null, $newData = null)
-    {
+                    if ($wmWidth > $wmHeight) {
+                        //Landscape
+                        $watermark->resize($maxSize, null, function ($constraint) {
+                            $constraint->aspectRatio();
+                        });
+                    } else {
+                        // Portrait
+                        $watermark->resize(null, $maxSize, function ($constraint) {
+                            $constraint->aspectRatio();
+                        });
+                    }
+                }
+                $image->insert($watermark, 'center');
+            }
+            // Now shrink the image
+
+            $imageWidth = $image->width();
+            $imageHeight = $image->height();
+
+            if ($imageWidth > $imageHeight) {
+                // Landscape
+                $image->resize(null, $cropWidth, function ($constraint) {
+                    $constraint->aspectRatio();
+                    $constraint->upsize();
+                });
+            } else {
+                // Portrait
+                $image->resize($cropHeight, null, function ($constraint) {
+                    $constraint->aspectRatio();
+                    $constraint->upsize();
+                });
+            }
+
+            if (config('lorekeeper.settings.masterlist_image_automation') == 0) {
+                $xOffset = 0 + (($points['x0'] - $trimOffsetX) > 0 ? ($points['x0'] - $trimOffsetX) : 0);
+                if (($xOffset + $cropWidth) > $image->width()) {
+                    $xOffsetNew = $cropWidth - ($image->width() - $xOffset);
+                }
+                if (isset($xOffsetNew)) {
+                    if (($xOffsetNew + $cropWidth) > $image->width()) {
+                        $xOffsetNew = $image->width() - $cropWidth;
+                    }
+                }
+                $yOffset = 0 + (($points['y0'] - $trimOffsetY) > 0 ? ($points['y0'] - $trimOffsetY) : 0);
+                if (($yOffset + $cropHeight) > $image->height()) {
+                    $yOffsetNew = $cropHeight - ($image->height() - $yOffset);
+                }
+                if (isset($yOffsetNew)) {
+                    if (($yOffsetNew + $cropHeight) > $image->height()) {
+                        $yOffsetNew = $image->height() - $cropHeight;
+                    }
+                }
+
+                // Crop according to the selected area
+                $image->crop($cropWidth, $cropHeight, $xOffsetNew ?? $xOffset, $yOffsetNew ?? $yOffset);
+            }
+        } else {
+            $cropWidth = $points['x1'] - $points['x0'];
+            $cropHeight = $points['y1'] - $points['y0'];
+
+            if (config('lorekeeper.settings.masterlist_image_automation') == 0) {
+                // Crop according to the selected area
+                $image->crop($cropWidth, $cropHeight, $points['x0'], $points['y0']);
+            }
+
+            // Resize to fit the thumbnail size
+            $image->resize(config('lorekeeper.settings.masterlist_thumbnails.width'), config('lorekeeper.settings.masterlist_thumbnails.height'));
+        }
+
+        // Save the thumbnail
+        $image->save($characterImage->thumbnailPath.'/'.$characterImage->thumbnailFileName, 100, config('lorekeeper.settings.masterlist_image_format'));
+    }
+
+    /**
+     * Creates a character log.
+     *
+     * @param int    $senderId
+     * @param string $senderUrl
+     * @param int    $recipientId
+     * @param string $recipientUrl
+     * @param int    $characterId
+     * @param string $type
+     * @param string $data
+     * @param string $logType
+     * @param bool   $isUpdate
+     * @param string $oldData
+     * @param string $newData
+     *
+     * @return bool
+     */
+    public function createLog($senderId, $senderUrl, $recipientId, $recipientUrl, $characterId, $type, $data, $logType, $isUpdate = false, $oldData = null, $newData = null) {
         return DB::table($logType == 'character' ? 'character_log' : 'user_character_log')->insert(
             [
-                'sender_id' => $senderId,
-                'sender_url' => $senderUrl,
-                'recipient_id' => $recipientId,
+                'sender_id'     => $senderId,
+                'sender_url'    => $senderUrl,
+                'recipient_id'  => $recipientId,
                 'recipient_url' => $recipientUrl,
-                'character_id' => $characterId,
-                'log' => $type . ($data ? ' (' . $data . ')' : ''),
-                'log_type' => $type,
-                'data' => $data,
-                'created_at' => Carbon::now(),
-                'updated_at' => Carbon::now()
+                'character_id'  => $characterId,
+                'log'           => $type.($data ? ' ('.$data.')' : ''),
+                'log_type'      => $type,
+                'data'          => $data,
+                'created_at'    => Carbon::now(),
+                'updated_at'    => Carbon::now(),
             ] + ($logType == 'character' ?
                 [
                     'change_log' => $isUpdate ? json_encode([
                         'old' => $oldData,
-                        'new' => $newData
-                    ]) : null
+                        'new' => $newData,
+                    ]) : null,
                 ] : [])
         );
     }
@@ -604,51 +530,64 @@ public function createLog($senderId, $senderUrl, $recipientId, $recipientUrl, $c
     /**
      * Creates a character image.
      *
-     * @param  array                            $data
-     * @param  \App\Models\Character\Character  $character
-     * @param  \App\Models\User\User            $user
-     * @return  \App\Models\Character\Character|bool
+     * @param array                           $data
+     * @param \App\Models\Character\Character $character
+     * @param \App\Models\User\User           $user
+     *
+     * @return \App\Models\Character\Character|bool
      */
-    public function createImage($data, $character, $user)
-    {
+    public function createImage($data, $character, $user) {
         DB::beginTransaction();
 
         try {
-            if(!$character->is_myo_slot)
-            {
-                if(!(isset($data['species_id']) && $data['species_id'])) throw new \Exception('Characters require a species.');
-                if(!(isset($data['rarity_id']) && $data['rarity_id'])) throw new \Exception('Characters require a rarity.');
+            if (!$character->is_myo_slot) {
+                if (!(isset($data['species_id']) && $data['species_id'])) {
+                    throw new \Exception('Characters require a species.');
+                }
+                if (!(isset($data['rarity_id']) && $data['rarity_id'])) {
+                    throw new \Exception('Characters require a rarity.');
+                }
             }
-            if(isset($data['subtype_id']) && $data['subtype_id'])
-            {
+            if (isset($data['subtype_id']) && $data['subtype_id']) {
                 $subtype = Subtype::find($data['subtype_id']);
-                if(!(isset($data['species_id']) && $data['species_id'])) throw new \Exception('Species must be selected to select a subtype.');
-                if(!$subtype || $subtype->species_id != $data['species_id']) throw new \Exception('Selected subtype invalid or does not match species.');
+                if (!(isset($data['species_id']) && $data['species_id'])) {
+                    throw new \Exception('Species must be selected to select a subtype.');
+                }
+                if (!$subtype || $subtype->species_id != $data['species_id']) {
+                    throw new \Exception('Selected subtype invalid or does not match species.');
+                }
+            } else {
+                $data['subtype_id'] = null;
             }
-            else $data['subtype_id'] = null;
 
             $data['is_visible'] = 1;
 
             // Create character image
             $image = $this->handleCharacterImage($data, $character);
-            if(!$image) throw new \Exception("Error happened while trying to create image.");
+            if (!$image) {
+                throw new \Exception('Error happened while trying to create image.');
+            }
 
             // Update the character's image ID
             $character->character_image_id = $image->id;
             $character->save();
 
+            if (!$this->logAdminAction($user, 'Created Image', 'Created character image <a href="'.$character->url.'">#'.$image->id.'</a>')) {
+                throw new \Exception('Failed to log admin action.');
+            }
+
             // Add a log for the character
             // This logs all the updates made to the character
             $this->createLog($user->id, null, $character->user_id, ($character->user_id ? null : $character->owner_url), $character->id, 'Character Image Uploaded', '[#'.$image->id.']', 'character');
 
             // If the recipient has an account, send them a notification
-            if($character->user && $user->id != $character->user_id && $character->is_visible) {
+            if ($character->user && $user->id != $character->user_id && $character->is_visible) {
                 Notifications::create('IMAGE_UPLOAD', $character->user, [
-                    'character_url' => $character->url,
+                    'character_url'  => $character->url,
                     'character_slug' => $character->slug,
                     'character_name' => $character->name,
-                    'sender_url' => $user->url,
-                    'sender_name' => $user->name
+                    'sender_url'     => $user->url,
+                    'sender_name'    => $user->name,
                 ]);
             }
 
@@ -656,31 +595,39 @@ public function createImage($data, $character, $user)
             $character->notifyBookmarkers('BOOKMARK_IMAGE');
 
             return $this->commitReturn($character);
-        } catch(\Exception $e) {
+        } catch (\Exception $e) {
             $this->setError('error', $e->getMessage());
         }
+
         return $this->rollbackReturn(false);
     }
 
     /**
      * Updates a character image.
      *
-     * @param  array                                 $data
-     * @param  \App\Models\Character\CharacterImage  $image
-     * @param  \App\Models\User\User                 $user
-     * @return  bool
+     * @param array                                $data
+     * @param \App\Models\Character\CharacterImage $image
+     * @param \App\Models\User\User                $user
+     *
+     * @return bool
      */
-    public function updateImageFeatures($data, $image, $user)
-    {
+    public function updateImageFeatures($data, $image, $user) {
         DB::beginTransaction();
 
         try {
             // Check that the subtype matches
-            if(isset($data['subtype_id']) && $data['subtype_id'])
-            {
+            if (isset($data['subtype_id']) && $data['subtype_id']) {
                 $subtype = Subtype::find($data['subtype_id']);
-                if(!(isset($data['species_id']) && $data['species_id'])) throw new \Exception('Species must be selected to select a subtype.');
-                if(!$subtype || $subtype->species_id != $data['species_id']) throw new \Exception('Selected subtype invalid or does not match species.');
+                if (!(isset($data['species_id']) && $data['species_id'])) {
+                    throw new \Exception('Species must be selected to select a subtype.');
+                }
+                if (!$subtype || $subtype->species_id != $data['species_id']) {
+                    throw new \Exception('Selected subtype invalid or does not match species.');
+                }
+            }
+
+            if (!$this->logAdminAction($user, 'Updated Image', 'Updated character image features on <a href="'.$image->character->url.'">#'.$image->id.'</a>')) {
+                throw new \Exception('Failed to log admin action.');
             }
 
             // Log old features
@@ -695,8 +642,8 @@ public function updateImageFeatures($data, $image, $user)
             $image->features()->delete();
 
             // Attach features
-            foreach($data['feature_id'] as $key => $featureId) {
-                if($featureId) {
+            foreach ($data['feature_id'] as $key => $featureId) {
+                if ($featureId) {
                     $feature = CharacterFeature::create(['character_image_id' => $image->id, 'feature_id' => $featureId, 'data' => $data['feature_data'][$key]]);
                 }
             }
@@ -725,36 +672,23 @@ public function updateImageFeatures($data, $image, $user)
             $this->createLog($user->id, null, null, null, $image->character_id, 'Traits Updated', '#'.$image->id, 'character', true, $old, $new);
 
             return $this->commitReturn(true);
-        } catch(\Exception $e) {
+        } catch (\Exception $e) {
             $this->setError('error', $e->getMessage());
         }
-        return $this->rollbackReturn(false);
-    }
 
-    /**
-     * Generates a list of features for displaying.
-     *
-     * @param  \App\Models\Character\CharacterImage  $image
-     * @return  string
-     */
-    private function generateFeatureList($image)
-    {
-        $result = '';
-        foreach($image->features as $feature)
-            $result .= '<div>' . ($feature->feature->category ? '<strong>' . $feature->feature->category->displayName . ':</strong> ' : '') . $feature->feature->displayName . '</div>';
-        return $result;
+        return $this->rollbackReturn(false);
     }
 
     /**
      * Updates image data.
      *
-     * @param  array                                 $data
-     * @param  \App\Models\Character\CharacterImage  $image
-     * @param  \App\Models\User\User                 $user
-     * @return  bool
+     * @param array                                $data
+     * @param \App\Models\Character\CharacterImage $image
+     * @param \App\Models\User\User                $user
+     *
+     * @return bool
      */
-    public function updateImageNotes($data, $image, $user)
-    {
+    public function updateImageNotes($data, $image, $user) {
         DB::beginTransaction();
 
         try {
@@ -765,83 +699,100 @@ public function updateImageNotes($data, $image, $user)
             $image->parsed_description = parse($data['description']);
             $image->save();
 
+            if (!$this->logAdminAction($user, 'Updated Image Notes', 'Updated image <a href="'.$image->character->url.'">#'.$image->id.'</a>')) {
+                throw new \Exception('Failed to log admin action.');
+            }
+
             // Add a log for the character
             // This logs all the updates made to the character
             $this->createLog($user->id, null, null, null, $image->character_id, 'Image Notes Updated', '[#'.$image->id.']', 'character', true, $old, $image->parsed_description);
 
             return $this->commitReturn(true);
-        } catch(\Exception $e) {
+        } catch (\Exception $e) {
             $this->setError('error', $e->getMessage());
         }
+
         return $this->rollbackReturn(false);
     }
 
     /**
      * Updates image credits.
      *
-     * @param  array                                 $data
-     * @param  \App\Models\Character\CharacterImage  $image
-     * @param  \App\Models\User\User                 $user
-     * @return  bool
+     * @param array                                $data
+     * @param \App\Models\Character\CharacterImage $image
+     * @param \App\Models\User\User                $user
+     *
+     * @return bool
      */
-    public function updateImageCredits($data, $image, $user)
-    {
+    public function updateImageCredits($data, $image, $user) {
         DB::beginTransaction();
 
         try {
+            if (!$this->logAdminAction($user, 'Updated Image Credits', 'Updated character image credits on <a href="'.$image->character->url.'">#'.$image->id.'</a>')) {
+                throw new \Exception('Failed to log admin action.');
+            }
+
             $old = $this->generateCredits($image);
 
             // Clear old artists/designers
             $image->creators()->delete();
 
             // Check if entered url(s) have aliases associated with any on-site users
-            foreach($data['designer_url'] as $key=>$url) {
+            $designers = array_filter($data['designer_url']); // filter null values
+            foreach ($designers as $key=> $url) {
                 $recipient = checkAlias($url, false);
-                if(is_object($recipient)) {
+                if (is_object($recipient)) {
                     $data['designer_id'][$key] = $recipient->id;
-                    $data['designer_url'][$key] = null;
+                    $designers[$key] = null;
                 }
             }
-            foreach($data['artist_url'] as $key=>$url) {
+            $artists = array_filter($data['artist_url']);  // filter null values
+            foreach ($artists as $key=> $url) {
                 $recipient = checkAlias($url, false);
-                if(is_object($recipient)) {
+                if (is_object($recipient)) {
                     $data['artist_id'][$key] = $recipient->id;
-                    $data['artist_url'][$key] = null;
+                    $artists[$key] = null;
                 }
             }
 
             // Check that users with the specified id(s) exist on site
-            foreach($data['designer_id'] as $id) {
-                if(isset($id) && $id) {
+            foreach ($data['designer_id'] as $id) {
+                if (isset($id) && $id) {
                     $user = User::find($id);
-                    if(!$user) throw new \Exception('One or more designers is invalid.');
+                    if (!$user) {
+                        throw new \Exception('One or more designers is invalid.');
+                    }
                 }
             }
-            foreach($data['artist_id'] as $id) {
-                if(isset($id) && $id) {
+            foreach ($data['artist_id'] as $id) {
+                if (isset($id) && $id) {
                     $user = $user = User::find($id);
-                    if(!$user) throw new \Exception('One or more artists is invalid.');
+                    if (!$user) {
+                        throw new \Exception('One or more artists is invalid.');
+                    }
                 }
             }
 
             // Attach artists/designers
-            foreach($data['designer_id'] as $key => $id) {
-                if($id || $data['designer_url'][$key])
+            foreach ($data['designer_id'] as $key => $id) {
+                if ($id || $data['designer_url'][$key]) {
                     DB::table('character_image_creators')->insert([
                         'character_image_id' => $image->id,
-                        'type' => 'Designer',
-                        'url' => $data['designer_url'][$key],
-                        'user_id' => $id
+                        'type'               => 'Designer',
+                        'url'                => $data['designer_url'][$key],
+                        'user_id'            => $id,
                     ]);
+                }
             }
-            foreach($data['artist_id'] as $key => $id) {
-                if($id || $data['artist_url'][$key])
+            foreach ($data['artist_id'] as $key => $id) {
+                if ($id || $data['artist_url'][$key]) {
                     DB::table('character_image_creators')->insert([
                         'character_image_id' => $image->id,
-                        'type' => 'Artist',
-                        'url' => $data['artist_url'][$key],
-                        'user_id' => $id
+                        'type'               => 'Artist',
+                        'url'                => $data['artist_url'][$key],
+                        'user_id'            => $id,
                     ]);
+                }
             }
 
             // Add a log for the character
@@ -849,52 +800,48 @@ public function updateImageCredits($data, $image, $user)
             $this->createLog($user->id, null, null, null, $image->character_id, 'Image Credits Updated', '[#'.$image->id.']', 'character', true, $old, $this->generateCredits($image));
 
             return $this->commitReturn(true);
-        } catch(\Exception $e) {
+        } catch (\Exception $e) {
             $this->setError('error', $e->getMessage());
         }
-        return $this->rollbackReturn(false);
-    }
 
-    /**
-     * Generates a list of image credits for displaying.
-     *
-     * @param  \App\Models\Character\CharacterImage  $image
-     * @return  string
-     */
-    private function generateCredits($image)
-    {
-        $result = ['designers' => '', 'artists' => ''];
-        foreach($image->designers as $designer)
-            $result['designers'] .= '<div>' . $designer->displayLink() . '</div>';
-        foreach($image->artists as $artist)
-            $result['artists'] .= '<div>' . $artist->displayLink() . '</div>';
-        return $result;
+        return $this->rollbackReturn(false);
     }
 
     /**
      * Reuploads an image.
      *
-     * @param  array                                 $data
-     * @param  \App\Models\Character\CharacterImage  $image
-     * @param  \App\Models\User\User                 $user
-     * @return  bool
+     * @param array                                $data
+     * @param \App\Models\Character\CharacterImage $image
+     * @param \App\Models\User\User                $user
+     *
+     * @return bool
      */
-    public function reuploadImage($data, $image, $user)
-    {
+    public function reuploadImage($data, $image, $user) {
         DB::beginTransaction();
 
         try {
-            if(Config::get('lorekeeper.settings.masterlist_image_format') != null) {
+            if (!$this->logAdminAction($user, 'Reuploaded Image', 'Reuploaded character image <a href="'.$image->character->url.'">#'.$image->id.'</a>')) {
+                throw new \Exception('Failed to log admin action.');
+            }
+
+            if (config('lorekeeper.settings.masterlist_image_format') != null) {
                 // Remove old versions so that images in various filetypes don't pile up
-                unlink($image->imagePath . '/' . $image->imageFileName);
-                if(isset($image->fullsize_hash) ? file_exists( public_path($image->imageDirectory.'/'.$image->fullsizeFileName)) : FALSE) unlink($image->imagePath . '/' . $image->fullsizeFileName);
-                unlink($image->imagePath . '/' . $image->thumbnailFileName);
+                if (file_exists($image->imagePath.'/'.$image->imageFileName)) {
+                    unlink($image->imagePath.'/'.$image->imageFileName);
+                }
+                if (isset($image->fullsize_hash) ? file_exists(public_path($image->imageDirectory.'/'.$image->fullsizeFileName)) : false) {
+                    if (file_exists($image->imagePath.'/'.$image->fullsizeFileName)) {
+                        unlink($image->imagePath.'/'.$image->fullsizeFileName);
+                    }
+                }
+                if (file_exists($image->imagePath.'/'.$image->thumbnailFileName)) {
+                    unlink($image->imagePath.'/'.$image->thumbnailFileName);
+                }
 
                 // Set the image's extension in the DB as defined in settings
-                $image->extension = Config::get('lorekeeper.settings.masterlist_image_format');
+                $image->extension = config('lorekeeper.settings.masterlist_image_format');
                 $image->save();
-            }
-            else {
+            } else {
                 // Get uploaded image's extension and save it to the DB
                 $image->extension = $data['image']->getClientOriginalExtension();
                 $image->save();
@@ -905,71 +852,99 @@ public function reuploadImage($data, $image, $user)
 
             $isMyo = $image->character->is_myo_slot ? true : false;
             // Save thumbnail
-            if(isset($data['use_cropper'])) $this->cropThumbnail(Arr::only($data, ['x0','x1','y0','y1']), $image, $isMyo);
-            else $this->handleImage($data['thumbnail'], $image->thumbnailPath, $image->thumbnailFileName);
+            if (isset($data['use_cropper'])) {
+                $this->cropThumbnail(Arr::only($data, ['x0', 'x1', 'y0', 'y1']), $image, $isMyo);
+            } else {
+                $this->handleImage($data['thumbnail'], $image->thumbnailPath, $image->thumbnailFileName);
+            }
 
             // Process and save the image itself
-            if(!$isMyo) $this->processImage($image);
+            if (!$isMyo) {
+                $this->processImage($image);
+            }
 
             // Add a log for the character
             // This logs all the updates made to the character
             $this->createLog($user->id, null, null, null, $image->character_id, 'Image Reuploaded', '[#'.$image->id.']', 'character');
 
             return $this->commitReturn(true);
-        } catch(\Exception $e) {
+        } catch (\Exception $e) {
             $this->setError('error', $e->getMessage());
         }
+
         return $this->rollbackReturn(false);
     }
 
     /**
      * Deletes an image.
      *
-     * @param  \App\Models\Character\CharacterImage  $image
-     * @param  \App\Models\User\User                 $user
-     * @return  bool
+     * @param \App\Models\Character\CharacterImage $image
+     * @param \App\Models\User\User                $user
+     * @param bool                                 $forceDelete
+     *
+     * @return bool
      */
-    public function deleteImage($image, $user)
-    {
+    public function deleteImage($image, $user, $forceDelete = false) {
         DB::beginTransaction();
 
         try {
-            if($image->character->character_image_id == $image->id) throw new \Exception("Cannot delete a character's active image.");
+            if (!$this->logAdminAction($user, 'Deleted Image', 'Deleted character image <a href="'.$image->character->url.'">#'.$image->id.'</a>')) {
+                throw new \Exception('Failed to log admin action.');
+            }
+
+            if (!$forceDelete && $image->character->character_image_id == $image->id) {
+                throw new \Exception("Cannot delete a character's active image.");
+            }
 
             $image->features()->delete();
 
             $image->delete();
 
             // Delete the image files
-            unlink($image->imagePath . '/' . $image->imageFileName);
-            if(isset($image->fullsize_hash) ? file_exists( public_path($image->imageDirectory.'/'.$image->fullsizeFileName)) : FALSE) unlink($image->imagePath . '/' . $image->fullsizeFileName);
-            unlink($image->imagePath . '/' . $image->thumbnailFileName);
+            if (file_exists($image->imagePath.'/'.$image->imageFileName)) {
+                unlink($image->imagePath.'/'.$image->imageFileName);
+            }
+            if (isset($image->fullsize_hash) ? file_exists(public_path($image->imageDirectory.'/'.$image->fullsizeFileName)) : false) {
+                if (file_exists($image->imagePath.'/'.$image->fullsizeFileName)) {
+                    unlink($image->imagePath.'/'.$image->fullsizeFileName);
+                }
+            }
+            if (file_exists($image->imagePath.'/'.$image->thumbnailFileName)) {
+                unlink($image->imagePath.'/'.$image->thumbnailFileName);
+            }
 
             // Add a log for the character
             // This logs all the updates made to the character
             $this->createLog($user->id, null, null, null, $image->character_id, 'Image Deleted', '[#'.$image->id.']', 'character');
 
             return $this->commitReturn(true);
-        } catch(\Exception $e) {
+        } catch (\Exception $e) {
             $this->setError('error', $e->getMessage());
         }
+
         return $this->rollbackReturn(false);
     }
 
     /**
      * Updates image settings.
      *
-     * @param  array                                 $data
-     * @param  \App\Models\Character\CharacterImage  $image
-     * @param  \App\Models\User\User                 $user
-     * @return  bool
+     * @param array                                $data
+     * @param \App\Models\Character\CharacterImage $image
+     * @param \App\Models\User\User                $user
+     *
+     * @return bool
      */
-    public function updateImageSettings($data, $image, $user)
-    {
+    public function updateImageSettings($data, $image, $user) {
         DB::beginTransaction();
 
         try {
-            if($image->character->character_image_id == $image->id && !isset($data['is_visible'])) throw new \Exception("Cannot hide a character's active image.");
+            if (!$this->logAdminAction($user, 'Updated Image', 'Updated character image settings on <a href="'.$image->character->url.'">#'.$image->id.'</a>')) {
+                throw new \Exception('Failed to log admin action.');
+            }
+
+            if ($image->character->character_image_id == $image->id && !isset($data['is_visible'])) {
+                throw new \Exception("Cannot hide a character's active image.");
+            }
 
             $image->is_valid = isset($data['is_valid']);
             $image->is_visible = isset($data['is_visible']);
@@ -980,26 +955,35 @@ public function updateImageSettings($data, $image, $user)
             $this->createLog($user->id, null, null, null, $image->character_id, 'Image Visibility/Validity Updated', '[#'.$image->id.']', 'character');
 
             return $this->commitReturn(true);
-        } catch(\Exception $e) {
+        } catch (\Exception $e) {
             $this->setError('error', $e->getMessage());
         }
+
         return $this->rollbackReturn(false);
     }
 
     /**
      * Updates a character's active image.
      *
-     * @param  \App\Models\Character\CharacterImage  $image
-     * @param  \App\Models\User\User                 $user
-     * @return  bool
+     * @param \App\Models\Character\CharacterImage $image
+     * @param \App\Models\User\User                $user
+     *
+     * @return bool
      */
-    public function updateActiveImage($image, $user)
-    {
+    public function updateActiveImage($image, $user) {
         DB::beginTransaction();
 
         try {
-            if($image->character->character_image_id == $image->id) return true;
-            if(!$image->is_visible) throw new \Exception("Cannot set a non-visible image as the character's active image.");
+            if (!$this->logAdminAction($user, 'Updated Image', 'Set image <a href="'.$image->character->url.'">#'.$image->id.'</a> to active image')) {
+                throw new \Exception('Failed to log admin action.');
+            }
+
+            if ($image->character->character_image_id == $image->id) {
+                return true;
+            }
+            if (!$image->is_visible) {
+                throw new \Exception("Cannot set a non-visible image as the character's active image.");
+            }
 
             $image->character->character_image_id = $image->id;
             $image->character->save();
@@ -1009,34 +993,38 @@ public function updateActiveImage($image, $user)
             $this->createLog($user->id, null, null, null, $image->character_id, 'Active Image Updated', '[#'.$image->id.']', 'character');
 
             return $this->commitReturn(true);
-        } catch(\Exception $e) {
+        } catch (\Exception $e) {
             $this->setError('error', $e->getMessage());
         }
+
         return $this->rollbackReturn(false);
     }
 
     /**
-     * Sorts a character's images
+     * Sorts a character's images.
      *
-     * @param  array                            $data
-     * @param  \App\Models\Character\Character  $image
-     * @param  \App\Models\User\User            $user
-     * @return  bool
+     * @param array                 $data
+     * @param \App\Models\User\User $user
+     * @param mixed                 $character
+     *
+     * @return bool
      */
-    public function sortImages($data, $character, $user)
-    {
+    public function sortImages($data, $character, $user) {
         DB::beginTransaction();
 
         try {
             $ids = explode(',', $data['sort']);
-            $images = CharacterImage::whereIn('id', $ids)->where('character_id', $character->id)->orderByRaw(DB::raw('FIELD(id, '.implode(',', $ids).')'))->get();
+            $images = CharacterImage::whereIn('id', $ids)->where('character_id', $character->id)->orderBy(DB::raw('FIELD(id, '.implode(',', $ids).')'))->get();
 
-            if(count($images) != count($ids)) throw new \Exception("Invalid image included in sorting order.");
-            if(!$images->first()->is_visible) throw new \Exception("Cannot set a non-visible image as the character's active image.");
+            if (count($images) != count($ids)) {
+                throw new \Exception('Invalid image included in sorting order.');
+            }
+            if (!$images->first()->is_visible) {
+                throw new \Exception("Cannot set a non-visible image as the character's active image.");
+            }
 
             $count = 0;
-            foreach($images as $image)
-            {
+            foreach ($images as $image) {
                 //if($count == 1)
                 //{
                 //    // Set the first one as the active image
@@ -1053,58 +1041,67 @@ public function sortImages($data, $character, $user)
             $this->createLog($user->id, null, null, null, $image->character_id, 'Image Order Updated', '', 'character');
 
             return $this->commitReturn(true);
-        } catch(\Exception $e) {
+        } catch (\Exception $e) {
             $this->setError('error', $e->getMessage());
         }
+
         return $this->rollbackReturn(false);
     }
 
     /**
      * Sorts a user's characters.
      *
-     * @param  array                                 $data
-     * @param  \App\Models\User\User                 $user
-     * @return  bool
+     * @param array                 $data
+     * @param \App\Models\User\User $user
+     *
+     * @return bool
      */
-    public function sortCharacters($data, $user)
-    {
+    public function sortCharacters($data, $user) {
         DB::beginTransaction();
 
         try {
             $ids = array_reverse(explode(',', $data['sort']));
-            $characters = Character::myo(0)->whereIn('id', $ids)->where('user_id', $user->id)->where('is_visible', 1)->orderByRaw(DB::raw('FIELD(id, '.implode(',', $ids).')'))->get();
+            $characters = Character::myo(0)->whereIn('id', $ids)->where('user_id', $user->id)->where('is_visible', 1)->orderBy(DB::raw('FIELD(id, '.implode(',', $ids).')'))->get();
 
-            if(count($characters) != count($ids)) throw new \Exception("Invalid character included in sorting order.");
+            if (count($characters) != count($ids)) {
+                throw new \Exception('Invalid character included in sorting order.');
+            }
 
             $count = 0;
-            foreach($characters as $character)
-            {
+            foreach ($characters as $character) {
                 $character->sort = $count;
                 $character->save();
                 $count++;
             }
 
             return $this->commitReturn(true);
-        } catch(\Exception $e) {
+        } catch (\Exception $e) {
             $this->setError('error', $e->getMessage());
         }
+
         return $this->rollbackReturn(false);
     }
 
     /**
      * Updates a character's stats.
      *
-     * @param  array                            $data
-     * @param  \App\Models\Character\Character  $image
-     * @param  \App\Models\User\User            $user
-     * @return  bool
+     * @param array                 $data
+     * @param \App\Models\User\User $user
+     * @param mixed                 $character
+     *
+     * @return bool
      */
-    public function updateCharacterStats($data, $character, $user)
-    {
+    public function updateCharacterStats($data, $character, $user) {
         DB::beginTransaction();
 
         try {
-            if(!$character->is_myo_slot && Character::where('slug', $data['slug'])->where('id', '!=', $character->id)->exists()) throw new \Exception("Character code must be unique.");
+            if (!$this->logAdminAction($user, 'Updated Stats', 'Updated character stats on '.$character->displayname)) {
+                throw new \Exception('Failed to log admin action.');
+            }
+
+            if (!$character->is_myo_slot && Character::where('slug', $data['slug'])->where('id', '!=', $character->id)->exists()) {
+                throw new \Exception('Character code must be unique.');
+            }
 
             $characterData = Arr::only($data, [
                 'character_category_id',
@@ -1113,93 +1110,98 @@ public function updateCharacterStats($data, $character, $user)
             $characterData['is_sellable'] = isset($data['is_sellable']);
             $characterData['is_tradeable'] = isset($data['is_tradeable']);
             $characterData['is_giftable'] = isset($data['is_giftable']);
-            $characterData['sale_value'] = isset($data['sale_value']) ? $data['sale_value'] : 0;
-            $characterData['transferrable_at'] = isset($data['transferrable_at']) ? $data['transferrable_at'] : null;
-            if($character->is_myo_slot) $characterData['name'] = (isset($data['name']) && $data['name']) ? $data['name'] : null;
+            $characterData['sale_value'] = $data['sale_value'] ?? 0;
+            $characterData['transferrable_at'] = $data['transferrable_at'] ?? null;
+            if ($character->is_myo_slot) {
+                $characterData['name'] = (isset($data['name']) && $data['name']) ? $data['name'] : null;
+            }
 
             // Needs to be cleaned up
             $result = [];
             $old = [];
             $new = [];
-            if(!$character->is_myo_slot) {
-                if($characterData['character_category_id'] != $character->character_category_id) {
+            if (!$character->is_myo_slot) {
+                if ($characterData['character_category_id'] != $character->character_category_id) {
                     $result[] = 'character category';
                     $old['character_category'] = $character->category->displayName;
                     $new['character_category'] = CharacterCategory::find($characterData['character_category_id'])->displayName;
                 }
-                if($characterData['number'] != $character->number) {
+                if ($characterData['number'] != $character->number) {
                     $result[] = 'character number';
                     $old['number'] = $character->number;
                     $new['number'] = $characterData['number'];
                 }
-                if($characterData['slug'] != $character->number) {
+                if ($characterData['slug'] != $character->slug) {
                     $result[] = 'character code';
                     $old['slug'] = $character->slug;
                     $new['slug'] = $characterData['slug'];
                 }
-            }
-            else {
-                if($characterData['name'] != $character->name) {
+            } else {
+                if ($characterData['name'] != $character->name) {
                     $result[] = 'name';
                     $old['name'] = $character->name;
                     $new['name'] = $characterData['name'];
                 }
             }
-            if($characterData['is_sellable'] != $character->is_sellable) {
+            if ($characterData['is_sellable'] != $character->is_sellable) {
                 $result[] = 'sellable status';
                 $old['is_sellable'] = $character->is_sellable;
                 $new['is_sellable'] = $characterData['is_sellable'];
             }
-            if($characterData['is_tradeable'] != $character->is_tradeable) {
+            if ($characterData['is_tradeable'] != $character->is_tradeable) {
                 $result[] = 'tradeable status';
                 $old['is_tradeable'] = $character->is_tradeable;
                 $new['is_tradeable'] = $characterData['is_tradeable'];
             }
-            if($characterData['is_giftable'] != $character->is_giftable) {
+            if ($characterData['is_giftable'] != $character->is_giftable) {
                 $result[] = 'giftable status';
                 $old['is_giftable'] = $character->is_giftable;
                 $new['is_giftable'] = $characterData['is_giftable'];
             }
-            if($characterData['sale_value'] != $character->sale_value) {
+            if ($characterData['sale_value'] != $character->sale_value) {
                 $result[] = 'sale value';
                 $old['sale_value'] = $character->sale_value;
                 $new['sale_value'] = $characterData['sale_value'];
             }
-            if($characterData['transferrable_at'] != $character->transferrable_at) {
+            if ($characterData['transferrable_at'] != $character->transferrable_at) {
                 $result[] = 'transfer cooldown';
                 $old['transferrable_at'] = $character->transferrable_at;
                 $new['transferrable_at'] = $characterData['transferrable_at'];
             }
 
-            if(count($result))
-            {
+            if (count($result)) {
                 $character->update($characterData);
 
                 // Add a log for the character
                 // This logs all the updates made to the character
-                $this->createLog($user->id, null, null, null, $character->id, 'Character Updated', ucfirst(implode(', ', $result)) . ' edited', 'character', true, $old, $new);
+                $this->createLog($user->id, null, null, null, $character->id, 'Character Updated', ucfirst(implode(', ', $result)).' edited', 'character', true, $old, $new);
             }
 
             return $this->commitReturn(true);
-        } catch(\Exception $e) {
+        } catch (\Exception $e) {
             $this->setError('error', $e->getMessage());
         }
+
         return $this->rollbackReturn(false);
     }
 
     /**
      * Updates a character's description.
      *
-     * @param  array                            $data
-     * @param  \App\Models\Character\Character  $character
-     * @param  \App\Models\User\User            $user
-     * @return  bool
+     * @param array                           $data
+     * @param \App\Models\Character\Character $character
+     * @param \App\Models\User\User           $user
+     *
+     * @return bool
      */
-    public function updateCharacterDescription($data, $character, $user)
-    {
+    public function updateCharacterDescription($data, $character, $user) {
         DB::beginTransaction();
 
         try {
+            if (!$this->logAdminAction($user, 'Updated Character Description', 'Updated character description on '.$character->displayname)) {
+                throw new \Exception('Failed to log admin action.');
+            }
+
             $old = $character->parsed_description;
 
             // Update the image's notes
@@ -1212,25 +1214,30 @@ public function updateCharacterDescription($data, $character, $user)
             $this->createLog($user->id, null, null, null, $character->id, 'Character Description Updated', '', 'character', true, $old, $character->parsed_description);
 
             return $this->commitReturn(true);
-        } catch(\Exception $e) {
+        } catch (\Exception $e) {
             $this->setError('error', $e->getMessage());
         }
+
         return $this->rollbackReturn(false);
     }
 
     /**
      * Updates a character's settings.
      *
-     * @param  array                            $data
-     * @param  \App\Models\Character\Character  $image
-     * @param  \App\Models\User\User            $user
-     * @return  bool
+     * @param array                 $data
+     * @param \App\Models\User\User $user
+     * @param mixed                 $character
+     *
+     * @return bool
      */
-    public function updateCharacterSettings($data, $character, $user)
-    {
+    public function updateCharacterSettings($data, $character, $user) {
         DB::beginTransaction();
 
         try {
+            if (!$this->logAdminAction($user, 'Updated Character Settings', 'Updated character settings on '.$character->displayname)) {
+                throw new \Exception('Failed to log admin action.');
+            }
+
             $old = ['is_visible' => $character->is_visible];
 
             $character->is_visible = isset($data['is_visible']);
@@ -1241,23 +1248,24 @@ public function updateCharacterSettings($data, $character, $user)
             $this->createLog($user->id, null, null, null, $character->id, 'Character Visibility Updated', '', 'character', true, $old, ['is_visible' => $character->is_visible]);
 
             return $this->commitReturn(true);
-        } catch(\Exception $e) {
+        } catch (\Exception $e) {
             $this->setError('error', $e->getMessage());
         }
+
         return $this->rollbackReturn(false);
     }
 
     /**
      * Updates a character's profile.
      *
-     * @param  array                            $data
-     * @param  \App\Models\Character\Character  $character
-     * @param  \App\Models\User\User            $user
-     * @param  bool                             $isAdmin
-     * @return  bool
+     * @param array                           $data
+     * @param \App\Models\Character\Character $character
+     * @param \App\Models\User\User           $user
+     * @param bool                            $isAdmin
+     *
+     * @return bool
      */
-    public function updateCharacterProfile($data, $character, $user, $isAdmin = false)
-    {
+    public function updateCharacterProfile($data, $character, $user, $isAdmin = false) {
         DB::beginTransaction();
 
         try {
@@ -1267,74 +1275,102 @@ public function updateCharacterProfile($data, $character, $user, $isAdmin = fals
 
             // Allow updating the gift art/trading options if the editing
             // user owns the character
-            if(!$isAdmin)
-            {
-                if($character->user_id != $user->id) throw new \Exception("You cannot edit this character.");
+            if (!$isAdmin) {
+                if ($character->user_id != $user->id) {
+                    throw new \Exception('You cannot edit this character.');
+                }
 
-                if($character->is_trading != isset($data['is_trading'])) $notifyTrading = true;
-                if(isset($data['is_gift_art_allowed']) && $character->is_gift_art_allowed != $data['is_gift_art_allowed']) $notifyGiftArt = true;
-                if(isset($data['is_gift_writing_allowed']) && $character->is_gift_writing_allowed != $data['is_gift_writing_allowed']) $notifyGiftWriting = true;
+                if ($character->is_trading != isset($data['is_trading'])) {
+                    $notifyTrading = true;
+                }
+                if (isset($data['is_gift_art_allowed']) && $character->is_gift_art_allowed != $data['is_gift_art_allowed']) {
+                    $notifyGiftArt = true;
+                }
+                if (isset($data['is_gift_writing_allowed']) && $character->is_gift_writing_allowed != $data['is_gift_writing_allowed']) {
+                    $notifyGiftWriting = true;
+                }
 
                 $character->is_gift_art_allowed = isset($data['is_gift_art_allowed']) && $data['is_gift_art_allowed'] <= 2 ? $data['is_gift_art_allowed'] : 0;
                 $character->is_gift_writing_allowed = isset($data['is_gift_writing_allowed']) && $data['is_gift_writing_allowed'] <= 2 ? $data['is_gift_writing_allowed'] : 0;
                 $character->is_trading = isset($data['is_trading']);
                 $character->save();
+            } else {
+                if (!$this->logAdminAction($user, 'Updated Character Profile', 'Updated character profile on '.$character->displayname)) {
+                    throw new \Exception('Failed to log admin action.');
+                }
             }
 
             // Update the character's profile
-            if(!$character->is_myo_slot) $character->name = $data['name'];
+            if (!$character->is_myo_slot) {
+                $character->name = $data['name'];
+            }
             $character->save();
 
-            if(!$character->is_myo_slot && Config::get('lorekeeper.extensions.character_TH_profile_link')) $character->profile->link = $data['link'];
+            if (!$character->is_myo_slot && config('lorekeeper.extensions.character_TH_profile_link')) {
+                $character->profile->link = $data['link'];
+            }
             $character->profile->save();
 
             $character->profile->text = $data['text'];
             $character->profile->parsed_text = parse($data['text']);
             $character->profile->save();
 
-            if($isAdmin && isset($data['alert_user']) && $character->is_visible && $character->user_id)
-            {
+            if ($isAdmin && isset($data['alert_user']) && $character->is_visible && $character->user_id) {
                 Notifications::create('CHARACTER_PROFILE_EDIT', $character->user, [
                     'character_name' => $character->name,
-                    'character_slug' => $character->slug,
-                    'sender_url' => $user->url,
-                    'sender_name' => $user->name
+                    'character_slug' => $character->is_myo_slot ? $character->id : $character->slug,
+                    'sender_url'     => $user->url,
+                    'sender_name'    => $user->name,
                 ]);
             }
 
-            if($notifyTrading) $character->notifyBookmarkers('BOOKMARK_TRADING');
-            if($notifyGiftArt) $character->notifyBookmarkers('BOOKMARK_GIFTS');
-            if($notifyGiftWriting) $character->notifyBookmarkers('BOOKMARK_GIFT_WRITING');
+            if ($notifyTrading) {
+                $character->notifyBookmarkers('BOOKMARK_TRADING');
+            }
+            if ($notifyGiftArt) {
+                $character->notifyBookmarkers('BOOKMARK_GIFTS');
+            }
+            if ($notifyGiftWriting) {
+                $character->notifyBookmarkers('BOOKMARK_GIFT_WRITING');
+            }
 
             return $this->commitReturn(true);
-        } catch(\Exception $e) {
+        } catch (\Exception $e) {
             $this->setError('error', $e->getMessage());
         }
+
         return $this->rollbackReturn(false);
     }
 
     /**
      * Deletes a character.
      *
-     * @param  \App\Models\Character\Character  $character
-     * @param  \App\Models\User\User            $user
-     * @return  bool
+     * @param \App\Models\Character\Character $character
+     * @param \App\Models\User\User           $user
+     *
+     * @return bool
      */
-    public function deleteCharacter($character, $user)
-    {
+    public function deleteCharacter($character, $user) {
         DB::beginTransaction();
 
         try {
-            if($character->user_id) {
+            if (SalesCharacter::where('character_id', $character->id)->exists()) {
+                throw new \Exception('This character currently exists in a previous sale post and cannot be deleted.');
+            }
+            if ($character->user_id) {
                 $character->user->settings->save();
-        }
+            }
+
+            if (!$this->logAdminAction($user, 'Deleted Character', 'Deleted character '.$character->slug)) {
+                throw new \Exception('Failed to log admin action.');
+            }
 
             // Delete associated bookmarks
             CharacterBookmark::where('character_id', $character->id)->delete();
 
             // Delete associated features and images
             // Images use soft deletes
-            foreach($character->images as $image) {
+            foreach ($character->images as $image) {
                 $image->features()->delete();
                 $image->delete();
             }
@@ -1351,159 +1387,189 @@ public function deleteCharacter($character, $user)
             $character->delete();
 
             return $this->commitReturn(true);
-        } catch(\Exception $e) {
+        } catch (\Exception $e) {
             $this->setError('error', $e->getMessage());
         }
+
         return $this->rollbackReturn(false);
     }
 
     /**
      * Creates a character transfer.
      *
-     * @param  array                            $data
-     * @param  \App\Models\Character\Character  $character
-     * @param  \App\Models\User\User            $user
-     * @return  bool
+     * @param array                           $data
+     * @param \App\Models\Character\Character $character
+     * @param \App\Models\User\User           $user
+     *
+     * @return bool
      */
-    public function createTransfer($data, $character, $user)
-    {
+    public function createTransfer($data, $character, $user) {
         DB::beginTransaction();
 
         try {
-            if($user->id != $character->user_id) throw new \Exception("You do not own this character.");
-            if(!$character->is_sellable && !$character->is_tradeable && !$character->is_giftable) throw new \Exception("This character is not transferrable.");
-            if($character->transferrable_at && $character->transferrable_at->isFuture()) throw new \Exception("This character is still on transfer cooldown and cannot be transferred.");
-            if(CharacterTransfer::active()->where('character_id', $character->id)->exists()) throw new \Exception("This character is in an active transfer.");
-            if($character->trade_id) throw new \Exception("This character is in an active trade.");
+            if ($user->id != $character->user_id) {
+                throw new \Exception('You do not own this character.');
+            }
+            if (!$character->is_sellable && !$character->is_tradeable && !$character->is_giftable) {
+                throw new \Exception('This character is not transferrable.');
+            }
+            if ($character->transferrable_at && $character->transferrable_at->isFuture()) {
+                throw new \Exception('This character is still on transfer cooldown and cannot be transferred.');
+            }
+            if (CharacterTransfer::active()->where('character_id', $character->id)->exists()) {
+                throw new \Exception('This character is in an active transfer.');
+            }
+            if ($character->trade_id) {
+                throw new \Exception('This character is in an active trade.');
+            }
 
             $recipient = User::find($data['recipient_id']);
-            if(!$recipient) throw new \Exception("Invalid user selected.");
-            if($recipient->is_banned) throw new \Exception("Cannot transfer character to a banned member.");
+            if (!$recipient) {
+                throw new \Exception('Invalid user selected.');
+            }
+            if ($recipient->is_banned) {
+                throw new \Exception('Cannot transfer character to a banned member.');
+            }
 
             // deletes any pending design drafts
-            foreach($character->designUpdate as $update)
-            {
-                if($update->status == 'Draft')
-                {
-                   if(!$this->rejectRequest('Cancelled by '.$user->displayName.' in order to transfer character to another user', $update, $user, true, false)) throw new \Exception('Could not cancel pending request.');
+            foreach ($character->designUpdate as $update) {
+                if ($update->status == 'Draft') {
+                    if (!(new DesignUpdateManager)->rejectRequest('Cancelled by '.$user->displayName.' in order to transfer character to another user', $update, $user, true, false)) {
+                        throw new \Exception('Could not cancel pending request.');
+                    }
                 }
             }
 
             $queueOpen = Settings::get('open_transfers_queue');
 
             CharacterTransfer::create([
-                'user_reason' => $data['user_reason'],  # pulls from this characters user_reason collum
+                'user_reason'  => $data['user_reason'],  // pulls from this characters user_reason collum
                 'character_id' => $character->id,
-                'sender_id' => $user->id,
+                'sender_id'    => $user->id,
                 'recipient_id' => $recipient->id,
-                'status' => 'Pending',
+                'status'       => 'Pending',
 
                 // if the queue is closed, all transfers are auto-approved
-                'is_approved' => !$queueOpen
+                'is_approved'  => !$queueOpen,
             ]);
 
-            if(!$queueOpen)
+            if (!$queueOpen) {
                 Notifications::create('CHARACTER_TRANSFER_RECEIVED', $recipient, [
-                    'character_url' => $character->url,
+                    'character_url'  => $character->url,
                     'character_name' => $character->slug,
-                    'sender_name' => $user->name,
-                    'sender_url' => $user->url
+                    'sender_name'    => $user->name,
+                    'sender_url'     => $user->url,
                 ]);
+            }
 
             return $this->commitReturn(true);
-        } catch(\Exception $e) {
+        } catch (\Exception $e) {
             $this->setError('error', $e->getMessage());
         }
+
         return $this->rollbackReturn(false);
     }
 
     /**
      * Forces an admin transfer of a character.
      *
-     * @param  array                            $data
-     * @param  \App\Models\Character\Character  $character
-     * @param  \App\Models\User\User            $user
-     * @return  bool
+     * @param array                           $data
+     * @param \App\Models\Character\Character $character
+     * @param \App\Models\User\User           $user
+     *
+     * @return bool
      */
-    public function adminTransfer($data, $character, $user)
-    {
+    public function adminTransfer($data, $character, $user) {
         DB::beginTransaction();
 
         try {
-            if(isset($data['recipient_id']) && $data['recipient_id']) {
+            if (isset($data['recipient_id']) && $data['recipient_id']) {
                 $recipient = User::find($data['recipient_id']);
-                if(!$recipient) throw new \Exception("Invalid user selected.");
-                if($character->user_id == $recipient->id) throw new \Exception("Cannot transfer a character to the same user.");
-            }
-            else if(isset($data['recipient_url']) && $data['recipient_url']) {
+                if (!$recipient) {
+                    throw new \Exception('Invalid user selected.');
+                }
+                if ($character->user_id == $recipient->id) {
+                    throw new \Exception('Cannot transfer a character to the same user.');
+                }
+                if (!$this->logAdminAction($user, 'Admin Transfer', 'Admin transferred '.$character->displayname.' to '.$recipient->displayName)) {
+                    throw new \Exception('Failed to log admin action.');
+                }
+            } elseif (isset($data['recipient_url']) && $data['recipient_url']) {
                 // Transferring to an off-site user
                 $recipient = checkAlias($data['recipient_url']);
+                if (!$this->logAdminAction($user, 'Admin Transfer', 'Admin transferred '.$character->displayname.' to '.$recipient)) {
+                    throw new \Exception('Failed to log admin action.');
+                }
+            } else {
+                throw new \Exception('Please enter a recipient for the transfer.');
             }
-            else throw new \Exception("Please enter a recipient for the transfer.");
 
             // If the character is in an active transfer, cancel it
             $transfer = CharacterTransfer::active()->where('character_id', $character->id)->first();
-            if($transfer) {
+            if ($transfer) {
                 $transfer->status = 'Canceled';
                 $transfer->reason = 'Transfer canceled by '.$user->displayName.' in order to transfer character to another user';
                 $transfer->save();
             }
             // deletes any pending design drafts
-            foreach($character->designUpdate as $update)
-            {
-                if($update->status == 'Draft')
-                {
-                   if(!$this->rejectRequest('Cancelled by '.$user->displayName.' in order to transfer character to another user', $update, $user, true, false)) throw new \Exception('Could not cancel pending request.');
+            foreach ($character->designUpdate as $update) {
+                if ($update->status == 'Draft') {
+                    if (!(new DesignUpdateManager)->rejectRequest('Cancelled by '.$user->displayName.' in order to transfer character to another user', $update, $user, true, false)) {
+                        throw new \Exception('Could not cancel pending request.');
+                    }
                 }
             }
 
             $sender = $character->user;
 
-            $this->moveCharacter($character, $recipient, 'Transferred by ' . $user->displayName . (isset($data['reason']) ? ': ' . $data['reason'] : ''), isset($data['cooldown']) ? $data['cooldown'] : -1);
+            $this->moveCharacter($character, $recipient, 'Transferred by '.$user->displayName.(isset($data['reason']) ? ': '.$data['reason'] : ''), $data['cooldown'] ?? -1);
 
             // Add notifications for the old and new owners
-            if($sender) {
+            if ($sender) {
                 Notifications::create('CHARACTER_SENT', $sender, [
                     'character_name' => $character->slug,
                     'character_slug' => $character->slug,
-                    'sender_name' => $user->name,
-                    'sender_url' => $user->url,
+                    'sender_name'    => $user->name,
+                    'sender_url'     => $user->url,
                     'recipient_name' => is_object($recipient) ? $recipient->name : prettyProfileName($recipient),
-                    'recipient_url' => is_object($recipient) ? $recipient->url : $recipient,
+                    'recipient_url'  => is_object($recipient) ? $recipient->url : $recipient,
                 ]);
             }
-            if(is_object($recipient)) {
+            if (is_object($recipient)) {
                 Notifications::create('CHARACTER_RECEIVED', $recipient, [
                     'character_name' => $character->slug,
                     'character_slug' => $character->slug,
-                    'sender_name' => $user->name,
-                    'sender_url' => $user->url,
+                    'sender_name'    => $user->name,
+                    'sender_url'     => $user->url,
                 ]);
             }
 
             return $this->commitReturn(true);
-        } catch(\Exception $e) {
+        } catch (\Exception $e) {
             $this->setError('error', $e->getMessage());
         }
+
         return $this->rollbackReturn(false);
     }
 
     /**
      * Processes a character transfer.
      *
-     * @param  array                            $data
-     * @param  \App\Models\User\User            $user
-     * @return  bool
+     * @param array                 $data
+     * @param \App\Models\User\User $user
+     *
+     * @return bool
      */
-    public function processTransfer($data, $user)
-    {
+    public function processTransfer($data, $user) {
         DB::beginTransaction();
 
         try {
             $transfer = CharacterTransfer::where('id', $data['transfer_id'])->active()->where('recipient_id', $user->id)->first();
-            if(!$transfer) throw new \Exception("Invalid transfer selected.");
+            if (!$transfer) {
+                throw new \Exception('Invalid transfer selected.');
+            }
 
-            if($data['action'] == 'Accept') {
+            if ($data['action'] == 'Accept') {
                 $cooldown = Settings::get('transfer_cooldown');
 
                 $transfer->status = 'Accepted';
@@ -1511,60 +1577,65 @@ public function processTransfer($data, $user)
                 // Process the character move if the transfer has already been approved
                 if ($transfer->is_approved) {
                     //check the cooldown saved
-                    if(isset($transfer->data['cooldown'])) $cooldown = $transfer->data['cooldown'];
+                    if (isset($transfer->data['cooldown'])) {
+                        $cooldown = $transfer->data['cooldown'];
+                    }
                     $this->moveCharacter($transfer->character, $transfer->recipient, 'User Transfer', $cooldown);
-                    if(!Settings::get('open_transfers_queue'))
+                    if (!Settings::get('open_transfers_queue')) {
                         $transfer->data = json_encode([
                             'cooldown' => $cooldown,
-                            'staff_id' => null
+                            'staff_id' => null,
                         ]);
+                    }
 
                     // Notify sender of the successful transfer
                     Notifications::create('CHARACTER_TRANSFER_ACCEPTED', $transfer->sender, [
                         'character_name' => $transfer->character->slug,
-                        'character_url' => $transfer->character->url,
-                        'sender_name' => $transfer->recipient->name,
-                        'sender_url' => $transfer->recipient->url,
+                        'character_url'  => $transfer->character->url,
+                        'sender_name'    => $transfer->recipient->name,
+                        'sender_url'     => $transfer->recipient->url,
                     ]);
                 }
-            }
-            else {
+            } else {
                 $transfer->status = 'Rejected';
                 $transfer->data = json_encode([
-                    'staff_id' => null
+                    'staff_id' => null,
                 ]);
 
                 // Notify sender that transfer has been rejected
                 Notifications::create('CHARACTER_TRANSFER_REJECTED', $transfer->sender, [
                     'character_name' => $transfer->character->slug,
-                    'character_url' => $transfer->character->url,
-                    'sender_name' => $transfer->recipient->name,
-                    'sender_url' => $transfer->recipient->url,
+                    'character_url'  => $transfer->character->url,
+                    'sender_name'    => $transfer->recipient->name,
+                    'sender_url'     => $transfer->recipient->url,
                 ]);
             }
             $transfer->save();
 
             return $this->commitReturn(true);
-        } catch(\Exception $e) {
+        } catch (\Exception $e) {
             $this->setError('error', $e->getMessage());
         }
+
         return $this->rollbackReturn(false);
     }
 
     /**
      * Cancels a character transfer.
      *
-     * @param  array                            $data
-     * @param  \App\Models\User\User            $user
-     * @return  bool
+     * @param array                 $data
+     * @param \App\Models\User\User $user
+     *
+     * @return bool
      */
-    public function cancelTransfer($data, $user)
-    {
+    public function cancelTransfer($data, $user) {
         DB::beginTransaction();
 
         try {
             $transfer = CharacterTransfer::where('id', $data['transfer_id'])->active()->where('sender_id', $user->id)->first();
-            if(!$transfer) throw new \Exception("Invalid transfer selected.");
+            if (!$transfer) {
+                throw new \Exception('Invalid transfer selected.');
+            }
 
             $transfer->status = 'Canceled';
             $transfer->save();
@@ -1572,132 +1643,148 @@ public function cancelTransfer($data, $user)
             // Notify recipient of the cancelled transfer
             Notifications::create('CHARACTER_TRANSFER_CANCELED', $transfer->recipient, [
                 'character_name' => $transfer->character->slug,
-                'character_url' => $transfer->character->url,
-                'sender_name' => $transfer->sender->name,
-                'sender_url' => $transfer->sender->url,
+                'character_url'  => $transfer->character->url,
+                'sender_name'    => $transfer->sender->name,
+                'sender_url'     => $transfer->sender->url,
             ]);
 
             return $this->commitReturn(true);
-        } catch(\Exception $e) {
+        } catch (\Exception $e) {
             $this->setError('error', $e->getMessage());
         }
+
         return $this->rollbackReturn(false);
     }
 
     /**
      * Processes a character transfer in the approvals queue.
      *
-     * @param  array                            $data
-     * @param  \App\Models\User\User            $user
-     * @return  bool
+     * @param array                 $data
+     * @param \App\Models\User\User $user
+     *
+     * @return bool
      */
-    public function processTransferQueue($data, $user)
-    {
+    public function processTransferQueue($data, $user) {
         DB::beginTransaction();
 
         try {
-            if(isset($data['transfer_id'])) $transfer = CharacterTransfer::where('id', $data['transfer_id'])->active()->first();
-            else $transfer = $data['transfer'];
-            if(!$transfer) throw new \Exception("Invalid transfer selected.");
+            if (isset($data['transfer_id'])) {
+                $transfer = CharacterTransfer::where('id', $data['transfer_id'])->active()->first();
+            } else {
+                $transfer = $data['transfer'];
+            }
+            if (!$transfer) {
+                throw new \Exception('Invalid transfer selected.');
+            }
 
-            if($data['action'] == 'Approve') {
+            if ($data['action'] == 'Approve') {
                 $transfer->is_approved = 1;
                 $transfer->data = json_encode([
                     'staff_id' => $user->id,
-                    'cooldown' => isset($data['cooldown']) ? $data['cooldown'] : Settings::get('transfer_cooldown')
+                    'cooldown' => $data['cooldown'] ?? Settings::get('transfer_cooldown'),
                 ]);
 
                 // Process the character move if the recipient has already accepted the transfer
-                if($transfer->status == 'Accepted') {
-                    $this->moveCharacter($transfer->character, $transfer->recipient, 'User Transfer', isset($data['cooldown']) ? $data['cooldown'] : -1);
+                if ($transfer->status == 'Accepted') {
+                    if (!$this->logAdminAction($user, 'Approved Transfer', 'Approved transfer of '.$transfer->character->displayname.' to '.$transfer->recipient->displayname)) {
+                        throw new \Exception('Failed to log admin action.');
+                    }
+                    $this->moveCharacter($transfer->character, $transfer->recipient, 'User Transfer', $data['cooldown'] ?? -1);
 
                     // Notify both parties of the successful transfer
                     Notifications::create('CHARACTER_TRANSFER_APPROVED', $transfer->sender, [
                         'character_name' => $transfer->character->slug,
-                        'character_url' => $transfer->character->url,
-                        'sender_name' => $user->name,
-                        'sender_url' => $user->url,
+                        'character_url'  => $transfer->character->url,
+                        'sender_name'    => $user->name,
+                        'sender_url'     => $user->url,
                     ]);
                     Notifications::create('CHARACTER_TRANSFER_APPROVED', $transfer->recipient, [
                         'character_name' => $transfer->character->slug,
-                        'character_url' => $transfer->character->url,
-                        'sender_name' => $user->name,
-                        'sender_url' => $user->url,
+                        'character_url'  => $transfer->character->url,
+                        'sender_name'    => $user->name,
+                        'sender_url'     => $user->url,
                     ]);
+                } else {
+                    if (!$this->logAdminAction($user, 'Approved Transfer', 'Approved transfer of '.$transfer->character->displayname.' to '.$transfer->recipient->displayname)) {
+                        throw new \Exception('Failed to log admin action.');
+                    }
 
-                }
-                else {
                     // Still pending a response from the recipient
                     Notifications::create('CHARACTER_TRANSFER_ACCEPTABLE', $transfer->recipient, [
                         'character_name' => $transfer->character->slug,
-                        'character_url' => $transfer->character->url,
-                        'sender_name' => $user->name,
-                        'sender_url' => $user->url,
+                        'character_url'  => $transfer->character->url,
+                        'sender_name'    => $user->name,
+                        'sender_url'     => $user->url,
                     ]);
-
                 }
-            }
-            else {
+            } else {
+                if (!$this->logAdminAction($user, 'Rejected Transfer', 'Rejected transfer of '.$transfer->character->displayname.' to '.$transfer->recipient->displayname)) {
+                    throw new \Exception('Failed to log admin action.');
+                }
+
                 $transfer->status = 'Rejected';
-                $transfer->reason = isset($data['reason']) ? $data['reason'] : null;
+                $transfer->reason = $data['reason'] ?? null;
                 $transfer->data = json_encode([
-                    'staff_id' => $user->id
+                    'staff_id' => $user->id,
                 ]);
 
                 // Notify both parties that the request was denied
                 Notifications::create('CHARACTER_TRANSFER_DENIED', $transfer->sender, [
                     'character_name' => $transfer->character->slug,
-                    'character_url' => $transfer->character->url,
-                    'sender_name' => $user->name,
-                    'sender_url' => $user->url,
+                    'character_url'  => $transfer->character->url,
+                    'sender_name'    => $user->name,
+                    'sender_url'     => $user->url,
                 ]);
                 Notifications::create('CHARACTER_TRANSFER_DENIED', $transfer->recipient, [
                     'character_name' => $transfer->character->slug,
-                    'character_url' => $transfer->character->url,
-                    'sender_name' => $user->name,
-                    'sender_url' => $user->url,
+                    'character_url'  => $transfer->character->url,
+                    'sender_name'    => $user->name,
+                    'sender_url'     => $user->url,
                 ]);
             }
             $transfer->save();
 
             return $this->commitReturn(true);
-        } catch(\Exception $e) {
+        } catch (\Exception $e) {
             $this->setError('error', $e->getMessage());
         }
+
         return $this->rollbackReturn(false);
     }
 
     /**
      * Moves a character from one user to another.
      *
-     * @param  \App\Models\Character\Character  $character
-     * @param  \App\Models\User\User            $recipient
-     * @param  string                           $data
-     * @param  int                              $cooldown
-     * @param  string                           $logType
+     * @param \App\Models\Character\Character $character
+     * @param \App\Models\User\User           $recipient
+     * @param string                          $data
+     * @param int                             $cooldown
+     * @param string                          $logType
      */
-    public function moveCharacter($character, $recipient, $data, $cooldown = -1, $logType = null)
-    {
+    public function moveCharacter($character, $recipient, $data, $cooldown = -1, $logType = null) {
         $sender = $character->user;
-        if(!$sender) $sender = $character->owner_url;
+        if (!$sender) {
+            $sender = $character->owner_url;
+        }
 
         // Update character counts if the sender has an account
-        if(is_object($sender)) {
+        if (is_object($sender)) {
             $sender->settings->save();
         }
 
-        if(is_object($recipient)) {
-            if(!$character->is_myo_slot) $recipient->settings->is_fto = 0;
+        if (is_object($recipient)) {
+            if (!$character->is_myo_slot) {
+                $recipient->settings->is_fto = 0;
+            }
             $recipient->settings->save();
         }
 
         // Update character owner, sort order and cooldown
         $character->sort = 0;
-        if(is_object($recipient)) {
+        if (is_object($recipient)) {
             $character->user_id = $recipient->id;
             $character->owner_url = null;
-        }
-        else {
+        } else {
             $character->owner_url = $recipient;
             $character->user_id = null;
         }
@@ -1705,17 +1792,19 @@ public function moveCharacter($character, $recipient, $data, $cooldown = -1, $lo
             // Add the default amount from settings
             $cooldown = Settings::get('transfer_cooldown');
         }
-        if($cooldown > 0) {
-            if ($character->transferrable_at && $character->transferrable_at->isFuture())
+        if ($cooldown > 0) {
+            if ($character->transferrable_at && $character->transferrable_at->isFuture()) {
                 $character->transferrable_at->addDays($cooldown);
-            else $character->transferrable_at = Carbon::now()->addDays($cooldown);
+            } else {
+                $character->transferrable_at = Carbon::now()->addDays($cooldown);
+            }
         }
         $character->save();
 
         // Notify bookmarkers
         $character->notifyBookmarkers('BOOKMARK_OWNER');
 
-        if(Config::get('lorekeeper.settings.reset_character_status_on_transfer')) {
+        if (config('lorekeeper.settings.reset_character_status_on_transfer')) {
             // Reset trading status, gift art status, and writing status
             $character->update([
                 'is_gift_art_allowed'     => 0,
@@ -1724,797 +1813,249 @@ public function moveCharacter($character, $recipient, $data, $cooldown = -1, $lo
             ]);
         }
 
-        if(Config::get('lorekeeper.settings.reset_character_profile_on_transfer') && !$character->is_myo_slot) {
+        if (config('lorekeeper.settings.reset_character_profile_on_transfer') && !$character->is_myo_slot) {
             // Reset name and profile
             $character->update(['name' => null]);
 
             // Reset profile
             $character->profile->update([
                 'text'        => null,
-                'parsed_text' => null
+                'parsed_text' => null,
             ]);
         }
 
         // Add a log for the ownership change
         $this->createLog(
-is_object($sender) ? $sender->id : null,
+            is_object($sender) ? $sender->id : null,
             is_object($sender) ? null : $sender,
             $recipient && is_object($recipient) ? $recipient->id : null,
-            $recipient && is_object($recipient) ? $recipient->url : ($recipient ? : null),
-            $character->id, $logType ? $logType : ($character->is_myo_slot ? 'MYO Slot Transferred' : 'Character Transferred'), $data, 'user');
+            $recipient && is_object($recipient) ? $recipient->url : ($recipient ?: null),
+            $character->id,
+            $logType ? $logType : ($character->is_myo_slot ? 'MYO Slot Transferred' : 'Character Transferred'),
+            $data,
+            'user'
+        );
     }
 
     /**
-     * Creates a character design update request (or a MYO design approval request).
+     * Handles character data.
+     *
+     * @param array $data
+     * @param bool  $isMyo
      *
-     * @param  \App\Models\Character\Character  $character
-     * @param  \App\Models\User\User            $user
-     * @return  \App\Models\Character\CharacterDesignUpdate|bool
+     * @return \App\Models\Character\Character|bool
      */
-    public function createDesignUpdateRequest($character, $user)
-    {
-        DB::beginTransaction();
-
+    private function handleCharacter($data, $isMyo = false) {
         try {
-            if($character->user_id != $user->id) throw new \Exception("You do not own this character.");
-            if(CharacterDesignUpdate::where('character_id', $character->id)->active()->exists()) throw new \Exception("This ".($character->is_myo_slot ? 'MYO slot' : 'character')." already has an existing request. Please update that one, or delete it before creating a new one.");
-            if(!$character->isAvailable) throw new \Exception("This ".($character->is_myo_slot ? 'MYO slot' : 'character')." is currently in an open trade or transfer. Please cancel the trade or transfer before creating a design update.");
-
-            $data = [
-                'user_id' => $user->id,
-                'character_id' => $character->id,
-                'status' => 'Draft',
-                'hash' => randomString(10),
-                'fullsize_hash' => randomString(15),
-                'update_type' => $character->is_myo_slot ? 'MYO' : 'Character',
-
-                // Set some data based on the character's existing stats
-                'rarity_id' => $character->image->rarity_id,
-                'species_id' => $character->image->species_id,
-                'subtype_id' => $character->image->subtype_id
-            ];
-
-            $request = CharacterDesignUpdate::create($data);
-
-            // If the character is not a MYO slot, make a copy of the previous image's traits
-            // as presumably, we will not want to make major modifications to them.
-            // This is skipped for MYO slots as it complicates things later on - we don't want
-            // users to edit compulsory traits, so we'll only add them when the design is approved.
-            if(!$character->is_myo_slot)
-            {
-                foreach($character->image->features as $feature)
-                {
-                    $request->features()->create([
-                        'character_image_id' => $request->id,
-                        'character_type' => 'Update',
-                        'feature_id' => $feature->feature_id,
-                        'data' => $feature->data
-                    ]);
-                }
+            if ($isMyo) {
+                $data['character_category_id'] = null;
+                $data['number'] = null;
+                $data['slug'] = null;
+                $data['species_id'] = isset($data['species_id']) && $data['species_id'] ? $data['species_id'] : null;
+                $data['subtype_id'] = isset($data['subtype_id']) && $data['subtype_id'] ? $data['subtype_id'] : null;
+                $data['rarity_id'] = isset($data['rarity_id']) && $data['rarity_id'] ? $data['rarity_id'] : null;
             }
 
-            return $this->commitReturn($request);
-        } catch(\Exception $e) {
-            $this->setError('error', $e->getMessage());
-        }
-        return $this->rollbackReturn(false);
-    }
+            $characterData = Arr::only($data, [
+                'character_category_id', 'rarity_id', 'user_id',
+                'number', 'slug', 'description',
+                'sale_value', 'transferrable_at', 'is_visible',
+            ]);
 
-    /**
-     * Saves the comment section of a character design update request.
-     *
-     * @param  array                                        $data
-     * @param  \App\Models\Character\CharacterDesignUpdate  $request
-     * @return  bool
-     */
-    public function saveRequestComment($data, $request)
-    {
-        DB::beginTransaction();
+            $characterData['name'] = ($isMyo && isset($data['name'])) ? $data['name'] : null;
+            $characterData['owner_url'] = isset($characterData['user_id']) ? null : $data['owner_url'];
+            $characterData['is_sellable'] = isset($data['is_sellable']);
+            $characterData['is_tradeable'] = isset($data['is_tradeable']);
+            $characterData['is_giftable'] = isset($data['is_giftable']);
+            $characterData['is_visible'] = isset($data['is_visible']);
+            $characterData['sale_value'] = $data['sale_value'] ?? 0;
+            $characterData['is_gift_art_allowed'] = 0;
+            $characterData['is_gift_writing_allowed'] = 0;
+            $characterData['is_trading'] = 0;
+            $characterData['parsed_description'] = parse($data['description']);
+            if ($isMyo) {
+                $characterData['is_myo_slot'] = 1;
+            }
 
-        try {
-            // Update the comments section
-            $request->comments = (isset($data['comments']) && $data['comments']) ? $data['comments'] : null;
-            $request->has_comments = 1;
-            $request->save();
+            $character = Character::create($characterData);
 
-            return $this->commitReturn(true);
-        } catch(\Exception $e) {
+            // Create character profile row
+            $character->profile()->create([]);
+
+            return $character;
+        } catch (\Exception $e) {
             $this->setError('error', $e->getMessage());
         }
-        return $this->rollbackReturn(false);
+
+        return false;
     }
 
     /**
-     * Saves the image upload section of a character design update request.
+     * Handles character image data.
      *
-     * @param  array                                        $data
-     * @param  \App\Models\Character\CharacterDesignUpdate  $request
-     * @param  bool                                         $isAdmin
-     * @return  bool
+     * @param array $data
+     * @param bool  $isMyo
+     * @param mixed $character
+     *
+     * @return \App\Models\Character\Character           $character
+     * @return \App\Models\Character\CharacterImage|bool
      */
-    public function saveRequestImage($data, $request, $isAdmin = false)
-    {
-        DB::beginTransaction();
-
+    private function handleCharacterImage($data, $character, $isMyo = false) {
         try {
-            // Require an image to be uploaded the first time, but if an image already exists, allow user to update the other details
-            if(!$isAdmin && !isset($data['image']) && !file_exists($request->imagePath . '/' . $request->imageFileName)) throw new \Exception("Please upload a valid image.");
-
-            // Require a thumbnail to be uploaded the first time as well
-            if(!file_exists($request->thumbnailPath . '/' . $request->thumbnailFileName)) {
-                // If the crop dimensions are invalid...
-                // The crop function resizes the thumbnail to fit, so we only need to check that it's not null
-                if(!$isAdmin || ($isAdmin && isset($data['modify_thumbnail']))) {
-                    if(isset($data['use_cropper']) && ($data['x0'] === null || $data['x1'] === null || $data['y0'] === null || $data['y1'] === null)) throw new \Exception('Invalid crop dimensions specified.');
-                    if(!isset($data['use_cropper']) && !isset($data['thumbnail'])) throw new \Exception("Please upload a valid thumbnail or use the image cropper.");
+            if ($isMyo) {
+                $data['species_id'] = (isset($data['species_id']) && $data['species_id']) ? $data['species_id'] : null;
+                $data['subtype_id'] = isset($data['subtype_id']) && $data['subtype_id'] ? $data['subtype_id'] : null;
+                $data['rarity_id'] = (isset($data['rarity_id']) && $data['rarity_id']) ? $data['rarity_id'] : null;
+
+                // Use default images for MYO slots without an image provided
+                if (!isset($data['image'])) {
+                    $data['image'] = public_path('images/myo.png');
+                    $data['thumbnail'] = public_path('images/myo-th.png');
+                    $data['extension'] = config('lorekeeper.settings.masterlist_image_format') ?? 'png';
+                    $data['fullsize_extension'] = config('lorekeeper.settings.masterlist_fullsizes_format') ?? $data['extension'];
+                    $data['default_image'] = true;
+                    unset($data['use_cropper']);
                 }
             }
-            if(!$isAdmin || ($isAdmin && isset($data['modify_thumbnail']))) {
-                $imageData = [];
-                if(isset($data['use_cropper'])) {
-                    $imageData = Arr::only($data, [
-                        'use_cropper',
-                        'x0', 'x1', 'y0', 'y1',
-                    ]);
-                    $imageData['use_cropper'] = isset($data['use_cropper']);
+            $imageData = Arr::only($data, [
+                'species_id', 'subtype_id', 'rarity_id', 'use_cropper',
+                'x0', 'x1', 'y0', 'y1', 'title_id', 'title_data'
+            ]);
+            $imageData['use_cropper'] = isset($data['use_cropper']);
+            $imageData['description'] = $data['image_description'] ?? null;
+            $imageData['parsed_description'] = parse($imageData['description']);
+            $imageData['hash'] = randomString(10);
+            $imageData['fullsize_hash'] = randomString(15);
+            $imageData['sort'] = 0;
+            $imageData['is_valid'] = isset($data['is_valid']);
+            $imageData['is_visible'] = isset($data['is_visible']);
+            $imageData['extension'] = (config('lorekeeper.settings.masterlist_image_format') ?? ($data['extension'] ?? $data['image']->getClientOriginalExtension()));
+            $imageData['fullsize_extension'] = (config('lorekeeper.settings.masterlist_fullsizes_format') ?? ($data['fullsize_extension'] ?? $data['image']->getClientOriginalExtension()));
+            $imageData['character_id'] = $character->id;
+            $imageData['title_id'] = isset($data['title_id']) && $data['title_id'] ? ($data['title_id'] != 'custom' ? $data['title_id'] : null) : null;
+            $imageData['title_data'] = isset($data['title_data']) && $data['title_data'] && isset($data['title_data']['full']) ? json_encode($data['title_data']) : null;
+
+            $image = CharacterImage::create($imageData);
+
+            // Check if entered url(s) have aliases associated with any on-site users
+            $designers = array_filter($data['designer_url']); // filter null values
+            foreach ($designers as $key=> $url) {
+                $recipient = checkAlias($url, false);
+                if (is_object($recipient)) {
+                    $data['designer_id'][$key] = $recipient->id;
+                    $designers[$key] = null;
                 }
-                if(!$isAdmin && isset($data['image'])) {
-                    $imageData['extension'] = (Config::get('lorekeeper.settings.masterlist_image_format') ? Config::get('lorekeeper.settings.masterlist_image_format') : (isset($data['extension']) ? $data['extension'] : $data['image']->getClientOriginalExtension()));
-                    $imageData['has_image'] = true;
+            }
+            $artists = array_filter($data['artist_url']);  // filter null values
+            foreach ($artists as $key=> $url) {
+                $recipient = checkAlias($url, false);
+                if (is_object($recipient)) {
+                    $data['artist_id'][$key] = $recipient->id;
+                    $artists[$key] = null;
                 }
-                $request->update($imageData);
             }
-
-            $request->designers()->delete();
-            $request->artists()->delete();
-
             // Check that users with the specified id(s) exist on site
-            foreach($data['designer_id'] as $id) {
-                if(isset($id) && $id) {
+            foreach ($data['designer_id'] as $id) {
+                if (isset($id) && $id) {
                     $user = User::find($id);
-                    if(!$user) throw new \Exception('One or more designers is invalid.');
+                    if (!$user) {
+                        throw new \Exception('One or more designers is invalid.');
+                    }
                 }
             }
-            foreach($data['artist_id'] as $id) {
-                if(isset($id) && $id) {
+            foreach ($data['artist_id'] as $id) {
+                if (isset($id) && $id) {
                     $user = $user = User::find($id);
-                    if(!$user) throw new \Exception('One or more artists is invalid.');
+                    if (!$user) {
+                        throw new \Exception('One or more artists is invalid.');
+                    }
                 }
             }
 
             // Attach artists/designers
-            foreach($data['designer_id'] as $key => $id) {
-                if($id || $data['designer_url'][$key])
+            foreach ($data['designer_id'] as $key => $id) {
+                if ($id || $data['designer_url'][$key]) {
                     DB::table('character_image_creators')->insert([
-                        'character_image_id' => $request->id,
-                        'type' => 'Designer',
-                        'character_type' => 'Update',
-                        'url' => $data['designer_url'][$key],
-                        'user_id' => $id
+                        'character_image_id' => $image->id,
+                        'type'               => 'Designer',
+                        'url'                => $data['designer_url'][$key],
+                        'user_id'            => $id,
                     ]);
+                }
             }
-            foreach($data['artist_id'] as $key => $id) {
-                if($id || $data['artist_url'][$key])
+            foreach ($data['artist_id'] as $key => $id) {
+                if ($id || $data['artist_url'][$key]) {
                     DB::table('character_image_creators')->insert([
-                        'character_image_id' => $request->id,
-                        'type' => 'Artist',
-                        'character_type' => 'Update',
-                        'url' => $data['artist_url'][$key],
-                        'user_id' => $id
+                        'character_image_id' => $image->id,
+                        'type'               => 'Artist',
+                        'url'                => $data['artist_url'][$key],
+                        'user_id'            => $id,
                     ]);
+                }
             }
 
             // Save image
-            if(!$isAdmin && isset($data['image'])) $this->handleImage($data['image'], $request->imageDirectory, $request->imageFileName, null, isset($data['default_image']));
-
-            // Save thumbnail
-            if(!$isAdmin || ($isAdmin && isset($data['modify_thumbnail']))) {
-                if(isset($data['use_cropper']))
-                    $this->cropThumbnail(Arr::only($data, ['x0','x1','y0','y1']), $request);
-                else if(isset($data['thumbnail']))
-                    $this->handleImage($data['thumbnail'], $request->imageDirectory, $request->thumbnailFileName);
-            }
-
-            return $this->commitReturn(true);
-        } catch(\Exception $e) {
-            $this->setError('error', $e->getMessage());
-        }
-        return $this->rollbackReturn(false);
-    }
-
-    /**
-     * Saves the addons section of a character design update request.
-     *
-     * @param  array                                        $data
-     * @param  \App\Models\Character\CharacterDesignUpdate  $request
-     * @return  bool
-     */
-    public function saveRequestAddons($data, $request)
-    {
-        DB::beginTransaction();
-
-        try {
-            $requestData = $request->data;
-            // First return any item stacks associated with this request
-            if(isset($requestData['user']) && isset($requestData['user']['user_items'])) {
-                foreach($requestData['user']['user_items'] as $userItemId=>$quantity) {
-                    $userItemRow = UserItem::find($userItemId);
-                    if(!$userItemRow) throw new \Exception("Cannot return an invalid item. (".$userItemId.")");
-                    if($userItemRow->update_count < $quantity) throw new \Exception("Cannot return more items than was held. (".$userItemId.")");
-                    $userItemRow->update_count -= $quantity;
-                    $userItemRow->save();
-                }
-            }
+            $this->handleImage($data['image'], $image->imageDirectory, $image->imageFileName, null, isset($data['default_image']));
 
-            // Also return any currency associated with this request
-            // This is stored in the data attribute
-            $currencyManager = new CurrencyManager;
-            if(isset($requestData['user']) && isset($requestData['user']['currencies'])) {
-                foreach($requestData['user']['currencies'] as $currencyId=>$quantity) {
-                    $currencyManager->creditCurrency(null, $request->user, null, null, $currencyId, $quantity);
-                }
-            }
-            if(isset($requestData['character']) && isset($requestData['character']['currencies'])) {
-                foreach($requestData['character']['currencies'] as $currencyId=>$quantity) {
-                    $currencyManager->creditCurrency(null, $request->character, null, null, $currencyId, $quantity);
-                }
+            // Save thumbnail first before processing full image
+            if (isset($data['use_cropper'])) {
+                $this->cropThumbnail(Arr::only($data, ['x0', 'x1', 'y0', 'y1']), $image, $isMyo);
+            } else {
+                $this->handleImage($data['thumbnail'], $image->imageDirectory, $image->thumbnailFileName, null, isset($data['default_image']));
             }
 
-            $userAssets = createAssetsArray();
-            $characterAssets = createAssetsArray(true);
-
-            // Attach items. Technically, the user doesn't lose ownership of the item - we're just adding an additional holding field.
-            // We're also not going to add logs as this might add unnecessary fluff to the logs and the items still belong to the user.
-            // Perhaps later I'll add a way to locate items that are being held by updates/trades.
-            if(isset($data['stack_id'])) {
-                foreach($data['stack_id'] as $stackId) {
-                    $stack = UserItem::with('item')->find($stackId);
-                    if(!$stack || $stack->user_id != $request->user_id) throw new \Exception("Invalid item selected.");
-                    if(!isset($data['stack_quantity'][$stackId])) throw new \Exception("Invalid quantity selected.");
-                    $stack->update_count += $data['stack_quantity'][$stackId];
-                    $stack->save();
-
-                    addAsset($userAssets, $stack, $data['stack_quantity'][$stackId]);
-                }
+            // Process and save the image itself
+            if (!$isMyo) {
+                $this->processImage($image);
             }
 
-            // Attach currencies.
-            if(isset($data['currency_id'])) {
-                foreach($data['currency_id'] as $holderKey=>$currencyIds) {
-                    $holder = explode('-', $holderKey);
-                    $holderType = $holder[0];
-                    $holderId = $holder[1];
-
-                    // The holder can be obtained from the request, but for sanity's sake we're going to perform a check
-                    $holder = ($holderType == 'user' ? User::find($holderId) : Character::find($holderId));
-                    if ($holderType == 'user' && $holder->id != $request->user_id) throw new \Exception("Error attaching currencies to this request. (1)");
-                    else if ($holderType == 'character' && $holder->id != $request->character_id) throw new \Exception("Error attaching currencies to this request. (2)");
-
-                    foreach($currencyIds as $key=>$currencyId) {
-                        $currency = Currency::find($currencyId);
-                        if(!$currency) throw new \Exception("Invalid currency selected.");
-                        if(!$currencyManager->debitCurrency($holder, null, null, null, $currency, $data['currency_quantity'][$holderKey][$key])) throw new \Exception("Invalid currency/quantity selected.");
-
-                        if($holderType == 'user') addAsset($userAssets, $currency, $data['currency_quantity'][$holderKey][$key]);
-                        else addAsset($characterAssets, $currency, $data['currency_quantity'][$holderKey][$key]);
-
-                    }
+            // Attach features
+            foreach ($data['feature_id'] as $key => $featureId) {
+                if ($featureId) {
+                    $feature = CharacterFeature::create(['character_image_id' => $image->id, 'feature_id' => $featureId, 'data' => $data['feature_data'][$key]]);
                 }
             }
 
-            $request->has_addons = 1;
-            $request->data = json_encode([
-                'user' => Arr::only(getDataReadyAssets($userAssets), ['user_items','currencies']),
-                'character' => Arr::only(getDataReadyAssets($characterAssets), ['currencies'])
-            ]);
-            $request->save();
-
-            return $this->commitReturn(true);
-        } catch(\Exception $e) {
+            return $image;
+        } catch (\Exception $e) {
             $this->setError('error', $e->getMessage());
         }
-        return $this->rollbackReturn(false);
-    }
-
-    /**
-     * Saves the character features (traits) section of a character design update request.
-     *
-     * @param  array                                        $data
-     * @param  \App\Models\Character\CharacterDesignUpdate  $request
-     * @return  bool
-     */
-    public function saveRequestFeatures($data, $request)
-    {
-        DB::beginTransaction();
-
-        try {
-            if(!($request->character->is_myo_slot && $request->character->image->species_id) && !isset($data['species_id'])) throw new \Exception("Please select a species.");
-            if(!($request->character->is_myo_slot && $request->character->image->rarity_id) && !isset($data['rarity_id'])) throw new \Exception("Please select a rarity.");
-
-            $rarity = ($request->character->is_myo_slot && $request->character->image->rarity_id) ? $request->character->image->rarity : Rarity::find($data['rarity_id']);
-            $species = ($request->character->is_myo_slot && $request->character->image->species_id) ? $request->character->image->species : Species::find($data['species_id']);
-            if(isset($data['title_id'])) $title = ($request->character->is_myo_slot && $request->character->image->title_id) ? $request->character->image->title : CharacterTitle::where('id', $data['title_id'])->first();
-            if(isset($data['subtype_id']) && $data['subtype_id'])
-                $subtype = ($request->character->is_myo_slot && $request->character->image->subtype_id) ? $request->character->image->subtype : Subtype::find($data['subtype_id']);
-            else $subtype = null;
-            if(!$rarity) throw new \Exception("Invalid rarity selected.");
-            if(!$species) throw new \Exception("Invalid species selected.");
-            if($subtype && $subtype->species_id != $species->id) throw new \Exception("Subtype does not match the species.");
-            if(isset($title) && !$title) throw new \Exception("Invalid title selected.");
-
-            // Clear old features
-            $request->features()->delete();
-
-            // Attach features
-            // We'll do the compulsory ones at the time of approval.
 
-            $features = Feature::whereIn('id', $data['feature_id'])->with('rarity')->get()->keyBy('id');
-
-            foreach($data['feature_id'] as $key => $featureId) {
-                if(!$featureId) continue;
-
-                // Skip the feature if the rarity is too high.
-                // Comment out this check if rarities should have more berth for traits choice.
-                //if($features[$featureId]->rarity->sort > $rarity->sort) continue;
-
-                // Skip the feature if it's not the correct species.
-                if($features[$featureId]->species_id && $features[$featureId]->species_id != $species->id) continue;
-
-                $feature = CharacterFeature::create(['character_image_id' => $request->id, 'feature_id' => $featureId, 'data' => $data['feature_data'][$key], 'character_type' => 'Update']);
-            }
-
-            // Update other stats
-            $request->species_id = $species->id;
-            $request->rarity_id = $rarity->id;
-            $request->subtype_id = $subtype ? $subtype->id : null;
-            $request->has_features = 1;
-            $request->title_id = isset($data['title_id']) && $data['title_id'] ? ($data['title_id'] != 'custom' ? $data['title_id'] : null) : null;
-            $request->title_data = ($title || $data['title_id'] == 'custom') && isset($data['title_data']) && isset($data['title_data']['full']) ? json_encode($data['title_data']) : null;
-            $request->save();
-
-            return $this->commitReturn(true);
-        } catch(\Exception $e) {
-            $this->setError('error', $e->getMessage());
-        }
-        return $this->rollbackReturn(false);
+        return false;
     }
 
     /**
-     * Submit a character design update request to the approval queue.
+     * Generates a list of features for displaying.
      *
-     * @param  \App\Models\Character\CharacterDesignUpdate  $request
-     * @return  bool
-     */
-    public function submitRequest($request)
-    {
-        DB::beginTransaction();
-
-        try {
-            if($request->status != 'Draft') throw new \Exception("This request cannot be resubmitted to the queue.");
-
-            // Recheck and set update type, as insurance/in case of pre-existing drafts
-            if($request->character->is_myo_slot)
-            $request->update_type = 'MYO';
-            else $request->update_type = 'Character';
-            // We've done validation and all section by section,
-            // so it's safe to simply set the status to Pending here
-            $request->status = 'Pending';
-            if(!$request->submitted_at) $request->submitted_at = Carbon::now();
-            $request->save();
-            return $this->commitReturn(true);
-        } catch(\Exception $e) {
-            $this->setError('error', $e->getMessage());
-        }
-        return $this->rollbackReturn(false);
-    }
-
-    /**
-     * Approves a character design update request and processes it.
+     * @param \App\Models\Character\CharacterImage $image
      *
-     * @param  array                                        $data
-     * @param  \App\Models\Character\CharacterDesignUpdate  $request
-     * @param  \App\Models\User\User                        $user
-     * @return  bool
+     * @return string
      */
-    public function approveRequest($data, $request, $user)
-    {
-        DB::beginTransaction();
-
-        try {
-            if($request->status != 'Pending') throw new \Exception("This request cannot be processed.");
-            if(!isset($data['character_category_id'])) throw new \Exception("Please select a character category.");
-            if(!isset($data['number'])) throw new \Exception("Please enter a character number.");
-            if(!isset($data['slug']) || Character::where('slug', $data['slug'])->where('id', '!=', $request->character_id)->exists()) throw new \Exception("Please enter a unique character code.");
-
-            // Remove any added items/currency
-            // Currency has already been removed, so no action required
-            // However logs need to be added for each of these
-            $requestData = $request->data;
-            $inventoryManager = new InventoryManager;
-            if(isset($requestData['user']) && isset($requestData['user']['user_items'])) {
-                $stacks = $requestData['user']['user_items'];
-                foreach($requestData['user']['user_items'] as $userItemId=>$quantity) {
-                    $userItemRow = UserItem::find($userItemId);
-                    if(!$userItemRow) throw new \Exception("Cannot return an invalid item. (".$userItemId.")");
-                    if($userItemRow->update_count < $quantity) throw new \Exception("Cannot return more items than was held. (".$userItemId.")");
-                    $userItemRow->update_count -= $quantity;
-                    $userItemRow->save();
-                }
-
-                $staff = $user;
-                foreach($stacks as $stackId=>$quantity) {
-                    $stack = UserItem::find($stackId);
-                    $user = User::find($request->user_id);
-                    if(!$inventoryManager->debitStack($user, $request->character->is_myo_slot ? 'MYO Design Approved' : 'Character Design Updated', ['data' => 'Item used in ' . ($request->character->is_myo_slot ? 'MYO design approval' : 'Character design update') . ' (<a href="'.$request->url.'">#'.$request->id.'</a>)'], $stack, $quantity)) throw new \Exception("Failed to create log for item stack.");
-                }
-                $user = $staff;
-            }
-            $currencyManager = new CurrencyManager;
-            if(isset($requestData['user']['currencies']) && $requestData['user']['currencies'])
-            {
-                foreach($requestData['user']['currencies'] as $currencyId=>$quantity) {
-                    $currency = Currency::find($currencyId);
-                    if(!$currencyManager->createLog($request->user_id, 'User', null, null,
-                    $request->character->is_myo_slot ? 'MYO Design Approved' : 'Character Design Updated',
-                    'Used in ' . ($request->character->is_myo_slot ? 'MYO design approval' : 'character design update') . ' (<a href="'.$request->url.'">#'.$request->id.'</a>)',
-                    $currencyId, $quantity))
-                        throw new \Exception("Failed to create log for user currency.");
-                }
-            }
-            if(isset($requestData['character']['currencies']) && $requestData['character']['currencies'])
-            {
-                foreach($requestData['character']['currencies'] as $currencyId=>$quantity) {
-                    $currency = Currency::find($currencyId);
-                    if(!$currencyManager->createLog($request->character_id, 'Character', null, null,
-                    $request->character->is_myo_slot ? 'MYO Design Approved' : 'Character Design Updated',
-                    'Used in ' . ($request->character->is_myo_slot ? 'MYO design approval' : 'character design update') . ' (<a href="'.$request->url.'">#'.$request->id.'</a>)',
-                    $currencyId, $quantity))
-                        throw new \Exception("Failed to create log for character currency.");
-                }
-            }
-
-            $extension = Config::get('lorekeeper.settings.masterlist_image_format') != null ? Config::get('lorekeeper.settings.masterlist_image_format') : $request->extension;
-
-            // Create a new image with the request data
-            $image = CharacterImage::create([
-                'character_id' => $request->character_id,
-                'is_visible' => 1,
-                'hash' => $request->hash,
-                'fullsize_hash' => $request->fullsize_hash ? $request->fullsize_hash : randomString(15),
-                'extension' => $extension,
-                'use_cropper' => $request->use_cropper,
-                'x0' => $request->x0,
-                'x1' => $request->x1,
-                'y0' => $request->y0,
-                'y1' => $request->y1,
-                'species_id' => $request->species_id,
-                'subtype_id' => ($request->character->is_myo_slot && isset($request->character->image->subtype_id)) ? $request->character->image->subtype_id : $request->subtype_id,
-                'rarity_id' => $request->rarity_id,
-                'sort' => 0,
-                'title_id' => isset($request->title_id) && $request->title_id ? $request->title_id : null,
-                'title_data' => isset($request->title_data) ? json_encode($request->title_data) : null
-            ]);
-
-            // Shift the image credits over to the new image
-            $request->designers()->update(['character_type' => 'Character', 'character_image_id' => $image->id]);
-            $request->artists()->update(['character_type' => 'Character', 'character_image_id' => $image->id]);
-
-            // Add the compulsory features
-            if($request->character->is_myo_slot)
-            {
-                foreach($request->character->image->features as $feature)
-                {
-                    CharacterFeature::create(['character_image_id' => $image->id, 'feature_id' => $feature->feature_id, 'data' => $feature->data, 'character_type' => 'Character']);
-                }
-            }
-
-            // Shift the image features over to the new image
-            $request->rawFeatures()->update(['character_image_id' => $image->id, 'character_type' => 'Character']);
-
-            // Make the image directory if it doesn't exist
-            if(!file_exists($image->imagePath))
-            {
-                // Create the directory.
-                if (!mkdir($image->imagePath, 0755, true)) {
-                    $this->setError('error', 'Failed to create image directory.');
-                    return false;
-                }
-                chmod($image->imagePath, 0755);
-            }
-
-            // Move the image file to the new image
-            File::move($request->imagePath . '/' . $request->imageFileName, $image->imagePath . '/' . $image->imageFileName);
-            // Process and save the image
-            $this->processImage($image);
-
-            // The thumbnail is already generated, so it can just be moved without processing
-            File::move($request->thumbnailPath . '/' . $request->thumbnailFileName, $image->thumbnailPath . '/' . $image->thumbnailFileName);
-
-            // Set character data and other info such as cooldown time, resell cost and terms etc.
-            // since those might be updated with the new design update
-            if(isset($data['transferrable_at'])) $request->character->transferrable_at = $data['transferrable_at'];
-            $request->character->character_category_id = $data['character_category_id'];
-            $request->character->number = $data['number'];
-            $request->character->slug = $data['slug'];
-            $request->character->rarity_id = $request->rarity_id;
-
-            $request->character->description = $data['description'];
-            $request->character->parsed_description = parse($data['description']);
-
-            $request->character->is_sellable = isset($data['is_sellable']);
-            $request->character->is_tradeable = isset($data['is_tradeable']);
-            $request->character->is_giftable = isset($data['is_giftable']);
-            $request->character->sale_value = isset($data['sale_value']) ? $data['sale_value'] : 0;
-
-            // Invalidate old image if desired
-            if(isset($data['invalidate_old']))
-            {
-                $request->character->image->is_valid = 0;
-                $request->character->image->save();
-            }
-
-            // Set new image if desired
-            if(isset($data['set_active']))
-            {
-                $request->character->character_image_id = $image->id;
-            }
-
-            // Final recheck and setting of update type, as insurance
-            if($request->character->is_myo_slot)
-            $request->update_type = 'MYO';
-            else $request->update_type = 'Character';
-            $request->save();
-
-            // Add a log for the character and user
-            $this->createLog($user->id, null, $request->character->user_id, $request->character->user->url, $request->character->id, $request->update_type == 'MYO' ? 'MYO Design Approved' : 'Character Design Updated', '[#'.$image->id.']', 'character');
-            $this->createLog($user->id, null, $request->character->user_id, $request->character->user->url, $request->character->id, $request->update_type == 'MYO' ? 'MYO Design Approved' : 'Character Design Updated', '[#'.$image->id.']', 'user');
-
-            // If this is for a MYO, set user's FTO status and the MYO status of the slot
-            // and clear the character's name
-            if($request->character->is_myo_slot)
-            {
-                if(Config::get('lorekeeper.settings.clear_myo_slot_name_on_approval')) $request->character->name = null;
-                $request->character->is_myo_slot = 0;
-                $request->user->settings->is_fto = 0;
-                $request->user->settings->save();
-            }
-            $request->character->save();
-
-            // Set status to approved
-            $request->staff_id = $user->id;
-            $request->status = 'Approved';
-            $request->save();
-
-            // Notify the user
-            Notifications::create('DESIGN_APPROVED', $request->user, [
-                'design_url' => $request->url,
-                'character_url' => $request->character->url,
-                'name' => $request->character->fullName
-            ]);
-
-            // Notify bookmarkers
-            $request->character->notifyBookmarkers('BOOKMARK_IMAGE');
-
-            return $this->commitReturn(true);
-        } catch(\Exception $e) {
-            $this->setError('error', $e->getMessage());
+    private function generateFeatureList($image) {
+        $result = '';
+        foreach ($image->features as $feature) {
+            $result .= '<div>'.($feature->feature->category ? '<strong>'.$feature->feature->category->displayName.':</strong> ' : '').$feature->feature->displayName.'</div>';
         }
-        return $this->rollbackReturn(false);
-    }
-
-    /**
-     * Rejects a character design update request and processes it.
-     * Rejection can be a soft rejection (reopens the request so the user can edit it and resubmit)
-     * or a hard rejection (takes the request out of the queue completely).
-     *
-     * @param  array                                        $data
-     * @param  \App\Models\Character\CharacterDesignUpdate  $request
-     * @param  \App\Models\User\User                        $user
-     * @param  bool                                         $forceReject
-     * @return  bool
-     */
-    public function rejectRequest($data, $request, $user, $forceReject = false, $notification = true)
-    {
-        DB::beginTransaction();
-
-        try {
-            if(!$forceReject && $request->status != 'Pending') throw new \Exception("This request cannot be processed.");
-
-            // This hard rejects the request - items/currency are returned to user
-            // and the user will need to open a new request to resubmit.
-            // Use when rejecting a request the user shouldn't have submitted at all.
-
-            $requestData = $request->data;
-            // Return all added items/currency
-            if(isset($requestData['user']) && isset($requestData['user']['user_items'])) {
-                foreach($requestData['user']['user_items'] as $userItemId=>$quantity) {
-                    $userItemRow = UserItem::find($userItemId);
-                    if(!$userItemRow) throw new \Exception("Cannot return an invalid item. (".$userItemId.")");
-                    if($userItemRow->update_count < $quantity) throw new \Exception("Cannot return more items than was held. (".$userItemId.")");
-                    $userItemRow->update_count -= $quantity;
-                    $userItemRow->save();
-                }
-            }
 
-            $currencyManager = new CurrencyManager;
-            if(isset($requestData['user']['currencies']) && $requestData['user']['currencies'])
-            {
-                foreach($requestData['user']['currencies'] as $currencyId=>$quantity) {
-                    $currency = Currency::find($currencyId);
-                    if(!$currency) throw new \Exception("Cannot return an invalid currency. (".$currencyId.")");
-                    if(!$currencyManager->creditCurrency(null, $request->user, null, null, $currency, $quantity)) throw new \Exception("Could not return currency to user. (".$currencyId.")");
-                }
-            }
-            if(isset($requestData['character']['currencies']) && $requestData['character']['currencies'])
-            {
-                foreach($requestData['character']['currencies'] as $currencyId=>$quantity) {
-                    $currency = Currency::find($currencyId);
-                    if(!$currency) throw new \Exception("Cannot return an invalid currency. (".$currencyId.")");
-                    if(!$currencyManager->creditCurrency(null, $request->character, null, null, $currency, $quantity)) throw new \Exception("Could not return currency to character. (".$currencyId.")");
-                }
-            }
-
-            // Set staff comment and status
-            $request->staff_id = $user->id;
-            $request->staff_comments = isset($data['staff_comments']) ? $data['staff_comments'] : null;
-            $request->status = 'Rejected';
-            $request->save();
-
-            if($notification)
-            {
-                // Notify the user
-                Notifications::create('DESIGN_REJECTED', $request->user, [
-                    'design_url' => $request->url,
-                    'character_url' => $request->character->url,
-                    'name' => $request->character->fullName
-                ]);
-            }
-
-            return $this->commitReturn(true);
-        } catch(\Exception $e) {
-            $this->setError('error', $e->getMessage());
-        }
-        return $this->rollbackReturn(false);
+        return $result;
     }
 
     /**
-     * Cancels a character design update request.
+     * Generates a list of image credits for displaying.
      *
-     * @param  array                                        $data
-     * @param  \App\Models\Character\CharacterDesignUpdate  $request
-     * @param  \App\Models\User\User                        $user
-     * @return  bool
-     */
-    public function cancelRequest($data, $request, $user)
-    {
-        DB::beginTransaction();
-
-        try {
-            if($request->status != 'Pending') throw new \Exception("This request cannot be processed.");
-
-            // Soft removes the request from the queue -
-            // it preserves all the data entered, but allows the staff member
-            // to add a comment to it. Status is returned to Draft status.
-            // Use when rejecting a request that just requires minor modifications to approve.
-
-            // Set staff comment and status
-            $request->staff_id = $user->id;
-            $request->staff_comments = isset($data['staff_comments']) ? $data['staff_comments'] : null;
-            $request->status = 'Draft';
-            if(!isset($data['preserve_queue'])) $request->submitted_at = null;
-            $request->save();
-
-            // Notify the user
-            Notifications::create('DESIGN_CANCELED', $request->user, [
-                'design_url' => $request->url,
-                'character_url' => $request->character->url,
-                'name' => $request->character->fullName
-            ]);
-
-            return $this->commitReturn(true);
-        } catch(\Exception $e) {
-            $this->setError('error', $e->getMessage());
-        }
-        return $this->rollbackReturn(false);
-    }
-
-    /**
-     * Deletes a character design update request.
+     * @param \App\Models\Character\CharacterImage $image
      *
-     * @param  \App\Models\Character\CharacterDesignUpdate  $request
-     * @return  bool
+     * @return string
      */
-    public function deleteRequest($request)
-    {
-        DB::beginTransaction();
-
-        try {
-            if($request->status != 'Draft') throw new \Exception("This request cannot be processed.");
-
-            // Deletes the request entirely, including images and etc.
-            // This returns any attached items/currency
-            // Characters with an open draft request cannot be transferred (due to attached items/currency),
-            // so this is necessary to transfer a character
-
-            $requestData = $request->data;
-            // Return all added items/currency
-            if(isset($requestData['user']) && isset($requestData['user']['user_items'])) {
-                foreach($requestData['user']['user_items'] as $userItemId=>$quantity) {
-                    $userItemRow = UserItem::find($userItemId);
-                    if(!$userItemRow) throw new \Exception("Cannot return an invalid item. (".$userItemId.")");
-                    if($userItemRow->update_count < $quantity) throw new \Exception("Cannot return more items than was held. (".$userItemId.")");
-                    $userItemRow->update_count -= $quantity;
-                    $userItemRow->save();
-                }
-            }
-
-            $currencyManager = new CurrencyManager;
-            if(isset($requestData['user']['currencies']) && $requestData['user']['currencies'])
-            {
-                foreach($requestData['user']['currencies'] as $currencyId=>$quantity) {
-                    $currency = Currency::find($currencyId);
-                    if(!$currency) throw new \Exception("Cannot return an invalid currency. (".$currencyId.")");
-                    if(!$currencyManager->creditCurrency(null, $request->user, null, null, $currency, $quantity)) throw new \Exception("Could not return currency to user. (".$currencyId.")");
-                }
-            }
-            if(isset($requestData['character']['currencies']) && $requestData['character']['currencies'])
-            {
-                foreach($requestData['character']['currencies'] as $currencyId=>$quantity) {
-                    $currency = Currency::find($currencyId);
-                    if(!$currency) throw new \Exception("Cannot return an invalid currency. (".$currencyId.")");
-                    if(!$currencyManager->creditCurrency(null, $request->character, null, null, $currency, $quantity)) throw new \Exception("Could not return currency to character. (".$currencyId.")");
-                }
-            }
-
-            // Delete the request
-            $request->delete();
-
-            return $this->commitReturn(true);
-        } catch(\Exception $e) {
-            $this->setError('error', $e->getMessage());
+    private function generateCredits($image) {
+        $result = ['designers' => '', 'artists' => ''];
+        foreach ($image->designers as $designer) {
+            $result['designers'] .= '<div>'.$designer->displayLink().'</div>';
         }
-        return $this->rollbackReturn(false);
-    }
-
-    /**
-     * Votes on a a character design update request.
-     *
-     * @param  string                                       $action
-     * @param  \App\Models\Character\CharacterDesignUpdate  $request
-     * @param  \App\Models\User\User                        $user
-     * @return  bool
-     */
-    public function voteRequest($action, $request, $user)
-    {
-        DB::beginTransaction();
-
-        try {
-            if($request->status != 'Pending') throw new \Exception("This request cannot be processed.");
-            if(!Config::get('lorekeeper.extensions.design_update_voting')) throw new \Exception('This extension is not currently enabled.');
-
-            switch($action) {
-                default:
-                    flash('Invalid action.')->error();
-                    break;
-                case 'approve':
-                    $vote = 2;
-                    break;
-                case 'reject':
-                    $vote = 1;
-                    break;
-            }
-
-            $voteData = (isset($request->vote_data) ? collect(json_decode($request->vote_data, true)) : collect([]));
-            $voteData->get($user->id) ? $voteData->pull($user->id) : null;
-            $voteData->put($user->id, $vote);
-            $request->vote_data = $voteData->toJson();
-
-            $request->save();
-
-            return $this->commitReturn(true);
-        } catch(\Exception $e) {
-            $this->setError('error', $e->getMessage());
+        foreach ($image->artists as $artist) {
+            $result['artists'] .= '<div>'.$artist->displayLink().'</div>';
         }
-        return $this->rollbackReturn(false);
+
+        return $result;
     }
 }
diff --git a/app/Services/CurrencyManager.php b/app/Services/CurrencyManager.php
index 7c0e2c64dc..2ea9c08041 100644
--- a/app/Services/CurrencyManager.php
+++ b/app/Services/CurrencyManager.php
@@ -1,19 +1,16 @@
-<?php namespace App\Services;
+<?php
 
-use Carbon\Carbon;
-use App\Services\Service;
-
-use DB;
-use Config;
-use Notifications;
+namespace App\Services;
 
-use App\Models\User\User;
+use App\Facades\Notifications;
+use App\Models\Character\CharacterCurrency;
 use App\Models\Currency\Currency;
+use App\Models\User\User;
 use App\Models\User\UserCurrency;
-use App\Models\Character\CharacterCurrency;
+use Carbon\Carbon;
+use Illuminate\Support\Facades\DB;
 
-class CurrencyManager extends Service
-{
+class CurrencyManager extends Service {
     /*
     |--------------------------------------------------------------------------
     | Currency Service
@@ -26,51 +23,67 @@ class CurrencyManager extends Service
     /**
      * Admin function for granting currency to multiple users.
      *
-     * @param  array                  $data
-     * @param  \App\Models\User\User  $staff
-     * @return  bool
+     * @param array                 $data
+     * @param \App\Models\User\User $staff
+     *
+     * @return bool
      */
-    public function grantUserCurrencies($data, $staff)
-    {
+    public function grantUserCurrencies($data, $staff) {
         DB::beginTransaction();
 
         try {
-            if($data['quantity'] == 0) throw new \Exception("Please enter a non-zero quantity.");
+            if ($data['quantity'] == 0) {
+                throw new \Exception('Please enter a non-zero quantity.');
+            }
 
             // Process names
             $users = User::find($data['names']);
-            if(count($users) != count($data['names'])) throw new \Exception("An invalid user was selected.");
+            if (count($users) != count($data['names'])) {
+                throw new \Exception('An invalid user was selected.');
+            }
 
             // Process currency
             $currency = Currency::find($data['currency_id']);
-            if(!$currency) throw new \Exception("Invalid currency selected.");
-            if(!$currency->is_user_owned) throw new \Exception("This currency cannot be held by users.");
+            if (!$currency) {
+                throw new \Exception('Invalid currency selected.');
+            }
+            if (!$currency->is_user_owned) {
+                throw new \Exception('This currency cannot be held by users.');
+            }
 
-            if($data['quantity'] < 0)
-                foreach($users as $user) {
+            if ($data['quantity'] < 0) {
+                foreach ($users as $user) {
+                    if (!$this->logAdminAction($staff, 'Currency Debit', 'Debited '.$data['quantity'].' '.$currency->displayName.' from '.$user->displayname)) {
+                        throw new \Exception('Failed to log admin action.');
+                    }
                     $this->debitCurrency($user, $staff, 'Staff Removal', $data['data'], $currency, -$data['quantity']);
                     Notifications::create('CURRENCY_REMOVAL', $user, [
-                        'currency_name' => $currency->name,
+                        'currency_name'     => $currency->name,
                         'currency_quantity' => -$data['quantity'],
-                        'sender_url' => $staff->url,
-                        'sender_name' => $staff->name
+                        'sender_url'        => $staff->url,
+                        'sender_name'       => $staff->name,
                     ]);
                 }
-            else
-                foreach($users as $user) {
+            } else {
+                foreach ($users as $user) {
+                    if (!$this->logAdminAction($staff, 'Currency Grant', 'Granted '.$data['quantity'].' '.$currency->displayName.' to '.$user->displayname)) {
+                        throw new \Exception('Failed to log admin action.');
+                    }
                     $this->creditCurrency($staff, $user, 'Staff Grant', $data['data'], $currency, $data['quantity']);
                     Notifications::create('CURRENCY_GRANT', $user, [
-                        'currency_name' => $currency->name,
+                        'currency_name'     => $currency->name,
                         'currency_quantity' => $data['quantity'],
-                        'sender_url' => $staff->url,
-                        'sender_name' => $staff->name
+                        'sender_url'        => $staff->url,
+                        'sender_name'       => $staff->name,
                     ]);
                 }
+            }
 
             return $this->commitReturn(true);
-        } catch(\Exception $e) {
+        } catch (\Exception $e) {
             $this->setError('error', $e->getMessage());
         }
+
         return $this->rollbackReturn(false);
     }
 
@@ -78,250 +91,303 @@ public function grantUserCurrencies($data, $staff)
      * Admin function for granting currency to a character.
      * Removes currency if the quantity given is less than 0.
      *
-     * @param  array                            $data
-     * @param  \App\Models\Character\Character  $staff
-     * @param  \App\Models\User\User            $staff
-     * @return  bool
+     * @param array                           $data
+     * @param \App\Models\Character\Character $staff
+     * @param \App\Models\User\User           $staff
+     * @param mixed                           $character
+     *
+     * @return bool
      */
-    public function grantCharacterCurrencies($data, $character, $staff)
-    {
+    public function grantCharacterCurrencies($data, $character, $staff) {
         DB::beginTransaction();
 
         try {
-            if($data['quantity'] == 0) throw new \Exception("Please enter a non-zero quantity.");
+            if ($data['quantity'] == 0) {
+                throw new \Exception('Please enter a non-zero quantity.');
+            }
 
-            if(!$character) throw new \Exception("Invalid character selected.");
+            if (!$character) {
+                throw new \Exception('Invalid character selected.');
+            }
 
             // Process currency
             $currency = Currency::find($data['currency_id']);
-            if(!$currency) throw new \Exception("Invalid currency selected.");
-            if(!$currency->is_character_owned) throw new \Exception("This currency cannot be held by characters.");
-            if($data['quantity'] < 0) {
+            if (!$currency) {
+                throw new \Exception('Invalid currency selected.');
+            }
+            if (!$currency->is_character_owned) {
+                throw new \Exception('This currency cannot be held by characters.');
+            }
+            if ($data['quantity'] < 0) {
                 $this->debitCurrency($character, $staff, 'Staff Removal', $data['data'], $currency, -$data['quantity']);
-                if(isset($character->user)) {
-                  Notifications::create('CHARACTER_CURRENCY_REMOVAL', $character->user, [
-                      'currency_name' => $currency->name,
-                      'currency_quantity' => -$data['quantity'],
-                      'sender_url' => $staff->url,
-                      'sender_name' => $staff->name,
-                      'character_name' => $character->fullName,
-                      'character_slug' => $character->slug
-                  ]);
+                if (isset($character->user)) {
+                    Notifications::create('CHARACTER_CURRENCY_REMOVAL', $character->user, [
+                        'currency_name'     => $currency->name,
+                        'currency_quantity' => -$data['quantity'],
+                        'sender_url'        => $staff->url,
+                        'sender_name'       => $staff->name,
+                        'character_name'    => $character->fullName,
+                        'character_slug'    => $character->slug,
+                    ]);
                 }
-            }
-            else{
+            } else {
                 $this->creditCurrency($staff, $character, 'Staff Grant', $data['data'], $currency, $data['quantity']);
-                if(isset($character->user)) {
-                  Notifications::create('CHARACTER_CURRENCY_GRANT', $character->user, [
-                      'currency_name' => $currency->name,
-                      'currency_quantity' => $data['quantity'],
-                      'sender_url' => $staff->url,
-                      'sender_name' => $staff->name,
-                      'character_name' => $character->fullName,
-                      'character_slug' => $character->slug
-                  ]);
+                if (isset($character->user)) {
+                    Notifications::create('CHARACTER_CURRENCY_GRANT', $character->user, [
+                        'currency_name'     => $currency->name,
+                        'currency_quantity' => $data['quantity'],
+                        'sender_url'        => $staff->url,
+                        'sender_name'       => $staff->name,
+                        'character_name'    => $character->fullName,
+                        'character_slug'    => $character->slug,
+                    ]);
                 }
             }
 
             return $this->commitReturn(true);
-        } catch(\Exception $e) {
+        } catch (\Exception $e) {
             $this->setError('error', $e->getMessage());
         }
+
         return $this->rollbackReturn(false);
     }
 
     /**
      * Transfers currency between users.
      *
-     * @param  \App\Models\User\User          $sender
-     * @param  \App\Models\User\User          $recipient
-     * @param  \App\Models\Currency\Currency  $currency
-     * @param  int                            $quantity
-     * @return  bool
+     * @param \App\Models\User\User         $sender
+     * @param \App\Models\User\User         $recipient
+     * @param \App\Models\Currency\Currency $currency
+     * @param int                           $quantity
+     *
+     * @return bool
      */
-    public function transferCurrency($sender, $recipient, $currency, $quantity)
-    {
+    public function transferCurrency($sender, $recipient, $currency, $quantity) {
         DB::beginTransaction();
 
         try {
-            if(!$recipient) throw new \Exception("Invalid recipient selected.");
-            if($recipient->logType == 'User' && !$recipient->hasAlias) throw new \Exception("Cannot transfer currency to a non-verified member.");
-            if($recipient->logType == 'User' && $recipient->is_banned) throw new \Exception("Cannot transfer currency to a banned member.");
-            if(!$currency) throw new \Exception("Invalid currency selected.");
-            if($quantity <= 0) throw new \Exception("Invalid quantity entered.");
-
+            if (!$recipient) {
+                throw new \Exception('Invalid recipient selected.');
+            }
+            if ($recipient->logType == 'User' && !$recipient->hasAlias) {
+                throw new \Exception('Cannot transfer currency to a non-verified member.');
+            }
+            if ($recipient->logType == 'User' && $recipient->is_banned) {
+                throw new \Exception('Cannot transfer currency to a banned member.');
+            }
+            if (!$currency) {
+                throw new \Exception('Invalid currency selected.');
+            }
+            if ($quantity <= 0) {
+                throw new \Exception('Invalid quantity entered.');
+            }
 
-            if($this->debitCurrency($sender, $recipient, null, null, $currency, $quantity) &&
-            $this->creditCurrency($sender, $recipient, null, null, $currency, $quantity))
-            {
+            if ($this->debitCurrency($sender, $recipient, null, null, $currency, $quantity) &&
+            $this->creditCurrency($sender, $recipient, null, null, $currency, $quantity)) {
                 $this->createLog($sender->id, $sender->logType, $recipient->id, $recipient->logType, 'User Transfer', null, $currency->id, $quantity);
 
                 Notifications::create('CURRENCY_TRANSFER', $recipient, [
-                    'currency_name' => $currency->name,
+                    'currency_name'     => $currency->name,
                     'currency_quantity' => $quantity,
-                    'sender_url' => $sender->url,
-                    'sender_name' => $sender->name
+                    'sender_url'        => $sender->url,
+                    'sender_name'       => $sender->name,
                 ]);
+
                 return $this->commitReturn(true);
             }
-        } catch(\Exception $e) {
+        } catch (\Exception $e) {
             $this->setError('error', $e->getMessage());
         }
+
         return $this->rollbackReturn(false);
     }
 
     /**
      * Transfers currency between a user and character.
      *
-     * @param  \App\Models\User\User|\App\Models\Character\Character  $sender
-     * @param  \App\Models\User\User|\App\Models\Character\Character  $recipient
-     * @param  \App\Models\Currency\Currency                          $currency
-     * @param  int                                                    $quantity
-     * @return  bool
+     * @param \App\Models\Character\Character|\App\Models\User\User $sender
+     * @param \App\Models\Character\Character|\App\Models\User\User $recipient
+     * @param \App\Models\Currency\Currency                         $currency
+     * @param int                                                   $quantity
+     *
+     * @return bool
      */
-    public function transferCharacterCurrency($sender, $recipient, $currency, $quantity)
-    {
+    public function transferCharacterCurrency($sender, $recipient, $currency, $quantity) {
         DB::beginTransaction();
 
         try {
-            if(!$recipient) throw new \Exception("Invalid recipient selected.");
-            if(!$sender) throw new \Exception("Invalid sender selected.");
-            if($recipient->logType == 'Character' && $sender->logType == 'Character') throw new \Exception("Cannot transfer currencies between characters.");
-            if($recipient->logType == 'Character' && !$sender->hasPower('edit_inventories') && !$recipient->is_visible) throw new \Exception("Invalid character selected.");
-            if(!$currency) throw new \Exception("Invalid currency selected.");
-            if($quantity <= 0) throw new \Exception("Invalid quantity entered.");
-
+            if (!$recipient) {
+                throw new \Exception('Invalid recipient selected.');
+            }
+            if (!$sender) {
+                throw new \Exception('Invalid sender selected.');
+            }
+            if ($recipient->logType == 'Character' && $sender->logType == 'Character') {
+                throw new \Exception('Cannot transfer currencies between characters.');
+            }
+            if ($recipient->logType == 'Character' && !$sender->hasPower('edit_inventories') && !$recipient->is_visible) {
+                throw new \Exception('Invalid character selected.');
+            }
+            if (!$currency) {
+                throw new \Exception('Invalid currency selected.');
+            }
+            if ($quantity <= 0) {
+                throw new \Exception('Invalid quantity entered.');
+            }
 
-            if($this->debitCurrency($sender, $recipient, null, null, $currency, $quantity) &&
-            $this->creditCurrency($sender, $recipient, null, null, $currency, $quantity))
-            {
+            if ($this->debitCurrency($sender, $recipient, null, null, $currency, $quantity) &&
+            $this->creditCurrency($sender, $recipient, null, null, $currency, $quantity)) {
                 $this->createLog($sender->id, $sender->logType, $recipient->id, $recipient->logType, $sender->logType == 'User' ? 'User → Character Transfer' : 'Character → User Transfer', null, $currency->id, $quantity);
+
                 return $this->commitReturn(true);
             }
-        } catch(\Exception $e) {
+        } catch (\Exception $e) {
             $this->setError('error', $e->getMessage());
         }
+
         return $this->rollbackReturn(false);
     }
 
     /**
      * Credits currency to a user or character.
      *
-     * @param  \App\Models\User\User|\App\Models\Character\Character  $sender
-     * @param  \App\Models\User\User|\App\Models\Character\Character  $recipient
-     * @param  string                                                 $type
-     * @param  string                                                 $data
-     * @param  \App\Models\Currency\Currency                          $currency
-     * @param  int                                                    $quantity
-     * @return  bool
+     * @param \App\Models\Character\Character|\App\Models\User\User $sender
+     * @param \App\Models\Character\Character|\App\Models\User\User $recipient
+     * @param string                                                $type
+     * @param string                                                $data
+     * @param \App\Models\Currency\Currency                         $currency
+     * @param int                                                   $quantity
+     *
+     * @return bool
      */
-    public function creditCurrency($sender, $recipient, $type, $data, $currency, $quantity)
-    {
+    public function creditCurrency($sender, $recipient, $type, $data, $currency, $quantity) {
         DB::beginTransaction();
 
         try {
-            if(is_numeric($currency)) $currency = Currency::find($currency);
-            if($recipient->logType == 'User') {
+            if (is_numeric($currency)) {
+                $currency = Currency::find($currency);
+            }
+            if ($recipient->logType == 'User') {
                 $record = UserCurrency::where('user_id', $recipient->id)->where('currency_id', $currency->id)->first();
-                if($record) {
+                if ($record) {
                     // Laravel doesn't support composite primary keys, so directly updating the DB row here
                     DB::table('user_currencies')->where('user_id', $recipient->id)->where('currency_id', $currency->id)->update(['quantity' => $record->quantity + $quantity]);
-                }
-                else {
+                } else {
                     $record = UserCurrency::create(['user_id' => $recipient->id, 'currency_id' => $currency->id, 'quantity' => $quantity]);
                 }
-            }
-            else {
+            } else {
                 $record = CharacterCurrency::where('character_id', $recipient->id)->where('currency_id', $currency->id)->first();
-                if($record) {
+                if ($record) {
                     // Laravel doesn't support composite primary keys, so directly updating the DB row here
                     DB::table('character_currencies')->where('character_id', $recipient->id)->where('currency_id', $currency->id)->update(['quantity' => $record->quantity + $quantity]);
-                }
-                else {
+                } else {
                     $record = CharacterCurrency::create(['character_id' => $recipient->id, 'currency_id' => $currency->id, 'quantity' => $quantity]);
                 }
             }
-            if($type && !$this->createLog($sender ? $sender->id : null, $sender ? $sender->logType : null,
-            $recipient ? $recipient->id : null, $recipient ? $recipient->logType : null,
-            $type, $data, $currency->id, $quantity)) throw new \Exception("Failed to create log.");
+            if ($type && !$this->createLog(
+                $sender ? $sender->id : null,
+                $sender ? $sender->logType : null,
+                $recipient ? $recipient->id : null,
+                $recipient ? $recipient->logType : null,
+                $type,
+                $data,
+                $currency->id,
+                $quantity
+            )) {
+                throw new \Exception('Failed to create log.');
+            }
 
             return $this->commitReturn(true);
-        } catch(\Exception $e) {
+        } catch (\Exception $e) {
             $this->setError('error', $e->getMessage());
         }
+
         return $this->rollbackReturn(false);
     }
 
     /**
      * Debits currency from a user or character.
      *
-     * @param  \App\Models\User\User|\App\Models\Character\Character  $sender
-     * @param  \App\Models\User\User|\App\Models\Character\Character  $recipient
-     * @param  string                                                 $type
-     * @param  string                                                 $data
-     * @param  \App\Models\Currency\Currency                          $currency
-     * @param  int                                                    $quantity
-     * @return  bool
+     * @param \App\Models\Character\Character|\App\Models\User\User $sender
+     * @param \App\Models\Character\Character|\App\Models\User\User $recipient
+     * @param string                                                $type
+     * @param string                                                $data
+     * @param \App\Models\Currency\Currency                         $currency
+     * @param int                                                   $quantity
+     *
+     * @return bool
      */
-    public function debitCurrency($sender, $recipient, $type, $data, $currency, $quantity)
-    {
+    public function debitCurrency($sender, $recipient, $type, $data, $currency, $quantity) {
         DB::beginTransaction();
 
         try {
-            if($sender->logType == 'User') {
+            if ($sender->logType == 'User') {
                 $record = UserCurrency::where('user_id', $sender->id)->where('currency_id', $currency->id)->first();
-                if(!$record || $record->quantity < $quantity) throw new \Exception("Not enough ".$currency->name." to carry out this action.");
+                if (!$record || $record->quantity < $quantity) {
+                    throw new \Exception('Not enough '.$currency->name.' to carry out this action.');
+                }
 
                 // Laravel doesn't support composite primary keys, so directly updating the DB row here
                 DB::table('user_currencies')->where('user_id', $sender->id)->where('currency_id', $currency->id)->update(['quantity' => $record->quantity - $quantity]);
-            }
-            else {
+            } else {
                 $record = CharacterCurrency::where('character_id', $sender->id)->where('currency_id', $currency->id)->first();
-                if(!$record || $record->quantity < $quantity) throw new \Exception("Not enough ".$currency->name." to carry out this action.");
+                if (!$record || $record->quantity < $quantity) {
+                    throw new \Exception('Not enough '.$currency->name.' to carry out this action.');
+                }
 
                 // Laravel doesn't support composite primary keys, so directly updating the DB row here
                 DB::table('character_currencies')->where('character_id', $sender->id)->where('currency_id', $currency->id)->update(['quantity' => $record->quantity - $quantity]);
             }
 
-            if($type && !$this->createLog($sender ? $sender->id : null, $sender ? $sender->logType : null,
-            $recipient ? $recipient->id : null, $recipient ? $recipient->logType : null,
-            $type, $data, $currency->id, -$quantity)) throw new \Exception("Failed to create log.");
+            if ($type && !$this->createLog(
+                $sender ? $sender->id : null,
+                $sender ? $sender->logType : null,
+                $recipient ? $recipient->id : null,
+                $recipient ? $recipient->logType : null,
+                $type,
+                $data,
+                $currency->id,
+                -$quantity
+            )) {
+                throw new \Exception('Failed to create log.');
+            }
 
             return $this->commitReturn(true);
-        } catch(\Exception $e) {
+        } catch (\Exception $e) {
             $this->setError('error', $e->getMessage());
         }
+
         return $this->rollbackReturn(false);
     }
 
     /**
      * Creates a currency log.
      *
-     * @param  int     $senderId
-     * @param  string  $senderType
-     * @param  int     $recipientId
-     * @param  string  $recipientType
-     * @param  string  $type
-     * @param  string  $data
-     * @param  int     $currencyId
-     * @param  int     $quantity
-     * @return  int
+     * @param int    $senderId
+     * @param string $senderType
+     * @param int    $recipientId
+     * @param string $recipientType
+     * @param string $type
+     * @param string $data
+     * @param int    $currencyId
+     * @param int    $quantity
+     *
+     * @return int
      */
-    public function createLog($senderId, $senderType, $recipientId, $recipientType, $type, $data, $currencyId, $quantity)
-    {
+    public function createLog($senderId, $senderType, $recipientId, $recipientType, $type, $data, $currencyId, $quantity) {
         return DB::table('currencies_log')->insert(
             [
-                'sender_id' => $senderId,
-                'sender_type' => $senderType,
-                'recipient_id' => $recipientId,
+                'sender_id'      => $senderId,
+                'sender_type'    => $senderType,
+                'recipient_id'   => $recipientId,
                 'recipient_type' => $recipientType,
-                'log' => $type . ($data ? ' (' . $data . ')' : ''),
-                'log_type' => $type,
-                'data' => $data, // this should be just a string
-                'currency_id' => $currencyId,
-                'quantity' => $quantity,
-                'created_at' => Carbon::now(),
-                'updated_at' => Carbon::now()
+                'log'            => $type.($data ? ' ('.$data.')' : ''),
+                'log_type'       => $type,
+                'data'           => $data, // this should be just a string
+                'currency_id'    => $currencyId,
+                'quantity'       => $quantity,
+                'created_at'     => Carbon::now(),
+                'updated_at'     => Carbon::now(),
             ]
         );
     }
diff --git a/app/Services/CurrencyService.php b/app/Services/CurrencyService.php
index b608d2bbd7..55bd53534b 100644
--- a/app/Services/CurrencyService.php
+++ b/app/Services/CurrencyService.php
@@ -1,17 +1,13 @@
-<?php namespace App\Services;
+<?php
 
-use App\Services\Service;
-
-use DB;
-use Config;
+namespace App\Services;
 
+use App\Models\Character\CharacterCurrency;
 use App\Models\Currency\Currency;
 use App\Models\User\UserCurrency;
-use App\Models\Character\CharacterCurrency;
-
+use Illuminate\Support\Facades\DB;
 
-class CurrencyService extends Service
-{
+class CurrencyService extends Service {
     /*
     |--------------------------------------------------------------------------
     | Currency Service
@@ -24,161 +20,143 @@ class CurrencyService extends Service
     /**
      * Creates a new currency.
      *
-     * @param  array                  $data
-     * @param  \App\Models\User\User  $user
-     * @return bool|\App\Models\Currency\Currency
+     * @param array                 $data
+     * @param \App\Models\User\User $user
+     *
+     * @return \App\Models\Currency\Currency|bool
      */
-    public function createCurrency($data, $user)
-    {
+    public function createCurrency($data, $user) {
         DB::beginTransaction();
 
         try {
             // More specific validation
-            if(!isset($data['is_user_owned']) && !isset($data['is_character_owned'])) throw new \Exception("Please choose if this currency is attached to users and/or characters.");
+            if (!isset($data['is_user_owned']) && !isset($data['is_character_owned'])) {
+                throw new \Exception('Please choose if this currency is attached to users and/or characters.');
+            }
 
             $data = $this->populateData($data);
 
             $icon = $image = null;
-            if(isset($data['icon']) && $data['icon']) {
+            if (isset($data['icon']) && $data['icon']) {
                 $data['has_icon'] = 1;
                 $icon = $data['icon'];
                 unset($data['icon']);
+            } else {
+                $data['has_icon'] = 0;
             }
-            else $data['has_icon'] = 0;
 
-            if(isset($data['image']) && $data['image']) {
+            if (isset($data['image']) && $data['image']) {
                 $data['has_image'] = 1;
+                $data['hash'] = randomString(10);
                 $image = $data['image'];
                 unset($data['image']);
+            } else {
+                $data['has_image'] = 0;
             }
-            else $data['has_image'] = 0;
 
             $currency = Currency::create($data);
 
-            if ($icon) $this->handleImage($icon, $currency->currencyIconPath, $currency->currencyIconFileName);
-            if ($image) $this->handleImage($image, $currency->currencyImagePath, $currency->currencyImageFileName);
+            if (!$this->logAdminAction($user, 'Created Currency', 'Created '.$currency->displayName)) {
+                throw new \Exception('Failed to log admin action.');
+            }
+
+            if ($icon) {
+                $this->handleImage($icon, $currency->currencyIconPath, $currency->currencyIconFileName);
+            }
+            if ($image) {
+                $this->handleImage($image, $currency->currencyImagePath, $currency->currencyImageFileName);
+            }
 
             return $this->commitReturn($currency);
-        } catch(\Exception $e) {
+        } catch (\Exception $e) {
             $this->setError('error', $e->getMessage());
         }
+
         return $this->rollbackReturn(false);
     }
 
     /**
      * Updates a currency.
      *
-     * @param  \App\Models\Currency\Currency  $currency
-     * @param  array                          $data
-     * @param  \App\Models\User\User          $user
-     * @return bool|\App\Models\Currency\Currency
+     * @param \App\Models\Currency\Currency $currency
+     * @param array                         $data
+     * @param \App\Models\User\User         $user
+     *
+     * @return \App\Models\Currency\Currency|bool
      */
-    public function updateCurrency($currency, $data, $user)
-    {
+    public function updateCurrency($currency, $data, $user) {
         DB::beginTransaction();
 
         try {
             // More specific validation
-            if(!isset($data['is_user_owned']) && !isset($data['is_character_owned'])) throw new \Exception("Please choose if this currency is attached to users and/or characters.");
-            if(Currency::where('name', $data['name'])->where('id', '!=', $currency->id)->exists()) throw new \Exception("The name has already been taken.");
-            if(isset($data['abbreviation']) && Currency::where('abbreviation', $data['abbreviation'])->where('id', '!=', $currency->id)->exists()) throw new \Exception("The abbreviation has already been taken.");
+            if (!isset($data['is_user_owned']) && !isset($data['is_character_owned'])) {
+                throw new \Exception('Please choose if this currency is attached to users and/or characters.');
+            }
+            if (Currency::where('name', $data['name'])->where('id', '!=', $currency->id)->exists()) {
+                throw new \Exception('The name has already been taken.');
+            }
+            if (isset($data['abbreviation']) && Currency::where('abbreviation', $data['abbreviation'])->where('id', '!=', $currency->id)->exists()) {
+                throw new \Exception('The abbreviation has already been taken.');
+            }
 
             $data = $this->populateData($data, $currency);
 
             $icon = $image = null;
-            if(isset($data['icon']) && $data['icon']) {
+            if (isset($data['icon']) && $data['icon']) {
                 $data['has_icon'] = 1;
                 $icon = $data['icon'];
                 unset($data['icon']);
             }
 
-            if(isset($data['image']) && $data['image']) {
+            if (isset($data['image']) && $data['image']) {
                 $data['has_image'] = 1;
+                $data['hash'] = randomString(10);
                 $image = $data['image'];
                 unset($data['image']);
             }
 
             $currency->update($data);
 
-            if ($icon) $this->handleImage($icon, $currency->currencyIconPath, $currency->currencyIconFileName);
-            if ($image) $this->handleImage($image, $currency->currencyImagePath, $currency->currencyImageFileName);
+            if (!$this->logAdminAction($user, 'Updated Currency', 'Updated '.$currency->displayName)) {
+                throw new \Exception('Failed to log admin action.');
+            }
+
+            if ($icon) {
+                $this->handleImage($icon, $currency->currencyIconPath, $currency->currencyIconFileName);
+            }
+            if ($image) {
+                $this->handleImage($image, $currency->currencyImagePath, $currency->currencyImageFileName);
+            }
 
             return $this->commitReturn($currency);
-        } catch(\Exception $e) {
+        } catch (\Exception $e) {
             $this->setError('error', $e->getMessage());
         }
-        return $this->rollbackReturn(false);
-    }
 
-    /**
-     * Processes user input for creating/updating a currency.
-     *
-     * @param  array                          $data
-     * @param  \App\Models\Currency\Currency  $currency
-     * @return array
-     */
-    private function populateData($data, $currency = null)
-    {
-        if(isset($data['description']) && $data['description']) $data['parsed_description'] = parse($data['description']);
-
-        if(!isset($data['is_user_owned'])) $data['is_user_owned'] = 0;
-        if(!isset($data['is_character_owned'])) $data['is_character_owned'] = 0;
-
-        if(!isset($data['is_displayed'])) $data['is_displayed'] = 0;
-
-        if(!isset($data['allow_user_to_user'])) $data['allow_user_to_user'] = 0;
-        if(!isset($data['allow_user_to_character'])) $data['allow_user_to_character'] = 0;
-        if(!isset($data['allow_character_to_user'])) $data['allow_character_to_user'] = 0;
-
-        $data['sort_user'] = $data['sort_character'] = 0;
-
-        // Process the checkbox fields
-        if(!($data['is_character_owned'] && $data['is_user_owned']))
-        {
-            $data['allow_user_to_character'] = $data['allow_character_to_user'] = 0;
-        }
-        if(!$data['is_user_owned'])
-        {
-            $data['allow_user_to_user'] = $data['is_displayed'] = 0;
-        }
-
-        if(isset($data['remove_icon']) || isset($data['remove_image']))
-        {
-            if($currency)
-            {
-                if($currency->has_icon && $data['remove_icon'])
-                {
-                    $data['has_icon'] = 0;
-                    $this->deleteImage($currency->currencyIconPath, $currency->currencyIconFileName);
-                }
-                if($currency->has_image && $data['remove_image'])
-                {
-                    $data['has_image'] = 0;
-                    $this->deleteImage($currency->currencyImagePath, $currency->currencyImageFileName);
-                }
-            }
-            unset($data['remove_icon']);
-            unset($data['remove_image']);
-        }
-
-        return $data;
+        return $this->rollbackReturn(false);
     }
 
     /**
      * Deletes a currency.
      *
-     * @param  \App\Models\Currency\Currency  $currency
+     * @param \App\Models\Currency\Currency $currency
+     * @param mixed                         $user
+     *
      * @return bool
      */
-    public function deleteCurrency($currency)
-    {
+    public function deleteCurrency($currency, $user) {
         DB::beginTransaction();
 
         try {
-
-            if(DB::table('loots')->where('rewardable_type', 'Currency')->where('rewardable_id', $currency->id)->exists()) throw new \Exception("A loot table currently distributes this currency as a potential reward. Please remove the currency before deleting it.");
-            if(DB::table('prompt_rewards')->where('rewardable_type', 'Currency')->where('rewardable_id', $currency->id)->exists()) throw new \Exception("A prompt currently distributes this currency as a reward. Please remove the currency before deleting it.");
-            if(DB::table('shop_stock')->where('currency_id', $currency->id)->exists()) throw new \Exception("A shop currently requires this currency to purchase an item. Please change the currency before deleting it.");
+            if (DB::table('loots')->where('rewardable_type', 'Currency')->where('rewardable_id', $currency->id)->exists()) {
+                throw new \Exception('A loot table currently distributes this currency as a potential reward. Please remove the currency before deleting it.');
+            }
+            if (DB::table('prompt_rewards')->where('rewardable_type', 'Currency')->where('rewardable_id', $currency->id)->exists()) {
+                throw new \Exception('A prompt currently distributes this currency as a reward. Please remove the currency before deleting it.');
+            }
+            if (DB::table('shop_stock')->where('currency_id', $currency->id)->exists()) {
+                throw new \Exception('A shop currently requires this currency to purchase an currency. Please change the currency before deleting it.');
+            }
             // Disabled for now due to issues with JSON lookup with older mysql versions/mariaDB
             // if(DB::table('items')->where('data->resell', $currency->id)->exists()) throw new \Exception("An item currently uses this currency for its resale value. Please change the resale information before deleting this currency.");
 
@@ -187,42 +165,114 @@ public function deleteCurrency($currency)
             // are created for temporary use, it would be inconvenient to have to manually
             // remove them from user accounts before deleting the base currency.
 
+            if (!$this->logAdminAction($user, 'Deleted Currency', 'Deleted '.$currency->name)) {
+                throw new \Exception('Failed to log admin action.');
+            }
+
             UserCurrency::where('currency_id', $currency->id)->delete();
             CharacterCurrency::where('currency_id', $currency->id)->delete();
-            if($currency->has_image) $this->deleteImage($currency->currencyImagePath, $currency->currencyImageFileName);
-            if($currency->has_icon) $this->deleteImage($currency->currencyIconPath, $currency->currencyIconFileName);
+            if ($currency->has_image) {
+                $this->deleteImage($currency->currencyImagePath, $currency->currencyImageFileName);
+            }
+            if ($currency->has_icon) {
+                $this->deleteImage($currency->currencyIconPath, $currency->currencyIconFileName);
+            }
             $currency->delete();
 
             return $this->commitReturn(true);
-        } catch(\Exception $e) {
+        } catch (\Exception $e) {
             $this->setError('error', $e->getMessage());
         }
+
         return $this->rollbackReturn(false);
     }
 
     /**
      * Sorts currency order.
      *
-     * @param  array   $data
-     * @param  string  $type
+     * @param array  $data
+     * @param string $type
+     *
      * @return bool
      */
-    public function sortCurrency($data, $type)
-    {
+    public function sortCurrency($data, $type) {
         DB::beginTransaction();
 
         try {
             // explode the sort array and reverse it since the power order is inverted
             $sort = array_reverse(explode(',', $data));
 
-            foreach($sort as $key => $s) {
+            foreach ($sort as $key => $s) {
                 Currency::where('id', $s)->update([($type == 'user') ? 'sort_user' : 'sort_character' => $key]);
             }
 
             return $this->commitReturn(true);
-        } catch(\Exception $e) {
+        } catch (\Exception $e) {
             $this->setError('error', $e->getMessage());
         }
+
         return $this->rollbackReturn(false);
     }
+
+    /**
+     * Processes user input for creating/updating a currency.
+     *
+     * @param array                         $data
+     * @param \App\Models\Currency\Currency $currency
+     *
+     * @return array
+     */
+    private function populateData($data, $currency = null) {
+        if (isset($data['description']) && $data['description']) {
+            $data['parsed_description'] = parse($data['description']);
+        }
+
+        if (!isset($data['is_user_owned'])) {
+            $data['is_user_owned'] = 0;
+        }
+        if (!isset($data['is_character_owned'])) {
+            $data['is_character_owned'] = 0;
+        }
+
+        if (!isset($data['is_displayed'])) {
+            $data['is_displayed'] = 0;
+        }
+
+        if (!isset($data['allow_user_to_user'])) {
+            $data['allow_user_to_user'] = 0;
+        }
+        if (!isset($data['allow_user_to_character'])) {
+            $data['allow_user_to_character'] = 0;
+        }
+        if (!isset($data['allow_character_to_user'])) {
+            $data['allow_character_to_user'] = 0;
+        }
+
+        $data['sort_user'] = $data['sort_character'] = 0;
+
+        // Process the checkbox fields
+        if (!($data['is_character_owned'] && $data['is_user_owned'])) {
+            $data['allow_user_to_character'] = $data['allow_character_to_user'] = 0;
+        }
+        if (!$data['is_user_owned']) {
+            $data['allow_user_to_user'] = $data['is_displayed'] = 0;
+        }
+
+        if (isset($data['remove_icon']) || isset($data['remove_image'])) {
+            if ($currency) {
+                if ($currency->has_icon && $data['remove_icon']) {
+                    $data['has_icon'] = 0;
+                    $this->deleteImage($currency->currencyIconPath, $currency->currencyIconFileName);
+                }
+                if ($currency->has_image && $data['remove_image']) {
+                    $data['has_image'] = 0;
+                    $this->deleteImage($currency->currencyImagePath, $currency->currencyImageFileName);
+                }
+            }
+            unset($data['remove_icon']);
+            unset($data['remove_image']);
+        }
+
+        return $data;
+    }
 }
diff --git a/app/Services/DesignUpdateManager.php b/app/Services/DesignUpdateManager.php
new file mode 100644
index 0000000000..341dd7a83b
--- /dev/null
+++ b/app/Services/DesignUpdateManager.php
@@ -0,0 +1,969 @@
+<?php
+
+namespace App\Services;
+
+use App\Facades\Notifications;
+use App\Models\Character\Character;
+use App\Models\Character\CharacterDesignUpdate;
+use App\Models\Character\CharacterFeature;
+use App\Models\Character\CharacterImage;
+use App\Models\Currency\Currency;
+use App\Models\Feature\Feature;
+use App\Models\Rarity;
+use App\Models\Species\Species;
+use App\Models\Species\Subtype;
+use App\Models\User\User;
+use App\Models\User\UserItem;
+use Carbon\Carbon;
+use Illuminate\Support\Arr;
+use Illuminate\Support\Facades\DB;
+use Illuminate\Support\Facades\File;
+use Intervention\Image\Facades\Image;
+
+class DesignUpdateManager extends Service {
+    /*
+    |--------------------------------------------------------------------------
+    | Design Update Manager
+    |--------------------------------------------------------------------------
+    |
+    | Handles creation and modification of design update data.
+    |
+    */
+
+    /**
+     * Creates a character design update request (or a MYO design approval request).
+     *
+     * @param \App\Models\Character\Character $character
+     * @param \App\Models\User\User           $user
+     *
+     * @return \App\Models\Character\CharacterDesignUpdate|bool
+     */
+    public function createDesignUpdateRequest($character, $user) {
+        DB::beginTransaction();
+
+        try {
+            if ($character->user_id != $user->id) {
+                throw new \Exception('You do not own this character.');
+            }
+            if (CharacterDesignUpdate::where('character_id', $character->id)->active()->exists()) {
+                throw new \Exception('This '.($character->is_myo_slot ? 'MYO slot' : 'character').' already has an existing request. Please update that one, or delete it before creating a new one.');
+            }
+            if (!$character->isAvailable) {
+                throw new \Exception('This '.($character->is_myo_slot ? 'MYO slot' : 'character').' is currently in an open trade or transfer. Please cancel the trade or transfer before creating a design update.');
+            }
+
+            $data = [
+                'user_id'       => $user->id,
+                'character_id'  => $character->id,
+                'status'        => 'Draft',
+                'hash'          => randomString(10),
+                'fullsize_hash' => randomString(15),
+                'update_type'   => $character->is_myo_slot ? 'MYO' : 'Character',
+
+                // Set some data based on the character's existing stats
+                'rarity_id'     => $character->image->rarity_id,
+                'species_id'    => $character->image->species_id,
+                'subtype_id'    => $character->image->subtype_id,
+            ];
+
+            $request = CharacterDesignUpdate::create($data);
+
+            // If the character is not a MYO slot, make a copy of the previous image's traits
+            // as presumably, we will not want to make major modifications to them.
+            // This is skipped for MYO slots as it complicates things later on - we don't want
+            // users to edit compulsory traits, so we'll only add them when the design is approved.
+            if (!$character->is_myo_slot) {
+                foreach ($character->image->features as $feature) {
+                    $request->features()->create([
+                        'character_image_id' => $request->id,
+                        'character_type'     => 'Update',
+                        'feature_id'         => $feature->feature_id,
+                        'data'               => $feature->data,
+                    ]);
+                }
+            }
+
+            return $this->commitReturn($request);
+        } catch (\Exception $e) {
+            $this->setError('error', $e->getMessage());
+        }
+
+        return $this->rollbackReturn(false);
+    }
+
+    /**
+     * Saves the comment section of a character design update request.
+     *
+     * @param array                                       $data
+     * @param \App\Models\Character\CharacterDesignUpdate $request
+     *
+     * @return bool
+     */
+    public function saveRequestComment($data, $request) {
+        DB::beginTransaction();
+
+        try {
+            // Update the comments section
+            $request->comments = (isset($data['comments']) && $data['comments']) ? $data['comments'] : null;
+            $request->has_comments = 1;
+            $request->save();
+
+            return $this->commitReturn(true);
+        } catch (\Exception $e) {
+            $this->setError('error', $e->getMessage());
+        }
+
+        return $this->rollbackReturn(false);
+    }
+
+    /**
+     * Saves the image upload section of a character design update request.
+     *
+     * @param array                                       $data
+     * @param \App\Models\Character\CharacterDesignUpdate $request
+     * @param bool                                        $isAdmin
+     *
+     * @return bool
+     */
+    public function saveRequestImage($data, $request, $isAdmin = false) {
+        DB::beginTransaction();
+
+        try {
+            // Require an image to be uploaded the first time, but if an image already exists, allow user to update the other details
+            if (!$isAdmin && !isset($data['image']) && !file_exists($request->imagePath.'/'.$request->imageFileName)) {
+                throw new \Exception('Please upload a valid image.');
+            }
+
+            // Require a thumbnail to be uploaded the first time as well
+            if (!file_exists($request->thumbnailPath.'/'.$request->thumbnailFileName)) {
+                // If the crop dimensions are invalid...
+                // The crop function resizes the thumbnail to fit, so we only need to check that it's not null
+                if (!$isAdmin || ($isAdmin && isset($data['modify_thumbnail']))) {
+                    if (isset($data['use_cropper']) && ($data['x0'] === null || $data['x1'] === null || $data['y0'] === null || $data['y1'] === null)) {
+                        throw new \Exception('Invalid crop dimensions specified.');
+                    }
+                    if (!isset($data['use_cropper']) && !isset($data['thumbnail'])) {
+                        throw new \Exception('Please upload a valid thumbnail or use the image cropper.');
+                    }
+                }
+            }
+            if (!$isAdmin || ($isAdmin && isset($data['modify_thumbnail']))) {
+                $imageData = [];
+                if (isset($data['use_cropper'])) {
+                    $imageData = Arr::only($data, [
+                        'use_cropper',
+                        'x0', 'x1', 'y0', 'y1',
+                    ]);
+                    $imageData['use_cropper'] = isset($data['use_cropper']);
+                }
+                if (!$isAdmin && isset($data['image'])) {
+                    $imageData['extension'] = (config('lorekeeper.settings.masterlist_image_format') ? config('lorekeeper.settings.masterlist_image_format') : ($data['extension'] ?? $data['image']->getClientOriginalExtension()));
+                    $imageData['has_image'] = true;
+                }
+                $request->update($imageData);
+            }
+
+            $request->designers()->delete();
+            $request->artists()->delete();
+
+            // Check that users with the specified id(s) exist on site
+            foreach ($data['designer_id'] as $id) {
+                if (isset($id) && $id) {
+                    $user = User::find($id);
+                    if (!$user) {
+                        throw new \Exception('One or more designers is invalid.');
+                    }
+                }
+            }
+            foreach ($data['artist_id'] as $id) {
+                if (isset($id) && $id) {
+                    $user = $user = User::find($id);
+                    if (!$user) {
+                        throw new \Exception('One or more artists is invalid.');
+                    }
+                }
+            }
+
+            // Attach artists/designers
+            foreach ($data['designer_id'] as $key => $id) {
+                if ($id || $data['designer_url'][$key]) {
+                    DB::table('character_image_creators')->insert([
+                        'character_image_id' => $request->id,
+                        'type'               => 'Designer',
+                        'character_type'     => 'Update',
+                        'url'                => $data['designer_url'][$key],
+                        'user_id'            => $id,
+                    ]);
+                }
+            }
+            foreach ($data['artist_id'] as $key => $id) {
+                if ($id || $data['artist_url'][$key]) {
+                    DB::table('character_image_creators')->insert([
+                        'character_image_id' => $request->id,
+                        'type'               => 'Artist',
+                        'character_type'     => 'Update',
+                        'url'                => $data['artist_url'][$key],
+                        'user_id'            => $id,
+                    ]);
+                }
+            }
+
+            // Save image
+            if (!$isAdmin && isset($data['image'])) {
+                $this->handleImage($data['image'], $request->imageDirectory, $request->imageFileName, null, isset($data['default_image']));
+            }
+
+            // Save thumbnail, if we have an image set
+            if ((!$isAdmin) || ($isAdmin && isset($data['modify_thumbnail']))) {
+                if (isset($data['use_cropper']) && (isset($data['image']) || ($isAdmin && isset($data['modify_thumbnail'])))) {
+                    (new CharacterManager)->cropThumbnail(Arr::only($data, ['x0', 'x1', 'y0', 'y1']), $request);
+                } elseif (isset($data['thumbnail'])) {
+                    $this->handleImage($data['thumbnail'], $request->imageDirectory, $request->thumbnailFileName);
+                }
+            }
+
+            return $this->commitReturn(true);
+        } catch (\Exception $e) {
+            $this->setError('error', $e->getMessage());
+        }
+
+        return $this->rollbackReturn(false);
+    }
+
+    /**
+     * Saves the addons section of a character design update request.
+     *
+     * @param array                                       $data
+     * @param \App\Models\Character\CharacterDesignUpdate $request
+     *
+     * @return bool
+     */
+    public function saveRequestAddons($data, $request) {
+        DB::beginTransaction();
+
+        try {
+            $requestData = $request->data;
+            // First return any item stacks associated with this request
+            if (isset($requestData['user']) && isset($requestData['user']['user_items'])) {
+                foreach ($requestData['user']['user_items'] as $userItemId=> $quantity) {
+                    $userItemRow = UserItem::find($userItemId);
+                    if (!$userItemRow) {
+                        throw new \Exception('Cannot return an invalid item. ('.$userItemId.')');
+                    }
+                    if ($userItemRow->update_count < $quantity) {
+                        throw new \Exception('Cannot return more items than was held. ('.$userItemId.')');
+                    }
+                    $userItemRow->update_count -= $quantity;
+                    $userItemRow->save();
+                }
+            }
+
+            // Also return any currency associated with this request
+            // This is stored in the data attribute
+            $currencyManager = new CurrencyManager;
+            if (isset($requestData['user']) && isset($requestData['user']['currencies'])) {
+                foreach ($requestData['user']['currencies'] as $currencyId=> $quantity) {
+                    $currencyManager->creditCurrency(null, $request->user, null, null, $currencyId, $quantity);
+                }
+            }
+            if (isset($requestData['character']) && isset($requestData['character']['currencies'])) {
+                foreach ($requestData['character']['currencies'] as $currencyId=> $quantity) {
+                    $currencyManager->creditCurrency(null, $request->character, null, null, $currencyId, $quantity);
+                }
+            }
+
+            $userAssets = createAssetsArray();
+            $characterAssets = createAssetsArray(true);
+
+            // Attach items. Technically, the user doesn't lose ownership of the item - we're just adding an additional holding field.
+            // We're also not going to add logs as this might add unnecessary fluff to the logs and the items still belong to the user.
+            // Perhaps later I'll add a way to locate items that are being held by updates/trades.
+            if (isset($data['stack_id'])) {
+                foreach ($data['stack_id'] as $stackId) {
+                    $stack = UserItem::with('item')->find($stackId);
+                    if (!$stack || $stack->user_id != $request->user_id) {
+                        throw new \Exception('Invalid item selected.');
+                    }
+                    if (!isset($data['stack_quantity'][$stackId])) {
+                        throw new \Exception('Invalid quantity selected.');
+                    }
+                    $stack->update_count += $data['stack_quantity'][$stackId];
+                    $stack->save();
+
+                    addAsset($userAssets, $stack, $data['stack_quantity'][$stackId]);
+                }
+            }
+
+            // Attach currencies.
+            if (isset($data['currency_id'])) {
+                foreach ($data['currency_id'] as $holderKey=> $currencyIds) {
+                    $holder = explode('-', $holderKey);
+                    $holderType = $holder[0];
+                    $holderId = $holder[1];
+
+                    // The holder can be obtained from the request, but for sanity's sake we're going to perform a check
+                    $holder = ($holderType == 'user' ? User::find($holderId) : Character::find($holderId));
+                    if ($holderType == 'user' && $holder->id != $request->user_id) {
+                        throw new \Exception('Error attaching currencies to this request. (1)');
+                    } elseif ($holderType == 'character' && $holder->id != $request->character_id) {
+                        throw new \Exception('Error attaching currencies to this request. (2)');
+                    }
+
+                    foreach ($currencyIds as $key=> $currencyId) {
+                        $currency = Currency::find($currencyId);
+                        if (!$currency) {
+                            throw new \Exception('Invalid currency selected.');
+                        }
+                        if (!$currencyManager->debitCurrency($holder, null, null, null, $currency, $data['currency_quantity'][$holderKey][$key])) {
+                            throw new \Exception('Invalid currency/quantity selected.');
+                        }
+
+                        if ($holderType == 'user') {
+                            addAsset($userAssets, $currency, $data['currency_quantity'][$holderKey][$key]);
+                        } else {
+                            addAsset($characterAssets, $currency, $data['currency_quantity'][$holderKey][$key]);
+                        }
+                    }
+                }
+            }
+
+            $request->has_addons = 1;
+            $request->data = json_encode([
+                'user'      => Arr::only(getDataReadyAssets($userAssets), ['user_items', 'currencies']),
+                'character' => Arr::only(getDataReadyAssets($characterAssets), ['currencies']),
+            ]);
+            $request->save();
+
+            return $this->commitReturn(true);
+        } catch (\Exception $e) {
+            $this->setError('error', $e->getMessage());
+        }
+
+        return $this->rollbackReturn(false);
+    }
+
+    /**
+     * Saves the character features (traits) section of a character design update request.
+     *
+     * @param array                                       $data
+     * @param \App\Models\Character\CharacterDesignUpdate $request
+     *
+     * @return bool
+     */
+    public function saveRequestFeatures($data, $request) {
+        DB::beginTransaction();
+
+        try {
+            if (!($request->character->is_myo_slot && $request->character->image->species_id) && !isset($data['species_id'])) {
+                throw new \Exception('Please select a species.');
+            }
+            if (!($request->character->is_myo_slot && $request->character->image->rarity_id) && !isset($data['rarity_id'])) {
+                throw new \Exception('Please select a rarity.');
+            }
+
+            $rarity = ($request->character->is_myo_slot && $request->character->image->rarity_id) ? $request->character->image->rarity : Rarity::find($data['rarity_id']);
+            $species = ($request->character->is_myo_slot && $request->character->image->species_id) ? $request->character->image->species : Species::find($data['species_id']);
+            if (isset($data['subtype_id']) && $data['subtype_id']) {
+                $subtype = ($request->character->is_myo_slot && $request->character->image->subtype_id) ? $request->character->image->subtype : Subtype::find($data['subtype_id']);
+            } else {
+                $subtype = null;
+            }
+            if (!$rarity) {
+                throw new \Exception('Invalid rarity selected.');
+            }
+            if (!$species) {
+                throw new \Exception('Invalid species selected.');
+            }
+            if ($subtype && $subtype->species_id != $species->id) {
+                throw new \Exception('Subtype does not match the species.');
+            }
+
+            // Clear old features
+            $request->features()->delete();
+
+            // Attach features
+            // We'll do the compulsory ones at the time of approval.
+
+            $features = Feature::whereIn('id', $data['feature_id'])->with('rarity')->get()->keyBy('id');
+
+            foreach ($data['feature_id'] as $key => $featureId) {
+                if (!$featureId) {
+                    continue;
+                }
+
+                // Skip the feature if the rarity is too high.
+                // Comment out this check if rarities should have more berth for traits choice.
+                //if($features[$featureId]->rarity->sort > $rarity->sort) continue;
+
+                // Skip the feature if it's not the correct species.
+                if ($features[$featureId]->species_id && $features[$featureId]->species_id != $species->id) {
+                    continue;
+                }
+
+                $feature = CharacterFeature::create(['character_image_id' => $request->id, 'feature_id' => $featureId, 'data' => $data['feature_data'][$key], 'character_type' => 'Update']);
+            }
+
+            // Update other stats
+            $request->species_id = $species->id;
+            $request->rarity_id = $rarity->id;
+            $request->subtype_id = $subtype ? $subtype->id : null;
+            $request->has_features = 1;
+            $request->save();
+
+            return $this->commitReturn(true);
+        } catch (\Exception $e) {
+            $this->setError('error', $e->getMessage());
+        }
+
+        return $this->rollbackReturn(false);
+    }
+
+    /**
+     * Submit a character design update request to the approval queue.
+     *
+     * @param \App\Models\Character\CharacterDesignUpdate $request
+     *
+     * @return bool
+     */
+    public function submitRequest($request) {
+        DB::beginTransaction();
+
+        try {
+            if ($request->status != 'Draft') {
+                throw new \Exception('This request cannot be resubmitted to the queue.');
+            }
+
+            // Recheck and set update type, as insurance/in case of pre-existing drafts
+            if ($request->character->is_myo_slot) {
+                $request->update_type = 'MYO';
+            } else {
+                $request->update_type = 'Character';
+            }
+            // We've done validation and all section by section,
+            // so it's safe to simply set the status to Pending here
+            $request->status = 'Pending';
+            if (!$request->submitted_at) {
+                $request->submitted_at = Carbon::now();
+            }
+            $request->save();
+
+            return $this->commitReturn(true);
+        } catch (\Exception $e) {
+            $this->setError('error', $e->getMessage());
+        }
+
+        return $this->rollbackReturn(false);
+    }
+
+    /**
+     * Approves a character design update request and processes it.
+     *
+     * @param array                                       $data
+     * @param \App\Models\Character\CharacterDesignUpdate $request
+     * @param \App\Models\User\User                       $user
+     *
+     * @return bool
+     */
+    public function approveRequest($data, $request, $user) {
+        DB::beginTransaction();
+
+        try {
+            if ($request->status != 'Pending') {
+                throw new \Exception('This request cannot be processed.');
+            }
+            if (!isset($data['character_category_id'])) {
+                throw new \Exception('Please select a character category.');
+            }
+            if (!isset($data['number'])) {
+                throw new \Exception('Please enter a character number.');
+            }
+            if (!isset($data['slug']) || Character::where('slug', $data['slug'])->where('id', '!=', $request->character_id)->exists()) {
+                throw new \Exception('Please enter a unique character code.');
+            }
+
+            if (!$this->logAdminAction($user, 'Approved Design Update', 'Approved design update <a href="'.$request->url.'">#'.$request->id.'</a>')) {
+                throw new \Exception('Failed to log admin action.');
+            }
+
+            // Remove any added items/currency
+            // Currency has already been removed, so no action required
+            // However logs need to be added for each of these
+            $requestData = $request->data;
+            $inventoryManager = new InventoryManager;
+            if (isset($requestData['user']) && isset($requestData['user']['user_items'])) {
+                $stacks = $requestData['user']['user_items'];
+                foreach ($requestData['user']['user_items'] as $userItemId=> $quantity) {
+                    $userItemRow = UserItem::find($userItemId);
+                    if (!$userItemRow) {
+                        throw new \Exception('Cannot return an invalid item. ('.$userItemId.')');
+                    }
+                    if ($userItemRow->update_count < $quantity) {
+                        throw new \Exception('Cannot return more items than was held. ('.$userItemId.')');
+                    }
+                    $userItemRow->update_count -= $quantity;
+                    $userItemRow->save();
+                }
+
+                $staff = $user;
+                foreach ($stacks as $stackId=> $quantity) {
+                    $stack = UserItem::find($stackId);
+                    $user = User::find($request->user_id);
+                    if (!$inventoryManager->debitStack($user, $request->character->is_myo_slot ? 'MYO Design Approved' : 'Character Design Updated', ['data' => 'Item used in '.($request->character->is_myo_slot ? 'MYO design approval' : 'Character design update').' (<a href="'.$request->url.'">#'.$request->id.'</a>)'], $stack, $quantity)) {
+                        throw new \Exception('Failed to create log for item stack.');
+                    }
+                }
+                $user = $staff;
+            }
+            $currencyManager = new CurrencyManager;
+            if (isset($requestData['user']['currencies']) && $requestData['user']['currencies']) {
+                foreach ($requestData['user']['currencies'] as $currencyId=> $quantity) {
+                    $currency = Currency::find($currencyId);
+                    if (!$currencyManager->createLog(
+                        $request->user_id,
+                        'User',
+                        null,
+                        null,
+                        $request->character->is_myo_slot ? 'MYO Design Approved' : 'Character Design Updated',
+                        'Used in '.($request->character->is_myo_slot ? 'MYO design approval' : 'character design update').' (<a href="'.$request->url.'">#'.$request->id.'</a>)',
+                        $currencyId,
+                        $quantity
+                    )) {
+                        throw new \Exception('Failed to create log for user currency.');
+                    }
+                }
+            }
+            if (isset($requestData['character']['currencies']) && $requestData['character']['currencies']) {
+                foreach ($requestData['character']['currencies'] as $currencyId=> $quantity) {
+                    $currency = Currency::find($currencyId);
+                    if (!$currencyManager->createLog(
+                        $request->character_id,
+                        'Character',
+                        null,
+                        null,
+                        $request->character->is_myo_slot ? 'MYO Design Approved' : 'Character Design Updated',
+                        'Used in '.($request->character->is_myo_slot ? 'MYO design approval' : 'character design update').' (<a href="'.$request->url.'">#'.$request->id.'</a>)',
+                        $currencyId,
+                        $quantity
+                    )) {
+                        throw new \Exception('Failed to create log for character currency.');
+                    }
+                }
+            }
+
+            $extension = config('lorekeeper.settings.masterlist_image_format') != null ? config('lorekeeper.settings.masterlist_image_format') : $request->extension;
+
+            // Create a new image with the request data
+            $image = CharacterImage::create([
+                'character_id'  => $request->character_id,
+                'is_visible'    => 1,
+                'hash'          => $request->hash,
+                'fullsize_hash' => $request->fullsize_hash ? $request->fullsize_hash : randomString(15),
+                'extension'     => $extension,
+                'use_cropper'   => $request->use_cropper,
+                'x0'            => $request->x0,
+                'x1'            => $request->x1,
+                'y0'            => $request->y0,
+                'y1'            => $request->y1,
+                'species_id'    => $request->species_id,
+                'subtype_id'    => ($request->character->is_myo_slot && isset($request->character->image->subtype_id)) ? $request->character->image->subtype_id : $request->subtype_id,
+                'rarity_id'     => $request->rarity_id,
+                'sort'          => 0,
+                'title_id'      => isset($request->title_id) && $request->title_id ? $request->title_id : null,
+                'title_data'    => isset($request->title_data) ? json_encode($request->title_data) : null
+            ]);
+
+            // Shift the image credits over to the new image
+            $request->designers()->update(['character_type' => 'Character', 'character_image_id' => $image->id]);
+            $request->artists()->update(['character_type' => 'Character', 'character_image_id' => $image->id]);
+
+            // Add the compulsory features
+            if ($request->character->is_myo_slot) {
+                foreach ($request->character->image->features as $feature) {
+                    CharacterFeature::create(['character_image_id' => $image->id, 'feature_id' => $feature->feature_id, 'data' => $feature->data, 'character_type' => 'Character']);
+                }
+            }
+
+            // Shift the image features over to the new image
+            $request->rawFeatures()->update(['character_image_id' => $image->id, 'character_type' => 'Character']);
+
+            // Make the image directory if it doesn't exist
+            if (!file_exists($image->imagePath)) {
+                // Create the directory.
+                if (!mkdir($image->imagePath, 0755, true)) {
+                    $this->setError('error', 'Failed to create image directory.');
+
+                    return false;
+                }
+                chmod($image->imagePath, 0755);
+            }
+
+            // Move the image file to the new image
+            File::move($request->imagePath.'/'.$request->imageFileName, $image->imagePath.'/'.$image->imageFileName);
+            // Process and save the image
+            (new CharacterManager)->processImage($image);
+
+            // The thumbnail is already generated, so it can just be moved without processing
+            File::move($request->thumbnailPath.'/'.$request->thumbnailFileName, $image->thumbnailPath.'/'.$image->thumbnailFileName);
+
+            // Set character data and other info such as cooldown time, resell cost and terms etc.
+            // since those might be updated with the new design update
+            if (isset($data['transferrable_at'])) {
+                $request->character->transferrable_at = $data['transferrable_at'];
+            }
+            $request->character->character_category_id = $data['character_category_id'];
+            $request->character->number = $data['number'];
+            $request->character->slug = $data['slug'];
+            $request->character->rarity_id = $request->rarity_id;
+
+            $request->character->description = $data['description'];
+            $request->character->parsed_description = parse($data['description']);
+
+            $request->character->is_sellable = isset($data['is_sellable']);
+            $request->character->is_tradeable = isset($data['is_tradeable']);
+            $request->character->is_giftable = isset($data['is_giftable']);
+            $request->character->sale_value = $data['sale_value'] ?? 0;
+
+            // Invalidate old image if desired
+            if (isset($data['invalidate_old'])) {
+                $request->character->image->is_valid = 0;
+                $request->character->image->save();
+            }
+
+            // Note old image to delete it
+            if (config('lorekeeper.extensions.remove_myo_image') && $request->character->is_myo_slot && $data['remove_myo_image'] == 2) {
+                $oldImage = $request->character->image;
+            }
+
+            // Hide the MYO placeholder image if desired
+            if (config('lorekeeper.extensions.remove_myo_image') && $request->character->is_myo_slot && $data['remove_myo_image'] == 1) {
+                $request->character->image->is_visible = 0;
+                $request->character->image->save();
+            }
+
+            // Set new image if desired
+            if (isset($data['set_active'])) {
+                $request->character->character_image_id = $image->id;
+            }
+
+            // Final recheck and setting of update type, as insurance
+            if ($request->character->is_myo_slot) {
+                $request->update_type = 'MYO';
+            } else {
+                $request->update_type = 'Character';
+            }
+            $request->save();
+
+            // Add a log for the character and user
+            (new CharacterManager)->createLog($user->id, null, $request->character->user_id, $request->character->user->url, $request->character->id, $request->update_type == 'MYO' ? 'MYO Design Approved' : 'Character Design Updated', '[#'.$image->id.']', 'character');
+            (new CharacterManager)->createLog($user->id, null, $request->character->user_id, $request->character->user->url, $request->character->id, $request->update_type == 'MYO' ? 'MYO Design Approved' : 'Character Design Updated', '[#'.$image->id.']', 'user');
+
+            // If this is for a MYO, set user's FTO status and the MYO status of the slot
+            // and clear the character's name
+            if ($request->character->is_myo_slot) {
+                if (config('lorekeeper.settings.clear_myo_slot_name_on_approval')) {
+                    $request->character->name = null;
+                }
+                $request->character->is_myo_slot = 0;
+                $request->user->settings->is_fto = 0;
+                $request->user->settings->save();
+
+                // Delete the MYO placeholder image if desired
+                if (config('lorekeeper.extensions.remove_myo_image') && $data['remove_myo_image'] == 2) {
+                    $characterManager = new CharacterManager;
+                    if (!$characterManager->deleteImage($oldImage, $user, true)) {
+                        foreach ($characterManager->errors()->getMessages()['error'] as $error) {
+                            flash($error)->error();
+                        }
+                        throw new \Exception('Failed to delete MYO image.');
+                    }
+                }
+            }
+            $request->character->save();
+
+            // Set status to approved
+            $request->staff_id = $user->id;
+            $request->status = 'Approved';
+            $request->save();
+
+            // Notify the user
+            Notifications::create('DESIGN_APPROVED', $request->user, [
+                'design_url'    => $request->url,
+                'character_url' => $request->character->url,
+                'name'          => $request->character->fullName,
+            ]);
+
+            // Notify bookmarkers
+            $request->character->notifyBookmarkers('BOOKMARK_IMAGE');
+
+            return $this->commitReturn(true);
+        } catch (\Exception $e) {
+            $this->setError('error', $e->getMessage());
+        }
+
+        return $this->rollbackReturn(false);
+    }
+
+    /**
+     * Rejects a character design update request and processes it.
+     * Rejection can be a soft rejection (reopens the request so the user can edit it and resubmit)
+     * or a hard rejection (takes the request out of the queue completely).
+     *
+     * @param array                                       $data
+     * @param \App\Models\Character\CharacterDesignUpdate $request
+     * @param \App\Models\User\User                       $user
+     * @param bool                                        $forceReject
+     * @param mixed                                       $notification
+     *
+     * @return bool
+     */
+    public function rejectRequest($data, $request, $user, $forceReject = false, $notification = true) {
+        DB::beginTransaction();
+
+        try {
+            if (!$forceReject && $request->status != 'Pending') {
+                throw new \Exception('This request cannot be processed.');
+            }
+
+            if (!$this->logAdminAction($user, 'Rejected Design Update', 'Rejected design update <a href="'.$request->url.'">#'.$request->id.'</a>')) {
+                throw new \Exception('Failed to log admin action.');
+            }
+
+            // This hard rejects the request - items/currency are returned to user
+            // and the user will need to open a new request to resubmit.
+            // Use when rejecting a request the user shouldn't have submitted at all.
+
+            $requestData = $request->data;
+            // Return all added items/currency
+            if (isset($requestData['user']) && isset($requestData['user']['user_items'])) {
+                foreach ($requestData['user']['user_items'] as $userItemId=> $quantity) {
+                    $userItemRow = UserItem::find($userItemId);
+                    if (!$userItemRow) {
+                        throw new \Exception('Cannot return an invalid item. ('.$userItemId.')');
+                    }
+                    if ($userItemRow->update_count < $quantity) {
+                        throw new \Exception('Cannot return more items than was held. ('.$userItemId.')');
+                    }
+                    $userItemRow->update_count -= $quantity;
+                    $userItemRow->save();
+                }
+            }
+
+            $currencyManager = new CurrencyManager;
+            if (isset($requestData['user']['currencies']) && $requestData['user']['currencies']) {
+                foreach ($requestData['user']['currencies'] as $currencyId=> $quantity) {
+                    $currency = Currency::find($currencyId);
+                    if (!$currency) {
+                        throw new \Exception('Cannot return an invalid currency. ('.$currencyId.')');
+                    }
+                    if (!$currencyManager->creditCurrency(null, $request->user, null, null, $currency, $quantity)) {
+                        throw new \Exception('Could not return currency to user. ('.$currencyId.')');
+                    }
+                }
+            }
+            if (isset($requestData['character']['currencies']) && $requestData['character']['currencies']) {
+                foreach ($requestData['character']['currencies'] as $currencyId=> $quantity) {
+                    $currency = Currency::find($currencyId);
+                    if (!$currency) {
+                        throw new \Exception('Cannot return an invalid currency. ('.$currencyId.')');
+                    }
+                    if (!$currencyManager->creditCurrency(null, $request->character, null, null, $currency, $quantity)) {
+                        throw new \Exception('Could not return currency to character. ('.$currencyId.')');
+                    }
+                }
+            }
+
+            // Set staff comment and status
+            $request->staff_id = $user->id;
+            $request->staff_comments = $data['staff_comments'] ?? null;
+            $request->status = 'Rejected';
+            $request->save();
+
+            if ($notification) {
+                // Notify the user
+                Notifications::create('DESIGN_REJECTED', $request->user, [
+                    'design_url'    => $request->url,
+                    'character_url' => $request->character->url,
+                    'name'          => $request->character->fullName,
+                ]);
+            }
+
+            return $this->commitReturn(true);
+        } catch (\Exception $e) {
+            $this->setError('error', $e->getMessage());
+        }
+
+        return $this->rollbackReturn(false);
+    }
+
+    /**
+     * Cancels a character design update request.
+     *
+     * @param array                                       $data
+     * @param \App\Models\Character\CharacterDesignUpdate $request
+     * @param \App\Models\User\User                       $user
+     *
+     * @return bool
+     */
+    public function cancelRequest($data, $request, $user) {
+        DB::beginTransaction();
+
+        try {
+            if ($request->status != 'Pending') {
+                throw new \Exception('This request cannot be processed.');
+            }
+
+            if (!$this->logAdminAction($user, 'Cancelled Design Update', 'Cancelled design update <a href="'.$request->url.'">#'.$request->id.'</a>')) {
+                throw new \Exception('Failed to log admin action.');
+            }
+
+            // Soft removes the request from the queue -
+            // it preserves all the data entered, but allows the staff member
+            // to add a comment to it. Status is returned to Draft status.
+            // Use when rejecting a request that just requires minor modifications to approve.
+
+            // Set staff comment and status
+            $request->staff_id = $user->id;
+            $request->staff_comments = $data['staff_comments'] ?? null;
+            $request->status = 'Draft';
+            if (!isset($data['preserve_queue'])) {
+                $request->submitted_at = null;
+            }
+            $request->save();
+
+            // Notify the user
+            Notifications::create('DESIGN_CANCELED', $request->user, [
+                'design_url'    => $request->url,
+                'character_url' => $request->character->url,
+                'name'          => $request->character->fullName,
+            ]);
+
+            return $this->commitReturn(true);
+        } catch (\Exception $e) {
+            $this->setError('error', $e->getMessage());
+        }
+
+        return $this->rollbackReturn(false);
+    }
+
+    /**
+     * Deletes a character design update request.
+     *
+     * @param \App\Models\Character\CharacterDesignUpdate $request
+     *
+     * @return bool
+     */
+    public function deleteRequest($request) {
+        DB::beginTransaction();
+
+        try {
+            if ($request->status != 'Draft') {
+                throw new \Exception('This request cannot be processed.');
+            }
+
+            // Deletes the request entirely, including images and etc.
+            // This returns any attached items/currency
+            // Characters with an open draft request cannot be transferred (due to attached items/currency),
+            // so this is necessary to transfer a character
+
+            $requestData = $request->data;
+            // Return all added items/currency
+            if (isset($requestData['user']) && isset($requestData['user']['user_items'])) {
+                foreach ($requestData['user']['user_items'] as $userItemId=> $quantity) {
+                    $userItemRow = UserItem::find($userItemId);
+                    if (!$userItemRow) {
+                        throw new \Exception('Cannot return an invalid item. ('.$userItemId.')');
+                    }
+                    if ($userItemRow->update_count < $quantity) {
+                        throw new \Exception('Cannot return more items than was held. ('.$userItemId.')');
+                    }
+                    $userItemRow->update_count -= $quantity;
+                    $userItemRow->save();
+                }
+            }
+
+            $currencyManager = new CurrencyManager;
+            if (isset($requestData['user']['currencies']) && $requestData['user']['currencies']) {
+                foreach ($requestData['user']['currencies'] as $currencyId=> $quantity) {
+                    $currency = Currency::find($currencyId);
+                    if (!$currency) {
+                        throw new \Exception('Cannot return an invalid currency. ('.$currencyId.')');
+                    }
+                    if (!$currencyManager->creditCurrency(null, $request->user, null, null, $currency, $quantity)) {
+                        throw new \Exception('Could not return currency to user. ('.$currencyId.')');
+                    }
+                }
+            }
+            if (isset($requestData['character']['currencies']) && $requestData['character']['currencies']) {
+                foreach ($requestData['character']['currencies'] as $currencyId=> $quantity) {
+                    $currency = Currency::find($currencyId);
+                    if (!$currency) {
+                        throw new \Exception('Cannot return an invalid currency. ('.$currencyId.')');
+                    }
+                    if (!$currencyManager->creditCurrency(null, $request->character, null, null, $currency, $quantity)) {
+                        throw new \Exception('Could not return currency to character. ('.$currencyId.')');
+                    }
+                }
+            }
+
+            // Delete the request
+            $request->delete();
+
+            return $this->commitReturn(true);
+        } catch (\Exception $e) {
+            $this->setError('error', $e->getMessage());
+        }
+
+        return $this->rollbackReturn(false);
+    }
+
+    /**
+     * Votes on a character design update request.
+     *
+     * @param string                                      $action
+     * @param \App\Models\Character\CharacterDesignUpdate $request
+     * @param \App\Models\User\User                       $user
+     *
+     * @return bool
+     */
+    public function voteRequest($action, $request, $user) {
+        DB::beginTransaction();
+
+        try {
+            if ($request->status != 'Pending') {
+                throw new \Exception('This request cannot be processed.');
+            }
+            if (!config('lorekeeper.extensions.design_update_voting')) {
+                throw new \Exception('This extension is not currently enabled.');
+            }
+
+            switch ($action) {
+                default:
+                    flash('Invalid action.')->error();
+                    break;
+                case 'approve':
+                    $vote = 2;
+                    break;
+                case 'reject':
+                    $vote = 1;
+                    break;
+            }
+
+            $voteData = (isset($request->vote_data) ? collect(json_decode($request->vote_data, true)) : collect([]));
+            $voteData->get($user->id) ? $voteData->pull($user->id) : null;
+            $voteData->put($user->id, $vote);
+            $request->vote_data = $voteData->toJson();
+
+            $request->save();
+
+            if (!$this->logAdminAction($user, 'Voted on Design Update', 'Voted on design update <a href="'.$request->url.'">#'.$request->id.'</a>')) {
+                throw new \Exception('Failed to log admin action.');
+            }
+
+            return $this->commitReturn(true);
+        } catch (\Exception $e) {
+            $this->setError('error', $e->getMessage());
+        }
+
+        return $this->rollbackReturn(false);
+    }
+}
diff --git a/app/Services/ExtensionService.php b/app/Services/ExtensionService.php
index ca931880e1..35d0dc96f5 100644
--- a/app/Services/ExtensionService.php
+++ b/app/Services/ExtensionService.php
@@ -1,14 +1,11 @@
-<?php namespace App\Services;
+<?php
 
-use App\Services\Service;
-
-use DB;
-use Config;
+namespace App\Services;
 
 use App\Models\Notification;
+use Illuminate\Support\Facades\DB;
 
-class ExtensionService extends Service
-{
+class ExtensionService extends Service {
     /*
     |--------------------------------------------------------------------------
     | Extension Service
@@ -25,22 +22,24 @@ class ExtensionService extends Service
      * Should be called with a command instructing it
      * in what notifications to move where.
      *
-     * @param  $data
+     * @param mixed $source
+     * @param mixed $destination
+     *
      * @return bool
      */
-    public function updateNotifications($source, $destination)
-    {
+    public function updateNotifications($source, $destination) {
         $count = Notification::where('notification_type_id', $source)->count();
-        if($count && isset($destination)) {
+        if ($count && isset($destination)) {
             DB::beginTransaction();
             try {
                 Notification::where('notification_type_id', $source)->update(['notification_type_id' => $destination]);
 
                 return $this->commitReturn(true);
-            } catch(\Exception $e) { 
+            } catch (\Exception $e) {
                 $this->setError('error', $e->getMessage());
             }
+
             return $this->rollbackReturn(false);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/app/Services/FeatureService.php b/app/Services/FeatureService.php
index a045f0df38..76b7cbc3f8 100644
--- a/app/Services/FeatureService.php
+++ b/app/Services/FeatureService.php
@@ -1,17 +1,14 @@
-<?php namespace App\Services;
+<?php
 
-use App\Services\Service;
+namespace App\Services;
 
-use DB;
-use Config;
-
-use App\Models\Feature\FeatureCategory;
 use App\Models\Feature\Feature;
+use App\Models\Feature\FeatureCategory;
 use App\Models\Species\Species;
 use App\Models\Species\Subtype;
+use Illuminate\Support\Facades\DB;
 
-class FeatureService extends Service
-{
+class FeatureService extends Service {
     /*
     |--------------------------------------------------------------------------
     | Feature Service
@@ -22,7 +19,7 @@ class FeatureService extends Service
     */
 
     /**********************************************************************************************
-     
+
         FEATURE CATEGORIES
 
     **********************************************************************************************/
@@ -30,148 +27,157 @@ class FeatureService extends Service
     /**
      * Create a category.
      *
-     * @param  array                 $data
-     * @param  \App\Models\User\User $user
+     * @param array                 $data
+     * @param \App\Models\User\User $user
+     *
      * @return \App\Models\Feature\FeatureCategory|bool
      */
-    public function createFeatureCategory($data, $user)
-    {
+    public function createFeatureCategory($data, $user) {
         DB::beginTransaction();
 
         try {
             $data = $this->populateCategoryData($data);
 
             $image = null;
-            if(isset($data['image']) && $data['image']) {
+            if (isset($data['image']) && $data['image']) {
                 $data['has_image'] = 1;
+                $data['hash'] = randomString(10);
                 $image = $data['image'];
                 unset($data['image']);
+            } else {
+                $data['has_image'] = 0;
             }
-            else $data['has_image'] = 0;
 
             $category = FeatureCategory::create($data);
 
-            if ($image) $this->handleImage($image, $category->categoryImagePath, $category->categoryImageFileName);
+            if (!$this->logAdminAction($user, 'Created Feature Category', 'Created '.$category->displayName)) {
+                throw new \Exception('Failed to log admin action.');
+            }
+
+            if ($image) {
+                $this->handleImage($image, $category->categoryImagePath, $category->categoryImageFileName);
+            }
 
             return $this->commitReturn($category);
-        } catch(\Exception $e) { 
+        } catch (\Exception $e) {
             $this->setError('error', $e->getMessage());
         }
+
         return $this->rollbackReturn(false);
     }
 
     /**
      * Update a category.
      *
-     * @param  \App\Models\Feature\FeatureCategory  $category
-     * @param  array                                $data
-     * @param  \App\Models\User\User                $user
+     * @param \App\Models\Feature\FeatureCategory $category
+     * @param array                               $data
+     * @param \App\Models\User\User               $user
+     *
      * @return \App\Models\Feature\FeatureCategory|bool
      */
-    public function updateFeatureCategory($category, $data, $user)
-    {
+    public function updateFeatureCategory($category, $data, $user) {
         DB::beginTransaction();
 
         try {
             // More specific validation
-            if(FeatureCategory::where('name', $data['name'])->where('id', '!=', $category->id)->exists()) throw new \Exception("The name has already been taken.");
+            if (FeatureCategory::where('name', $data['name'])->where('id', '!=', $category->id)->exists()) {
+                throw new \Exception('The name has already been taken.');
+            }
 
             $data = $this->populateCategoryData($data, $category);
 
-            $image = null;            
-            if(isset($data['image']) && $data['image']) {
+            $image = null;
+            if (isset($data['image']) && $data['image']) {
                 $data['has_image'] = 1;
+                $data['hash'] = randomString(10);
                 $image = $data['image'];
                 unset($data['image']);
             }
 
             $category->update($data);
 
-            if ($category) $this->handleImage($image, $category->categoryImagePath, $category->categoryImageFileName);
+            if (!$this->logAdminAction($user, 'Updated Feature Category', 'Updated '.$category->displayName)) {
+                throw new \Exception('Failed to log admin action.');
+            }
 
-            return $this->commitReturn($category);
-        } catch(\Exception $e) { 
-            $this->setError('error', $e->getMessage());
-        }
-        return $this->rollbackReturn(false);
-    }
+            if (!$this->logAdminAction($user, 'Updated Feature Category', 'Updated '.$category->displayName)) {
+                throw new \Exception('Failed to log admin action.');
+            }
 
-    /**
-     * Handle category data.
-     *
-     * @param  array                                     $data
-     * @param  \App\Models\Feature\FeatureCategory|null  $category
-     * @return array
-     */
-    private function populateCategoryData($data, $category = null)
-    {
-        if(isset($data['description']) && $data['description']) $data['parsed_description'] = parse($data['description']);
-        
-        if(isset($data['remove_image']))
-        {
-            if($category && $category->has_image && $data['remove_image']) 
-            { 
-                $data['has_image'] = 0; 
-                $this->deleteImage($category->categoryImagePath, $category->categoryImageFileName); 
+            if ($category) {
+                $this->handleImage($image, $category->categoryImagePath, $category->categoryImageFileName);
             }
-            unset($data['remove_image']);
+
+            return $this->commitReturn($category);
+        } catch (\Exception $e) {
+            $this->setError('error', $e->getMessage());
         }
 
-        return $data;
+        return $this->rollbackReturn(false);
     }
 
     /**
      * Delete a category.
      *
-     * @param  \App\Models\Feature\FeatureCategory  $category
+     * @param \App\Models\Feature\FeatureCategory $category
+     * @param mixed                               $user
+     *
      * @return bool
      */
-    public function deleteFeatureCategory($category)
-    {
+    public function deleteFeatureCategory($category, $user) {
         DB::beginTransaction();
 
         try {
             // Check first if the category is currently in use
-            if(Feature::where('feature_category_id', $category->id)->exists()) throw new \Exception("A trait with this category exists. Please change its category first.");
-            
-            if($category->has_image) $this->deleteImage($category->categoryImagePath, $category->categoryImageFileName); 
+            if (Feature::where('feature_category_id', $category->id)->exists()) {
+                throw new \Exception('A trait with this category exists. Please change its category first.');
+            }
+
+            if (!$this->logAdminAction($user, 'Deleted Feature Category', 'Deleted '.$category->name)) {
+                throw new \Exception('Failed to log admin action.');
+            }
+
+            if ($category->has_image) {
+                $this->deleteImage($category->categoryImagePath, $category->categoryImageFileName);
+            }
             $category->delete();
 
             return $this->commitReturn(true);
-        } catch(\Exception $e) { 
+        } catch (\Exception $e) {
             $this->setError('error', $e->getMessage());
         }
+
         return $this->rollbackReturn(false);
     }
 
     /**
      * Sorts category order.
      *
-     * @param  array  $data
+     * @param array $data
+     *
      * @return bool
      */
-    public function sortFeatureCategory($data)
-    {
+    public function sortFeatureCategory($data) {
         DB::beginTransaction();
 
         try {
             // explode the sort array and reverse it since the order is inverted
             $sort = array_reverse(explode(',', $data));
 
-            foreach($sort as $key => $s) {
+            foreach ($sort as $key => $s) {
                 FeatureCategory::where('id', $s)->update(['sort' => $key]);
             }
 
             return $this->commitReturn(true);
-        } catch(\Exception $e) { 
+        } catch (\Exception $e) {
             $this->setError('error', $e->getMessage());
         }
+
         return $this->rollbackReturn(false);
     }
 
-    
     /**********************************************************************************************
-     
+
         FEATURES
 
     **********************************************************************************************/
@@ -179,143 +185,233 @@ public function sortFeatureCategory($data)
     /**
      * Creates a new feature.
      *
-     * @param  array                  $data 
-     * @param  \App\Models\User\User  $user
-     * @return bool|\App\Models\Feature\Feature
+     * @param array                 $data
+     * @param \App\Models\User\User $user
+     *
+     * @return \App\Models\Feature\Feature|bool
      */
-    public function createFeature($data, $user)
-    {
+    public function createFeature($data, $user) {
         DB::beginTransaction();
 
         try {
-            if(isset($data['feature_category_id']) && $data['feature_category_id'] == 'none') $data['feature_category_id'] = null;
-            if(isset($data['species_id']) && $data['species_id'] == 'none') $data['species_id'] = null;
-            if(isset($data['subtype_id']) && $data['subtype_id'] == 'none') $data['subtype_id'] = null;
-
-            if((isset($data['feature_category_id']) && $data['feature_category_id']) && !FeatureCategory::where('id', $data['feature_category_id'])->exists()) throw new \Exception("The selected trait category is invalid.");
-            if((isset($data['species_id']) && $data['species_id']) && !Species::where('id', $data['species_id'])->exists()) throw new \Exception("The selected species is invalid.");
-            if(isset($data['subtype_id']) && $data['subtype_id'])
-            {
+            if (isset($data['feature_category_id']) && $data['feature_category_id'] == 'none') {
+                $data['feature_category_id'] = null;
+            }
+            if (isset($data['species_id']) && $data['species_id'] == 'none') {
+                $data['species_id'] = null;
+            }
+            if (isset($data['subtype_id']) && $data['subtype_id'] == 'none') {
+                $data['subtype_id'] = null;
+            }
+
+            if ((isset($data['feature_category_id']) && $data['feature_category_id']) && !FeatureCategory::where('id', $data['feature_category_id'])->exists()) {
+                throw new \Exception('The selected trait category is invalid.');
+            }
+            if ((isset($data['species_id']) && $data['species_id']) && !Species::where('id', $data['species_id'])->exists()) {
+                throw new \Exception('The selected species is invalid.');
+            }
+            if (isset($data['subtype_id']) && $data['subtype_id']) {
                 $subtype = Subtype::find($data['subtype_id']);
-                if(!(isset($data['species_id']) && $data['species_id'])) throw new \Exception('Species must be selected to select a subtype.');
-                if(!$subtype || $subtype->species_id != $data['species_id']) throw new \Exception('Selected subtype invalid or does not match species.');
+                if (!(isset($data['species_id']) && $data['species_id'])) {
+                    throw new \Exception('Species must be selected to select a subtype.');
+                }
+                if (!$subtype || $subtype->species_id != $data['species_id']) {
+                    throw new \Exception('Selected subtype invalid or does not match species.');
+                }
             }
 
             $data = $this->populateData($data);
 
             $image = null;
-            if(isset($data['image']) && $data['image']) {
+            if (isset($data['image']) && $data['image']) {
                 $data['has_image'] = 1;
+                $data['hash'] = randomString(10);
                 $image = $data['image'];
                 unset($data['image']);
+            } else {
+                $data['has_image'] = 0;
             }
-            else $data['has_image'] = 0;
 
             $feature = Feature::create($data);
 
-            if ($image) $this->handleImage($image, $feature->imagePath, $feature->imageFileName);
+            if (!$this->logAdminAction($user, 'Created Feature', 'Created '.$feature->displayName)) {
+                throw new \Exception('Failed to log admin action.');
+            }
+
+            if ($image) {
+                $this->handleImage($image, $feature->imagePath, $feature->imageFileName);
+            }
 
             return $this->commitReturn($feature);
-        } catch(\Exception $e) { 
+        } catch (\Exception $e) {
             $this->setError('error', $e->getMessage());
         }
+
         return $this->rollbackReturn(false);
     }
 
     /**
      * Updates a feature.
      *
-     * @param  \App\Models\Feature\Feature  $feature
-     * @param  array                        $data 
-     * @param  \App\Models\User\User        $user
-     * @return bool|\App\Models\Feature\Feature
+     * @param \App\Models\Feature\Feature $feature
+     * @param array                       $data
+     * @param \App\Models\User\User       $user
+     *
+     * @return \App\Models\Feature\Feature|bool
      */
-    public function updateFeature($feature, $data, $user)
-    {
+    public function updateFeature($feature, $data, $user) {
         DB::beginTransaction();
 
         try {
-            if(isset($data['feature_category_id']) && $data['feature_category_id'] == 'none') $data['feature_category_id'] = null;
-            if(isset($data['species_id']) && $data['species_id'] == 'none') $data['species_id'] = null;
-            if(isset($data['subtype_id']) && $data['subtype_id'] == 'none') $data['subtype_id'] = null;
+            if (isset($data['feature_category_id']) && $data['feature_category_id'] == 'none') {
+                $data['feature_category_id'] = null;
+            }
+            if (isset($data['species_id']) && $data['species_id'] == 'none') {
+                $data['species_id'] = null;
+            }
+            if (isset($data['subtype_id']) && $data['subtype_id'] == 'none') {
+                $data['subtype_id'] = null;
+            }
 
             // More specific validation
-            if(Feature::where('name', $data['name'])->where('id', '!=', $feature->id)->exists()) throw new \Exception("The name has already been taken.");
-            if((isset($data['feature_category_id']) && $data['feature_category_id']) && !FeatureCategory::where('id', $data['feature_category_id'])->exists()) throw new \Exception("The selected trait category is invalid.");
-            if((isset($data['species_id']) && $data['species_id']) && !Species::where('id', $data['species_id'])->exists()) throw new \Exception("The selected species is invalid.");
-            if(isset($data['subtype_id']) && $data['subtype_id'])
-            {
+            if (Feature::where('name', $data['name'])->where('id', '!=', $feature->id)->exists()) {
+                throw new \Exception('The name has already been taken.');
+            }
+            if ((isset($data['feature_category_id']) && $data['feature_category_id']) && !FeatureCategory::where('id', $data['feature_category_id'])->exists()) {
+                throw new \Exception('The selected trait category is invalid.');
+            }
+            if ((isset($data['species_id']) && $data['species_id']) && !Species::where('id', $data['species_id'])->exists()) {
+                throw new \Exception('The selected species is invalid.');
+            }
+            if (isset($data['subtype_id']) && $data['subtype_id']) {
                 $subtype = Subtype::find($data['subtype_id']);
-                if(!(isset($data['species_id']) && $data['species_id'])) throw new \Exception('Species must be selected to select a subtype.');
-                if(!$subtype || $subtype->species_id != $data['species_id']) throw new \Exception('Selected subtype invalid or does not match species.');
+                if (!(isset($data['species_id']) && $data['species_id'])) {
+                    throw new \Exception('Species must be selected to select a subtype.');
+                }
+                if (!$subtype || $subtype->species_id != $data['species_id']) {
+                    throw new \Exception('Selected subtype invalid or does not match species.');
+                }
             }
 
             $data = $this->populateData($data);
 
-            $image = null;            
-            if(isset($data['image']) && $data['image']) {
+            $image = null;
+            if (isset($data['image']) && $data['image']) {
                 $data['has_image'] = 1;
+                $data['hash'] = randomString(10);
                 $image = $data['image'];
                 unset($data['image']);
             }
 
             $feature->update($data);
 
-            if ($feature) $this->handleImage($image, $feature->imagePath, $feature->imageFileName);
+            if (!$this->logAdminAction($user, 'Updated Feature', 'Updated '.$feature->displayName)) {
+                throw new \Exception('Failed to log admin action.');
+            }
+
+            if ($feature) {
+                $this->handleImage($image, $feature->imagePath, $feature->imageFileName);
+            }
 
             return $this->commitReturn($feature);
-        } catch(\Exception $e) { 
+        } catch (\Exception $e) {
             $this->setError('error', $e->getMessage());
         }
+
         return $this->rollbackReturn(false);
     }
 
-    /**
-     * Processes user input for creating/updating a feature.
-     *
-     * @param  array                        $data 
-     * @param  \App\Models\Feature\Feature  $feature
-     * @return array
-     */
-    private function populateData($data, $feature = null)
-    {
-        if(isset($data['description']) && $data['description']) $data['parsed_description'] = parse($data['description']);
-        if(isset($data['species_id']) && $data['species_id'] == 'none') $data['species_id'] = null;
-        if(isset($data['feature_category_id']) && $data['feature_category_id'] == 'none') $data['feature_category_id'] = null;
-        if(isset($data['remove_image']))
-        {
-            if($feature && $feature->has_image && $data['remove_image']) 
-            { 
-                $data['has_image'] = 0; 
-                $this->deleteImage($feature->imagePath, $feature->imageFileName); 
-            }
-            unset($data['remove_image']);
-        }
-
-        return $data;
-    }
-    
     /**
      * Deletes a feature.
      *
-     * @param  \App\Models\Feature\Feature  $feature
+     * @param \App\Models\Feature\Feature $feature
+     * @param mixed                       $user
+     *
      * @return bool
      */
-    public function deleteFeature($feature)
-    {
+    public function deleteFeature($feature, $user) {
         DB::beginTransaction();
 
         try {
             // Check first if the feature is currently in use
-            if(DB::table('character_features')->where('feature_id', $feature->id)->exists()) throw new \Exception("A character with this trait exists. Please remove the trait first.");
-            
-            if($feature->has_image) $this->deleteImage($feature->imagePath, $feature->imageFileName); 
+            if (DB::table('character_features')->where('feature_id', $feature->id)->exists()) {
+                throw new \Exception('A character with this trait exists. Please remove the trait first.');
+            }
+
+            if (!$this->logAdminAction($user, 'Deleted Feature', 'Deleted '.$feature->name)) {
+                throw new \Exception('Failed to log admin action.');
+            }
+
+            if ($feature->has_image) {
+                $this->deleteImage($feature->imagePath, $feature->imageFileName);
+            }
             $feature->delete();
 
             return $this->commitReturn(true);
-        } catch(\Exception $e) { 
+        } catch (\Exception $e) {
             $this->setError('error', $e->getMessage());
         }
+
         return $this->rollbackReturn(false);
     }
-}
\ No newline at end of file
+
+    /**
+     * Handle category data.
+     *
+     * @param array                                    $data
+     * @param \App\Models\Feature\FeatureCategory|null $category
+     *
+     * @return array
+     */
+    private function populateCategoryData($data, $category = null) {
+        if (isset($data['description']) && $data['description']) {
+            $data['parsed_description'] = parse($data['description']);
+        }
+
+        if (!isset($data['is_visible'])) {
+            $data['is_visible'] = 0;
+        }
+
+        if (isset($data['remove_image'])) {
+            if ($category && $category->has_image && $data['remove_image']) {
+                $data['has_image'] = 0;
+                $this->deleteImage($category->categoryImagePath, $category->categoryImageFileName);
+            }
+            unset($data['remove_image']);
+        }
+
+        return $data;
+    }
+
+    /**
+     * Processes user input for creating/updating a feature.
+     *
+     * @param array                       $data
+     * @param \App\Models\Feature\Feature $feature
+     *
+     * @return array
+     */
+    private function populateData($data, $feature = null) {
+        if (isset($data['description']) && $data['description']) {
+            $data['parsed_description'] = parse($data['description']);
+        }
+        if (isset($data['species_id']) && $data['species_id'] == 'none') {
+            $data['species_id'] = null;
+        }
+        if (isset($data['feature_category_id']) && $data['feature_category_id'] == 'none') {
+            $data['feature_category_id'] = null;
+        }
+        if (!isset($data['is_visible'])) {
+            $data['is_visible'] = 0;
+        }
+        if (isset($data['remove_image'])) {
+            if ($feature && $feature->has_image && $data['remove_image']) {
+                $data['has_image'] = 0;
+                $this->deleteImage($feature->imagePath, $feature->imageFileName);
+            }
+            unset($data['remove_image']);
+        }
+
+        return $data;
+    }
+}
diff --git a/app/Services/FileManager.php b/app/Services/FileManager.php
index 9845e1539d..ef08f15eaf 100644
--- a/app/Services/FileManager.php
+++ b/app/Services/FileManager.php
@@ -1,12 +1,10 @@
-<?php namespace App\Services;
+<?php
 
-use App\Services\Service;
+namespace App\Services;
 
-use File;
-use Config;
+use Illuminate\Support\Facades\File;
 
-class FileManager extends Service
-{
+class FileManager extends Service {
     /*
     |--------------------------------------------------------------------------
     | File Manager
@@ -19,156 +17,170 @@ class FileManager extends Service
     /**
      * Creates a directory.
      *
-     * @param  string  $dir
+     * @param string $dir
+     *
      * @return bool
      */
-    public function createDirectory($dir) 
-    {
-        if(file_exists($dir)) $this->setError('Folder already exists.');
-        else {
+    public function createDirectory($dir) {
+        if (file_exists($dir)) {
+            $this->setError('Folder already exists.');
+        } else {
             // Create the directory.
             if (!mkdir($dir, 0755, true)) {
                 $this->setError('Failed to create folder.');
+
                 return false;
             }
             chmod($dir, 0755);
         }
+
         return true;
     }
 
     /**
      * Deletes a directory if it exists and doesn't contain files.
      *
-     * @param  string  $dir
+     * @param string $dir
+     *
      * @return bool
      */
-    public function deleteDirectory($dir) 
-    {
-        if(!file_exists($dir)) {
+    public function deleteDirectory($dir) {
+        if (!file_exists($dir)) {
             $this->setError('error', 'Directory does not exist.');
+
             return false;
         }
-        $files = array_diff(scandir($dir), array('.', '..'));
-        if(count($files)) {
+        $files = array_diff(scandir($dir), ['.', '..']);
+        if (count($files)) {
             $this->setError('error', 'Cannot delete a folder that contains files.');
+
             return false;
         }
         rmdir($dir);
+
         return true;
     }
-    
+
     /**
      * Renames a directory.
      *
-     * @param  string  $dir
-     * @param  string  $oldName 
-     * @param  string  $newName
+     * @param string $dir
+     * @param string $oldName
+     * @param string $newName
+     *
      * @return bool
      */
-    public function renameDirectory($dir, $oldName, $newName) 
-    {
-        if(!file_exists($dir . '/' . $oldName)) {
+    public function renameDirectory($dir, $oldName, $newName) {
+        if (!file_exists($dir.'/'.$oldName)) {
             $this->setError('error', 'Directory does not exist.');
+
             return false;
         }
-        $files = array_diff(scandir($dir . '/' . $oldName), array('.', '..'));
-        if(count($files)) {
+        $files = array_diff(scandir($dir.'/'.$oldName), ['.', '..']);
+        if (count($files)) {
             $this->setError('error', 'Cannot delete a folder that contains files.');
+
             return false;
         }
-        rename($dir . '/' . $oldName, $dir . '/' . $newName);
+        rename($dir.'/'.$oldName, $dir.'/'.$newName);
+
         return true;
     }
-    
+
     /**
      * Uploads a file.
      *
-     * @param  array   $file
-     * @param  string  $dir
-     * @param  string  $name
-     * @param  bool    $isFileManager
+     * @param array  $file
+     * @param string $dir
+     * @param string $name
+     * @param bool   $isFileManager
+     *
      * @return bool
      */
-    public function uploadFile($file, $dir, $name, $isFileManager = true)
-    {
-        $directory = public_path(). ($isFileManager ? '/files'.($dir ? '/'.$dir : '') : '/images');
-        if(!file_exists($directory))
-        {
+    public function uploadFile($file, $dir, $name, $isFileManager = true) {
+        $directory = public_path().($isFileManager ? '/files'.($dir ? '/'.$dir : '') : '/images');
+        if (!file_exists($directory)) {
             $this->setError('error', 'Folder does not exist.');
         }
-        File::move($file, $directory . '/' . $name);
-        chmod($directory . '/' . $name, 0755);
-        
+        File::move($file, $directory.'/'.$name);
+        chmod($directory.'/'.$name, 0755);
+
         return true;
     }
-    
+
     /**
      * Uploads a custom CSS file.
      *
-     * @param  array  $file
+     * @param array $file
+     *
      * @return bool
      */
-    public function uploadCss($file)
-    {
-        File::move($file, public_path() . '/css/custom.css');
-        chmod(public_path() . '/css/custom.css', 0755);
-        
+    public function uploadCss($file) {
+        File::move($file, public_path().'/css/custom.css');
+        chmod(public_path().'/css/custom.css', 0755);
+
         return true;
     }
-    
+
     /**
      * Deletes a file.
      *
-     * @param  string  $path
+     * @param string $path
+     *
      * @return bool
      */
-    public function deleteFile($path)
-    {
-        if(!file_exists($path)) {
+    public function deleteFile($path) {
+        if (!file_exists($path)) {
             $this->setError('error', 'File does not exist.');
+
             return false;
         }
         unlink($path);
+
         return true;
     }
-    
+
     /**
      * Moves a file.
      *
-     * @param  string  $oldDir
-     * @param  string  $newDir
-     * @param  string  $name
+     * @param string $oldDir
+     * @param string $newDir
+     * @param string $name
+     *
      * @return bool
      */
-    public function moveFile($oldDir, $newDir, $name)
-    {
-        if(!file_exists($oldDir . '/' . $name)) {
+    public function moveFile($oldDir, $newDir, $name) {
+        if (!file_exists($oldDir.'/'.$name)) {
             $this->setError('error', 'File does not exist.');
+
             return false;
-        }
-        else if(!file_exists($newDir)) {
+        } elseif (!file_exists($newDir)) {
             $this->setError('error', 'Destination does not exist.');
+
             return false;
         }
-        rename($oldDir . '/' . $name, $newDir . '/' . $name);
+        rename($oldDir.'/'.$name, $newDir.'/'.$name);
+
         return true;
     }
-    
+
     /**
      * Renames a file.
      *
-     * @param  string  $dir
-     * @param  string  $oldName
-     * @param  string  $newName
+     * @param string $dir
+     * @param string $oldName
+     * @param string $newName
+     *
      * @return bool
      */
-    public function renameFile($dir, $oldName, $newName)
-    {
-        if(!file_exists($dir . '/' . $oldName)) {
+    public function renameFile($dir, $oldName, $newName) {
+        if (!file_exists($dir.'/'.$oldName)) {
             $this->setError('error', 'File does not exist.');
+
             return false;
         }
-        rename($dir . '/' . $oldName, $dir . '/' . $newName);
+        rename($dir.'/'.$oldName, $dir.'/'.$newName);
+
         return true;
     }
-}
\ No newline at end of file
+}
diff --git a/app/Services/GalleryManager.php b/app/Services/GalleryManager.php
index 3a146a3f36..b6daf78ae3 100644
--- a/app/Services/GalleryManager.php
+++ b/app/Services/GalleryManager.php
@@ -1,26 +1,23 @@
-<?php namespace App\Services;
+<?php
 
-use DB;
-use Image;
-use Settings;
-use Config;
-use Notifications;
-use Carbon\Carbon;
-use App\Services\Service;
+namespace App\Services;
 
+use App\Facades\Notifications;
+use App\Facades\Settings;
+use App\Models\Character\Character;
+use App\Models\Currency\Currency;
 use App\Models\Gallery\Gallery;
-use App\Models\Gallery\GallerySubmission;
 use App\Models\Gallery\GalleryCharacter;
 use App\Models\Gallery\GalleryCollaborator;
 use App\Models\Gallery\GalleryFavorite;
-
-use App\Models\User\User;
-use App\Models\Character\Character;
+use App\Models\Gallery\GallerySubmission;
 use App\Models\Prompt\Prompt;
-use App\Models\Currency\Currency;
+use App\Models\User\User;
+use Illuminate\Support\Facades\Config;
+use Illuminate\Support\Facades\DB;
+use Intervention\Image\Facades\Image;
 
-class GalleryManager extends Service
-{
+class GalleryManager extends Service {
     /*
     |--------------------------------------------------------------------------
     | Gallery Manager
@@ -33,62 +30,81 @@ class GalleryManager extends Service
     /**
      * Creates a new gallery submission.
      *
-     * @param  array                  $data
-     * @param  array                  $currencyFormData
-     * @param  \App\Models\User\User  $user
-     * @return bool|\App\Models\Gallery\GallerySubmission
+     * @param array                 $data
+     * @param array                 $currencyFormData
+     * @param \App\Models\User\User $user
+     *
+     * @return \App\Models\Gallery\GallerySubmission|bool
      */
-    public function createSubmission($data, $currencyFormData, $user)
-    {
+    public function createSubmission($data, $currencyFormData, $user) {
         DB::beginTransaction();
 
         try {
             //  Check that submissions are open
-            if(!Settings::get('gallery_submissions_open')) throw new \Exception("Gallery submissions are currently closed.");
+            if (!Settings::get('gallery_submissions_open')) {
+                throw new \Exception('Gallery submissions are currently closed.');
+            }
             // Check that the gallery exists and can be submitted to
             $gallery = Gallery::find($data['gallery_id']);
-            if(!$gallery) throw new \Exception ("Invalid gallery selected.");
-            if(!$gallery->submissions_open && !$user->hasPower('manage_submissions')) throw new \Exception("You cannot submit to this gallery.");
-            if((isset($gallery->start_at) && $gallery->start_at->isFuture()) || (isset($gallery->end_at) && $gallery->end_at->isPast())) throw new \Exception('This gallery\'s submissions aren\'t open.');
+            if (!$gallery) {
+                throw new \Exception('Invalid gallery selected.');
+            }
+            if (!$gallery->submissions_open && !$user->hasPower('manage_submissions')) {
+                throw new \Exception('You cannot submit to this gallery.');
+            }
+            if ((isset($gallery->start_at) && $gallery->start_at->isFuture()) || (isset($gallery->end_at) && $gallery->end_at->isPast())) {
+                throw new \Exception('This gallery\'s submissions aren\'t open.');
+            }
 
             // Check that associated collaborators exist
-            if(isset($data['collaborator_id'])) {
+            if (isset($data['collaborator_id'])) {
                 $collaborators = User::whereIn('id', $data['collaborator_id'])->get();
-                if(count($collaborators) != count($data['collaborator_id'])) throw new \Exception("One or more of the selected collaborators does not exist, or you have entered a duplicate.");
+                if (count($collaborators) != count($data['collaborator_id'])) {
+                    throw new \Exception('One or more of the selected collaborators does not exist, or you have entered a duplicate.');
+                }
+            } else {
+                $collaborators = [];
             }
-            else $collaborators = [];
 
             // Check that associated participants exist
-            if(isset($data['participant_id'])) {
+            if (isset($data['participant_id'])) {
                 $participants = User::whereIn('id', $data['participant_id'])->get();
-                if(count($participants) != count($data['participant_id'])) throw new \Exception("One or more of the selected participants does not exist, or you have entered a duplicate.");
+                if (count($participants) != count($data['participant_id'])) {
+                    throw new \Exception('One or more of the selected participants does not exist, or you have entered a duplicate.');
+                }
+            } else {
+                $participants = [];
             }
-            else $participants = [];
 
             // Check that associated characters exist
-            if(isset($data['slug'])) {
+            if (isset($data['slug'])) {
                 $characters = Character::myo(0)->visible()->whereIn('slug', $data['slug'])->get();
-                if(count($characters) != count($data['slug'])) throw new \Exception("One or more of the selected characters does not exist, or you have entered a duplicate.");
+                if (count($characters) != count($data['slug'])) {
+                    throw new \Exception('One or more of the selected characters does not exist, or you have entered a duplicate.');
+                }
+            } else {
+                $characters = [];
             }
-            else $characters = [];
 
             // Check that the selected prompt exists and can be submitted to
-            if(isset($data['prompt_id'])) {
+            if (isset($data['prompt_id'])) {
                 $prompt = Prompt::active()->find($data['prompt_id']);
-                if(!$prompt) throw new \Exception("Invalid prompt selected.");
+                if (!$prompt) {
+                    throw new \Exception('Invalid prompt selected.');
+                }
             }
 
             $submission = GallerySubmission::create([
-                'user_id' => $user->id,
+                'user_id'    => $user->id,
                 'gallery_id' => $gallery->id,
-                'status' => 'Pending',
-                'title' => $data['title'],
-                'is_visible' => 1
+                'status'     => 'Pending',
+                'title'      => $data['title'],
+                'is_visible' => 1,
             ]);
 
             $data = $this->populateData($data);
 
-            if(isset($currencyFormData) && $currencyFormData) {
+            if (isset($currencyFormData) && $currencyFormData) {
                 $data['data']['currencyData'] = $currencyFormData;
                 $data['data']['total'] = calculateGroupCurrency($currencyFormData);
                 $data['data'] = collect($data['data'])->toJson();
@@ -96,182 +112,215 @@ public function createSubmission($data, $currencyFormData, $user)
 
             $submission->update($data);
 
-            if(isset($data['image']) && $data['image']) $this->processImage($data, $submission);
+            if (isset($data['image']) && $data['image']) {
+                $this->processImage($data, $submission);
+            }
             $submission->update();
 
-            if(isset($data['collaborator_id']) && $collaborators->count()) {
+            if (isset($data['collaborator_id']) && $collaborators->count()) {
                 // Attach any collaborators to the submission
-                foreach($data['collaborator_id'] as $key=>$collaborator) {
+                foreach ($data['collaborator_id'] as $key=> $collaborator) {
                     GalleryCollaborator::create([
-                        'user_id' => $collaborator,
+                        'user_id'               => $collaborator,
                         'gallery_submission_id' => $submission->id,
-                        'data' => $data['collaborator_data'][$key],
-                        'has_approved' => $collaborator == $user->id ? 1 : 0,
+                        'data'                  => $data['collaborator_data'][$key],
+                        'has_approved'          => $collaborator == $user->id ? 1 : 0,
                     ]);
 
                     // Notify collaborators (but not the submitting user)
-                    if($collaborator != $user->id) {
+                    if ($collaborator != $user->id) {
                         Notifications::create('GALLERY_SUBMISSION_COLLABORATOR', User::find($collaborator), [
-                            'sender_url' => $user->url,
-                            'sender' => $user->name,
+                            'sender_url'    => $user->url,
+                            'sender'        => $user->name,
                             'submission_id' => $submission->id,
                         ]);
                     }
                 }
             }
 
-            if(isset($data['participant_id']) && $participants->count()) {
+            if (isset($data['participant_id']) && $participants->count()) {
                 // Attach any participants to the submission
-                foreach($data['participant_id'] as $key=>$participant) {
+                foreach ($data['participant_id'] as $key=> $participant) {
                     GalleryCollaborator::create([
-                        'user_id' => $participant,
+                        'user_id'               => $participant,
                         'gallery_submission_id' => $submission->id,
-                        'data' => null,
-                        'has_approved' => 1,
-                        'type' => $data['participant_type'][$key]
+                        'data'                  => null,
+                        'has_approved'          => 1,
+                        'type'                  => $data['participant_type'][$key],
                     ]);
                 }
             }
 
             // Attach any characters to the submission
-            foreach($characters as $character) {
+            foreach ($characters as $character) {
                 GalleryCharacter::create([
-                    'character_id' => $character->id,
+                    'character_id'          => $character->id,
                     'gallery_submission_id' => $submission->id,
                 ]);
             }
 
-            if(!$submission->collaborators->count() && (!Settings::get('gallery_submissions_require_approval') || (Settings::get('gallery_submissions_require_approval') && $submission->gallery->votes_required == 0))) $this->acceptSubmission($submission);
+            if (!$submission->collaborators->count() && (!Settings::get('gallery_submissions_require_approval') || (Settings::get('gallery_submissions_require_approval') && $submission->gallery->votes_required == 0))) {
+                $this->acceptSubmission($submission);
+            }
 
             return $this->commitReturn($submission);
-        } catch(\Exception $e) {
+        } catch (\Exception $e) {
             $this->setError('error', $e->getMessage());
         }
+
         return $this->rollbackReturn(false);
     }
 
     /**
      * Updates a gallery submission.
      *
-     * @param  \App\Models\Gallery\GallerySubmission  $submission
-     * @param  array                                  $data
-     * @param  \App\Models\User\User                  $user
-     * @return bool|\App\Models\Gallery\GallerySubmission
+     * @param \App\Models\Gallery\GallerySubmission $submission
+     * @param array                                 $data
+     * @param \App\Models\User\User                 $user
+     *
+     * @return \App\Models\Gallery\GallerySubmission|bool
      */
-    public function updateSubmission($submission, $data, $user)
-    {
+    public function updateSubmission($submission, $data, $user) {
         DB::beginTransaction();
 
         try {
             // Check that the user can edit the submission
-            if(!$submission->user_id == $user->id && !$user->hasPower('manage_submissions')) throw new \Exception("You can't edit this submission.");
+            if (!$submission->user_id == $user->id && !$user->hasPower('manage_submissions')) {
+                throw new \Exception("You can't edit this submission.");
+            }
 
             // Check that there is text and/or an image, including if there is an existing image (via the existence of a hash)
-            if((!isset($data['image']) && !isset($submission->hash)) && !$data['text']) throw new \Exception("Please submit either text or an image.");
+            if ((!isset($data['image']) && !isset($submission->hash)) && !$data['text']) {
+                throw new \Exception('Please submit either text or an image.');
+            }
+
+            if ($user->isStaff) {
+                if (!$this->logAdminAction($user, 'Edited Gallery Submission', 'Edited gallery submission '.$submission->displayName)) {
+                    throw new \Exception('Failed to log admin action.');
+                }
+            }
 
             // If still pending, perform validation on and process collaborators and participants
-            if($submission->status == 'Pending') {
+            if ($submission->status == 'Pending') {
                 // Check that associated collaborators exist
-                if(isset($data['collaborator_id'])) {
+                if (isset($data['collaborator_id'])) {
                     $collaborators = User::whereIn('id', $data['collaborator_id'])->get();
-                    if(count($collaborators) != count($data['collaborator_id'])) throw new \Exception("One or more of the selected users does not exist, or you have entered a duplicate.");
+                    if (count($collaborators) != count($data['collaborator_id'])) {
+                        throw new \Exception('One or more of the selected users does not exist, or you have entered a duplicate.');
+                    }
+                } else {
+                    $collaborators = [];
                 }
-                else $collaborators = [];
 
                 // Fetch collaborator approval data
                 $collaboratorApproval = $submission->collaborators->pluck('has_approved', 'user_id');
                 // Remove all collaborators from the submission so they can be reattached with new data
                 $submission->collaborators()->delete();
 
-                if(isset($data['collaborator_id']) && $collaborators->count()) {
+                if (isset($data['collaborator_id']) && $collaborators->count()) {
                     // Attach any collaborators to the submission
-                    foreach($data['collaborator_id'] as $key=>$collaborator) {
+                    foreach ($data['collaborator_id'] as $key=> $collaborator) {
                         GalleryCollaborator::create([
-                            'user_id' => $collaborator,
+                            'user_id'               => $collaborator,
                             'gallery_submission_id' => $submission->id,
-                            'data' => $data['collaborator_data'][$key],
-                            'has_approved' => isset($collaboratorApproval[$collaborator]) ? $collaboratorApproval[$collaborator] : ($collaborator == $user->id ? 1 : 0),
+                            'data'                  => $data['collaborator_data'][$key],
+                            'has_approved'          => $collaboratorApproval[$collaborator] ?? ($collaborator == $user->id ? 1 : 0),
                         ]);
                     }
                 }
 
                 // Check that associated participants exist
-                if(isset($data['participant_id'])) {
+                if (isset($data['participant_id'])) {
                     $participants = User::whereIn('id', $data['participant_id'])->get();
-                    if(count($participants) != count($data['participant_id'])) throw new \Exception("One or more of the selected participants does not exist, or you have entered a duplicate.");
+                    if (count($participants) != count($data['participant_id'])) {
+                        throw new \Exception('One or more of the selected participants does not exist, or you have entered a duplicate.');
+                    }
+                } else {
+                    $participants = [];
                 }
-                else $participants = [];
 
                 // Remove all participants from the submission so they can be reattached with new data
                 $submission->participants()->delete();
 
-                if(isset($data['participant_id']) && $participants->count()) {
+                if (isset($data['participant_id']) && $participants->count()) {
                     // Attach any participants to the submission
-                    foreach($data['participant_id'] as $key=>$participant) {
+                    foreach ($data['participant_id'] as $key=> $participant) {
                         GalleryCollaborator::create([
-                            'user_id' => $participant,
+                            'user_id'               => $participant,
                             'gallery_submission_id' => $submission->id,
-                            'data' => null,
-                            'has_approved' => 1,
-                            'type' => $data['participant_type'][$key]
+                            'data'                  => null,
+                            'has_approved'          => 1,
+                            'type'                  => $data['participant_type'][$key],
                         ]);
                     }
                 }
             }
 
             // Check that associated characters exist
-            if(isset($data['slug'])) {
+            if (isset($data['slug'])) {
                 $characters = Character::myo(0)->visible()->whereIn('slug', $data['slug'])->get();
-                if(count($characters) != count($data['slug'])) throw new \Exception("One or more of the selected characters does not exist, or you have entered a duplicate.");
+                if (count($characters) != count($data['slug'])) {
+                    throw new \Exception('One or more of the selected characters does not exist, or you have entered a duplicate.');
+                }
+            } else {
+                $characters = [];
             }
-            else $characters = [];
 
             // Remove all characters from the submission so they can be reattached with new data
             $submission->characters()->delete();
 
             // Attach any characters to the submission
-            foreach($characters as $character) {
+            foreach ($characters as $character) {
                 GalleryCharacter::create([
-                    'character_id' => $character->id,
+                    'character_id'          => $character->id,
                     'gallery_submission_id' => $submission->id,
                 ]);
             }
 
             // Check that the selected prompt exists and can be submitted to
-            if(isset($data['prompt_id'])) {
+            if (isset($data['prompt_id'])) {
                 $prompt = $user->hasPower('manage_submissions') ? Prompt::find($data['prompt_id']) : Prompt::active()->find($data['prompt_id']);
-                if(!$prompt) throw new \Exception("Invalid prompt selected.");
+                if (!$prompt) {
+                    throw new \Exception('Invalid prompt selected.');
+                }
             }
 
-            if((isset($submission->parsed_description) && $submission->parsed_description) && !isset($data['description'])) $data['parsed_description'] = null;
-            if((isset($submission->parsed_text) && $submission->parsed_text) && !isset($data['text'])) $data['parsed_text'] = null;
+            if ((isset($submission->parsed_description) && $submission->parsed_description) && !isset($data['description'])) {
+                $data['parsed_description'] = null;
+            }
+            if ((isset($submission->parsed_text) && $submission->parsed_text) && !isset($data['text'])) {
+                $data['parsed_text'] = null;
+            }
 
             $data = $this->populateData($data);
-            if(isset($data['image']) && $data['image']) $this->processImage($data, $submission);
+            if (isset($data['image']) && $data['image']) {
+                $this->processImage($data, $submission);
+            }
 
             // Processing relating to staff edits
-            if($user->hasPower('manage_submissions')) {
-                if(!isset($data['gallery_id']) && !$data['gallery_id']) $data['gallery_id'] = $submission->gallery->id;
+            if ($user->hasPower('manage_submissions')) {
+                if (!isset($data['gallery_id']) && !$data['gallery_id']) {
+                    $data['gallery_id'] = $submission->gallery->id;
+                }
 
                 $data['staff_id'] = $user->id;
             }
 
             // Send notifications for staff edits if necessary
-            if($user->hasPower('manage_submissions') && $user->id != $submission->user->id && (isset($data['alert_user']) && $data['alert_user'])) {
-                if($data['gallery_id'] != $submission->gallery_id) {
+            if ($user->hasPower('manage_submissions') && $user->id != $submission->user->id && (isset($data['alert_user']) && $data['alert_user'])) {
+                if ($data['gallery_id'] != $submission->gallery_id) {
                     Notifications::create('GALLERY_SUBMISSION_MOVED', $submission->user, [
                         'submission_title' => $submission->title,
-                        'submission_id' => $submission->id,
-                        'staff_url' => $user->url,
-                        'staff_name' => $user->name,
+                        'submission_id'    => $submission->id,
+                        'staff_url'        => $user->url,
+                        'staff_name'       => $user->name,
                     ]);
-                }
-                else {
+                } else {
                     Notifications::create('GALLERY_SUBMISSION_EDITED', $submission->user, [
                         'submission_title' => $submission->title,
-                        'submission_id' => $submission->id,
-                        'staff_url' => $user->url,
-                        'staff_name' => $user->name,
+                        'submission_id'    => $submission->id,
+                        'staff_url'        => $user->url,
+                        'staff_name'       => $user->name,
                     ]);
                 }
             }
@@ -279,78 +328,36 @@ public function updateSubmission($submission, $data, $user)
             $submission->update($data);
 
             return $this->commitReturn($submission);
-        } catch(\Exception $e) {
+        } catch (\Exception $e) {
             $this->setError('error', $e->getMessage());
         }
-        return $this->rollbackReturn(false);
-    }
-
-    /**
-     * Processes user input for creating/updating a gallery submission.
-     *
-     * @param  array                                  $data
-     * @return array
-     */
-    private function populateData($data)
-    {
-        // Parse any text
-        if(isset($data['text']) && $data['text']) $data['parsed_text'] = parse($data['text']);
-        if(isset($data['description']) && $data['description']) $data['parsed_description'] = parse($data['description']);
-
-        return $data;
-    }
-
-    /**
-     * Processes gallery submission images.
-     *
-     * @param  array                                  $data
-     * @param  \App\Models\Gallery\GallerySubmission  $submission
-     * @return array
-     */
-    private function processImage($data, $submission)
-    {
-        if(isset($submission->hash)) {
-            unlink($submission->imagePath . '/' . $submission->imageFileName);
-            unlink($submission->imagePath . '/' . $submission->thumbnailFileName);
-        }
-        $submission->hash = randomString(10);
-        $submission->extension = $data['image']->getClientOriginalExtension();
-
-        // Save image itself
-        $this->handleImage($data['image'], $submission->imageDirectory, $submission->imageFileName);
-
-        // Process thumbnail
-        $thumbnail = Image::make($submission->imagePath . '/' .  $submission->imageFileName);
-        // Resize
-        $thumbnail->resize(null, Config::get('lorekeeper.settings.masterlist_thumbnails.height'), function ($constraint) {
-            $constraint->aspectRatio();
-            $constraint->upsize();
-        });
-
-        // Save thumbnail
-        $thumbnail->save($submission->thumbnailPath . '/' . $submission->thumbnailFileName);
 
-        return $submission;
+        return $this->rollbackReturn(false);
     }
 
     /**
      * Processes collaborator edits/approvals on a submission.
      *
-     * @param  \App\Models\Gallery\GallerySubmission  $submission
-     * @param  \App\Models\User\User                  $user
-     * @return bool|\App\Models\Gallery\GalleryFavorite
+     * @param \App\Models\Gallery\GallerySubmission $submission
+     * @param \App\Models\User\User                 $user
+     * @param mixed                                 $data
+     *
+     * @return \App\Models\Gallery\GalleryFavorite|bool
      */
-    public function editCollaborator($submission, $data, $user)
-    {
+    public function editCollaborator($submission, $data, $user) {
         DB::beginTransaction();
 
         try {
             // Check that the submission is pending and the user is a collaborator on it
-            if(!$submission->status == 'Pending') throw new \Exception("This submission isn't pending.");
-            if($submission->collaborators->where('user_id', $user->id)->first() == null) throw new \Exception("You aren't a collaborator on this submission.");
+            if (!$submission->status == 'Pending') {
+                throw new \Exception("This submission isn't pending.");
+            }
+            if ($submission->collaborators->where('user_id', $user->id)->first() == null) {
+                throw new \Exception("You aren't a collaborator on this submission.");
+            }
 
             // Check if the user has requested to be removed from the submission
-            if(isset($data['remove_user']) && $data['remove_user']) {
+            if (isset($data['remove_user']) && $data['remove_user']) {
                 $submission->collaborators()->where('user_id', $user->id)->delete();
             }
             // Otherwise update the record of their contribution and mark them as having approved
@@ -361,43 +368,49 @@ public function editCollaborator($submission, $data, $user)
 
                 // Check if all collaborators have approved, and if so send a notification to the
                 // submitting user (unless they are the last to approve-- which shouldn't happen, but)
-                if($submission->collaboratorApproved) {
-                    if(Settings::get('gallery_submissions_require_approval') && $submission->gallery->votes_required > 0) {
-                        if($submission->user->id != $user->id) {
+                if ($submission->collaboratorApproved) {
+                    if (Settings::get('gallery_submissions_require_approval') && $submission->gallery->votes_required > 0) {
+                        if ($submission->user->id != $user->id) {
                             Notifications::create('GALLERY_COLLABORATORS_APPROVED', $submission->user, [
                                 'submission_title' => $submission->title,
-                                'submission_id' => $submission->id,
+                                'submission_id'    => $submission->id,
                             ]);
                         }
+                    } else {
+                        $this->acceptSubmission($submission);
                     }
-                    else $this->acceptSubmission($submission);
                 }
             }
 
             return $this->commitReturn($submission);
-        } catch(\Exception $e) {
+        } catch (\Exception $e) {
             $this->setError('error', $e->getMessage());
         }
+
         return $this->rollbackReturn(false);
     }
 
     /**
      * Votes on a gallery submission.
      *
-     * @param  string                                 $action
-     * @param  \App\Models\Gallery\GallerySubmission  $submission
-     * @param  \App\Models\User\User                  $user
-     * @return  bool
+     * @param string                                $action
+     * @param \App\Models\Gallery\GallerySubmission $submission
+     * @param \App\Models\User\User                 $user
+     *
+     * @return bool
      */
-    public function castVote($action, $submission, $user)
-    {
+    public function castVote($action, $submission, $user) {
         DB::beginTransaction();
 
         try {
-            if($submission->status != 'Pending') throw new \Exception("This request cannot be processed.");
-            if(!$submission->collaboratorApproved) throw new \Exception("This submission's collaborators have not all approved yet.");
+            if ($submission->status != 'Pending') {
+                throw new \Exception('This request cannot be processed.');
+            }
+            if (!$submission->collaboratorApproved) {
+                throw new \Exception("This submission's collaborators have not all approved yet.");
+            }
 
-            switch($action) {
+            switch ($action) {
                 default:
                     flash('Invalid action.')->error();
                     break;
@@ -421,198 +434,147 @@ public function castVote($action, $submission, $user)
             // Count up the existing votes to see if the required number has been reached
             $rejectSum = 0;
             $approveSum = 0;
-            foreach($submission->voteData as $voter=>$vote) {
-                if($vote == 1) $rejectSum += 1;
-                if($vote == 2) $approveSum += 1;
+            foreach ($submission->voteData as $voter=> $vote) {
+                if ($vote == 1) {
+                    $rejectSum += 1;
+                }
+                if ($vote == 2) {
+                    $approveSum += 1;
+                }
             }
 
             // And if so, process the submission
-            if($action == 'reject' && $rejectSum >= $submission->gallery->votes_required)
-            $this->rejectSubmission($submission);
-            if($action == 'accept' && $approveSum >= $submission->gallery->votes_required) $this->acceptSubmission($submission);
+            if ($action == 'reject' && $rejectSum >= $submission->gallery->votes_required) {
+                $this->rejectSubmission($submission, $user);
+            }
+            if ($action == 'accept' && $approveSum >= $submission->gallery->votes_required) {
+                $this->acceptSubmission($submission);
+            }
+
+            if (!$this->logAdminAction($user, 'Voted on Gallery Submission', 'Voted on gallery submission '.$submission->displayName)) {
+                throw new \Exception('Failed to log admin action.');
+            }
 
             return $this->commitReturn(true);
-        } catch(\Exception $e) {
+        } catch (\Exception $e) {
             $this->setError('error', $e->getMessage());
         }
+
         return $this->rollbackReturn(false);
     }
 
     /**
      * Processes staff comments for a submission.
      *
-     * @param  \App\Models\Gallery\GallerySubmission  $submission
-     * @param  \App\Models\User\User                  $user
-     * @return bool|\App\Models\Gallery\GalleryFavorite
+     * @param \App\Models\User\User $user
+     * @param mixed                 $id
+     * @param mixed                 $data
+     *
+     * @return \App\Models\Gallery\GalleryFavorite|bool
      */
-    public function postStaffComments($id, $data, $user)
-    {
+    public function postStaffComments($id, $data, $user) {
         DB::beginTransaction();
 
         try {
             $submission = GallerySubmission::find($id);
             // Check that the submission exists and that the user can edit staff comments
-            if(!$submission) throw new \Exception("Invalid submission selected.");
-            if(!$user->hasPower('manage_submissions')) throw new \Exception("You can't edit staff comments on this submission.");
+            if (!$submission) {
+                throw new \Exception('Invalid submission selected.');
+            }
+            if (!$user->hasPower('manage_submissions')) {
+                throw new \Exception("You can't edit staff comments on this submission.");
+            }
 
             // Parse comments
-            if(isset($data['staff_comments']) && $data['staff_comments']) $data['parsed_staff_comments'] = parse($data['staff_comments']);
+            if (isset($data['staff_comments']) && $data['staff_comments']) {
+                $data['parsed_staff_comments'] = parse($data['staff_comments']);
+            }
 
             $submission->update([
-                'staff_comments' => $data['staff_comments'],
+                'staff_comments'        => $data['staff_comments'],
                 'parsed_staff_comments' => $data['parsed_staff_comments'],
-                'staff_id' => $user->id,
+                'staff_id'              => $user->id,
             ]);
 
-            if(isset($data['alert_user'])) {
+            if (isset($data['alert_user'])) {
                 Notifications::create('GALLERY_SUBMISSION_STAFF_COMMENTS', $submission->user, [
-                    'sender' => $user->name,
-                    'sender_url' => $user->url,
+                    'sender'           => $user->name,
+                    'sender_url'       => $user->url,
                     'submission_title' => $submission->title,
-                    'submission_id' => $submission->id,
+                    'submission_id'    => $submission->id,
                 ]);
             }
 
             return $this->commitReturn(true);
-        } catch(\Exception $e) {
+        } catch (\Exception $e) {
             $this->setError('error', $e->getMessage());
         }
+
         return $this->rollbackReturn(false);
     }
 
     /**
-     * Processes acceptance for a submission.
+     * Archives a submission.
+     *
+     * @param \App\Models\Gallery\GallerySubmission $submission
+     * @param mixed                                 $user
      *
-     * @param  \App\Models\Gallery\GallerySubmission  $submission
-     * @return bool|\App\Models\Gallery\GallerySubmission
+     * @return bool
      */
-    private function acceptSubmission($submission)
-    {
+    public function archiveSubmission($submission, $user) {
         DB::beginTransaction();
 
         try {
-            // Check that the submission exists and is pending
-            if(!$submission) throw new \Exception("Invalid submission selected.");
-            if($submission->status != 'Pending') throw new \Exception("This submission isn't pending.");
-
-            $submission->update(['status' => 'Accepted']);
-
-            // If the submission wouldn't have been automatically approved, send a notification
-            if(Settings::get('gallery_submissions_require_approval') || (!Settings::get('gallery_submissions_require_approval') && $submission->collaborators->count())) {
-                Notifications::create('GALLERY_SUBMISSION_ACCEPTED', $submission->user, [
-                    'submission_title' => $submission->title,
-                    'submission_id' => $submission->id
-                ]);
+            if (!$submission) {
+                throw new \Exception('Invalid submission selected.');
+            }
+            if ($submission->user->id != $user->id && !$user->hasPower('manage_submissions')) {
+                throw new \Exception("You can't archive this submission.");
             }
 
-            if($submission->characters->count()) {
-                // Send a notification to included characters' owners now that the submission is accepted
-                // but not for the submitting user's own characters
-                foreach($submission->characters as $character) {
-                    if($character->user && $character->character->user->id != $submission->user->id) {
-                        Notifications::create('GALLERY_SUBMISSION_CHARACTER', $character->character->user, [
-                            'sender' => $submission->user->name,
-                            'sender_url' => $submission->user->url,
-                            'character_url' => $character->character->url,
-                            'character' => isset($character->character->name) ? $character->character->fullName : $character->character->slug,
-                            'submission_id' => $submission->id,
-                        ]);
-                    }
+            if ($user->isStaff) {
+                if (!$this->logAdminAction($user, 'Archived Gallery Submission', 'Archived gallery submission '.$submission->displayName)) {
+                    throw new \Exception('Failed to log admin action.');
                 }
             }
 
-            if($submission->participants->count()) {
-                // Send a notification to participants now that the submission is accepted
-                // but not for the submitting user
-                foreach($submission->participants as $participant) {
-                    if($participant->user->id != $submission->user->id) {
-                        Notifications::create('GALLERY_SUBMISSION_PARTICIPANT', $participant->user, [
-                            'sender_url' => $submission->user->url,
-                            'sender' => $submission->user->name,
-                            'submission_id' => $submission->id,
-                        ]);
-                    }
-                }
+            if ($submission->is_visible) {
+                $submission->update(['is_visible' => 0]);
+            } else {
+                $submission->update(['is_visible' => 1]);
             }
 
             return $this->commitReturn(true);
-        } catch(\Exception $e) {
+        } catch (\Exception $e) {
             $this->setError('error', $e->getMessage());
         }
-        return $this->rollbackReturn(false);
-    }
-
-    /**
-     * Processes rejection for a submission.
-     *
-     * @param  \App\Models\Gallery\GallerySubmission  $submission
-     * @return bool|\App\Models\Gallery\GallerySubmission
-     */
-    private function rejectSubmission($submission)
-    {
-        DB::beginTransaction();
-
-        try {
-            // Check that the submission exists and is pending
-            if(!$submission) throw new \Exception("Invalid submission selected.");
-            if($submission->status != 'Pending') throw new \Exception("This submission isn't pending.");
-
-            $submission->update(['status' => 'Rejected']);
 
-            Notifications::create('GALLERY_SUBMISSION_REJECTED', $submission->user, [
-                'submission_title' => $submission->title,
-                'submission_id' => $submission->id,
-            ]);
-
-            return $this->commitReturn(true);
-        } catch(\Exception $e) {
-            $this->setError('error', $e->getMessage());
-        }
-        return $this->rollbackReturn(false);
-    }
-
-    /**
-     * Archives a submission.
-     *
-     * @param  \App\Models\Gallery\GallerySubmission  $submission
-     * @return bool
-     */
-    public function archiveSubmission($submission, $user)
-    {
-        DB::beginTransaction();
-
-        try {
-            if(!$submission) throw new \Exception("Invalid submission selected.");
-            if($submission->user->id != $user->id && !$user->hasPower('manage_submissions')) throw new \Exception("You can't archive this submission.");
-
-            if($submission->is_visible) $submission->update(['is_visible' => 0]);
-            else $submission->update(['is_visible' => 1]);
-
-            return $this->commitReturn(true);
-        } catch(\Exception $e) {
-            $this->setError('error', $e->getMessage());
-        }
         return $this->rollbackReturn(false);
     }
 
     /**
      * Processes group currency evaluation for a submission.
      *
-     * @param  \App\Models\Gallery\GallerySubmission  $submission
-     * @param  \App\Models\User\User                  $user
-     * @return bool|\App\Models\Gallery\GalleryFavorite
+     * @param \App\Models\User\User $user
+     * @param mixed                 $id
+     * @param mixed                 $data
+     *
+     * @return \App\Models\Gallery\GalleryFavorite|bool
      */
-    public function postValueSubmission($id, $data, $user)
-    {
+    public function postValueSubmission($id, $data, $user) {
         DB::beginTransaction();
 
         try {
             $submission = GallerySubmission::find($id);
             // Check that the submission exists and that the user can value it
-            if(!$submission) throw new \Exception("Invalid submission selected.");
-            if(!$user->hasPower('manage_submissions')) throw new \Exception("You can't evaluate this submission.");
+            if (!$submission) {
+                throw new \Exception('Invalid submission selected.');
+            }
+            if (!$user->hasPower('manage_submissions')) {
+                throw new \Exception("You can't evaluate this submission.");
+            }
 
-            if(!isset($data['ineligible'])) {
+            if (!isset($data['ineligible'])) {
                 // Process data and award currency for each user associated with the submission
                 // First, set up CurrencyManager instance and log information
                 $currencyManager = new CurrencyManager;
@@ -625,20 +587,26 @@ public function postValueSubmission($id, $data, $user)
                 $awardQuantity = [];
 
                 // Then cycle through associated users and award currency
-                if(isset($data['value']['submitted'])) {
-                    if(!$currencyManager->creditCurrency($user, $submission->user, $awardType, $awardData, $currency, $data['value']['submitted'][$submission->user->id])) throw new \Exception("Failed to award currency to submitting user.");
+                if (isset($data['value']['submitted'])) {
+                    if (!$currencyManager->creditCurrency($user, $submission->user, $awardType, $awardData, $currency, $data['value']['submitted'][$submission->user->id])) {
+                        throw new \Exception('Failed to award currency to submitting user.');
+                    }
 
                     $grantedList[] = $submission->user;
                     $awardQuantity[] = $data['value']['submitted'][$submission->user->id];
                 }
 
-                if(isset($data['value']['collaborator'])) {
-                    foreach($submission->collaborators as $collaborator) {
-                        if($data['value']['collaborator'][$collaborator->user->id] > 0) {
+                if (isset($data['value']['collaborator'])) {
+                    foreach ($submission->collaborators as $collaborator) {
+                        if ($data['value']['collaborator'][$collaborator->user->id] > 0) {
                             // Double check that the submitting user isn't being awarded currency twice
-                            if(isset($data['value']['submitted']) && $collaborator->user->id == $submission->user->id) throw new \Exception("Can't award currency to the submitting user twice.");
+                            if (isset($data['value']['submitted']) && $collaborator->user->id == $submission->user->id) {
+                                throw new \Exception("Can't award currency to the submitting user twice.");
+                            }
 
-                            if(!$currencyManager->creditCurrency($user, $collaborator->user, $awardType, $awardData, $currency, $data['value']['collaborator'][$collaborator->user->id])) throw new \Exception("Failed to award currency to one or more collaborators.");
+                            if (!$currencyManager->creditCurrency($user, $collaborator->user, $awardType, $awardData, $currency, $data['value']['collaborator'][$collaborator->user->id])) {
+                                throw new \Exception('Failed to award currency to one or more collaborators.');
+                            }
 
                             $grantedList[] = $collaborator->user;
                             $awardQuantity[] = $data['value']['collaborator'][$collaborator->user->id];
@@ -646,10 +614,12 @@ public function postValueSubmission($id, $data, $user)
                     }
                 }
 
-                if(isset($data['value']['participant'])) {
-                    foreach($submission->participants as $participant) {
-                        if($data['value']['participant'][$participant->user->id] > 0) {
-                            if(!$currencyManager->creditCurrency($user, $participant->user, $awardType, $awardData, $currency, $data['value']['participant'][$participant->user->id])) throw new \Exception("Failed to award currency to one or more participants.");
+                if (isset($data['value']['participant'])) {
+                    foreach ($submission->participants as $participant) {
+                        if ($data['value']['participant'][$participant->user->id] > 0) {
+                            if (!$currencyManager->creditCurrency($user, $participant->user, $awardType, $awardData, $currency, $data['value']['participant'][$participant->user->id])) {
+                                throw new \Exception('Failed to award currency to one or more participants.');
+                            }
 
                             $grantedList[] = $participant->user;
                             $awardQuantity[] = $data['value']['participant'][$participant->user->id];
@@ -658,97 +628,295 @@ public function postValueSubmission($id, $data, $user)
                 }
 
                 // Collect and json encode existing as well as new data for storage
-                if(isset($submission->data['total'])) $valueData = collect([
-                    'currencyData' => $submission->data['currencyData'],
-                    'total' => $submission->data['total'],
-                    'value' => $data['value'],
-                    'staff' => $user->id,
-                ])->toJson();
-                else $valueData = collect(['value' => $data['value'], 'staff' => $user->id])->toJson();
+                if (isset($submission->data['total'])) {
+                    $valueData = collect([
+                        'currencyData' => $submission->data['currencyData'],
+                        'total'        => $submission->data['total'],
+                        'value'        => $data['value'],
+                        'staff'        => $user->id,
+                    ])->toJson();
+                } else {
+                    $valueData = collect(['value' => $data['value'], 'staff' => $user->id])->toJson();
+                }
 
                 // Update the submission with the new data and mark it as processed
                 $submission->update([
-                    'data' => $valueData,
+                    'data'      => $valueData,
                     'is_valued' => 1,
                 ]);
 
+                if (!$this->logAdminAction($user, 'Awarded Gallery Submission', 'Awarded gallery submission '.$submission->displayName)) {
+                    throw new \Exception('Failed to log admin action.');
+                }
+
                 // Send a notification to each user that received a currency award
-                foreach($grantedList as $key=>$grantedUser) {
+                foreach ($grantedList as $key=> $grantedUser) {
                     Notifications::create('GALLERY_SUBMISSION_VALUED', $grantedUser, [
                         'currency_quantity' => $awardQuantity[$key],
-                        'currency_name' => $currency->name,
-                        'submission_title' => $submission->title,
-                        'submission_id' => $submission->id,
+                        'currency_name'     => $currency->name,
+                        'submission_title'  => $submission->title,
+                        'submission_id'     => $submission->id,
                     ]);
                 }
-            }
-            else {
+            } else {
                 // Collect and json encode existing as well as new data for storage
-                if(isset($submission->data['total'])) $valueData = collect([
-                    'currencyData' => $submission->data['currencyData'],
-                    'total' => $submission->data['total'],
-                    'ineligible' => 1,
-                    'staff' => $user->id,
-                ])->toJson();
-                else $valueData = collect(['ineligible' => 1, 'staff' => $user->id])->toJson();
+                if (isset($submission->data['total'])) {
+                    $valueData = collect([
+                        'currencyData' => $submission->data['currencyData'],
+                        'total'        => $submission->data['total'],
+                        'ineligible'   => 1,
+                        'staff'        => $user->id,
+                    ])->toJson();
+                } else {
+                    $valueData = collect(['ineligible' => 1, 'staff' => $user->id])->toJson();
+                }
 
                 // Update the submission, including marking it as processed
                 $submission->update([
-                    'data' => $valueData,
+                    'data'      => $valueData,
                     'is_valued' => 1,
                 ]);
-
             }
 
             return $this->commitReturn(true);
-        } catch(\Exception $e) {
+        } catch (\Exception $e) {
             $this->setError('error', $e->getMessage());
         }
+
         return $this->rollbackReturn(false);
     }
 
     /**
      * Toggles favorite status on a submission for a user.
      *
-     * @param  \App\Models\Gallery\GallerySubmission  $submission
-     * @param  \App\Models\User\User                  $user
-     * @return bool|\App\Models\Gallery\GalleryFavorite
+     * @param \App\Models\Gallery\GallerySubmission $submission
+     * @param \App\Models\User\User                 $user
+     *
+     * @return \App\Models\Gallery\GalleryFavorite|bool
      */
-    public function favoriteSubmission($submission, $user)
-    {
+    public function favoriteSubmission($submission, $user) {
         DB::beginTransaction();
 
         try {
             // Check that the submission can be favorited
-            if(!$submission->isVisible) throw new \Exception("This submission isn't visible to be favorited.");
-            if($submission->user->id == $user->id || $submission->collaborators->where('user_id', $user->id)->first() != null) throw new \Exception("You can't favorite your own submission!");
+            if (!$submission->isVisible) {
+                throw new \Exception("This submission isn't visible to be favorited.");
+            }
+            if ($submission->user->id == $user->id || $submission->collaborators->where('user_id', $user->id)->first() != null) {
+                throw new \Exception("You can't favorite your own submission!");
+            }
 
             // Check if the user has an existing favorite, and if so, delete it
             // or else create one.
-            if($submission->favorites->where('user_id', $user->id)->first() != null) {
+            if ($submission->favorites->where('user_id', $user->id)->first() != null) {
                 $submission->favorites()->where('user_id', $user->id)->delete();
-            }
-            else {
+            } else {
                 GalleryFavorite::create([
-                    'user_id' => $user->id,
+                    'user_id'               => $user->id,
                     'gallery_submission_id' => $submission->id,
                 ]);
 
-                if($submission->user->id != $user->id) {
+                if ($submission->user->id != $user->id) {
                     Notifications::create('GALLERY_SUBMISSION_FAVORITE', $submission->user, [
-                        'sender_url' => $user->url,
-                        'sender' => $user->name,
+                        'sender_url'       => $user->url,
+                        'sender'           => $user->name,
                         'submission_title' => $submission->title,
-                        'submission_id' => $submission->id,
+                        'submission_id'    => $submission->id,
                     ]);
                 }
             }
 
             return $this->commitReturn(true);
-        } catch(\Exception $e) {
+        } catch (\Exception $e) {
+            $this->setError('error', $e->getMessage());
+        }
+
+        return $this->rollbackReturn(false);
+    }
+
+    /**
+     * Processes rejection for a submission.
+     *
+     * @param \App\Models\Gallery\GallerySubmission $submission
+     * @param mixed                                 $user
+     *
+     * @return \App\Models\Gallery\GallerySubmission|bool
+     */
+    public function rejectSubmission($submission, $user) {
+        DB::beginTransaction();
+
+        try {
+            // Check that the submission exists and is pending
+            if (!$submission) {
+                throw new \Exception('Invalid submission selected.');
+            }
+            if ($submission->status != 'Pending') {
+                throw new \Exception("This submission isn't pending.");
+            }
+
+            if (!$this->logAdminAction($user, 'Rejected Gallery Submission', 'Rejected gallery submission '.$submission->displayName)) {
+                throw new \Exception('Failed to log admin action.');
+            }
+
+            $submission->update(['status' => 'Rejected']);
+
+            Notifications::create('GALLERY_SUBMISSION_REJECTED', $submission->user, [
+                'submission_title' => $submission->title,
+                'submission_id'    => $submission->id,
+            ]);
+
+            return $this->commitReturn(true);
+        } catch (\Exception $e) {
             $this->setError('error', $e->getMessage());
         }
+
         return $this->rollbackReturn(false);
     }
 
+    /**
+     * Processes user input for creating/updating a gallery submission.
+     *
+     * @param array $data
+     *
+     * @return array
+     */
+    private function populateData($data) {
+        // Parse any text
+        if (isset($data['text']) && $data['text']) {
+            $data['parsed_text'] = parse($data['text']);
+        }
+        if (isset($data['description']) && $data['description']) {
+            $data['parsed_description'] = parse($data['description']);
+        }
+
+        return $data;
+    }
+
+    /**
+     * Processes gallery submission images.
+     *
+     * @param array                                 $data
+     * @param \App\Models\Gallery\GallerySubmission $submission
+     *
+     * @return array
+     */
+    private function processImage($data, $submission) {
+        if (isset($submission->hash)) {
+            unlink($submission->imagePath.'/'.$submission->imageFileName);
+            unlink($submission->imagePath.'/'.$submission->thumbnailFileName);
+        }
+        $submission->hash = randomString(10);
+        $submission->extension = config('lorekeeper.settings.gallery_images_format') ?? $data['image']->getClientOriginalExtension();
+
+        // Save image itself
+        $this->handleImage($data['image'], $submission->imagePath, $submission->imageFileName);
+
+        $imageProperties = getimagesize($submission->imagePath.'/'.$submission->imageFileName);
+        if ($imageProperties[0] > 2000 || $imageProperties[1] > 2000) {
+            // For large images (in terms of dimensions),
+            // use imagick instead, as it's better at handling them
+            Config::set('image.driver', 'imagick');
+        }
+
+        if (config('lorekeeper.settings.gallery_images_cap') || config('lorekeeper.settings.gallery_images_format')) {
+            $image = Image::make($submission->imagePath.'/'.$submission->imageFileName);
+
+            // Scale the image if desired/necessary
+            if (config('lorekeeper.settings.gallery_images_cap') && ($imageProperties[0] > config('lorekeeper.settings.gallery_images_cap') || $imageProperties[1] > config('lorekeeper.settings.gallery_images_cap'))) {
+                if ($image->width() > $image->height()) {
+                    // Landscape
+                    $image->resize(config('lorekeeper.settings.gallery_images_cap'), null, function ($constraint) {
+                        $constraint->aspectRatio();
+                        $constraint->upsize();
+                    });
+                } else {
+                    // Portrait
+                    $image->resize(null, config('lorekeeper.settings.gallery_images_cap'), function ($constraint) {
+                        $constraint->aspectRatio();
+                        $constraint->upsize();
+                    });
+                }
+            }
+
+            // Save the processed image
+            $image->save($submission->imagePath.'/'.$submission->imageFileName, 100, config('lorekeeper.settings.gallery_images_format'));
+        }
+
+        // Process thumbnail
+        Image::make($submission->imagePath.'/'.$submission->imageFileName)
+            ->resize(null, config('lorekeeper.settings.masterlist_thumbnails.height'), function ($constraint) {
+                $constraint->aspectRatio();
+                $constraint->upsize();
+            })
+            ->save($submission->thumbnailPath.'/'.$submission->thumbnailFileName);
+
+        return $submission;
+    }
+
+    /**
+     * Processes acceptance for a submission.
+     *
+     * @param \App\Models\Gallery\GallerySubmission $submission
+     *
+     * @return \App\Models\Gallery\GallerySubmission|bool
+     */
+    private function acceptSubmission($submission) {
+        DB::beginTransaction();
+
+        try {
+            // Check that the submission exists and is pending
+            if (!$submission) {
+                throw new \Exception('Invalid submission selected.');
+            }
+            if ($submission->status != 'Pending') {
+                throw new \Exception("This submission isn't pending.");
+            }
+
+            $submission->update(['status' => 'Accepted']);
+
+            // If the submission wouldn't have been automatically approved, send a notification
+            if (Settings::get('gallery_submissions_require_approval') || (!Settings::get('gallery_submissions_require_approval') && $submission->collaborators->count())) {
+                Notifications::create('GALLERY_SUBMISSION_ACCEPTED', $submission->user, [
+                    'submission_title' => $submission->title,
+                    'submission_id'    => $submission->id,
+                ]);
+            }
+
+            if ($submission->characters->count()) {
+                // Send a notification to included characters' owners now that the submission is accepted
+                // but not for the submitting user's own characters
+                foreach ($submission->characters as $character) {
+                    if ($character->user && $character->character->user->id != $submission->user->id) {
+                        Notifications::create('GALLERY_SUBMISSION_CHARACTER', $character->character->user, [
+                            'sender'        => $submission->user->name,
+                            'sender_url'    => $submission->user->url,
+                            'character_url' => $character->character->url,
+                            'character'     => isset($character->character->name) ? $character->character->fullName : $character->character->slug,
+                            'submission_id' => $submission->id,
+                        ]);
+                    }
+                }
+            }
+
+            if ($submission->participants->count()) {
+                // Send a notification to participants now that the submission is accepted
+                // but not for the submitting user
+                foreach ($submission->participants as $participant) {
+                    if ($participant->user->id != $submission->user->id) {
+                        Notifications::create('GALLERY_SUBMISSION_PARTICIPANT', $participant->user, [
+                            'sender_url'    => $submission->user->url,
+                            'sender'        => $submission->user->name,
+                            'submission_id' => $submission->id,
+                        ]);
+                    }
+                }
+            }
+
+            return $this->commitReturn(true);
+        } catch (\Exception $e) {
+            $this->setError('error', $e->getMessage());
+        }
+
+        return $this->rollbackReturn(false);
+    }
 }
diff --git a/app/Services/GalleryService.php b/app/Services/GalleryService.php
index 026195be46..2685d8cb14 100644
--- a/app/Services/GalleryService.php
+++ b/app/Services/GalleryService.php
@@ -1,15 +1,12 @@
-<?php namespace App\Services;
+<?php
 
-use App\Services\Service;
-
-use DB;
-use Config;
+namespace App\Services;
 
 use App\Models\Gallery\Gallery;
 use App\Models\Gallery\GallerySubmission;
+use Illuminate\Support\Facades\DB;
 
-class GalleryService extends Service
-{
+class GalleryService extends Service {
     /*
     |--------------------------------------------------------------------------
     | Gallery Service
@@ -22,82 +19,120 @@ class GalleryService extends Service
     /**
      * Creates a new gallery.
      *
-     * @param  array                  $data
-     * @param  \App\Models\User\User  $user
-     * @return bool|\App\Models\Gallery
+     * @param array                 $data
+     * @param \App\Models\User\User $user
+     *
+     * @return \App\Models\Gallery|bool
      */
-    public function createGallery($data, $user)
-    {
+    public function createGallery($data, $user) {
         DB::beginTransaction();
 
         try {
-            if(!isset($data['submissions_open'])) $data['submissions_open'] = 0;
-            if(!isset($data['currency_enabled'])) $data['currency_enabled'] = 0;
-            if(!isset($data['votes_required'])) $data['votes_required'] = 0;
-            if(!isset($data['hide_before_start'])) $data['hide_before_start'] = 0;
-            if(!isset($data['prompt_selection'])) $data['prompt_selection'] = 0;
+            if (!isset($data['submissions_open'])) {
+                $data['submissions_open'] = 0;
+            }
+            if (!isset($data['currency_enabled'])) {
+                $data['currency_enabled'] = 0;
+            }
+            if (!isset($data['votes_required'])) {
+                $data['votes_required'] = 0;
+            }
+            if (!isset($data['hide_before_start'])) {
+                $data['hide_before_start'] = 0;
+            }
+            if (!isset($data['prompt_selection'])) {
+                $data['prompt_selection'] = 0;
+            }
 
             $gallery = Gallery::create($data);
 
+            if (!$this->logAdminAction($user, 'Created Gallery', 'Created '.$gallery->displayName)) {
+                throw new \Exception('Failed to log admin action.');
+            }
+
             return $this->commitReturn($gallery);
-        } catch(\Exception $e) {
+        } catch (\Exception $e) {
             $this->setError('error', $e->getMessage());
         }
+
         return $this->rollbackReturn(false);
     }
 
     /**
      * Updates a gallery.
      *
-     * @param  \App\Models\Gallery    $gallery
-     * @param  array                  $data
-     * @param  \App\Models\User\User  $user
-     * @return bool|\App\Models\Gallery
+     * @param \App\Models\Gallery   $gallery
+     * @param array                 $data
+     * @param \App\Models\User\User $user
+     *
+     * @return \App\Models\Gallery|bool
      */
-    public function updateGallery($gallery, $data, $user)
-    {
+    public function updateGallery($gallery, $data, $user) {
         DB::beginTransaction();
 
         try {
             // More specific validation
-            if(Gallery::where('name', $data['name'])->where('id', '!=', $gallery->id)->exists()) throw new \Exception("The name has already been taken.");
-
-            if(!isset($data['submissions_open'])) $data['submissions_open'] = 0;
-            if(!isset($data['currency_enabled'])) $data['currency_enabled'] = 0;
-            if(!isset($data['votes_required'])) $data['votes_required'] = 0;
-            if(!isset($data['hide_before_start'])) $data['hide_before_start'] = 0;
-            if(!isset($data['prompt_selection'])) $data['prompt_selection'] = 0;
+            if (Gallery::where('name', $data['name'])->where('id', '!=', $gallery->id)->exists()) {
+                throw new \Exception('The name has already been taken.');
+            }
+
+            if (!isset($data['submissions_open'])) {
+                $data['submissions_open'] = 0;
+            }
+            if (!isset($data['currency_enabled'])) {
+                $data['currency_enabled'] = 0;
+            }
+            if (!isset($data['votes_required'])) {
+                $data['votes_required'] = 0;
+            }
+            if (!isset($data['hide_before_start'])) {
+                $data['hide_before_start'] = 0;
+            }
+            if (!isset($data['prompt_selection'])) {
+                $data['prompt_selection'] = 0;
+            }
+
+            if (!$this->logAdminAction($user, 'Updated Gallery', 'Updated '.$gallery->displayName)) {
+                throw new \Exception('Failed to log admin action.');
+            }
 
             $gallery->update($data);
 
             return $this->commitReturn($gallery);
-        } catch(\Exception $e) {
+        } catch (\Exception $e) {
             $this->setError('error', $e->getMessage());
         }
+
         return $this->rollbackReturn(false);
     }
 
     /**
      * Deletes a gallery.
      *
-     * @param  \App\Models\Gallery  $gallery
+     * @param \App\Models\Gallery $gallery
+     * @param mixed               $user
+     *
      * @return bool
      */
-    public function deleteGallery($gallery)
-    {
+    public function deleteGallery($gallery, $user) {
         DB::beginTransaction();
 
         try {
             // Check first if submissions exist in this gallery, or the gallery has children
-            if(GallerySubmission::where('gallery_id', $gallery->id)->exists() || Gallery::where('parent_id', $gallery->id)->exists()) throw new \Exception("A gallery or submissions in this gallery exist. Consider setting the gallery's submissions to closed instead.");
+            if (GallerySubmission::where('gallery_id', $gallery->id)->exists() || Gallery::where('parent_id', $gallery->id)->exists()) {
+                throw new \Exception("A gallery or submissions in this gallery exist. Consider setting the gallery's submissions to closed instead.");
+            }
+            if (!$this->logAdminAction($user, 'Deleted Gallery', 'Deleted '.$gallery->name)) {
+                throw new \Exception('Failed to log admin action.');
+            }
 
             $gallery->delete();
 
             return $this->commitReturn(true);
-        } catch(\Exception $e) {
+        } catch (\Exception $e) {
             $this->setError('error', $e->getMessage());
         }
+
         return $this->rollbackReturn(false);
     }
-
 }
diff --git a/app/Services/InventoryManager.php b/app/Services/InventoryManager.php
index 422b3cb076..652b2bdc8f 100644
--- a/app/Services/InventoryManager.php
+++ b/app/Services/InventoryManager.php
@@ -1,23 +1,17 @@
-<?php namespace App\Services;
+<?php
 
-use Carbon\Carbon;
-use App\Services\Service;
-
-use DB;
-use Auth;
-use Config;
-use Notifications;
+namespace App\Services;
 
-use Illuminate\Support\Arr;
-use App\Models\User\User;
+use App\Facades\Notifications;
+use App\Models\Character\CharacterItem;
 use App\Models\Item\Item;
-use App\Models\Item\ItemCategory;
+use App\Models\User\User;
 use App\Models\User\UserItem;
-use App\Models\Character\CharacterItem;
-use App\Models\Currency\Currency;
+use Carbon\Carbon;
+use Illuminate\Support\Arr;
+use Illuminate\Support\Facades\DB;
 
-class InventoryManager extends Service
-{
+class InventoryManager extends Service {
     /*
     |--------------------------------------------------------------------------
     | Inventory Manager
@@ -30,511 +24,710 @@ class InventoryManager extends Service
     /**
      * Grants an item to multiple users.
      *
-     * @param  array                 $data
-     * @param  \App\Models\User\User $staff
+     * @param array                 $data
+     * @param \App\Models\User\User $staff
+     *
      * @return bool
      */
-    public function grantItems($data, $staff)
-    {
+    public function grantItems($data, $staff) {
         DB::beginTransaction();
 
         try {
-            foreach($data['quantities'] as $q) {
-                if($q <= 0) throw new \Exception("All quantities must be at least 1.");
+            foreach ($data['quantities'] as $q) {
+                if ($q <= 0) {
+                    throw new \Exception('All quantities must be at least 1.');
+                }
             }
 
             // Process names
             $users = User::find($data['names']);
-            if(count($users) != count($data['names'])) throw new \Exception("An invalid user was selected.");
+            if (count($users) != count($data['names'])) {
+                throw new \Exception('An invalid user was selected.');
+            }
 
             $keyed_quantities = [];
-            array_walk($data['item_ids'], function($id, $key) use(&$keyed_quantities, $data) {
-                if($id != null && !in_array($id, array_keys($keyed_quantities), TRUE)) {
+            array_walk($data['item_ids'], function ($id, $key) use (&$keyed_quantities, $data) {
+                if ($id != null && !in_array($id, array_keys($keyed_quantities), true)) {
                     $keyed_quantities[$id] = $data['quantities'][$key];
                 }
             });
 
             // Process item
             $items = Item::find($data['item_ids']);
-            if(!count($items)) throw new \Exception("No valid items found.");
+            if (!count($items)) {
+                throw new \Exception('No valid items found.');
+            }
 
-            foreach($users as $user) {
-                foreach($items as $item) {
-                    if($this->creditItem($staff, $user, 'Staff Grant', Arr::only($data, ['data', 'disallow_transfer', 'notes']), $item, $keyed_quantities[$item->id]))
-                    {
+            foreach ($users as $user) {
+                foreach ($items as $item) {
+                    if (!$this->logAdminAction($staff, 'Item Grant', 'Granted '.$keyed_quantities[$item->id].' '.$item->displayName.' to '.$user->displayname)) {
+                        throw new \Exception('Failed to log admin action.');
+                    }
+                    if ($this->creditItem($staff, $user, 'Staff Grant', Arr::only($data, ['data', 'disallow_transfer', 'notes']), $item, $keyed_quantities[$item->id])) {
                         Notifications::create('ITEM_GRANT', $user, [
-                            'item_name' => $item->name,
+                            'item_name'     => $item->name,
                             'item_quantity' => $keyed_quantities[$item->id],
-                            'sender_url' => $staff->url,
-                            'sender_name' => $staff->name
+                            'sender_url'    => $staff->url,
+                            'sender_name'   => $staff->name,
                         ]);
-                    }
-                    else
-                    {
-                        throw new \Exception("Failed to credit items to ".$user->name.".");
+                    } else {
+                        throw new \Exception('Failed to credit items to '.$user->name.'.');
                     }
                 }
             }
+
             return $this->commitReturn(true);
-        } catch(\Exception $e) { 
+        } catch (\Exception $e) {
             $this->setError('error', $e->getMessage());
         }
+
         return $this->rollbackReturn(false);
     }
 
     /**
      * Grants an item to a character.
      *
-     * @param  array                            $data
-     * @param  \App\Models\Character\Character  $character
-     * @param  \App\Models\User\User            $staff
+     * @param array                           $data
+     * @param \App\Models\Character\Character $character
+     * @param \App\Models\User\User           $staff
+     *
      * @return bool
      */
-    public function grantCharacterItems($data, $character, $staff)
-    {
+    public function grantCharacterItems($data, $character, $staff) {
         DB::beginTransaction();
 
         try {
-            if(!$character) throw new \Exception("Invalid character selected.");
+            if (!$character) {
+                throw new \Exception('Invalid character selected.');
+            }
 
-            foreach($data['quantities'] as $q) {
-                if($q <= 0) throw new \Exception("All quantities must be at least 1.");
+            foreach ($data['quantities'] as $q) {
+                if ($q <= 0) {
+                    throw new \Exception('All quantities must be at least 1.');
+                }
             }
 
             $keyed_quantities = [];
-            array_walk($data['item_ids'], function($id, $key) use(&$keyed_quantities, $data) {
-                if($id != null && !in_array($id, array_keys($keyed_quantities), TRUE)) {
+            array_walk($data['item_ids'], function ($id, $key) use (&$keyed_quantities, $data) {
+                if ($id != null && !in_array($id, array_keys($keyed_quantities), true)) {
                     $keyed_quantities[$id] = $data['quantities'][$key];
                 }
             });
 
             // Process item(s)
             $items = Item::find($data['item_ids']);
-            foreach($items as $i) {
-                if(!$i->category->is_character_owned) throw new \Exception("One of these items cannot be owned by characters.");
+            foreach ($items as $i) {
+                if (!$i->category->is_character_owned) {
+                    throw new \Exception('One of these items cannot be owned by characters.');
+                }
+            }
+            if (!count($items)) {
+                throw new \Exception('No valid items found.');
             }
-            if(!count($items)) throw new \Exception("No valid items found.");
-            
-            foreach($items as $item) {
+
+            foreach ($items as $item) {
+                if (!$this->logAdminAction($staff, 'Item Grant', 'Granted '.$keyed_quantities[$item->id].' '.$item->displayName.' to '.$character->displayname)) {
+                    throw new \Exception('Failed to log admin action.');
+                }
                 $this->creditItem($staff, $character, 'Staff Grant', Arr::only($data, ['data', 'disallow_transfer', 'notes']), $item, $keyed_quantities[$item->id]);
-                if($character->is_visible && $character->user_id) {
+                if ($character->is_visible && $character->user_id) {
                     Notifications::create('CHARACTER_ITEM_GRANT', $character->user, [
-                        'item_name' => $item->name,
-                        'item_quantity' => $keyed_quantities[$item->id],
-                        'sender_url' => $staff->url,
-                        'sender_name' => $staff->name,
+                        'item_name'      => $item->name,
+                        'item_quantity'  => $keyed_quantities[$item->id],
+                        'sender_url'     => $staff->url,
+                        'sender_name'    => $staff->name,
                         'character_name' => $character->fullName,
                         'character_slug' => $character->slug,
                     ]);
                 }
             }
-            
+
             return $this->commitReturn(true);
-        } catch(\Exception $e) { 
+        } catch (\Exception $e) {
             $this->setError('error', $e->getMessage());
         }
+
         return $this->rollbackReturn(false);
     }
 
     /**
      * Transfers items between a user and character.
      *
-     * @param  \App\Models\User\User|\App\Models\Character\Character          $sender
-     * @param  \App\Models\User\User|\App\Models\Character\Character          $recipient
-     * @param  \App\Models\User\UserItem|\App\Models\Character\CharacterItem  $stacks
-     * @param  int                                                            $quantities
+     * @param \App\Models\Character\Character|\App\Models\User\User         $sender
+     * @param \App\Models\Character\Character|\App\Models\User\User         $recipient
+     * @param \App\Models\Character\CharacterItem|\App\Models\User\UserItem $stacks
+     * @param int                                                           $quantities
+     * @param mixed                                                         $user
+     *
      * @return bool
      */
-    public function transferCharacterStack($sender, $recipient, $stacks, $quantities)
-    {
+    public function transferCharacterStack($sender, $recipient, $stacks, $quantities, $user) {
         DB::beginTransaction();
 
         try {
-            foreach($stacks as $key=>$stack) {
+            foreach ($stacks as $key=> $stack) {
                 $quantity = $quantities[$key];
 
-                if(!$stack) throw new \Exception("Invalid or no stack selected.");
-                if(!$recipient) throw new \Exception("Invalid recipient selected.");
-                if(!$sender) throw new \Exception("Invalid sender selected.");
-
-                if($recipient->logType == 'Character' && $sender->logType == 'Character') throw new \Exception("Cannot transfer items between characters.");
-                if($recipient->logType == 'Character' && !$sender->hasPower('edit_inventories') && !$recipient->is_visible) throw new \Exception("Invalid character selected.");
-                if(!$stacks) throw new \Exception("Invalid stack selected.");
-                if($sender->logType == 'Character' && $quantity <= 0 && $stack->count > 0) $quantity = $stack->count;
-                if($quantity <= 0) throw new \Exception("Invalid quantity entered.");
-                
-                if(($recipient->logType == 'Character' && !$sender->hasPower('edit_inventories') && !Auth::user() == $recipient->user) || ($recipient->logType == 'User' && !Auth::user()->hasPower('edit_inventories') && !Auth::user() == $sender->user)) throw new \Exception("Cannot transfer items to/from a character you don't own.");
-                
-                if($recipient->logType == 'Character' && !$stack->item->category->is_character_owned) throw new \Exception("One of the selected items cannot be owned by characters.");
-                if((!$stack->item->allow_transfer || isset($stack->data['disallow_transfer'])) && !Auth::user()->hasPower('edit_inventories')) throw new \Exception("One of the selected items cannot be transferred.");
-                if($stack->count < $quantity) throw new \Exception("Quantity to transfer exceeds item count.");
+                if (!$stack) {
+                    throw new \Exception('Invalid or no stack selected.');
+                }
+                if (!$recipient) {
+                    throw new \Exception('Invalid recipient selected.');
+                }
+                if (!$sender) {
+                    throw new \Exception('Invalid sender selected.');
+                }
+
+                if ($recipient->logType == 'Character' && $sender->logType == 'Character') {
+                    throw new \Exception('Cannot transfer items between characters.');
+                }
+                if ($recipient->logType == 'Character' && !$sender->hasPower('edit_inventories') && !$recipient->is_visible) {
+                    throw new \Exception('Invalid character selected.');
+                }
+                if (!$stacks) {
+                    throw new \Exception('Invalid stack selected.');
+                }
+                if ($sender->logType == 'Character' && $quantity <= 0 && $stack->count > 0) {
+                    $quantity = $stack->count;
+                }
+                if ($quantity <= 0) {
+                    throw new \Exception('Invalid quantity entered.');
+                }
+
+                if (($recipient->logType == 'Character' && !$sender->hasPower('edit_inventories') && !$user == $recipient->user) || ($recipient->logType == 'User' && !$user->hasPower('edit_inventories') && !$user == $sender->user)) {
+                    throw new \Exception("Cannot transfer items to/from a character you don't own.");
+                }
+
+                if ($recipient->logType == 'Character' && !$stack->item->category->is_character_owned) {
+                    throw new \Exception('One of the selected items cannot be owned by characters.');
+                }
+                if ((!$stack->item->allow_transfer || isset($stack->data['disallow_transfer'])) && !$user->hasPower('edit_inventories')) {
+                    throw new \Exception('One of the selected items cannot be transferred.');
+                }
+                if ($stack->count < $quantity) {
+                    throw new \Exception('Quantity to transfer exceeds item count.');
+                }
 
                 //Check that hold count isn't being exceeded
-                if($stack->item->category->character_limit > 0) $limit = $stack->item->category->character_limit;
-                if($recipient->logType == 'Character' && isset($limit)) {
+                if ($stack->item->category->character_limit > 0) {
+                    $limit = $stack->item->category->character_limit;
+                }
+                if ($recipient->logType == 'Character' && isset($limit)) {
                     $limitedItems = Item::where('item_category_id', $stack->item->category->id);
                     $ownedLimitedItems = CharacterItem::with('item')->whereIn('item_id', $limitedItems->pluck('id'))->whereNull('deleted_at')->where('count', '>', '0')->where('character_id', $recipient->id)->get();
                     $newOwnedLimit = $ownedLimitedItems->pluck('count')->sum() + $quantity;
                 }
 
-                if($recipient->logType == 'Character' && isset($limit) && ($ownedLimitedItems->pluck('count')->sum() >= $limit || $newOwnedLimit > $limit)) throw new \Exception("One of the selected items exceeds the limit characters can own for its category.");
+                if ($recipient->logType == 'Character' && isset($limit) && ($ownedLimitedItems->pluck('count')->sum() >= $limit || $newOwnedLimit > $limit)) {
+                    throw new \Exception('One of the selected items exceeds the limit characters can own for its category.');
+                }
 
                 $this->creditItem($sender, $recipient, $sender->logType == 'User' ? 'User → Character Transfer' : 'Character → User Transfer', $stack->data, $stack->item, $quantity);
 
                 $stack->count -= $quantity;
                 $stack->save();
             }
+
             return $this->commitReturn(true);
-        } catch(\Exception $e) { 
+        } catch (\Exception $e) {
             $this->setError('error', $e->getMessage());
         }
+
         return $this->rollbackReturn(false);
     }
 
     /**
      * Transfers items between user stacks.
      *
-     * @param  \App\Models\User\User      $sender
-     * @param  \App\Models\User\User      $recipient
-     * @param  \App\Models\User\UserItem  $stacks
-     * @param  int                        $quantities
+     * @param \App\Models\User\User     $sender
+     * @param \App\Models\User\User     $recipient
+     * @param \App\Models\User\UserItem $stacks
+     * @param int                       $quantities
+     *
      * @return bool
      */
-    public function transferStack($sender, $recipient, $stacks, $quantities)
-    {
+    public function transferStack($sender, $recipient, $stacks, $quantities) {
         DB::beginTransaction();
 
         try {
-            foreach($stacks as $key=>$stack) {
+            foreach ($stacks as $key=> $stack) {
                 $quantity = $quantities[$key];
-                if(!$sender->hasAlias) throw new \Exception("You need to have a linked social media account before you can perform this action.");
-                if(!$stack) throw new \Exception("An invalid item was selected.");
-                if($stack->user_id != $sender->id && !$sender->hasPower('edit_inventories')) throw new \Exception("You do not own one of the selected items.");
-                if($stack->user_id == $recipient->id) throw new \Exception("Cannot send items to the item's owner.");
-                if(!$recipient) throw new \Exception("Invalid recipient selected.");
-                if(!$recipient->hasAlias) throw new \Exception("Cannot transfer items to a non-verified member.");
-                if($recipient->is_banned) throw new \Exception("Cannot transfer items to a banned member.");
-                if((!$stack->item->allow_transfer || isset($stack->data['disallow_transfer'])) && !$sender->hasPower('edit_inventories')) throw new \Exception("One of the selected items cannot be transferred.");
-                if($stack->count < $quantity) throw new \Exception("Quantity to transfer exceeds item count.");
+                if (!$sender->hasAlias) {
+                    throw new \Exception('You need to have a linked social media account before you can perform this action.');
+                }
+                if (!$stack) {
+                    throw new \Exception('An invalid item was selected.');
+                }
+                if ($stack->user_id != $sender->id && !$sender->hasPower('edit_inventories')) {
+                    throw new \Exception('You do not own one of the selected items.');
+                }
+                if ($stack->user_id == $recipient->id) {
+                    throw new \Exception("Cannot send items to the item's owner.");
+                }
+                if (!$recipient) {
+                    throw new \Exception('Invalid recipient selected.');
+                }
+                if (!$recipient->hasAlias) {
+                    throw new \Exception('Cannot transfer items to a non-verified member.');
+                }
+                if ($recipient->is_banned) {
+                    throw new \Exception('Cannot transfer items to a banned member.');
+                }
+                if ((!$stack->item->allow_transfer || isset($stack->data['disallow_transfer'])) && !$sender->hasPower('edit_inventories')) {
+                    throw new \Exception('One of the selected items cannot be transferred.');
+                }
+                if ($stack->count < $quantity) {
+                    throw new \Exception('Quantity to transfer exceeds item count.');
+                }
 
                 $oldUser = $stack->user;
-                if($this->moveStack($stack->user, $recipient, ($stack->user_id == $sender->id ? 'User Transfer' : 'Staff Transfer'), ['data' => ($stack->user_id != $sender->id ? 'Transferred by '.$sender->displayName : '')], $stack, $quantity)) 
-                {
+                if ($this->moveStack($stack->user, $recipient, ($stack->user_id == $sender->id ? 'User Transfer' : 'Staff Transfer'), ['data' => ($stack->user_id != $sender->id ? 'Transferred by '.$sender->displayName : '')], $stack, $quantity)) {
                     Notifications::create('ITEM_TRANSFER', $recipient, [
-                        'item_name' => $stack->item->name,
+                        'item_name'     => $stack->item->name,
                         'item_quantity' => $quantity,
-                        'sender_url' => $sender->url,
-                        'sender_name' => $sender->name
+                        'sender_url'    => $sender->url,
+                        'sender_name'   => $sender->name,
                     ]);
-                    if($stack->user_id != $sender->id) 
+                    if ($stack->user_id != $sender->id) {
                         Notifications::create('FORCED_ITEM_TRANSFER', $oldUser, [
-                            'item_name' => $stack->item->name,
+                            'item_name'     => $stack->item->name,
                             'item_quantity' => $quantity,
-                            'sender_url' => $sender->url,
-                            'sender_name' => $sender->name
+                            'sender_url'    => $sender->url,
+                            'sender_name'   => $sender->name,
                         ]);
+                    }
                 }
             }
+
             return $this->commitReturn(true);
-        } catch(\Exception $e) { 
+        } catch (\Exception $e) {
             $this->setError('error', $e->getMessage());
         }
+
         return $this->rollbackReturn(false);
     }
 
     /**
      * Deletes items from stack.
      *
-     * @param  \App\Models\User\User|\App\Models\Character\Character          $owner
-     * @param  \App\Models\User\UserItem|\App\Models\Character\CharacterItem  $stacks
-     * @param  int                                                            $quantities
+     * @param \App\Models\Character\Character|\App\Models\User\User         $owner
+     * @param \App\Models\Character\CharacterItem|\App\Models\User\UserItem $stacks
+     * @param int                                                           $quantities
+     * @param mixed                                                         $user
+     *
      * @return bool
      */
-    public function deleteStack($owner, $stacks, $quantities)
-    {
+    public function deleteStack($owner, $stacks, $quantities, $user) {
         DB::beginTransaction();
 
         try {
-            if($owner->logType == 'User') {
-                foreach($stacks as $key=>$stack) {
-                    $user = Auth::user();
+            if ($owner->logType == 'User') {
+                foreach ($stacks as $key=> $stack) {
                     $quantity = $quantities[$key];
-                    if(!$owner->hasAlias) throw new \Exception("You need to have a linked social media account before you can perform this action.");
-                    if(!$stack) throw new \Exception("An invalid item was selected.");
-                    if($stack->user_id != $owner->id && !$user->hasPower('edit_inventories')) throw new \Exception("You do not own one of the selected items.");
-                    if($stack->count < $quantity) throw new \Exception("Quantity to delete exceeds item count.");
-                    
+                    if (!$owner->hasAlias) {
+                        throw new \Exception('You need to have a linked social media account before you can perform this action.');
+                    }
+                    if (!$stack) {
+                        throw new \Exception('An invalid item was selected.');
+                    }
+                    if ($stack->user_id != $owner->id && !$user->hasPower('edit_inventories')) {
+                        throw new \Exception('You do not own one of the selected items.');
+                    }
+                    if ($stack->count < $quantity) {
+                        throw new \Exception('Quantity to delete exceeds item count.');
+                    }
+
                     $oldUser = $stack->user;
 
-                    if($this->debitStack($stack->user, ($stack->user_id == $user->id ? 'User Deleted' : 'Staff Deleted'), ['data' => ($stack->user_id != $user->id ? 'Deleted by '.$user->displayName : '')], $stack, $quantity)) 
-                    {
-                        if($stack->user_id != $user->id) 
+                    if ($this->debitStack($stack->user, ($stack->user_id == $user->id ? 'User Deleted' : 'Staff Deleted'), ['data' => ($stack->user_id != $user->id ? 'Deleted by '.$user->displayName : '')], $stack, $quantity)) {
+                        if ($stack->user_id != $user->id) {
                             Notifications::create('ITEM_REMOVAL', $oldUser, [
-                                'item_name' => $stack->item->name,
+                                'item_name'     => $stack->item->name,
                                 'item_quantity' => $quantity,
-                                'sender_url' => $user->url,
-                                'sender_name' => $user->name
+                                'sender_url'    => $user->url,
+                                'sender_name'   => $user->name,
                             ]);
+                        }
                     }
                 }
-            }
-            else {
-                foreach($stacks as $key=>$stack) {
+            } else {
+                foreach ($stacks as $key=> $stack) {
                     $quantity = $quantities[$key];
-                    $user = Auth::user();
-                    if(!$user->hasAlias) throw new \Exception("You need to have a linked social media account before you can perform this action.");
-                    if(!$stack) throw new \Exception("An invalid item was selected.");
-                    if($stack->character->user_id != $user->id && !$user->hasPower('edit_inventories')) throw new \Exception("You do not own one of the selected items.");
-                    if($stack->count < $quantity) throw new \Exception("Quantity to delete exceeds item count.");
-
-                    if($this->debitStack($stack->character, ($stack->character->user_id == $user->id ? 'User Deleted' : 'Staff Deleted'), ['data' => ($stack->character->user_id != $user->id ? 'Deleted by '.$user->displayName : '')], $stack, $quantity)) 
-                    {
-                        if($stack->character->user_id != $user->id && $stack->character->is_visible && $stack->character->user_id)
+                    if (!$user->hasAlias) {
+                        throw new \Exception('You need to have a linked social media account before you can perform this action.');
+                    }
+                    if (!$stack) {
+                        throw new \Exception('An invalid item was selected.');
+                    }
+                    if ($stack->character->user_id != $user->id && !$user->hasPower('edit_inventories')) {
+                        throw new \Exception('You do not own one of the selected items.');
+                    }
+                    if ($stack->count < $quantity) {
+                        throw new \Exception('Quantity to delete exceeds item count.');
+                    }
+
+                    if ($this->debitStack($stack->character, ($stack->character->user_id == $user->id ? 'User Deleted' : 'Staff Deleted'), ['data' => ($stack->character->user_id != $user->id ? 'Deleted by '.$user->displayName : '')], $stack, $quantity)) {
+                        if ($stack->character->user_id != $user->id && $stack->character->is_visible && $stack->character->user_id) {
                             Notifications::create('CHARACTER_ITEM_REMOVAL', $stack->character->user, [
-                                'item_name' => $stack->item->name,
-                                'item_quantity' => $quantity,
-                                'sender_url' => $user->url,
-                                'sender_name' => $user->name,
+                                'item_name'      => $stack->item->name,
+                                'item_quantity'  => $quantity,
+                                'sender_url'     => $user->url,
+                                'sender_name'    => $user->name,
                                 'character_name' => $stack->character->fullName,
-                                'character_slug' => $stack->character->slug
+                                'character_slug' => $stack->character->slug,
                             ]);
+                        }
                     }
                 }
             }
+
             return $this->commitReturn(true);
-        } catch(\Exception $e) { 
+        } catch (\Exception $e) {
             $this->setError('error', $e->getMessage());
         }
+
         return $this->rollbackReturn(false);
     }
 
     /**
      * Sells items from stack.
      *
-     * @param  \App\Models\User\User      $user
-     * @param  \App\Models\User\UserItem  $stacks
-     * @param  int                        $quantities
+     * @param \App\Models\User\User     $user
+     * @param \App\Models\User\UserItem $stacks
+     * @param int                       $quantities
+     *
      * @return bool
      */
-    public function resellStack($user, $stacks, $quantities)
-    {
+    public function resellStack($user, $stacks, $quantities) {
         DB::beginTransaction();
 
         try {
-            foreach($stacks as $key=>$stack) {
+            foreach ($stacks as $key=> $stack) {
                 $quantity = $quantities[$key];
-                if(!$user->hasAlias) throw new \Exception("You need to have a linked social media account before you can perform this action.");
-                if(!$stack) throw new \Exception("An invalid item was selected.");
-                if($stack->user_id != $user->id && !$user->hasPower('edit_inventories')) throw new \Exception("You do not own one of the selected items.");
-                if($stack->count < $quantity) throw new \Exception("Quantity to sell exceeds item count.");
-                if(!isset($stack->item->data['resell'])) throw new \Exception ("This item cannot be sold.");
-                if(!Config::get('lorekeeper.extensions.item_entry_expansion.resale_function')) throw new \Exception("This function is not currently enabled.");
-                
+                if (!$user->hasAlias) {
+                    throw new \Exception('You need to have a linked social media account before you can perform this action.');
+                }
+                if (!$stack) {
+                    throw new \Exception('An invalid item was selected.');
+                }
+                if ($stack->user_id != $user->id && !$user->hasPower('edit_inventories')) {
+                    throw new \Exception('You do not own one of the selected items.');
+                }
+                if ($stack->count < $quantity) {
+                    throw new \Exception('Quantity to sell exceeds item count.');
+                }
+                if (!isset($stack->item->data['resell'])) {
+                    throw new \Exception('This item cannot be sold.');
+                }
+                if (!config('lorekeeper.extensions.item_entry_expansion.resale_function')) {
+                    throw new \Exception('This function is not currently enabled.');
+                }
+
                 $oldUser = $stack->user;
 
                 $currencyManager = new CurrencyManager;
-                if(isset($stack->item->data['resell']) && $stack->item->data['resell'])
-                {
+                if (isset($stack->item->data['resell']) && $stack->item->data['resell']) {
                     $currency = $stack->item->resell->flip()->pop();
                     $currencyQuantity = $stack->item->resell->pop() * $quantity;
 
-                    if(!$currencyManager->creditCurrency(null, $oldUser, 'Sold Item', 'Sold '.$stack->item->displayName.' ×'.$quantity, $currency, $currencyQuantity)) 
-                            throw new \Exception("Failed to credit currency.");
+                    if (!$currencyManager->creditCurrency(null, $oldUser, 'Sold Item', 'Sold '.$stack->item->displayName.' ×'.$quantity, $currency, $currencyQuantity)) {
+                        throw new \Exception('Failed to credit currency.');
+                    }
                 }
 
-                if($this->debitStack($stack->user, ($stack->user_id == $user->id ? 'Sold by User' : 'Sold by Staff'), ['data' => ($stack->user_id != $user->id ? 'Sold by '.$user->displayName : '')], $stack, $quantity)) 
-                {
-                    if($stack->user_id != $user->id) 
+                if ($this->debitStack($stack->user, ($stack->user_id == $user->id ? 'Sold by User' : 'Sold by Staff'), ['data' => ($stack->user_id != $user->id ? 'Sold by '.$user->displayName : '')], $stack, $quantity)) {
+                    if ($stack->user_id != $user->id) {
                         Notifications::create('ITEM_REMOVAL', $oldUser, [
-                            'item_name' => $stack->item->name,
+                            'item_name'     => $stack->item->name,
                             'item_quantity' => $quantity,
-                            'sender_url' => $user->url,
-                            'sender_name' => $user->name
+                            'sender_url'    => $user->url,
+                            'sender_name'   => $user->name,
                         ]);
+                    }
                 }
             }
+
             return $this->commitReturn(true);
-        } catch(\Exception $e) { 
+        } catch (\Exception $e) {
             $this->setError('error', $e->getMessage());
         }
+
         return $this->rollbackReturn(false);
     }
 
     /**
      * Credits an item to a user or character.
      *
-     * @param  \App\Models\User\User|\App\Models\Character\Character  $sender
-     * @param  \App\Models\User\User|\App\Models\Character\Character  $recipient
-     * @param  string                                                 $type 
-     * @param  array                                                  $data
-     * @param  \App\Models\Item\Item                                  $item
-     * @param  int                                                    $quantity
+     * @param \App\Models\Character\Character|\App\Models\User\User $sender
+     * @param \App\Models\Character\Character|\App\Models\User\User $recipient
+     * @param string                                                $type
+     * @param array                                                 $data
+     * @param \App\Models\Item\Item                                 $item
+     * @param int                                                   $quantity
+     *
      * @return bool
      */
-    public function creditItem($sender, $recipient, $type, $data, $item, $quantity)
-    {
+    public function creditItem($sender, $recipient, $type, $data, $item, $quantity) {
         DB::beginTransaction();
 
         try {
             $encoded_data = \json_encode($data);
 
-            if($recipient->logType == 'User') {
+            if ($recipient->logType == 'User') {
                 $recipient_stack = UserItem::where([
                     ['user_id', '=', $recipient->id],
                     ['item_id', '=', $item->id],
-                    ['data', '=', $encoded_data]
+                    ['data', '=', $encoded_data],
                 ])->first();
-                
-                if(!$recipient_stack)
+
+                if (!$recipient_stack) {
                     $recipient_stack = UserItem::create(['user_id' => $recipient->id, 'item_id' => $item->id, 'data' => $encoded_data]);
+                }
                 $recipient_stack->count += $quantity;
                 $recipient_stack->save();
-            }
-            else {
+            } else {
                 $recipient_stack = CharacterItem::where([
                     ['character_id', '=', $recipient->id],
                     ['item_id', '=', $item->id],
-                    ['data', '=', $encoded_data]
+                    ['data', '=', $encoded_data],
                 ])->first();
-                
-                if(!$recipient_stack)
+
+                if (!$recipient_stack) {
                     $recipient_stack = CharacterItem::create(['character_id' => $recipient->id, 'item_id' => $item->id, 'data' => $encoded_data]);
+                }
                 $recipient_stack->count += $quantity;
                 $recipient_stack->save();
             }
-            if($type && !$this->createLog($sender ? $sender->id : null, $sender ? $sender->logType : null, $recipient ? $recipient->id : null, $recipient ? $recipient->logType : null, null, $type, $data['data'], $item->id, $quantity)) throw new \Exception("Failed to create log.");
+
+            if (!$item->is_released) {
+                $item->update([
+                    'is_released' => 1,
+                ]);
+            }
+
+            if ($type && !$this->createLog($sender ? $sender->id : null, $sender ? $sender->logType : null, $recipient ? $recipient->id : null, $recipient ? $recipient->logType : null, null, $type, $data['data'], $item->id, $quantity)) {
+                throw new \Exception('Failed to create log.');
+            }
 
             return $this->commitReturn(true);
-        } catch(\Exception $e) { 
+        } catch (\Exception $e) {
             $this->setError('error', $e->getMessage());
         }
+
         return $this->rollbackReturn(false);
     }
 
     /**
      * Moves items from one user or character stack to another.
      *
-     * @param  \App\Models\User\User|\App\Models\Character\Character          $sender
-     * @param  \App\Models\User\User|\App\Models\Character\Character          $recipient
-     * @param  string                                                         $type 
-     * @param  array                                                          $data
-     * @param  \App\Models\User\UserItem|\App\Models\Character\CharacterItem  $item
+     * @param \App\Models\Character\Character|\App\Models\User\User $sender
+     * @param \App\Models\Character\Character|\App\Models\User\User $recipient
+     * @param string                                                $type
+     * @param array                                                 $data
+     * @param mixed                                                 $stack
+     * @param mixed                                                 $quantity
+     *
      * @return bool
      */
-    public function moveStack($sender, $recipient, $type, $data, $stack, $quantity)
-    {
+    public function moveStack($sender, $recipient, $type, $data, $stack, $quantity) {
         DB::beginTransaction();
 
         try {
             $recipient_stack = UserItem::where([
                 ['user_id', '=', $recipient->id],
                 ['item_id', '=', $stack->item_id],
-                ['data', '=', json_encode($stack->data)]
+                ['data', '=', json_encode($stack->data)],
             ])->first();
 
-            if(!$recipient_stack)
+            if (!$recipient_stack) {
                 $recipient_stack = UserItem::create(['user_id' => $recipient->id, 'item_id' => $stack->item_id, 'data' => json_encode($stack->data)]);
-                
+            }
+
             $stack->count -= $quantity;
             $recipient_stack->count += $quantity;
             $stack->save();
             $recipient_stack->save();
 
-            if($type && !$this->createLog($sender ? $sender->id : null, $sender ? $sender->logType : null, $recipient->id, $recipient ? $recipient->logType : null, $stack->id, $type, $data['data'], $stack->item_id, $quantity)) throw new \Exception("Failed to create log.");
+            if ($type && !$this->createLog($sender ? $sender->id : null, $sender ? $sender->logType : null, $recipient->id, $recipient ? $recipient->logType : null, $stack->id, $type, $data['data'], $stack->item_id, $quantity)) {
+                throw new \Exception('Failed to create log.');
+            }
 
             return $this->commitReturn(true);
-        } catch(\Exception $e) { 
+        } catch (\Exception $e) {
             $this->setError('error', $e->getMessage());
         }
+
         return $this->rollbackReturn(false);
     }
 
     /**
      * Debits an item from a user or character.
      *
-     * @param  \App\Models\User\User|\App\Models\Character\Character  $owner
-     * @param  string                                                 $type 
-     * @param  array                                                  $data
-     * @param  \App\Models\Item\UserItem                              $stack
+     * @param \App\Models\Character\Character|\App\Models\User\User $owner
+     * @param string                                                $type
+     * @param array                                                 $data
+     * @param \App\Models\Item\UserItem                             $stack
+     * @param mixed                                                 $quantity
+     *
      * @return bool
      */
-    public function debitStack($owner, $type, $data, $stack, $quantity)
-    {
+    public function debitStack($owner, $type, $data, $stack, $quantity) {
         DB::beginTransaction();
 
         try {
             $stack->count -= $quantity;
             $stack->save();
 
-            if($type && !$this->createLog($owner ? $owner->id : null, $owner ? $owner->logType : null, null, null, $stack->id, $type, $data['data'], $stack->item->id, $quantity)) throw new \Exception("Failed to create log."); 
+            if ($type && !$this->createLog($owner ? $owner->id : null, $owner ? $owner->logType : null, null, null, $stack->id, $type, $data['data'], $stack->item->id, $quantity)) {
+                throw new \Exception('Failed to create log.');
+            }
 
             return $this->commitReturn(true);
-        } catch(\Exception $e) { 
+        } catch (\Exception $e) {
             $this->setError('error', $e->getMessage());
         }
+
         return $this->rollbackReturn(false);
     }
 
     /**
      * Names an item stack.
      *
-     * @param  \App\Models\User\User|\App\Models\Character\Character          $owner
-     * @param  \App\Models\User\UserItem|\App\Models\Character\CharacterItem  $stacks
-     * @param  int                                                            $quantities
+     * @param \App\Models\Character\Character|\App\Models\User\User         $owner
+     * @param \App\Models\Character\CharacterItem|\App\Models\User\UserItem $stacks
+     * @param mixed                                                         $name
+     * @param mixed                                                         $user
+     *
      * @return bool
      */
-    public function nameStack($owner, $stacks, $name)
-    {
+    public function nameStack($owner, $stacks, $name, $user) {
         DB::beginTransaction();
 
         try {
-            foreach($stacks as $key=>$stack) {
-                $user = Auth::user();
-                if(!$user->hasAlias) throw new \Exception("You need to have a linked social media account before you can perform this action.");
-                if(!$stack) throw new \Exception("An invalid item was selected.");
-                if($stack->character->user_id != $user->id && !$user->hasPower('edit_inventories')) throw new \Exception("You do not own one of the selected items.");
+            foreach ($stacks as $key=> $stack) {
+                if (!$user->hasAlias) {
+                    throw new \Exception('You need to have a linked social media account before you can perform this action.');
+                }
+                if (!$stack) {
+                    throw new \Exception('An invalid item was selected.');
+                }
+                if ($stack->character->user_id != $user->id && !$user->hasPower('edit_inventories')) {
+                    throw new \Exception('You do not own one of the selected items.');
+                }
 
                 $stack['stack_name'] = $name;
                 $stack->save();
             }
+
             return $this->commitReturn(true);
-        } catch(\Exception $e) { 
+        } catch (\Exception $e) {
             $this->setError('error', $e->getMessage());
         }
+
         return $this->rollbackReturn(false);
     }
 
     /**
      * Creates an inventory log.
      *
-     * @param  int     $senderId
-     * @param  string  $senderType
-     * @param  int     $recipientId
-     * @param  string  $recipientType
-     * @param  int     $stackId
-     * @param  string  $type 
-     * @param  string  $data
-     * @param  int     $quantity
-     * @return  int
+     * @param int    $senderId
+     * @param string $senderType
+     * @param int    $recipientId
+     * @param string $recipientType
+     * @param int    $stackId
+     * @param string $type
+     * @param string $data
+     * @param int    $quantity
+     * @param mixed  $itemId
+     *
+     * @return int
      */
-    public function createLog($senderId, $senderType, $recipientId, $recipientType, $stackId, $type, $data, $itemId, $quantity)
-    {
-        
+    public function createLog($senderId, $senderType, $recipientId, $recipientType, $stackId, $type, $data, $itemId, $quantity) {
         return DB::table('items_log')->insert(
             [
-                'sender_id' => $senderId,
-                'sender_type' => $senderType,
-                'recipient_id' => $recipientId,
+                'sender_id'      => $senderId,
+                'sender_type'    => $senderType,
+                'recipient_id'   => $recipientId,
                 'recipient_type' => $recipientType,
-                'stack_id' => $stackId,
-                'log' => $type . ($data ? ' (' . $data . ')' : ''),
-                'log_type' => $type,
-                'data' => $data, // this should be just a string
-                'item_id' => $itemId,
-                'quantity' => $quantity,
-                'created_at' => Carbon::now(),
-                'updated_at' => Carbon::now()
+                'stack_id'       => $stackId,
+                'log'            => $type.($data ? ' ('.$data.')' : ''),
+                'log_type'       => $type,
+                'data'           => $data, // this should be just a string
+                'item_id'        => $itemId,
+                'quantity'       => $quantity,
+                'created_at'     => Carbon::now(),
+                'updated_at'     => Carbon::now(),
             ]
         );
     }
-}
\ No newline at end of file
+
+    /**
+     * Consolidates a user's item stacks.
+     *
+     * @param \App\Models\User\User $user
+     *
+     * @return bool
+     */
+    public function consolidateInventory($user) {
+        DB::beginTransaction();
+
+        try {
+            if (!$user->hasAlias) {
+                throw new \Exception('You need to have a linked social media account before you can perform this action.');
+            }
+
+            // Making a very large assumption here that there aren't going to be a huge number
+            // of items to process, due to the nature of ARPGs.
+
+            // Group owned items by ID.
+            // We'll exclude stacks that are partially contained in trades, updates and submissions.
+            $items = UserItem::where('user_id', $user->id)->whereNull('deleted_at')
+                ->where(function ($query) {
+                    $query->where('trade_count', 0)->orWhereNull('trade_count');
+                })->where(function ($query) {
+                    $query->where('update_count', 0)->orWhereNull('update_count');
+                })->where(function ($query) {
+                    $query->where('submission_count', 0)->orWhereNull('submission_count');
+                })->get()->groupBy('item_id');
+
+            foreach ($items as $itemId => $itemVariations) {
+                $variations = [];
+
+                // We'll loop over the user items to obtain the first of each variant of item, to update with the final count.
+                // Variations are distinguished by having the same data field.
+                foreach ($itemVariations as $typeVariation) {
+                    $isNew = true;
+                    foreach ($variations as $foundVariation) {
+                        // Found an existing match.
+                        // The count can be added to the existing variation, and this row can be deleted.
+                        // Just for the sake of reducing confusion when looking in the DB,
+                        // We'll also reduce its count to 0 before deletion.
+                        if ($foundVariation->data == $typeVariation->data) {
+                            $isNew = false;
+                            $foundVariation->count += $typeVariation->count;
+                            $typeVariation->count = 0;
+                            $typeVariation->save();
+                            $typeVariation->delete();
+                            break;
+                        }
+                    }
+                    // No match, add a new variation
+                    if ($isNew) {
+                        $variations[] = $typeVariation;
+                    }
+                }
+
+                // At the end, save the rows in the variations array
+                foreach ($variations as $variation) {
+                    $variation->save();
+                }
+            }
+
+            return $this->commitReturn(true);
+        } catch (\Exception $e) {
+            $this->setError('error', $e->getMessage());
+        }
+
+        return $this->rollbackReturn(false);
+    }
+}
diff --git a/app/Services/InvitationService.php b/app/Services/InvitationService.php
index 35dce35f21..544e503b27 100644
--- a/app/Services/InvitationService.php
+++ b/app/Services/InvitationService.php
@@ -1,12 +1,11 @@
-<?php namespace App\Services;
+<?php
 
-use DB;
-use App\Services\Service;
+namespace App\Services;
 
 use App\Models\Invitation;
+use Illuminate\Support\Facades\DB;
 
-class InvitationService extends Service
-{
+class InvitationService extends Service {
     /*
     |--------------------------------------------------------------------------
     | Invitation Service
@@ -19,79 +18,86 @@ class InvitationService extends Service
     /**
      * Generates an invitation code, saving the user who generated it.
      *
-     * @param  \App\Models\User\User $user
+     * @param \App\Models\User\User $user
+     *
      * @return \App\Models\Invitation|bool
      */
-    public function generateInvitation($user)
-    {
+    public function generateInvitation($user) {
         DB::beginTransaction();
 
         try {
             $invitation = Invitation::create([
-                'code' => $this->generateCode(),
-                'user_id' => $user->id
+                'code'    => $this->generateCode(),
+                'user_id' => $user->id,
             ]);
 
             return $this->commitReturn($invitation);
-        } catch(\Exception $e) { 
+        } catch (\Exception $e) {
             $this->setError('error', $e->getMessage());
         }
+
         return $this->rollbackReturn(false);
     }
 
     /**
      * Marks an invitation code as used, saving the user who used it.
      *
-     * @param  \App\Models\User\User $user
+     * @param \App\Models\User\User $user
+     * @param mixed                 $invitation
+     *
      * @return \App\Models\Invitation|bool
      */
-    public function useInvitation($invitation, $user)
-    {
+    public function useInvitation($invitation, $user) {
         DB::beginTransaction();
 
         try {
             // More specific validation
-            if($invitation->recipient_id) throw new \Exception("This invitation key has already been used.");
-            
+            if ($invitation->recipient_id) {
+                throw new \Exception('This invitation key has already been used.');
+            }
+
             $invitation->recipient_id = $user->id;
             $invitation->save();
 
             return $this->commitReturn($invitation);
-        } catch(\Exception $e) { 
+        } catch (\Exception $e) {
             $this->setError('error', $e->getMessage());
         }
+
         return $this->rollbackReturn(false);
     }
 
     /**
      * Deletes an unused invitation code.
      *
-     * @param  \App\Models\Invitation $invitation
+     * @param \App\Models\Invitation $invitation
+     *
      * @return bool
      */
-    public function deleteInvitation($invitation)
-    {
+    public function deleteInvitation($invitation) {
         DB::beginTransaction();
 
         try {
             // Check first if the invitation has been used
-            if($invitation->recipient_id) throw new \Exception("This invitation has already been used."); 
+            if ($invitation->recipient_id) {
+                throw new \Exception('This invitation has already been used.');
+            }
             $invitation->delete();
 
             return $this->commitReturn(true);
-        } catch(\Exception $e) { 
+        } catch (\Exception $e) {
             $this->setError('error', $e->getMessage());
         }
+
         return $this->rollbackReturn(false);
     }
-    
+
     /**
      * Generates a string for an invitation code.
      *
      * @return string
      */
-    private function generateCode()
-    {
+    private function generateCode() {
         return randomString(10);
     }
-}
\ No newline at end of file
+}
diff --git a/app/Services/Item/BoxService.php b/app/Services/Item/BoxService.php
index 89c3edb85e..5d7472c75b 100644
--- a/app/Services/Item/BoxService.php
+++ b/app/Services/Item/BoxService.php
@@ -1,18 +1,13 @@
-<?php namespace App\Services\Item;
+<?php
 
-use App\Services\Service;
-
-use DB;
-
-use App\Services\InventoryManager;
+namespace App\Services\Item;
 
 use App\Models\Item\Item;
-use App\Models\Currency\Currency;
-use App\Models\Loot\LootTable;
-use App\Models\Raffle\Raffle;
+use App\Services\InventoryManager;
+use App\Services\Service;
+use Illuminate\Support\Facades\DB;
 
-class BoxService extends Service
-{
+class BoxService extends Service {
     /*
     |--------------------------------------------------------------------------
     | Box Service
@@ -27,65 +22,58 @@ class BoxService extends Service
      *
      * @return array
      */
-    public function getEditData()
-    {
-        return [
-            'characterCurrencies' => Currency::where('is_character_owned', 1)->orderBy('sort_character', 'DESC')->pluck('name', 'id'),
-            'items' => Item::orderBy('name')->pluck('name', 'id'),
-            'currencies' => Currency::where('is_user_owned', 1)->orderBy('name')->pluck('name', 'id'),
-            'tables' => LootTable::orderBy('name')->pluck('name', 'id'),
-            'raffles' => Raffle::where('rolled_at', null)->where('is_active', 1)->orderBy('name')->pluck('name', 'id'),
-        ];
+    public function getEditData() {
+        return [];
     }
 
     /**
      * Processes the data attribute of the tag and returns it in the preferred format.
      *
-     * @param  string  $tag
+     * @param object $tag
+     *
      * @return mixed
      */
-    public function getTagData($tag)
-    {
+    public function getTagData($tag) {
         $rewards = [];
-        if($tag->data) {
+        if ($tag->data) {
             $assets = parseAssetData($tag->data);
-            foreach($assets as $type => $a)
-            {
+            foreach ($assets as $type => $a) {
                 $class = getAssetModelString($type, false);
-                foreach($a as $id => $asset)
-                {
-                    $rewards[] = (object)[
+                foreach ($a as $id => $asset) {
+                    $rewards[] = (object) [
                         'rewardable_type' => $class,
-                        'rewardable_id' => $id,
-                        'quantity' => $asset['quantity']
+                        'rewardable_id'   => $id,
+                        'quantity'        => $asset['quantity'],
                     ];
                 }
             }
         }
+
         return $rewards;
     }
 
     /**
      * Processes the data attribute of the tag and returns it in the preferred format.
      *
-     * @param  string  $tag
-     * @param  array   $data
+     * @param object $tag
+     * @param array  $data
+     *
      * @return bool
      */
-    public function updateData($tag, $data)
-    {
+    public function updateData($tag, $data) {
         DB::beginTransaction();
 
         try {
             // If there's no data, return.
-            if(!isset($data['rewardable_type'])) return true;
-            
-            // The data will be stored as an asset table, json_encode()d. 
+            if (!isset($data['rewardable_type'])) {
+                return true;
+            }
+
+            // The data will be stored as an asset table, json_encode()d.
             // First build the asset table, then prepare it for storage.
             $assets = createAssetsArray();
-            foreach($data['rewardable_type'] as $key => $r) {
-                switch ($r)
-                {
+            foreach ($data['rewardable_type'] as $key => $r) {
+                switch ($r) {
                     case 'Item':
                         $type = 'App\Models\Item\Item';
                         break;
@@ -107,70 +95,63 @@ public function updateData($tag, $data)
             $tag->update(['data' => json_encode($assets)]);
 
             return $this->commitReturn(true);
-        } catch(\Exception $e) { 
+        } catch (\Exception $e) {
             $this->setError('error', $e->getMessage());
         }
+
         return $this->rollbackReturn(false);
     }
 
-
     /**
      * Acts upon the item when used from the inventory.
      *
-     * @param  \App\Models\User\UserItem  $stacks
-     * @param  \App\Models\User\User      $user
-     * @param  array                      $data
+     * @param \App\Models\User\UserItem $stacks
+     * @param \App\Models\User\User     $user
+     * @param array                     $data
+     *
      * @return bool
      */
-    public function act($stacks, $user, $data)
-    {
+    public function act($stacks, $user, $data) {
         DB::beginTransaction();
 
         try {
-            foreach($stacks as $key=>$stack) {
+            foreach ($stacks as $key=> $stack) {
                 // We don't want to let anyone who isn't the owner of the box open it,
-                // so do some validation... 
-                if($stack->user_id != $user->id) throw new \Exception("This item does not belong to you.");
+                // so do some validation...
+                if ($stack->user_id != $user->id) {
+                    throw new \Exception('This item does not belong to you.');
+                }
 
                 // Next, try to delete the box item. If successful, we can start distributing rewards.
-                if((new InventoryManager)->debitStack($stack->user, 'Box Opened', ['data' => ''], $stack, $data['quantities'][$key])) {
-                    
-                    for($q=0; $q<$data['quantities'][$key]; $q++) {
+                if ((new InventoryManager)->debitStack($stack->user, 'Box Opened', ['data' => ''], $stack, $data['quantities'][$key])) {
+                    for ($q = 0; $q < $data['quantities'][$key]; $q++) {
                         // Distribute user rewards
-                        if(!$rewards = fillUserAssets(parseAssetData($stack->item->tag('box')->data), $user, $user, 'Box Rewards', [
-                            'data' => 'Received rewards from opening '.$stack->item->name
-                        ])) throw new \Exception("Failed to open box.");
+                        if (!$rewards = fillUserAssets(parseAssetData($stack->item->tag('box')->data), $user, $user, 'Box Rewards', [
+                            'data' => 'Received rewards from opening '.$stack->item->name,
+                        ])) {
+                            throw new \Exception('Failed to open box.');
+                        }
                         flash($this->getBoxRewardsString($rewards));
                     }
                 }
             }
+
             return $this->commitReturn(true);
-        } catch(\Exception $e) { 
+        } catch (\Exception $e) {
             $this->setError('error', $e->getMessage());
         }
+
         return $this->rollbackReturn(false);
     }
 
     /**
      * Acts upon the item when used from the inventory.
      *
-     * @param  array                  $rewards
+     * @param array $rewards
+     *
      * @return string
      */
-    private function getBoxRewardsString($rewards)
-    {
-        $results = "You have received: ";
-        $result_elements = [];
-        foreach($rewards as $assetType)
-        {
-            if(isset($assetType))
-            {
-                foreach($assetType as $asset)
-                {
-                    array_push($result_elements, $asset['asset']->name.(class_basename($asset['asset']) == 'Raffle' ? ' (Raffle Ticket)' : '')." x".$asset['quantity']);
-                }
-            }
-        }
-        return $results.implode(', ', $result_elements);
+    private function getBoxRewardsString($rewards) {
+        return 'You have received: '.createRewardsString($rewards);
     }
-}
\ No newline at end of file
+}
diff --git a/app/Services/Item/SlotService.php b/app/Services/Item/SlotService.php
index 0f83ed7d39..56dabb7373 100644
--- a/app/Services/Item/SlotService.php
+++ b/app/Services/Item/SlotService.php
@@ -1,23 +1,18 @@
-<?php namespace App\Services\Item;
+<?php
 
-use App\Services\Service;
-use Illuminate\Http\Request;
-
-use DB;
-
-use App\Services\InventoryManager;
-use App\Services\CharacterManager;
+namespace App\Services\Item;
 
 use App\Models\Item\Item;
-use App\Models\User\User;
-use App\Models\User\UserItem;
-use App\Models\Character\Character;
+use App\Models\Rarity;
 use App\Models\Species\Species;
 use App\Models\Species\Subtype;
-use App\Models\Rarity;
+use App\Models\User\User;
+use App\Services\CharacterManager;
+use App\Services\InventoryManager;
+use App\Services\Service;
+use Illuminate\Support\Facades\DB;
 
-class SlotService extends Service
-{
+class SlotService extends Service {
     /*
     |--------------------------------------------------------------------------
     | Slot Service
@@ -32,37 +27,52 @@ class SlotService extends Service
      *
      * @return array
      */
-    public function getEditData()
-    {
+    public function getEditData() {
         return [
-            'rarities' => ['0' => 'Select Rarity'] + Rarity::orderBy('sort', 'DESC')->pluck('name', 'id')->toArray(),
+            'rarities'  => ['0' => 'Select Rarity'] + Rarity::orderBy('sort', 'DESC')->pluck('name', 'id')->toArray(),
             'specieses' => ['0' => 'Select Species'] + Species::orderBy('sort', 'DESC')->pluck('name', 'id')->toArray(),
-            'subtypes' => ['0' => 'Select Subtype'] + Subtype::orderBy('sort', 'DESC')->pluck('name', 'id')->toArray(),
-            'isMyo' => true
+            'subtypes'  => ['0' => 'Select Subtype'] + Subtype::orderBy('sort', 'DESC')->pluck('name', 'id')->toArray(),
+            'isMyo'     => true,
         ];
     }
 
     /**
      * Processes the data attribute of the tag and returns it in the preferred format for edits.
      *
-     * @param  string  $tag
+     * @param object $tag
+     *
      * @return mixed
      */
-    public function getTagData($tag)
-    {
+    public function getTagData($tag) {
         //fetch data from DB, if there is no data then set to NULL instead
-        $characterData['name'] = isset($tag->data['name']) ? $tag->data['name'] : null;
+        $characterData['name'] = $tag->data['name'] ?? null;
         $characterData['species_id'] = isset($tag->data['species_id']) && $tag->data['species_id'] ? $tag->data['species_id'] : null;
         $characterData['subtype_id'] = isset($tag->data['subtype_id']) && $tag->data['subtype_id'] ? $tag->data['subtype_id'] : null;
         $characterData['rarity_id'] = isset($tag->data['rarity_id']) && $tag->data['rarity_id'] ? $tag->data['rarity_id'] : null;
         $characterData['description'] = isset($tag->data['description']) && $tag->data['description'] ? $tag->data['description'] : null;
         $characterData['parsed_description'] = parse($characterData['description']);
-        $characterData['sale_value'] = isset($tag->data['sale_value']) ? $tag->data['sale_value'] : 0;
+        $characterData['sale_value'] = $tag->data['sale_value'] ?? 0;
         //the switches hate true/false, need to convert boolean to binary
-        if( isset($tag->data['is_sellable']) && $tag->data['is_sellable'] == "true") { $characterData['is_sellable'] = 1; } else $characterData['is_sellable'] = 0;
-        if( isset($tag->data['is_tradeable']) && $tag->data['is_tradeable'] == "true") { $characterData['is_tradeable'] = 1; } else $characterData['is_tradeable'] = 0;
-        if( isset($tag->data['is_giftable']) && $tag->data['is_giftable'] == "true") { $characterData['is_giftable'] = 1; } else $characterData['is_giftable'] = 0;
-        if( isset($tag->data['is_visible']) && $tag->data['is_visible'] == "true") { $characterData['is_visible'] = 1; } else $characterData['is_visible'] = 0;
+        if (isset($tag->data['is_sellable']) && $tag->data['is_sellable'] == 'true') {
+            $characterData['is_sellable'] = 1;
+        } else {
+            $characterData['is_sellable'] = 0;
+        }
+        if (isset($tag->data['is_tradeable']) && $tag->data['is_tradeable'] == 'true') {
+            $characterData['is_tradeable'] = 1;
+        } else {
+            $characterData['is_tradeable'] = 0;
+        }
+        if (isset($tag->data['is_giftable']) && $tag->data['is_giftable'] == 'true') {
+            $characterData['is_giftable'] = 1;
+        } else {
+            $characterData['is_giftable'] = 0;
+        }
+        if (isset($tag->data['is_visible']) && $tag->data['is_visible'] == 'true') {
+            $characterData['is_visible'] = 1;
+        } else {
+            $characterData['is_visible'] = 0;
+        }
 
         return $characterData;
     }
@@ -70,20 +80,20 @@ public function getTagData($tag)
     /**
      * Processes the data attribute of the tag and returns it in the preferred format for DB storage.
      *
-     * @param  string  $tag
-     * @param  array   $data
+     * @param object $tag
+     * @param array  $data
+     *
      * @return bool
      */
-    public function updateData($tag, $data)
-    {
+    public function updateData($tag, $data) {
         //put inputs into an array to transfer to the DB
-        $characterData['name'] = isset($data['name']) ? $data['name'] : null;
+        $characterData['name'] = $data['name'] ?? null;
         $characterData['species_id'] = isset($data['species_id']) && $data['species_id'] ? $data['species_id'] : null;
         $characterData['subtype_id'] = isset($data['subtype_id']) && $data['subtype_id'] ? $data['subtype_id'] : null;
         $characterData['rarity_id'] = isset($data['rarity_id']) && $data['rarity_id'] ? $data['rarity_id'] : null;
         $characterData['description'] = isset($data['description']) && $data['description'] ? $data['description'] : null;
         $characterData['parsed_description'] = parse($characterData['description']);
-        $characterData['sale_value'] = isset($data['sale_value']) ? $data['sale_value'] : 0;
+        $characterData['sale_value'] = $data['sale_value'] ?? 0;
         //if the switch was toggled, set true, if null, set false
         $characterData['is_sellable'] = isset($data['is_sellable']);
         $characterData['is_tradeable'] = isset($data['is_tradeable']);
@@ -97,40 +107,42 @@ public function updateData($tag, $data)
             $tag->update(['data' => json_encode($characterData)]);
 
             return $this->commitReturn(true);
-        } catch(\Exception $e) {
+        } catch (\Exception $e) {
             $this->setError('error', $e->getMessage());
         }
+
         return $this->rollbackReturn(false);
     }
 
     /**
      * Acts upon the item when used from the inventory.
      *
-     * @param  \App\Models\User\UserItem  $stacks
-     * @param  \App\Models\User\User      $user
-     * @param  array                      $data
+     * @param \App\Models\User\UserItem $stacks
+     * @param \App\Models\User\User     $user
+     * @param array                     $data
+     *
      * @return bool
      */
-    public function act($stacks, $user, $data)
-    {
+    public function act($stacks, $user, $data) {
         DB::beginTransaction();
 
         try {
-            foreach($stacks as $key=>$stack) {
+            foreach ($stacks as $key=> $stack) {
                 // We don't want to let anyone who isn't the owner of the slot to use it,
                 // so do some validation...
-                if($stack->user_id != $user->id) throw new \Exception("This item does not belong to you.");
+                if ($stack->user_id != $user->id) {
+                    throw new \Exception('This item does not belong to you.');
+                }
 
                 // Next, try to delete the tag item. If successful, we can start distributing rewards.
-                if((new InventoryManager)->debitStack($stack->user, 'Slot Used', ['data' => ''], $stack, $data['quantities'][$key])) {
-
-                    for($q=0; $q<$data['quantities'][$key]; $q++) {
+                if ((new InventoryManager)->debitStack($stack->user, 'Slot Used', ['data' => ''], $stack, $data['quantities'][$key])) {
+                    for ($q = 0; $q < $data['quantities'][$key]; $q++) {
                         //fill an array with the DB contents
                         $characterData = $stack->item->tag('slot')->data;
                         //set user who is opening the item
                         $characterData['user_id'] = $user->id;
                         //other vital data that is default
-                        $characterData['name'] = isset($characterData['name']) ? $characterData['name'] : "Slot";
+                        $characterData['name'] ??= 'Slot';
                         $characterData['transferrable_at'] = null;
                         $characterData['is_myo_slot'] = 1;
                         //this uses your default MYO slot image from the CharacterManager
@@ -150,26 +162,43 @@ public function act($stacks, $user, $data)
                         $characterData['feature_data'][0] = null;
 
                         //DB has 'true' and 'false' as strings, so need to set them to true/null
-                        if( $stack->item->tag('slot')->data['is_sellable'] == "true") { $characterData['is_sellable'] = true; } else $characterData['is_sellable'] = null;
-                        if( $stack->item->tag('slot')->data['is_tradeable'] == "true") { $characterData['is_tradeable'] = true; } else $characterData['is_tradeable'] = null;
-                        if( $stack->item->tag('slot')->data['is_giftable'] == "true") { $characterData['is_giftable'] = true; } else $characterData['is_giftable'] = null;
-                        if( $stack->item->tag('slot')->data['is_visible'] == "true") { $characterData['is_visible'] = true; } else $characterData['is_visible'] = null;
+                        if ($stack->item->tag('slot')->data['is_sellable'] == 'true') {
+                            $characterData['is_sellable'] = true;
+                        } else {
+                            $characterData['is_sellable'] = null;
+                        }
+                        if ($stack->item->tag('slot')->data['is_tradeable'] == 'true') {
+                            $characterData['is_tradeable'] = true;
+                        } else {
+                            $characterData['is_tradeable'] = null;
+                        }
+                        if ($stack->item->tag('slot')->data['is_giftable'] == 'true') {
+                            $characterData['is_giftable'] = true;
+                        } else {
+                            $characterData['is_giftable'] = null;
+                        }
+                        if ($stack->item->tag('slot')->data['is_visible'] == 'true') {
+                            $characterData['is_visible'] = true;
+                        } else {
+                            $characterData['is_visible'] = null;
+                        }
 
                         // Distribute user rewards
                         $charService = new CharacterManager;
                         if ($character = $charService->createCharacter($characterData, $user, true)) {
-                            flash('<a href="' . $character->url . '">MYO slot</a> created successfully.')->success();
-                        }
-                        else {
-                            throw new \Exception("Failed to use slot.");
+                            flash('<a href="'.$character->url.'">MYO slot</a> created successfully.')->success();
+                        } else {
+                            throw new \Exception('Failed to use slot.');
                         }
                     }
                 }
             }
+
             return $this->commitReturn(true);
-        } catch(\Exception $e) {
+        } catch (\Exception $e) {
             $this->setError('error', $e->getMessage());
         }
+
         return $this->rollbackReturn(false);
     }
 }
diff --git a/app/Services/ItemService.php b/app/Services/ItemService.php
index 4483990179..13ceb31e7e 100644
--- a/app/Services/ItemService.php
+++ b/app/Services/ItemService.php
@@ -1,16 +1,13 @@
-<?php namespace App\Services;
+<?php
 
-use App\Services\Service;
+namespace App\Services;
 
-use DB;
-use Config;
-
-use App\Models\Item\ItemCategory;
 use App\Models\Item\Item;
+use App\Models\Item\ItemCategory;
 use App\Models\Item\ItemTag;
+use Illuminate\Support\Facades\DB;
 
-class ItemService extends Service
-{
+class ItemService extends Service {
     /*
     |--------------------------------------------------------------------------
     | Item Service
@@ -29,147 +26,147 @@ class ItemService extends Service
     /**
      * Create a category.
      *
-     * @param  array                 $data
-     * @param  \App\Models\User\User $user
+     * @param array                 $data
+     * @param \App\Models\User\User $user
+     *
      * @return \App\Models\Item\ItemCategory|bool
      */
-    public function createItemCategory($data, $user)
-    {
+    public function createItemCategory($data, $user) {
         DB::beginTransaction();
 
         try {
-
             $data = $this->populateCategoryData($data);
 
             $image = null;
-            if(isset($data['image']) && $data['image']) {
+            if (isset($data['image']) && $data['image']) {
                 $data['has_image'] = 1;
+                $data['hash'] = randomString(10);
                 $image = $data['image'];
                 unset($data['image']);
+            } else {
+                $data['has_image'] = 0;
             }
-            else $data['has_image'] = 0;
 
             $category = ItemCategory::create($data);
 
-            if ($image) $this->handleImage($image, $category->categoryImagePath, $category->categoryImageFileName);
+            if (!$this->logAdminAction($user, 'Created Item Category', 'Created '.$category->displayName)) {
+                throw new \Exception('Failed to log admin action.');
+            }
+
+            if ($image) {
+                $this->handleImage($image, $category->categoryImagePath, $category->categoryImageFileName);
+            }
 
             return $this->commitReturn($category);
-        } catch(\Exception $e) {
+        } catch (\Exception $e) {
             $this->setError('error', $e->getMessage());
         }
+
         return $this->rollbackReturn(false);
     }
 
     /**
      * Update a category.
      *
-     * @param  \App\Models\Item\ItemCategory  $category
-     * @param  array                          $data
-     * @param  \App\Models\User\User          $user
+     * @param \App\Models\Item\ItemCategory $category
+     * @param array                         $data
+     * @param \App\Models\User\User         $user
+     *
      * @return \App\Models\Item\ItemCategory|bool
      */
-    public function updateItemCategory($category, $data, $user)
-    {
+    public function updateItemCategory($category, $data, $user) {
         DB::beginTransaction();
 
         try {
             // More specific validation
-            if(ItemCategory::where('name', $data['name'])->where('id', '!=', $category->id)->exists()) throw new \Exception("The name has already been taken.");
+            if (ItemCategory::where('name', $data['name'])->where('id', '!=', $category->id)->exists()) {
+                throw new \Exception('The name has already been taken.');
+            }
 
             $data = $this->populateCategoryData($data, $category);
 
             $image = null;
-            if(isset($data['image']) && $data['image']) {
+            if (isset($data['image']) && $data['image']) {
                 $data['has_image'] = 1;
+                $data['hash'] = randomString(10);
                 $image = $data['image'];
                 unset($data['image']);
             }
 
             $category->update($data);
 
-            if ($category) $this->handleImage($image, $category->categoryImagePath, $category->categoryImageFileName);
+            if (!$this->logAdminAction($user, 'Updated Item Category', 'Updated '.$category->displayName)) {
+                throw new \Exception('Failed to log admin action.');
+            }
+
+            if ($category) {
+                $this->handleImage($image, $category->categoryImagePath, $category->categoryImageFileName);
+            }
 
             return $this->commitReturn($category);
-        } catch(\Exception $e) {
+        } catch (\Exception $e) {
             $this->setError('error', $e->getMessage());
         }
-        return $this->rollbackReturn(false);
-    }
 
-    /**
-     * Handle category data.
-     *
-     * @param  array                               $data
-     * @param  \App\Models\Item\ItemCategory|null  $category
-     * @return array
-     */
-    private function populateCategoryData($data, $category = null)
-    {
-        if(isset($data['description']) && $data['description']) $data['parsed_description'] = parse($data['description']);
-
-        isset($data['is_character_owned']) && $data['is_character_owned'] ? $data['is_character_owned'] : $data['is_character_owned'] = 0;
-        isset($data['character_limit']) && $data['character_limit'] ? $data['character_limit'] : $data['character_limit'] = 0;
-        isset($data['can_name']) && $data['can_name'] ? $data['can_name'] : $data['can_name'] = 0;
-
-        if(isset($data['remove_image']))
-        {
-            if($category && $category->has_image && $data['remove_image'])
-            {
-                $data['has_image'] = 0;
-                $this->deleteImage($category->categoryImagePath, $category->categoryImageFileName);
-            }
-            unset($data['remove_image']);
-        }
-
-        return $data;
+        return $this->rollbackReturn(false);
     }
 
     /**
      * Delete a category.
      *
-     * @param  \App\Models\Item\ItemCategory  $category
+     * @param \App\Models\Item\ItemCategory $category
+     * @param mixed                         $user
+     *
      * @return bool
      */
-    public function deleteItemCategory($category)
-    {
+    public function deleteItemCategory($category, $user) {
         DB::beginTransaction();
 
         try {
             // Check first if the category is currently in use
-            if(Item::where('item_category_id', $category->id)->exists()) throw new \Exception("An item with this category exists. Please change its category first.");
+            if (Item::where('item_category_id', $category->id)->exists()) {
+                throw new \Exception('An item with this category exists. Please change its category first.');
+            }
+            if (!$this->logAdminAction($user, 'Deleted Item Category', 'Deleted '.$category->name)) {
+                throw new \Exception('Failed to log admin action.');
+            }
 
-            if($category->has_image) $this->deleteImage($category->categoryImagePath, $category->categoryImageFileName);
+            if ($category->has_image) {
+                $this->deleteImage($category->categoryImagePath, $category->categoryImageFileName);
+            }
             $category->delete();
 
             return $this->commitReturn(true);
-        } catch(\Exception $e) {
+        } catch (\Exception $e) {
             $this->setError('error', $e->getMessage());
         }
+
         return $this->rollbackReturn(false);
     }
 
     /**
      * Sorts category order.
      *
-     * @param  array  $data
+     * @param array $data
+     *
      * @return bool
      */
-    public function sortItemCategory($data)
-    {
+    public function sortItemCategory($data) {
         DB::beginTransaction();
 
         try {
             // explode the sort array and reverse it since the order is inverted
             $sort = array_reverse(explode(',', $data));
 
-            foreach($sort as $key => $s) {
+            foreach ($sort as $key => $s) {
                 ItemCategory::where('id', $s)->update(['sort' => $key]);
             }
 
             return $this->commitReturn(true);
-        } catch(\Exception $e) {
+        } catch (\Exception $e) {
             $this->setError('error', $e->getMessage());
         }
+
         return $this->rollbackReturn(false);
     }
 
@@ -182,157 +179,173 @@ public function sortItemCategory($data)
     /**
      * Creates a new item.
      *
-     * @param  array                  $data
-     * @param  \App\Models\User\User  $user
-     * @return bool|\App\Models\Item\Item
+     * @param array                 $data
+     * @param \App\Models\User\User $user
+     *
+     * @return \App\Models\Item\Item|bool
      */
-    public function createItem($data, $user)
-    {
+    public function createItem($data, $user) {
         DB::beginTransaction();
 
         try {
-            if(isset($data['item_category_id']) && $data['item_category_id'] == 'none') $data['item_category_id'] = null;
+            if (isset($data['item_category_id']) && $data['item_category_id'] == 'none') {
+                $data['item_category_id'] = null;
+            }
 
-            if((isset($data['item_category_id']) && $data['item_category_id']) && !ItemCategory::where('id', $data['item_category_id'])->exists()) throw new \Exception("The selected item category is invalid.");
+            if ((isset($data['item_category_id']) && $data['item_category_id']) && !ItemCategory::where('id', $data['item_category_id'])->exists()) {
+                throw new \Exception('The selected item category is invalid.');
+            }
 
             $data = $this->populateData($data);
 
             $image = null;
-            if(isset($data['image']) && $data['image']) {
+            if (isset($data['image']) && $data['image']) {
                 $data['has_image'] = 1;
+                $data['hash'] = randomString(10);
                 $image = $data['image'];
                 unset($data['image']);
+            } else {
+                $data['has_image'] = 0;
             }
-            else $data['has_image'] = 0;
 
             $item = Item::create($data);
 
+            if (!$this->logAdminAction($user, 'Created Item', 'Created '.$item->displayName)) {
+                throw new \Exception('Failed to log admin action.');
+            }
+
             $item->update([
                 'data' => json_encode([
-                    'rarity' => isset($data['rarity']) && $data['rarity'] ? $data['rarity'] : null,
-                    'uses' => isset($data['uses']) && $data['uses'] ? $data['uses'] : null,
+                    'rarity'  => isset($data['rarity']) && $data['rarity'] ? $data['rarity'] : null,
+                    'uses'    => isset($data['uses']) && $data['uses'] ? $data['uses'] : null,
                     'release' => isset($data['release']) && $data['release'] ? $data['release'] : null,
                     'prompts' => isset($data['prompts']) && $data['prompts'] ? $data['prompts'] : null,
-                    'resell' => isset($data['currency_quantity']) ? [$data['currency_id'] => $data['currency_quantity']] : null,
-                    ]) // rarity, availability info (original source, purchase locations, drop locations)
+                    'resell'  => isset($data['currency_quantity']) ? [$data['currency_id'] => $data['currency_quantity']] : null,
+                ]), // rarity, availability info (original source, purchase locations, drop locations)
             ]);
 
-            if ($image) $this->handleImage($image, $item->imagePath, $item->imageFileName);
+            if ($image) {
+                $this->handleImage($image, $item->imagePath, $item->imageFileName);
+            }
 
             return $this->commitReturn($item);
-        } catch(\Exception $e) {
+        } catch (\Exception $e) {
             $this->setError('error', $e->getMessage());
         }
+
         return $this->rollbackReturn(false);
     }
 
     /**
      * Updates an item.
      *
-     * @param  \App\Models\Item\Item  $item
-     * @param  array                  $data
-     * @param  \App\Models\User\User  $user
-     * @return bool|\App\Models\Item\Item
+     * @param \App\Models\Item\Item $item
+     * @param array                 $data
+     * @param \App\Models\User\User $user
+     *
+     * @return \App\Models\Item\Item|bool
      */
-    public function updateItem($item, $data, $user)
-    {
+    public function updateItem($item, $data, $user) {
         DB::beginTransaction();
 
         try {
-            if(isset($data['item_category_id']) && $data['item_category_id'] == 'none') $data['item_category_id'] = null;
+            if (isset($data['item_category_id']) && $data['item_category_id'] == 'none') {
+                $data['item_category_id'] = null;
+            }
 
             // More specific validation
-            if(Item::where('name', $data['name'])->where('id', '!=', $item->id)->exists()) throw new \Exception("The name has already been taken.");
-            if((isset($data['item_category_id']) && $data['item_category_id']) && !ItemCategory::where('id', $data['item_category_id'])->exists()) throw new \Exception("The selected item category is invalid.");
+            if (Item::where('name', $data['name'])->where('id', '!=', $item->id)->exists()) {
+                throw new \Exception('The name has already been taken.');
+            }
+            if ((isset($data['item_category_id']) && $data['item_category_id']) && !ItemCategory::where('id', $data['item_category_id'])->exists()) {
+                throw new \Exception('The selected item category is invalid.');
+            }
 
-            $data = $this->populateData($data);
+            $data = $this->populateData($data, $item);
 
             $image = null;
-            if(isset($data['image']) && $data['image']) {
+            if (isset($data['image']) && $data['image']) {
                 $data['has_image'] = 1;
+                $data['hash'] = randomString(10);
                 $image = $data['image'];
                 unset($data['image']);
             }
 
             $item->update($data);
 
+            if (!$this->logAdminAction($user, 'Updated Item', 'Updated '.$item->displayName)) {
+                throw new \Exception('Failed to log admin action.');
+            }
+
             $item->update([
                 'data' => json_encode([
-                    'rarity' => isset($data['rarity']) && $data['rarity'] ? $data['rarity'] : null,
-                    'uses' => isset($data['uses']) && $data['uses'] ? $data['uses'] : null,
+                    'rarity'  => isset($data['rarity']) && $data['rarity'] ? $data['rarity'] : null,
+                    'uses'    => isset($data['uses']) && $data['uses'] ? $data['uses'] : null,
                     'release' => isset($data['release']) && $data['release'] ? $data['release'] : null,
                     'prompts' => isset($data['prompts']) && $data['prompts'] ? $data['prompts'] : null,
-                    'resell' => isset($data['currency_quantity']) ? [$data['currency_id'] => $data['currency_quantity']] : null,
-                    ]) // rarity, availability info (original source, purchase locations, drop locations)
+                    'resell'  => isset($data['currency_quantity']) ? [$data['currency_id'] => $data['currency_quantity']] : null,
+                ]), // rarity, availability info (original source, purchase locations, drop locations)
             ]);
 
-            if ($item) $this->handleImage($image, $item->imagePath, $item->imageFileName);
+            if ($item) {
+                $this->handleImage($image, $item->imagePath, $item->imageFileName);
+            }
 
             return $this->commitReturn($item);
-        } catch(\Exception $e) {
+        } catch (\Exception $e) {
             $this->setError('error', $e->getMessage());
         }
-        return $this->rollbackReturn(false);
-    }
-
-    /**
-     * Processes user input for creating/updating an item.
-     *
-     * @param  array                  $data
-     * @param  \App\Models\Item\Item  $item
-     * @return array
-     */
-    private function populateData($data, $item = null)
-    {
-        if(isset($data['description']) && $data['description']) $data['parsed_description'] = parse($data['description']);
-        else $data['parsed_description'] = null;
-
-        if(!isset($data['allow_transfer'])) $data['allow_transfer'] = 0;
-        if(!isset($data['is_released']) && Config::get('lorekeeper.extensions.item_entry_expansion.extra_fields')) $data['is_released'] = 0;
-        else $data['is_released'] = 1;
-
-        if(isset($data['remove_image']))
-        {
-            if($item && $item->has_image && $data['remove_image'])
-            {
-                $data['has_image'] = 0;
-                $this->deleteImage($item->imagePath, $item->imageFileName);
-            }
-            unset($data['remove_image']);
-        }
 
-        return $data;
+        return $this->rollbackReturn(false);
     }
 
     /**
      * Deletes an item.
      *
-     * @param  \App\Models\Item\Item  $item
+     * @param \App\Models\Item\Item $item
+     * @param mixed                 $user
+     *
      * @return bool
      */
-    public function deleteItem($item)
-    {
+    public function deleteItem($item, $user) {
         DB::beginTransaction();
 
         try {
             // Check first if the item is currently owned or if some other site feature uses it
-            if(DB::table('user_items')->where([['item_id', '=', $item->id], ['count', '>', 0]])->exists()) throw new \Exception("At least one user currently owns this item. Please remove the item(s) before deleting it.");
-            if(DB::table('character_items')->where([['item_id', '=', $item->id], ['count', '>', 0]])->exists()) throw new \Exception("At least one character currently owns this item. Please remove the item(s) before deleting it.");
-            if(DB::table('loots')->where('rewardable_type', 'Item')->where('rewardable_id', $item->id)->exists()) throw new \Exception("A loot table currently distributes this item as a potential reward. Please remove the item before deleting it.");
-            if(DB::table('prompt_rewards')->where('rewardable_type', 'Item')->where('rewardable_id', $item->id)->exists()) throw new \Exception("A prompt currently distributes this item as a reward. Please remove the item before deleting it.");
-            if(DB::table('shop_stock')->where('item_id', $item->id)->exists()) throw new \Exception("A shop currently stocks this item. Please remove the item before deleting it.");
+            if (DB::table('user_items')->where([['item_id', '=', $item->id], ['count', '>', 0]])->exists()) {
+                throw new \Exception('At least one user currently owns this item. Please remove the item(s) before deleting it.');
+            }
+            if (DB::table('character_items')->where([['item_id', '=', $item->id], ['count', '>', 0]])->exists()) {
+                throw new \Exception('At least one character currently owns this item. Please remove the item(s) before deleting it.');
+            }
+            if (DB::table('loots')->where('rewardable_type', 'Item')->where('rewardable_id', $item->id)->exists()) {
+                throw new \Exception('A loot table currently distributes this item as a potential reward. Please remove the item before deleting it.');
+            }
+            if (DB::table('prompt_rewards')->where('rewardable_type', 'Item')->where('rewardable_id', $item->id)->exists()) {
+                throw new \Exception('A prompt currently distributes this item as a reward. Please remove the item before deleting it.');
+            }
+            if (DB::table('shop_stock')->where('item_id', $item->id)->exists()) {
+                throw new \Exception('A shop currently stocks this item. Please remove the item before deleting it.');
+            }
+
+            if (!$this->logAdminAction($user, 'Deleted Item', 'Deleted '.$item->name)) {
+                throw new \Exception('Failed to log admin action.');
+            }
 
             DB::table('items_log')->where('item_id', $item->id)->delete();
             DB::table('user_items')->where('item_id', $item->id)->delete();
             DB::table('character_items')->where('item_id', $item->id)->delete();
             $item->tags()->delete();
-            if($item->has_image) $this->deleteImage($item->imagePath, $item->imageFileName);
+            if ($item->has_image) {
+                $this->deleteImage($item->imagePath, $item->imageFileName);
+            }
             $item->delete();
 
             return $this->commitReturn(true);
-        } catch(\Exception $e) {
+        } catch (\Exception $e) {
             $this->setError('error', $e->getMessage());
         }
+
         return $this->rollbackReturn(false);
     }
 
@@ -347,12 +360,12 @@ public function deleteItem($item)
      *
      * @return array
      */
-    public function getItemTags()
-    {
-        $tags = Config::get('lorekeeper.item_tags');
+    public function getItemTags() {
+        $tags = config('lorekeeper.item_tags');
         $result = [];
-        foreach($tags as $tag => $tagData)
+        foreach ($tags as $tag => $tagData) {
             $result[$tag] = $tagData['name'];
+        }
 
         return $result;
     }
@@ -360,51 +373,72 @@ public function getItemTags()
     /**
      * Adds an item tag to an item.
      *
-     * @param  \App\Models\Item\Item  $item
-     * @param  string                 $tag
-     * @return string|bool
+     * @param \App\Models\Item\Item $item
+     * @param string                $tag
+     * @param mixed                 $user
+     *
+     * @return bool|string
      */
-    public function addItemTag($item, $tag)
-    {
+    public function addItemTag($item, $tag, $user) {
         DB::beginTransaction();
 
         try {
-            if(!$item) throw new \Exception("Invalid item selected.");
-            if($item->tags()->where('tag', $tag)->exists()) throw new \Exception("This item already has this tag attached to it.");
-            if(!$tag) throw new \Exception("No tag selected.");
+            if (!$item) {
+                throw new \Exception('Invalid item selected.');
+            }
+            if ($item->tags()->where('tag', $tag)->exists()) {
+                throw new \Exception('This item already has this tag attached to it.');
+            }
+            if (!$tag) {
+                throw new \Exception('No tag selected.');
+            }
+
+            if (!$this->logAdminAction($user, 'Added Item Tag', 'Added '.$tag.' tag to '.$item->displayName)) {
+                throw new \Exception('Failed to log admin action.');
+            }
 
             $tag = ItemTag::create([
                 'item_id' => $item->id,
-                'tag' => $tag
+                'tag'     => $tag,
             ]);
 
             return $this->commitReturn($tag);
-        } catch(\Exception $e) {
+        } catch (\Exception $e) {
             $this->setError('error', $e->getMessage());
         }
+
         return $this->rollbackReturn(false);
     }
 
     /**
      * Edits the data associated with an item tag on an item.
      *
-     * @param  \App\Models\Item\Item  $item
-     * @param  string                 $tag
-     * @param  array                  $data
-     * @return string|bool
+     * @param \App\Models\Item\Item $item
+     * @param string                $tag
+     * @param array                 $data
+     * @param mixed                 $user
+     *
+     * @return bool|string
      */
-    public function editItemTag($item, $tag, $data)
-    {
+    public function editItemTag($item, $tag, $data, $user) {
         DB::beginTransaction();
 
         try {
-            if(!$item) throw new \Exception("Invalid item selected.");
-            if(!$item->tags()->where('tag', $tag)->exists()) throw new \Exception("This item does not have this tag attached to it.");
+            if (!$item) {
+                throw new \Exception('Invalid item selected.');
+            }
+            if (!$item->tags()->where('tag', $tag)->exists()) {
+                throw new \Exception('This item does not have this tag attached to it.');
+            }
+
+            if (!$this->logAdminAction($user, 'Edited Item Tag', 'Edited '.$tag.' tag on '.$item->displayName)) {
+                throw new \Exception('Failed to log admin action.');
+            }
 
             $tag = $item->tags()->where('tag', $tag)->first();
 
             $service = $tag->service;
-            if(!$service->updateData($tag, $data)) {
+            if (!$service->updateData($tag, $data)) {
                 $this->setErrors($service->errors());
                 throw new \Exception('sdlfk');
             }
@@ -414,33 +448,113 @@ public function editItemTag($item, $tag, $data)
             $tag->save();
 
             return $this->commitReturn($tag);
-        } catch(\Exception $e) {
+        } catch (\Exception $e) {
             $this->setError('error', $e->getMessage());
         }
+
         return $this->rollbackReturn(false);
     }
 
     /**
      * Removes an item tag from an item.
      *
-     * @param  \App\Models\Item\Item  $item
-     * @param  string                 $tag
-     * @return string|bool
+     * @param \App\Models\Item\Item $item
+     * @param string                $tag
+     * @param mixed                 $user
+     *
+     * @return bool|string
      */
-    public function deleteItemTag($item, $tag)
-    {
+    public function deleteItemTag($item, $tag, $user) {
         DB::beginTransaction();
 
         try {
-            if(!$item) throw new \Exception("Invalid item selected.");
-            if(!$item->tags()->where('tag', $tag)->exists()) throw new \Exception("This item does not have this tag attached to it.");
+            if (!$item) {
+                throw new \Exception('Invalid item selected.');
+            }
+            if (!$item->tags()->where('tag', $tag)->exists()) {
+                throw new \Exception('This item does not have this tag attached to it.');
+            }
+
+            if (!$this->logAdminAction($user, 'Deleted Item Tag', 'Deleted '.$tag.' tag on '.$item->displayName)) {
+                throw new \Exception('Failed to log admin action.');
+            }
 
             $item->tags()->where('tag', $tag)->delete();
 
             return $this->commitReturn(true);
-        } catch(\Exception $e) {
+        } catch (\Exception $e) {
             $this->setError('error', $e->getMessage());
         }
+
         return $this->rollbackReturn(false);
     }
+
+    /**
+     * Handle category data.
+     *
+     * @param array                              $data
+     * @param \App\Models\Item\ItemCategory|null $category
+     *
+     * @return array
+     */
+    private function populateCategoryData($data, $category = null) {
+        if (isset($data['description']) && $data['description']) {
+            $data['parsed_description'] = parse($data['description']);
+        } else {
+            $data['parsed_description'] = null;
+        }
+
+        isset($data['is_character_owned']) && $data['is_character_owned'] ? $data['is_character_owned'] : $data['is_character_owned'] = 0;
+        isset($data['character_limit']) && $data['character_limit'] ? $data['character_limit'] : $data['character_limit'] = 0;
+        isset($data['can_name']) && $data['can_name'] ? $data['can_name'] : $data['can_name'] = 0;
+
+        if (!isset($data['is_visible'])) {
+            $data['is_visible'] = 0;
+        }
+
+        if (isset($data['remove_image'])) {
+            if ($category && $category->has_image && $data['remove_image']) {
+                $data['has_image'] = 0;
+                $this->deleteImage($category->categoryImagePath, $category->categoryImageFileName);
+            }
+            unset($data['remove_image']);
+        }
+
+        return $data;
+    }
+
+    /**
+     * Processes user input for creating/updating an item.
+     *
+     * @param array                 $data
+     * @param \App\Models\Item\Item $item
+     *
+     * @return array
+     */
+    private function populateData($data, $item = null) {
+        if (isset($data['description']) && $data['description']) {
+            $data['parsed_description'] = parse($data['description']);
+        } else {
+            $data['parsed_description'] = null;
+        }
+
+        if (!isset($data['allow_transfer'])) {
+            $data['allow_transfer'] = 0;
+        }
+        if (!isset($data['is_released']) && config('lorekeeper.extensions.item_entry_expansion.extra_fields')) {
+            $data['is_released'] = 0;
+        } else {
+            $data['is_released'] = 1;
+        }
+
+        if (isset($data['remove_image'])) {
+            if ($item && $item->has_image && $data['remove_image']) {
+                $data['has_image'] = 0;
+                $this->deleteImage($item->imagePath, $item->imageFileName);
+            }
+            unset($data['remove_image']);
+        }
+
+        return $data;
+    }
 }
diff --git a/app/Services/LinkService.php b/app/Services/LinkService.php
index 33756855e3..f2e19c269e 100644
--- a/app/Services/LinkService.php
+++ b/app/Services/LinkService.php
@@ -1,13 +1,13 @@
-<?php namespace App\Services;
+<?php
+
+namespace App\Services;
 
-use DB;
-use Laravel\Socialite\Facades\Socialite;
-use App\Services\Service;
 use App\Models\User\UserAlias;
 use App\Models\User\UserUpdateLog;
+use Illuminate\Support\Facades\DB;
+use Laravel\Socialite\Facades\Socialite;
 
-class LinkService extends Service
-{
+class LinkService extends Service {
     /*
     |--------------------------------------------------------------------------
     | Link Service
@@ -16,56 +16,83 @@ class LinkService extends Service
     | Handles connection to social media sites to verify a user's identity.
     |
     */
-    
+
     /**
      * Get the Auth URL for dA.
      *
+     * @param mixed $provider
+     * @param mixed $login
+     *
      * @return string
      */
-    public function getAuthRedirect($provider) {
-        if($provider == 'deviantart') return Socialite::driver($provider)->setScopes(['user'])->redirect();
-        else return Socialite::driver($provider)->redirect();
+    public function getAuthRedirect($provider, $login = false) {
+        $socialite = Socialite::driver($provider);
+
+        if ($provider == 'deviantart') {
+            $socialite->setScopes(['user']);
+        }
+        // We want to go to a different endpoint if we're trying to login
+        if ($login && $provider == 'tumblr') {
+            flash('Tumblr is currently unsupported for login')->error();
+
+            return redirect()->back();
+        }
+        if ($login) {
+            $socialite->redirectUrl(str_replace('auth', 'login', url(config('services.'.$provider.'.redirect'))));
+        }
+
+        return $socialite->redirect();
     }
 
     /**
-     * Link the user's social media account name to their account
-     * 
-     * @param  \App\Models\User\User  $user
+     * Link the user's social media account name to their account.
+     *
+     * @param \App\Models\User\User $user
+     * @param mixed                 $provider
+     * @param mixed                 $result
      */
     public function saveProvider($provider, $result, $user) {
         DB::beginTransaction();
 
         try {
-            if(!$result || !$result->nickname) throw new \Exception("Unable to retrieve user data.");
+            if (!$result || !$result->nickname) {
+                throw new \Exception('Unable to retrieve user data.');
+            }
 
-            if(DB::table('user_aliases')->where('site', $provider)->where('alias', $result->nickname)->exists()) throw new \Exception("Cannot link the same account multiple times and/or to different site accounts.");
+            if (DB::table('user_aliases')->where('site', $provider)->where('alias', $result->nickname)->exists()) {
+                throw new \Exception('Cannot link the same account multiple times and/or to different site accounts.');
+            }
 
             // Save the user's alias and set it as the primary alias
             UserAlias::create([
-                'user_id' => $user->id,
-                'site' => $provider,
-                'alias' => $result->nickname,
-                'is_visible' => !$user->has_alias,
+                'user_id'          => $user->id,
+                'site'             => $provider,
+                'alias'            => $result->nickname,
+                'is_visible'       => !$user->has_alias,
                 'is_primary_alias' => !$user->has_alias,
+                // ID should always exist but just in case.
+                'user_snowflake' => $result->id ?? $result->nickname,
             ]);
 
             // Save that the user has an alias
             $user->has_alias = 1;
             $user->save();
-            
+
             UserUpdateLog::create(['user_id' => $user->id, 'data' => json_encode(['alias' => $result->nickname, 'site' => $provider]), 'type' => 'Alias Added']);
 
             return $this->commitReturn(true);
-        } catch(\Exception $e) { 
+        } catch (\Exception $e) {
             $this->setError('error', $e->getMessage());
         }
+
         return $this->rollbackReturn(false);
     }
 
     /**
      * Makes the selected alias the user's primary alias.
-     * 
-     * @param  \App\Models\User\User  $user
+     *
+     * @param \App\Models\User\User $user
+     * @param mixed                 $aliasId
      */
     public function makePrimary($aliasId, $user) {
         DB::beginTransaction();
@@ -73,8 +100,12 @@ public function makePrimary($aliasId, $user) {
         try {
             $alias = UserAlias::where('id', $aliasId)->where('user_id', $user->id)->where('is_primary_alias', 0)->first();
 
-            if(!$alias) throw new \Exception("Invalid alias selected.");
-            if(!$alias->canMakePrimary) throw new \Exception("This alias cannot be made your primary alias.");
+            if (!$alias) {
+                throw new \Exception('Invalid alias selected.');
+            }
+            if (!$alias->canMakePrimary) {
+                throw new \Exception('This alias cannot be made your primary alias.');
+            }
 
             // Unset the current primary alias
             UserAlias::where('user_id', $user->id)->where('is_primary_alias', 1)->update(['is_primary_alias' => 0]);
@@ -83,65 +114,89 @@ public function makePrimary($aliasId, $user) {
             $alias->is_visible = 1;
             $alias->is_primary_alias = 1;
             $alias->save();
-            
+
             UserUpdateLog::create(['user_id' => $user->id, 'data' => json_encode(['alias' => $alias->alias, 'site' => $alias->site]), 'type' => 'Primary Alias Changed']);
 
             return $this->commitReturn(true);
-        } catch(\Exception $e) { 
+        } catch (\Exception $e) {
             $this->setError('error', $e->getMessage());
         }
+
         return $this->rollbackReturn(false);
     }
 
     /**
      * Hides or unhides the selected alias.
-     * 
-     * @param  \App\Models\User\User  $user
+     *
+     * @param \App\Models\User\User $user
+     * @param mixed                 $aliasId
      */
     public function hideAlias($aliasId, $user) {
         DB::beginTransaction();
 
         try {
-            $alias = UserAlias::where('id', $aliasId)->where('user_id', $user->id)->where('is_primary_alias', 0)->first();
+            $alias = UserAlias::where('id', $aliasId)->where('user_id', $user->id);
+            if (config('lorekeeper.settings.require_alias')) {
+                $alias = $alias->where('is_primary_alias', 0)->first();
+            } else {
+                $alias = $alias->first();
+            }
 
-            if(!$alias) throw new \Exception("Invalid alias selected.");
+            if (!$alias) {
+                throw new \Exception('Invalid alias selected.');
+            }
 
             // Update the alias's visibility
             $alias->is_visible = !$alias->is_visible;
             $alias->save();
-            
+
             UserUpdateLog::create(['user_id' => $user->id, 'data' => json_encode(['alias' => $alias->alias, 'site' => $alias->site]), 'type' => 'Alias Visibility Changed']);
 
             return $this->commitReturn(true);
-        } catch(\Exception $e) { 
+        } catch (\Exception $e) {
             $this->setError('error', $e->getMessage());
         }
+
         return $this->rollbackReturn(false);
     }
 
     /**
      * Removes the selected alias.
-     * 
-     * @param  \App\Models\User\User  $user
+     *
+     * @param \App\Models\User\User $user
+     * @param mixed                 $aliasId
      */
     public function removeAlias($aliasId, $user) {
         DB::beginTransaction();
 
         try {
-            $alias = UserAlias::where('id', $aliasId)->where('user_id', $user->id)->where('is_primary_alias', 0)->first();
+            $alias = UserAlias::where('id', $aliasId)->where('user_id', $user->id);
+            if (config('lorekeeper.settings.require_alias')) {
+                $alias = $alias->where('is_primary_alias', 0)->first();
+            } else {
+                $alias = $alias->first();
+            }
+
+            if (!$alias) {
+                throw new \Exception('Invalid alias selected.');
+            }
 
-            if(!$alias) throw new \Exception("Invalid alias selected.");
-            
             UserUpdateLog::create(['user_id' => $user->id, 'data' => json_encode(['alias' => $alias->alias, 'site' => $alias->site]), 'type' => 'Alias Deleted']);
 
             // Delete the alias
             $alias->delete();
 
+            if (!config('lorekeeper.settings.require_alias') && $user->aliases->count() == 0) {
+                $user->update([
+                    'has_alias' => 0,
+                ]);
+            }
+
             return $this->commitReturn(true);
-        } catch(\Exception $e) { 
+        } catch (\Exception $e) {
             $this->setError('error', $e->getMessage());
         }
+
         return $this->rollbackReturn(false);
     }
-
 }
diff --git a/app/Services/LootService.php b/app/Services/LootService.php
index a48d7d4d76..9b18d7c669 100644
--- a/app/Services/LootService.php
+++ b/app/Services/LootService.php
@@ -1,17 +1,14 @@
-<?php namespace App\Services;
+<?php
 
-use App\Services\Service;
+namespace App\Services;
 
-use DB;
-use Config;
-
-use Illuminate\Support\Arr;
-use App\Models\Loot\LootTable;
 use App\Models\Loot\Loot;
+use App\Models\Loot\LootTable;
 use App\Models\Prompt\PromptReward;
+use Illuminate\Support\Arr;
+use Illuminate\Support\Facades\DB;
 
-class LootService extends Service
-{
+class LootService extends Service {
     /*
     |--------------------------------------------------------------------------
     | Loot Service
@@ -24,25 +21,35 @@ class LootService extends Service
     /**
      * Creates a loot table.
      *
-     * @param  array  $data
-     * @return bool|\App\Models\Loot\LootTable
+     * @param array $data
+     *
+     * @return \App\Models\Loot\LootTable|bool
      */
-    public function createLootTable($data)
-    {
+    public function createLootTable($data) {
         DB::beginTransaction();
 
         try {
-
             // More specific validation
-            foreach($data['rewardable_type'] as $key => $type)
-            {
-                if(!$type) throw new \Exception("Loot type is required.");
-                if($type != 'ItemRarity' && !$data['rewardable_id'][$key]) throw new \Exception("Reward is required.");
-                if(!$data['quantity'][$key] || $data['quantity'][$key] < 1) throw new \Exception("Quantity is required and must be an integer greater than 0.");
-                if(!$data['weight'][$key] || $data['weight'][$key] < 1) throw new \Exception("Weight is required and must be an integer greater than 0.");
-                if($type == 'ItemCategoryRarity') {
-                    if(!isset($data['criteria'][$key]) || !$data['criteria'][$key]) throw new \Exception("Criteria is required for conditional item categories.");
-                    if(!isset($data['rarity'][$key]) || !$data['rarity'][$key]) throw new \Exception("A rarity is required for conditional item categories.");
+            foreach ($data['rewardable_type'] as $key => $type) {
+                if (!$type) {
+                    throw new \Exception('Loot type is required.');
+                }
+                if ($type != 'ItemRarity' && !$data['rewardable_id'][$key]) {
+                    throw new \Exception('Reward is required.');
+                }
+                if (!$data['quantity'][$key] || $data['quantity'][$key] < 1) {
+                    throw new \Exception('Quantity is required and must be an integer greater than 0.');
+                }
+                if (!$data['weight'][$key] || $data['weight'][$key] < 1) {
+                    throw new \Exception('Weight is required and must be an integer greater than 0.');
+                }
+                if ($type == 'ItemCategoryRarity') {
+                    if (!isset($data['criteria'][$key]) || !$data['criteria'][$key]) {
+                        throw new \Exception('Criteria is required for conditional item categories.');
+                    }
+                    if (!isset($data['rarity'][$key]) || !$data['rarity'][$key]) {
+                        throw new \Exception('A rarity is required for conditional item categories.');
+                    }
                 }
             }
 
@@ -51,35 +58,46 @@ public function createLootTable($data)
             $this->populateLootTable($table, Arr::only($data, ['rewardable_type', 'rewardable_id', 'quantity', 'weight', 'criteria', 'rarity']));
 
             return $this->commitReturn($table);
-        } catch(\Exception $e) {
+        } catch (\Exception $e) {
             $this->setError('error', $e->getMessage());
         }
+
         return $this->rollbackReturn(false);
     }
 
     /**
      * Updates a loot table.
      *
-     * @param  \App\Models\Loot\LootTable  $table
-     * @param  array                       $data
-     * @return bool|\App\Models\Loot\LootTable
+     * @param \App\Models\Loot\LootTable $table
+     * @param array                      $data
+     *
+     * @return \App\Models\Loot\LootTable|bool
      */
-    public function updateLootTable($table, $data)
-    {
+    public function updateLootTable($table, $data) {
         DB::beginTransaction();
 
         try {
-
             // More specific validation
-            foreach($data['rewardable_type'] as $key => $type)
-            {
-                if(!$type) throw new \Exception("Loot type is required.");
-                if($type != 'ItemRarity' && !$data['rewardable_id'][$key]) throw new \Exception("Reward is required.");
-                if(!$data['quantity'][$key] || $data['quantity'][$key] < 1) throw new \Exception("Quantity is required and must be an integer greater than 0.");
-                if(!$data['weight'][$key] || $data['weight'][$key] < 1) throw new \Exception("Weight is required and must be an integer greater than 0.");
-                if($type == 'ItemCategoryRarity') {
-                    if(!isset($data['criteria'][$key]) || !$data['criteria'][$key]) throw new \Exception("Criteria is required for conditional item categories.");
-                    if(!isset($data['rarity'][$key]) || !$data['rarity'][$key]) throw new \Exception("A rarity is required for conditional item categories.");
+            foreach ($data['rewardable_type'] as $key => $type) {
+                if (!$type) {
+                    throw new \Exception('Loot type is required.');
+                }
+                if ($type != 'ItemRarity' && !$data['rewardable_id'][$key]) {
+                    throw new \Exception('Reward is required.');
+                }
+                if (!$data['quantity'][$key] || $data['quantity'][$key] < 1) {
+                    throw new \Exception('Quantity is required and must be an integer greater than 0.');
+                }
+                if (!$data['weight'][$key] || $data['weight'][$key] < 1) {
+                    throw new \Exception('Weight is required and must be an integer greater than 0.');
+                }
+                if ($type == 'ItemCategoryRarity') {
+                    if (!isset($data['criteria'][$key]) || !$data['criteria'][$key]) {
+                        throw new \Exception('Criteria is required for conditional item categories.');
+                    }
+                    if (!isset($data['rarity'][$key]) || !$data['rarity'][$key]) {
+                        throw new \Exception('A rarity is required for conditional item categories.');
+                    }
                 }
             }
 
@@ -88,65 +106,68 @@ public function updateLootTable($table, $data)
             $this->populateLootTable($table, Arr::only($data, ['rewardable_type', 'rewardable_id', 'quantity', 'weight', 'criteria', 'rarity']));
 
             return $this->commitReturn($table);
-        } catch(\Exception $e) {
+        } catch (\Exception $e) {
             $this->setError('error', $e->getMessage());
         }
-        return $this->rollbackReturn(false);
-    }
-
-    /**
-     * Handles the creation of loot for a loot table.
-     *
-     * @param  \App\Models\Loot\LootTable  $table
-     * @param  array                       $data
-     */
-    private function populateLootTable($table, $data)
-    {
-        // Clear the old loot...
-        $table->loot()->delete();
-
-        foreach($data['rewardable_type'] as $key => $type)
-        {
-            if($type == 'ItemCategoryRarity' || $type == 'ItemRarity')
-                $lootData = [
-                    'criteria' => $data['criteria'][$key],
-                    'rarity' => $data['rarity'][$key]
-                ];
 
-            Loot::create([
-                'loot_table_id'   => $table->id,
-                'rewardable_type' => $type,
-                'rewardable_id'   => isset($data['rewardable_id'][$key]) ? $data['rewardable_id'][$key] : 1,
-                'quantity'        => $data['quantity'][$key],
-                'weight'          => $data['weight'][$key],
-                'data'            => isset($lootData) ? json_encode($lootData) : null
-            ]);
-        }
+        return $this->rollbackReturn(false);
     }
 
     /**
      * Deletes a loot table.
      *
-     * @param  \App\Models\Loot\LootTable  $table
+     * @param \App\Models\Loot\LootTable $table
+     *
      * @return bool
      */
-    public function deleteLootTable($table)
-    {
+    public function deleteLootTable($table) {
         DB::beginTransaction();
 
         try {
             // Check first if the table is currently in use
             // - Prompts
             // - Box rewards (unfortunately this can't be checked easily)
-            if(PromptReward::where('rewardable_type', 'LootTable')->where('rewardable_id', $table->id)->exists()) throw new \Exception("A prompt uses this table to distribute rewards. Please remove it from the rewards list first.");
+            if (PromptReward::where('rewardable_type', 'LootTable')->where('rewardable_id', $table->id)->exists()) {
+                throw new \Exception('A prompt uses this table to distribute rewards. Please remove it from the rewards list first.');
+            }
 
             $table->loot()->delete();
             $table->delete();
 
             return $this->commitReturn(true);
-        } catch(\Exception $e) {
+        } catch (\Exception $e) {
             $this->setError('error', $e->getMessage());
         }
+
         return $this->rollbackReturn(false);
     }
+
+    /**
+     * Handles the creation of loot for a loot table.
+     *
+     * @param \App\Models\Loot\LootTable $table
+     * @param array                      $data
+     */
+    private function populateLootTable($table, $data) {
+        // Clear the old loot...
+        $table->loot()->delete();
+
+        foreach ($data['rewardable_type'] as $key => $type) {
+            if ($type == 'ItemCategoryRarity' || $type == 'ItemRarity') {
+                $lootData = [
+                    'criteria' => $data['criteria'][$key],
+                    'rarity'   => $data['rarity'][$key],
+                ];
+            }
+
+            Loot::create([
+                'loot_table_id'   => $table->id,
+                'rewardable_type' => $type,
+                'rewardable_id'   => $data['rewardable_id'][$key] ?? 1,
+                'quantity'        => $data['quantity'][$key],
+                'weight'          => $data['weight'][$key],
+                'data'            => isset($lootData) ? json_encode($lootData) : null,
+            ]);
+        }
+    }
 }
diff --git a/app/Services/NewsService.php b/app/Services/NewsService.php
index 46482b3c04..5a40a17426 100644
--- a/app/Services/NewsService.php
+++ b/app/Services/NewsService.php
@@ -1,15 +1,12 @@
-<?php namespace App\Services;
+<?php
 
-use App\Services\Service;
+namespace App\Services;
 
-use DB;
-use Config;
-
-use App\Models\User\User;
 use App\Models\News;
+use App\Models\User\User;
+use Illuminate\Support\Facades\DB;
 
-class NewsService extends Service
-{
+class NewsService extends Service {
     /*
     |--------------------------------------------------------------------------
     | News Service
@@ -22,74 +19,85 @@ class NewsService extends Service
     /**
      * Creates a news post.
      *
-     * @param  array                  $data
-     * @param  \App\Models\User\User  $user
-     * @return bool|\App\Models\News
+     * @param array                 $data
+     * @param \App\Models\User\User $user
+     *
+     * @return \App\Models\News|bool
      */
-    public function createNews($data, $user)
-    {
+    public function createNews($data, $user) {
         DB::beginTransaction();
 
         try {
             $data['parsed_text'] = parse($data['text']);
             $data['user_id'] = $user->id;
-            if(!isset($data['is_visible'])) $data['is_visible'] = 0;
+            if (!isset($data['is_visible'])) {
+                $data['is_visible'] = 0;
+            }
 
             $news = News::create($data);
 
-            if($news->is_visible) $this->alertUsers();
+            if ($news->is_visible) {
+                $this->alertUsers();
+            }
 
             return $this->commitReturn($news);
-        } catch(\Exception $e) { 
+        } catch (\Exception $e) {
             $this->setError('error', $e->getMessage());
         }
+
         return $this->rollbackReturn(false);
     }
 
     /**
      * Updates a news post.
      *
-     * @param  \App\Models\News       $news
-     * @param  array                  $data 
-     * @param  \App\Models\User\User  $user
-     * @return bool|\App\Models\News
+     * @param \App\Models\News      $news
+     * @param array                 $data
+     * @param \App\Models\User\User $user
+     *
+     * @return \App\Models\News|bool
      */
-    public function updateNews($news, $data, $user)
-    {
+    public function updateNews($news, $data, $user) {
         DB::beginTransaction();
 
         try {
             $data['parsed_text'] = parse($data['text']);
             $data['user_id'] = $user->id;
-            if(!isset($data['is_visible'])) $data['is_visible'] = 0;
-            if(isset($data['bump']) && $data['is_visible'] == 1 && $data['bump'] == 1) $this->alertUsers();
+            if (!isset($data['is_visible'])) {
+                $data['is_visible'] = 0;
+            }
+            if (isset($data['bump']) && $data['is_visible'] == 1 && $data['bump'] == 1) {
+                $this->alertUsers();
+            }
 
             $news->update($data);
 
             return $this->commitReturn($news);
-        } catch(\Exception $e) { 
+        } catch (\Exception $e) {
             $this->setError('error', $e->getMessage());
         }
+
         return $this->rollbackReturn(false);
     }
 
     /**
      * Deletes a news post.
      *
-     * @param  \App\Models\News  $news
+     * @param \App\Models\News $news
+     *
      * @return bool
      */
-    public function deleteNews($news)
-    {
+    public function deleteNews($news) {
         DB::beginTransaction();
 
         try {
             $news->delete();
 
             return $this->commitReturn(true);
-        } catch(\Exception $e) { 
+        } catch (\Exception $e) {
             $this->setError('error', $e->getMessage());
         }
+
         return $this->rollbackReturn(false);
     }
 
@@ -99,10 +107,9 @@ public function deleteNews($news)
      *
      * @return bool
      */
-    public function updateQueue()
-    {
+    public function updateQueue() {
         $count = News::shouldBeVisible()->count();
-        if($count) {
+        if ($count) {
             DB::beginTransaction();
 
             try {
@@ -110,9 +117,10 @@ public function updateQueue()
                 $this->alertUsers();
 
                 return $this->commitReturn(true);
-            } catch(\Exception $e) { 
+            } catch (\Exception $e) {
                 $this->setError('error', $e->getMessage());
             }
+
             return $this->rollbackReturn(false);
         }
     }
@@ -123,9 +131,9 @@ public function updateQueue()
      *
      * @return bool
      */
-    private function alertUsers()
-    {
+    private function alertUsers() {
         User::query()->update(['is_news_unread' => 1]);
+
         return true;
     }
-}
\ No newline at end of file
+}
diff --git a/app/Services/PageService.php b/app/Services/PageService.php
index b7b3d9ea0c..b3e8dfba25 100644
--- a/app/Services/PageService.php
+++ b/app/Services/PageService.php
@@ -1,14 +1,11 @@
-<?php namespace App\Services;
+<?php
 
-use App\Services\Service;
-
-use DB;
-use Config;
+namespace App\Services;
 
 use App\Models\SitePage;
+use Illuminate\Support\Facades\DB;
 
-class PageService extends Service
-{
+class PageService extends Service {
     /*
     |--------------------------------------------------------------------------
     | Page Service
@@ -21,79 +18,100 @@ class PageService extends Service
     /**
      * Creates a site page.
      *
-     * @param  array                  $data
-     * @param  \App\Models\User\User  $user
-     * @return bool|\App\Models\SitePage
+     * @param array                 $data
+     * @param \App\Models\User\User $user
+     *
+     * @return \App\Models\SitePage|bool
      */
-    public function createPage($data, $user)
-    {
+    public function createPage($data, $user) {
         DB::beginTransaction();
 
         try {
-            if(isset($data['text']) && $data['text']) $data['parsed_text'] = parse($data['text']);
+            if (isset($data['text']) && $data['text']) {
+                $data['parsed_text'] = parse($data['text']);
+            }
             $data['user_id'] = $user->id;
-            if(!isset($data['is_visible'])) $data['is_visible'] = 0;
-            if(!isset($data['can_comment'])) $data['can_comment'] = 0;
+            if (!isset($data['is_visible'])) {
+                $data['is_visible'] = 0;
+            }
+            if (!isset($data['can_comment'])) {
+                $data['can_comment'] = 0;
+                $data['allow_dislikes'] = 0;
+            }
 
             $page = SitePage::create($data);
 
             return $this->commitReturn($page);
-        } catch(\Exception $e) { 
+        } catch (\Exception $e) {
             $this->setError('error', $e->getMessage());
         }
+
         return $this->rollbackReturn(false);
     }
 
     /**
      * Updates a site page.
      *
-     * @param  \App\Models\SitePage   $news
-     * @param  array                  $data 
-     * @param  \App\Models\User\User  $user
-     * @return bool|\App\Models\SitePage
+     * @param array                 $data
+     * @param \App\Models\User\User $user
+     * @param mixed                 $page
+     *
+     * @return \App\Models\SitePage|bool
      */
-    public function updatePage($page, $data, $user)
-    {
+    public function updatePage($page, $data, $user) {
         DB::beginTransaction();
 
         try {
             // More specific validation
-            if(SitePage::where('key', $data['key'])->where('id', '!=', $page->id)->exists()) throw new \Exception("The key has already been taken.");
+            if (SitePage::where('key', $data['key'])->where('id', '!=', $page->id)->exists()) {
+                throw new \Exception('The key has already been taken.');
+            }
 
-            if(isset($data['text']) && $data['text']) $data['parsed_text'] = parse($data['text']);
+            if (isset($data['text']) && $data['text']) {
+                $data['parsed_text'] = parse($data['text']);
+            }
             $data['user_id'] = $user->id;
-            if(!isset($data['is_visible'])) $data['is_visible'] = 0;
-            if(!isset($data['can_comment'])) $data['can_comment'] = 0;
+            if (!isset($data['is_visible'])) {
+                $data['is_visible'] = 0;
+            }
+            if (!isset($data['can_comment'])) {
+                $data['can_comment'] = 0;
+                $data['allow_dislikes'] = 0;
+            }
 
             $page->update($data);
 
             return $this->commitReturn($page);
-        } catch(\Exception $e) { 
+        } catch (\Exception $e) {
             $this->setError('error', $e->getMessage());
         }
+
         return $this->rollbackReturn(false);
     }
 
     /**
      * Deletes a site page.
      *
-     * @param  \App\Models\SitePage  $news
+     * @param mixed $page
+     *
      * @return bool
      */
-    public function deletePage($page)
-    {
+    public function deletePage($page) {
         DB::beginTransaction();
 
         try {
             // Specific pages such as the TOS/privacy policy cannot be deleted from the admin panel.
-            if(Config::get('lorekeeper.text_pages.'.$page->key)) throw new \Exception("You cannot delete this page.");
+            if (config('lorekeeper.text_pages.'.$page->key)) {
+                throw new \Exception('You cannot delete this page.');
+            }
 
             $page->delete();
 
             return $this->commitReturn(true);
-        } catch(\Exception $e) { 
+        } catch (\Exception $e) {
             $this->setError('error', $e->getMessage());
         }
+
         return $this->rollbackReturn(false);
     }
-}
\ No newline at end of file
+}
diff --git a/app/Services/PromptService.php b/app/Services/PromptService.php
index 99cdc4bdb6..2ff79be1f9 100644
--- a/app/Services/PromptService.php
+++ b/app/Services/PromptService.php
@@ -1,18 +1,15 @@
-<?php namespace App\Services;
+<?php
 
-use App\Services\Service;
+namespace App\Services;
 
-use DB;
-use Config;
-
-use Illuminate\Support\Arr;
-use App\Models\Prompt\PromptCategory;
 use App\Models\Prompt\Prompt;
+use App\Models\Prompt\PromptCategory;
 use App\Models\Prompt\PromptReward;
 use App\Models\Submission\Submission;
+use Illuminate\Support\Arr;
+use Illuminate\Support\Facades\DB;
 
-class PromptService extends Service
-{
+class PromptService extends Service {
     /*
     |--------------------------------------------------------------------------
     | Prompt Service
@@ -31,144 +28,135 @@ class PromptService extends Service
     /**
      * Create a category.
      *
-     * @param  array                 $data
-     * @param  \App\Models\User\User $user
+     * @param array                 $data
+     * @param \App\Models\User\User $user
+     *
      * @return \App\Models\Prompt\PromptCategory|bool
      */
-    public function createPromptCategory($data, $user)
-    {
+    public function createPromptCategory($data, $user) {
         DB::beginTransaction();
 
         try {
-
             $data = $this->populateCategoryData($data);
 
             $image = null;
-            if(isset($data['image']) && $data['image']) {
+            if (isset($data['image']) && $data['image']) {
                 $data['has_image'] = 1;
+                $data['hash'] = randomString(10);
                 $image = $data['image'];
                 unset($data['image']);
+            } else {
+                $data['has_image'] = 0;
             }
-            else $data['has_image'] = 0;
 
             $category = PromptCategory::create($data);
 
-            if ($image) $this->handleImage($image, $category->categoryImagePath, $category->categoryImageFileName);
+            if ($image) {
+                $this->handleImage($image, $category->categoryImagePath, $category->categoryImageFileName);
+            }
 
             return $this->commitReturn($category);
-        } catch(\Exception $e) {
+        } catch (\Exception $e) {
             $this->setError('error', $e->getMessage());
         }
+
         return $this->rollbackReturn(false);
     }
 
     /**
      * Update a category.
      *
-     * @param  \App\Models\Prompt\PromptCategory  $category
-     * @param  array                              $data
-     * @param  \App\Models\User\User              $user
+     * @param \App\Models\Prompt\PromptCategory $category
+     * @param array                             $data
+     * @param \App\Models\User\User             $user
+     *
      * @return \App\Models\Prompt\PromptCategory|bool
      */
-    public function updatePromptCategory($category, $data, $user)
-    {
+    public function updatePromptCategory($category, $data, $user) {
         DB::beginTransaction();
 
         try {
             // More specific validation
-            if(PromptCategory::where('name', $data['name'])->where('id', '!=', $category->id)->exists()) throw new \Exception("The name has already been taken.");
+            if (PromptCategory::where('name', $data['name'])->where('id', '!=', $category->id)->exists()) {
+                throw new \Exception('The name has already been taken.');
+            }
 
             $data = $this->populateCategoryData($data, $category);
 
             $image = null;
-            if(isset($data['image']) && $data['image']) {
+            if (isset($data['image']) && $data['image']) {
                 $data['has_image'] = 1;
+                $data['hash'] = randomString(10);
                 $image = $data['image'];
                 unset($data['image']);
             }
 
             $category->update($data);
 
-            if ($category) $this->handleImage($image, $category->categoryImagePath, $category->categoryImageFileName);
+            if ($category) {
+                $this->handleImage($image, $category->categoryImagePath, $category->categoryImageFileName);
+            }
 
             return $this->commitReturn($category);
-        } catch(\Exception $e) {
+        } catch (\Exception $e) {
             $this->setError('error', $e->getMessage());
         }
-        return $this->rollbackReturn(false);
-    }
-
-    /**
-     * Handle category data.
-     *
-     * @param  array                                   $data
-     * @param  \App\Models\Prompt\PromptCategory|null  $category
-     * @return array
-     */
-    private function populateCategoryData($data, $category = null)
-    {
-        if(isset($data['description']) && $data['description']) $data['parsed_description'] = parse($data['description']);
-        elseif(!isset($data['description']) && !$data['description']) $data['parsed_description'] = null;
-
-        if(isset($data['remove_image']))
-        {
-            if($category && $category->has_image && $data['remove_image'])
-            {
-                $data['has_image'] = 0;
-                $this->deleteImage($category->categoryImagePath, $category->categoryImageFileName);
-            }
-            unset($data['remove_image']);
-        }
 
-        return $data;
+        return $this->rollbackReturn(false);
     }
 
     /**
      * Delete a category.
      *
-     * @param  \App\Models\Prompt\PromptCategory  $category
+     * @param \App\Models\Prompt\PromptCategory $category
+     *
      * @return bool
      */
-    public function deletePromptCategory($category)
-    {
+    public function deletePromptCategory($category) {
         DB::beginTransaction();
 
         try {
             // Check first if the category is currently in use
-            if(Prompt::where('prompt_category_id', $category->id)->exists()) throw new \Exception("An prompt with this category exists. Please change its category first.");
+            if (Prompt::where('prompt_category_id', $category->id)->exists()) {
+                throw new \Exception('An prompt with this category exists. Please change its category first.');
+            }
 
-            if($category->has_image) $this->deleteImage($category->categoryImagePath, $category->categoryImageFileName);
+            if ($category->has_image) {
+                $this->deleteImage($category->categoryImagePath, $category->categoryImageFileName);
+            }
             $category->delete();
 
             return $this->commitReturn(true);
-        } catch(\Exception $e) {
+        } catch (\Exception $e) {
             $this->setError('error', $e->getMessage());
         }
+
         return $this->rollbackReturn(false);
     }
 
     /**
      * Sorts category order.
      *
-     * @param  array  $data
+     * @param array $data
+     *
      * @return bool
      */
-    public function sortPromptCategory($data)
-    {
+    public function sortPromptCategory($data) {
         DB::beginTransaction();
 
         try {
             // explode the sort array and reverse it since the order is inverted
             $sort = array_reverse(explode(',', $data));
 
-            foreach($sort as $key => $s) {
+            foreach ($sort as $key => $s) {
                 PromptCategory::where('id', $s)->update(['sort' => $key]);
             }
 
             return $this->commitReturn(true);
-        } catch(\Exception $e) {
+        } catch (\Exception $e) {
             $this->setError('error', $e->getMessage());
         }
+
         return $this->rollbackReturn(false);
     }
 
@@ -181,107 +169,197 @@ public function sortPromptCategory($data)
     /**
      * Creates a new prompt.
      *
-     * @param  array                  $data
-     * @param  \App\Models\User\User  $user
-     * @return bool|\App\Models\Prompt\Prompt
+     * @param array                 $data
+     * @param \App\Models\User\User $user
+     *
+     * @return \App\Models\Prompt\Prompt|bool
      */
-    public function createPrompt($data, $user)
-    {
+    public function createPrompt($data, $user) {
         DB::beginTransaction();
 
         try {
-            if(isset($data['prompt_category_id']) && $data['prompt_category_id'] == 'none') $data['prompt_category_id'] = null;
+            if (isset($data['prompt_category_id']) && $data['prompt_category_id'] == 'none') {
+                $data['prompt_category_id'] = null;
+            }
 
-            if((isset($data['prompt_category_id']) && $data['prompt_category_id']) && !PromptCategory::where('id', $data['prompt_category_id'])->exists()) throw new \Exception("The selected prompt category is invalid.");
+            if ((isset($data['prompt_category_id']) && $data['prompt_category_id']) && !PromptCategory::where('id', $data['prompt_category_id'])->exists()) {
+                throw new \Exception('The selected prompt category is invalid.');
+            }
 
             $data = $this->populateData($data);
 
             $image = null;
-            if(isset($data['image']) && $data['image']) {
+            if (isset($data['image']) && $data['image']) {
                 $data['has_image'] = 1;
+                $data['hash'] = randomString(10);
                 $image = $data['image'];
                 unset($data['image']);
+            } else {
+                $data['has_image'] = 0;
             }
-            else $data['has_image'] = 0;
 
-            if(!isset($data['hide_submissions']) && !$data['hide_submissions']) $data['hide_submissions'] = 0;
+            if (!isset($data['hide_submissions']) && !$data['hide_submissions']) {
+                $data['hide_submissions'] = 0;
+            }
 
-            $prompt = Prompt::create(Arr::only($data, ['prompt_category_id', 'name', 'summary', 'description', 'parsed_description', 'is_active', 'start_at', 'end_at', 'hide_before_start', 'hide_after_end', 'has_image', 'prefix', 'hide_submissions']));
+            $prompt = Prompt::create(Arr::only($data, ['prompt_category_id', 'name', 'summary', 'description', 'parsed_description', 'is_active', 'start_at', 'end_at', 'hide_before_start', 'hide_after_end', 'has_image', 'prefix', 'hide_submissions', 'staff_only', 'hash']));
 
-            if ($image) $this->handleImage($image, $prompt->imagePath, $prompt->imageFileName);
+            if ($image) {
+                $this->handleImage($image, $prompt->imagePath, $prompt->imageFileName);
+            }
 
             $this->populateRewards(Arr::only($data, ['rewardable_type', 'rewardable_id', 'quantity']), $prompt);
 
             return $this->commitReturn($prompt);
-        } catch(\Exception $e) {
+        } catch (\Exception $e) {
             $this->setError('error', $e->getMessage());
         }
+
         return $this->rollbackReturn(false);
     }
 
     /**
      * Updates a prompt.
      *
-     * @param  \App\Models\Prompt\Prompt  $prompt
-     * @param  array                      $data
-     * @param  \App\Models\User\User      $user
-     * @return bool|\App\Models\Prompt\Prompt
+     * @param \App\Models\Prompt\Prompt $prompt
+     * @param array                     $data
+     * @param \App\Models\User\User     $user
+     *
+     * @return \App\Models\Prompt\Prompt|bool
      */
-    public function updatePrompt($prompt, $data, $user)
-    {
+    public function updatePrompt($prompt, $data, $user) {
         DB::beginTransaction();
 
         try {
-            if(isset($data['prompt_category_id']) && $data['prompt_category_id'] == 'none') $data['prompt_category_id'] = null;
+            if (isset($data['prompt_category_id']) && $data['prompt_category_id'] == 'none') {
+                $data['prompt_category_id'] = null;
+            }
 
             // More specific validation
-            if(Prompt::where('name', $data['name'])->where('id', '!=', $prompt->id)->exists()) throw new \Exception("The name has already been taken.");
-            if((isset($data['prompt_category_id']) && $data['prompt_category_id']) && !PromptCategory::where('id', $data['prompt_category_id'])->exists()) throw new \Exception("The selected prompt category is invalid.");
-            if(isset($data['prefix']) && Prompt::where('prefix', $data['prefix'])->where('id', '!=', $prompt->id)->exists()) throw new \Exception("That prefix has already been taken.");
+            if (Prompt::where('name', $data['name'])->where('id', '!=', $prompt->id)->exists()) {
+                throw new \Exception('The name has already been taken.');
+            }
+            if ((isset($data['prompt_category_id']) && $data['prompt_category_id']) && !PromptCategory::where('id', $data['prompt_category_id'])->exists()) {
+                throw new \Exception('The selected prompt category is invalid.');
+            }
+            if (isset($data['prefix']) && Prompt::where('prefix', $data['prefix'])->where('id', '!=', $prompt->id)->exists()) {
+                throw new \Exception('That prefix has already been taken.');
+            }
 
             $data = $this->populateData($data, $prompt);
 
             $image = null;
-            if(isset($data['image']) && $data['image']) {
+            if (isset($data['image']) && $data['image']) {
                 $data['has_image'] = 1;
+                $data['hash'] = randomString(10);
                 $image = $data['image'];
                 unset($data['image']);
             }
 
-            if(!isset($data['hide_submissions']) && !$data['hide_submissions']) $data['hide_submissions'] = 0;
+            if (!isset($data['hide_submissions']) && !$data['hide_submissions']) {
+                $data['hide_submissions'] = 0;
+            }
 
-            $prompt->update(Arr::only($data, ['prompt_category_id', 'name', 'summary', 'description', 'parsed_description', 'is_active', 'start_at', 'end_at', 'hide_before_start', 'hide_after_end', 'has_image', 'prefix', 'hide_submissions']));
+            $prompt->update(Arr::only($data, ['prompt_category_id', 'name', 'summary', 'description', 'parsed_description', 'is_active', 'start_at', 'end_at', 'hide_before_start', 'hide_after_end', 'has_image', 'prefix', 'hide_submissions', 'staff_only', 'hash']));
 
-            if ($prompt) $this->handleImage($image, $prompt->imagePath, $prompt->imageFileName);
+            if ($prompt) {
+                $this->handleImage($image, $prompt->imagePath, $prompt->imageFileName);
+            }
 
             $this->populateRewards(Arr::only($data, ['rewardable_type', 'rewardable_id', 'quantity']), $prompt);
 
             return $this->commitReturn($prompt);
-        } catch(\Exception $e) {
+        } catch (\Exception $e) {
+            $this->setError('error', $e->getMessage());
+        }
+
+        return $this->rollbackReturn(false);
+    }
+
+    /**
+     * Deletes a prompt.
+     *
+     * @param \App\Models\Prompt\Prompt $prompt
+     *
+     * @return bool
+     */
+    public function deletePrompt($prompt) {
+        DB::beginTransaction();
+
+        try {
+            // Check first if the category is currently in use
+            if (Submission::where('prompt_id', $prompt->id)->exists()) {
+                throw new \Exception('A submission under this prompt exists. Deleting the prompt will break the submission page - consider setting the prompt to be not active instead.');
+            }
+
+            $prompt->rewards()->delete();
+            if ($prompt->has_image) {
+                $this->deleteImage($prompt->imagePath, $prompt->imageFileName);
+            }
+            $prompt->delete();
+
+            return $this->commitReturn(true);
+        } catch (\Exception $e) {
             $this->setError('error', $e->getMessage());
         }
+
         return $this->rollbackReturn(false);
     }
 
+    /**
+     * Handle category data.
+     *
+     * @param array                                  $data
+     * @param \App\Models\Prompt\PromptCategory|null $category
+     *
+     * @return array
+     */
+    private function populateCategoryData($data, $category = null) {
+        if (isset($data['description']) && $data['description']) {
+            $data['parsed_description'] = parse($data['description']);
+        } elseif (!isset($data['description']) && !$data['description']) {
+            $data['parsed_description'] = null;
+        }
+
+        if (isset($data['remove_image'])) {
+            if ($category && $category->has_image && $data['remove_image']) {
+                $data['has_image'] = 0;
+                $this->deleteImage($category->categoryImagePath, $category->categoryImageFileName);
+            }
+            unset($data['remove_image']);
+        }
+
+        return $data;
+    }
+
     /**
      * Processes user input for creating/updating a prompt.
      *
-     * @param  array                      $data
-     * @param  \App\Models\Prompt\Prompt  $prompt
+     * @param array                     $data
+     * @param \App\Models\Prompt\Prompt $prompt
+     *
      * @return array
      */
-    private function populateData($data, $prompt = null)
-    {
-        if(isset($data['description']) && $data['description']) $data['parsed_description'] = parse($data['description']);
-
-        if(!isset($data['hide_before_start'])) $data['hide_before_start'] = 0;
-        if(!isset($data['hide_after_end'])) $data['hide_after_end'] = 0;
-        if(!isset($data['is_active'])) $data['is_active'] = 0;
-
-        if(isset($data['remove_image']))
-        {
-            if($prompt && $prompt->has_image && $data['remove_image'])
-            {
+    private function populateData($data, $prompt = null) {
+        if (isset($data['description']) && $data['description']) {
+            $data['parsed_description'] = parse($data['description']);
+        }
+
+        if (!isset($data['hide_before_start'])) {
+            $data['hide_before_start'] = 0;
+        }
+        if (!isset($data['hide_after_end'])) {
+            $data['hide_after_end'] = 0;
+        }
+        if (!isset($data['is_active'])) {
+            $data['is_active'] = 0;
+        }
+        if (!isset($data['staff_only'])) {
+            $data['staff_only'] = 0;
+        }
+
+        if (isset($data['remove_image'])) {
+            if ($prompt && $prompt->has_image && $data['remove_image']) {
                 $data['has_image'] = 0;
                 $this->deleteImage($prompt->imagePath, $prompt->imageFileName);
             }
@@ -294,17 +372,15 @@ private function populateData($data, $prompt = null)
     /**
      * Processes user input for creating/updating prompt rewards.
      *
-     * @param  array                      $data
-     * @param  \App\Models\Prompt\Prompt  $prompt
+     * @param array                     $data
+     * @param \App\Models\Prompt\Prompt $prompt
      */
-    private function populateRewards($data, $prompt)
-    {
+    private function populateRewards($data, $prompt) {
         // Clear the old rewards...
         $prompt->rewards()->delete();
 
-        if(isset($data['rewardable_type'])) {
-            foreach($data['rewardable_type'] as $key => $type)
-            {
+        if (isset($data['rewardable_type'])) {
+            foreach ($data['rewardable_type'] as $key => $type) {
                 PromptReward::create([
                     'prompt_id'       => $prompt->id,
                     'rewardable_type' => $type,
@@ -314,29 +390,4 @@ private function populateRewards($data, $prompt)
             }
         }
     }
-
-    /**
-     * Deletes a prompt.
-     *
-     * @param  \App\Models\Prompt\Prompt  $prompt
-     * @return bool
-     */
-    public function deletePrompt($prompt)
-    {
-        DB::beginTransaction();
-
-        try {
-            // Check first if the category is currently in use
-            if(Submission::where('prompt_id', $prompt->id)->exists()) throw new \Exception("A submission under this prompt exists. Deleting the prompt will break the submission page - consider setting the prompt to be not active instead.");
-
-            $prompt->rewards()->delete();
-            if($prompt->has_image) $this->deleteImage($prompt->imagePath, $prompt->imageFileName);
-            $prompt->delete();
-
-            return $this->commitReturn(true);
-        } catch(\Exception $e) {
-            $this->setError('error', $e->getMessage());
-        }
-        return $this->rollbackReturn(false);
-    }
 }
diff --git a/app/Services/RaffleManager.php b/app/Services/RaffleManager.php
index 0649f0896c..c23af2971a 100644
--- a/app/Services/RaffleManager.php
+++ b/app/Services/RaffleManager.php
@@ -1,15 +1,14 @@
-<?php namespace App\Services;
+<?php
+
+namespace App\Services;
 
-use DB;
-use Carbon\Carbon;
-use App\Services\Service;
-use App\Models\Raffle\RaffleGroup;
 use App\Models\Raffle\Raffle;
 use App\Models\Raffle\RaffleTicket;
 use App\Models\User\User;
+use Carbon\Carbon;
+use Illuminate\Support\Facades\DB;
 
-class RaffleManager extends Service 
-{
+class RaffleManager extends Service {
     /*
     |--------------------------------------------------------------------------
     | Raffle Manager
@@ -20,67 +19,80 @@ class RaffleManager extends Service
     */
 
     /**
-     * Adds tickets to a raffle. 
-     * One ticket is added per name in $names, which is a
-     * string containing comma-separated names.
+     * Adds tickets to a raffle.
+     *
+     * @param \App\Models\Raffle\Raffle $raffle
+     * @param array                     $data
      *
-     * @param  \App\Models\Raffle\Raffle $raffle
-     * @param  string                    $names
      * @return int
      */
-    public function addTickets($raffle, $names)
-    {
-        $names = explode(',', $names);
+    public function addTickets($raffle, $data) {
         $count = 0;
-        foreach($names as $name)
-        {
-            $name = trim($name);
-            if(strlen($name) == 0) continue;
-            if ($user = User::where('name', $name)->first())
-                $count += $this->addTicket($user, $raffle);
-            else
-                $count += $this->addTicket($name, $raffle);
+        foreach ($data['user_id'] as $key=> $id) {
+            if ($user = User::where('id', $id)->first()) {
+                if ($this->addTicket($user, $raffle, $data['ticket_count'][$key])) {
+                    $count += $data['ticket_count'][$key];
+                }
+            } else {
+                if ($this->addTicket($data['alias'][$key], $raffle, $data['ticket_count'][$key])) {
+                    $count += $data['ticket_count'][$key];
+                }
+            }
         }
+
         return $count;
     }
 
     /**
      * Adds one or more tickets to a single user for a raffle.
      *
-     * @param  \App\Models\User\User     $user
-     * @param  \App\Models\Raffle\Raffle $raffle
-     * @param  int                       $count
+     * @param \App\Models\User\User     $user
+     * @param \App\Models\Raffle\Raffle $raffle
+     * @param int                       $count
+     *
      * @return int
      */
-    public function addTicket($user, $raffle, $count = 1)
-    {
-        if (!$user) return 0;
-        else if (!$raffle) return 0;
-        else if ($count == 0) return 0;
-        else if ($raffle->rolled_at != null) return 0;
-        else {
+    public function addTicket($user, $raffle, $count = 1) {
+        if (!$user) {
+            return 0;
+        } elseif (!$raffle) {
+            return 0;
+        } elseif ($count == 0) {
+            return 0;
+        } elseif ($raffle->rolled_at != null) {
+            return 0;
+        } elseif ($raffle->ticket_cap > 0 && ((is_string($user) ? $raffle->tickets()->where('alias', $user)->count() : $raffle->tickets()->where('user_id', $user->id)->count()) > $raffle->ticket_cap || (is_string($user) ? $raffle->tickets()->where('alias', $user)->count() : $raffle->tickets()->where('user_id', $user->id)->count()) + $count > $raffle->ticket_cap)) {
+            return 0;
+        } else {
             DB::beginTransaction();
-            $data = ["raffle_id" => $raffle->id, 'created_at' => Carbon::now()] + (is_string($user) ? ['alias' => $user] : ['user_id' => $user->id]);
-            for ($i = 0; $i < $count; $i++) RaffleTicket::create($data);
+            $data = ['raffle_id' => $raffle->id, 'created_at' => Carbon::now()] + (is_string($user) ? ['alias' => $user] : ['user_id' => $user->id]);
+            for ($i = 0; $i < $count; $i++) {
+                RaffleTicket::create($data);
+            }
             DB::commit();
+
             return 1;
         }
+
         return 0;
     }
 
     /**
      * Removes a single ticket.
      *
-     * @param  \App\Models\Raffle\RaffleTicket $ticket
+     * @param \App\Models\Raffle\RaffleTicket $ticket
+     *
      * @return bool
      */
-    public function removeTicket($ticket)
-    {
-        if (!$ticket) return null;
-        else {
+    public function removeTicket($ticket) {
+        if (!$ticket) {
+            return null;
+        } else {
             $ticket->delete();
+
             return true;
         }
+
         return false;
     }
 
@@ -89,25 +101,27 @@ public function removeTicket($ticket)
      * If the $updateGroup flag is true, winners will be removed
      * from other raffles in the group.
      *
-     * @param  \App\Models\Raffle\RaffleGroup $raffleGroup
-     * @param  bool                           $updateGroup
+     * @param \App\Models\Raffle\RaffleGroup $raffleGroup
+     * @param bool                           $updateGroup
+     *
      * @return bool
      */
-    public function rollRaffleGroup($raffleGroup, $updateGroup = true)
-    {
-        if(!$raffleGroup) return null;
+    public function rollRaffleGroup($raffleGroup, $updateGroup = true) {
+        if (!$raffleGroup) {
+            return null;
+        }
         DB::beginTransaction();
-        foreach($raffleGroup->raffles()->orderBy('order')->get() as $raffle)
-        {
-            if (!$this->rollRaffle($raffle, $updateGroup)) 
-            {
+        foreach ($raffleGroup->raffles()->orderBy('order')->get() as $raffle) {
+            if (!$this->rollRaffle($raffle, $updateGroup)) {
                 DB::rollback();
+
                 return false;
             }
         }
         $raffleGroup->is_active = 2;
         $raffleGroup->save();
         DB::commit();
+
         return true;
     }
 
@@ -116,49 +130,53 @@ public function rollRaffleGroup($raffleGroup, $updateGroup = true)
      * If the $updateGroup flag is true, winners will be removed
      * from other raffles in the group.
      *
-     * @param  \App\Models\Raffle\Raffle $raffle
-     * @param  bool                      $updateGroup
+     * @param \App\Models\Raffle\Raffle $raffle
+     * @param bool                      $updateGroup
+     *
      * @return bool
      */
-    public function rollRaffle($raffle, $updateGroup = false) 
-    {
-        if(!$raffle) return null;
+    public function rollRaffle($raffle, $updateGroup = false) {
+        if (!$raffle) {
+            return null;
+        }
         DB::beginTransaction();
         // roll winners
-        if($winners = $this->rollWinners($raffle))
-        {
+        if ($winners = $this->rollWinners($raffle)) {
             // mark raffle as finished
             $raffle->is_active = 2;
             $raffle->rolled_at = Carbon::now();
             $raffle->save();
 
             // updates the raffle group if necessary
-            if($updateGroup && !$this->afterRoll($winners, $raffle->group, $raffle))
-            {
+            if ($updateGroup && !$this->afterRoll($winners, $raffle->group, $raffle)) {
                 DB::rollback();
+
                 return false;
             }
             DB::commit();
+
             return true;
         }
         DB::rollback();
+
         return false;
     }
 
     /**
      * Rolls the winners of a raffle.
      *
-     * @param  \App\Models\Raffle\Raffle $raffle
+     * @param \App\Models\Raffle\Raffle $raffle
+     *
      * @return array
      */
-    private function rollWinners($raffle)
-    {
+    private function rollWinners($raffle) {
         $ticketPool = $raffle->tickets;
         $ticketCount = $ticketPool->count();
         $winners = ['ids' => [], 'aliases' => []];
-        for ($i = 0; $i < $raffle->winner_count; $i++)
-        {
-            if($ticketCount == 0) break;
+        for ($i = 0; $i < $raffle->winner_count; $i++) {
+            if ($ticketCount == 0) {
+                break;
+            }
 
             $num = mt_rand(0, $ticketCount - 1);
             $winner = $ticketPool[$num];
@@ -167,8 +185,11 @@ private function rollWinners($raffle)
             $winner->update(['position' => $i + 1]);
 
             // save the winning ticket's user id
-            if(isset($winner->user_id)) $winners['ids'][] = $winner->user_id;
-            else $winners['aliases'][] = $winner->alias;
+            if (isset($winner->user_id)) {
+                $winners['ids'][] = $winner->user_id;
+            } else {
+                $winners['aliases'][] = $winner->alias;
+            }
 
             // remove ticket from the ticket pool after pulled
             $ticketPool->forget($num);
@@ -177,40 +198,36 @@ private function rollWinners($raffle)
             $ticketCount--;
 
             // remove tickets for the same user...I'm unsure how this is going to hold up with 3000 tickets,
-            foreach($ticketPool as $key=>$ticket)
-            {
-                if(($ticket->user_id != null && $ticket->user_id == $winner->user_id) || ($ticket->user_id == null && $ticket->alias == $winner->alias)) 
-                {
+            foreach ($ticketPool as $key=> $ticket) {
+                if (($ticket->user_id != null && $ticket->user_id == $winner->user_id) || ($ticket->user_id == null && $ticket->alias == $winner->alias)) {
                     $ticketPool->forget($key);
                 }
-
             }
             $ticketPool = $ticketPool->values();
             $ticketCount = $ticketPool->count();
         }
+
         return $winners;
     }
 
     /**
      * Rolls the winners of a raffle.
      *
-     * @param  array                          $winners
-     * @param  \App\Models\Raffle\RaffleGroup $raffleGroup
-     * @param  \App\Models\Raffle\Raffle      $raffle
+     * @param array                          $winners
+     * @param \App\Models\Raffle\RaffleGroup $raffleGroup
+     * @param \App\Models\Raffle\Raffle      $raffle
+     *
      * @return bool
      */
-    private function afterRoll($winners, $raffleGroup, $raffle)
-    {
+    private function afterRoll($winners, $raffleGroup, $raffle) {
         // remove any tickets from winners in raffles in the group that aren't completed
         $raffles = $raffleGroup->raffles()->where('is_active', '!=', 2)->where('id', '!=', $raffle->id)->get();
-        foreach($raffles as $r)
-        {
-            $r->tickets()->where(function($query) use ($winners) { 
-                $query->whereIn('user_id', $winners['ids'])->orWhereIn('alias', $winners['aliases']); 
+        foreach ($raffles as $r) {
+            $r->tickets()->where(function ($query) use ($winners) {
+                $query->whereIn('user_id', $winners['ids'])->orWhereIn('alias', $winners['aliases']);
             })->delete();
         }
+
         return true;
     }
-
-
 }
diff --git a/app/Services/RaffleService.php b/app/Services/RaffleService.php
index 0244cef761..7ef66661ff 100644
--- a/app/Services/RaffleService.php
+++ b/app/Services/RaffleService.php
@@ -1,15 +1,13 @@
-<?php namespace App\Services;
+<?php
+
+namespace App\Services;
 
-use DB;
-use App\Notify;
-use Carbon\Carbon;
-use Illuminate\Support\Arr;
-use App\Services\Service;
-use App\Models\Raffle\RaffleGroup;
 use App\Models\Raffle\Raffle;
+use App\Models\Raffle\RaffleGroup;
+use Illuminate\Support\Arr;
+use Illuminate\Support\Facades\DB;
 
-class RaffleService  extends Service 
-{
+class RaffleService extends Service {
     /*
     |--------------------------------------------------------------------------
     | Raffle Service
@@ -22,93 +20,113 @@ class RaffleService  extends Service
     /**
      * Creates a raffle.
      *
-     * @param  array  $data
+     * @param array $data
+     *
      * @return \App\Models\Raffle\Raffle
      */
-    public function createRaffle($data)
-    {
+    public function createRaffle($data) {
         DB::beginTransaction();
-        if(!isset($data['is_active'])) $data['is_active'] = 0;
+        if (!isset($data['is_active'])) {
+            $data['is_active'] = 0;
+        }
         $raffle = Raffle::create(Arr::only($data, ['name', 'is_active', 'winner_count', 'group_id', 'order']));
         DB::commit();
+
         return $raffle;
     }
 
     /**
-     * Updates a raffle. 
+     * Updates a raffle.
+     *
+     * @param array                     $data
+     * @param \App\Models\Raffle\Raffle $raffle
      *
-     * @param  array                     $data
-     * @param  \App\Models\Raffle\Raffle $raffle
      * @return \App\Models\Raffle\Raffle
      */
-    public function updateRaffle($data, $raffle) 
-    {
+    public function updateRaffle($data, $raffle) {
         DB::beginTransaction();
-        if(!isset($data['is_active'])) $data['is_active'] = 0;
-        $raffle->update(Arr::only($data, ['name', 'is_active', 'winner_count', 'group_id', 'order']));
+        if (!isset($data['is_active'])) {
+            $data['is_active'] = 0;
+        }
+        $raffle->update(Arr::only($data, ['name', 'is_active', 'winner_count', 'group_id', 'order', 'ticket_cap']));
         DB::commit();
+
         return $raffle;
-    }    
+    }
 
     /**
-     * Deletes a raffle. 
+     * Deletes a raffle.
+     *
+     * @param \App\Models\Raffle\Raffle $raffle
      *
-     * @param  \App\Models\Raffle\Raffle $raffle
      * @return bool
      */
-    public function deleteRaffle($raffle) 
-    {
+    public function deleteRaffle($raffle) {
         DB::beginTransaction();
-        foreach($raffle->tickets as $ticket) $ticket->delete();
+        foreach ($raffle->tickets as $ticket) {
+            $ticket->delete();
+        }
         $raffle->delete();
         DB::commit();
+
         return true;
-    }   
+    }
 
     /**
      * Creates a raffle group.
      *
-     * @param  array  $data
+     * @param array $data
+     *
      * @return \App\Models\Raffle\RaffleGroup
      */
-    public function createRaffleGroup($data)
-    {
+    public function createRaffleGroup($data) {
         DB::beginTransaction();
-        if(!isset($data['is_active'])) $data['is_active'] = 0;
+        if (!isset($data['is_active'])) {
+            $data['is_active'] = 0;
+        }
         $group = RaffleGroup::create(Arr::only($data, ['name', 'is_active']));
         DB::commit();
+
         return $group;
     }
 
     /**
-     * Updates a raffle group. 
+     * Updates a raffle group.
+     *
+     * @param array $data
+     * @param mixed $group
      *
-     * @param  array                          $data
-     * @param  \App\Models\Raffle\RaffleGroup $raffle
      * @return \App\Models\Raffle\Raffle
      */
-    public function updateRaffleGroup($data, $group) 
-    {
+    public function updateRaffleGroup($data, $group) {
         DB::beginTransaction();
-        if(!isset($data['is_active'])) $data['is_active'] = 0;
+        if (!isset($data['is_active'])) {
+            $data['is_active'] = 0;
+        }
         $group->update(Arr::only($data, ['name', 'is_active']));
-        foreach($group->raffles as $raffle) $raffle->update(['is_active' => $data['is_active']]);
+        foreach ($group->raffles as $raffle) {
+            $raffle->update(['is_active' => $data['is_active']]);
+        }
         DB::commit();
+
         return $group;
-    }  
+    }
 
     /**
-     * Deletes a raffle group. 
+     * Deletes a raffle group.
+     *
+     * @param mixed $group
      *
-     * @param  \App\Models\Raffle\RaffleGroup $raffle
      * @return bool
      */
-    public function deleteRaffleGroup($group) 
-    {
+    public function deleteRaffleGroup($group) {
         DB::beginTransaction();
-        foreach($group->raffles as $raffle) $raffle->update(['group_id' => null]);
+        foreach ($group->raffles as $raffle) {
+            $raffle->update(['group_id' => null]);
+        }
         $group->delete();
         DB::commit();
+
         return true;
-    }   
+    }
 }
diff --git a/app/Services/RankService.php b/app/Services/RankService.php
index 7c88993d01..4cf1cedb51 100644
--- a/app/Services/RankService.php
+++ b/app/Services/RankService.php
@@ -1,16 +1,12 @@
-<?php namespace App\Services;
+<?php
 
-use App\Services\Service;
+namespace App\Services;
 
-use DB;
-use Config;
-
-use App\Models\User\User;
 use App\Models\Rank\Rank;
-use App\Models\Rank\RankPower;
+use App\Models\User\User;
+use Illuminate\Support\Facades\DB;
 
-class RankService extends Service
-{
+class RankService extends Service {
     /*
     |--------------------------------------------------------------------------
     | Rank Service
@@ -23,22 +19,26 @@ class RankService extends Service
     /**
      * Creates a user rank.
      *
-     * @param  array                  $data
-     * @param  \App\Models\User\User  $user
+     * @param array                 $data
+     * @param \App\Models\User\User $user
+     *
      * @return bool
      */
-    public function createRank($data, $user)
-    {
+    public function createRank($data, $user) {
         DB::beginTransaction();
 
         try {
             // More specific validation
-            if(Rank::where('name', $data['name'])->exists()) throw new \Exception("A rank with the given name already exists.");
+            if (Rank::where('name', $data['name'])->exists()) {
+                throw new \Exception('A rank with the given name already exists.');
+            }
 
             $powers = null;
-            if(isset($data['powers'])) {
-                foreach($data['powers'] as $power) {
-                    if(!Config::get('lorekeeper.powers.'.$power)) throw new \Exception("Invalid power selected.");
+            if (isset($data['powers'])) {
+                foreach ($data['powers'] as $power) {
+                    if (!config('lorekeeper.powers.'.$power)) {
+                        throw new \Exception('Invalid power selected.');
+                    }
                 }
 
                 $powers = array_unique($data['powers']);
@@ -52,40 +52,51 @@ public function createRank($data, $user)
             Rank::where('sort', '>=', $data['sort'])->increment('sort');
 
             $data['color'] = isset($data['color']) ? str_replace('#', '', $data['color']) : null;
-            if(isset($data['description']) && $data['description']) $data['parsed_description'] = parse($data['description']);
+            if (isset($data['description']) && $data['description']) {
+                $data['parsed_description'] = parse($data['description']);
+            }
 
-            $data['icon'] = isset($data['icon']) ? $data['icon'] : 'fas fa-user';
+            $data['icon'] ??= 'fas fa-user';
 
             $rank = Rank::create($data);
-            if($powers) foreach($powers as $power) DB::table('rank_powers')->insert(['rank_id' => $rank->id, 'power' => $power]);
+            if ($powers) {
+                foreach ($powers as $power) {
+                    DB::table('rank_powers')->insert(['rank_id' => $rank->id, 'power' => $power]);
+                }
+            }
 
             return $this->commitReturn(true);
-        } catch(\Exception $e) { 
+        } catch (\Exception $e) {
             $this->setError('error', $e->getMessage());
         }
+
         return $this->rollbackReturn(false);
     }
 
     /**
      * Updates a user rank.
      *
-     * @param  \App\Models\Rank\Rank  $rank
-     * @param  array                  $data
-     * @param  \App\Models\User\User  $user
+     * @param \App\Models\Rank\Rank $rank
+     * @param array                 $data
+     * @param \App\Models\User\User $user
+     *
      * @return bool
      */
-    public function updateRank($rank, $data, $user)
-    {
+    public function updateRank($rank, $data, $user) {
         DB::beginTransaction();
 
         try {
             // More specific validation
-            if(Rank::where('name', $data['name'])->where('id', '!=', $rank->id)->exists()) throw new \Exception("A rank with the given name already exists.");
+            if (Rank::where('name', $data['name'])->where('id', '!=', $rank->id)->exists()) {
+                throw new \Exception('A rank with the given name already exists.');
+            }
 
             $powers = null;
-            if(isset($data['powers'])) {
-                foreach($data['powers'] as $power) {
-                    if(!Config::get('lorekeeper.powers.'.$power)) throw new \Exception("Invalid power selected.");
+            if (isset($data['powers'])) {
+                foreach ($data['powers'] as $power) {
+                    if (!config('lorekeeper.powers.'.$power)) {
+                        throw new \Exception('Invalid power selected.');
+                    }
                 }
 
                 $powers = array_unique($data['powers']);
@@ -93,57 +104,65 @@ public function updateRank($rank, $data, $user)
             }
 
             $data['color'] = isset($data['color']) ? str_replace('#', '', $data['color']) : null;
-            if(isset($data['description']) && $data['description']) $data['parsed_description'] = parse($data['description']);
+            if (isset($data['description']) && $data['description']) {
+                $data['parsed_description'] = parse($data['description']);
+            }
 
-            $data['icon'] = isset($data['icon']) ? $data['icon'] : 'fas fa-user';
+            $data['icon'] ??= 'fas fa-user';
 
             $rank->update($data);
-            if($powers) {
-                $rank->powers()->delete();
-                foreach($powers as $power) DB::table('rank_powers')->insert(['rank_id' => $rank->id, 'power' => $power]);
+            $rank->powers()->delete();
+            if ($powers) {
+                foreach ($powers as $power) {
+                    DB::table('rank_powers')->insert(['rank_id' => $rank->id, 'power' => $power]);
+                }
             }
 
             return $this->commitReturn(true);
-        } catch(\Exception $e) { 
+        } catch (\Exception $e) {
             $this->setError('error', $e->getMessage());
         }
+
         return $this->rollbackReturn(false);
     }
 
     /**
      * Deletes a user rank.
      *
-     * @param  \App\Models\Rank\Rank  $rank
-     * @param  \App\Models\User\User  $user
+     * @param \App\Models\Rank\Rank $rank
+     * @param \App\Models\User\User $user
+     *
      * @return bool
      */
-    public function deleteRank($rank, $user)
-    {
+    public function deleteRank($rank, $user) {
         DB::beginTransaction();
 
         try {
             // Disallow deletion of ranks that are currently assigned to users
-            if(User::where('rank_id', $rank->id)->exists()) throw new \Exception("There are currently user(s) with the selected rank. Please change their rank before deleting this one.");
+            if (User::where('rank_id', $rank->id)->exists()) {
+                throw new \Exception('There are currently user(s) with the selected rank. Please change their rank before deleting this one.');
+            }
 
             $rank->powers()->delete();
             $rank->delete();
 
             return $this->commitReturn(true);
-        } catch(\Exception $e) { 
+        } catch (\Exception $e) {
             $this->setError('error', $e->getMessage());
         }
+
         return $this->rollbackReturn(false);
     }
 
     /**
      * Sorts user ranks.
      *
-     * @param  array                  $data
-     * @param  \App\Models\User\User  $user
+     * @param array                 $data
+     * @param \App\Models\User\User $user
+     *
      * @return bool
      */
-    public function sortRanks($data, $user)
-    {
+    public function sortRanks($data, $user) {
         DB::beginTransaction();
 
         try {
@@ -153,9 +172,13 @@ public function sortRanks($data, $user)
             // Check if the array contains the admin rank, or anything non-numeric
             $adminRank = Rank::orderBy('sort', 'DESC')->first();
             $count = 0;
-            foreach($sort as $key => $s) {
-                if(!is_numeric($s) || !is_numeric($key)) throw new \Exception("Invalid sort order.");
-                if($s == $adminRank->id) throw new \Exception("Sort order of admin rank cannot be changed.");
+            foreach ($sort as $key => $s) {
+                if (!is_numeric($s) || !is_numeric($key)) {
+                    throw new \Exception('Invalid sort order.');
+                }
+                if ($s == $adminRank->id) {
+                    throw new \Exception('Sort order of admin rank cannot be changed.');
+                }
 
                 Rank::where('id', $s)->update(['sort' => $key]);
                 $count++;
@@ -163,9 +186,10 @@ public function sortRanks($data, $user)
             $adminRank->update(['sort'=> $count]);
 
             return $this->commitReturn(true);
-        } catch(\Exception $e) { 
+        } catch (\Exception $e) {
             $this->setError('error', $e->getMessage());
         }
+
         return $this->rollbackReturn(false);
     }
-}
\ No newline at end of file
+}
diff --git a/app/Services/RarityService.php b/app/Services/RarityService.php
index 18d8556b09..89ae7bfbff 100644
--- a/app/Services/RarityService.php
+++ b/app/Services/RarityService.php
@@ -1,16 +1,13 @@
-<?php namespace App\Services;
+<?php
 
-use App\Services\Service;
+namespace App\Services;
 
-use DB;
-use Config;
-
-use App\Models\Rarity;
 use App\Models\Character\Character;
 use App\Models\Character\CharacterImage;
+use App\Models\Rarity;
+use Illuminate\Support\Facades\DB;
 
-class RarityService extends Service
-{
+class RarityService extends Service {
     /*
     |--------------------------------------------------------------------------
     | Rarity Service
@@ -23,144 +20,163 @@ class RarityService extends Service
     /**
      * Creates a new rarity.
      *
-     * @param  array                  $data 
-     * @param  \App\Models\User\User  $user
-     * @return bool|\App\Models\Rarity
+     * @param array                 $data
+     * @param \App\Models\User\User $user
+     *
+     * @return \App\Models\Rarity|bool
      */
-    public function createRarity($data, $user)
-    {
+    public function createRarity($data, $user) {
         DB::beginTransaction();
 
         try {
             $data = $this->populateData($data);
 
             $image = null;
-            if(isset($data['image']) && $data['image']) {
+            if (isset($data['image']) && $data['image']) {
+                $data['hash'] = randomString(10);
                 $data['has_image'] = 1;
                 $image = $data['image'];
                 unset($data['image']);
+            } else {
+                $data['has_image'] = 0;
             }
-            else $data['has_image'] = 0;
 
             $rarity = Rarity::create($data);
 
-            if ($image) $this->handleImage($image, $rarity->rarityImagePath, $rarity->rarityImageFileName);
+            if ($image) {
+                $this->handleImage($image, $rarity->rarityImagePath, $rarity->rarityImageFileName);
+            }
 
             return $this->commitReturn($rarity);
-        } catch(\Exception $e) { 
+        } catch (\Exception $e) {
             $this->setError('error', $e->getMessage());
         }
+
         return $this->rollbackReturn(false);
     }
 
     /**
      * Updates a rarity.
      *
-     * @param  \App\Models\Rarity     $rarity
-     * @param  array                  $data 
-     * @param  \App\Models\User\User  $user
-     * @return bool|\App\Models\Rarity
+     * @param \App\Models\Rarity    $rarity
+     * @param array                 $data
+     * @param \App\Models\User\User $user
+     *
+     * @return \App\Models\Rarity|bool
      */
-    public function updateRarity($rarity, $data, $user)
-    {
+    public function updateRarity($rarity, $data, $user) {
         DB::beginTransaction();
 
         try {
             // More specific validation
-            if(Rarity::where('name', $data['name'])->where('id', '!=', $rarity->id)->exists()) throw new \Exception("The name has already been taken.");
+            if (Rarity::where('name', $data['name'])->where('id', '!=', $rarity->id)->exists()) {
+                throw new \Exception('The name has already been taken.');
+            }
 
             $data = $this->populateData($data, $rarity);
 
-            $image = null;            
-            if(isset($data['image']) && $data['image']) {
+            $image = null;
+            if (isset($data['image']) && $data['image']) {
                 $data['has_image'] = 1;
+                $data['hash'] = randomString(10);
                 $image = $data['image'];
                 unset($data['image']);
             }
 
             $rarity->update($data);
 
-            if ($rarity) $this->handleImage($image, $rarity->rarityImagePath, $rarity->rarityImageFileName);
+            if ($rarity) {
+                $this->handleImage($image, $rarity->rarityImagePath, $rarity->rarityImageFileName);
+            }
 
             return $this->commitReturn($rarity);
-        } catch(\Exception $e) { 
+        } catch (\Exception $e) {
             $this->setError('error', $e->getMessage());
         }
+
         return $this->rollbackReturn(false);
     }
 
-    /**
-     * Processes user input for creating/updating a rarity.
-     *
-     * @param  array               $data 
-     * @param  \App\Models\Rarity  $rarity
-     * @return array
-     */
-    private function populateData($data, $rarity = null)
-    {
-        if(isset($data['description']) && $data['description']) $data['parsed_description'] = parse($data['description']);
-
-        if(isset($data['color'])) $data['color'] = str_replace('#', '', $data['color']);
-        
-        if(isset($data['remove_image']))
-        {
-            if($rarity && $rarity->has_image && $data['remove_image']) 
-            { 
-                $data['has_image'] = 0; 
-                $this->deleteImage($rarity->rarityImagePath, $rarity->rarityImageFileName); 
-            }
-            unset($data['remove_image']);
-        }
-
-        return $data;
-    }
-    
     /**
      * Deletes a rarity.
      *
-     * @param  \App\Models\Rarity  $rarity
+     * @param \App\Models\Rarity $rarity
+     *
      * @return bool
      */
-    public function deleteRarity($rarity)
-    {
+    public function deleteRarity($rarity) {
         DB::beginTransaction();
 
-        try {         
+        try {
             // Check first if characters with this rarity exist
-            if(CharacterImage::where('rarity_id', $rarity->id)->exists() || Character::where('rarity_id', $rarity->id)->exists()) throw new \Exception("A character or character image with this rarity exists. Please change its rarity first.");
+            if (CharacterImage::where('rarity_id', $rarity->id)->exists() || Character::where('rarity_id', $rarity->id)->exists()) {
+                throw new \Exception('A character or character image with this rarity exists. Please change its rarity first.');
+            }
 
-            if($rarity->has_image) $this->deleteImage($rarity->rarityImagePath, $rarity->rarityImageFileName); 
+            if ($rarity->has_image) {
+                $this->deleteImage($rarity->rarityImagePath, $rarity->rarityImageFileName);
+            }
             $rarity->delete();
 
             return $this->commitReturn(true);
-        } catch(\Exception $e) { 
+        } catch (\Exception $e) {
             $this->setError('error', $e->getMessage());
         }
+
         return $this->rollbackReturn(false);
     }
 
     /**
      * Sorts rarity order.
      *
-     * @param  array  $data
+     * @param array $data
+     *
      * @return bool
      */
-    public function sortRarity($data)
-    {
+    public function sortRarity($data) {
         DB::beginTransaction();
 
         try {
             // explode the sort array and reverse it since the order is inverted
             $sort = array_reverse(explode(',', $data));
 
-            foreach($sort as $key => $s) {
+            foreach ($sort as $key => $s) {
                 Rarity::where('id', $s)->update(['sort' => $key]);
             }
 
             return $this->commitReturn(true);
-        } catch(\Exception $e) { 
+        } catch (\Exception $e) {
             $this->setError('error', $e->getMessage());
         }
+
         return $this->rollbackReturn(false);
     }
-}
\ No newline at end of file
+
+    /**
+     * Processes user input for creating/updating a rarity.
+     *
+     * @param array              $data
+     * @param \App\Models\Rarity $rarity
+     *
+     * @return array
+     */
+    private function populateData($data, $rarity = null) {
+        if (isset($data['description']) && $data['description']) {
+            $data['parsed_description'] = parse($data['description']);
+        }
+
+        if (isset($data['color'])) {
+            $data['color'] = str_replace('#', '', $data['color']);
+        }
+
+        if (isset($data['remove_image'])) {
+            if ($rarity && $rarity->has_image && $data['remove_image']) {
+                $data['has_image'] = 0;
+                $this->deleteImage($rarity->rarityImagePath, $rarity->rarityImageFileName);
+            }
+            unset($data['remove_image']);
+        }
+
+        return $data;
+    }
+}
diff --git a/app/Services/ReportManager.php b/app/Services/ReportManager.php
index df2fa0493a..6c1e9878f4 100644
--- a/app/Services/ReportManager.php
+++ b/app/Services/ReportManager.php
@@ -1,25 +1,14 @@
-<?php namespace App\Services;
+<?php
 
-use App\Services\Service;
+namespace App\Services;
 
-use Carbon\Carbon;
-
-use DB;
-use Config;
-use Image;
-use Notifications;
-use Settings;
-
-use App\Models\User\User;
-use App\Models\Character\Character;
-use App\Models\Report\Report;
-use App\Models\Currency\Currency;
-use App\Models\Item\Item;
-use App\Models\Loot\LootTable;
+use App\Facades\Notifications;
+use App\Facades\Settings;
 use App\Models\Prompt\Prompt;
+use App\Models\Report\Report;
+use Illuminate\Support\Facades\DB;
 
-class ReportManager extends Service
-{
+class ReportManager extends Service {
     /*
     |--------------------------------------------------------------------------
     | Report Manager
@@ -32,111 +21,135 @@ class ReportManager extends Service
     /**
      * Creates a new report.
      *
-     * @param  array                  $data
-     * @param  \App\Models\User\User  $user
-     * @param  bool                   $isClaim
+     * @param array                 $data
+     * @param \App\Models\User\User $user
+     * @param bool                  $isClaim
+     *
      * @return mixed
      */
-    public function createReport($data, $user, $isClaim = false)
-    {
+    public function createReport($data, $user, $isClaim = false) {
         DB::beginTransaction();
 
         try {
             // 1. check that the prompt can be submitted at this time
             // 2. check that the characters selected exist (are visible too)
             // 3. check that the currencies selected can be attached to characters
-            if(!Settings::get('is_reports_open')) throw new \Exception("The prompt queue is closed for reports.");
-            if(!isset($data['is_br'])) $data['is_br'] = 0;
+            if (!Settings::get('is_reports_open')) {
+                throw new \Exception('The prompt queue is closed for reports.');
+            }
+            if (!isset($data['is_br'])) {
+                $data['is_br'] = 0;
+            }
             //dd($data['error']);
 
             $report = Report::create([
-                'user_id' => $user->id,
-                'url' => $data['url'],
-                'status' => 'Pending',
-                'comments' => $data['comments'],
+                'user_id'    => $user->id,
+                'url'        => $data['url'],
+                'status'     => 'Pending',
+                'comments'   => $data['comments'],
                 'error_type' => $data['error'],
-                'is_br' => $data['is_br'],
-                ]);
-            
+                'is_br'      => $data['is_br'],
+            ]);
+
             return $this->commitReturn($report);
-        } catch(\Exception $e) { 
+        } catch (\Exception $e) {
             $this->setError('error', $e->getMessage());
         }
+
         return $this->rollbackReturn(false);
     }
 
     /**
      * Approves a report.
      *
-     * @param  array                  $data
-     * @param  \App\Models\User\User  $user
+     * @param array                 $data
+     * @param \App\Models\User\User $user
+     *
      * @return mixed
      */
-    public function assignReport($data, $user)
-    {
+    public function assignReport($data, $user) {
         DB::beginTransaction();
 
         try {
-
-            $report = Report::where('staff_id', NULL)->where('id', $data['id'])->first();
-            if(!$report) throw new \Exception("This has been assigned an admin");
+            $report = Report::where('staff_id', null)->where('id', $data['id'])->first();
+            if (!$report) {
+                throw new \Exception('This has been assigned an admin');
+            }
 
             $report->update([
                 'staff_id' => $user->id,
-                'status' => 'Assigned',
+                'status'   => 'Assigned',
             ]);
 
             Notifications::create('REPORT_ASSIGNED', $report->user, [
-                'staff_url' => $user->url,
+                'staff_url'  => $user->url,
                 'staff_name' => $user->name,
-                'report_id' => $report->id,
+                'report_id'  => $report->id,
             ]);
 
+            if (!$this->logAdminAction($user, 'Report Assigned', 'Assigned themselves to report <a href="'.$report->viewurl.'">#'.$report->id.'</a>')) {
+                throw new \Exception('Failed to log admin action.');
+            }
+
             return $this->commitReturn($report);
-        } catch(\Exception $e) { 
+        } catch (\Exception $e) {
             $this->setError('error', $e->getMessage());
         }
+
         return $this->rollbackReturn(false);
     }
 
     /**
      * Closes a report.
      *
-     * @param  array                  $data
-     * @param  \App\Models\User\User  $user
+     * @param array                 $data
+     * @param \App\Models\User\User $user
+     *
      * @return mixed
      */
-    public function closeReport($data, $user)
-    {
+    public function closeReport($data, $user) {
         DB::beginTransaction();
 
         try {
-            if(!isset($data['report'])) $report = Report::where('status', 'Assigned')->where('id', $data['id'])->first();
-            elseif($data['report']->status == 'Assigned') $report = $data['report'];
-            else $report = null;
-            if(!$report) throw new \Exception("Invalid report.");
-			
-			if(isset($data['staff_comments']) && $data['staff_comments']) $data['parsed_staff_comments'] = parse($data['staff_comments']);
-			else $data['parsed_staff_comments'] = null;
+            if (!isset($data['report'])) {
+                $report = Report::where('status', 'Assigned')->where('id', $data['id'])->first();
+            } elseif ($data['report']->status == 'Assigned') {
+                $report = $data['report'];
+            } else {
+                $report = null;
+            }
+            if (!$report) {
+                throw new \Exception('Invalid report.');
+            }
+
+            if (isset($data['staff_comments']) && $data['staff_comments']) {
+                $data['parsed_staff_comments'] = parse($data['staff_comments']);
+            } else {
+                $data['parsed_staff_comments'] = null;
+            }
 
             $report->update([
-                'staff_comments' => $data['staff_comments'],
-				'parsed_staff_comments' => $data['parsed_staff_comments'],
-                'staff_id' => $user->id,
-                'status' => 'Closed'
+                'staff_comments'        => $data['staff_comments'],
+                'parsed_staff_comments' => $data['parsed_staff_comments'],
+                'staff_id'              => $user->id,
+                'status'                => 'Closed',
             ]);
 
             Notifications::create('REPORT_CLOSED', $report->user, [
-                'staff_url' => $user->url,
+                'staff_url'  => $user->url,
                 'staff_name' => $user->name,
-                'report_id' => $report->id,
+                'report_id'  => $report->id,
             ]);
 
+            if (!$this->logAdminAction($user, 'Report Closed', 'Closed report <a href="'.$report->viewurl.'">#'.$report->id.'</a>')) {
+                throw new \Exception('Failed to log admin action.');
+            }
+
             return $this->commitReturn($report);
-        } catch(\Exception $e) { 
+        } catch (\Exception $e) {
             $this->setError('error', $e->getMessage());
         }
+
         return $this->rollbackReturn(false);
     }
-    
-}
\ No newline at end of file
+}
diff --git a/app/Services/SalesService.php b/app/Services/SalesService.php
index 4356c9122e..f5a6f25a87 100644
--- a/app/Services/SalesService.php
+++ b/app/Services/SalesService.php
@@ -1,18 +1,15 @@
-<?php namespace App\Services;
+<?php
 
-use App\Services\Service;
+namespace App\Services;
 
-use DB;
-use Config;
-use Validator;
-
-use App\Models\User\User;
+use App\Models\Character\Character;
 use App\Models\Sales\Sales;
 use App\Models\Sales\SalesCharacter;
-use App\Models\Character\Character;
+use App\Models\User\User;
+use Illuminate\Support\Facades\DB;
+use Validator;
 
-class SalesService extends Service
-{
+class SalesService extends Service {
     /*
     |--------------------------------------------------------------------------
     | Sales Service
@@ -25,196 +22,242 @@ class SalesService extends Service
     /**
      * Creates a Sales post.
      *
-     * @param  array                  $data
-     * @param  \App\Models\User\User  $user
-     * @return bool|\App\Models\Sales\Sales
+     * @param array                 $data
+     * @param \App\Models\User\User $user
+     *
+     * @return \App\Models\Sales\Sales|bool
      */
-    public function createSales($data, $user)
-    {
+    public function createSales($data, $user) {
         DB::beginTransaction();
 
         try {
             $data['parsed_text'] = parse($data['text']);
             $data['user_id'] = $user->id;
-            if(!isset($data['is_visible'])) $data['is_visible'] = 0;
-            if(!isset($data['is_open'])) $data['is_open'] = 0;
+            if (!isset($data['is_visible'])) {
+                $data['is_visible'] = 0;
+            }
+            if (!isset($data['is_open'])) {
+                $data['is_open'] = 0;
+            }
 
             $sales = Sales::create($data);
 
             // The character identification comes in both the slug field and as character IDs
             // First, check if the characters are accessible to begin with.
-            if(isset($data['slug'])) {
-                $characters = Character::myo(0)->visible()->whereIn('slug', $data['slug'])->get();
-                if(count($characters) != count($data['slug'])) throw new \Exception("One or more of the selected characters do not exist.");
+            if (isset($data['slug'])) {
+                $characters = Character::myo(0)->whereIn('slug', $data['slug'])->get();
+                if (count($characters) != count($data['slug'])) {
+                    throw new \Exception('One or more of the selected characters do not exist.');
+                }
+            } else {
+                $characters = [];
             }
-            else $characters = [];
 
             // Process entered character data
-            if(isset($data['slug'])) $this->processCharacters($sales, $data);
+            if (isset($data['slug'])) {
+                $this->processCharacters($sales, $data);
+            }
 
-            if($sales->is_visible) $this->alertUsers();
+            if ($sales->is_visible) {
+                $this->alertUsers();
+            }
 
             return $this->commitReturn($sales);
-        } catch(\Exception $e) {
+        } catch (\Exception $e) {
             $this->setError('error', $e->getMessage());
         }
+
         return $this->rollbackReturn(false);
     }
 
     /**
      * Updates a Sales post.
      *
-     * @param  \App\Models\Sales\Sales       $Sales
-     * @param  array                  $data
-     * @param  \App\Models\User\User  $user
-     * @return bool|\App\Models\Sales\Sales
+     * @param array                 $data
+     * @param \App\Models\User\User $user
+     * @param mixed                 $sales
+     *
+     * @return \App\Models\Sales\Sales|bool
      */
-    public function updateSales($sales, $data, $user)
-    {
+    public function updateSales($sales, $data, $user) {
         DB::beginTransaction();
 
         try {
             $data['parsed_text'] = parse($data['text']);
             $data['user_id'] = $user->id;
-            if(!isset($data['is_visible'])) $data['is_visible'] = 0;
-            if(!isset($data['is_open'])) $data['is_open'] = 0;
+            if (!isset($data['is_visible'])) {
+                $data['is_visible'] = 0;
+            }
+            if (!isset($data['is_open'])) {
+                $data['is_open'] = 0;
+            }
 
-            if(isset($data['bump']) && $data['is_visible'] == 1 && $data['bump'] == 1) $this->alertUsers();
+            if (isset($data['bump']) && $data['is_visible'] == 1 && $data['bump'] == 1) {
+                $this->alertUsers();
+            }
 
             // The character identification comes in both the slug field and as character IDs
             // First, check if the characters are accessible to begin with.
-            if(isset($data['slug'])) {
-                $characters = Character::myo(0)->visible()->whereIn('slug', $data['slug'])->get();
-                if(count($characters) != count($data['slug'])) throw new \Exception("One or more of the selected characters do not exist.");
+            if (isset($data['slug'])) {
+                $characters = Character::myo(0)->whereIn('slug', $data['slug'])->get();
+                if (count($characters) != count($data['slug'])) {
+                    throw new \Exception('One or more of the selected characters do not exist.');
+                }
+            } else {
+                $characters = [];
             }
-            else $characters = [];
 
             // Remove existing attached characters, then process entered character data
             $sales->characters()->delete();
-            if(isset($data['slug'])) $this->processCharacters($sales, $data);
+            if (isset($data['slug'])) {
+                $this->processCharacters($sales, $data);
+            }
 
             $sales->update($data);
 
             return $this->commitReturn($sales);
-        } catch(\Exception $e) {
+        } catch (\Exception $e) {
+            $this->setError('error', $e->getMessage());
+        }
+
+        return $this->rollbackReturn(false);
+    }
+
+    /**
+     * Deletes a Sales post.
+     *
+     * @param mixed $sales
+     *
+     * @return bool
+     */
+    public function deleteSales($sales) {
+        DB::beginTransaction();
+
+        try {
+            $sales->delete();
+
+            return $this->commitReturn(true);
+        } catch (\Exception $e) {
             $this->setError('error', $e->getMessage());
         }
+
         return $this->rollbackReturn(false);
     }
 
+    /**
+     * Updates queued Sales posts to be visible and alert users when
+     * they should be posted.
+     *
+     * @return bool
+     */
+    public function updateQueue() {
+        $count = Sales::shouldBeVisible()->count();
+        if ($count) {
+            DB::beginTransaction();
+
+            try {
+                Sales::shouldBeVisible()->update(['is_visible' => 1]);
+                $this->alertUsers();
+
+                return $this->commitReturn(true);
+            } catch (\Exception $e) {
+                $this->setError('error', $e->getMessage());
+            }
+
+            return $this->rollbackReturn(false);
+        }
+    }
+
     /**
      * Processes sales data entered for characters.
      *
-     * @param  App\Models\Sales\Sales                   $sales
-     * @param  array                                    $data
+     * @param App\Models\Sales\Sales $sales
+     * @param array                  $data
+     *
      * @return bool
      */
-    private function processCharacters($sales, $data)
-    {
-        foreach($data['slug'] as $key=>$slug) {
-            $character = Character::myo(0)->visible()->where('slug', $slug)->first();
+    private function processCharacters($sales, $data) {
+        foreach ($data['slug'] as $key=> $slug) {
+            $character = Character::myo(0)->where('slug', $slug)->first();
 
             // Assemble data
             $charData[$key] = [];
             $charData[$key]['type'] = $data['sale_type'][$key];
-            switch($charData[$key]['type']) {
+            switch ($charData[$key]['type']) {
                 case 'flatsale':
                     $charData[$key]['price'] = $data['price'][$key];
                     break;
                 case 'auction':
                     $charData[$key]['starting_bid'] = $data['starting_bid'][$key];
                     $charData[$key]['min_increment'] = $data['min_increment'][$key];
-                    if(isset($data['autobuy'][$key])) $charData[$key]['autobuy'] = $data['autobuy'][$key];
-                    if(isset($data['end_point'][$key])) $charData[$key]['end_point'] = $data['end_point'][$key];
+                    if (isset($data['autobuy'][$key])) {
+                        $charData[$key]['autobuy'] = $data['autobuy'][$key];
+                    }
+                    if (isset($data['end_point'][$key])) {
+                        $charData[$key]['end_point'] = $data['end_point'][$key];
+                    }
                     break;
                 case 'ota':
-                    if(isset($data['autobuy'][$key])) $charData[$key]['autobuy'] = $data['autobuy'][$key];
-                    if(isset($data['end_point'][$key])) $charData[$key]['end_point'] = $data['end_point'][$key];
-					if(isset($data['minimum'][$key])) $charData[$key]['minimum'] = $data['minimum'][$key];
+                    if (isset($data['autobuy'][$key])) {
+                        $charData[$key]['autobuy'] = $data['autobuy'][$key];
+                    }
+                    if (isset($data['end_point'][$key])) {
+                        $charData[$key]['end_point'] = $data['end_point'][$key];
+                    }
+                    if (isset($data['minimum'][$key])) {
+                        $charData[$key]['minimum'] = $data['minimum'][$key];
+                    }
                     break;
                 case 'xta':
-                    if(isset($data['autobuy'][$key])) $charData[$key]['autobuy'] = $data['autobuy'][$key];
-                    if(isset($data['end_point'][$key])) $charData[$key]['end_point'] = $data['end_point'][$key];
-					if(isset($data['minimum'][$key])) $charData[$key]['minimum'] = $data['minimum'][$key];
+                    if (isset($data['autobuy'][$key])) {
+                        $charData[$key]['autobuy'] = $data['autobuy'][$key];
+                    }
+                    if (isset($data['end_point'][$key])) {
+                        $charData[$key]['end_point'] = $data['end_point'][$key];
+                    }
+                    if (isset($data['minimum'][$key])) {
+                        $charData[$key]['minimum'] = $data['minimum'][$key];
+                    }
                     break;
                 case 'flaffle':
                     $charData[$key]['price'] = $data['price'][$key];
                     break;
                 case 'pwyw':
-                    if(isset($data['minimum'][$key])) $charData[$key]['minimum'] = $data['minimum'][$key];
+                    if (isset($data['minimum'][$key])) {
+                        $charData[$key]['minimum'] = $data['minimum'][$key];
+                    }
                     break;
             }
 
             // Validate data
             $validator = Validator::make($charData[$key], SalesCharacter::$rules);
-            if($validator->fails()) throw new \Exception($validator->errors()->first());
+            if ($validator->fails()) {
+                throw new \Exception($validator->errors()->first());
+            }
 
             // Record data/attach the character to the sales post
             SalesCharacter::create([
                 'character_id' => $character->id,
-                'sales_id' => $sales->id,
-                'type' => $charData[$key]['type'],
-                'data' => json_encode($charData[$key]),
-                'description' => isset($data['description'][$key]) ? $data['description'][$key] : null,
-                'link' => isset($data['link'][$key]) ? $data['link'][$key] : null,
-                'is_open' => isset($data['character_is_open'][$character->slug]) ? $data['character_is_open'][$character->slug] : ($data['new_entry'][$key] ? 1 : 0)
+                'image_id'     => $data['image_id'][$key] ?? $character->image->id,
+                'sales_id'     => $sales->id,
+                'type'         => $charData[$key]['type'],
+                'data'         => json_encode($charData[$key]),
+                'description'  => $data['description'][$key] ?? null,
+                'link'         => $data['link'][$key] ?? null,
+                'is_open'      => $data['character_is_open'][$character->slug] ?? ($data['new_entry'][$key] ? 1 : 0),
             ]);
         }
     }
 
-    /**
-     * Deletes a Sales post.
-     *
-     * @param  \App\Models\Sales\Sales  $Sales
-     * @return bool
-     */
-    public function deleteSales($sales)
-    {
-        DB::beginTransaction();
-
-        try {
-            $sales->delete();
-
-            return $this->commitReturn(true);
-        } catch(\Exception $e) {
-            $this->setError('error', $e->getMessage());
-        }
-        return $this->rollbackReturn(false);
-    }
-
-    /**
-     * Updates queued Sales posts to be visible and alert users when
-     * they should be posted.
-     *
-     * @return bool
-     */
-    public function updateQueue()
-    {
-        $count = Sales::shouldBeVisible()->count();
-        if($count) {
-            DB::beginTransaction();
-
-            try {
-                Sales::shouldBeVisible()->update(['is_visible' => 1]);
-                $this->alertUsers();
-
-                return $this->commitReturn(true);
-            } catch(\Exception $e) {
-                $this->setError('error', $e->getMessage());
-            }
-            return $this->rollbackReturn(false);
-        }
-    }
-
     /**
      * Updates the unread Sales flag for all users so that
      * the new Sales notification is displayed.
      *
      * @return bool
      */
-    private function alertUsers()
-    {
+    private function alertUsers() {
         User::query()->update(['is_sales_unread' => 1]);
+
         return true;
     }
 }
diff --git a/app/Services/Service.php b/app/Services/Service.php
index c3a58587d0..17d100f668 100644
--- a/app/Services/Service.php
+++ b/app/Services/Service.php
@@ -1,14 +1,16 @@
-<?php namespace App\Services;
+<?php
+
+namespace App\Services;
 
 use App;
-use Auth;
-use DB;
-use File;
-use Request;
+use App\Models\AdminLog;
+use App\Models\Currency\Currency;
+use Illuminate\Support\Facades\Auth;
+use Illuminate\Support\Facades\DB;
+use Illuminate\Support\Facades\File;
 use Illuminate\Support\MessageBag;
 
 abstract class Service {
-
     /*
     |--------------------------------------------------------------------------
     | Base Service
@@ -20,6 +22,7 @@ abstract class Service {
 
     /**
      * Errors.
+     *
      * @var Illuminate\Support\MessageBag
      */
     protected $errors = null;
@@ -29,210 +32,305 @@ abstract class Service {
     /**
      * Default constructor.
      */
-    public function __construct()
-    {
+    public function __construct() {
         $this->callMethod('beforeConstruct');
         $this->resetErrors();
         $this->callMethod('afterConstruct');
     }
 
     /**
-     * Calls a service method and injects the required dependencies.
-     * @param string $methodName
-     * @return mixed
-     */
-    protected function callMethod($methodName)
-    {
-        if(method_exists($this, $methodName)) return App::call([$this, $methodName]);
-    }
-
-    /**
-     * Return if an error exists. 
+     * Return if an error exists.
+     *
      * @return bool
      */
-    public function hasErrors()
-    {
+    public function hasErrors() {
         return $this->errors->count() > 0;
     }
 
     /**
-     * Return if an error exists. 
+     * Return if an error exists.
+     *
+     * @param mixed $key
+     *
      * @return bool
      */
-    public function hasError($key)
-    {
+    public function hasError($key) {
         return $this->errors->has($key);
     }
 
     /**
-     * Return errors. 
+     * Return errors.
+     *
      * @return Illuminate\Support\MessageBag
      */
-    public function errors()
-    {
+    public function errors() {
         return $this->errors;
     }
+
     /**
-     * Return errors. 
+     * Return errors.
+     *
      * @return array
      */
-    public function getAllErrors()
-    {
+    public function getAllErrors() {
         return $this->errors->unique();
     }
 
     /**
-     * Return error by key. 
+     * Return error by key.
+     *
+     * @param mixed $key
+     *
      * @return Illuminate\Support\MessageBag
      */
-    public function getError($key)
-    {
+    public function getError($key) {
         return $this->errors->get($key);
     }
 
     /**
      * Empty the errors MessageBag.
-     * @return void
      */
-    public function resetErrors()
-    {
+    public function resetErrors() {
         $this->errors = new MessageBag();
     }
 
+    public function remember($key = null, $fn = null) {
+        if (isset($this->cache[$key])) {
+            return $this->cache[$key];
+        }
+
+        return $this->cache[$key] = $fn();
+    }
+
+    public function forget($key = null) {
+        unset($this->cache[$key]);
+    }
+
+    public function setUser($user) {
+        $this->user = $user;
+
+        return $this;
+    }
+
+    public function user() {
+        return $this->user ? $this->user : Auth::user();
+    }
+
+    // 1. Old image exists, want to move it to a new location.
+    // 2. Given new image, want to upload it to new location.
+    //    (old image may or may not exist)
+    // 3. Nothing happens (no changes required)
+    public function handleImage($image, $dir, $name, $oldName = null, $copy = false) {
+        if (!$oldName && !$image) {
+            return true;
+        }
+
+        if (!$image) {
+            // Check if we're moving an old image, and move it if it does.
+            if ($oldName) {
+                return $this->moveImage($dir, $name, $oldName, $copy);
+            }
+        } else {
+            // Don't want to leave a lot of random images lying around,
+            // so move the old image first if it exists.
+            if ($oldName) {
+                $this->moveImage($dir, $name, $oldName, $copy);
+            }
+
+            // Then overwrite the old image.
+            return $this->saveImage($image, $dir, $name, $copy);
+        }
+
+        return false;
+    }
+
+    public function deleteImage($dir, $name) {
+        unlink($dir.'/'.$name);
+    }
+
+    /**
+     * Creates an admin log entry after an action is performed.
+     * If staff rewards are enabled, also checks for and grants any
+     * applicable rewards.
+     *
+     * @param string $action
+     * @param object $user
+     * @param string $action
+     * @param mixed  $action_details
+     */
+    public function logAdminAction($user, $action, $action_details) {
+        // Double-check that the user is staff
+        if ($user->isStaff) {
+            // If staff rewards are enabled, check if the action
+            // is eligible for a reward, and if so, grant it
+            if (config('lorekeeper.extensions.staff_rewards.enabled')) {
+                // Ensure that the user only receives rewards for the action once
+                if (!AdminLog::where('user_id', $user->id)->where('action', $action)->where('action_details', $action_details)->exists()) {
+                    // Fetch all configured actions
+                    $actions = [];
+                    foreach (glob('../config/lorekeeper/staff-reward-actions/*.php') as $a) {
+                        $actions[basename($a, '.php')] = include $a;
+                    }
+
+                    // Cycle through and locate any keyed actions which
+                    // correspond to the action currently being logged
+                    $keyedActions = [];
+                    foreach ($actions as $key=> $a) {
+                        foreach ($a['actions'] as $act) {
+                            if ($act == $action) {
+                                $keyedActions[] = $key;
+                            }
+                        }
+                    }
+
+                    // Collect the configured reward(s) for performing
+                    // this action
+                    $reward = 0;
+                    foreach ($keyedActions as $a) {
+                        if (DB::table('staff_actions')->where('key', $a)->exists()) {
+                            $reward += DB::table('staff_actions')->where('key', $a)->first()->value;
+                        } else {
+                            // If not configured, just supply 1
+                            $reward += 1;
+                        }
+                    }
+
+                    // Grant the calculated reward to the user
+                    if ($reward) {
+                        // Check that the currency exists, first
+                        $currency = Currency::find(config('lorekeeper.extensions.staff_rewards.currency_id'));
+                        if ($currency) {
+                            if (!(new CurrencyManager)->creditCurrency(null, $user, 'Staff Reward', $action_details, $currency, $reward)) {
+                                return false;
+                            }
+                        }
+                    }
+                }
+            }
+
+            $log = AdminLog::create([
+                'user_id'        => $user->id,
+                'action'         => $action,
+                'action_details' => $action_details,
+            ]);
+
+            if ($log) {
+                return true;
+            } else {
+                return false;
+            }
+        } else {
+            return true;
+        }
+    }
+
+    /**
+     * Calls a service method and injects the required dependencies.
+     *
+     * @param string $methodName
+     *
+     * @return mixed
+     */
+    protected function callMethod($methodName) {
+        if (method_exists($this, $methodName)) {
+            return App::call([$this, $methodName]);
+        }
+    }
+
     /**
      * Add an error to the MessageBag.
+     *
      * @param string $key
      * @param string $value
-     * @return void
      */
-    protected function setError($key, $value)
-    {
+    protected function setError($key, $value) {
         $this->errors->add($key, $value);
     }
 
     /**
-     * Add multiple errors to the message bag
+     * Add multiple errors to the message bag.
+     *
      * @param Illuminate\Support\MessageBag $errors
-     * @return void
      */
-    protected function setErrors($errors) 
-    {
+    protected function setErrors($errors) {
         $this->errors->merge($errors);
     }
 
     /**
      * Commits the current DB transaction and returns a value.
+     *
      * @param mixed $return
+     *
      * @return mixed $return
      */
-    protected function commitReturn($return = true)
-    {
+    protected function commitReturn($return = true) {
         DB::commit();
+
         return $return;
     }
 
     /**
      * Rolls back the current DB transaction and returns a value.
+     *
      * @param mixed $return
+     *
      * @return mixed $return
      */
-    protected function rollbackReturn($return = false)
-    {
+    protected function rollbackReturn($return = false) {
         DB::rollback();
+
         return $return;
     }
 
     /**
      * Returns the current field if it is numeric, otherwise searches for a field if it is an array or object.
-     * @param mixed $data
+     *
+     * @param mixed  $data
      * @param string $field
-     * @return mixed 
+     *
+     * @return mixed
      */
-    protected function getNumeric($data, $field = 'id')
-    {
-        if(is_numeric($data)) return $data;
-        elseif(is_object($data)) return $data->$field;
-        elseif(is_array($data)) return $data[$field];
-        else return 0;
-    }
-
-    public function remember($key = null, $fn = null)
-    {
-        if(isset($this->cache[$key])) return $this->cache[$key];
-        return $this->cache[$key] = $fn();
-    }
-
-    public function forget($key = null)
-    {
-        unset($this->cache[$key]);
-    }
-
-    public function setUser($user)
-    {
-        $this->user = $user;
-        return $this;
-    }
-
-    public function user()
-    {
-        return $this->user ? $this->user : Auth::user();
-    }
-
-    // 1. Old image exists, want to move it to a new location.
-    // 2. Given new image, want to upload it to new location.
-    //    (old image may or may not exist)
-    // 3. Nothing happens (no changes required)
-    public function handleImage($image, $dir, $name, $oldName = null, $copy = false)
-    {
-        if(!$oldName && !$image) return true;
-
-        if(!$image)
-        {
-            // Check if we're moving an old image, and move it if it does.
-            if($oldName) { return $this->moveImage($dir, $name, $oldName, $copy); }
-        }
-        else
-        {
-            // Don't want to leave a lot of random images lying around,
-            // so move the old image first if it exists.
-            if($oldName) { $this->moveImage($dir, $name, $oldName, $copy); }
-            
-            // Then overwrite the old image.
-            return $this->saveImage($image, $dir, $name, $copy);
+    protected function getNumeric($data, $field = 'id') {
+        if (is_numeric($data)) {
+            return $data;
+        } elseif (is_object($data)) {
+            return $data->$field;
+        } elseif (is_array($data)) {
+            return $data[$field];
+        } else {
+            return 0;
         }
-
-        return false;
     }
 
     // Moves an old image within the same directory.
-    private function moveImage($dir, $name, $oldName, $copy = false)
-    {
-        if($copy) File::copy($dir . '/' . $oldName, $dir . '/' . $name);
-        else File::move($dir . '/' . $oldName, $dir . '/' . $name);
+    private function moveImage($dir, $name, $oldName, $copy = false) {
+        if ($copy) {
+            File::copy($dir.'/'.$oldName, $dir.'/'.$name);
+        } else {
+            File::move($dir.'/'.$oldName, $dir.'/'.$name);
+        }
+
         return true;
     }
 
     // Moves an uploaded image into a directory, checking if it exists.
-    private function saveImage($image, $dir, $name, $copy = false)
-    { 
-        if(!file_exists($dir))
-        {
+    private function saveImage($image, $dir, $name, $copy = false) {
+        if (!file_exists($dir)) {
             // Create the directory.
             if (!mkdir($dir, 0755, true)) {
                 $this->setError('error', 'Failed to create image directory.');
+
                 return false;
             }
             chmod($dir, 0755);
         }
-        if($copy) File::copy($image, $dir . '/' . $name);
-        else File::move($image, $dir . '/' . $name);
-        chmod($dir . '/' . $name, 0755);
-        
-        return true;
-    }
+        if ($copy) {
+            File::copy($image, $dir.'/'.$name);
+        } else {
+            File::move($image, $dir.'/'.$name);
+        }
+        chmod($dir.'/'.$name, 0755);
 
-    public function deleteImage($dir, $name)
-    {
-        unlink($dir . '/' . $name);
+        return true;
     }
 }
diff --git a/app/Services/ShopManager.php b/app/Services/ShopManager.php
index b0a749e12a..db5eb627c2 100644
--- a/app/Services/ShopManager.php
+++ b/app/Services/ShopManager.php
@@ -1,17 +1,14 @@
-<?php namespace App\Services;
+<?php
 
-use App\Services\Service;
-
-use DB;
-use Config;
+namespace App\Services;
 
 use App\Models\Character\Character;
 use App\Models\Shop\Shop;
-use App\Models\Shop\ShopStock;
 use App\Models\Shop\ShopLog;
+use App\Models\Shop\ShopStock;
+use Illuminate\Support\Facades\DB;
 
-class ShopManager extends Service
-{
+class ShopManager extends Service {
     /*
     |--------------------------------------------------------------------------
     | Shop Manager
@@ -24,126 +21,158 @@ class ShopManager extends Service
     /**
      * Buys an item from a shop.
      *
-     * @param  array                 $data
-     * @param  \App\Models\User\User $user
-     * @return bool|App\Models\Shop\Shop
+     * @param array                 $data
+     * @param \App\Models\User\User $user
+     *
+     * @return App\Models\Shop\Shop|bool
      */
-    public function buyStock($data, $user)
-    {
+    public function buyStock($data, $user) {
         DB::beginTransaction();
 
         try {
             $quantity = ceil($data['quantity']);
-            if(!$quantity || $quantity == 0) throw new \Exception("Invalid quantity selected.");
+            if (!$quantity || $quantity == 0) {
+                throw new \Exception('Invalid quantity selected.');
+            }
 
             // Check that the shop exists and is open
             $shop = Shop::where('id', $data['shop_id'])->where('is_active', 1)->first();
-            if(!$shop) throw new \Exception("Invalid shop selected.");
+            if (!$shop) {
+                throw new \Exception('Invalid shop selected.');
+            }
 
             // Check that the stock exists and belongs to the shop
             $shopStock = ShopStock::where('id', $data['stock_id'])->where('shop_id', $data['shop_id'])->with('currency')->with('item')->first();
-            if(!$shopStock) throw new \Exception("Invalid item selected.");
+            if (!$shopStock) {
+                throw new \Exception('Invalid item selected.');
+            }
 
             // Check if the item has a quantity, and if it does, check there is enough stock remaining
-            if($shopStock->is_limited_stock && $shopStock->quantity < $quantity) throw new \Exception("There is insufficient stock to fulfill your request.");
+            if ($shopStock->is_limited_stock && $shopStock->quantity < $quantity) {
+                throw new \Exception('There is insufficient stock to fulfill your request.');
+            }
 
             // Check if the user can only buy a limited number of this item, and if it does, check that the user hasn't hit the limit
-            if($shopStock->purchase_limit && $this->checkPurchaseLimitReached($shopStock, $user)) throw new \Exception("You have already purchased the maximum amount of this item you can buy.");
+            if ($shopStock->purchase_limit && $this->checkPurchaseLimitReached($shopStock, $user)) {
+                throw new \Exception('You have already purchased the maximum amount of this item you can buy.');
+            }
 
-            if($shopStock->purchase_limit && $quantity > $shopStock->purchase_limit) throw new \Exception("The quantity specified exceeds the amount of this item you can buy.");
+            if ($shopStock->purchase_limit && $quantity > $shopStock->purchase_limit) {
+                throw new \Exception('The quantity specified exceeds the amount of this item you can buy.');
+            }
 
             $total_cost = $shopStock->cost * $quantity;
 
             $character = null;
-            if($data['bank'] == 'character')
-            {
+            if ($data['bank'] == 'character') {
                 // Check if the user is using a character to pay
                 // - stock must be purchaseable with characters
                 // - currency must be character-held
                 // - character has enough currency
-                if(!$shopStock->use_character_bank || !$shopStock->currency->is_character_owned) throw new \Exception("You cannot use a character's bank to pay for this item.");
-                if(!$data['slug']) throw new \Exception("Please enter a character code.");
+                if (!$shopStock->use_character_bank || !$shopStock->currency->is_character_owned) {
+                    throw new \Exception("You cannot use a character's bank to pay for this item.");
+                }
+                if (!$data['slug']) {
+                    throw new \Exception('Please enter a character code.');
+                }
                 $character = Character::where('slug', $data['slug'])->first();
-                if(!$character) throw new \Exception("Please enter a valid character code.");
-                if(!(new CurrencyManager)->debitCurrency($character, null, 'Shop Purchase', 'Purchased '.$shopStock->item->name.' from '.$shop->name, $shopStock->currency, $total_cost)) throw new \Exception("Not enough currency to make this purchase.");
-            }
-            else
-            {
+                if (!$character) {
+                    throw new \Exception('Please enter a valid character code.');
+                }
+                if ($character->user_id != $user->id) {
+                    throw new \Exception('That character does not belong to you.');
+                }
+                if (!(new CurrencyManager)->debitCurrency($character, null, 'Shop Purchase', 'Purchased '.$shopStock->item->name.' from '.$shop->name, $shopStock->currency, $total_cost)) {
+                    throw new \Exception('Not enough currency to make this purchase.');
+                }
+            } else {
                 // If the user is paying by themselves
                 // - stock must be purchaseable by users
                 // - currency must be user-held
                 // - user has enough currency
-                if(!$shopStock->use_user_bank || !$shopStock->currency->is_user_owned) throw new \Exception("You cannot use your user bank to pay for this item.");
-                if($shopStock->cost > 0 && !(new CurrencyManager)->debitCurrency($user, null, 'Shop Purchase', 'Purchased '.$shopStock->item->name.' from '.$shop->name, $shopStock->currency, $total_cost)) throw new \Exception("Not enough currency to make this purchase.");
+                if (!$shopStock->use_user_bank || !$shopStock->currency->is_user_owned) {
+                    throw new \Exception('You cannot use your user bank to pay for this item.');
+                }
+                if ($shopStock->cost > 0 && !(new CurrencyManager)->debitCurrency($user, null, 'Shop Purchase', 'Purchased '.$shopStock->item->name.' from '.$shop->name, $shopStock->currency, $total_cost)) {
+                    throw new \Exception('Not enough currency to make this purchase.');
+                }
             }
 
             // If the item has a limited quantity, decrease the quantity
-            if($shopStock->is_limited_stock)
-            {
+            if ($shopStock->is_limited_stock) {
                 $shopStock->quantity -= $quantity;
                 $shopStock->save();
             }
 
             // Add a purchase log
             $shopLog = ShopLog::create([
-                'shop_id' => $shop->id,
+                'shop_id'      => $shop->id,
                 'character_id' => $character ? $character->id : null,
-                'user_id' => $user->id,
-                'currency_id' => $shopStock->currency->id,
-                'cost' => $total_cost,
-                'item_id' => $shopStock->item_id,
-                'quantity' => $quantity
+                'user_id'      => $user->id,
+                'currency_id'  => $shopStock->currency->id,
+                'cost'         => $total_cost,
+                'item_id'      => $shopStock->item_id,
+                'quantity'     => $quantity,
             ]);
 
             // Give the user the item, noting down 1. whose currency was used (user or character) 2. who purchased it 3. which shop it was purchased from
-            if(!(new InventoryManager)->creditItem(null, $user, 'Shop Purchase', [
-                'data' => $shopLog->itemData,
-                'notes' => 'Purchased ' . format_date($shopLog->created_at)
-            ], $shopStock->item, $quantity)) throw new \Exception("Failed to purchase item.");
+            if (!(new InventoryManager)->creditItem(null, $user, 'Shop Purchase', [
+                'data'  => $shopLog->itemData,
+                'notes' => 'Purchased '.format_date($shopLog->created_at),
+            ], $shopStock->item, $quantity)) {
+                throw new \Exception('Failed to purchase item.');
+            }
 
             return $this->commitReturn($shop);
-        } catch(\Exception $e) {
+        } catch (\Exception $e) {
             $this->setError('error', $e->getMessage());
         }
+
         return $this->rollbackReturn(false);
     }
 
     /**
      * Checks if the purchase limit for an item from a shop has been reached.
      *
-     * @param  \App\Models\Shop\ShopStock  $shopStock
-     * @param  \App\Models\User\User      $user
+     * @param \App\Models\Shop\ShopStock $shopStock
+     * @param \App\Models\User\User      $user
+     *
      * @return bool
      */
-    public function checkPurchaseLimitReached($shopStock, $user)
-    {
-        if($shopStock->purchase_limit > 0)
+    public function checkPurchaseLimitReached($shopStock, $user) {
+        if ($shopStock->purchase_limit > 0) {
             return $this->checkUserPurchases($shopStock, $user) >= $shopStock->purchase_limit;
+        }
+
         return false;
     }
 
     /**
      * Checks how many times a user has purchased a shop item.
      *
-     * @param  \App\Models\Shop\ShopStock  $shopStock
-     * @param  \App\Models\User\User      $user
+     * @param \App\Models\Shop\ShopStock $shopStock
+     * @param \App\Models\User\User      $user
+     *
      * @return int
      */
-    public function checkUserPurchases($shopStock, $user)
-    {
+    public function checkUserPurchases($shopStock, $user) {
         return ShopLog::where('shop_id', $shopStock->shop_id)->where('item_id', $shopStock->item_id)->where('user_id', $user->id)->sum('quantity');
     }
 
-    public function getStockPurchaseLimit($shopStock, $user)
-    {
-        $limit = Config::get('lorekeeper.settings.default_purchase_limit');
-        if($shopStock->purchase_limit > 0) {
+    public function getStockPurchaseLimit($shopStock, $user) {
+        $limit = config('lorekeeper.settings.default_purchase_limit');
+        if ($shopStock->purchase_limit > 0) {
             $user_purchase_limit = $shopStock->purchase_limit - $this->checkUserPurchases($shopStock, $user);
-            if($user_purchase_limit < $limit) $limit = $user_purchase_limit;
+            if ($user_purchase_limit < $limit) {
+                $limit = $user_purchase_limit;
+            }
         }
-        if($shopStock->is_limited_stock) {
-            if($shopStock->quantity < $limit) $limit = $shopStock->quantity;
+        if ($shopStock->is_limited_stock) {
+            if ($shopStock->quantity < $limit) {
+                $limit = $shopStock->quantity;
+            }
         }
+
         return $limit;
     }
 }
diff --git a/app/Services/ShopService.php b/app/Services/ShopService.php
index de2f205ae6..5f567282b7 100644
--- a/app/Services/ShopService.php
+++ b/app/Services/ShopService.php
@@ -1,15 +1,11 @@
-<?php namespace App\Services;
+<?php
 
-use App\Services\Service;
-
-use DB;
-use Config;
+namespace App\Services;
 
 use App\Models\Shop\Shop;
-use App\Models\Shop\ShopStock;
+use Illuminate\Support\Facades\DB;
 
-class ShopService extends Service
-{
+class ShopService extends Service {
     /*
     |--------------------------------------------------------------------------
     | Shop Service
@@ -20,106 +16,118 @@ class ShopService extends Service
     */
 
     /**********************************************************************************************
-     
+
         SHOPS
 
     **********************************************************************************************/
-    
+
     /**
      * Creates a new shop.
      *
-     * @param  array                  $data 
-     * @param  \App\Models\User\User  $user
-     * @return bool|\App\Models\Shop\Shop
+     * @param array                 $data
+     * @param \App\Models\User\User $user
+     *
+     * @return \App\Models\Shop\Shop|bool
      */
-    public function createShop($data, $user)
-    {
+    public function createShop($data, $user) {
         DB::beginTransaction();
 
         try {
-
             $data = $this->populateShopData($data);
 
             $image = null;
-            if(isset($data['image']) && $data['image']) {
+            if (isset($data['image']) && $data['image']) {
                 $data['has_image'] = 1;
+                $data['hash'] = randomString(10);
                 $image = $data['image'];
                 unset($data['image']);
+            } else {
+                $data['has_image'] = 0;
             }
-            else $data['has_image'] = 0;
 
             $shop = Shop::create($data);
 
-            if ($image) $this->handleImage($image, $shop->shopImagePath, $shop->shopImageFileName);
+            if ($image) {
+                $this->handleImage($image, $shop->shopImagePath, $shop->shopImageFileName);
+            }
 
             return $this->commitReturn($shop);
-        } catch(\Exception $e) { 
+        } catch (\Exception $e) {
             $this->setError('error', $e->getMessage());
         }
+
         return $this->rollbackReturn(false);
     }
-    
+
     /**
      * Updates a shop.
      *
-     * @param  \App\Models\Shop\Shop  $shop
-     * @param  array                  $data 
-     * @param  \App\Models\User\User  $user
-     * @return bool|\App\Models\Shop\Shop
+     * @param \App\Models\Shop\Shop $shop
+     * @param array                 $data
+     * @param \App\Models\User\User $user
+     *
+     * @return \App\Models\Shop\Shop|bool
      */
-    public function updateShop($shop, $data, $user)
-    {
+    public function updateShop($shop, $data, $user) {
         DB::beginTransaction();
 
         try {
             // More specific validation
-            if(Shop::where('name', $data['name'])->where('id', '!=', $shop->id)->exists()) throw new \Exception("The name has already been taken.");
+            if (Shop::where('name', $data['name'])->where('id', '!=', $shop->id)->exists()) {
+                throw new \Exception('The name has already been taken.');
+            }
 
             $data = $this->populateShopData($data, $shop);
 
-            $image = null;            
-            if(isset($data['image']) && $data['image']) {
+            $image = null;
+            if (isset($data['image']) && $data['image']) {
                 $data['has_image'] = 1;
+                $data['hash'] = randomString(10);
                 $image = $data['image'];
                 unset($data['image']);
             }
 
             $shop->update($data);
 
-            if ($shop) $this->handleImage($image, $shop->shopImagePath, $shop->shopImageFileName);
+            if ($shop) {
+                $this->handleImage($image, $shop->shopImagePath, $shop->shopImageFileName);
+            }
 
             return $this->commitReturn($shop);
-        } catch(\Exception $e) { 
+        } catch (\Exception $e) {
             $this->setError('error', $e->getMessage());
         }
+
         return $this->rollbackReturn(false);
     }
-    
+
     /**
      * Updates shop stock.
      *
-     * @param  \App\Models\Shop\Shop  $shop
-     * @param  array                  $data 
-     * @param  \App\Models\User\User  $user
-     * @return bool|\App\Models\Shop\Shop
+     * @param \App\Models\Shop\Shop $shop
+     * @param array                 $data
+     * @param \App\Models\User\User $user
+     *
+     * @return \App\Models\Shop\Shop|bool
      */
-    public function updateShopStock($shop, $data, $user)
-    {
+    public function updateShopStock($shop, $data, $user) {
         DB::beginTransaction();
 
         try {
-            if(isset($data['item_id'])) {
-                foreach($data['item_id'] as $key => $itemId)
-                {
-                    if($data['cost'][$key] == null) throw new \Exception("One or more of the items is missing a cost.");
-                    if($data['cost'][$key] < 0) throw new \Exception("One or more of the items has a negative cost.");
+            if (isset($data['item_id'])) {
+                foreach ($data['item_id'] as $key => $itemId) {
+                    if ($data['cost'][$key] == null) {
+                        throw new \Exception('One or more of the items is missing a cost.');
+                    }
+                    if ($data['cost'][$key] < 0) {
+                        throw new \Exception('One or more of the items has a negative cost.');
+                    }
                 }
 
                 // Clear the existing shop stock
                 $shop->stock()->delete();
 
-                foreach($data['item_id'] as $key => $itemId)
-                {
+                foreach ($data['item_id'] as $key => $itemId) {
                     $shop->stock()->create([
                         'shop_id'               => $shop->id,
                         'item_id'               => $data['item_id'][$key],
@@ -138,83 +146,90 @@ public function updateShopStock($shop, $data, $user)
             }
 
             return $this->commitReturn($shop);
-        } catch(\Exception $e) { 
+        } catch (\Exception $e) {
             $this->setError('error', $e->getMessage());
         }
+
         return $this->rollbackReturn(false);
     }
 
-    /**
-     * Processes user input for creating/updating a shop.
-     *
-     * @param  array                  $data 
-     * @param  \App\Models\Shop\Shop  $shop
-     * @return array
-     */
-    private function populateShopData($data, $shop = null)
-    {
-        if(isset($data['description']) && $data['description']) $data['parsed_description'] = parse($data['description']);
-        $data['is_active'] = isset($data['is_active']);
-        
-        if(isset($data['remove_image']))
-        {
-            if($shop && $shop->has_image && $data['remove_image']) 
-            { 
-                $data['has_image'] = 0; 
-                $this->deleteImage($shop->shopImagePath, $shop->shopImageFileName); 
-            }
-            unset($data['remove_image']);
-        }
-
-        return $data;
-    }
-    
     /**
      * Deletes a shop.
      *
-     * @param  \App\Models\Shop\Shop  $shop
+     * @param \App\Models\Shop\Shop $shop
+     *
      * @return bool
      */
-    public function deleteShop($shop)
-    {
+    public function deleteShop($shop) {
         DB::beginTransaction();
 
         try {
             // Delete shop stock
             $shop->stock()->delete();
 
-            if($shop->has_image) $this->deleteImage($shop->shopImagePath, $shop->shopImageFileName); 
+            if ($shop->has_image) {
+                $this->deleteImage($shop->shopImagePath, $shop->shopImageFileName);
+            }
             $shop->delete();
 
             return $this->commitReturn(true);
-        } catch(\Exception $e) { 
+        } catch (\Exception $e) {
             $this->setError('error', $e->getMessage());
         }
+
         return $this->rollbackReturn(false);
     }
 
     /**
      * Sorts shop order.
      *
-     * @param  array  $data
+     * @param array $data
+     *
      * @return bool
      */
-    public function sortShop($data)
-    {
+    public function sortShop($data) {
         DB::beginTransaction();
 
         try {
             // explode the sort array and reverse it since the order is inverted
             $sort = array_reverse(explode(',', $data));
 
-            foreach($sort as $key => $s) {
+            foreach ($sort as $key => $s) {
                 Shop::where('id', $s)->update(['sort' => $key]);
             }
 
             return $this->commitReturn(true);
-        } catch(\Exception $e) { 
+        } catch (\Exception $e) {
             $this->setError('error', $e->getMessage());
         }
+
         return $this->rollbackReturn(false);
     }
-}
\ No newline at end of file
+
+    /**
+     * Processes user input for creating/updating a shop.
+     *
+     * @param array                 $data
+     * @param \App\Models\Shop\Shop $shop
+     *
+     * @return array
+     */
+    private function populateShopData($data, $shop = null) {
+        if (isset($data['description']) && $data['description']) {
+            $data['parsed_description'] = parse($data['description']);
+        } else {
+            $data['parsed_description'] = null;
+        }
+        $data['is_active'] = isset($data['is_active']);
+
+        if (isset($data['remove_image'])) {
+            if ($shop && $shop->has_image && $data['remove_image']) {
+                $data['has_image'] = 0;
+                $this->deleteImage($shop->shopImagePath, $shop->shopImageFileName);
+            }
+            unset($data['remove_image']);
+        }
+
+        return $data;
+    }
+}
diff --git a/app/Services/SpeciesService.php b/app/Services/SpeciesService.php
index 461d2cb442..c18351d0e9 100644
--- a/app/Services/SpeciesService.php
+++ b/app/Services/SpeciesService.php
@@ -1,16 +1,13 @@
-<?php namespace App\Services;
+<?php
 
-use App\Services\Service;
-
-use DB;
-use Config;
+namespace App\Services;
 
+use App\Models\Character\CharacterImage;
 use App\Models\Species\Species;
 use App\Models\Species\Subtype;
-use App\Models\Character\CharacterImage;
+use Illuminate\Support\Facades\DB;
 
-class SpeciesService extends Service
-{
+class SpeciesService extends Service {
     /*
     |--------------------------------------------------------------------------
     | Species Service
@@ -19,285 +16,323 @@ class SpeciesService extends Service
     | Handles the creation and editing of character species.
     |
     */
-    
+
     /**
      * Creates a new species.
      *
-     * @param  array                  $data 
-     * @param  \App\Models\User\User  $user
-     * @return bool|\App\Models\Species\Species
+     * @param array                 $data
+     * @param \App\Models\User\User $user
+     *
+     * @return \App\Models\Species\Species|bool
      */
-    public function createSpecies($data, $user)
-    {
+    public function createSpecies($data, $user) {
         DB::beginTransaction();
 
         try {
             $data = $this->populateData($data);
 
             $image = null;
-            if(isset($data['image']) && $data['image']) {
+            if (isset($data['image']) && $data['image']) {
                 $data['has_image'] = 1;
+                $data['hash'] = randomString(10);
                 $image = $data['image'];
                 unset($data['image']);
+            } else {
+                $data['has_image'] = 0;
             }
-            else $data['has_image'] = 0;
 
             $species = Species::create($data);
 
-            if ($image) $this->handleImage($image, $species->speciesImagePath, $species->speciesImageFileName);
+            if ($image) {
+                $this->handleImage($image, $species->speciesImagePath, $species->speciesImageFileName);
+            }
 
             return $this->commitReturn($species);
-        } catch(\Exception $e) { 
+        } catch (\Exception $e) {
             $this->setError('error', $e->getMessage());
         }
+
         return $this->rollbackReturn(false);
     }
-    
+
     /**
      * Updates a species.
      *
-     * @param  \App\Models\Species\Species  $species
-     * @param  array                        $data 
-     * @param  \App\Models\User\User        $user
-     * @return bool|\App\Models\Species\Species
+     * @param \App\Models\Species\Species $species
+     * @param array                       $data
+     * @param \App\Models\User\User       $user
+     *
+     * @return \App\Models\Species\Species|bool
      */
-    public function updateSpecies($species, $data, $user)
-    {
+    public function updateSpecies($species, $data, $user) {
         DB::beginTransaction();
 
         try {
             // More specific validation
-            if(Species::where('name', $data['name'])->where('id', '!=', $species->id)->exists()) throw new \Exception("The name has already been taken.");
+            if (Species::where('name', $data['name'])->where('id', '!=', $species->id)->exists()) {
+                throw new \Exception('The name has already been taken.');
+            }
 
             $data = $this->populateData($data, $species);
 
-            $image = null;            
-            if(isset($data['image']) && $data['image']) {
+            $image = null;
+            if (isset($data['image']) && $data['image']) {
                 $data['has_image'] = 1;
+                $data['hash'] = randomString(10);
                 $image = $data['image'];
                 unset($data['image']);
             }
 
             $species->update($data);
 
-            if ($species) $this->handleImage($image, $species->speciesImagePath, $species->speciesImageFileName);
+            if ($species) {
+                $this->handleImage($image, $species->speciesImagePath, $species->speciesImageFileName);
+            }
 
             return $this->commitReturn($species);
-        } catch(\Exception $e) { 
+        } catch (\Exception $e) {
             $this->setError('error', $e->getMessage());
         }
+
         return $this->rollbackReturn(false);
     }
 
-    /**
-     * Processes user input for creating/updating a species.
-     *
-     * @param  array                        $data 
-     * @param  \App\Models\Species\Species  $species
-     * @return array
-     */
-    private function populateData($data, $species = null)
-    {
-        if(isset($data['description']) && $data['description']) $data['parsed_description'] = parse($data['description']);
-        
-        if(isset($data['remove_image']))
-        {
-            if($species && $species->has_image && $data['remove_image']) 
-            { 
-                $data['has_image'] = 0; 
-                $this->deleteImage($species->speciesImagePath, $species->speciesImageFileName); 
-            }
-            unset($data['remove_image']);
-        }
-
-        return $data;
-    }
-    
     /**
      * Deletes a species.
      *
-     * @param  \App\Models\Species\Species  $species
+     * @param \App\Models\Species\Species $species
+     *
      * @return bool
      */
-    public function deleteSpecies($species)
-    {
+    public function deleteSpecies($species) {
         DB::beginTransaction();
 
         try {
             // Check first if characters with this species exists
-            if(CharacterImage::where('species_id', $species->id)->exists()) throw new \Exception("A character image with this species exists. Please change its species first.");
-            
-            if($species->has_image) $this->deleteImage($species->speciesImagePath, $species->speciesImageFileName); 
+            if (CharacterImage::where('species_id', $species->id)->exists()) {
+                throw new \Exception('A character image with this species exists. Please change its species first.');
+            }
+
+            if ($species->has_image) {
+                $this->deleteImage($species->speciesImagePath, $species->speciesImageFileName);
+            }
             $species->delete();
 
             return $this->commitReturn(true);
-        } catch(\Exception $e) { 
+        } catch (\Exception $e) {
             $this->setError('error', $e->getMessage());
         }
+
         return $this->rollbackReturn(false);
     }
 
     /**
      * Sorts species order.
      *
-     * @param  array  $data
+     * @param array $data
+     *
      * @return bool
      */
-    public function sortSpecies($data)
-    {
+    public function sortSpecies($data) {
         DB::beginTransaction();
 
         try {
             // explode the sort array and reverse it since the order is inverted
             $sort = array_reverse(explode(',', $data));
 
-            foreach($sort as $key => $s) {
+            foreach ($sort as $key => $s) {
                 Species::where('id', $s)->update(['sort' => $key]);
             }
 
             return $this->commitReturn(true);
-        } catch(\Exception $e) { 
+        } catch (\Exception $e) {
             $this->setError('error', $e->getMessage());
         }
+
         return $this->rollbackReturn(false);
     }
-    
+
     /**
      * Creates a new subtype.
      *
-     * @param  array                  $data 
-     * @param  \App\Models\User\User  $user
-     * @return bool|\App\Models\Species\Subtype
+     * @param array                 $data
+     * @param \App\Models\User\User $user
+     *
+     * @return \App\Models\Species\Subtype|bool
      */
-    public function createSubtype($data, $user)
-    {
+    public function createSubtype($data, $user) {
         DB::beginTransaction();
 
         try {
             $data = $this->populateSubtypeData($data);
 
             $image = null;
-            if(isset($data['image']) && $data['image']) {
+            if (isset($data['image']) && $data['image']) {
                 $data['has_image'] = 1;
+                $data['hash'] = randomString(10);
                 $image = $data['image'];
                 unset($data['image']);
+            } else {
+                $data['has_image'] = 0;
             }
-            else $data['has_image'] = 0;
 
             $subtype = Subtype::create($data);
 
-            if ($image) $this->handleImage($image, $subtype->subtypeImagePath, $subtype->subtypeImageFileName);
+            if ($image) {
+                $this->handleImage($image, $subtype->subtypeImagePath, $subtype->subtypeImageFileName);
+            }
 
             return $this->commitReturn($subtype);
-        } catch(\Exception $e) { 
+        } catch (\Exception $e) {
             $this->setError('error', $e->getMessage());
         }
+
         return $this->rollbackReturn(false);
     }
-    
+
     /**
      * Updates a subtype.
      *
-     * @param  \App\Models\Species\Subtype  $subtype
-     * @param  array                        $data 
-     * @param  \App\Models\User\User        $user
-     * @return bool|\App\Models\Species\Subtype
+     * @param \App\Models\Species\Subtype $subtype
+     * @param array                       $data
+     * @param \App\Models\User\User       $user
+     *
+     * @return \App\Models\Species\Subtype|bool
      */
-    public function updateSubtype($subtype, $data, $user)
-    {
+    public function updateSubtype($subtype, $data, $user) {
         DB::beginTransaction();
 
         try {
             $data = $this->populateSubtypeData($data, $subtype);
 
-            $image = null;            
-            if(isset($data['image']) && $data['image']) {
+            $image = null;
+            if (isset($data['image']) && $data['image']) {
                 $data['has_image'] = 1;
+                $data['hash'] = randomString(10);
                 $image = $data['image'];
                 unset($data['image']);
             }
 
             $subtype->update($data);
 
-            if ($subtype) $this->handleImage($image, $subtype->subtypeImagePath, $subtype->subtypeImageFileName);
+            if ($subtype) {
+                $this->handleImage($image, $subtype->subtypeImagePath, $subtype->subtypeImageFileName);
+            }
 
             return $this->commitReturn($subtype);
-        } catch(\Exception $e) { 
+        } catch (\Exception $e) {
             $this->setError('error', $e->getMessage());
         }
+
         return $this->rollbackReturn(false);
     }
 
-    /**
-     * Processes user input for creating/updating a subtype.
-     *
-     * @param  array                        $data 
-     * @param  \App\Models\Species\Subtype  $subtype
-     * @return array
-     */
-    private function populateSubtypeData($data, $subtype = null)
-    {
-        if(isset($data['description']) && $data['description']) $data['parsed_description'] = parse($data['description']);
-        
-        if(isset($data['remove_image']))
-        {
-            if($subtype && $subtype->has_image && $data['remove_image']) 
-            { 
-                $data['has_image'] = 0; 
-                $this->deleteImage($subtype->subtypeImagePath, $subtype->subtypeImageFileName); 
-            }
-            unset($data['remove_image']);
-        }
-
-        return $data;
-    }
-    
     /**
      * Deletes a subtype.
      *
-     * @param  \App\Models\Species\Subtype  $subtype
+     * @param \App\Models\Species\Subtype $subtype
+     *
      * @return bool
      */
-    public function deleteSubtype($subtype)
-    {
+    public function deleteSubtype($subtype) {
         DB::beginTransaction();
 
         try {
             // Check first if characters with this subtype exists
-            if(CharacterImage::where('subtype_id', $subtype->id)->exists()) throw new \Exception("A character image with this subtype exists. Please change or remove its subtype first.");
-            
-            if($subtype->has_image) $this->deleteImage($subtype->subtypeImagePath, $subtype->subtypeImageFileName); 
+            if (CharacterImage::where('subtype_id', $subtype->id)->exists()) {
+                throw new \Exception('A character image with this subtype exists. Please change or remove its subtype first.');
+            }
+
+            if ($subtype->has_image) {
+                $this->deleteImage($subtype->subtypeImagePath, $subtype->subtypeImageFileName);
+            }
             $subtype->delete();
 
             return $this->commitReturn(true);
-        } catch(\Exception $e) { 
+        } catch (\Exception $e) {
             $this->setError('error', $e->getMessage());
         }
+
         return $this->rollbackReturn(false);
     }
 
     /**
      * Sorts subtype order.
      *
-     * @param  array  $data
+     * @param array $data
+     *
      * @return bool
      */
-    public function sortSubtypes($data)
-    {
+    public function sortSubtypes($data) {
         DB::beginTransaction();
 
         try {
             // explode the sort array and reverse it since the order is inverted
             $sort = array_reverse(explode(',', $data));
 
-            foreach($sort as $key => $s) {
+            foreach ($sort as $key => $s) {
                 Subtype::where('id', $s)->update(['sort' => $key]);
             }
 
             return $this->commitReturn(true);
-        } catch(\Exception $e) { 
+        } catch (\Exception $e) {
             $this->setError('error', $e->getMessage());
         }
+
         return $this->rollbackReturn(false);
     }
-}
\ No newline at end of file
+
+    /**
+     * Processes user input for creating/updating a species.
+     *
+     * @param array                       $data
+     * @param \App\Models\Species\Species $species
+     *
+     * @return array
+     */
+    private function populateData($data, $species = null) {
+        if (isset($data['description']) && $data['description']) {
+            $data['parsed_description'] = parse($data['description']);
+        }
+
+        if (!isset($data['is_visible'])) {
+            $data['is_visible'] = 0;
+        }
+        if (isset($data['remove_image'])) {
+            if ($species && $species->has_image && $data['remove_image']) {
+                $data['has_image'] = 0;
+                $this->deleteImage($species->speciesImagePath, $species->speciesImageFileName);
+            }
+            unset($data['remove_image']);
+        }
+
+        return $data;
+    }
+
+    /**
+     * Processes user input for creating/updating a subtype.
+     *
+     * @param array                       $data
+     * @param \App\Models\Species\Subtype $subtype
+     *
+     * @return array
+     */
+    private function populateSubtypeData($data, $subtype = null) {
+        if (isset($data['description']) && $data['description']) {
+            $data['parsed_description'] = parse($data['description']);
+        }
+
+        if (!isset($data['is_visible'])) {
+            $data['is_visible'] = 0;
+        }
+        if (isset($data['remove_image'])) {
+            if ($subtype && $subtype->has_image && $data['remove_image']) {
+                $data['has_image'] = 0;
+                $this->deleteImage($subtype->subtypeImagePath, $subtype->subtypeImageFileName);
+            }
+            unset($data['remove_image']);
+        }
+
+        return $data;
+    }
+}
diff --git a/app/Services/SublistService.php b/app/Services/SublistService.php
index f75dfe63d8..25c16f266c 100644
--- a/app/Services/SublistService.php
+++ b/app/Services/SublistService.php
@@ -1,16 +1,13 @@
-<?php namespace App\Services;
+<?php
 
-use App\Services\Service;
+namespace App\Services;
 
-use DB;
-use Config;
-
-use App\Models\Character\Sublist;
 use App\Models\Character\CharacterCategory;
+use App\Models\Character\Sublist;
 use App\Models\Species\Species;
+use Illuminate\Support\Facades\DB;
 
-class SublistService extends Service
-{
+class SublistService extends Service {
     /*
     |--------------------------------------------------------------------------
     | Sub Masterlist Service
@@ -21,7 +18,7 @@ class SublistService extends Service
     */
 
     /**********************************************************************************************
-     
+
         SUB MASTERLISTS
 
     **********************************************************************************************/
@@ -29,115 +26,120 @@ class SublistService extends Service
     /**
      * Create a sublist.
      *
-     * @param  array                 $data
-     * @param  array                 $contents
+     * @param array $data
+     * @param array $contents
+     *
      * @return \App\Models\Character\Sublist|bool
      */
-    public function createSublist($data, $contents)
-    {
+    public function createSublist($data, $contents) {
         DB::beginTransaction();
 
         try {
             $sublist = Sublist::create($data);
 
             //update categories and species
-            if(isset($contents['categories']) && $contents['categories'])
-            {
-                CharacterCategory::whereIn('id', $contents['categories'])->update(array('masterlist_sub_id' => $sublist->id));
+            if (isset($contents['categories']) && $contents['categories']) {
+                CharacterCategory::whereIn('id', $contents['categories'])->update(['masterlist_sub_id' => $sublist->id]);
             }
-            if(isset($contents['species']) && $contents['species'])
-            {
-                Species::whereIn('id', $contents['species'])->update(array('masterlist_sub_id' => $sublist->id));
+            if (isset($contents['species']) && $contents['species']) {
+                Species::whereIn('id', $contents['species'])->update(['masterlist_sub_id' => $sublist->id]);
             }
 
             return $this->commitReturn($sublist);
-        } catch(\Exception $e) { 
+        } catch (\Exception $e) {
             $this->setError('error', $e->getMessage());
         }
+
         return $this->rollbackReturn(false);
     }
 
     /**
      * Update a sublist.
      *
-     * @param  \App\Models\Character\Sublist        $sublist
-     * @param  array                                $data
-     * @param  array                                $contents
-     * @param  \App\Models\User\User                $user
+     * @param \App\Models\Character\Sublist $sublist
+     * @param array                         $data
+     * @param array                         $contents
+     *
      * @return \App\Models\Character\Sublist|bool
      */
-    public function updateSublist($sublist, $data, $contents)
-    {
+    public function updateSublist($sublist, $data, $contents) {
         DB::beginTransaction();
 
         try {
             // More specific validation
-            if(Sublist::where('name', $data['name'])->where('id', '!=', $sublist->id)->exists()) throw new \Exception("The name has already been taken.");
+            if (Sublist::where('name', $data['name'])->where('id', '!=', $sublist->id)->exists()) {
+                throw new \Exception('The name has already been taken.');
+            }
 
             //update sublist
             $sublist->update($data);
 
             //update categories and species
-            CharacterCategory::where('masterlist_sub_id', $sublist->id)->update(array('masterlist_sub_id' => 0));
-            Species::where('masterlist_sub_id', $sublist->id)->update(array('masterlist_sub_id' => 0));
-            if(isset($contents['categories']))
-                CharacterCategory::whereIn('id', $contents['categories'])->update(array('masterlist_sub_id' => $sublist->id));
-            if(isset($contents['species']))
-                Species::whereIn('id', $contents['species'])->update(array('masterlist_sub_id' => $sublist->id));
+            CharacterCategory::where('masterlist_sub_id', $sublist->id)->update(['masterlist_sub_id' => 0]);
+            Species::where('masterlist_sub_id', $sublist->id)->update(['masterlist_sub_id' => 0]);
+            if (isset($contents['categories'])) {
+                CharacterCategory::whereIn('id', $contents['categories'])->update(['masterlist_sub_id' => $sublist->id]);
+            }
+            if (isset($contents['species'])) {
+                Species::whereIn('id', $contents['species'])->update(['masterlist_sub_id' => $sublist->id]);
+            }
 
             return $this->commitReturn($sublist);
-        } catch(\Exception $e) { 
+        } catch (\Exception $e) {
             $this->setError('error', $e->getMessage());
         }
+
         return $this->rollbackReturn(false);
     }
 
     /**
      * Delete a sublist.
      *
-     * @param  \App\Models\Character\Sublist  $sublist
+     * @param \App\Models\Character\Sublist $sublist
+     *
      * @return bool
      */
-    public function deleteSublist($sublist)
-    {
+    public function deleteSublist($sublist) {
         DB::beginTransaction();
 
         try {
             // Check first if the sublist is currently in use
-            CharacterCategory::where('masterlist_sub_id', $sublist->id)->update(array('masterlist_sub_id' => 0));
-            Species::where('masterlist_sub_id', $sublist->id)->update(array('masterlist_sub_id' => 0));
-            
+            CharacterCategory::where('masterlist_sub_id', $sublist->id)->update(['masterlist_sub_id' => 0]);
+            Species::where('masterlist_sub_id', $sublist->id)->update(['masterlist_sub_id' => 0]);
+
             $sublist->delete();
 
             return $this->commitReturn(true);
-        } catch(\Exception $e) { 
+        } catch (\Exception $e) {
             $this->setError('error', $e->getMessage());
         }
+
         return $this->rollbackReturn(false);
     }
 
     /**
      * Sorts sublist  order.
      *
-     * @param  array  $data
+     * @param array $data
+     *
      * @return bool
      */
-    public function sortSublist($data)
-    {
+    public function sortSublist($data) {
         DB::beginTransaction();
 
         try {
             // explode the sort array and reverse it since the order is inverted
             $sort = array_reverse(explode(',', $data));
 
-            foreach($sort as $key => $s) {
+            foreach ($sort as $key => $s) {
                 Sublist::where('id', $s)->update(['sort' => $key]);
             }
 
             return $this->commitReturn(true);
-        } catch(\Exception $e) { 
+        } catch (\Exception $e) {
             $this->setError('error', $e->getMessage());
         }
+
         return $this->rollbackReturn(false);
     }
-}
\ No newline at end of file
+}
diff --git a/app/Services/SubmissionManager.php b/app/Services/SubmissionManager.php
index a1b8a2ff52..a86be7924d 100644
--- a/app/Services/SubmissionManager.php
+++ b/app/Services/SubmissionManager.php
@@ -1,29 +1,24 @@
-<?php namespace App\Services;
+<?php
 
-use App\Services\Service;
+namespace App\Services;
 
-use Carbon\Carbon;
-
-use DB;
-use Config;
-use Image;
-use Notifications;
-use Settings;
-
-use Illuminate\Support\Arr;
-use App\Models\User\User;
-use App\Models\User\UserItem;
+use App\Facades\Notifications;
+use App\Facades\Settings;
 use App\Models\Character\Character;
-use App\Models\Submission\Submission;
-use App\Models\Submission\SubmissionCharacter;
 use App\Models\Currency\Currency;
 use App\Models\Item\Item;
 use App\Models\Loot\LootTable;
-use App\Models\Raffle\Raffle;
 use App\Models\Prompt\Prompt;
+use App\Models\Raffle\Raffle;
+use App\Models\Submission\Submission;
+use App\Models\Submission\SubmissionCharacter;
+use App\Models\User\User;
+use App\Models\User\UserItem;
+use Carbon\Carbon;
+use Illuminate\Support\Arr;
+use Illuminate\Support\Facades\DB;
 
-class SubmissionManager extends Service
-{
+class SubmissionManager extends Service {
     /*
     |--------------------------------------------------------------------------
     | Submission Manager
@@ -36,323 +31,316 @@ class SubmissionManager extends Service
     /**
      * Creates a new submission.
      *
-     * @param  array                  $data
-     * @param  \App\Models\User\User  $user
-     * @param  bool                   $isClaim
+     * @param array                 $data
+     * @param \App\Models\User\User $user
+     * @param bool                  $isClaim
+     * @param mixed                 $isDraft
+     *
      * @return mixed
      */
-    public function createSubmission($data, $user, $isClaim = false)
-    {
+    public function createSubmission($data, $user, $isClaim = false, $isDraft = false) {
         DB::beginTransaction();
 
         try {
-
             // 1. check that the prompt can be submitted at this time
             // 2. check that the characters selected exist (are visible too)
             // 3. check that the currencies selected can be attached to characters
-            if(!$isClaim && !Settings::get('is_prompts_open')) throw new \Exception("The prompt queue is closed for submissions.");
-            else if($isClaim && !Settings::get('is_claims_open')) throw new \Exception("The claim queue is closed for submissions.");
-            if(!$isClaim && !isset($data['prompt_id'])) throw new \Exception("Please select a prompt.");
-            if(!$isClaim) {
-                $prompt = Prompt::active()->where('id', $data['prompt_id'])->with('rewards')->first();
-                if(!$prompt) throw new \Exception("Invalid prompt selected.");
+            if (!$isClaim && !Settings::get('is_prompts_open')) {
+                throw new \Exception('The prompt queue is closed for submissions.');
+            } elseif ($isClaim && !Settings::get('is_claims_open')) {
+                throw new \Exception('The claim queue is closed for submissions.');
             }
-            else $prompt = null;
-
-            // The character identification comes in both the slug field and as character IDs
-            // that key the reward ID/quantity arrays.
-            // We'll need to match characters to the rewards for them.
-            // First, check if the characters are accessible to begin with.
-            if(isset($data['slug'])) {
-                $characters = Character::myo(0)->visible()->whereIn('slug', $data['slug'])->get();
-                if(count($characters) != count($data['slug'])) throw new \Exception("One or more of the selected characters do not exist.");
+            if (!$isClaim && !isset($data['prompt_id'])) {
+                throw new \Exception('Please select a prompt.');
             }
-            else $characters = [];
-
-            $userAssets = createAssetsArray();
-
-            // Attach items. Technically, the user doesn't lose ownership of the item - we're just adding an additional holding field.
-            // We're also not going to add logs as this might add unnecessary fluff to the logs and the items still belong to the user.
-            if(isset($data['stack_id'])) {
-                foreach($data['stack_id'] as $stackId) {
-                    $stack = UserItem::with('item')->find($stackId);
-                    if(!$stack || $stack->user_id != $user->id) throw new \Exception("Invalid item selected.");
-                    if(!isset($data['stack_quantity'][$stackId])) throw new \Exception("Invalid quantity selected.");
-                    $stack->submission_count += $data['stack_quantity'][$stackId];
-                    $stack->save();
+            if (!$isClaim) {
+                $prompt = Prompt::active()->where('id', $data['prompt_id'])->with('rewards')->first();
+                if (!$prompt) {
+                    throw new \Exception('Invalid prompt selected.');
+                }
 
-                    addAsset($userAssets, $stack, $data['stack_quantity'][$stackId]);
+                if ($prompt->staff_only && !$user->isStaff) {
+                    throw new \Exception('This prompt may only be submitted to by staff members.');
                 }
+            } else {
+                $prompt = null;
             }
 
-            // Attach currencies.
-            if(isset($data['currency_id'])) {
-                foreach($data['currency_id'] as $holderKey=>$currencyIds) {
-                    $holder = explode('-', $holderKey);
-                    $holderType = $holder[0];
-                    $holderId = $holder[1];
+            // Create the submission itself.
+            $submission = Submission::create([
+                'user_id'   => $user->id,
+                'url'       => $data['url'] ?? null,
+                'status'    => $isDraft ? 'Draft' : 'Pending',
+                'comments'  => $data['comments'],
+                'data'      => null,
+            ] + ($isClaim ? [] : [
+                'prompt_id' => $prompt->id,
+            ]));
+
+            // Set items that have been attached.
+            $assets = $this->createUserAttachments($submission, $data, $user);
+            $userAssets = $assets['userAssets'];
+            $promptRewards = $assets['promptRewards'];
 
-                    $holder = User::find($holderId);
+            $submission->update([
+                'data' => json_encode([
+                    'user'    => Arr::only(getDataReadyAssets($userAssets), ['user_items', 'currencies']),
+                    'rewards' => getDataReadyAssets($promptRewards),
+                ]), // list of rewards and addons
+            ]);
 
-                    $currencyManager = new CurrencyManager;
-                    foreach($currencyIds as $key=>$currencyId) {
-                        $currency = Currency::find($currencyId);
-                        if(!$currency) throw new \Exception("Invalid currency selected.");
-                        if($data['currency_quantity'][$holderKey][$key] < 0) throw new \Exception('Cannot attach a negative amount of currency.');
-                        if(!$currencyManager->debitCurrency($holder, null, null, null, $currency, $data['currency_quantity'][$holderKey][$key])) throw new \Exception("Invalid currency/quantity selected.");
+            // Set characters that have been attached.
+            $this->createCharacterAttachments($submission, $data);
 
-                        addAsset($userAssets, $currency, $data['currency_quantity'][$holderKey][$key]);
+            return $this->commitReturn($submission);
+        } catch (\Exception $e) {
+            $this->setError('error', $e->getMessage());
+        }
 
-                    }
-                }
-            }
+        return $this->rollbackReturn(false);
+    }
+
+    /**
+     * Edits an existing submission.
+     *
+     * @param array                 $data
+     * @param \App\Models\User\User $user
+     * @param bool                  $isClaim
+     * @param mixed                 $submission
+     * @param mixed                 $isSubmit
+     *
+     * @return mixed
+     */
+    public function editSubmission($submission, $data, $user, $isClaim = false, $isSubmit = false) {
+        DB::beginTransaction();
 
-            // Get a list of rewards, then create the submission itself
-            $promptRewards = createAssetsArray();
-            if(!$isClaim)
-            {
-                foreach($prompt->rewards as $reward)
-                {
-                    addAsset($promptRewards, $reward->reward, $reward->quantity);
+        try {
+            // 1. check that the prompt can be submitted at this time
+            // 2. check that the characters selected exist (are visible too)
+            // 3. check that the currencies selected can be attached to characters
+            if (!$isClaim && !Settings::get('is_prompts_open')) {
+                throw new \Exception('The prompt queue is closed for submissions.');
+            } elseif ($isClaim && !Settings::get('is_claims_open')) {
+                throw new \Exception('The claim queue is closed for submissions.');
+            }
+            if (!$isClaim && !isset($data['prompt_id'])) {
+                throw new \Exception('Please select a prompt.');
+            }
+            if (!$isClaim) {
+                $prompt = Prompt::active()->where('id', $data['prompt_id'])->with('rewards')->first();
+                if (!$prompt) {
+                    throw new \Exception('Invalid prompt selected.');
                 }
+            } else {
+                $prompt = null;
             }
-            $promptRewards = mergeAssetsArrays($promptRewards, $this->processRewards($data, false));
-            $submission = Submission::create([
-                'user_id' => $user->id,
-                'url' => isset($data['url']) ? $data['url'] : null,
-                'status' => 'Pending',
-                'comments' => $data['comments'],
-                'data' => json_encode([
-                    'user' => Arr::only(getDataReadyAssets($userAssets), ['user_items','currencies']),
-                    'rewards' => getDataReadyAssets($promptRewards)
-                    ]) // list of rewards and addons
-            ] + ($isClaim ? [] : ['prompt_id' => $prompt->id,]));
 
+            // First, return all items and currency applied.
+            // Also, as this is an edit, delete all attached characters to be re-applied later.
+            $this->removeAttachments($submission);
+            SubmissionCharacter::where('submission_id', $submission->id)->delete();
 
-            // Retrieve all reward IDs for characters
-            $currencyIds = []; $itemIds = []; $tableIds = [];
-            if(isset($data['character_currency_id'])) {
-                foreach($data['character_currency_id'] as $c)
-                {
-                    foreach($c as $currencyId) $currencyIds[] = $currencyId;
-                } // Non-expanded character rewards
+            if ($isSubmit) {
+                $submission->update(['status' => 'Pending']);
             }
-            elseif(isset($data['character_rewardable_id']))
-            {
-                $data['character_rewardable_id'] = array_map(array($this, 'innerNull'),$data['character_rewardable_id']);
-                foreach($data['character_rewardable_id'] as $ckey => $c)
-                {
-                    foreach($c as $key => $id) {
-
-                        switch($data['character_rewardable_type'][$ckey][$key])
-                        {
-                            case 'Currency': $currencyIds[] = $id; break;
-                            case 'Item': $itemIds[] = $id; break;
-                            case 'LootTable': $tableIds[] = $id; break;
-                        }
-                    }
-                } // Expanded character rewards
-            }
-            array_unique($currencyIds);            array_unique($itemIds);            array_unique($tableIds);
-            $currencies = Currency::whereIn('id', $currencyIds)->where('is_character_owned', 1)->get()->keyBy('id');
-            $items = Item::whereIn('id', $itemIds)->get()->keyBy('id');
-            $tables = LootTable::whereIn('id', $tableIds)->get()->keyBy('id');
 
-            // Attach characters
-            foreach($characters as $c)
-            {
-                // Users might not pass in clean arrays (may contain redundant data) so we need to clean that up
-                $assets = $this->processRewards($data + ['character_id' => $c->id, 'currencies' => $currencies, 'items' => $items, 'tables' => $tables], true);
+            // Then, re-attach everything fresh.
+            $assets = $this->createUserAttachments($submission, $data, $user);
+            $userAssets = $assets['userAssets'];
+            $promptRewards = $assets['promptRewards'];
+            $this->createCharacterAttachments($submission, $data);
 
-                // Now we have a clean set of assets (redundant data is gone, duplicate entries are merged)
-                // so we can attach the character to the submission
-                SubmissionCharacter::create([
-                    'character_id' => $c->id,
-                    'submission_id' => $submission->id,
-                    'data' => json_encode(getDataReadyAssets($assets))
-                ]);
-            }
+            // Modify submission
+            $submission->update([
+                'url'           => $data['url'] ?? null,
+                'updated_at'    => Carbon::now(),
+                'comments'      => $data['comments'],
+                'data'          => json_encode([
+                    'user'          => Arr::only(getDataReadyAssets($userAssets), ['user_items', 'currencies']),
+                    'rewards'       => getDataReadyAssets($promptRewards),
+                ]), // list of rewards and addons
+            ] + ($isClaim ? [] : ['prompt_id' => $prompt->id]));
 
             return $this->commitReturn($submission);
-        } catch(\Exception $e) {
+        } catch (\Exception $e) {
             $this->setError('error', $e->getMessage());
         }
-        return $this->rollbackReturn(false);
-    }
 
-    private function innerNull($value){
-        return array_values(array_filter($value));
+        return $this->rollbackReturn(false);
     }
 
     /**
-     * Processes reward data into a format that can be used for distribution.
+     * Cancels a submission.
      *
-     * @param  array $data
-     * @param  bool  $isCharacter
-     * @param  bool  $isStaff
-     * @return array
+     * @param mixed $data the submission data
+     * @param mixed $user the user performing the cancellation
      */
-    private function processRewards($data, $isCharacter, $isStaff = false)
-    {
-        if($isCharacter)
-        {
-            $assets = createAssetsArray(true);
+    public function cancelSubmission($data, $user) {
+        DB::beginTransaction();
 
-            if(isset($data['character_currency_id'][$data['character_id']]) && isset($data['character_quantity'][$data['character_id']]))
-            {
-                foreach($data['character_currency_id'][$data['character_id']] as $key => $currency)
-                {
-                    if($data['character_quantity'][$data['character_id']][$key]) addAsset($assets, $data['currencies'][$currency], $data['character_quantity'][$data['character_id']][$key]);
-                }
+        try {
+            // 1. check that the submission exists
+            // 2. check that the submission is pending
+            if (!isset($data['submission'])) {
+                $submission = Submission::where('status', 'Pending')->where('id', $data['id'])->first();
+            } elseif ($data['submission']->status == 'Pending') {
+                $submission = $data['submission'];
+            } else {
+                $submission = null;
+            }
+            if (!$submission) {
+                throw new \Exception('Invalid submission.');
             }
-            elseif(isset($data['character_rewardable_type'][$data['character_id']]) && isset($data['character_rewardable_id'][$data['character_id']]) && isset($data['character_rewardable_quantity'][$data['character_id']]))
-            {
-
-                $data['character_rewardable_id'] = array_map(array($this, 'innerNull'),$data['character_rewardable_id']);
 
-                foreach($data['character_rewardable_id'][$data['character_id']] as $key => $reward)
-                {
-                    switch($data['character_rewardable_type'][$data['character_id']][$key])
-                    {
-                        case 'Currency': if($data['character_rewardable_quantity'][$data['character_id']][$key]) addAsset($assets, $data['currencies'][$reward], $data['character_rewardable_quantity'][$data['character_id']][$key]); break;
-                        case 'Item': if($data['character_rewardable_quantity'][$data['character_id']][$key]) addAsset($assets, $data['items'][$reward], $data['character_rewardable_quantity'][$data['character_id']][$key]); break;
-                        case 'LootTable': if($data['character_rewardable_quantity'][$data['character_id']][$key]) addAsset($assets, $data['tables'][$reward], $data['character_rewardable_quantity'][$data['character_id']][$key]); break;
-                    }
-                }
+            // Set staff comments
+            if (isset($data['staff_comments']) && $data['staff_comments']) {
+                $data['parsed_staff_comments'] = parse($data['staff_comments']);
+            } else {
+                $data['parsed_staff_comments'] = null;
             }
-            return $assets;
-        }
-        else
-        {
-            $assets = createAssetsArray(false);
-            // Process the additional rewards
-            if(isset($data['rewardable_type']) && $data['rewardable_type'])
-            {
-                foreach($data['rewardable_type'] as $key => $type)
-                {
-                    $reward = null;
-                    switch($type)
-                    {
-                        case 'Item':
-                            $reward = Item::find($data['rewardable_id'][$key]);
-                            break;
-                        case 'Currency':
-                            $reward = Currency::find($data['rewardable_id'][$key]);
-                            if(!$reward->is_user_owned) throw new \Exception("Invalid currency selected.");
-                            break;
-                        case 'LootTable':
-                            if (!$isStaff) break;
-                            $reward = LootTable::find($data['rewardable_id'][$key]);
-                            break;
-                        case 'Raffle':
-                            if (!$isStaff) break;
-                            $reward = Raffle::find($data['rewardable_id'][$key]);
-                            break;
-                    }
-                    if(!$reward) continue;
-                    addAsset($assets, $reward, $data['quantity'][$key]);
-                }
+
+            $assets = $submission->data;
+            $userAssets = $assets['user'];
+            // Remove prompt-only rewards
+            $promptRewards = $this->removePromptAttachments($submission);
+
+            if ($user->id != $submission->user_id) {
+                // The only things we need to set are:
+                // 1. staff comment
+                // 2. staff ID
+                // 3. status
+                $submission->update([
+                    'staff_comments'        => $data['staff_comments'],
+                    'parsed_staff_comments' => $data['parsed_staff_comments'],
+                    'updated_at'            => Carbon::now(),
+                    'staff_id'              => $user->id,
+                    'status'                => 'Draft',
+                    'data'                  => json_encode([
+                        'user'      => $userAssets,
+                        'rewards'   => getDataReadyAssets($promptRewards),
+                    ]), // list of rewards and addons
+                ]);
+
+                Notifications::create($submission->prompt_id ? 'SUBMISSION_CANCELLED' : 'CLAIM_CANCELLED', $submission->user, [
+                    'staff_url'     => $user->url,
+                    'staff_name'    => $user->name,
+                    'submission_id' => $submission->id,
+                ]);
+            } else {
+                // This is when a user cancels their own submission back into draft form
+                $submission->update([
+                    'status'     => 'Draft',
+                    'updated_at' => Carbon::now(),
+                    'data'       => json_encode([
+                        'user'      => $userAssets,
+                        'rewards'   => getDataReadyAssets($promptRewards),
+                    ]), // list of rewards and addons
+                ]);
             }
-            return $assets;
+
+            return $this->commitReturn($submission);
+        } catch (\Exception $e) {
+            $this->setError('error', $e->getMessage());
         }
+
+        return $this->rollbackReturn(false);
     }
 
     /**
      * Rejects a submission.
      *
-     * @param  array                  $data
-     * @param  \App\Models\User\User  $user
+     * @param array                 $data
+     * @param \App\Models\User\User $user
+     *
      * @return mixed
      */
-    public function rejectSubmission($data, $user)
-    {
+    public function rejectSubmission($data, $user) {
         DB::beginTransaction();
 
         try {
             // 1. check that the submission exists
             // 2. check that the submission is pending
-            if(!isset($data['submission'])) $submission = Submission::where('status', 'Pending')->where('id', $data['id'])->first();
-            elseif($data['submission']->status == 'Pending') $submission = $data['submission'];
-            else $submission = null;
-            if(!$submission) throw new \Exception("Invalid submission.");
-
-            // Return all added items
-            $addonData = $submission->data['user'];
-            if(isset($addonData['user_items'])) {
-                foreach($addonData['user_items'] as $userItemId => $quantity) {
-                    $userItemRow = UserItem::find($userItemId);
-                    if(!$userItemRow) throw new \Exception("Cannot return an invalid item. (".$userItemId.")");
-                    if($userItemRow->submission_count < $quantity) throw new \Exception("Cannot return more items than was held. (".$userItemId.")");
-                    $userItemRow->submission_count -= $quantity;
-                    $userItemRow->save();
-                }
+            if (!isset($data['submission'])) {
+                $submission = Submission::where('status', 'Pending')->where('id', $data['id'])->first();
+            } elseif ($data['submission']->status == 'Pending') {
+                $submission = $data['submission'];
+            } else {
+                $submission = null;
             }
-
-            // And currencies
-            $currencyManager = new CurrencyManager;
-            if(isset($addonData['currencies']) && $addonData['currencies'])
-            {
-                foreach($addonData['currencies'] as $currencyId=>$quantity) {
-                    $currency = Currency::find($currencyId);
-                    if(!$currency) throw new \Exception("Cannot return an invalid currency. (".$currencyId.")");
-                    if(!$currencyManager->creditCurrency(null, $submission->user, null, null, $currency, $quantity)) throw new \Exception("Could not return currency to user. (".$currencyId.")");
-                }
+            if (!$submission) {
+                throw new \Exception('Invalid submission.');
             }
 
-			if(isset($data['staff_comments']) && $data['staff_comments']) $data['parsed_staff_comments'] = parse($data['staff_comments']);
-			else $data['parsed_staff_comments'] = null;
+            // Return all items and currency applied.
+            $this->removeAttachments($submission);
+
+            if (isset($data['staff_comments']) && $data['staff_comments']) {
+                $data['parsed_staff_comments'] = parse($data['staff_comments']);
+            } else {
+                $data['parsed_staff_comments'] = null;
+            }
 
             // The only things we need to set are:
             // 1. staff comment
             // 2. staff ID
             // 3. status
             $submission->update([
-                'staff_comments' => $data['staff_comments'],
-				'parsed_staff_comments' => $data['parsed_staff_comments'],
-                'staff_id' => $user->id,
-                'status' => 'Rejected'
+                'staff_comments'        => $data['staff_comments'],
+                'parsed_staff_comments' => $data['parsed_staff_comments'],
+                'staff_id'              => $user->id,
+                'status'                => 'Rejected',
             ]);
 
             Notifications::create($submission->prompt_id ? 'SUBMISSION_REJECTED' : 'CLAIM_REJECTED', $submission->user, [
-                'staff_url' => $user->url,
-                'staff_name' => $user->name,
+                'staff_url'     => $user->url,
+                'staff_name'    => $user->name,
                 'submission_id' => $submission->id,
             ]);
 
+            if (!$this->logAdminAction($user, 'Submission Rejected', 'Rejected submission <a href="'.$submission->viewurl.'">#'.$submission->id.'</a>')) {
+                throw new \Exception('Failed to log admin action.');
+            }
+
             return $this->commitReturn($submission);
-        } catch(\Exception $e) {
+        } catch (\Exception $e) {
             $this->setError('error', $e->getMessage());
         }
+
         return $this->rollbackReturn(false);
     }
 
     /**
      * Approves a submission.
      *
-     * @param  array                  $data
-     * @param  \App\Models\User\User  $user
+     * @param array                 $data
+     * @param \App\Models\User\User $user
+     *
      * @return mixed
      */
-    public function approveSubmission($data, $user)
-    {
+    public function approveSubmission($data, $user) {
         DB::beginTransaction();
 
         try {
-
             // 1. check that the submission exists
             // 2. check that the submission is pending
             $submission = Submission::where('status', 'Pending')->where('id', $data['id'])->first();
-            if(!$submission) throw new \Exception("Invalid submission.");
+            if (!$submission) {
+                throw new \Exception('Invalid submission.');
+            }
 
             // Remove any added items, hold counts, and add logs
             $addonData = $submission->data['user'];
             $inventoryManager = new InventoryManager;
-            if(isset($addonData['user_items'])) {
+            if (isset($addonData['user_items'])) {
                 $stacks = $addonData['user_items'];
-                foreach($addonData['user_items'] as $userItemId => $quantity) {
+                foreach ($addonData['user_items'] as $userItemId => $quantity) {
                     $userItemRow = UserItem::find($userItemId);
-                    if(!$userItemRow) throw new \Exception("Cannot return an invalid item. (".$userItemId.")");
-                    if($userItemRow->submission_count < $quantity) throw new \Exception("Cannot return more items than was held. (".$userItemId.")");
+                    if (!$userItemRow) {
+                        throw new \Exception('Cannot return an invalid item. ('.$userItemId.')');
+                    }
+                    if ($userItemRow->submission_count < $quantity) {
+                        throw new \Exception('Cannot return more items than was held. ('.$userItemId.')');
+                    }
                     $userItemRow->submission_count -= $quantity;
                     $userItemRow->save();
                 }
@@ -360,10 +348,12 @@ public function approveSubmission($data, $user)
                 // Workaround for user not being unset after inventory shuffling, preventing proper staff ID assignment
                 $staff = $user;
 
-                foreach($stacks as $stackId=>$quantity) {
+                foreach ($stacks as $stackId=> $quantity) {
                     $stack = UserItem::find($stackId);
                     $user = User::find($submission->user_id);
-                    if(!$inventoryManager->debitStack($user, $submission->prompt_id ? 'Prompt Approved' : 'Claim Approved', ['data' => 'Item used in submission (<a href="'.$submission->viewUrl.'">#'.$submission->id.'</a>)'], $stack, $quantity)) throw new \Exception("Failed to create log for item stack.");
+                    if (!$inventoryManager->debitStack($user, $submission->prompt_id ? 'Prompt Approved' : 'Claim Approved', ['data' => 'Item used in submission (<a href="'.$submission->viewUrl.'">#'.$submission->id.'</a>)'], $stack, $quantity)) {
+                        throw new \Exception('Failed to create log for item stack.');
+                    }
                 }
 
                 // Set user back to the processing staff member, now that addons have been properly processed.
@@ -372,13 +362,21 @@ public function approveSubmission($data, $user)
 
             // Log currency removal, etc.
             $currencyManager = new CurrencyManager;
-            if(isset($addonData['currencies']) && $addonData['currencies'])
-            {
-                foreach($addonData['currencies'] as $currencyId=>$quantity) {
+            if (isset($addonData['currencies']) && $addonData['currencies']) {
+                foreach ($addonData['currencies'] as $currencyId=> $quantity) {
                     $currency = Currency::find($currencyId);
-                    if(!$currencyManager->createLog($submission->user_id, 'User', null, null,
-                    $submission->prompt_id ? 'Prompt Approved' : 'Claim Approved', 'Used in ' . ($submission->prompt_id ? 'prompt' : 'claim') . ' (<a href="'.$submission->viewUrl.'">#'.$submission->id.'</a>)', $currencyId, $quantity))
-                        throw new \Exception("Failed to create currency log.");
+                    if (!$currencyManager->createLog(
+                        $submission->user_id,
+                        'User',
+                        null,
+                        null,
+                        $submission->prompt_id ? 'Prompt Approved' : 'Claim Approved',
+                        'Used in '.($submission->prompt_id ? 'prompt' : 'claim').' (<a href="'.$submission->viewUrl.'">#'.$submission->id.'</a>)',
+                        $currencyId,
+                        $quantity
+                    )) {
+                        throw new \Exception('Failed to create currency log.');
+                    }
                 }
             }
 
@@ -386,11 +384,14 @@ public function approveSubmission($data, $user)
             // that key the reward ID/quantity arrays.
             // We'll need to match characters to the rewards for them.
             // First, check if the characters are accessible to begin with.
-            if(isset($data['slug'])) {
+            if (isset($data['slug'])) {
                 $characters = Character::myo(0)->visible()->whereIn('slug', $data['slug'])->get();
-                if(count($characters) != count($data['slug'])) throw new \Exception("One or more of the selected characters do not exist.");
+                if (count($characters) != count($data['slug'])) {
+                    throw new \Exception('One or more of the selected characters do not exist.');
+                }
+            } else {
+                $characters = [];
             }
-            else $characters = [];
 
             // Get the updated set of rewards
             $rewards = $this->processRewards($data, false, true);
@@ -398,37 +399,42 @@ public function approveSubmission($data, $user)
             // Logging data
             $promptLogType = $submission->prompt_id ? 'Prompt Rewards' : 'Claim Rewards';
             $promptData = [
-                'data' => 'Received rewards for '.($submission->prompt_id ? 'submission' : 'claim').' (<a href="'.$submission->viewUrl.'">#'.$submission->id.'</a>)'
+                'data' => 'Received rewards for '.($submission->prompt_id ? 'submission' : 'claim').' (<a href="'.$submission->viewUrl.'">#'.$submission->id.'</a>)',
             ];
 
             // Distribute user rewards
-            if(!$rewards = fillUserAssets($rewards, $user, $submission->user, $promptLogType, $promptData)) throw new \Exception("Failed to distribute rewards to user.");
+            if (!$rewards = fillUserAssets($rewards, $user, $submission->user, $promptLogType, $promptData)) {
+                throw new \Exception('Failed to distribute rewards to user.');
+            }
 
             // Retrieve all reward IDs for characters
-            $currencyIds = []; $itemIds = []; $tableIds = [];
-            if(isset($data['character_currency_id'])) {
-                foreach($data['character_currency_id'] as $c)
-                {
-                    foreach($c as $currencyId) $currencyIds[] = $currencyId;
+            $currencyIds = [];
+            $itemIds = [];
+            $tableIds = [];
+            if (isset($data['character_currency_id'])) {
+                foreach ($data['character_currency_id'] as $c) {
+                    foreach ($c as $currencyId) {
+                        $currencyIds[] = $currencyId;
+                    }
                 } // Non-expanded character rewards
-            }
-            elseif(isset($data['character_rewardable_id']))
-            {
-                $data['character_rewardable_id'] = array_map(array($this, 'innerNull'),$data['character_rewardable_id']);
-                foreach($data['character_rewardable_id'] as $ckey => $c)
-                {
-                    foreach($c as $key => $id) {
-
-                        switch($data['character_rewardable_type'][$ckey][$key])
-                        {
-                            case 'Currency': $currencyIds[] = $id; break;
-                            case 'Item': $itemIds[] = $id; break;
-                            case 'LootTable': $tableIds[] = $id; break;
+            } elseif (isset($data['character_rewardable_id'])) {
+                $data['character_rewardable_id'] = array_map([$this, 'innerNull'], $data['character_rewardable_id']);
+                foreach ($data['character_rewardable_id'] as $ckey => $c) {
+                    foreach ($c as $key                            => $id) {
+                        switch ($data['character_rewardable_type'][$ckey][$key]) {
+                            case 'Currency': $currencyIds[] = $id;
+                                break;
+                            case 'Item': $itemIds[] = $id;
+                                break;
+                            case 'LootTable': $tableIds[] = $id;
+                                break;
                         }
                     }
                 } // Expanded character rewards
             }
-            array_unique($currencyIds);            array_unique($itemIds);            array_unique($tableIds);
+            array_unique($currencyIds);
+            array_unique($itemIds);
+            array_unique($tableIds);
             $currencies = Currency::whereIn('id', $currencyIds)->where('is_character_owned', 1)->get()->keyBy('id');
             $items = Item::whereIn('id', $itemIds)->get()->keyBy('id');
             $tables = LootTable::whereIn('id', $tableIds)->get()->keyBy('id');
@@ -437,56 +443,401 @@ public function approveSubmission($data, $user)
             $submission->characters()->delete();
 
             // Distribute character rewards
-            foreach($characters as $c)
-            {
+            foreach ($characters as $c) {
                 // Users might not pass in clean arrays (may contain redundant data) so we need to clean that up
                 $assets = $this->processRewards($data + ['character_id' => $c->id, 'currencies' => $currencies, 'items' => $items, 'tables' => $tables], true);
 
-                if(!$assets = fillCharacterAssets($assets, $user, $c, $promptLogType, $promptData, $submission->user)) throw new \Exception("Failed to distribute rewards to character.");
+                if (!$assets = fillCharacterAssets($assets, $user, $c, $promptLogType, $promptData, $submission->user)) {
+                    throw new \Exception('Failed to distribute rewards to character.');
+                }
 
                 SubmissionCharacter::create([
-                    'character_id' => $c->id,
+                    'character_id'  => $c->id,
                     'submission_id' => $submission->id,
-                    'data' => json_encode(getDataReadyAssets($assets))
+                    'data'          => json_encode(getDataReadyAssets($assets)),
                 ]);
             }
 
             // Increment user submission count if it's a prompt
-            if($submission->prompt_id) {
+            if ($submission->prompt_id) {
                 $user->settings->submission_count++;
                 $user->settings->save();
             }
 
-			if(isset($data['staff_comments']) && $data['staff_comments']) $data['parsed_staff_comments'] = parse($data['staff_comments']);
-			else $data['parsed_staff_comments'] = null;
+            if (isset($data['staff_comments']) && $data['staff_comments']) {
+                $data['parsed_staff_comments'] = parse($data['staff_comments']);
+            } else {
+                $data['parsed_staff_comments'] = null;
+            }
 
             // Finally, set:
-			// 1. staff comments
+            // 1. staff comments
             // 2. staff ID
             // 3. status
             // 4. final rewards
             $submission->update([
-			    'staff_comments' => $data['staff_comments'],
-				'parsed_staff_comments' => $data['parsed_staff_comments'],
-                'staff_id' => $user->id,
-                'status' => 'Approved',
-                'data' => json_encode([
-                    'user' => $addonData,
-                    'rewards' => getDataReadyAssets($rewards)
-                    ]) // list of rewards
+                'staff_comments'        => $data['staff_comments'],
+                'parsed_staff_comments' => $data['parsed_staff_comments'],
+                'staff_id'              => $user->id,
+                'status'                => 'Approved',
+                'data'                  => json_encode([
+                    'user'    => $addonData,
+                    'rewards' => getDataReadyAssets($rewards),
+                ]), // list of rewards
             ]);
 
             Notifications::create($submission->prompt_id ? 'SUBMISSION_APPROVED' : 'CLAIM_APPROVED', $submission->user, [
-                'staff_url' => $user->url,
-                'staff_name' => $user->name,
+                'staff_url'     => $user->url,
+                'staff_name'    => $user->name,
                 'submission_id' => $submission->id,
             ]);
 
+            if (!$this->logAdminAction($user, 'Submission Approved', 'Approved submission <a href="'.$submission->viewurl.'">#'.$submission->id.'</a>')) {
+                throw new \Exception('Failed to log admin action.');
+            }
+
             return $this->commitReturn($submission);
-        } catch(\Exception $e) {
+        } catch (\Exception $e) {
             $this->setError('error', $e->getMessage());
         }
+
         return $this->rollbackReturn(false);
     }
 
+    /**
+     * Deletes a submission.
+     *
+     * @param mixed $data the data of the submission to be deleted
+     * @param mixed $user the user performing the deletion
+     */
+    public function deleteSubmission($data, $user) {
+        DB::beginTransaction();
+        try {
+            // 1. check that the submission exists
+            // 2. check that the submission is a draft
+            if (!isset($data['submission'])) {
+                $submission = Submission::where('status', 'Draft')->where('id', $data['id'])->first();
+            } elseif ($data['submission']->status == 'Pending') {
+                $submission = $data['submission'];
+            } else {
+                $submission = null;
+            }
+            if (!$submission) {
+                throw new \Exception('Invalid submission.');
+            }
+            if ($user->id != $submission->user_id) {
+                throw new \Exception('This is not your submission.');
+            }
+
+            // Remove characters and attachments.
+            SubmissionCharacter::where('submission_id', $submission->id)->delete();
+            $this->removeAttachments($submission);
+            $submission->delete();
+
+            return $this->commitReturn($submission);
+        } catch (\Exception $e) {
+            $this->setError('error', $e->getMessage());
+        }
+
+        return $this->rollbackReturn(false);
+    }
+
+    /**************************************************************************************************************
+     *
+     * PRIVATE FUNCTIONS
+     *
+     **************************************************************************************************************/
+
+    /**
+     * Helper function to remove all empty/zero/falsey values.
+     *
+     * @param array $value
+     *
+     * @return array
+     */
+    private function innerNull($value) {
+        return array_values(array_filter($value));
+    }
+
+    /**
+     * Processes reward data into a format that can be used for distribution.
+     *
+     * @param array $data
+     * @param bool  $isCharacter
+     * @param bool  $isStaff
+     * @param bool  $isClaim
+     *
+     * @return array
+     */
+    private function processRewards($data, $isCharacter, $isStaff = false, $isClaim = false) {
+        if ($isCharacter) {
+            $assets = createAssetsArray(true);
+
+            if (isset($data['character_currency_id'][$data['character_id']]) && isset($data['character_quantity'][$data['character_id']])) {
+                foreach ($data['character_currency_id'][$data['character_id']] as $key => $currency) {
+                    if ($data['character_quantity'][$data['character_id']][$key]) {
+                        addAsset($assets, $data['currencies'][$currency], $data['character_quantity'][$data['character_id']][$key]);
+                    }
+                }
+            } elseif (isset($data['character_rewardable_type'][$data['character_id']]) && isset($data['character_rewardable_id'][$data['character_id']]) && isset($data['character_rewardable_quantity'][$data['character_id']])) {
+                $data['character_rewardable_id'] = array_map([$this, 'innerNull'], $data['character_rewardable_id']);
+
+                foreach ($data['character_rewardable_id'][$data['character_id']] as $key => $reward) {
+                    switch ($data['character_rewardable_type'][$data['character_id']][$key]) {
+                        case 'Currency': if ($data['character_rewardable_quantity'][$data['character_id']][$key]) {
+                            addAsset($assets, $data['currencies'][$reward], $data['character_rewardable_quantity'][$data['character_id']][$key]);
+                        } break;
+                        case 'Item': if ($data['character_rewardable_quantity'][$data['character_id']][$key]) {
+                            addAsset($assets, $data['items'][$reward], $data['character_rewardable_quantity'][$data['character_id']][$key]);
+                        } break;
+                        case 'LootTable': if ($data['character_rewardable_quantity'][$data['character_id']][$key]) {
+                            addAsset($assets, $data['tables'][$reward], $data['character_rewardable_quantity'][$data['character_id']][$key]);
+                        } break;
+                    }
+                }
+            }
+
+            return $assets;
+        } else {
+            $assets = createAssetsArray(false);
+            // Process the additional rewards
+            if (isset($data['rewardable_type']) && $data['rewardable_type']) {
+                foreach ($data['rewardable_type'] as $key => $type) {
+                    $reward = null;
+                    switch ($type) {
+                        case 'Item':
+                            $reward = Item::find($data['rewardable_id'][$key]);
+                            break;
+                        case 'Currency':
+                            $reward = Currency::find($data['rewardable_id'][$key]);
+                            if (!$reward->is_user_owned) {
+                                throw new \Exception('Invalid currency selected.');
+                            }
+                            break;
+                        case 'LootTable':
+                            if (!$isStaff) {
+                                break;
+                            }
+                            $reward = LootTable::find($data['rewardable_id'][$key]);
+                            break;
+                        case 'Raffle':
+                            if (!$isStaff && !$isClaim) {
+                                break;
+                            }
+                            $reward = Raffle::find($data['rewardable_id'][$key]);
+                            break;
+                    }
+                    if (!$reward) {
+                        continue;
+                    }
+                    addAsset($assets, $reward, $data['quantity'][$key]);
+                }
+            }
+
+            return $assets;
+        }
+    }
+
+    /**************************************************************************************************************
+     *
+     * ATTACHMENT FUNCTIONS
+     *
+     **************************************************************************************************************/
+
+    /**
+     * Creates user attachments for a submission.
+     *
+     * @param mixed $submission the submission object
+     * @param mixed $data       the data for creating the attachments
+     * @param mixed $user       the user object
+     */
+    private function createUserAttachments($submission, $data, $user) {
+        $userAssets = createAssetsArray();
+
+        // Attach items. Technically, the user doesn't lose ownership of the item - we're just adding an additional holding field.
+        // We're also not going to add logs as this might add unnecessary fluff to the logs and the items still belong to the user.
+        if (isset($data['stack_id'])) {
+            foreach ($data['stack_id'] as $stackId) {
+                $stack = UserItem::with('item')->find($stackId);
+                if (!$stack || $stack->user_id != $user->id) {
+                    throw new \Exception('Invalid item selected.');
+                }
+                if (!isset($data['stack_quantity'][$stackId])) {
+                    throw new \Exception('Invalid quantity selected.');
+                }
+                $stack->submission_count += $data['stack_quantity'][$stackId];
+                $stack->save();
+
+                addAsset($userAssets, $stack, $data['stack_quantity'][$stackId]);
+            }
+        }
+
+        // Attach currencies.
+        if (isset($data['currency_id'])) {
+            foreach ($data['currency_id'] as $holderKey=>$currencyIds) {
+                $holder = explode('-', $holderKey);
+                $holderType = $holder[0];
+                $holderId = $holder[1];
+
+                $holder = User::find($holderId);
+
+                $currencyManager = new CurrencyManager;
+                foreach ($currencyIds as $key=>$currencyId) {
+                    $currency = Currency::find($currencyId);
+                    if (!$currency) {
+                        throw new \Exception('Invalid currency selected.');
+                    }
+                    if ($data['currency_quantity'][$holderKey][$key] < 0) {
+                        throw new \Exception('Cannot attach a negative amount of currency.');
+                    }
+                    if (!$currencyManager->debitCurrency($holder, null, null, null, $currency, $data['currency_quantity'][$holderKey][$key])) {
+                        throw new \Exception('Invalid currency/quantity selected.');
+                    }
+
+                    addAsset($userAssets, $currency, $data['currency_quantity'][$holderKey][$key]);
+                }
+            }
+        }
+
+        // Get a list of rewards, then create the submission itself
+        $promptRewards = createAssetsArray();
+        if ($submission->status == 'Pending' && isset($submission->prompt_id) && $submission->prompt_id) {
+            foreach ($submission->prompt->rewards as $reward) {
+                addAsset($promptRewards, $reward->reward, $reward->quantity);
+            }
+        }
+        $promptRewards = mergeAssetsArrays($promptRewards, $this->processRewards($data, false));
+
+        return [
+            'userAssets'    => $userAssets,
+            'promptRewards' => $promptRewards,
+        ];
+    }
+
+    /**
+     * Removes the attachments associated with a prompt from a submission.
+     *
+     * @param mixed $submission the submission object
+     */
+    private function removePromptAttachments($submission) {
+        $assets = $submission->data;
+        // Get a list of rewards, then create the submission itself
+        $promptRewards = createAssetsArray();
+        $promptRewards = mergeAssetsArrays($promptRewards, parseAssetData($assets['rewards']));
+        if (isset($submission->prompt_id) && $submission->prompt_id) {
+            foreach ($submission->prompt->rewards as $reward) {
+                removeAsset($promptRewards, $reward->reward, $reward->quantity);
+            }
+        }
+
+        return $promptRewards;
+    }
+
+    /**
+     * Creates character attachments for a submission.
+     *
+     * @param mixed $submission the submission object
+     * @param mixed $data       the data for creating character attachments
+     */
+    private function createCharacterAttachments($submission, $data) {
+        // The character identification comes in both the slug field and as character IDs
+        // that key the reward ID/quantity arrays.
+        // We'll need to match characters to the rewards for them.
+        // First, check if the characters are accessible to begin with.
+        if (isset($data['slug'])) {
+            $characters = Character::myo(0)->visible()->whereIn('slug', $data['slug'])->get();
+            if (count($characters) != count($data['slug'])) {
+                throw new \Exception('One or more of the selected characters do not exist.');
+            }
+        } else {
+            $characters = [];
+        }
+
+        // Retrieve all reward IDs for characters
+        $currencyIds = [];
+        $itemIds = [];
+        $tableIds = [];
+        if (isset($data['character_currency_id'])) {
+            foreach ($data['character_currency_id'] as $c) {
+                foreach ($c as $currencyId) {
+                    $currencyIds[] = $currencyId;
+                }
+            } // Non-expanded character rewards
+        } elseif (isset($data['character_rewardable_id'])) {
+            $data['character_rewardable_id'] = array_map([$this, 'innerNull'], $data['character_rewardable_id']);
+            foreach ($data['character_rewardable_id'] as $ckey => $c) {
+                foreach ($c as $key => $id) {
+                    switch ($data['character_rewardable_type'][$ckey][$key]) {
+                        case 'Currency': $currencyIds[] = $id;
+                            break;
+                        case 'Item': $itemIds[] = $id;
+                            break;
+                        case 'LootTable': $tableIds[] = $id;
+                            break;
+                    }
+                }
+            } // Expanded character rewards
+        }
+        array_unique($currencyIds);
+        array_unique($itemIds);
+        array_unique($tableIds);
+        $currencies = Currency::whereIn('id', $currencyIds)->where('is_character_owned', 1)->get()->keyBy('id');
+        $items = Item::whereIn('id', $itemIds)->get()->keyBy('id');
+        $tables = LootTable::whereIn('id', $tableIds)->get()->keyBy('id');
+
+        // Attach characters
+        foreach ($characters as $c) {
+            // Users might not pass in clean arrays (may contain redundant data) so we need to clean that up
+            $assets = $this->processRewards($data + ['character_id' => $c->id, 'currencies' => $currencies, 'items' => $items, 'tables' => $tables], true);
+
+            // Now we have a clean set of assets (redundant data is gone, duplicate entries are merged)
+            // so we can attach the character to the submission
+            SubmissionCharacter::create([
+                'character_id'  => $c->id,
+                'submission_id' => $submission->id,
+                'data'          => json_encode(getDataReadyAssets($assets)),
+            ]);
+        }
+
+        return true;
+    }
+
+    /**
+     * Removes attachments from a submission.
+     *
+     * @param mixed $submission the submission object
+     */
+    private function removeAttachments($submission) {
+        // This occurs when a draft is edited or rejected.
+
+        // Return all added items
+        $addonData = $submission->data['user'];
+        if (isset($addonData['user_items'])) {
+            foreach ($addonData['user_items'] as $userItemId => $quantity) {
+                $userItemRow = UserItem::find($userItemId);
+                if (!$userItemRow) {
+                    throw new \Exception('Cannot return an invalid item. ('.$userItemId.')');
+                }
+                if ($userItemRow->submission_count < $quantity) {
+                    throw new \Exception('Cannot return more items than was held. ('.$userItemId.')');
+                }
+                $userItemRow->submission_count -= $quantity;
+                $userItemRow->save();
+            }
+        }
+
+        // And currencies
+        $currencyManager = new CurrencyManager;
+        if (isset($addonData['currencies']) && $addonData['currencies']) {
+            foreach ($addonData['currencies'] as $currencyId=>$quantity) {
+                $currency = Currency::find($currencyId);
+                if (!$currency) {
+                    throw new \Exception('Cannot return an invalid currency. ('.$currencyId.')');
+                }
+                if (!$currencyManager->creditCurrency(null, $submission->user, null, null, $currency, $quantity)) {
+                    throw new \Exception('Could not return currency to user. ('.$currencyId.')');
+                }
+            }
+        }
+    }
 }
diff --git a/app/Services/TradeManager.php b/app/Services/TradeManager.php
index 076d7b051e..6726d56210 100644
--- a/app/Services/TradeManager.php
+++ b/app/Services/TradeManager.php
@@ -1,29 +1,18 @@
-<?php namespace App\Services;
+<?php
 
-use App\Services\Service;
+namespace App\Services;
 
-use Carbon\Carbon;
-
-use DB;
-use Config;
-use Image;
-use Notifications;
-use Settings;
-
-use App\Models\User\User;
-use App\Models\User\UserItem;
+use App\Facades\Notifications;
+use App\Facades\Settings;
 use App\Models\Character\Character;
 use App\Models\Character\CharacterTransfer;
-use App\Models\Submission\Submission;
-use App\Models\Submission\SubmissionCharacter;
 use App\Models\Currency\Currency;
-use App\Models\Item\Item;
-use App\Models\Loot\LootTable;
-use App\Models\Prompt\Prompt;
 use App\Models\Trade;
+use App\Models\User\User;
+use App\Models\User\UserItem;
+use Illuminate\Support\Facades\DB;
 
-class TradeManager extends Service
-{
+class TradeManager extends Service {
     /*
     |--------------------------------------------------------------------------
     | Trade Manager
@@ -36,73 +25,81 @@ class TradeManager extends Service
     /**
      * Creates a new trade.
      *
-     * @param  array                  $data
-     * @param  \App\Models\User\User  $user
-     * @return bool|\App\Models\Trade
+     * @param array                 $data
+     * @param \App\Models\User\User $user
+     *
+     * @return \App\Models\Trade|bool
      */
-    public function createTrade($data, $user)
-    {
+    public function createTrade($data, $user) {
         DB::beginTransaction();
 
         try {
-            if(!isset($data['recipient_id'])) throw new \Exception("Please select a recipient.");
-            if($data['recipient_id'] == $user->id) throw new \Exception("Cannot start a trade with yourself.");
+            if (!isset($data['recipient_id'])) {
+                throw new \Exception('Please select a recipient.');
+            }
+            if ($data['recipient_id'] == $user->id) {
+                throw new \Exception('Cannot start a trade with yourself.');
+            }
             $recipient = User::find($data['recipient_id']);
-            if($recipient->is_banned) throw new \Exception("The recipient is a banned user and cannot receive a trade.");
+            if ($recipient->is_banned) {
+                throw new \Exception('The recipient is a banned user and cannot receive a trade.');
+            }
 
             $trade = Trade::create([
-                'sender_id' => $user->id,
-                'recipient_id' => $data['recipient_id'],
-                'status' => 'Open',
-                'comments' => isset($data['comments']) ? $data['comments'] : null,
-                'is_sender_confirmed' => 0,
+                'sender_id'              => $user->id,
+                'recipient_id'           => $data['recipient_id'],
+                'status'                 => 'Open',
+                'comments'               => $data['comments'] ?? null,
+                'is_sender_confirmed'    => 0,
                 'is_recipient_confirmed' => 0,
-                'data' => null
+                'data'                   => null,
             ]);
 
-            if($assetData = $this->handleTradeAssets($trade, $data, $user)) {
-                
+            if ($assetData = $this->handleTradeAssets($trade, $data, $user)) {
                 $trade->data = json_encode(['sender' => getDataReadyAssets($assetData['sender'])]);
                 $trade->save();
 
                 // send a notification
                 Notifications::create('TRADE_RECEIVED', $recipient, [
-                    'sender_url' => $user->url,
+                    'sender_url'  => $user->url,
                     'sender_name' => $user->name,
-                    'trade_id' => $trade->id
+                    'trade_id'    => $trade->id,
                 ]);
 
                 return $this->commitReturn($trade);
             }
-
-        } catch(\Exception $e) { 
+        } catch (\Exception $e) {
             $this->setError('error', $e->getMessage());
         }
+
         return $this->rollbackReturn(false);
     }
 
     /**
      * Edits a user's side of a trade.
      *
-     * @param  array                  $data
-     * @param  \App\Models\User\User  $user
-     * @return bool|\App\Models\Trade
+     * @param array                 $data
+     * @param \App\Models\User\User $user
+     *
+     * @return \App\Models\Trade|bool
      */
-    public function editTrade($data, $user)
-    {
+    public function editTrade($data, $user) {
         DB::beginTransaction();
         try {
-            if(!isset($data['trade'])) 
-                $trade = Trade::where('status', 'Open')->where('id', $data['id'])->where(function($query) use ($user) {
-                $query->where('sender_id', $user->id)->orWhere('recipient_id', $user->id);
+            if (!isset($data['trade'])) {
+                $trade = Trade::where('status', 'Open')->where('id', $data['id'])->where(function ($query) use ($user) {
+                    $query->where('sender_id', $user->id)->orWhere('recipient_id', $user->id);
                 })->first();
-            elseif($data['trade']->status == 'Open')
+            } elseif ($data['trade']->status == 'Open') {
                 $trade = $data['trade'];
-            else
+            } else {
                 $trade = null;
-            if(!$trade) throw new \Exception("Invalid trade.");
+            }
+            if (!$trade) {
+                throw new \Exception('Invalid trade.');
+            }
 
-            if($assetData = $this->handleTradeAssets($trade, $data, $user)) {
+            if ($assetData = $this->handleTradeAssets($trade, $data, $user)) {
                 $tradeData = $trade->data;
                 $isSender = ($trade->sender_id == $user->id);
                 $tradeData[$isSender ? 'sender' : 'recipient'] = getDataReadyAssets($assetData[$isSender ? 'sender' : 'recipient']);
@@ -110,207 +107,113 @@ public function editTrade($data, $user)
                 $trade->{'is_'.($isSender ? 'sender' : 'recipient').'_confirmed'} = 0;
                 $trade->{'is_'.($isSender ? 'recipient' : 'sender').'_trade_confirmed'} = 0;
                 $trade->save();
+
                 return $this->commitReturn($trade);
             }
-            
-        } catch(\Exception $e) { 
+        } catch (\Exception $e) {
             $this->setError('error', $e->getMessage());
         }
-        return $this->rollbackReturn(false);
-    }
-
-    /**
-     * Handles modification of assets on the user's side of a trade.
-     *
-     * @param  \App\Models\Trade      $trade 
-     * @param  array                  $data
-     * @param  \App\Models\User\User  $user
-     * @return bool|array
-     */
-    private function handleTradeAssets($trade, $data, $user)
-    {
-        DB::beginTransaction();
-        try {
-            $tradeData = $trade->data;
-            $isSender = $trade->sender_id == $user->id;
-            $type = ($isSender ? 'sender' : (($trade->recipient_id == $user->id) ? 'recipient' : null));
-            if(!$type) throw new \Exception("User not found.");
-            // First return any item stacks attached to the trade
-            
-            if(isset($tradeData[$type]['user_items'])) {
-                foreach($tradeData[$type]['user_items'] as $userItemId=>$quantity) {
-                    $userItemRow = UserItem::find($userItemId);
-                    if(!$userItemRow) throw new \Exception("Cannot return an invalid item. (".$userItemId.")");
-                    if($userItemRow->trade_count < $quantity) throw new \Exception("Cannot return more items than was held. (".$userItemId.")");
-                    $userItemRow->trade_count -= $quantity;
-                    $userItemRow->save();
-                }
-            }
-
-            // Also return any currency attached to the trade
-            // This is stored in the data attribute
-            $currencyManager = new CurrencyManager;
-            if(isset($tradeData[$type]['currencies'])) {
-                foreach($tradeData[$type]['currencies'] as $currencyId=>$quantity) {
-                    $currencyManager->creditCurrency(null, $user, null, null, $currencyId, $quantity);
-                }
-            }
-
-            // Unattach characters too
-            Character::where('trade_id', $trade->id)->where('user_id', $user->id)->update(['trade_id' => null]);
-
-            $userAssets = createAssetsArray();
-            $assetCount = 0;
-            $assetLimit = Config::get('lorekeeper.settings.trade_asset_limit');
-            
-            // Attach items. Technically, the user doesn't lose ownership of the item - we're just adding an additional holding field.
-            // Unlike for design updates, we're keeping track of attached items here.
-            if(isset($data['stack_id'])) {
-                foreach($data['stack_id'] as $stackId) {
-                    $stack = UserItem::with('item')->find($stackId);
-                    if(!$stack || $stack->user_id != $user->id) throw new \Exception("Invalid item selected.");
-                    if(!isset($data['stack_quantity'][$stackId])) throw new \Exception("Invalid quantity selected.");
-                    if(!$stack->item->allow_transfer || isset($stack->data['disallow_transfer'])) throw new \Exception("One or more of the selected items cannot be transferred.");
-                    $stack->trade_count += $data['stack_quantity'][$stackId];
-                    $stack->save();
-
-                    addAsset($userAssets, $stack, $data['stack_quantity'][$stackId]);
-                    $assetCount++;
-                }
-            }
-            if($assetCount > $assetLimit) throw new \Exception("You may only include a maximum of {$assetLimit} things in a trade.");
-
-            // Attach currencies. Character currencies cannot be attached to trades, so we're just checking the user's bank.
-            if(isset($data['currency_id'])) {
-                if ($user->id != $trade->sender_id && $user->id != $trade->recipient_id) throw new \Exception("Error attaching currencies to this trade.");
-                //dd([$data['currency_id'], $data['currency_quantity']]);
-                $data['currency_id'] = $data['currency_id']['user-'.$user->id];
-                $data['currency_quantity'] = $data['currency_quantity']['user-'.$user->id];
-                foreach($data['currency_id'] as $key=>$currencyId) {
-                    $currency = Currency::where('allow_user_to_user', 1)->where('id', $currencyId)->first();
-                    if(!$currency) throw new \Exception("Invalid currency selected.");
-                    if(!$currencyManager->debitCurrency($user, null, null, null, $currency, $data['currency_quantity'][$key])) throw new \Exception("Invalid currency/quantity selected.");
-
-                    addAsset($userAssets, $currency, $data['currency_quantity'][$key]);
-                    $assetCount++;
-                }
-            }
-            if($assetCount > $assetLimit) throw new \Exception("You may only include a maximum of {$assetLimit} things in a trade.");
 
-            // Attach characters.
-            if(isset($data['character_id'])) {
-                foreach($data['character_id'] as $characterId) {
-                    $character = Character::where('id', $characterId)->where('user_id', $user->id)->first();
-                    if(!$character) throw new \Exception("Invalid character selected.");
-                    if(!$character->is_sellable && !$character->is_tradeable && !$character->is_giftable) throw new \Exception("One or more of the selected characters cannot be transferred.");
-                    if(CharacterTransfer::active()->where('character_id', $character->id)->exists()) throw new \Exception("One or more of the selected characters is already pending a character transfer.");
-                    if($character->trade_id) throw new \Exception("One or more of the selected characters is already in a trade.");
-                    if($character->designUpdate()->active()->exists()) throw new \Exception("One or more of the selected characters has an active design update. Please wait for it to be processed, or delete it.");
-                    if($character->transferrable_at && $character->transferrable_at->isFuture()) throw new \Exception("One or more of the selected characters is still on transfer cooldown and cannot be transferred.");
-
-                    $character->trade_id = $trade->id;
-                    $character->save();
-
-                    addAsset($userAssets, $character, 1);
-                    $assetCount++;
-                }
-
-            }
-            if($assetCount > $assetLimit) throw new \Exception("You may only include a maximum of {$assetLimit} things in a trade.");
-            
-            return $this->commitReturn([($isSender ? 'sender' : 'recipient') => $userAssets]);
-        } catch(\Exception $e) { 
-            $this->setError('error', $e->getMessage());
-        }
         return $this->rollbackReturn(false);
     }
 
     /**
      * Cancels a trade.
      *
-     * @param  array                  $data
-     * @param  \App\Models\User\User  $user
-     * @return bool|\App\Models\Trade
+     * @param array                 $data
+     * @param \App\Models\User\User $user
+     *
+     * @return \App\Models\Trade|bool
      */
-    public function cancelTrade($data, $user)
-    {
+    public function cancelTrade($data, $user) {
         DB::beginTransaction();
 
         try {
-            if(!isset($data['trade'])) $trade = Trade::where('status', 'Open')->where('id', $data['id'])->where(function($query) use ($user) {
-                $query->where('sender_id', $user->id)->orWhere('recipient_id', $user->id);
-            })->first();
-            elseif($data['trade']->status == 'Open') $trade = $data['trade'];
-            else $trade = null;
-            if(!$trade) throw new \Exception("Invalid trade.");
-
-            if($this->returnAttachments($trade)) {
+            if (!isset($data['trade'])) {
+                $trade = Trade::where('status', 'Open')->where('id', $data['id'])->where(function ($query) use ($user) {
+                    $query->where('sender_id', $user->id)->orWhere('recipient_id', $user->id);
+                })->first();
+            } elseif ($data['trade']->status == 'Open') {
+                $trade = $data['trade'];
+            } else {
+                $trade = null;
+            }
+            if (!$trade) {
+                throw new \Exception('Invalid trade.');
+            }
+
+            if ($this->returnAttachments($trade)) {
                 Notifications::create('TRADE_CANCELED', $trade->sender_id == $user->id ? $trade->recipient : $trade->sender, [
-                    'sender_url' => $user->url,
+                    'sender_url'  => $user->url,
                     'sender_name' => $user->name,
-                    'trade_id' => $trade->id
+                    'trade_id'    => $trade->id,
                 ]);
                 $trade->status = 'Canceled';
                 $trade->save();
 
                 return $this->commitReturn($trade);
+            } else {
+                throw new \Exception('Failed to cancel trade.');
             }
-            else throw new \Exception("Failed to cancel trade.");
-        } catch(\Exception $e) { 
+        } catch (\Exception $e) {
             $this->setError('error', $e->getMessage());
         }
+
         return $this->rollbackReturn(false);
     }
 
     /**
      * Confirms the user's offer.
      *
-     * @param  array                  $data
-     * @param  \App\Models\User\User  $user
-     * @return bool|\App\Models\Trade
+     * @param array                 $data
+     * @param \App\Models\User\User $user
+     *
+     * @return \App\Models\Trade|bool
      */
-    public function confirmOffer($data, $user)
-    {
+    public function confirmOffer($data, $user) {
         DB::beginTransaction();
 
         try {
-            if(!isset($data['trade'])) $trade = Trade::where('status', 'Open')->where('id', $data['id'])->where(function($query) use ($user) {
-                $query->where('sender_id', $user->id)->orWhere('recipient_id', $user->id);
-            })->first();
-            elseif($data['trade']->status == 'Open') $trade = $data['trade'];
-            else $trade = null;
-            if(!$trade) throw new \Exception("Invalid trade.");
+            if (!isset($data['trade'])) {
+                $trade = Trade::where('status', 'Open')->where('id', $data['id'])->where(function ($query) use ($user) {
+                    $query->where('sender_id', $user->id)->orWhere('recipient_id', $user->id);
+                })->first();
+            } elseif ($data['trade']->status == 'Open') {
+                $trade = $data['trade'];
+            } else {
+                $trade = null;
+            }
+            if (!$trade) {
+                throw new \Exception('Invalid trade.');
+            }
 
             // Mark the offer as confirmed
-            if($trade->sender_id == $user->id) {
+            if ($trade->sender_id == $user->id) {
                 $trade->is_sender_confirmed = !$trade->is_sender_confirmed;
 
                 // Reset trade confirmations if this is unconfirming an offer
-                if(!$trade->is_sender_confirmed) {
+                if (!$trade->is_sender_confirmed) {
                     $trade->is_sender_trade_confirmed = 0;
                     $trade->is_recipient_trade_confirmed = 0;
-                }
-                else {
+                } else {
                     Notifications::create('TRADE_UPDATE', $trade->recipient, [
-                        'sender_url' => $user->url,
+                        'sender_url'  => $user->url,
                         'sender_name' => $user->name,
-                        'trade_id' => $trade->id
+                        'trade_id'    => $trade->id,
                     ]);
                 }
-            }
-            else {
+            } else {
                 $trade->is_recipient_confirmed = !$trade->is_recipient_confirmed;
 
                 // Reset trade confirmations if this is unconfirming an offer
-                if(!$trade->is_recipient_confirmed) {
+                if (!$trade->is_recipient_confirmed) {
                     $trade->is_sender_trade_confirmed = 0;
                     $trade->is_recipient_trade_confirmed = 0;
-                }
-                else {
+                } else {
                     Notifications::create('TRADE_UPDATE', $trade->sender, [
-                        'sender_url' => $user->url,
+                        'sender_url'  => $user->url,
                         'sender_name' => $user->name,
-                        'trade_id' => $trade->id
+                        'trade_id'    => $trade->id,
                     ]);
                 }
             }
@@ -318,212 +221,398 @@ public function confirmOffer($data, $user)
             $trade->save();
 
             return $this->commitReturn($trade);
-        } catch(\Exception $e) { 
+        } catch (\Exception $e) {
             $this->setError('error', $e->getMessage());
         }
+
         return $this->rollbackReturn(false);
     }
 
     /**
      * Confirms the trade for a user.
      *
-     * @param  array                  $data
-     * @param  \App\Models\User\User  $user
-     * @return bool|\App\Models\Trade
+     * @param array                 $data
+     * @param \App\Models\User\User $user
+     *
+     * @return \App\Models\Trade|bool
      */
-    public function confirmTrade($data, $user)
-    {
+    public function confirmTrade($data, $user) {
         DB::beginTransaction();
 
         try {
-            if(!isset($data['trade'])) $trade = Trade::where('status', 'Open')->where('id', $data['id'])->where(function($query) use ($user) {
-                $query->where('sender_id', $user->id)->orWhere('recipient_id', $user->id);
-            })->first();
-            elseif($data['trade']->status == 'Open') $trade = $data['trade'];
-            else $trade = null;
-            if(!$trade) throw new \Exception("Invalid trade.");
-            if(!$trade->isConfirmable) throw new \Exception('Both parties are required to confirm their offers before the trade can be confirmed.');
-
-            if($user->id == $trade->sender_id) $trade->is_sender_trade_confirmed = 1;
-            else $trade->is_recipient_trade_confirmed = 1;
-
-            if($trade->is_sender_trade_confirmed && $trade->is_recipient_trade_confirmed) {
-                if(!(Settings::get('open_transfers_queue') && (isset($trade->data['sender']['characters']) || isset($trade->data['recipient']['characters'])))) {
+            if (!isset($data['trade'])) {
+                $trade = Trade::where('status', 'Open')->where('id', $data['id'])->where(function ($query) use ($user) {
+                    $query->where('sender_id', $user->id)->orWhere('recipient_id', $user->id);
+                })->first();
+            } elseif ($data['trade']->status == 'Open') {
+                $trade = $data['trade'];
+            } else {
+                $trade = null;
+            }
+            if (!$trade) {
+                throw new \Exception('Invalid trade.');
+            }
+            if (!$trade->isConfirmable) {
+                throw new \Exception('Both parties are required to confirm their offers before the trade can be confirmed.');
+            }
+
+            if ($user->id == $trade->sender_id) {
+                $trade->is_sender_trade_confirmed = 1;
+            } else {
+                $trade->is_recipient_trade_confirmed = 1;
+            }
+
+            if ($trade->is_sender_trade_confirmed && $trade->is_recipient_trade_confirmed) {
+                if (!(Settings::get('open_transfers_queue') && (isset($trade->data['sender']['characters']) || isset($trade->data['recipient']['characters'])))) {
                     // Distribute the trade attachments
                     $this->creditAttachments($trade);
-    
+
                     $trade->status = 'Completed';
 
                     // Notify both users
                     Notifications::create('TRADE_COMPLETED', $trade->sender, [
-                        'trade_id' => $trade->id
+                        'trade_id' => $trade->id,
                     ]);
                     Notifications::create('TRADE_COMPLETED', $trade->recipient, [
-                        'trade_id' => $trade->id
+                        'trade_id' => $trade->id,
                     ]);
-                }
-                else {
+                } else {
                     // Put the trade into the queue
                     $trade->status = 'Pending';
-                    
+
                     // Notify both users
                     Notifications::create('TRADE_CONFIRMED', $trade->sender, [
-                        'trade_id' => $trade->id
+                        'trade_id' => $trade->id,
                     ]);
                     Notifications::create('TRADE_CONFIRMED', $trade->recipient, [
-                        'trade_id' => $trade->id
+                        'trade_id' => $trade->id,
                     ]);
                 }
-            }
-            else {
-                    
+            } else {
                 // Notify the other user
                 Notifications::create('TRADE_UPDATE', $user->id == $trade->sender_id ? $trade->recipient : $trade->sender, [
-                    'sender_url' => $user->url,
+                    'sender_url'  => $user->url,
                     'sender_name' => $user->name,
-                    'trade_id' => $trade->id
+                    'trade_id'    => $trade->id,
                 ]);
-
             }
             $trade->save();
 
             return $this->commitReturn($trade);
-        } catch(\Exception $e) { 
+        } catch (\Exception $e) {
             $this->setError('error', $e->getMessage());
         }
+
         return $this->rollbackReturn(false);
     }
 
     /**
      * Approves a trade in the admin panel.
      *
-     * @param  array                  $data
-     * @param  \App\Models\User\User  $user
-     * @return bool|\App\Models\Trade
+     * @param array                 $data
+     * @param \App\Models\User\User $user
+     *
+     * @return \App\Models\Trade|bool
      */
-    public function approveTrade($data, $user)
-    {
+    public function approveTrade($data, $user) {
         DB::beginTransaction();
 
         try {
             // 1. check that the trade exists
             // 2. check that the trade is open
-            if(!isset($data['trade'])) $trade = Trade::where('status', 'Pending')->where('id', $data['id'])->first();
-            else $trade = $data['trade'];
-            if(!$trade) throw new \Exception("Invalid trade.");
-            
-            if($this->creditAttachments($trade, $data)) {
+            if (!isset($data['trade'])) {
+                $trade = Trade::where('status', 'Pending')->where('id', $data['id'])->first();
+            } else {
+                $trade = $data['trade'];
+            }
+            if (!$trade) {
+                throw new \Exception('Invalid trade.');
+            }
+
+            if ($this->creditAttachments($trade, $data)) {
                 Notifications::create('TRADE_COMPLETED', $trade->sender, [
-                    'trade_id' => $trade->id
+                    'trade_id' => $trade->id,
                 ]);
                 Notifications::create('TRADE_COMPLETED', $trade->recipient, [
-                    'trade_id' => $trade->id
+                    'trade_id' => $trade->id,
                 ]);
 
+                if (!$this->logAdminAction($user, 'Approved Trade', 'Approved trade <a href="'.$trade->url.'">#'.$trade->id.'</a>')) {
+                    throw new \Exception('Failed to log admin action.');
+                }
+
                 $trade->status = 'Completed';
                 $trade->staff_id = $user->id;
                 $trade->save();
 
                 return $this->commitReturn($trade);
+            } else {
+                throw new \Exception('Failed to credit trade attachments.');
             }
-            else throw new \Exception("Failed to credit trade attachments.");
-        } catch(\Exception $e) { 
+        } catch (\Exception $e) {
             $this->setError('error', $e->getMessage());
         }
+
         return $this->rollbackReturn(false);
     }
 
     /**
      * Rejects a trade in the admin panel.
      *
-     * @param  array                  $data
-     * @param  \App\Models\User\User  $user
-     * @return bool|\App\Models\Trade
+     * @param array                 $data
+     * @param \App\Models\User\User $user
+     *
+     * @return \App\Models\Trade|bool
      */
-    public function rejectTrade($data, $user)
-    {
+    public function rejectTrade($data, $user) {
         DB::beginTransaction();
 
         try {
+            if (!isset($data['trade'])) {
+                $trade = Trade::where('status', 'Pending')->where('id', $data['id'])->first();
+            } else {
+                $trade = $data['trade'];
+            }
+            if (!$trade) {
+                throw new \Exception('Invalid trade.');
+            }
 
-            if(!isset($data['trade'])) $trade = Trade::where('status', 'Pending')->where('id', $data['id'])->first();
-            else $trade = $data['trade'];
-            if(!$trade) throw new \Exception("Invalid trade.");
-            
-            if($this->returnAttachments($trade)) {
+            if ($this->returnAttachments($trade)) {
                 Notifications::create('TRADE_REJECTED', $trade->sender, [
-                    'trade_id' => $trade->id
+                    'trade_id' => $trade->id,
                 ]);
                 Notifications::create('TRADE_REJECTED', $trade->recipient, [
-                    'trade_id' => $trade->id
+                    'trade_id' => $trade->id,
                 ]);
 
-                $trade->reason = isset($data['reason']) ? $data['reason'] : '';
+                if (!$this->logAdminAction($user, 'Rejected Trade', 'Rejected trade <a href="'.$trade->url.'">#'.$trade->id.'</a>')) {
+                    throw new \Exception('Failed to log admin action.');
+                }
+
+                $trade->reason = $data['reason'] ?? '';
                 $trade->status = 'Rejected';
                 $trade->staff_id = $user->id;
                 $trade->save();
 
                 return $this->commitReturn($trade);
+            } else {
+                throw new \Exception('Failed to return trade attachments.');
+            }
+        } catch (\Exception $e) {
+            $this->setError('error', $e->getMessage());
+        }
+
+        return $this->rollbackReturn(false);
+    }
+
+    /**
+     * Handles modification of assets on the user's side of a trade.
+     *
+     * @param \App\Models\Trade     $trade
+     * @param array                 $data
+     * @param \App\Models\User\User $user
+     *
+     * @return array|bool
+     */
+    private function handleTradeAssets($trade, $data, $user) {
+        DB::beginTransaction();
+        try {
+            $tradeData = $trade->data;
+            $isSender = $trade->sender_id == $user->id;
+            $type = ($isSender ? 'sender' : (($trade->recipient_id == $user->id) ? 'recipient' : null));
+            if (!$type) {
+                throw new \Exception('User not found.');
+            }
+            // First return any item stacks attached to the trade
+
+            if (isset($tradeData[$type]['user_items'])) {
+                foreach ($tradeData[$type]['user_items'] as $userItemId=> $quantity) {
+                    $quantity = (int) $quantity;
+                    $userItemRow = UserItem::find($userItemId);
+                    if (!$userItemRow) {
+                        throw new \Exception('Cannot return an invalid item. ('.$userItemId.')');
+                    }
+                    if ($userItemRow->trade_count < $quantity) {
+                        throw new \Exception('Cannot return more items than was held. ('.$userItemId.')');
+                    }
+                    $userItemRow->trade_count -= $quantity;
+                    $userItemRow->save();
+                }
+            }
+
+            // Also return any currency attached to the trade
+            // This is stored in the data attribute
+            $currencyManager = new CurrencyManager;
+            if (isset($tradeData[$type]['currencies'])) {
+                foreach ($tradeData[$type]['currencies'] as $currencyId=> $quantity) {
+                    $quantity = (int) $quantity;
+                    $currencyManager->creditCurrency(null, $user, null, null, $currencyId, $quantity);
+                }
+            }
+
+            // Unattach characters too
+            Character::where('trade_id', $trade->id)->where('user_id', $user->id)->update(['trade_id' => null]);
+
+            $userAssets = createAssetsArray();
+            $assetCount = 0;
+            $assetLimit = config('lorekeeper.settings.trade_asset_limit');
+
+            // Attach items. Technically, the user doesn't lose ownership of the item - we're just adding an additional holding field.
+            // Unlike for design updates, we're keeping track of attached items here.
+            if (isset($data['stack_id'])) {
+                foreach ($data['stack_id'] as $stackId) {
+                    $stack = UserItem::with('item')->find($stackId);
+                    if (!$stack || $stack->user_id != $user->id) {
+                        throw new \Exception('Invalid item selected.');
+                    }
+                    if (!isset($data['stack_quantity'][$stackId])) {
+                        throw new \Exception('Invalid quantity selected.');
+                    }
+                    if (!$stack->item->allow_transfer || isset($stack->data['disallow_transfer'])) {
+                        throw new \Exception('One or more of the selected items cannot be transferred.');
+                    }
+                    $stack->trade_count += intval($data['stack_quantity'][$stackId]);
+                    $stack->save();
+
+                    addAsset($userAssets, $stack, intval($data['stack_quantity'][$stackId]));
+                    $assetCount++;
+                }
+            }
+            if ($assetCount > $assetLimit) {
+                throw new \Exception("You may only include a maximum of {$assetLimit} things in a trade.");
             }
-            else throw new \Exception("Failed to return trade attachments.");
-        } catch(\Exception $e) { 
+
+            // Attach currencies. Character currencies cannot be attached to trades, so we're just checking the user's bank.
+            if (isset($data['currency_id'])) {
+                if ($user->id != $trade->sender_id && $user->id != $trade->recipient_id) {
+                    throw new \Exception('Error attaching currencies to this trade.');
+                }
+                //dd([$data['currency_id'], $data['currency_quantity']]);
+                $data['currency_id'] = $data['currency_id']['user-'.$user->id];
+                $data['currency_quantity'] = $data['currency_quantity']['user-'.$user->id];
+                foreach ($data['currency_id'] as $key=> $currencyId) {
+                    $currency = Currency::where('allow_user_to_user', 1)->where('id', $currencyId)->first();
+                    if (!$currency) {
+                        throw new \Exception('Invalid currency selected.');
+                    }
+                    if (!$currencyManager->debitCurrency($user, null, null, null, $currency, intval($data['currency_quantity'][$key]))) {
+                        throw new \Exception('Invalid currency/quantity selected.');
+                    }
+
+                    addAsset($userAssets, $currency, intval($data['currency_quantity'][$key]));
+                    $assetCount++;
+                }
+            }
+            if ($assetCount > $assetLimit) {
+                throw new \Exception("You may only include a maximum of {$assetLimit} things in a trade.");
+            }
+
+            // Attach characters.
+            if (isset($data['character_id'])) {
+                foreach ($data['character_id'] as $characterId) {
+                    $character = Character::where('id', $characterId)->where('user_id', $user->id)->first();
+                    if (!$character) {
+                        throw new \Exception('Invalid character selected.');
+                    }
+                    if (!$character->is_sellable && !$character->is_tradeable && !$character->is_giftable) {
+                        throw new \Exception('One or more of the selected characters cannot be transferred.');
+                    }
+                    if (CharacterTransfer::active()->where('character_id', $character->id)->exists()) {
+                        throw new \Exception('One or more of the selected characters is already pending a character transfer.');
+                    }
+                    if ($character->trade_id) {
+                        throw new \Exception('One or more of the selected characters is already in a trade.');
+                    }
+                    if ($character->designUpdate()->active()->exists()) {
+                        throw new \Exception('One or more of the selected characters has an active design update. Please wait for it to be processed, or delete it.');
+                    }
+                    if ($character->transferrable_at && $character->transferrable_at->isFuture()) {
+                        throw new \Exception('One or more of the selected characters is still on transfer cooldown and cannot be transferred.');
+                    }
+
+                    $character->trade_id = $trade->id;
+                    $character->save();
+
+                    addAsset($userAssets, $character, 1);
+                    $assetCount++;
+                }
+            }
+            if ($assetCount > $assetLimit) {
+                throw new \Exception("You may only include a maximum of {$assetLimit} things in a trade.");
+            }
+
+            return $this->commitReturn([($isSender ? 'sender' : 'recipient') => $userAssets]);
+        } catch (\Exception $e) {
             $this->setError('error', $e->getMessage());
         }
+
         return $this->rollbackReturn(false);
     }
 
     /**
      * Returns trade attachments to their owners.
      *
-     * @param  \App\Models\Trade  $trade
+     * @param \App\Models\Trade $trade
+     *
      * @return bool
      */
-    private function returnAttachments($trade)
-    {
+    private function returnAttachments($trade) {
         DB::beginTransaction();
 
         try {
             $tradeData = $trade->data;
             // Return all added items/currency/characters
-            foreach(['sender', 'recipient'] as $type) {
-                if(isset($tradeData[$type]['user_items'])) {
-                    foreach($tradeData[$type]['user_items'] as $userItemId => $quantity) {
+            foreach (['sender', 'recipient'] as $type) {
+                if (isset($tradeData[$type]['user_items'])) {
+                    foreach ($tradeData[$type]['user_items'] as $userItemId => $quantity) {
+                        $quantity = (int) $quantity;
                         $userItemRow = UserItem::find($userItemId);
-                        if(!$userItemRow) throw new \Exception("Cannot return an invalid item. (".$userItemId.")");
-                        if($userItemRow->trade_count < $quantity) throw new \Exception("Cannot return more items than was held. (".$userItemId.")");
+                        if (!$userItemRow) {
+                            throw new \Exception('Cannot return an invalid item. ('.$userItemId.')');
+                        }
+                        if ($userItemRow->trade_count < $quantity) {
+                            throw new \Exception('Cannot return more items than was held. ('.$userItemId.')');
+                        }
                         $userItemRow->trade_count -= $quantity;
                         $userItemRow->save();
                     }
                 }
             }
-            
+
             Character::where('trade_id', $trade->id)->update(['trade_id' => null]);
             $currencyManager = new CurrencyManager;
-            foreach(['sender', 'recipient'] as $type) {
-                if(isset($tradeData[$type]['currencies'])) {
-                    foreach($tradeData[$type]['currencies'] as $currencyId => $quantity) {
+            foreach (['sender', 'recipient'] as $type) {
+                if (isset($tradeData[$type]['currencies'])) {
+                    foreach ($tradeData[$type]['currencies'] as $currencyId => $quantity) {
+                        $quantity = (int) $quantity;
                         $currency = Currency::find($currencyId);
-                        if(!$currency) throw new \Exception("Cannot return an invalid currency. (".$currencyId.")");
-                        if(!$currencyManager->creditCurrency(null, $trade->{$type}, null, null, $currency, $quantity)) throw new \Exception("Could not return currency to user. (".$currencyId.")");                    
+                        if (!$currency) {
+                            throw new \Exception('Cannot return an invalid currency. ('.$currencyId.')');
+                        }
+                        if (!$currencyManager->creditCurrency(null, $trade->{$type}, null, null, $currency, $quantity)) {
+                            throw new \Exception('Could not return currency to user. ('.$currencyId.')');
+                        }
                     }
                 }
             }
+
             return $this->commitReturn(true);
-        } catch(\Exception $e) { 
+        } catch (\Exception $e) {
             $this->setError('error', $e->getMessage());
         }
+
         return $this->rollbackReturn(false);
     }
 
     /**
      * Credits trade attachments to their new owners.
      *
-     * @param  \App\Models\Trade  $trade
-     * @param  array              $data
+     * @param \App\Models\Trade $trade
+     * @param array             $data
+     *
      * @return bool
      */
-    private function creditAttachments($trade, $data = [])
-    {
+    private function creditAttachments($trade, $data = []) {
         DB::beginTransaction();
 
         try {
@@ -532,33 +621,41 @@ private function creditAttachments($trade, $data = [])
             // Get all items
             $senderStacks = null;
             $recipientStacks = null;
-            if(isset($trade->data['sender']['user_items']))
-            {
+            if (isset($trade->data['sender']['user_items'])) {
                 $senderStacks = UserItem::find(array_keys($trade->data['sender']['user_items']));
             }
-            if(isset($trade->data['recipient']['user_items']))
-            {
+            if (isset($trade->data['recipient']['user_items'])) {
                 $recipientStacks = UserItem::find(array_keys($trade->data['recipient']['user_items']));
             }
 
-            if($senderStacks) {
-                foreach($senderStacks as $stack) {
+            if ($senderStacks) {
+                foreach ($senderStacks as $stack) {
                     $quantity = $trade->data['sender']['user_items'][$stack->id];
+                    $quantity = (int) $quantity;
                     $inventoryManager->moveStack($trade->sender, $trade->recipient, 'Trade', ['data' => 'Received in trade [<a href="'.$trade->url.'">#'.$trade->id.'</a>]'], $stack, $quantity);
                     $userItemRow = UserItem::find($stack->id);
-                    if(!$userItemRow) throw new \Exception("Cannot return an invalid item. (".$userItemId.")");
-                    if($userItemRow->trade_count < $quantity) throw new \Exception("Cannot return more items than was held. (".$userItemId.")");
+                    if (!$userItemRow) {
+                        throw new \Exception('Cannot return an invalid item. ('.$userItemRow->id.')');
+                    }
+                    if ($userItemRow->trade_count < $quantity) {
+                        throw new \Exception('Cannot return more items than was held. ('.$userItemRow->id.')');
+                    }
                     $userItemRow->trade_count -= $quantity;
                     $userItemRow->save();
                 }
             }
-            if($recipientStacks) {
-                foreach($recipientStacks as $stack) {
+            if ($recipientStacks) {
+                foreach ($recipientStacks as $stack) {
                     $quantity = $trade->data['recipient']['user_items'][$stack->id];
+                    $quantity = (int) $quantity;
                     $inventoryManager->moveStack($trade->recipient, $trade->sender, 'Trade', ['data' => 'Received in trade [<a href="'.$trade->url.'">#'.$trade->id.'</a>]'], $stack, $quantity);
                     $userItemRow = UserItem::find($stack->id);
-                    if(!$userItemRow) throw new \Exception("Cannot return an invalid item. (".$userItemId.")");
-                    if($userItemRow->trade_count < $quantity) throw new \Exception("Cannot return more items than was held. (".$userItemId.")");
+                    if (!$userItemRow) {
+                        throw new \Exception('Cannot return an invalid item. ('.$userItemRow->id.')');
+                    }
+                    if ($userItemRow->trade_count < $quantity) {
+                        throw new \Exception('Cannot return more items than was held. ('.$userItemRow->id.')');
+                    }
                     $userItemRow->trade_count -= $quantity;
                     $userItemRow->save();
                 }
@@ -566,36 +663,46 @@ private function creditAttachments($trade, $data = [])
             $characterManager = new CharacterManager;
 
             // Transfer characters
-            $cooldowns = isset($data['cooldowns']) ? $data['cooldowns'] : [];
+            $cooldowns = $data['cooldowns'] ?? [];
             $defaultCooldown = Settings::get('transfer_cooldown');
 
             $senderCharacters = Character::where('user_id', $trade->sender_id)->where('trade_id', $trade->id)->get();
             $recipientCharacters = Character::where('user_id', $trade->recipient_id)->where('trade_id', $trade->id)->get();
 
-            foreach($senderCharacters as $character) $characterManager->moveCharacter($character, $trade->recipient, 'Trade [<a href="'.$trade->url.'">#'.$trade->id.'</a>]', isset($cooldowns[$character->id]) ? $cooldowns[$character->id] : $defaultCooldown, 'Transferred in trade');
-            
-            foreach($recipientCharacters as $character) $characterManager->moveCharacter($character, $trade->sender, 'Trade [<a href="'.$trade->url.'">#'.$trade->id.'</a>]', isset($cooldowns[$character->id]) ? $cooldowns[$character->id] : $defaultCooldown, 'Transferred in trade');
+            foreach ($senderCharacters as $character) {
+                $characterManager->moveCharacter($character, $trade->recipient, 'Trade [<a href="'.$trade->url.'">#'.$trade->id.'</a>]', $cooldowns[$character->id] ?? $defaultCooldown, 'Transferred in trade');
+            }
+
+            foreach ($recipientCharacters as $character) {
+                $characterManager->moveCharacter($character, $trade->sender, 'Trade [<a href="'.$trade->url.'">#'.$trade->id.'</a>]', $cooldowns[$character->id] ?? $defaultCooldown, 'Transferred in trade');
+            }
 
             Character::where('trade_id', $trade->id)->update(['trade_id' => null]);
 
             // Transfer currency
             $tradeData = $trade->data;
             $currencyManager = new CurrencyManager;
-            foreach(['sender', 'recipient'] as $type) {
+            foreach (['sender', 'recipient'] as $type) {
                 $recipientType = ($type == 'sender') ? 'recipient' : 'sender';
-                if(isset($tradeData[$type]['currencies'])) {
-                    foreach($tradeData[$type]['currencies'] as $currencyId => $quantity) {
+                if (isset($tradeData[$type]['currencies'])) {
+                    foreach ($tradeData[$type]['currencies'] as $currencyId => $quantity) {
+                        $quantity = (int) $quantity;
                         $currency = Currency::find($currencyId);
-                        if(!$currency) throw new \Exception("Cannot credit an invalid currency. (".$currencyId.")");
-                        if(!$currencyManager->creditCurrency($trade->{$type}, $trade->{$recipientType}, 'Trade', 'Received in trade [<a href="'.$trade->url.'">#'.$trade->id.']', $currency, $quantity)) throw new \Exception("Could not credit currency. (".$currencyId.")");                    
+                        if (!$currency) {
+                            throw new \Exception('Cannot credit an invalid currency. ('.$currencyId.')');
+                        }
+                        if (!$currencyManager->creditCurrency($trade->{$type}, $trade->{$recipientType}, 'Trade', 'Received in trade [<a href="'.$trade->url.'">#'.$trade->id.'</a>]', $currency, $quantity)) {
+                            throw new \Exception('Could not credit currency. ('.$currencyId.')');
+                        }
                     }
                 }
             }
-            
+
             return $this->commitReturn(true);
-        } catch(\Exception $e) { 
+        } catch (\Exception $e) {
             $this->setError('error', $e->getMessage());
         }
+
         return $this->rollbackReturn(false);
     }
-}
\ No newline at end of file
+}
diff --git a/app/Services/UserService.php b/app/Services/UserService.php
index c34babbc68..ba1c84e5c2 100644
--- a/app/Services/UserService.php
+++ b/app/Services/UserService.php
@@ -1,30 +1,27 @@
-<?php namespace App\Services;
+<?php
 
-use App\Services\Service;
+namespace App\Services;
 
-use DB;
-use Auth;
-use File;
-use Image;
-use Carbon\Carbon;
-
-use App\Models\User\User;
-use App\Models\Rank\Rank;
-use App\Models\Character\CharacterTransfer;
+use App\Facades\Notifications;
+use App\Facades\Settings;
 use App\Models\Character\CharacterDesignUpdate;
-use App\Models\Submission\Submission;
+use App\Models\Character\CharacterTransfer;
 use App\Models\Gallery\GallerySubmission;
+use App\Models\Invitation;
+use App\Models\Rank\Rank;
+use App\Models\Submission\Submission;
+use App\Models\Trade;
+use App\Models\User\User;
 use App\Models\User\UserUpdateLog;
+use Carbon\Carbon;
+use Illuminate\Support\Facades\DB;
+use Illuminate\Support\Facades\File;
 use Illuminate\Support\Facades\Hash;
-use Illuminate\Support\Facades\Storage;
-
-use App\Services\SubmissionManager;
-use App\Services\GalleryManager;
-use App\Services\CharacterManager;
-use App\Models\Trade;
+use Illuminate\Support\Facades\Validator;
+use Intervention\Image\Facades\Image;
+use Laravel\Fortify\Contracts\TwoFactorAuthenticationProvider;
 
-class UserService extends Service
-{
+class UserService extends Service {
     /*
     |--------------------------------------------------------------------------
     | User Service
@@ -37,85 +34,136 @@ class UserService extends Service
     /**
      * Create a user.
      *
-     * @param  array  $data
+     * @param array $data
+     *
      * @return \App\Models\User\User
      */
-    public function createUser($data)
-    {
+    public function createUser($data) {
         // If the rank is not given, create a user with the lowest existing rank.
-        if(!isset($data['rank_id'])) $data['rank_id'] = Rank::orderBy('sort')->first()->id;
+        if (!isset($data['rank_id'])) {
+            $data['rank_id'] = Rank::orderBy('sort')->first()->id;
+        }
 
         // Make birthday into format we can store
-        $date = $data['dob']['day']."-".$data['dob']['month']."-".$data['dob']['year'];
-        $formatDate = carbon::parse($date);
+        $formatDate = Carbon::parse($data['dob']);
 
         $user = User::create([
-            'name' => $data['name'],
-            'email' => $data['email'],
-            'rank_id' => $data['rank_id'],
-            'password' => Hash::make($data['password']),
-            'birthday' => $formatDate,
+            'name'      => $data['name'],
+            'email'     => $data['email'] ?? null,
+            'rank_id'   => $data['rank_id'],
+            'password'  => isset($data['password']) ? Hash::make($data['password']) : null,
+            'birthday'  => $formatDate,
+            'has_alias' => $data['has_alias'] ?? false,
+            // Verify the email if we're logging them in with their social
+            'email_verified_at' => (!isset($data['password']) && !isset($data['email'])) ? now() : null,
         ]);
         $user->settings()->create([
             'user_id' => $user->id,
         ]);
         $user->profile()->create([
-            'user_id' => $user->id
+            'user_id' => $user->id,
         ]);
 
         return $user;
     }
 
+    /**
+     * Get a validator for an incoming registration request.
+     *
+     * @param mixed $socialite
+     *
+     * @return \Illuminate\Contracts\Validation\Validator
+     */
+    public function validator(array $data, $socialite = false) {
+        return Validator::make($data, [
+            'name'      => ['required', 'string', 'min:3', 'max:25', 'alpha_dash', 'unique:users'],
+            'email'     => ($socialite ? [] : ['required']) + ['string', 'email', 'max:255', 'unique:users'],
+            'agreement' => ['required', 'accepted'],
+            'password'  => ($socialite ? [] : ['required']) + ['string', 'min:8', 'confirmed'],
+            'dob'       => [
+                'required', function ($attribute, $value, $fail) {
+                    $formatDate = Carbon::createFromFormat('Y-m-d', $value);
+                    $now = Carbon::now();
+                    if ($formatDate->diffInYears($now) < 13) {
+                        $fail('You must be 13 or older to access this site.');
+                    }
+                },
+            ],
+            'code'                 => ['string', function ($attribute, $value, $fail) {
+                if (!Settings::get('is_registration_open')) {
+                    if (!$value) {
+                        $fail('An invitation code is required to register an account.');
+                    }
+                    $invitation = Invitation::where('code', $value)->whereNull('recipient_id')->first();
+                    if (!$invitation) {
+                        $fail('Invalid code entered.');
+                    }
+                }
+            },
+            ],
+        ] + (config('app.env') == 'production' && config('lorekeeper.extensions.use_recaptcha') ? [
+            'g-recaptcha-response' => 'required|recaptchav3:register,0.5',
+        ] : []));
+    }
+
     /**
      * Updates a user. Used in modifying the admin user on the command line.
      *
-     * @param  array  $data
+     * @param array $data
+     *
      * @return \App\Models\User\User
      */
-    public function updateUser($data)
-    {
+    public function updateUser($data) {
         $user = User::find($data['id']);
-        if(isset($data['password'])) $data['password'] = Hash::make($data['password']);
-        if($user) $user->update($data);
+        if (isset($data['password'])) {
+            $data['password'] = Hash::make($data['password']);
+        }
+        if ($user) {
+            $user->update($data);
+        }
 
         return $user;
     }
 
     /**
-     * Updates the user's password. 
+     * Updates the user's password.
+     *
+     * @param array                 $data
+     * @param \App\Models\User\User $user
      *
-     * @param  array                  $data
-     * @param  \App\Models\User\User  $user
      * @return bool
      */
-    public function updatePassword($data, $user)
-    {
-
+    public function updatePassword($data, $user) {
         DB::beginTransaction();
 
         try {
-            if(!Hash::check($data['old_password'], $user->password)) throw new \Exception("Please enter your old password.");
-            if(Hash::make($data['new_password']) == $user->password) throw new \Exception("Please enter a different password.");
+            if (isset($user->password) && !Hash::check($data['old_password'], $user->password)) {
+                throw new \Exception('Please enter your old password.');
+            }
+            if (Hash::make($data['new_password']) == $user->password) {
+                throw new \Exception('Please enter a different password.');
+            }
 
             $user->password = Hash::make($data['new_password']);
             $user->save();
 
             return $this->commitReturn(true);
-        } catch(\Exception $e) { 
+        } catch (\Exception $e) {
             $this->setError('error', $e->getMessage());
         }
+
         return $this->rollbackReturn(false);
     }
 
     /**
-     * Updates the user's email and resends a verification email. 
+     * Updates the user's email and resends a verification email.
+     *
+     * @param array                 $data
+     * @param \App\Models\User\User $user
      *
-     * @param  array                  $data
-     * @param  \App\Models\User\User  $user
      * @return bool
      */
-    public function updateEmail($data, $user)
-    {
+    public function updateEmail($data, $user) {
         $user->email = $data['email'];
         $user->email_verified_at = null;
         $user->save();
@@ -126,171 +174,325 @@ public function updateEmail($data, $user)
     }
 
     /**
-     * Updates user's birthday
+     * Updates user's birthday.
+     *
+     * @param mixed $data
+     * @param mixed $user
      */
-    public function updateBirthday($data, $user)
-    {
-        $user->birthday = $data;
-        $user->save();
+    public function updateBirthday($data, $user) {
+        DB::beginTransaction();
 
-        return true;
+        try {
+            $user->birthday = $data;
+            $user->save();
+
+            return $this->commitReturn(true);
+        } catch (\Exception $e) {
+            $this->setError('error', $e->getMessage());
+        }
+
+        return $this->rollbackReturn(false);
     }
 
     /**
-     * Updates user's birthday setting
+     * Updates user's birthday setting.
+     *
+     * @param mixed $data
+     * @param mixed $user
      */
-    public function updateDOB($data, $user)
-    {
-        $user->settings->birthday_setting = $data;
-        $user->settings->save();
+    public function updateBirthdayVisibilitySetting($data, $user) {
+        DB::beginTransaction();
 
-        return true;
+        try {
+            $user->settings->birthday_setting = $data;
+            $user->settings->save();
+
+            return $this->commitReturn(true);
+        } catch (\Exception $e) {
+            $this->setError('error', $e->getMessage());
+        }
+
+        return $this->rollbackReturn(false);
+    }
+
+    /**
+     * Confirms a user's two-factor auth.
+     *
+     * @param string           $code
+     * @param array            $data
+     * @param \App\Models\User $user
+     *
+     * @return bool
+     */
+    public function confirmTwoFactor($code, $data, $user) {
+        DB::beginTransaction();
+
+        try {
+            if (app(TwoFactorAuthenticationProvider::class)->verify(decrypt($data['two_factor_secret']), $code['code'])) {
+                $user->forceFill([
+                    'two_factor_secret'         => $data['two_factor_secret'],
+                    'two_factor_recovery_codes' => $data['two_factor_recovery_codes'],
+                ])->save();
+            } else {
+                throw new \Exception('Provided code was invalid.');
+            }
+
+            return $this->commitReturn(true);
+        } catch (\Exception $e) {
+            $this->setError('error', $e->getMessage());
+        }
+
+        return $this->rollbackReturn(false);
+    }
+
+    /**
+     * Disables a user's two-factor auth.
+     *
+     * @param string           $code
+     * @param \App\Models\User $user
+     *
+     * @return bool
+     */
+    public function disableTwoFactor($code, $user) {
+        DB::beginTransaction();
+
+        try {
+            if (app(TwoFactorAuthenticationProvider::class)->verify(decrypt($user->two_factor_secret), $code['code'])) {
+                $user->forceFill([
+                    'two_factor_secret'         => null,
+                    'two_factor_recovery_codes' => null,
+                ])->save();
+            } else {
+                throw new \Exception('Provided code was invalid.');
+            }
+
+            return $this->commitReturn(true);
+        } catch (\Exception $e) {
+            $this->setError('error', $e->getMessage());
+        }
+
+        return $this->rollbackReturn(false);
     }
 
     /**
-     * Updates the user's avatar. 
+     * Updates the user's avatar.
+     *
+     * @param \App\Models\User\User $user
+     * @param mixed                 $avatar
      *
-     * @param  array                  $data
-     * @param  \App\Models\User\User  $user
      * @return bool
      */
-    public function updateAvatar($avatar, $user)
-    {
+    public function updateAvatar($avatar, $user) {
         DB::beginTransaction();
 
         try {
-            if(!$avatar) throw new \Exception ("Please upload a file.");
-            $filename = $user->id . '.' . $avatar->getClientOriginalExtension();
-            
-            if ($user->avatar !== 'default.jpg') {
-                $file = 'images/avatars/' . $user->avatar;
+            if (!$avatar) {
+                throw new \Exception('Please upload a file.');
+            }
+            $filename = $user->id.'.'.$avatar->getClientOriginalExtension();
+
+            if ($user->avatar != 'default.jpg') {
+                $file = 'images/avatars/'.$user->avatar;
                 //$destinationPath = 'uploads/' . $id . '/';
 
                 if (File::exists($file)) {
-                    if(!unlink($file)) throw new \Exception("Failed to unlink old avatar.");
+                    if (!unlink($file)) {
+                        throw new \Exception('Failed to unlink old avatar.');
+                    }
                 }
             }
 
             // Checks if uploaded file is a GIF
             if ($avatar->getClientOriginalExtension() == 'gif') {
-            
-                if(!copy($avatar, $file)) throw new \Exception("Failed to copy file.");
-                if(!$file->move( public_path('images/avatars', $filename))) throw new \Exception("Failed to move file."); 
-                if(!$avatar->move( public_path('images/avatars', $filename))) throw new \Exception("Failed to move file."); 
-                
-            }
-
-            else {
-                if(!Image::make($avatar)->resize(150, 150)->save( public_path('images/avatars/' . $filename))) 
-                throw new \Exception("Failed to process avatar.");
+                if (!$avatar->move(public_path('images/avatars'), $filename)) {
+                    throw new \Exception('Failed to move file.');
+                }
+            } else {
+                if (!Image::make($avatar)->resize(150, 150)->save(public_path('images/avatars/'.$filename))) {
+                    throw new \Exception('Failed to process avatar.');
+                }
             }
 
             $user->avatar = $filename;
             $user->save();
 
             return $this->commitReturn($avatar);
-        } catch(\Exception $e) { 
+        } catch (\Exception $e) {
+            $this->setError('error', $e->getMessage());
+        }
+
+        return $this->rollbackReturn(false);
+    }
+
+    /**
+     * Updates a user's username.
+     *
+     * @param string                $username
+     * @param \App\Models\User\User $user
+     *
+     * @return bool
+     */
+    public function updateUsername($username, $user) {
+        DB::beginTransaction();
+
+        try {
+            if (!config('lorekeeper.settings.allow_username_changes')) {
+                throw new \Exception('Username changes are currently disabled.');
+            }
+            if (!$username) {
+                throw new \Exception('Please enter a username.');
+            }
+            if (strlen($username) < 3 || strlen($username) > 25) {
+                throw new \Exception('Username must be between 3 and 25 characters.');
+            }
+            if (!preg_match('/^[a-zA-Z0-9_]+$/', $username)) {
+                throw new \Exception('Username must only contain letters, numbers, and underscores.');
+            }
+            if ($username == $user->name) {
+                throw new \Exception('Username cannot be the same as your current username.');
+            }
+            if (User::where('name', $username)->where('id', '!=', $user->id)->first()) {
+                throw new \Exception('Username already taken.');
+            }
+            // check if there is a cooldown
+            if (config('lorekeeper.settings.username_change_cooldown')) {
+                // these logs are different to the ones in the admin panel
+                // different type
+                $last_change = UserUpdateLog::where('user_id', $user->id)->where('type', 'Username Change')->orderBy('created_at', 'desc')->first();
+                if ($last_change && $last_change->created_at->diffInDays(Carbon::now()) < config('lorekeeper.settings.username_change_cooldown')) {
+                    throw new \Exception('You must wait '
+                        .config('lorekeeper.settings.username_change_cooldown') - $last_change->created_at->diffInDays(Carbon::now()).
+                    ' days before changing your username again.');
+                }
+            }
+
+            // create log
+            UserUpdateLog::create([
+                'staff_id' => null,
+                'user_id'  => $user->id,
+                'data'     => json_encode(['old_name' => $user->name, 'new_name' => $username]),
+                'type'     => 'Username Change',
+            ]);
+
+            $user->name = $username;
+            $user->save();
+
+            return $this->commitReturn(true);
+        } catch (\Exception $e) {
             $this->setError('error', $e->getMessage());
         }
+
         return $this->rollbackReturn(false);
     }
 
     /**
-     * Bans a user. 
+     * Bans a user.
+     *
+     * @param array                 $data
+     * @param \App\Models\User\User $user
+     * @param \App\Models\User\User $staff
      *
-     * @param  array                  $data
-     * @param  \App\Models\User\User  $user
-     * @param  \App\Models\User\User  $staff
      * @return bool
      */
-    public function ban($data, $user, $staff)
-    {
+    public function ban($data, $user, $staff) {
         DB::beginTransaction();
 
         try {
-            if(!$user->is_banned) {
+            if (!$user->is_banned) {
                 // New ban (not just editing the reason), clear all their engagements
+                if (!$this->logAdminAction($staff, 'Banned User', 'Banned '.$user->displayname)) {
+                    throw new \Exception('Failed to log admin action.');
+                }
 
                 // 1. Character transfers
                 $characterManager = new CharacterManager;
-                $transfers = CharacterTransfer::where(function($query) use ($user) {
+                $transfers = CharacterTransfer::where(function ($query) use ($user) {
                     $query->where('sender_id', $user->id)->orWhere('recipient_id', $user->id);
                 })->where('status', 'Pending')->get();
-                foreach($transfers as $transfer)
-                    $characterManager->processTransferQueue(['transfer' => $transfer, 'action' => 'Reject', 'reason' => ($transfer->sender_id == $user->id ? 'Sender' : 'Recipient') . ' has been banned from site activity.'], $staff);
+                foreach ($transfers as $transfer) {
+                    $characterManager->processTransferQueue(['transfer' => $transfer, 'action' => 'Reject', 'reason' => ($transfer->sender_id == $user->id ? 'Sender' : 'Recipient').' has been banned from site activity.'], $staff);
+                }
 
                 // 2. Submissions and claims
                 $submissionManager = new SubmissionManager;
                 $submissions = Submission::where('user_id', $user->id)->where('status', 'Pending')->get();
-                foreach($submissions as $submission)
-                    $submissionManager->rejectSubmission(['submission' => $submission, 'staff_comments' => 'User has been banned from site activity.']);
+                foreach ($submissions as $submission) {
+                    $submissionManager->rejectSubmission(['submission' => $submission, 'staff_comments' => 'User has been banned from site activity.'], $staff);
+                }
 
                 // 3. Gallery Submissions
                 $galleryManager = new GalleryManager;
                 $gallerySubmissions = GallerySubmission::where('user_id', $user->id)->where('status', 'Pending')->get();
-                foreach($gallerySubmissions as $submission) {
-                    $galleryManager->rejectSubmission($submission);
+                foreach ($gallerySubmissions as $submission) {
+                    $galleryManager->rejectSubmission($submission, $staff);
                     $galleryManager->postStaffComments($submission->id, ['staff_comments' => 'User has been banned from site activity.'], $staff);
                 }
                 $gallerySubmissions = GallerySubmission::where('user_id', $user->id)->where('status', 'Accepted')->get();
-                foreach($gallerySubmissions as $submission)
+                foreach ($gallerySubmissions as $submission) {
                     $submission->update(['is_visible' => 0]);
+                }
 
                 // 4. Design approvals
-                $requests = CharacterDesignUpdate::where('user_id', $user->id)->where(function($query) {
+                $requests = CharacterDesignUpdate::where('user_id', $user->id)->where(function ($query) {
                     $query->where('status', 'Pending')->orWhere('status', 'Draft');
                 })->get();
-                foreach($requests as $request)
-                    $characterManager->rejectRequest(['staff_comments' => 'User has been banned from site activity.'], $request, $staff, true);
+                foreach ($requests as $request) {
+                    (new DesignUpdateManager)->rejectRequest(['staff_comments' => 'User has been banned from site activity.'], $request, $staff, true);
+                }
 
                 // 5. Trades
                 $tradeManager = new TradeManager;
-                $trades = Trade::where(function($query) {
+                $trades = Trade::where(function ($query) {
                     $query->where('status', 'Open')->orWhere('status', 'Pending');
-                })->where(function($query) use ($user) {
+                })->where(function ($query) use ($user) {
                     $query->where('sender_id', $user->id)->where('recipient_id', $user->id);
                 })->get();
-                foreach($trades as $trade)
+                foreach ($trades as $trade) {
                     $tradeManager->rejectTrade(['trade' => $trade, 'reason' => 'User has been banned from site activity.'], $staff);
+                }
 
-                UserUpdateLog::create(['staff_id' => $staff->id, 'user_id' => $user->id, 'data' => json_encode(['is_banned' => 'Yes', 'ban_reason' => isset($data['ban_reason']) ? $data['ban_reason'] : null]), 'type' => 'Ban']);
+                UserUpdateLog::create(['staff_id' => $staff->id, 'user_id' => $user->id, 'data' => json_encode(['is_banned' => 'Yes', 'ban_reason' => $data['ban_reason'] ?? null]), 'type' => 'Ban']);
 
                 $user->settings->banned_at = Carbon::now();
 
                 $user->is_banned = 1;
                 $user->rank_id = Rank::orderBy('sort')->first()->id;
                 $user->save();
-            }
-            else {
-                UserUpdateLog::create(['staff_id' => $staff->id, 'user_id' => $user->id, 'data' => json_encode(['ban_reason' => isset($data['ban_reason']) ? $data['ban_reason'] : null]), 'type' => 'Ban Update']);
+            } else {
+                UserUpdateLog::create(['staff_id' => $staff->id, 'user_id' => $user->id, 'data' => json_encode(['ban_reason' => $data['ban_reason'] ?? null]), 'type' => 'Ban Update']);
             }
 
             $user->settings->ban_reason = isset($data['ban_reason']) && $data['ban_reason'] ? $data['ban_reason'] : null;
             $user->settings->save();
 
             return $this->commitReturn(true);
-        } catch(\Exception $e) { 
+        } catch (\Exception $e) {
             $this->setError('error', $e->getMessage());
         }
+
         return $this->rollbackReturn(false);
     }
 
     /**
-     * Unbans a user. 
+     * Unbans a user.
+     *
+     * @param \App\Models\User\User $user
+     * @param \App\Models\User\User $staff
      *
-     * @param  \App\Models\User\User  $user
-     * @param  \App\Models\User\User  $staff
      * @return bool
      */
-    public function unban($user, $staff)
-    {
+    public function unban($user, $staff) {
         DB::beginTransaction();
 
         try {
-            if($user->is_banned) {
+            if (!$this->logAdminAction($staff, 'Unbanned User', 'Unbanned '.$user->displayname)) {
+                throw new \Exception('Failed to log admin action.');
+            }
+
+            if ($user->is_banned) {
                 $user->is_banned = 0;
                 $user->save();
-                
+
                 $user->settings->ban_reason = null;
                 $user->settings->banned_at = null;
                 $user->settings->save();
@@ -298,9 +500,147 @@ public function unban($user, $staff)
             }
 
             return $this->commitReturn(true);
-        } catch(\Exception $e) { 
+        } catch (\Exception $e) {
             $this->setError('error', $e->getMessage());
         }
+
+        return $this->rollbackReturn(false);
+    }
+
+    /**
+     * Deactivates a user.
+     *
+     * @param array                 $data
+     * @param \App\Models\User\User $user
+     * @param \App\Models\User\User $staff
+     *
+     * @return bool
+     */
+    public function deactivate($data, $user, $staff = null) {
+        DB::beginTransaction();
+
+        try {
+            if (!$staff) {
+                $staff = $user;
+            }
+            if (!$user->is_deactivated) {
+                // New deactivation (not just editing the reason), clear all their engagements
+
+                // 1. Character transfers
+                $characterManager = new CharacterManager;
+                $transfers = CharacterTransfer::where(function ($query) use ($user) {
+                    $query->where('sender_id', $user->id)->orWhere('recipient_id', $user->id);
+                })->where('status', 'Pending')->get();
+                foreach ($transfers as $transfer) {
+                    $characterManager->processTransferQueue(['transfer' => $transfer, 'action' => 'Reject', 'reason' => ($transfer->sender_id == $user->id ? 'Sender' : 'Recipient').'\'s account was deactivated.'], ($staff ? $staff : $user));
+                }
+
+                // 2. Submissions and claims
+                $submissionManager = new SubmissionManager;
+                $submissions = Submission::where('user_id', $user->id)->where('status', 'Pending')->get();
+                foreach ($submissions as $submission) {
+                    $submissionManager->rejectSubmission(['submission' => $submission, 'staff_comments' => 'User\'s account was deactivated.'], $staff);
+                }
+
+                // 3. Gallery Submissions
+                $galleryManager = new GalleryManager;
+                $gallerySubmissions = GallerySubmission::where('user_id', $user->id)->where('status', 'Pending')->get();
+                foreach ($gallerySubmissions as $submission) {
+                    $galleryManager->rejectSubmission($submission, $staff);
+                    $galleryManager->postStaffComments($submission->id, ['staff_comments' => 'User\'s account was deactivated.'], $staff);
+                }
+                $gallerySubmissions = GallerySubmission::where('user_id', $user->id)->where('status', 'Accepted')->get();
+                foreach ($gallerySubmissions as $submission) {
+                    $submission->update(['is_visible' => 0]);
+                }
+
+                // 4. Design approvals
+                $requests = CharacterDesignUpdate::where('user_id', $user->id)->where(function ($query) {
+                    $query->where('status', 'Pending')->orWhere('status', 'Draft');
+                })->get();
+                foreach ($requests as $request) {
+                    (new DesignUpdateManager)->rejectRequest(['staff_comments' => 'User\'s account was deactivated.'], $request, $staff, true);
+                }
+
+                // 5. Trades
+                $tradeManager = new TradeManager;
+                $trades = Trade::where(function ($query) {
+                    $query->where('status', 'Open')->orWhere('status', 'Pending');
+                })->where(function ($query) use ($user) {
+                    $query->where('sender_id', $user->id)->where('recipient_id', $user->id);
+                })->get();
+                foreach ($trades as $trade) {
+                    $tradeManager->rejectTrade(['trade' => $trade, 'reason' => 'User\'s account was deactivated.'], $staff);
+                }
+
+                UserUpdateLog::create(['staff_id' => $staff->id, 'user_id' => $user->id, 'data' => json_encode(['is_deactivated' => 'Yes', 'deactivate_reason' => $data['deactivate_reason'] ?? null]), 'type' => 'Deactivation']);
+
+                $user->settings->deactivated_at = Carbon::now();
+
+                $user->is_deactivated = 1;
+                $user->deactivater_id = $staff->id;
+                $user->rank_id = Rank::orderBy('sort')->first()->id;
+                $user->save();
+
+                Notifications::create('USER_DEACTIVATED', User::find(Settings::get('admin_user')), [
+                    'user_url'   => $user->url,
+                    'user_name'  => $user->name,
+                    'staff_url'  => $staff->url,
+                    'staff_name' => $staff->name,
+                ]);
+            } else {
+                UserUpdateLog::create(['staff_id' => $staff->id, 'user_id' => $user->id, 'data' => json_encode(['deactivate_reason' => $data['deactivate_reason'] ?? null]), 'type' => 'Deactivation Update']);
+            }
+
+            $user->settings->deactivate_reason = isset($data['deactivate_reason']) && $data['deactivate_reason'] ? $data['deactivate_reason'] : null;
+            $user->settings->save();
+
+            return $this->commitReturn(true);
+        } catch (\Exception $e) {
+            $this->setError('error', $e->getMessage());
+        }
+
+        return $this->rollbackReturn(false);
+    }
+
+    /**
+     * Reactivates a user account.
+     *
+     * @param \App\Models\User\User $user
+     * @param \App\Models\User\User $staff
+     *
+     * @return bool
+     */
+    public function reactivate($user, $staff = null) {
+        DB::beginTransaction();
+
+        try {
+            if (!$staff) {
+                $staff = $user;
+            }
+            if ($user->is_deactivated) {
+                $user->is_deactivated = 0;
+                $user->deactivater_id = null;
+                $user->save();
+
+                $user->settings->deactivate_reason = null;
+                $user->settings->deactivated_at = null;
+                $user->settings->save();
+                UserUpdateLog::create(['staff_id' => $staff ? $staff->id : $user->id, 'user_id' => $user->id, 'data' => json_encode(['is_deactivated' => 'No']), 'type' => 'Reactivation']);
+            }
+
+            Notifications::create('USER_REACTIVATED', User::find(Settings::get('admin_user')), [
+                'user_url'   => $user->url,
+                'user_name'  => ucfirst($user->name),
+                'staff_url'  => $staff->url,
+                'staff_name' => $staff->name,
+            ]);
+
+            return $this->commitReturn(true);
+        } catch (\Exception $e) {
+            $this->setError('error', $e->getMessage());
+        }
+
         return $this->rollbackReturn(false);
     }
-}
\ No newline at end of file
+}
diff --git a/app/Traits/Commentable.php b/app/Traits/Commentable.php
index 4ea80ee838..06ce85adf5 100644
--- a/app/Traits/Commentable.php
+++ b/app/Traits/Commentable.php
@@ -2,48 +2,39 @@
 
 namespace App\Traits;
 
-use App\Models\Comment;
-
-use Config;
+use App\Models\Comment\Comment;
 
 /**
  * Add this trait to any model that you want to be able to
  * comment upon or get comments for.
  */
-trait Commentable
-{
+trait Commentable {
     /**
-     * This static method does voodoo magic to
-     * delete leftover comments once the commentable
-     * model is deleted.
+     * Returns all comments for this model.
      */
-    protected static function bootCommentable()
-    {
-        static::deleted(function($commentable) {
-            
-            if (Config::get('lorekeeper.comments.soft_deletes') == true) {
-                Comment::where('commentable_type', get_class($commentable))->where('commentable_id', $commentable->id)->delete();
-            }
-            else {
-                Comment::where('commentable_type', get_class($commentable))->where('commentable_id', $commentable->id)->forceDelete();
-            }
-            
-        });
+    public function commentz() {
+        return $this->morphMany('App\Models\Comment\Comment', 'commentable')->withTrashed();
     }
 
     /**
-     * Returns all comments for this model.
+     * Returns only approved comments for this model.
      */
-    public function commentz()
-    {
-        return $this->morphMany('App\Models\Comment', 'commentable');
+    public function approvedComments() {
+        return $this->morphMany('App\Models\Comment\Comment', 'commentable')->where('approved', true)->withTrashed();
     }
 
     /**
-     * Returns only approved comments for this model.
+     * This static method does voodoo magic to
+     * delete leftover comments once the commentable
+     * model is deleted.
      */
-    public function approvedComments()
-    {
-        return $this->morphMany('App\Models\Comment', 'commentable')->where('approved', true);
+    protected static function bootCommentable() {
+        static::deleted(function ($commentable) {
+            if (config('lorekeeper.comments.soft_deletes') == true) {
+                Comment::where('commentable_type', get_class($commentable))->where('commentable_id', $commentable->id)->delete();
+            } else {
+                Comment::where('commentable_type', get_class($commentable))->where('commentable_id', $commentable->id)->forceDelete();
+            }
+        });
     }
 }
diff --git a/app/Traits/Commenter.php b/app/Traits/Commenter.php
index 0f4d87d219..00fe6de15b 100644
--- a/app/Traits/Commenter.php
+++ b/app/Traits/Commenter.php
@@ -2,29 +2,22 @@
 
 namespace App\Traits;
 
-use App\Models\Comment;
-
-use Illuminate\Support\Facades\Config;
-
 /**
  * Add this trait to your User model so
  * that you can retrieve the comments for a user.
  */
-trait Commenter
-{
+trait Commenter {
     /**
      * Returns all comments that this user has made.
      */
-    public function comments()
-    {
-        return $this->morphMany('App\Models\Comment', 'commenter');
+    public function comments() {
+        return $this->morphMany('App\Models\Comment\Comment', 'commenter');
     }
 
     /**
      * Returns only approved comments that this user has made.
      */
-    public function approvedComments()
-    {
-        return $this->morphMany('App\Models\Comment', 'commenter')->where('approved', true);
+    public function approvedComments() {
+        return $this->morphMany('App\Models\Comment\Comment', 'commenter')->where('approved', true);
     }
 }
diff --git a/app/View/Components/AdminEdit.php b/app/View/Components/AdminEdit.php
new file mode 100644
index 0000000000..47cf0eec1c
--- /dev/null
+++ b/app/View/Components/AdminEdit.php
@@ -0,0 +1,44 @@
+<?php
+
+namespace App\View\Components;
+
+use Illuminate\Support\Facades\Auth;
+use Illuminate\View\Component;
+
+class AdminEdit extends Component {
+    /**
+     * The model object.
+     *
+     * @var string
+     */
+    public $object;
+
+    /**
+     * The title for the button.
+     *
+     * @var string
+     */
+    public $title;
+
+    /**
+     * Create a new component instance.
+     *
+     * @param mixed $title
+     * @param mixed $object
+     */
+    public function __construct($title, $object) {
+        $this->title = $title;
+        $this->object = $object;
+    }
+
+    /**
+     * Get the view / contents that represent the component.
+     *
+     * @return \Closure|\Illuminate\Contracts\View\View|string
+     */
+    public function render() {
+        if (Auth::check() && Auth::user()->hasPower($this->object->adminPower)) {
+            return view('components.admin-edit');
+        }
+    }
+}
diff --git a/composer.json b/composer.json
index 70a3429869..eb97151ff4 100644
--- a/composer.json
+++ b/composer.json
@@ -8,41 +8,35 @@
     ],
     "license": "MIT",
     "require": {
-        "php": "~8.1",
-        "boxconnect/deviant-php": "dev-master",
-        "doctrine/dbal": "^2.2",
+        "php": "^8.1",
+        "doctrine/dbal": "^3.7",
         "erusev/parsedown": "^1.7",
         "ezyang/htmlpurifier": "^4.10",
-        "fideloper/proxy": "^4.0",
-        "illuminate/database": "^5.6|^6.0|^7.0|^8.0",
-        "illuminate/http": "^5.6|^6.0|^7.0|^8.0",
-        "illuminate/pagination": "^5.6|^6.0|^7.0|^8.0",
-        "illuminate/queue": "^5.6|^6.0|^7.0|^8.0",
-        "illuminate/routing": "^5.6|^6.0|^7.0|^8.0",
-        "illuminate/support": "^5.6|^6.0|^7.0|^8.0",
-        "intervention/image": "^2.4",
+        "intervention/image": "^2.0",
+        "josiasmontag/laravel-recaptchav3": "^1.0.0",
         "laracasts/flash": "^3.0",
-        "laravel/framework": "^8.0",
+        "laravel/fortify": "^1.7",
+        "laravel/framework": "^10.0",
         "laravel/helpers": "^1.4",
         "laravel/socialite": "^5.2",
         "laravel/tinker": "^2.0",
-        "laravel/ui": "^3.1.0",
         "laravelcollective/html": "^6.0",
         "socialiteproviders/deviantart": "^4.1",
+        "socialiteproviders/discord": "^4.1",
         "socialiteproviders/imgur": "^4.1",
-        "socialiteproviders/instagram": "^4.1",
+        "socialiteproviders/instagram": "^5.0",
         "socialiteproviders/tumblr": "^4.1",
         "socialiteproviders/twitch": "^5.3",
-        "socialiteproviders/twitter": "^4.1",
+        "spatie/laravel-feed": "^4.1",
         "spatie/laravel-honeypot": "^4.1"
     },
     "require-dev": {
-        "beyondcode/laravel-dump-server": "^1.0",
-        "filp/whoops": "^2.0",
-        "fzaninotto/faker": "^1.4",
-        "mockery/mockery": "^1.0",
-        "nunomaduro/collision": "^5.0",
-        "phpunit/phpunit": "^9.0"
+        "fakerphp/faker": "^1.9.1",
+        "laravel/pint": "^1.0",
+        "mockery/mockery": "^1.4.4",
+        "nunomaduro/collision": "^7.0",
+        "phpunit/phpunit": "^10.1",
+        "spatie/laravel-ignition": "^2.0"
     },
     "config": {
         "optimize-autoloader": true,
@@ -72,7 +66,7 @@
             "Tests\\": "tests/"
         }
     },
-    "minimum-stability": "dev",
+    "minimum-stability": "stable",
     "prefer-stable": true,
     "scripts": {
         "post-autoload-dump": [
@@ -84,6 +78,12 @@
         ],
         "post-create-project-cmd": [
             "@php artisan key:generate --ansi"
+        ],
+        "sniff": [
+            "./vendor/bin/pint --test"
+        ],
+        "lint": [
+            "./vendor/bin/pint"
         ]
     }
 }
diff --git a/composer.lock b/composer.lock
new file mode 100644
index 0000000000..0c02a0e2e7
--- /dev/null
+++ b/composer.lock
@@ -0,0 +1,9801 @@
+{
+    "_readme": [
+        "This file locks the dependencies of your project to a known state",
+        "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
+        "This file is @generated automatically"
+    ],
+    "content-hash": "ac16e377cc2e367f3e2c2d2e9a64634a",
+    "packages": [
+        {
+            "name": "bacon/bacon-qr-code",
+            "version": "2.0.8",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/Bacon/BaconQrCode.git",
+                "reference": "8674e51bb65af933a5ffaf1c308a660387c35c22"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/Bacon/BaconQrCode/zipball/8674e51bb65af933a5ffaf1c308a660387c35c22",
+                "reference": "8674e51bb65af933a5ffaf1c308a660387c35c22",
+                "shasum": ""
+            },
+            "require": {
+                "dasprid/enum": "^1.0.3",
+                "ext-iconv": "*",
+                "php": "^7.1 || ^8.0"
+            },
+            "require-dev": {
+                "phly/keep-a-changelog": "^2.1",
+                "phpunit/phpunit": "^7 | ^8 | ^9",
+                "spatie/phpunit-snapshot-assertions": "^4.2.9",
+                "squizlabs/php_codesniffer": "^3.4"
+            },
+            "suggest": {
+                "ext-imagick": "to generate QR code images"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "BaconQrCode\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-2-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Ben Scholzen 'DASPRiD'",
+                    "email": "mail@dasprids.de",
+                    "homepage": "https://dasprids.de/",
+                    "role": "Developer"
+                }
+            ],
+            "description": "BaconQrCode is a QR code generator for PHP.",
+            "homepage": "https://github.com/Bacon/BaconQrCode",
+            "support": {
+                "issues": "https://github.com/Bacon/BaconQrCode/issues",
+                "source": "https://github.com/Bacon/BaconQrCode/tree/2.0.8"
+            },
+            "time": "2022-12-07T17:46:57+00:00"
+        },
+        {
+            "name": "brick/math",
+            "version": "0.11.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/brick/math.git",
+                "reference": "0ad82ce168c82ba30d1c01ec86116ab52f589478"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/brick/math/zipball/0ad82ce168c82ba30d1c01ec86116ab52f589478",
+                "reference": "0ad82ce168c82ba30d1c01ec86116ab52f589478",
+                "shasum": ""
+            },
+            "require": {
+                "php": "^8.0"
+            },
+            "require-dev": {
+                "php-coveralls/php-coveralls": "^2.2",
+                "phpunit/phpunit": "^9.0",
+                "vimeo/psalm": "5.0.0"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "Brick\\Math\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "description": "Arbitrary-precision arithmetic library",
+            "keywords": [
+                "Arbitrary-precision",
+                "BigInteger",
+                "BigRational",
+                "arithmetic",
+                "bigdecimal",
+                "bignum",
+                "brick",
+                "math"
+            ],
+            "support": {
+                "issues": "https://github.com/brick/math/issues",
+                "source": "https://github.com/brick/math/tree/0.11.0"
+            },
+            "funding": [
+                {
+                    "url": "https://github.com/BenMorel",
+                    "type": "github"
+                }
+            ],
+            "time": "2023-01-15T23:15:59+00:00"
+        },
+        {
+            "name": "carbonphp/carbon-doctrine-types",
+            "version": "2.1.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/CarbonPHP/carbon-doctrine-types.git",
+                "reference": "99f76ffa36cce3b70a4a6abce41dba15ca2e84cb"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/CarbonPHP/carbon-doctrine-types/zipball/99f76ffa36cce3b70a4a6abce41dba15ca2e84cb",
+                "reference": "99f76ffa36cce3b70a4a6abce41dba15ca2e84cb",
+                "shasum": ""
+            },
+            "require": {
+                "php": "^7.4 || ^8.0"
+            },
+            "conflict": {
+                "doctrine/dbal": "<3.7.0 || >=4.0.0"
+            },
+            "require-dev": {
+                "doctrine/dbal": "^3.7.0",
+                "nesbot/carbon": "^2.71.0 || ^3.0.0",
+                "phpunit/phpunit": "^10.3"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "Carbon\\Doctrine\\": "src/Carbon/Doctrine/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "KyleKatarn",
+                    "email": "kylekatarnls@gmail.com"
+                }
+            ],
+            "description": "Types to use Carbon in Doctrine",
+            "keywords": [
+                "carbon",
+                "date",
+                "datetime",
+                "doctrine",
+                "time"
+            ],
+            "support": {
+                "issues": "https://github.com/CarbonPHP/carbon-doctrine-types/issues",
+                "source": "https://github.com/CarbonPHP/carbon-doctrine-types/tree/2.1.0"
+            },
+            "funding": [
+                {
+                    "url": "https://github.com/kylekatarnls",
+                    "type": "github"
+                },
+                {
+                    "url": "https://opencollective.com/Carbon",
+                    "type": "open_collective"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/nesbot/carbon",
+                    "type": "tidelift"
+                }
+            ],
+            "time": "2023-12-11T17:09:12+00:00"
+        },
+        {
+            "name": "dasprid/enum",
+            "version": "1.0.5",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/DASPRiD/Enum.git",
+                "reference": "6faf451159fb8ba4126b925ed2d78acfce0dc016"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/DASPRiD/Enum/zipball/6faf451159fb8ba4126b925ed2d78acfce0dc016",
+                "reference": "6faf451159fb8ba4126b925ed2d78acfce0dc016",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=7.1 <9.0"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^7 | ^8 | ^9",
+                "squizlabs/php_codesniffer": "*"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "DASPRiD\\Enum\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-2-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Ben Scholzen 'DASPRiD'",
+                    "email": "mail@dasprids.de",
+                    "homepage": "https://dasprids.de/",
+                    "role": "Developer"
+                }
+            ],
+            "description": "PHP 7.1 enum implementation",
+            "keywords": [
+                "enum",
+                "map"
+            ],
+            "support": {
+                "issues": "https://github.com/DASPRiD/Enum/issues",
+                "source": "https://github.com/DASPRiD/Enum/tree/1.0.5"
+            },
+            "time": "2023-08-25T16:18:39+00:00"
+        },
+        {
+            "name": "dflydev/dot-access-data",
+            "version": "v3.0.2",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/dflydev/dflydev-dot-access-data.git",
+                "reference": "f41715465d65213d644d3141a6a93081be5d3549"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/dflydev/dflydev-dot-access-data/zipball/f41715465d65213d644d3141a6a93081be5d3549",
+                "reference": "f41715465d65213d644d3141a6a93081be5d3549",
+                "shasum": ""
+            },
+            "require": {
+                "php": "^7.1 || ^8.0"
+            },
+            "require-dev": {
+                "phpstan/phpstan": "^0.12.42",
+                "phpunit/phpunit": "^7.5 || ^8.5 || ^9.3",
+                "scrutinizer/ocular": "1.6.0",
+                "squizlabs/php_codesniffer": "^3.5",
+                "vimeo/psalm": "^4.0.0"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-main": "3.x-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Dflydev\\DotAccessData\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Dragonfly Development Inc.",
+                    "email": "info@dflydev.com",
+                    "homepage": "http://dflydev.com"
+                },
+                {
+                    "name": "Beau Simensen",
+                    "email": "beau@dflydev.com",
+                    "homepage": "http://beausimensen.com"
+                },
+                {
+                    "name": "Carlos Frutos",
+                    "email": "carlos@kiwing.it",
+                    "homepage": "https://github.com/cfrutos"
+                },
+                {
+                    "name": "Colin O'Dell",
+                    "email": "colinodell@gmail.com",
+                    "homepage": "https://www.colinodell.com"
+                }
+            ],
+            "description": "Given a deep data structure, access data by dot notation.",
+            "homepage": "https://github.com/dflydev/dflydev-dot-access-data",
+            "keywords": [
+                "access",
+                "data",
+                "dot",
+                "notation"
+            ],
+            "support": {
+                "issues": "https://github.com/dflydev/dflydev-dot-access-data/issues",
+                "source": "https://github.com/dflydev/dflydev-dot-access-data/tree/v3.0.2"
+            },
+            "time": "2022-10-27T11:44:00+00:00"
+        },
+        {
+            "name": "doctrine/cache",
+            "version": "2.2.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/doctrine/cache.git",
+                "reference": "1ca8f21980e770095a31456042471a57bc4c68fb"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/doctrine/cache/zipball/1ca8f21980e770095a31456042471a57bc4c68fb",
+                "reference": "1ca8f21980e770095a31456042471a57bc4c68fb",
+                "shasum": ""
+            },
+            "require": {
+                "php": "~7.1 || ^8.0"
+            },
+            "conflict": {
+                "doctrine/common": ">2.2,<2.4"
+            },
+            "require-dev": {
+                "cache/integration-tests": "dev-master",
+                "doctrine/coding-standard": "^9",
+                "phpunit/phpunit": "^7.5 || ^8.5 || ^9.5",
+                "psr/cache": "^1.0 || ^2.0 || ^3.0",
+                "symfony/cache": "^4.4 || ^5.4 || ^6",
+                "symfony/var-exporter": "^4.4 || ^5.4 || ^6"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "Doctrine\\Common\\Cache\\": "lib/Doctrine/Common/Cache"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Guilherme Blanco",
+                    "email": "guilhermeblanco@gmail.com"
+                },
+                {
+                    "name": "Roman Borschel",
+                    "email": "roman@code-factory.org"
+                },
+                {
+                    "name": "Benjamin Eberlei",
+                    "email": "kontakt@beberlei.de"
+                },
+                {
+                    "name": "Jonathan Wage",
+                    "email": "jonwage@gmail.com"
+                },
+                {
+                    "name": "Johannes Schmitt",
+                    "email": "schmittjoh@gmail.com"
+                }
+            ],
+            "description": "PHP Doctrine Cache library is a popular cache implementation that supports many different drivers such as redis, memcache, apc, mongodb and others.",
+            "homepage": "https://www.doctrine-project.org/projects/cache.html",
+            "keywords": [
+                "abstraction",
+                "apcu",
+                "cache",
+                "caching",
+                "couchdb",
+                "memcached",
+                "php",
+                "redis",
+                "xcache"
+            ],
+            "support": {
+                "issues": "https://github.com/doctrine/cache/issues",
+                "source": "https://github.com/doctrine/cache/tree/2.2.0"
+            },
+            "funding": [
+                {
+                    "url": "https://www.doctrine-project.org/sponsorship.html",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://www.patreon.com/phpdoctrine",
+                    "type": "patreon"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/doctrine%2Fcache",
+                    "type": "tidelift"
+                }
+            ],
+            "time": "2022-05-20T20:07:39+00:00"
+        },
+        {
+            "name": "doctrine/dbal",
+            "version": "3.7.2",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/doctrine/dbal.git",
+                "reference": "0ac3c270590e54910715e9a1a044cc368df282b2"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/doctrine/dbal/zipball/0ac3c270590e54910715e9a1a044cc368df282b2",
+                "reference": "0ac3c270590e54910715e9a1a044cc368df282b2",
+                "shasum": ""
+            },
+            "require": {
+                "composer-runtime-api": "^2",
+                "doctrine/cache": "^1.11|^2.0",
+                "doctrine/deprecations": "^0.5.3|^1",
+                "doctrine/event-manager": "^1|^2",
+                "php": "^7.4 || ^8.0",
+                "psr/cache": "^1|^2|^3",
+                "psr/log": "^1|^2|^3"
+            },
+            "require-dev": {
+                "doctrine/coding-standard": "12.0.0",
+                "fig/log-test": "^1",
+                "jetbrains/phpstorm-stubs": "2023.1",
+                "phpstan/phpstan": "1.10.42",
+                "phpstan/phpstan-strict-rules": "^1.5",
+                "phpunit/phpunit": "9.6.13",
+                "psalm/plugin-phpunit": "0.18.4",
+                "slevomat/coding-standard": "8.13.1",
+                "squizlabs/php_codesniffer": "3.7.2",
+                "symfony/cache": "^5.4|^6.0",
+                "symfony/console": "^4.4|^5.4|^6.0",
+                "vimeo/psalm": "4.30.0"
+            },
+            "suggest": {
+                "symfony/console": "For helpful console commands such as SQL execution and import of files."
+            },
+            "bin": [
+                "bin/doctrine-dbal"
+            ],
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "Doctrine\\DBAL\\": "src"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Guilherme Blanco",
+                    "email": "guilhermeblanco@gmail.com"
+                },
+                {
+                    "name": "Roman Borschel",
+                    "email": "roman@code-factory.org"
+                },
+                {
+                    "name": "Benjamin Eberlei",
+                    "email": "kontakt@beberlei.de"
+                },
+                {
+                    "name": "Jonathan Wage",
+                    "email": "jonwage@gmail.com"
+                }
+            ],
+            "description": "Powerful PHP database abstraction layer (DBAL) with many features for database schema introspection and management.",
+            "homepage": "https://www.doctrine-project.org/projects/dbal.html",
+            "keywords": [
+                "abstraction",
+                "database",
+                "db2",
+                "dbal",
+                "mariadb",
+                "mssql",
+                "mysql",
+                "oci8",
+                "oracle",
+                "pdo",
+                "pgsql",
+                "postgresql",
+                "queryobject",
+                "sasql",
+                "sql",
+                "sqlite",
+                "sqlserver",
+                "sqlsrv"
+            ],
+            "support": {
+                "issues": "https://github.com/doctrine/dbal/issues",
+                "source": "https://github.com/doctrine/dbal/tree/3.7.2"
+            },
+            "funding": [
+                {
+                    "url": "https://www.doctrine-project.org/sponsorship.html",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://www.patreon.com/phpdoctrine",
+                    "type": "patreon"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/doctrine%2Fdbal",
+                    "type": "tidelift"
+                }
+            ],
+            "time": "2023-11-19T08:06:58+00:00"
+        },
+        {
+            "name": "doctrine/deprecations",
+            "version": "1.1.2",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/doctrine/deprecations.git",
+                "reference": "4f2d4f2836e7ec4e7a8625e75c6aa916004db931"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/doctrine/deprecations/zipball/4f2d4f2836e7ec4e7a8625e75c6aa916004db931",
+                "reference": "4f2d4f2836e7ec4e7a8625e75c6aa916004db931",
+                "shasum": ""
+            },
+            "require": {
+                "php": "^7.1 || ^8.0"
+            },
+            "require-dev": {
+                "doctrine/coding-standard": "^9",
+                "phpstan/phpstan": "1.4.10 || 1.10.15",
+                "phpstan/phpstan-phpunit": "^1.0",
+                "phpunit/phpunit": "^7.5 || ^8.5 || ^9.5",
+                "psalm/plugin-phpunit": "0.18.4",
+                "psr/log": "^1 || ^2 || ^3",
+                "vimeo/psalm": "4.30.0 || 5.12.0"
+            },
+            "suggest": {
+                "psr/log": "Allows logging deprecations via PSR-3 logger implementation"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "Doctrine\\Deprecations\\": "lib/Doctrine/Deprecations"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "description": "A small layer on top of trigger_error(E_USER_DEPRECATED) or PSR-3 logging with options to disable all deprecations or selectively for packages.",
+            "homepage": "https://www.doctrine-project.org/",
+            "support": {
+                "issues": "https://github.com/doctrine/deprecations/issues",
+                "source": "https://github.com/doctrine/deprecations/tree/1.1.2"
+            },
+            "time": "2023-09-27T20:04:15+00:00"
+        },
+        {
+            "name": "doctrine/event-manager",
+            "version": "2.0.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/doctrine/event-manager.git",
+                "reference": "750671534e0241a7c50ea5b43f67e23eb5c96f32"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/doctrine/event-manager/zipball/750671534e0241a7c50ea5b43f67e23eb5c96f32",
+                "reference": "750671534e0241a7c50ea5b43f67e23eb5c96f32",
+                "shasum": ""
+            },
+            "require": {
+                "php": "^8.1"
+            },
+            "conflict": {
+                "doctrine/common": "<2.9"
+            },
+            "require-dev": {
+                "doctrine/coding-standard": "^10",
+                "phpstan/phpstan": "^1.8.8",
+                "phpunit/phpunit": "^9.5",
+                "vimeo/psalm": "^4.28"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "Doctrine\\Common\\": "src"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Guilherme Blanco",
+                    "email": "guilhermeblanco@gmail.com"
+                },
+                {
+                    "name": "Roman Borschel",
+                    "email": "roman@code-factory.org"
+                },
+                {
+                    "name": "Benjamin Eberlei",
+                    "email": "kontakt@beberlei.de"
+                },
+                {
+                    "name": "Jonathan Wage",
+                    "email": "jonwage@gmail.com"
+                },
+                {
+                    "name": "Johannes Schmitt",
+                    "email": "schmittjoh@gmail.com"
+                },
+                {
+                    "name": "Marco Pivetta",
+                    "email": "ocramius@gmail.com"
+                }
+            ],
+            "description": "The Doctrine Event Manager is a simple PHP event system that was built to be used with the various Doctrine projects.",
+            "homepage": "https://www.doctrine-project.org/projects/event-manager.html",
+            "keywords": [
+                "event",
+                "event dispatcher",
+                "event manager",
+                "event system",
+                "events"
+            ],
+            "support": {
+                "issues": "https://github.com/doctrine/event-manager/issues",
+                "source": "https://github.com/doctrine/event-manager/tree/2.0.0"
+            },
+            "funding": [
+                {
+                    "url": "https://www.doctrine-project.org/sponsorship.html",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://www.patreon.com/phpdoctrine",
+                    "type": "patreon"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/doctrine%2Fevent-manager",
+                    "type": "tidelift"
+                }
+            ],
+            "time": "2022-10-12T20:59:15+00:00"
+        },
+        {
+            "name": "doctrine/inflector",
+            "version": "2.0.8",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/doctrine/inflector.git",
+                "reference": "f9301a5b2fb1216b2b08f02ba04dc45423db6bff"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/doctrine/inflector/zipball/f9301a5b2fb1216b2b08f02ba04dc45423db6bff",
+                "reference": "f9301a5b2fb1216b2b08f02ba04dc45423db6bff",
+                "shasum": ""
+            },
+            "require": {
+                "php": "^7.2 || ^8.0"
+            },
+            "require-dev": {
+                "doctrine/coding-standard": "^11.0",
+                "phpstan/phpstan": "^1.8",
+                "phpstan/phpstan-phpunit": "^1.1",
+                "phpstan/phpstan-strict-rules": "^1.3",
+                "phpunit/phpunit": "^8.5 || ^9.5",
+                "vimeo/psalm": "^4.25 || ^5.4"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "Doctrine\\Inflector\\": "lib/Doctrine/Inflector"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Guilherme Blanco",
+                    "email": "guilhermeblanco@gmail.com"
+                },
+                {
+                    "name": "Roman Borschel",
+                    "email": "roman@code-factory.org"
+                },
+                {
+                    "name": "Benjamin Eberlei",
+                    "email": "kontakt@beberlei.de"
+                },
+                {
+                    "name": "Jonathan Wage",
+                    "email": "jonwage@gmail.com"
+                },
+                {
+                    "name": "Johannes Schmitt",
+                    "email": "schmittjoh@gmail.com"
+                }
+            ],
+            "description": "PHP Doctrine Inflector is a small library that can perform string manipulations with regard to upper/lowercase and singular/plural forms of words.",
+            "homepage": "https://www.doctrine-project.org/projects/inflector.html",
+            "keywords": [
+                "inflection",
+                "inflector",
+                "lowercase",
+                "manipulation",
+                "php",
+                "plural",
+                "singular",
+                "strings",
+                "uppercase",
+                "words"
+            ],
+            "support": {
+                "issues": "https://github.com/doctrine/inflector/issues",
+                "source": "https://github.com/doctrine/inflector/tree/2.0.8"
+            },
+            "funding": [
+                {
+                    "url": "https://www.doctrine-project.org/sponsorship.html",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://www.patreon.com/phpdoctrine",
+                    "type": "patreon"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/doctrine%2Finflector",
+                    "type": "tidelift"
+                }
+            ],
+            "time": "2023-06-16T13:40:37+00:00"
+        },
+        {
+            "name": "doctrine/lexer",
+            "version": "3.0.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/doctrine/lexer.git",
+                "reference": "84a527db05647743d50373e0ec53a152f2cde568"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/doctrine/lexer/zipball/84a527db05647743d50373e0ec53a152f2cde568",
+                "reference": "84a527db05647743d50373e0ec53a152f2cde568",
+                "shasum": ""
+            },
+            "require": {
+                "php": "^8.1"
+            },
+            "require-dev": {
+                "doctrine/coding-standard": "^10",
+                "phpstan/phpstan": "^1.9",
+                "phpunit/phpunit": "^9.5",
+                "psalm/plugin-phpunit": "^0.18.3",
+                "vimeo/psalm": "^5.0"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "Doctrine\\Common\\Lexer\\": "src"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Guilherme Blanco",
+                    "email": "guilhermeblanco@gmail.com"
+                },
+                {
+                    "name": "Roman Borschel",
+                    "email": "roman@code-factory.org"
+                },
+                {
+                    "name": "Johannes Schmitt",
+                    "email": "schmittjoh@gmail.com"
+                }
+            ],
+            "description": "PHP Doctrine Lexer parser library that can be used in Top-Down, Recursive Descent Parsers.",
+            "homepage": "https://www.doctrine-project.org/projects/lexer.html",
+            "keywords": [
+                "annotations",
+                "docblock",
+                "lexer",
+                "parser",
+                "php"
+            ],
+            "support": {
+                "issues": "https://github.com/doctrine/lexer/issues",
+                "source": "https://github.com/doctrine/lexer/tree/3.0.0"
+            },
+            "funding": [
+                {
+                    "url": "https://www.doctrine-project.org/sponsorship.html",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://www.patreon.com/phpdoctrine",
+                    "type": "patreon"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/doctrine%2Flexer",
+                    "type": "tidelift"
+                }
+            ],
+            "time": "2022-12-15T16:57:16+00:00"
+        },
+        {
+            "name": "dragonmantank/cron-expression",
+            "version": "v3.3.3",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/dragonmantank/cron-expression.git",
+                "reference": "adfb1f505deb6384dc8b39804c5065dd3c8c8c0a"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/dragonmantank/cron-expression/zipball/adfb1f505deb6384dc8b39804c5065dd3c8c8c0a",
+                "reference": "adfb1f505deb6384dc8b39804c5065dd3c8c8c0a",
+                "shasum": ""
+            },
+            "require": {
+                "php": "^7.2|^8.0",
+                "webmozart/assert": "^1.0"
+            },
+            "replace": {
+                "mtdowling/cron-expression": "^1.0"
+            },
+            "require-dev": {
+                "phpstan/extension-installer": "^1.0",
+                "phpstan/phpstan": "^1.0",
+                "phpstan/phpstan-webmozart-assert": "^1.0",
+                "phpunit/phpunit": "^7.0|^8.0|^9.0"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "Cron\\": "src/Cron/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Chris Tankersley",
+                    "email": "chris@ctankersley.com",
+                    "homepage": "https://github.com/dragonmantank"
+                }
+            ],
+            "description": "CRON for PHP: Calculate the next or previous run date and determine if a CRON expression is due",
+            "keywords": [
+                "cron",
+                "schedule"
+            ],
+            "support": {
+                "issues": "https://github.com/dragonmantank/cron-expression/issues",
+                "source": "https://github.com/dragonmantank/cron-expression/tree/v3.3.3"
+            },
+            "funding": [
+                {
+                    "url": "https://github.com/dragonmantank",
+                    "type": "github"
+                }
+            ],
+            "time": "2023-08-10T19:36:49+00:00"
+        },
+        {
+            "name": "egulias/email-validator",
+            "version": "4.0.2",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/egulias/EmailValidator.git",
+                "reference": "ebaaf5be6c0286928352e054f2d5125608e5405e"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/egulias/EmailValidator/zipball/ebaaf5be6c0286928352e054f2d5125608e5405e",
+                "reference": "ebaaf5be6c0286928352e054f2d5125608e5405e",
+                "shasum": ""
+            },
+            "require": {
+                "doctrine/lexer": "^2.0 || ^3.0",
+                "php": ">=8.1",
+                "symfony/polyfill-intl-idn": "^1.26"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^10.2",
+                "vimeo/psalm": "^5.12"
+            },
+            "suggest": {
+                "ext-intl": "PHP Internationalization Libraries are required to use the SpoofChecking validation"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "4.0.x-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Egulias\\EmailValidator\\": "src"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Eduardo Gulias Davis"
+                }
+            ],
+            "description": "A library for validating emails against several RFCs",
+            "homepage": "https://github.com/egulias/EmailValidator",
+            "keywords": [
+                "email",
+                "emailvalidation",
+                "emailvalidator",
+                "validation",
+                "validator"
+            ],
+            "support": {
+                "issues": "https://github.com/egulias/EmailValidator/issues",
+                "source": "https://github.com/egulias/EmailValidator/tree/4.0.2"
+            },
+            "funding": [
+                {
+                    "url": "https://github.com/egulias",
+                    "type": "github"
+                }
+            ],
+            "time": "2023-10-06T06:47:41+00:00"
+        },
+        {
+            "name": "erusev/parsedown",
+            "version": "1.7.4",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/erusev/parsedown.git",
+                "reference": "cb17b6477dfff935958ba01325f2e8a2bfa6dab3"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/erusev/parsedown/zipball/cb17b6477dfff935958ba01325f2e8a2bfa6dab3",
+                "reference": "cb17b6477dfff935958ba01325f2e8a2bfa6dab3",
+                "shasum": ""
+            },
+            "require": {
+                "ext-mbstring": "*",
+                "php": ">=5.3.0"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^4.8.35"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-0": {
+                    "Parsedown": ""
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Emanuil Rusev",
+                    "email": "hello@erusev.com",
+                    "homepage": "http://erusev.com"
+                }
+            ],
+            "description": "Parser for Markdown.",
+            "homepage": "http://parsedown.org",
+            "keywords": [
+                "markdown",
+                "parser"
+            ],
+            "support": {
+                "issues": "https://github.com/erusev/parsedown/issues",
+                "source": "https://github.com/erusev/parsedown/tree/1.7.x"
+            },
+            "time": "2019-12-30T22:54:17+00:00"
+        },
+        {
+            "name": "ezyang/htmlpurifier",
+            "version": "v4.17.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/ezyang/htmlpurifier.git",
+                "reference": "bbc513d79acf6691fa9cf10f192c90dd2957f18c"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/ezyang/htmlpurifier/zipball/bbc513d79acf6691fa9cf10f192c90dd2957f18c",
+                "reference": "bbc513d79acf6691fa9cf10f192c90dd2957f18c",
+                "shasum": ""
+            },
+            "require": {
+                "php": "~5.6.0 || ~7.0.0 || ~7.1.0 || ~7.2.0 || ~7.3.0 || ~7.4.0 || ~8.0.0 || ~8.1.0 || ~8.2.0 || ~8.3.0"
+            },
+            "require-dev": {
+                "cerdic/css-tidy": "^1.7 || ^2.0",
+                "simpletest/simpletest": "dev-master"
+            },
+            "suggest": {
+                "cerdic/css-tidy": "If you want to use the filter 'Filter.ExtractStyleBlocks'.",
+                "ext-bcmath": "Used for unit conversion and imagecrash protection",
+                "ext-iconv": "Converts text to and from non-UTF-8 encodings",
+                "ext-tidy": "Used for pretty-printing HTML"
+            },
+            "type": "library",
+            "autoload": {
+                "files": [
+                    "library/HTMLPurifier.composer.php"
+                ],
+                "psr-0": {
+                    "HTMLPurifier": "library/"
+                },
+                "exclude-from-classmap": [
+                    "/library/HTMLPurifier/Language/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "LGPL-2.1-or-later"
+            ],
+            "authors": [
+                {
+                    "name": "Edward Z. Yang",
+                    "email": "admin@htmlpurifier.org",
+                    "homepage": "http://ezyang.com"
+                }
+            ],
+            "description": "Standards compliant HTML filter written in PHP",
+            "homepage": "http://htmlpurifier.org/",
+            "keywords": [
+                "html"
+            ],
+            "support": {
+                "issues": "https://github.com/ezyang/htmlpurifier/issues",
+                "source": "https://github.com/ezyang/htmlpurifier/tree/v4.17.0"
+            },
+            "time": "2023-11-17T15:01:25+00:00"
+        },
+        {
+            "name": "fruitcake/php-cors",
+            "version": "v1.3.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/fruitcake/php-cors.git",
+                "reference": "3d158f36e7875e2f040f37bc0573956240a5a38b"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/fruitcake/php-cors/zipball/3d158f36e7875e2f040f37bc0573956240a5a38b",
+                "reference": "3d158f36e7875e2f040f37bc0573956240a5a38b",
+                "shasum": ""
+            },
+            "require": {
+                "php": "^7.4|^8.0",
+                "symfony/http-foundation": "^4.4|^5.4|^6|^7"
+            },
+            "require-dev": {
+                "phpstan/phpstan": "^1.4",
+                "phpunit/phpunit": "^9",
+                "squizlabs/php_codesniffer": "^3.5"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.2-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Fruitcake\\Cors\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Fruitcake",
+                    "homepage": "https://fruitcake.nl"
+                },
+                {
+                    "name": "Barryvdh",
+                    "email": "barryvdh@gmail.com"
+                }
+            ],
+            "description": "Cross-origin resource sharing library for the Symfony HttpFoundation",
+            "homepage": "https://github.com/fruitcake/php-cors",
+            "keywords": [
+                "cors",
+                "laravel",
+                "symfony"
+            ],
+            "support": {
+                "issues": "https://github.com/fruitcake/php-cors/issues",
+                "source": "https://github.com/fruitcake/php-cors/tree/v1.3.0"
+            },
+            "funding": [
+                {
+                    "url": "https://fruitcake.nl",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/barryvdh",
+                    "type": "github"
+                }
+            ],
+            "time": "2023-10-12T05:21:21+00:00"
+        },
+        {
+            "name": "graham-campbell/result-type",
+            "version": "v1.1.2",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/GrahamCampbell/Result-Type.git",
+                "reference": "fbd48bce38f73f8a4ec8583362e732e4095e5862"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/GrahamCampbell/Result-Type/zipball/fbd48bce38f73f8a4ec8583362e732e4095e5862",
+                "reference": "fbd48bce38f73f8a4ec8583362e732e4095e5862",
+                "shasum": ""
+            },
+            "require": {
+                "php": "^7.2.5 || ^8.0",
+                "phpoption/phpoption": "^1.9.2"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^8.5.34 || ^9.6.13 || ^10.4.2"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "GrahamCampbell\\ResultType\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Graham Campbell",
+                    "email": "hello@gjcampbell.co.uk",
+                    "homepage": "https://github.com/GrahamCampbell"
+                }
+            ],
+            "description": "An Implementation Of The Result Type",
+            "keywords": [
+                "Graham Campbell",
+                "GrahamCampbell",
+                "Result Type",
+                "Result-Type",
+                "result"
+            ],
+            "support": {
+                "issues": "https://github.com/GrahamCampbell/Result-Type/issues",
+                "source": "https://github.com/GrahamCampbell/Result-Type/tree/v1.1.2"
+            },
+            "funding": [
+                {
+                    "url": "https://github.com/GrahamCampbell",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/graham-campbell/result-type",
+                    "type": "tidelift"
+                }
+            ],
+            "time": "2023-11-12T22:16:48+00:00"
+        },
+        {
+            "name": "guzzlehttp/guzzle",
+            "version": "7.8.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/guzzle/guzzle.git",
+                "reference": "41042bc7ab002487b876a0683fc8dce04ddce104"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/guzzle/guzzle/zipball/41042bc7ab002487b876a0683fc8dce04ddce104",
+                "reference": "41042bc7ab002487b876a0683fc8dce04ddce104",
+                "shasum": ""
+            },
+            "require": {
+                "ext-json": "*",
+                "guzzlehttp/promises": "^1.5.3 || ^2.0.1",
+                "guzzlehttp/psr7": "^1.9.1 || ^2.5.1",
+                "php": "^7.2.5 || ^8.0",
+                "psr/http-client": "^1.0",
+                "symfony/deprecation-contracts": "^2.2 || ^3.0"
+            },
+            "provide": {
+                "psr/http-client-implementation": "1.0"
+            },
+            "require-dev": {
+                "bamarni/composer-bin-plugin": "^1.8.2",
+                "ext-curl": "*",
+                "php-http/client-integration-tests": "dev-master#2c025848417c1135031fdf9c728ee53d0a7ceaee as 3.0.999",
+                "php-http/message-factory": "^1.1",
+                "phpunit/phpunit": "^8.5.36 || ^9.6.15",
+                "psr/log": "^1.1 || ^2.0 || ^3.0"
+            },
+            "suggest": {
+                "ext-curl": "Required for CURL handler support",
+                "ext-intl": "Required for Internationalized Domain Name (IDN) support",
+                "psr/log": "Required for using the Log middleware"
+            },
+            "type": "library",
+            "extra": {
+                "bamarni-bin": {
+                    "bin-links": true,
+                    "forward-command": false
+                }
+            },
+            "autoload": {
+                "files": [
+                    "src/functions_include.php"
+                ],
+                "psr-4": {
+                    "GuzzleHttp\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Graham Campbell",
+                    "email": "hello@gjcampbell.co.uk",
+                    "homepage": "https://github.com/GrahamCampbell"
+                },
+                {
+                    "name": "Michael Dowling",
+                    "email": "mtdowling@gmail.com",
+                    "homepage": "https://github.com/mtdowling"
+                },
+                {
+                    "name": "Jeremy Lindblom",
+                    "email": "jeremeamia@gmail.com",
+                    "homepage": "https://github.com/jeremeamia"
+                },
+                {
+                    "name": "George Mponos",
+                    "email": "gmponos@gmail.com",
+                    "homepage": "https://github.com/gmponos"
+                },
+                {
+                    "name": "Tobias Nyholm",
+                    "email": "tobias.nyholm@gmail.com",
+                    "homepage": "https://github.com/Nyholm"
+                },
+                {
+                    "name": "Márk Sági-Kazár",
+                    "email": "mark.sagikazar@gmail.com",
+                    "homepage": "https://github.com/sagikazarmark"
+                },
+                {
+                    "name": "Tobias Schultze",
+                    "email": "webmaster@tubo-world.de",
+                    "homepage": "https://github.com/Tobion"
+                }
+            ],
+            "description": "Guzzle is a PHP HTTP client library",
+            "keywords": [
+                "client",
+                "curl",
+                "framework",
+                "http",
+                "http client",
+                "psr-18",
+                "psr-7",
+                "rest",
+                "web service"
+            ],
+            "support": {
+                "issues": "https://github.com/guzzle/guzzle/issues",
+                "source": "https://github.com/guzzle/guzzle/tree/7.8.1"
+            },
+            "funding": [
+                {
+                    "url": "https://github.com/GrahamCampbell",
+                    "type": "github"
+                },
+                {
+                    "url": "https://github.com/Nyholm",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/guzzlehttp/guzzle",
+                    "type": "tidelift"
+                }
+            ],
+            "time": "2023-12-03T20:35:24+00:00"
+        },
+        {
+            "name": "guzzlehttp/promises",
+            "version": "2.0.2",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/guzzle/promises.git",
+                "reference": "bbff78d96034045e58e13dedd6ad91b5d1253223"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/guzzle/promises/zipball/bbff78d96034045e58e13dedd6ad91b5d1253223",
+                "reference": "bbff78d96034045e58e13dedd6ad91b5d1253223",
+                "shasum": ""
+            },
+            "require": {
+                "php": "^7.2.5 || ^8.0"
+            },
+            "require-dev": {
+                "bamarni/composer-bin-plugin": "^1.8.2",
+                "phpunit/phpunit": "^8.5.36 || ^9.6.15"
+            },
+            "type": "library",
+            "extra": {
+                "bamarni-bin": {
+                    "bin-links": true,
+                    "forward-command": false
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "GuzzleHttp\\Promise\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Graham Campbell",
+                    "email": "hello@gjcampbell.co.uk",
+                    "homepage": "https://github.com/GrahamCampbell"
+                },
+                {
+                    "name": "Michael Dowling",
+                    "email": "mtdowling@gmail.com",
+                    "homepage": "https://github.com/mtdowling"
+                },
+                {
+                    "name": "Tobias Nyholm",
+                    "email": "tobias.nyholm@gmail.com",
+                    "homepage": "https://github.com/Nyholm"
+                },
+                {
+                    "name": "Tobias Schultze",
+                    "email": "webmaster@tubo-world.de",
+                    "homepage": "https://github.com/Tobion"
+                }
+            ],
+            "description": "Guzzle promises library",
+            "keywords": [
+                "promise"
+            ],
+            "support": {
+                "issues": "https://github.com/guzzle/promises/issues",
+                "source": "https://github.com/guzzle/promises/tree/2.0.2"
+            },
+            "funding": [
+                {
+                    "url": "https://github.com/GrahamCampbell",
+                    "type": "github"
+                },
+                {
+                    "url": "https://github.com/Nyholm",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/guzzlehttp/promises",
+                    "type": "tidelift"
+                }
+            ],
+            "time": "2023-12-03T20:19:20+00:00"
+        },
+        {
+            "name": "guzzlehttp/psr7",
+            "version": "2.6.2",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/guzzle/psr7.git",
+                "reference": "45b30f99ac27b5ca93cb4831afe16285f57b8221"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/guzzle/psr7/zipball/45b30f99ac27b5ca93cb4831afe16285f57b8221",
+                "reference": "45b30f99ac27b5ca93cb4831afe16285f57b8221",
+                "shasum": ""
+            },
+            "require": {
+                "php": "^7.2.5 || ^8.0",
+                "psr/http-factory": "^1.0",
+                "psr/http-message": "^1.1 || ^2.0",
+                "ralouphie/getallheaders": "^3.0"
+            },
+            "provide": {
+                "psr/http-factory-implementation": "1.0",
+                "psr/http-message-implementation": "1.0"
+            },
+            "require-dev": {
+                "bamarni/composer-bin-plugin": "^1.8.2",
+                "http-interop/http-factory-tests": "^0.9",
+                "phpunit/phpunit": "^8.5.36 || ^9.6.15"
+            },
+            "suggest": {
+                "laminas/laminas-httphandlerrunner": "Emit PSR-7 responses"
+            },
+            "type": "library",
+            "extra": {
+                "bamarni-bin": {
+                    "bin-links": true,
+                    "forward-command": false
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "GuzzleHttp\\Psr7\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Graham Campbell",
+                    "email": "hello@gjcampbell.co.uk",
+                    "homepage": "https://github.com/GrahamCampbell"
+                },
+                {
+                    "name": "Michael Dowling",
+                    "email": "mtdowling@gmail.com",
+                    "homepage": "https://github.com/mtdowling"
+                },
+                {
+                    "name": "George Mponos",
+                    "email": "gmponos@gmail.com",
+                    "homepage": "https://github.com/gmponos"
+                },
+                {
+                    "name": "Tobias Nyholm",
+                    "email": "tobias.nyholm@gmail.com",
+                    "homepage": "https://github.com/Nyholm"
+                },
+                {
+                    "name": "Márk Sági-Kazár",
+                    "email": "mark.sagikazar@gmail.com",
+                    "homepage": "https://github.com/sagikazarmark"
+                },
+                {
+                    "name": "Tobias Schultze",
+                    "email": "webmaster@tubo-world.de",
+                    "homepage": "https://github.com/Tobion"
+                },
+                {
+                    "name": "Márk Sági-Kazár",
+                    "email": "mark.sagikazar@gmail.com",
+                    "homepage": "https://sagikazarmark.hu"
+                }
+            ],
+            "description": "PSR-7 message implementation that also provides common utility methods",
+            "keywords": [
+                "http",
+                "message",
+                "psr-7",
+                "request",
+                "response",
+                "stream",
+                "uri",
+                "url"
+            ],
+            "support": {
+                "issues": "https://github.com/guzzle/psr7/issues",
+                "source": "https://github.com/guzzle/psr7/tree/2.6.2"
+            },
+            "funding": [
+                {
+                    "url": "https://github.com/GrahamCampbell",
+                    "type": "github"
+                },
+                {
+                    "url": "https://github.com/Nyholm",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/guzzlehttp/psr7",
+                    "type": "tidelift"
+                }
+            ],
+            "time": "2023-12-03T20:05:35+00:00"
+        },
+        {
+            "name": "guzzlehttp/uri-template",
+            "version": "v1.0.3",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/guzzle/uri-template.git",
+                "reference": "ecea8feef63bd4fef1f037ecb288386999ecc11c"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/guzzle/uri-template/zipball/ecea8feef63bd4fef1f037ecb288386999ecc11c",
+                "reference": "ecea8feef63bd4fef1f037ecb288386999ecc11c",
+                "shasum": ""
+            },
+            "require": {
+                "php": "^7.2.5 || ^8.0",
+                "symfony/polyfill-php80": "^1.24"
+            },
+            "require-dev": {
+                "bamarni/composer-bin-plugin": "^1.8.2",
+                "phpunit/phpunit": "^8.5.36 || ^9.6.15",
+                "uri-template/tests": "1.0.0"
+            },
+            "type": "library",
+            "extra": {
+                "bamarni-bin": {
+                    "bin-links": true,
+                    "forward-command": false
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "GuzzleHttp\\UriTemplate\\": "src"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Graham Campbell",
+                    "email": "hello@gjcampbell.co.uk",
+                    "homepage": "https://github.com/GrahamCampbell"
+                },
+                {
+                    "name": "Michael Dowling",
+                    "email": "mtdowling@gmail.com",
+                    "homepage": "https://github.com/mtdowling"
+                },
+                {
+                    "name": "George Mponos",
+                    "email": "gmponos@gmail.com",
+                    "homepage": "https://github.com/gmponos"
+                },
+                {
+                    "name": "Tobias Nyholm",
+                    "email": "tobias.nyholm@gmail.com",
+                    "homepage": "https://github.com/Nyholm"
+                }
+            ],
+            "description": "A polyfill class for uri_template of PHP",
+            "keywords": [
+                "guzzlehttp",
+                "uri-template"
+            ],
+            "support": {
+                "issues": "https://github.com/guzzle/uri-template/issues",
+                "source": "https://github.com/guzzle/uri-template/tree/v1.0.3"
+            },
+            "funding": [
+                {
+                    "url": "https://github.com/GrahamCampbell",
+                    "type": "github"
+                },
+                {
+                    "url": "https://github.com/Nyholm",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/guzzlehttp/uri-template",
+                    "type": "tidelift"
+                }
+            ],
+            "time": "2023-12-03T19:50:20+00:00"
+        },
+        {
+            "name": "intervention/image",
+            "version": "2.7.2",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/Intervention/image.git",
+                "reference": "04be355f8d6734c826045d02a1079ad658322dad"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/Intervention/image/zipball/04be355f8d6734c826045d02a1079ad658322dad",
+                "reference": "04be355f8d6734c826045d02a1079ad658322dad",
+                "shasum": ""
+            },
+            "require": {
+                "ext-fileinfo": "*",
+                "guzzlehttp/psr7": "~1.1 || ^2.0",
+                "php": ">=5.4.0"
+            },
+            "require-dev": {
+                "mockery/mockery": "~0.9.2",
+                "phpunit/phpunit": "^4.8 || ^5.7 || ^7.5.15"
+            },
+            "suggest": {
+                "ext-gd": "to use GD library based image processing.",
+                "ext-imagick": "to use Imagick based image processing.",
+                "intervention/imagecache": "Caching extension for the Intervention Image library"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "2.4-dev"
+                },
+                "laravel": {
+                    "providers": [
+                        "Intervention\\Image\\ImageServiceProvider"
+                    ],
+                    "aliases": {
+                        "Image": "Intervention\\Image\\Facades\\Image"
+                    }
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Intervention\\Image\\": "src/Intervention/Image"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Oliver Vogel",
+                    "email": "oliver@intervention.io",
+                    "homepage": "https://intervention.io/"
+                }
+            ],
+            "description": "Image handling and manipulation library with support for Laravel integration",
+            "homepage": "http://image.intervention.io/",
+            "keywords": [
+                "gd",
+                "image",
+                "imagick",
+                "laravel",
+                "thumbnail",
+                "watermark"
+            ],
+            "support": {
+                "issues": "https://github.com/Intervention/image/issues",
+                "source": "https://github.com/Intervention/image/tree/2.7.2"
+            },
+            "funding": [
+                {
+                    "url": "https://paypal.me/interventionio",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/Intervention",
+                    "type": "github"
+                }
+            ],
+            "time": "2022-05-21T17:30:32+00:00"
+        },
+        {
+            "name": "josiasmontag/laravel-recaptchav3",
+            "version": "1.0.2",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/josiasmontag/laravel-recaptchav3.git",
+                "reference": "3ded05660dd9827eef065a44510f5efecc2e68da"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/josiasmontag/laravel-recaptchav3/zipball/3ded05660dd9827eef065a44510f5efecc2e68da",
+                "reference": "3ded05660dd9827eef065a44510f5efecc2e68da",
+                "shasum": ""
+            },
+            "require": {
+                "guzzlehttp/guzzle": "^6.2|^7.0",
+                "illuminate/container": "~5.7.0|~5.8.0|^6.0|^7.0|^8.0|^9.0|^10.0",
+                "illuminate/http": "~5.7.0|~5.8.0|^6.0|^7.0|^8.0|^9.0|^10.0",
+                "illuminate/support": "~5.7.0|~5.8.0|^6.0|^7.0|^8.0|^9.0|^10.0",
+                "php": ">=7.1.0"
+            },
+            "require-dev": {
+                "mockery/mockery": "^1.2",
+                "orchestra/testbench": "~3.7.0|~3.8.0|^4.0|^5.0|^6.0|^7.0|^8.0",
+                "phpunit/phpunit": "6.2|^7.0|^8.0|^9.5.10"
+            },
+            "type": "library",
+            "extra": {
+                "laravel": {
+                    "providers": [
+                        "Lunaweb\\RecaptchaV3\\Providers\\RecaptchaV3ServiceProvider"
+                    ],
+                    "aliases": {
+                        "RecaptchaV3": "Lunaweb\\RecaptchaV3\\Facades\\RecaptchaV3"
+                    }
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Lunaweb\\RecaptchaV3\\": "src"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Josias Montag",
+                    "email": "josias@montag.info"
+                }
+            ],
+            "description": "Recaptcha V3 for Laravel package",
+            "homepage": "https://github.com/josiasmontag/laravel-recaptchav3",
+            "keywords": [
+                "captcha",
+                "laravel",
+                "php",
+                "recaptcha"
+            ],
+            "support": {
+                "issues": "https://github.com/josiasmontag/laravel-recaptchav3/issues",
+                "source": "https://github.com/josiasmontag/laravel-recaptchav3/tree/1.0.2"
+            },
+            "time": "2023-02-02T14:22:25+00:00"
+        },
+        {
+            "name": "laracasts/flash",
+            "version": "3.2.2",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/laracasts/flash.git",
+                "reference": "6330bc3c027d3c03188b41c58133016f8226b8fb"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/laracasts/flash/zipball/6330bc3c027d3c03188b41c58133016f8226b8fb",
+                "reference": "6330bc3c027d3c03188b41c58133016f8226b8fb",
+                "shasum": ""
+            },
+            "require": {
+                "illuminate/support": "~5.0|^6.0|^7.0|^8.0|^9.0|^10.0",
+                "php": ">=5.4.0"
+            },
+            "require-dev": {
+                "mockery/mockery": "dev-master",
+                "phpunit/phpunit": "^6.1|^9.5.10"
+            },
+            "type": "library",
+            "extra": {
+                "laravel": {
+                    "providers": [
+                        "Laracasts\\Flash\\FlashServiceProvider"
+                    ],
+                    "aliases": {
+                        "Flash": "Laracasts\\Flash\\Flash"
+                    }
+                }
+            },
+            "autoload": {
+                "files": [
+                    "src/Laracasts/Flash/functions.php"
+                ],
+                "psr-0": {
+                    "Laracasts\\Flash": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Jeffrey Way",
+                    "email": "jeffrey@laracasts.com"
+                }
+            ],
+            "description": "Easy flash notifications",
+            "support": {
+                "source": "https://github.com/laracasts/flash/tree/3.2.2"
+            },
+            "time": "2023-01-30T20:31:40+00:00"
+        },
+        {
+            "name": "laravel/fortify",
+            "version": "v1.19.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/laravel/fortify.git",
+                "reference": "1dde858a520f679b4a2f453fa68f8a0e98751875"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/laravel/fortify/zipball/1dde858a520f679b4a2f453fa68f8a0e98751875",
+                "reference": "1dde858a520f679b4a2f453fa68f8a0e98751875",
+                "shasum": ""
+            },
+            "require": {
+                "bacon/bacon-qr-code": "^2.0",
+                "ext-json": "*",
+                "illuminate/support": "^8.82|^9.0|^10.0",
+                "php": "^7.3|^8.0",
+                "pragmarx/google2fa": "^7.0|^8.0"
+            },
+            "require-dev": {
+                "mockery/mockery": "^1.0",
+                "orchestra/testbench": "^6.34|^7.31|^8.11",
+                "phpstan/phpstan": "^1.10",
+                "phpunit/phpunit": "^9.3"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.x-dev"
+                },
+                "laravel": {
+                    "providers": [
+                        "Laravel\\Fortify\\FortifyServiceProvider"
+                    ]
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Laravel\\Fortify\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Taylor Otwell",
+                    "email": "taylor@laravel.com"
+                }
+            ],
+            "description": "Backend controllers and scaffolding for Laravel authentication.",
+            "keywords": [
+                "auth",
+                "laravel"
+            ],
+            "support": {
+                "issues": "https://github.com/laravel/fortify/issues",
+                "source": "https://github.com/laravel/fortify"
+            },
+            "time": "2023-12-11T16:16:45+00:00"
+        },
+        {
+            "name": "laravel/framework",
+            "version": "v10.38.2",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/laravel/framework.git",
+                "reference": "43da808391da3540d44a8dfeb4e46da4ad8f5723"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/laravel/framework/zipball/43da808391da3540d44a8dfeb4e46da4ad8f5723",
+                "reference": "43da808391da3540d44a8dfeb4e46da4ad8f5723",
+                "shasum": ""
+            },
+            "require": {
+                "brick/math": "^0.9.3|^0.10.2|^0.11",
+                "composer-runtime-api": "^2.2",
+                "doctrine/inflector": "^2.0.5",
+                "dragonmantank/cron-expression": "^3.3.2",
+                "egulias/email-validator": "^3.2.1|^4.0",
+                "ext-ctype": "*",
+                "ext-filter": "*",
+                "ext-hash": "*",
+                "ext-mbstring": "*",
+                "ext-openssl": "*",
+                "ext-session": "*",
+                "ext-tokenizer": "*",
+                "fruitcake/php-cors": "^1.2",
+                "guzzlehttp/uri-template": "^1.0",
+                "laravel/prompts": "^0.1.9",
+                "laravel/serializable-closure": "^1.3",
+                "league/commonmark": "^2.2.1",
+                "league/flysystem": "^3.8.0",
+                "monolog/monolog": "^3.0",
+                "nesbot/carbon": "^2.67",
+                "nunomaduro/termwind": "^1.13",
+                "php": "^8.1",
+                "psr/container": "^1.1.1|^2.0.1",
+                "psr/log": "^1.0|^2.0|^3.0",
+                "psr/simple-cache": "^1.0|^2.0|^3.0",
+                "ramsey/uuid": "^4.7",
+                "symfony/console": "^6.2",
+                "symfony/error-handler": "^6.2",
+                "symfony/finder": "^6.2",
+                "symfony/http-foundation": "^6.4",
+                "symfony/http-kernel": "^6.2",
+                "symfony/mailer": "^6.2",
+                "symfony/mime": "^6.2",
+                "symfony/process": "^6.2",
+                "symfony/routing": "^6.2",
+                "symfony/uid": "^6.2",
+                "symfony/var-dumper": "^6.2",
+                "tijsverkoyen/css-to-inline-styles": "^2.2.5",
+                "vlucas/phpdotenv": "^5.4.1",
+                "voku/portable-ascii": "^2.0"
+            },
+            "conflict": {
+                "carbonphp/carbon-doctrine-types": ">=3.0",
+                "doctrine/dbal": ">=4.0",
+                "tightenco/collect": "<5.5.33"
+            },
+            "provide": {
+                "psr/container-implementation": "1.1|2.0",
+                "psr/simple-cache-implementation": "1.0|2.0|3.0"
+            },
+            "replace": {
+                "illuminate/auth": "self.version",
+                "illuminate/broadcasting": "self.version",
+                "illuminate/bus": "self.version",
+                "illuminate/cache": "self.version",
+                "illuminate/collections": "self.version",
+                "illuminate/conditionable": "self.version",
+                "illuminate/config": "self.version",
+                "illuminate/console": "self.version",
+                "illuminate/container": "self.version",
+                "illuminate/contracts": "self.version",
+                "illuminate/cookie": "self.version",
+                "illuminate/database": "self.version",
+                "illuminate/encryption": "self.version",
+                "illuminate/events": "self.version",
+                "illuminate/filesystem": "self.version",
+                "illuminate/hashing": "self.version",
+                "illuminate/http": "self.version",
+                "illuminate/log": "self.version",
+                "illuminate/macroable": "self.version",
+                "illuminate/mail": "self.version",
+                "illuminate/notifications": "self.version",
+                "illuminate/pagination": "self.version",
+                "illuminate/pipeline": "self.version",
+                "illuminate/process": "self.version",
+                "illuminate/queue": "self.version",
+                "illuminate/redis": "self.version",
+                "illuminate/routing": "self.version",
+                "illuminate/session": "self.version",
+                "illuminate/support": "self.version",
+                "illuminate/testing": "self.version",
+                "illuminate/translation": "self.version",
+                "illuminate/validation": "self.version",
+                "illuminate/view": "self.version"
+            },
+            "require-dev": {
+                "ably/ably-php": "^1.0",
+                "aws/aws-sdk-php": "^3.235.5",
+                "doctrine/dbal": "^3.5.1",
+                "ext-gmp": "*",
+                "fakerphp/faker": "^1.21",
+                "guzzlehttp/guzzle": "^7.5",
+                "league/flysystem-aws-s3-v3": "^3.0",
+                "league/flysystem-ftp": "^3.0",
+                "league/flysystem-path-prefixing": "^3.3",
+                "league/flysystem-read-only": "^3.3",
+                "league/flysystem-sftp-v3": "^3.0",
+                "mockery/mockery": "^1.5.1",
+                "nyholm/psr7": "^1.2",
+                "orchestra/testbench-core": "^8.15.1",
+                "pda/pheanstalk": "^4.0",
+                "phpstan/phpstan": "^1.4.7",
+                "phpunit/phpunit": "^10.0.7",
+                "predis/predis": "^2.0.2",
+                "symfony/cache": "^6.2",
+                "symfony/http-client": "^6.2.4",
+                "symfony/psr-http-message-bridge": "^2.0"
+            },
+            "suggest": {
+                "ably/ably-php": "Required to use the Ably broadcast driver (^1.0).",
+                "aws/aws-sdk-php": "Required to use the SQS queue driver, DynamoDb failed job storage, and SES mail driver (^3.235.5).",
+                "brianium/paratest": "Required to run tests in parallel (^6.0).",
+                "doctrine/dbal": "Required to rename columns and drop SQLite columns (^3.5.1).",
+                "ext-apcu": "Required to use the APC cache driver.",
+                "ext-fileinfo": "Required to use the Filesystem class.",
+                "ext-ftp": "Required to use the Flysystem FTP driver.",
+                "ext-gd": "Required to use Illuminate\\Http\\Testing\\FileFactory::image().",
+                "ext-memcached": "Required to use the memcache cache driver.",
+                "ext-pcntl": "Required to use all features of the queue worker and console signal trapping.",
+                "ext-pdo": "Required to use all database features.",
+                "ext-posix": "Required to use all features of the queue worker.",
+                "ext-redis": "Required to use the Redis cache and queue drivers (^4.0|^5.0).",
+                "fakerphp/faker": "Required to use the eloquent factory builder (^1.9.1).",
+                "filp/whoops": "Required for friendly error pages in development (^2.14.3).",
+                "guzzlehttp/guzzle": "Required to use the HTTP Client and the ping methods on schedules (^7.5).",
+                "laravel/tinker": "Required to use the tinker console command (^2.0).",
+                "league/flysystem-aws-s3-v3": "Required to use the Flysystem S3 driver (^3.0).",
+                "league/flysystem-ftp": "Required to use the Flysystem FTP driver (^3.0).",
+                "league/flysystem-path-prefixing": "Required to use the scoped driver (^3.3).",
+                "league/flysystem-read-only": "Required to use read-only disks (^3.3)",
+                "league/flysystem-sftp-v3": "Required to use the Flysystem SFTP driver (^3.0).",
+                "mockery/mockery": "Required to use mocking (^1.5.1).",
+                "nyholm/psr7": "Required to use PSR-7 bridging features (^1.2).",
+                "pda/pheanstalk": "Required to use the beanstalk queue driver (^4.0).",
+                "phpunit/phpunit": "Required to use assertions and run tests (^9.5.8|^10.0.7).",
+                "predis/predis": "Required to use the predis connector (^2.0.2).",
+                "psr/http-message": "Required to allow Storage::put to accept a StreamInterface (^1.0).",
+                "pusher/pusher-php-server": "Required to use the Pusher broadcast driver (^6.0|^7.0).",
+                "symfony/cache": "Required to PSR-6 cache bridge (^6.2).",
+                "symfony/filesystem": "Required to enable support for relative symbolic links (^6.2).",
+                "symfony/http-client": "Required to enable support for the Symfony API mail transports (^6.2).",
+                "symfony/mailgun-mailer": "Required to enable support for the Mailgun mail transport (^6.2).",
+                "symfony/postmark-mailer": "Required to enable support for the Postmark mail transport (^6.2).",
+                "symfony/psr-http-message-bridge": "Required to use PSR-7 bridging features (^2.0)."
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "10.x-dev"
+                }
+            },
+            "autoload": {
+                "files": [
+                    "src/Illuminate/Collections/helpers.php",
+                    "src/Illuminate/Events/functions.php",
+                    "src/Illuminate/Filesystem/functions.php",
+                    "src/Illuminate/Foundation/helpers.php",
+                    "src/Illuminate/Support/helpers.php"
+                ],
+                "psr-4": {
+                    "Illuminate\\": "src/Illuminate/",
+                    "Illuminate\\Support\\": [
+                        "src/Illuminate/Macroable/",
+                        "src/Illuminate/Collections/",
+                        "src/Illuminate/Conditionable/"
+                    ]
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Taylor Otwell",
+                    "email": "taylor@laravel.com"
+                }
+            ],
+            "description": "The Laravel Framework.",
+            "homepage": "https://laravel.com",
+            "keywords": [
+                "framework",
+                "laravel"
+            ],
+            "support": {
+                "issues": "https://github.com/laravel/framework/issues",
+                "source": "https://github.com/laravel/framework"
+            },
+            "time": "2023-12-22T14:39:10+00:00"
+        },
+        {
+            "name": "laravel/helpers",
+            "version": "v1.7.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/laravel/helpers.git",
+                "reference": "6caaa242a23bc39b4e3cf57304b5409260a7a346"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/laravel/helpers/zipball/6caaa242a23bc39b4e3cf57304b5409260a7a346",
+                "reference": "6caaa242a23bc39b4e3cf57304b5409260a7a346",
+                "shasum": ""
+            },
+            "require": {
+                "illuminate/support": "~5.8.0|^6.0|^7.0|^8.0|^9.0|^10.0|^11.0",
+                "php": "^7.2.0|^8.0"
+            },
+            "require-dev": {
+                "phpstan/phpstan": "^1.10",
+                "phpunit/phpunit": "^7.0|^8.0|^9.0|^10.0"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.x-dev"
+                }
+            },
+            "autoload": {
+                "files": [
+                    "src/helpers.php"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Taylor Otwell",
+                    "email": "taylor@laravel.com"
+                },
+                {
+                    "name": "Dries Vints",
+                    "email": "dries@laravel.com"
+                }
+            ],
+            "description": "Provides backwards compatibility for helpers in the latest Laravel release.",
+            "keywords": [
+                "helpers",
+                "laravel"
+            ],
+            "support": {
+                "source": "https://github.com/laravel/helpers/tree/v1.7.0"
+            },
+            "time": "2023-11-30T14:09:05+00:00"
+        },
+        {
+            "name": "laravel/prompts",
+            "version": "v0.1.13",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/laravel/prompts.git",
+                "reference": "e1379d8ead15edd6cc4369c22274345982edc95a"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/laravel/prompts/zipball/e1379d8ead15edd6cc4369c22274345982edc95a",
+                "reference": "e1379d8ead15edd6cc4369c22274345982edc95a",
+                "shasum": ""
+            },
+            "require": {
+                "ext-mbstring": "*",
+                "illuminate/collections": "^10.0|^11.0",
+                "php": "^8.1",
+                "symfony/console": "^6.2|^7.0"
+            },
+            "conflict": {
+                "illuminate/console": ">=10.17.0 <10.25.0",
+                "laravel/framework": ">=10.17.0 <10.25.0"
+            },
+            "require-dev": {
+                "mockery/mockery": "^1.5",
+                "pestphp/pest": "^2.3",
+                "phpstan/phpstan": "^1.10",
+                "phpstan/phpstan-mockery": "^1.1"
+            },
+            "suggest": {
+                "ext-pcntl": "Required for the spinner to be animated."
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-main": "0.1.x-dev"
+                }
+            },
+            "autoload": {
+                "files": [
+                    "src/helpers.php"
+                ],
+                "psr-4": {
+                    "Laravel\\Prompts\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "support": {
+                "issues": "https://github.com/laravel/prompts/issues",
+                "source": "https://github.com/laravel/prompts/tree/v0.1.13"
+            },
+            "time": "2023-10-27T13:53:59+00:00"
+        },
+        {
+            "name": "laravel/serializable-closure",
+            "version": "v1.3.3",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/laravel/serializable-closure.git",
+                "reference": "3dbf8a8e914634c48d389c1234552666b3d43754"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/laravel/serializable-closure/zipball/3dbf8a8e914634c48d389c1234552666b3d43754",
+                "reference": "3dbf8a8e914634c48d389c1234552666b3d43754",
+                "shasum": ""
+            },
+            "require": {
+                "php": "^7.3|^8.0"
+            },
+            "require-dev": {
+                "nesbot/carbon": "^2.61",
+                "pestphp/pest": "^1.21.3",
+                "phpstan/phpstan": "^1.8.2",
+                "symfony/var-dumper": "^5.4.11"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.x-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Laravel\\SerializableClosure\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Taylor Otwell",
+                    "email": "taylor@laravel.com"
+                },
+                {
+                    "name": "Nuno Maduro",
+                    "email": "nuno@laravel.com"
+                }
+            ],
+            "description": "Laravel Serializable Closure provides an easy and secure way to serialize closures in PHP.",
+            "keywords": [
+                "closure",
+                "laravel",
+                "serializable"
+            ],
+            "support": {
+                "issues": "https://github.com/laravel/serializable-closure/issues",
+                "source": "https://github.com/laravel/serializable-closure"
+            },
+            "time": "2023-11-08T14:08:06+00:00"
+        },
+        {
+            "name": "laravel/socialite",
+            "version": "v5.11.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/laravel/socialite.git",
+                "reference": "4f6a8af6f3f7c18da03d19842dd0514315501c10"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/laravel/socialite/zipball/4f6a8af6f3f7c18da03d19842dd0514315501c10",
+                "reference": "4f6a8af6f3f7c18da03d19842dd0514315501c10",
+                "shasum": ""
+            },
+            "require": {
+                "ext-json": "*",
+                "guzzlehttp/guzzle": "^6.0|^7.0",
+                "illuminate/contracts": "^6.0|^7.0|^8.0|^9.0|^10.0|^11.0",
+                "illuminate/http": "^6.0|^7.0|^8.0|^9.0|^10.0|^11.0",
+                "illuminate/support": "^6.0|^7.0|^8.0|^9.0|^10.0|^11.0",
+                "league/oauth1-client": "^1.10.1",
+                "php": "^7.2|^8.0"
+            },
+            "require-dev": {
+                "mockery/mockery": "^1.0",
+                "orchestra/testbench": "^4.0|^5.0|^6.0|^7.0|^8.0|^9.0",
+                "phpstan/phpstan": "^1.10",
+                "phpunit/phpunit": "^8.0|^9.3|^10.4"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "5.x-dev"
+                },
+                "laravel": {
+                    "providers": [
+                        "Laravel\\Socialite\\SocialiteServiceProvider"
+                    ],
+                    "aliases": {
+                        "Socialite": "Laravel\\Socialite\\Facades\\Socialite"
+                    }
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Laravel\\Socialite\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Taylor Otwell",
+                    "email": "taylor@laravel.com"
+                }
+            ],
+            "description": "Laravel wrapper around OAuth 1 & OAuth 2 libraries.",
+            "homepage": "https://laravel.com",
+            "keywords": [
+                "laravel",
+                "oauth"
+            ],
+            "support": {
+                "issues": "https://github.com/laravel/socialite/issues",
+                "source": "https://github.com/laravel/socialite"
+            },
+            "time": "2023-12-02T18:22:36+00:00"
+        },
+        {
+            "name": "laravel/tinker",
+            "version": "v2.8.2",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/laravel/tinker.git",
+                "reference": "b936d415b252b499e8c3b1f795cd4fc20f57e1f3"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/laravel/tinker/zipball/b936d415b252b499e8c3b1f795cd4fc20f57e1f3",
+                "reference": "b936d415b252b499e8c3b1f795cd4fc20f57e1f3",
+                "shasum": ""
+            },
+            "require": {
+                "illuminate/console": "^6.0|^7.0|^8.0|^9.0|^10.0",
+                "illuminate/contracts": "^6.0|^7.0|^8.0|^9.0|^10.0",
+                "illuminate/support": "^6.0|^7.0|^8.0|^9.0|^10.0",
+                "php": "^7.2.5|^8.0",
+                "psy/psysh": "^0.10.4|^0.11.1",
+                "symfony/var-dumper": "^4.3.4|^5.0|^6.0"
+            },
+            "require-dev": {
+                "mockery/mockery": "~1.3.3|^1.4.2",
+                "phpstan/phpstan": "^1.10",
+                "phpunit/phpunit": "^8.5.8|^9.3.3"
+            },
+            "suggest": {
+                "illuminate/database": "The Illuminate Database package (^6.0|^7.0|^8.0|^9.0|^10.0)."
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "2.x-dev"
+                },
+                "laravel": {
+                    "providers": [
+                        "Laravel\\Tinker\\TinkerServiceProvider"
+                    ]
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Laravel\\Tinker\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Taylor Otwell",
+                    "email": "taylor@laravel.com"
+                }
+            ],
+            "description": "Powerful REPL for the Laravel framework.",
+            "keywords": [
+                "REPL",
+                "Tinker",
+                "laravel",
+                "psysh"
+            ],
+            "support": {
+                "issues": "https://github.com/laravel/tinker/issues",
+                "source": "https://github.com/laravel/tinker/tree/v2.8.2"
+            },
+            "time": "2023-08-15T14:27:00+00:00"
+        },
+        {
+            "name": "laravelcollective/html",
+            "version": "v6.4.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/LaravelCollective/html.git",
+                "reference": "64ddfdcaeeb8d332bd98bef442bef81e39c3910b"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/LaravelCollective/html/zipball/64ddfdcaeeb8d332bd98bef442bef81e39c3910b",
+                "reference": "64ddfdcaeeb8d332bd98bef442bef81e39c3910b",
+                "shasum": ""
+            },
+            "require": {
+                "illuminate/http": "^6.0|^7.0|^8.0|^9.0|^10.0",
+                "illuminate/routing": "^6.0|^7.0|^8.0|^9.0|^10.0",
+                "illuminate/session": "^6.0|^7.0|^8.0|^9.0|^10.0",
+                "illuminate/support": "^6.0|^7.0|^8.0|^9.0|^10.0",
+                "illuminate/view": "^6.0|^7.0|^8.0|^9.0|^10.0",
+                "php": ">=7.2.5"
+            },
+            "require-dev": {
+                "illuminate/database": "^6.0|^7.0|^8.0|^9.0|^10.0",
+                "mockery/mockery": "~1.0",
+                "phpunit/phpunit": "~8.5|^9.5.10"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "6.x-dev"
+                },
+                "laravel": {
+                    "providers": [
+                        "Collective\\Html\\HtmlServiceProvider"
+                    ],
+                    "aliases": {
+                        "Form": "Collective\\Html\\FormFacade",
+                        "Html": "Collective\\Html\\HtmlFacade"
+                    }
+                }
+            },
+            "autoload": {
+                "files": [
+                    "src/helpers.php"
+                ],
+                "psr-4": {
+                    "Collective\\Html\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Adam Engebretson",
+                    "email": "adam@laravelcollective.com"
+                },
+                {
+                    "name": "Taylor Otwell",
+                    "email": "taylorotwell@gmail.com"
+                }
+            ],
+            "description": "HTML and Form Builders for the Laravel Framework",
+            "homepage": "https://laravelcollective.com",
+            "support": {
+                "issues": "https://github.com/LaravelCollective/html/issues",
+                "source": "https://github.com/LaravelCollective/html"
+            },
+            "abandoned": "spatie/laravel-html",
+            "time": "2023-04-25T02:46:11+00:00"
+        },
+        {
+            "name": "league/commonmark",
+            "version": "2.4.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/thephpleague/commonmark.git",
+                "reference": "3669d6d5f7a47a93c08ddff335e6d945481a1dd5"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/thephpleague/commonmark/zipball/3669d6d5f7a47a93c08ddff335e6d945481a1dd5",
+                "reference": "3669d6d5f7a47a93c08ddff335e6d945481a1dd5",
+                "shasum": ""
+            },
+            "require": {
+                "ext-mbstring": "*",
+                "league/config": "^1.1.1",
+                "php": "^7.4 || ^8.0",
+                "psr/event-dispatcher": "^1.0",
+                "symfony/deprecation-contracts": "^2.1 || ^3.0",
+                "symfony/polyfill-php80": "^1.16"
+            },
+            "require-dev": {
+                "cebe/markdown": "^1.0",
+                "commonmark/cmark": "0.30.0",
+                "commonmark/commonmark.js": "0.30.0",
+                "composer/package-versions-deprecated": "^1.8",
+                "embed/embed": "^4.4",
+                "erusev/parsedown": "^1.0",
+                "ext-json": "*",
+                "github/gfm": "0.29.0",
+                "michelf/php-markdown": "^1.4 || ^2.0",
+                "nyholm/psr7": "^1.5",
+                "phpstan/phpstan": "^1.8.2",
+                "phpunit/phpunit": "^9.5.21",
+                "scrutinizer/ocular": "^1.8.1",
+                "symfony/finder": "^5.3 | ^6.0",
+                "symfony/yaml": "^2.3 | ^3.0 | ^4.0 | ^5.0 | ^6.0",
+                "unleashedtech/php-coding-standard": "^3.1.1",
+                "vimeo/psalm": "^4.24.0 || ^5.0.0"
+            },
+            "suggest": {
+                "symfony/yaml": "v2.3+ required if using the Front Matter extension"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-main": "2.5-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "League\\CommonMark\\": "src"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Colin O'Dell",
+                    "email": "colinodell@gmail.com",
+                    "homepage": "https://www.colinodell.com",
+                    "role": "Lead Developer"
+                }
+            ],
+            "description": "Highly-extensible PHP Markdown parser which fully supports the CommonMark spec and GitHub-Flavored Markdown (GFM)",
+            "homepage": "https://commonmark.thephpleague.com",
+            "keywords": [
+                "commonmark",
+                "flavored",
+                "gfm",
+                "github",
+                "github-flavored",
+                "markdown",
+                "md",
+                "parser"
+            ],
+            "support": {
+                "docs": "https://commonmark.thephpleague.com/",
+                "forum": "https://github.com/thephpleague/commonmark/discussions",
+                "issues": "https://github.com/thephpleague/commonmark/issues",
+                "rss": "https://github.com/thephpleague/commonmark/releases.atom",
+                "source": "https://github.com/thephpleague/commonmark"
+            },
+            "funding": [
+                {
+                    "url": "https://www.colinodell.com/sponsor",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://www.paypal.me/colinpodell/10.00",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/colinodell",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/league/commonmark",
+                    "type": "tidelift"
+                }
+            ],
+            "time": "2023-08-30T16:55:00+00:00"
+        },
+        {
+            "name": "league/config",
+            "version": "v1.2.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/thephpleague/config.git",
+                "reference": "754b3604fb2984c71f4af4a9cbe7b57f346ec1f3"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/thephpleague/config/zipball/754b3604fb2984c71f4af4a9cbe7b57f346ec1f3",
+                "reference": "754b3604fb2984c71f4af4a9cbe7b57f346ec1f3",
+                "shasum": ""
+            },
+            "require": {
+                "dflydev/dot-access-data": "^3.0.1",
+                "nette/schema": "^1.2",
+                "php": "^7.4 || ^8.0"
+            },
+            "require-dev": {
+                "phpstan/phpstan": "^1.8.2",
+                "phpunit/phpunit": "^9.5.5",
+                "scrutinizer/ocular": "^1.8.1",
+                "unleashedtech/php-coding-standard": "^3.1",
+                "vimeo/psalm": "^4.7.3"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-main": "1.2-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "League\\Config\\": "src"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Colin O'Dell",
+                    "email": "colinodell@gmail.com",
+                    "homepage": "https://www.colinodell.com",
+                    "role": "Lead Developer"
+                }
+            ],
+            "description": "Define configuration arrays with strict schemas and access values with dot notation",
+            "homepage": "https://config.thephpleague.com",
+            "keywords": [
+                "array",
+                "config",
+                "configuration",
+                "dot",
+                "dot-access",
+                "nested",
+                "schema"
+            ],
+            "support": {
+                "docs": "https://config.thephpleague.com/",
+                "issues": "https://github.com/thephpleague/config/issues",
+                "rss": "https://github.com/thephpleague/config/releases.atom",
+                "source": "https://github.com/thephpleague/config"
+            },
+            "funding": [
+                {
+                    "url": "https://www.colinodell.com/sponsor",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://www.paypal.me/colinpodell/10.00",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/colinodell",
+                    "type": "github"
+                }
+            ],
+            "time": "2022-12-11T20:36:23+00:00"
+        },
+        {
+            "name": "league/flysystem",
+            "version": "3.23.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/thephpleague/flysystem.git",
+                "reference": "d4ad81e2b67396e33dc9d7e54ec74ccf73151dcc"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/thephpleague/flysystem/zipball/d4ad81e2b67396e33dc9d7e54ec74ccf73151dcc",
+                "reference": "d4ad81e2b67396e33dc9d7e54ec74ccf73151dcc",
+                "shasum": ""
+            },
+            "require": {
+                "league/flysystem-local": "^3.0.0",
+                "league/mime-type-detection": "^1.0.0",
+                "php": "^8.0.2"
+            },
+            "conflict": {
+                "async-aws/core": "<1.19.0",
+                "async-aws/s3": "<1.14.0",
+                "aws/aws-sdk-php": "3.209.31 || 3.210.0",
+                "guzzlehttp/guzzle": "<7.0",
+                "guzzlehttp/ringphp": "<1.1.1",
+                "phpseclib/phpseclib": "3.0.15",
+                "symfony/http-client": "<5.2"
+            },
+            "require-dev": {
+                "async-aws/s3": "^1.5 || ^2.0",
+                "async-aws/simple-s3": "^1.1 || ^2.0",
+                "aws/aws-sdk-php": "^3.220.0",
+                "composer/semver": "^3.0",
+                "ext-fileinfo": "*",
+                "ext-ftp": "*",
+                "ext-zip": "*",
+                "friendsofphp/php-cs-fixer": "^3.5",
+                "google/cloud-storage": "^1.23",
+                "microsoft/azure-storage-blob": "^1.1",
+                "phpseclib/phpseclib": "^3.0.34",
+                "phpstan/phpstan": "^1.10",
+                "phpunit/phpunit": "^9.5.11|^10.0",
+                "sabre/dav": "^4.3.1"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "League\\Flysystem\\": "src"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Frank de Jonge",
+                    "email": "info@frankdejonge.nl"
+                }
+            ],
+            "description": "File storage abstraction for PHP",
+            "keywords": [
+                "WebDAV",
+                "aws",
+                "cloud",
+                "file",
+                "files",
+                "filesystem",
+                "filesystems",
+                "ftp",
+                "s3",
+                "sftp",
+                "storage"
+            ],
+            "support": {
+                "issues": "https://github.com/thephpleague/flysystem/issues",
+                "source": "https://github.com/thephpleague/flysystem/tree/3.23.0"
+            },
+            "funding": [
+                {
+                    "url": "https://ecologi.com/frankdejonge",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/frankdejonge",
+                    "type": "github"
+                }
+            ],
+            "time": "2023-12-04T10:16:17+00:00"
+        },
+        {
+            "name": "league/flysystem-local",
+            "version": "3.23.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/thephpleague/flysystem-local.git",
+                "reference": "5cf046ba5f059460e86a997c504dd781a39a109b"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/thephpleague/flysystem-local/zipball/5cf046ba5f059460e86a997c504dd781a39a109b",
+                "reference": "5cf046ba5f059460e86a997c504dd781a39a109b",
+                "shasum": ""
+            },
+            "require": {
+                "ext-fileinfo": "*",
+                "league/flysystem": "^3.0.0",
+                "league/mime-type-detection": "^1.0.0",
+                "php": "^8.0.2"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "League\\Flysystem\\Local\\": ""
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Frank de Jonge",
+                    "email": "info@frankdejonge.nl"
+                }
+            ],
+            "description": "Local filesystem adapter for Flysystem.",
+            "keywords": [
+                "Flysystem",
+                "file",
+                "files",
+                "filesystem",
+                "local"
+            ],
+            "support": {
+                "issues": "https://github.com/thephpleague/flysystem-local/issues",
+                "source": "https://github.com/thephpleague/flysystem-local/tree/3.23.0"
+            },
+            "funding": [
+                {
+                    "url": "https://ecologi.com/frankdejonge",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/frankdejonge",
+                    "type": "github"
+                }
+            ],
+            "time": "2023-12-04T10:14:46+00:00"
+        },
+        {
+            "name": "league/mime-type-detection",
+            "version": "1.14.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/thephpleague/mime-type-detection.git",
+                "reference": "b6a5854368533df0295c5761a0253656a2e52d9e"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/thephpleague/mime-type-detection/zipball/b6a5854368533df0295c5761a0253656a2e52d9e",
+                "reference": "b6a5854368533df0295c5761a0253656a2e52d9e",
+                "shasum": ""
+            },
+            "require": {
+                "ext-fileinfo": "*",
+                "php": "^7.4 || ^8.0"
+            },
+            "require-dev": {
+                "friendsofphp/php-cs-fixer": "^3.2",
+                "phpstan/phpstan": "^0.12.68",
+                "phpunit/phpunit": "^8.5.8 || ^9.3 || ^10.0"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "League\\MimeTypeDetection\\": "src"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Frank de Jonge",
+                    "email": "info@frankdejonge.nl"
+                }
+            ],
+            "description": "Mime-type detection for Flysystem",
+            "support": {
+                "issues": "https://github.com/thephpleague/mime-type-detection/issues",
+                "source": "https://github.com/thephpleague/mime-type-detection/tree/1.14.0"
+            },
+            "funding": [
+                {
+                    "url": "https://github.com/frankdejonge",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/league/flysystem",
+                    "type": "tidelift"
+                }
+            ],
+            "time": "2023-10-17T14:13:20+00:00"
+        },
+        {
+            "name": "league/oauth1-client",
+            "version": "v1.10.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/thephpleague/oauth1-client.git",
+                "reference": "d6365b901b5c287dd41f143033315e2f777e1167"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/thephpleague/oauth1-client/zipball/d6365b901b5c287dd41f143033315e2f777e1167",
+                "reference": "d6365b901b5c287dd41f143033315e2f777e1167",
+                "shasum": ""
+            },
+            "require": {
+                "ext-json": "*",
+                "ext-openssl": "*",
+                "guzzlehttp/guzzle": "^6.0|^7.0",
+                "guzzlehttp/psr7": "^1.7|^2.0",
+                "php": ">=7.1||>=8.0"
+            },
+            "require-dev": {
+                "ext-simplexml": "*",
+                "friendsofphp/php-cs-fixer": "^2.17",
+                "mockery/mockery": "^1.3.3",
+                "phpstan/phpstan": "^0.12.42",
+                "phpunit/phpunit": "^7.5||9.5"
+            },
+            "suggest": {
+                "ext-simplexml": "For decoding XML-based responses."
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.0-dev",
+                    "dev-develop": "2.0-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "League\\OAuth1\\Client\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Ben Corlett",
+                    "email": "bencorlett@me.com",
+                    "homepage": "http://www.webcomm.com.au",
+                    "role": "Developer"
+                }
+            ],
+            "description": "OAuth 1.0 Client Library",
+            "keywords": [
+                "Authentication",
+                "SSO",
+                "authorization",
+                "bitbucket",
+                "identity",
+                "idp",
+                "oauth",
+                "oauth1",
+                "single sign on",
+                "trello",
+                "tumblr",
+                "twitter"
+            ],
+            "support": {
+                "issues": "https://github.com/thephpleague/oauth1-client/issues",
+                "source": "https://github.com/thephpleague/oauth1-client/tree/v1.10.1"
+            },
+            "time": "2022-04-15T14:02:14+00:00"
+        },
+        {
+            "name": "monolog/monolog",
+            "version": "3.5.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/Seldaek/monolog.git",
+                "reference": "c915e2634718dbc8a4a15c61b0e62e7a44e14448"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/Seldaek/monolog/zipball/c915e2634718dbc8a4a15c61b0e62e7a44e14448",
+                "reference": "c915e2634718dbc8a4a15c61b0e62e7a44e14448",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=8.1",
+                "psr/log": "^2.0 || ^3.0"
+            },
+            "provide": {
+                "psr/log-implementation": "3.0.0"
+            },
+            "require-dev": {
+                "aws/aws-sdk-php": "^3.0",
+                "doctrine/couchdb": "~1.0@dev",
+                "elasticsearch/elasticsearch": "^7 || ^8",
+                "ext-json": "*",
+                "graylog2/gelf-php": "^1.4.2 || ^2.0",
+                "guzzlehttp/guzzle": "^7.4.5",
+                "guzzlehttp/psr7": "^2.2",
+                "mongodb/mongodb": "^1.8",
+                "php-amqplib/php-amqplib": "~2.4 || ^3",
+                "phpstan/phpstan": "^1.9",
+                "phpstan/phpstan-deprecation-rules": "^1.0",
+                "phpstan/phpstan-strict-rules": "^1.4",
+                "phpunit/phpunit": "^10.1",
+                "predis/predis": "^1.1 || ^2",
+                "ruflin/elastica": "^7",
+                "symfony/mailer": "^5.4 || ^6",
+                "symfony/mime": "^5.4 || ^6"
+            },
+            "suggest": {
+                "aws/aws-sdk-php": "Allow sending log messages to AWS services like DynamoDB",
+                "doctrine/couchdb": "Allow sending log messages to a CouchDB server",
+                "elasticsearch/elasticsearch": "Allow sending log messages to an Elasticsearch server via official client",
+                "ext-amqp": "Allow sending log messages to an AMQP server (1.0+ required)",
+                "ext-curl": "Required to send log messages using the IFTTTHandler, the LogglyHandler, the SendGridHandler, the SlackWebhookHandler or the TelegramBotHandler",
+                "ext-mbstring": "Allow to work properly with unicode symbols",
+                "ext-mongodb": "Allow sending log messages to a MongoDB server (via driver)",
+                "ext-openssl": "Required to send log messages using SSL",
+                "ext-sockets": "Allow sending log messages to a Syslog server (via UDP driver)",
+                "graylog2/gelf-php": "Allow sending log messages to a GrayLog2 server",
+                "mongodb/mongodb": "Allow sending log messages to a MongoDB server (via library)",
+                "php-amqplib/php-amqplib": "Allow sending log messages to an AMQP server using php-amqplib",
+                "rollbar/rollbar": "Allow sending log messages to Rollbar",
+                "ruflin/elastica": "Allow sending log messages to an Elastic Search server"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-main": "3.x-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Monolog\\": "src/Monolog"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Jordi Boggiano",
+                    "email": "j.boggiano@seld.be",
+                    "homepage": "https://seld.be"
+                }
+            ],
+            "description": "Sends your logs to files, sockets, inboxes, databases and various web services",
+            "homepage": "https://github.com/Seldaek/monolog",
+            "keywords": [
+                "log",
+                "logging",
+                "psr-3"
+            ],
+            "support": {
+                "issues": "https://github.com/Seldaek/monolog/issues",
+                "source": "https://github.com/Seldaek/monolog/tree/3.5.0"
+            },
+            "funding": [
+                {
+                    "url": "https://github.com/Seldaek",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/monolog/monolog",
+                    "type": "tidelift"
+                }
+            ],
+            "time": "2023-10-27T15:32:31+00:00"
+        },
+        {
+            "name": "nesbot/carbon",
+            "version": "2.72.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/briannesbitt/Carbon.git",
+                "reference": "2b3b3db0a2d0556a177392ff1a3bf5608fa09f78"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/briannesbitt/Carbon/zipball/2b3b3db0a2d0556a177392ff1a3bf5608fa09f78",
+                "reference": "2b3b3db0a2d0556a177392ff1a3bf5608fa09f78",
+                "shasum": ""
+            },
+            "require": {
+                "carbonphp/carbon-doctrine-types": "*",
+                "ext-json": "*",
+                "php": "^7.1.8 || ^8.0",
+                "psr/clock": "^1.0",
+                "symfony/polyfill-mbstring": "^1.0",
+                "symfony/polyfill-php80": "^1.16",
+                "symfony/translation": "^3.4 || ^4.0 || ^5.0 || ^6.0"
+            },
+            "provide": {
+                "psr/clock-implementation": "1.0"
+            },
+            "require-dev": {
+                "doctrine/dbal": "^2.0 || ^3.1.4 || ^4.0",
+                "doctrine/orm": "^2.7 || ^3.0",
+                "friendsofphp/php-cs-fixer": "^3.0",
+                "kylekatarnls/multi-tester": "^2.0",
+                "ondrejmirtes/better-reflection": "*",
+                "phpmd/phpmd": "^2.9",
+                "phpstan/extension-installer": "^1.0",
+                "phpstan/phpstan": "^0.12.99 || ^1.7.14",
+                "phpunit/php-file-iterator": "^2.0.5 || ^3.0.6",
+                "phpunit/phpunit": "^7.5.20 || ^8.5.26 || ^9.5.20",
+                "squizlabs/php_codesniffer": "^3.4"
+            },
+            "bin": [
+                "bin/carbon"
+            ],
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-3.x": "3.x-dev",
+                    "dev-master": "2.x-dev"
+                },
+                "laravel": {
+                    "providers": [
+                        "Carbon\\Laravel\\ServiceProvider"
+                    ]
+                },
+                "phpstan": {
+                    "includes": [
+                        "extension.neon"
+                    ]
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Carbon\\": "src/Carbon/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Brian Nesbitt",
+                    "email": "brian@nesbot.com",
+                    "homepage": "https://markido.com"
+                },
+                {
+                    "name": "kylekatarnls",
+                    "homepage": "https://github.com/kylekatarnls"
+                }
+            ],
+            "description": "An API extension for DateTime that supports 281 different languages.",
+            "homepage": "https://carbon.nesbot.com",
+            "keywords": [
+                "date",
+                "datetime",
+                "time"
+            ],
+            "support": {
+                "docs": "https://carbon.nesbot.com/docs",
+                "issues": "https://github.com/briannesbitt/Carbon/issues",
+                "source": "https://github.com/briannesbitt/Carbon"
+            },
+            "funding": [
+                {
+                    "url": "https://github.com/sponsors/kylekatarnls",
+                    "type": "github"
+                },
+                {
+                    "url": "https://opencollective.com/Carbon#sponsor",
+                    "type": "opencollective"
+                },
+                {
+                    "url": "https://tidelift.com/subscription/pkg/packagist-nesbot-carbon?utm_source=packagist-nesbot-carbon&utm_medium=referral&utm_campaign=readme",
+                    "type": "tidelift"
+                }
+            ],
+            "time": "2023-12-08T23:47:49+00:00"
+        },
+        {
+            "name": "nette/schema",
+            "version": "v1.2.5",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/nette/schema.git",
+                "reference": "0462f0166e823aad657c9224d0f849ecac1ba10a"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/nette/schema/zipball/0462f0166e823aad657c9224d0f849ecac1ba10a",
+                "reference": "0462f0166e823aad657c9224d0f849ecac1ba10a",
+                "shasum": ""
+            },
+            "require": {
+                "nette/utils": "^2.5.7 || ^3.1.5 ||  ^4.0",
+                "php": "7.1 - 8.3"
+            },
+            "require-dev": {
+                "nette/tester": "^2.3 || ^2.4",
+                "phpstan/phpstan-nette": "^1.0",
+                "tracy/tracy": "^2.7"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.2-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause",
+                "GPL-2.0-only",
+                "GPL-3.0-only"
+            ],
+            "authors": [
+                {
+                    "name": "David Grudl",
+                    "homepage": "https://davidgrudl.com"
+                },
+                {
+                    "name": "Nette Community",
+                    "homepage": "https://nette.org/contributors"
+                }
+            ],
+            "description": "📐 Nette Schema: validating data structures against a given Schema.",
+            "homepage": "https://nette.org",
+            "keywords": [
+                "config",
+                "nette"
+            ],
+            "support": {
+                "issues": "https://github.com/nette/schema/issues",
+                "source": "https://github.com/nette/schema/tree/v1.2.5"
+            },
+            "time": "2023-10-05T20:37:59+00:00"
+        },
+        {
+            "name": "nette/utils",
+            "version": "v4.0.3",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/nette/utils.git",
+                "reference": "a9d127dd6a203ce6d255b2e2db49759f7506e015"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/nette/utils/zipball/a9d127dd6a203ce6d255b2e2db49759f7506e015",
+                "reference": "a9d127dd6a203ce6d255b2e2db49759f7506e015",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=8.0 <8.4"
+            },
+            "conflict": {
+                "nette/finder": "<3",
+                "nette/schema": "<1.2.2"
+            },
+            "require-dev": {
+                "jetbrains/phpstorm-attributes": "dev-master",
+                "nette/tester": "^2.5",
+                "phpstan/phpstan": "^1.0",
+                "tracy/tracy": "^2.9"
+            },
+            "suggest": {
+                "ext-gd": "to use Image",
+                "ext-iconv": "to use Strings::webalize(), toAscii(), chr() and reverse()",
+                "ext-intl": "to use Strings::webalize(), toAscii(), normalize() and compare()",
+                "ext-json": "to use Nette\\Utils\\Json",
+                "ext-mbstring": "to use Strings::lower() etc...",
+                "ext-tokenizer": "to use Nette\\Utils\\Reflection::getUseStatements()"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "4.0-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause",
+                "GPL-2.0-only",
+                "GPL-3.0-only"
+            ],
+            "authors": [
+                {
+                    "name": "David Grudl",
+                    "homepage": "https://davidgrudl.com"
+                },
+                {
+                    "name": "Nette Community",
+                    "homepage": "https://nette.org/contributors"
+                }
+            ],
+            "description": "🛠  Nette Utils: lightweight utilities for string & array manipulation, image handling, safe JSON encoding/decoding, validation, slug or strong password generating etc.",
+            "homepage": "https://nette.org",
+            "keywords": [
+                "array",
+                "core",
+                "datetime",
+                "images",
+                "json",
+                "nette",
+                "paginator",
+                "password",
+                "slugify",
+                "string",
+                "unicode",
+                "utf-8",
+                "utility",
+                "validation"
+            ],
+            "support": {
+                "issues": "https://github.com/nette/utils/issues",
+                "source": "https://github.com/nette/utils/tree/v4.0.3"
+            },
+            "time": "2023-10-29T21:02:13+00:00"
+        },
+        {
+            "name": "nikic/php-parser",
+            "version": "v4.18.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/nikic/PHP-Parser.git",
+                "reference": "1bcbb2179f97633e98bbbc87044ee2611c7d7999"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/1bcbb2179f97633e98bbbc87044ee2611c7d7999",
+                "reference": "1bcbb2179f97633e98bbbc87044ee2611c7d7999",
+                "shasum": ""
+            },
+            "require": {
+                "ext-tokenizer": "*",
+                "php": ">=7.0"
+            },
+            "require-dev": {
+                "ircmaxell/php-yacc": "^0.0.7",
+                "phpunit/phpunit": "^6.5 || ^7.0 || ^8.0 || ^9.0"
+            },
+            "bin": [
+                "bin/php-parse"
+            ],
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "4.9-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "PhpParser\\": "lib/PhpParser"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Nikita Popov"
+                }
+            ],
+            "description": "A PHP parser written in PHP",
+            "keywords": [
+                "parser",
+                "php"
+            ],
+            "support": {
+                "issues": "https://github.com/nikic/PHP-Parser/issues",
+                "source": "https://github.com/nikic/PHP-Parser/tree/v4.18.0"
+            },
+            "time": "2023-12-10T21:03:43+00:00"
+        },
+        {
+            "name": "nunomaduro/termwind",
+            "version": "v1.15.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/nunomaduro/termwind.git",
+                "reference": "8ab0b32c8caa4a2e09700ea32925441385e4a5dc"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/nunomaduro/termwind/zipball/8ab0b32c8caa4a2e09700ea32925441385e4a5dc",
+                "reference": "8ab0b32c8caa4a2e09700ea32925441385e4a5dc",
+                "shasum": ""
+            },
+            "require": {
+                "ext-mbstring": "*",
+                "php": "^8.0",
+                "symfony/console": "^5.3.0|^6.0.0"
+            },
+            "require-dev": {
+                "ergebnis/phpstan-rules": "^1.0.",
+                "illuminate/console": "^8.0|^9.0",
+                "illuminate/support": "^8.0|^9.0",
+                "laravel/pint": "^1.0.0",
+                "pestphp/pest": "^1.21.0",
+                "pestphp/pest-plugin-mock": "^1.0",
+                "phpstan/phpstan": "^1.4.6",
+                "phpstan/phpstan-strict-rules": "^1.1.0",
+                "symfony/var-dumper": "^5.2.7|^6.0.0",
+                "thecodingmachine/phpstan-strict-rules": "^1.0.0"
+            },
+            "type": "library",
+            "extra": {
+                "laravel": {
+                    "providers": [
+                        "Termwind\\Laravel\\TermwindServiceProvider"
+                    ]
+                }
+            },
+            "autoload": {
+                "files": [
+                    "src/Functions.php"
+                ],
+                "psr-4": {
+                    "Termwind\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Nuno Maduro",
+                    "email": "enunomaduro@gmail.com"
+                }
+            ],
+            "description": "Its like Tailwind CSS, but for the console.",
+            "keywords": [
+                "cli",
+                "console",
+                "css",
+                "package",
+                "php",
+                "style"
+            ],
+            "support": {
+                "issues": "https://github.com/nunomaduro/termwind/issues",
+                "source": "https://github.com/nunomaduro/termwind/tree/v1.15.1"
+            },
+            "funding": [
+                {
+                    "url": "https://www.paypal.com/paypalme/enunomaduro",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/nunomaduro",
+                    "type": "github"
+                },
+                {
+                    "url": "https://github.com/xiCO2k",
+                    "type": "github"
+                }
+            ],
+            "time": "2023-02-08T01:06:31+00:00"
+        },
+        {
+            "name": "paragonie/constant_time_encoding",
+            "version": "v2.6.3",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/paragonie/constant_time_encoding.git",
+                "reference": "58c3f47f650c94ec05a151692652a868995d2938"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/paragonie/constant_time_encoding/zipball/58c3f47f650c94ec05a151692652a868995d2938",
+                "reference": "58c3f47f650c94ec05a151692652a868995d2938",
+                "shasum": ""
+            },
+            "require": {
+                "php": "^7|^8"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^6|^7|^8|^9",
+                "vimeo/psalm": "^1|^2|^3|^4"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "ParagonIE\\ConstantTime\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Paragon Initiative Enterprises",
+                    "email": "security@paragonie.com",
+                    "homepage": "https://paragonie.com",
+                    "role": "Maintainer"
+                },
+                {
+                    "name": "Steve 'Sc00bz' Thomas",
+                    "email": "steve@tobtu.com",
+                    "homepage": "https://www.tobtu.com",
+                    "role": "Original Developer"
+                }
+            ],
+            "description": "Constant-time Implementations of RFC 4648 Encoding (Base-64, Base-32, Base-16)",
+            "keywords": [
+                "base16",
+                "base32",
+                "base32_decode",
+                "base32_encode",
+                "base64",
+                "base64_decode",
+                "base64_encode",
+                "bin2hex",
+                "encoding",
+                "hex",
+                "hex2bin",
+                "rfc4648"
+            ],
+            "support": {
+                "email": "info@paragonie.com",
+                "issues": "https://github.com/paragonie/constant_time_encoding/issues",
+                "source": "https://github.com/paragonie/constant_time_encoding"
+            },
+            "time": "2022-06-14T06:56:20+00:00"
+        },
+        {
+            "name": "phpoption/phpoption",
+            "version": "1.9.2",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/schmittjoh/php-option.git",
+                "reference": "80735db690fe4fc5c76dfa7f9b770634285fa820"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/schmittjoh/php-option/zipball/80735db690fe4fc5c76dfa7f9b770634285fa820",
+                "reference": "80735db690fe4fc5c76dfa7f9b770634285fa820",
+                "shasum": ""
+            },
+            "require": {
+                "php": "^7.2.5 || ^8.0"
+            },
+            "require-dev": {
+                "bamarni/composer-bin-plugin": "^1.8.2",
+                "phpunit/phpunit": "^8.5.34 || ^9.6.13 || ^10.4.2"
+            },
+            "type": "library",
+            "extra": {
+                "bamarni-bin": {
+                    "bin-links": true,
+                    "forward-command": true
+                },
+                "branch-alias": {
+                    "dev-master": "1.9-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "PhpOption\\": "src/PhpOption/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "Apache-2.0"
+            ],
+            "authors": [
+                {
+                    "name": "Johannes M. Schmitt",
+                    "email": "schmittjoh@gmail.com",
+                    "homepage": "https://github.com/schmittjoh"
+                },
+                {
+                    "name": "Graham Campbell",
+                    "email": "hello@gjcampbell.co.uk",
+                    "homepage": "https://github.com/GrahamCampbell"
+                }
+            ],
+            "description": "Option Type for PHP",
+            "keywords": [
+                "language",
+                "option",
+                "php",
+                "type"
+            ],
+            "support": {
+                "issues": "https://github.com/schmittjoh/php-option/issues",
+                "source": "https://github.com/schmittjoh/php-option/tree/1.9.2"
+            },
+            "funding": [
+                {
+                    "url": "https://github.com/GrahamCampbell",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/phpoption/phpoption",
+                    "type": "tidelift"
+                }
+            ],
+            "time": "2023-11-12T21:59:55+00:00"
+        },
+        {
+            "name": "pragmarx/google2fa",
+            "version": "v8.0.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/antonioribeiro/google2fa.git",
+                "reference": "80c3d801b31fe165f8fe99ea085e0a37834e1be3"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/antonioribeiro/google2fa/zipball/80c3d801b31fe165f8fe99ea085e0a37834e1be3",
+                "reference": "80c3d801b31fe165f8fe99ea085e0a37834e1be3",
+                "shasum": ""
+            },
+            "require": {
+                "paragonie/constant_time_encoding": "^1.0|^2.0",
+                "php": "^7.1|^8.0"
+            },
+            "require-dev": {
+                "phpstan/phpstan": "^0.12.18",
+                "phpunit/phpunit": "^7.5.15|^8.5|^9.0"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "PragmaRX\\Google2FA\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Antonio Carlos Ribeiro",
+                    "email": "acr@antoniocarlosribeiro.com",
+                    "role": "Creator & Designer"
+                }
+            ],
+            "description": "A One Time Password Authentication package, compatible with Google Authenticator.",
+            "keywords": [
+                "2fa",
+                "Authentication",
+                "Two Factor Authentication",
+                "google2fa"
+            ],
+            "support": {
+                "issues": "https://github.com/antonioribeiro/google2fa/issues",
+                "source": "https://github.com/antonioribeiro/google2fa/tree/v8.0.1"
+            },
+            "time": "2022-06-13T21:57:56+00:00"
+        },
+        {
+            "name": "psr/cache",
+            "version": "3.0.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/php-fig/cache.git",
+                "reference": "aa5030cfa5405eccfdcb1083ce040c2cb8d253bf"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/php-fig/cache/zipball/aa5030cfa5405eccfdcb1083ce040c2cb8d253bf",
+                "reference": "aa5030cfa5405eccfdcb1083ce040c2cb8d253bf",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=8.0.0"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.0.x-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Psr\\Cache\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "PHP-FIG",
+                    "homepage": "https://www.php-fig.org/"
+                }
+            ],
+            "description": "Common interface for caching libraries",
+            "keywords": [
+                "cache",
+                "psr",
+                "psr-6"
+            ],
+            "support": {
+                "source": "https://github.com/php-fig/cache/tree/3.0.0"
+            },
+            "time": "2021-02-03T23:26:27+00:00"
+        },
+        {
+            "name": "psr/clock",
+            "version": "1.0.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/php-fig/clock.git",
+                "reference": "e41a24703d4560fd0acb709162f73b8adfc3aa0d"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/php-fig/clock/zipball/e41a24703d4560fd0acb709162f73b8adfc3aa0d",
+                "reference": "e41a24703d4560fd0acb709162f73b8adfc3aa0d",
+                "shasum": ""
+            },
+            "require": {
+                "php": "^7.0 || ^8.0"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "Psr\\Clock\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "PHP-FIG",
+                    "homepage": "https://www.php-fig.org/"
+                }
+            ],
+            "description": "Common interface for reading the clock.",
+            "homepage": "https://github.com/php-fig/clock",
+            "keywords": [
+                "clock",
+                "now",
+                "psr",
+                "psr-20",
+                "time"
+            ],
+            "support": {
+                "issues": "https://github.com/php-fig/clock/issues",
+                "source": "https://github.com/php-fig/clock/tree/1.0.0"
+            },
+            "time": "2022-11-25T14:36:26+00:00"
+        },
+        {
+            "name": "psr/container",
+            "version": "2.0.2",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/php-fig/container.git",
+                "reference": "c71ecc56dfe541dbd90c5360474fbc405f8d5963"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/php-fig/container/zipball/c71ecc56dfe541dbd90c5360474fbc405f8d5963",
+                "reference": "c71ecc56dfe541dbd90c5360474fbc405f8d5963",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=7.4.0"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "2.0.x-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Psr\\Container\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "PHP-FIG",
+                    "homepage": "https://www.php-fig.org/"
+                }
+            ],
+            "description": "Common Container Interface (PHP FIG PSR-11)",
+            "homepage": "https://github.com/php-fig/container",
+            "keywords": [
+                "PSR-11",
+                "container",
+                "container-interface",
+                "container-interop",
+                "psr"
+            ],
+            "support": {
+                "issues": "https://github.com/php-fig/container/issues",
+                "source": "https://github.com/php-fig/container/tree/2.0.2"
+            },
+            "time": "2021-11-05T16:47:00+00:00"
+        },
+        {
+            "name": "psr/event-dispatcher",
+            "version": "1.0.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/php-fig/event-dispatcher.git",
+                "reference": "dbefd12671e8a14ec7f180cab83036ed26714bb0"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/php-fig/event-dispatcher/zipball/dbefd12671e8a14ec7f180cab83036ed26714bb0",
+                "reference": "dbefd12671e8a14ec7f180cab83036ed26714bb0",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=7.2.0"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.0.x-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Psr\\EventDispatcher\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "PHP-FIG",
+                    "homepage": "http://www.php-fig.org/"
+                }
+            ],
+            "description": "Standard interfaces for event handling.",
+            "keywords": [
+                "events",
+                "psr",
+                "psr-14"
+            ],
+            "support": {
+                "issues": "https://github.com/php-fig/event-dispatcher/issues",
+                "source": "https://github.com/php-fig/event-dispatcher/tree/1.0.0"
+            },
+            "time": "2019-01-08T18:20:26+00:00"
+        },
+        {
+            "name": "psr/http-client",
+            "version": "1.0.3",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/php-fig/http-client.git",
+                "reference": "bb5906edc1c324c9a05aa0873d40117941e5fa90"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/php-fig/http-client/zipball/bb5906edc1c324c9a05aa0873d40117941e5fa90",
+                "reference": "bb5906edc1c324c9a05aa0873d40117941e5fa90",
+                "shasum": ""
+            },
+            "require": {
+                "php": "^7.0 || ^8.0",
+                "psr/http-message": "^1.0 || ^2.0"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.0.x-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Psr\\Http\\Client\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "PHP-FIG",
+                    "homepage": "https://www.php-fig.org/"
+                }
+            ],
+            "description": "Common interface for HTTP clients",
+            "homepage": "https://github.com/php-fig/http-client",
+            "keywords": [
+                "http",
+                "http-client",
+                "psr",
+                "psr-18"
+            ],
+            "support": {
+                "source": "https://github.com/php-fig/http-client"
+            },
+            "time": "2023-09-23T14:17:50+00:00"
+        },
+        {
+            "name": "psr/http-factory",
+            "version": "1.0.2",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/php-fig/http-factory.git",
+                "reference": "e616d01114759c4c489f93b099585439f795fe35"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/php-fig/http-factory/zipball/e616d01114759c4c489f93b099585439f795fe35",
+                "reference": "e616d01114759c4c489f93b099585439f795fe35",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=7.0.0",
+                "psr/http-message": "^1.0 || ^2.0"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.0.x-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Psr\\Http\\Message\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "PHP-FIG",
+                    "homepage": "https://www.php-fig.org/"
+                }
+            ],
+            "description": "Common interfaces for PSR-7 HTTP message factories",
+            "keywords": [
+                "factory",
+                "http",
+                "message",
+                "psr",
+                "psr-17",
+                "psr-7",
+                "request",
+                "response"
+            ],
+            "support": {
+                "source": "https://github.com/php-fig/http-factory/tree/1.0.2"
+            },
+            "time": "2023-04-10T20:10:41+00:00"
+        },
+        {
+            "name": "psr/http-message",
+            "version": "2.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/php-fig/http-message.git",
+                "reference": "402d35bcb92c70c026d1a6a9883f06b2ead23d71"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/php-fig/http-message/zipball/402d35bcb92c70c026d1a6a9883f06b2ead23d71",
+                "reference": "402d35bcb92c70c026d1a6a9883f06b2ead23d71",
+                "shasum": ""
+            },
+            "require": {
+                "php": "^7.2 || ^8.0"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "2.0.x-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Psr\\Http\\Message\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "PHP-FIG",
+                    "homepage": "https://www.php-fig.org/"
+                }
+            ],
+            "description": "Common interface for HTTP messages",
+            "homepage": "https://github.com/php-fig/http-message",
+            "keywords": [
+                "http",
+                "http-message",
+                "psr",
+                "psr-7",
+                "request",
+                "response"
+            ],
+            "support": {
+                "source": "https://github.com/php-fig/http-message/tree/2.0"
+            },
+            "time": "2023-04-04T09:54:51+00:00"
+        },
+        {
+            "name": "psr/log",
+            "version": "3.0.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/php-fig/log.git",
+                "reference": "fe5ea303b0887d5caefd3d431c3e61ad47037001"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/php-fig/log/zipball/fe5ea303b0887d5caefd3d431c3e61ad47037001",
+                "reference": "fe5ea303b0887d5caefd3d431c3e61ad47037001",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=8.0.0"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "3.x-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Psr\\Log\\": "src"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "PHP-FIG",
+                    "homepage": "https://www.php-fig.org/"
+                }
+            ],
+            "description": "Common interface for logging libraries",
+            "homepage": "https://github.com/php-fig/log",
+            "keywords": [
+                "log",
+                "psr",
+                "psr-3"
+            ],
+            "support": {
+                "source": "https://github.com/php-fig/log/tree/3.0.0"
+            },
+            "time": "2021-07-14T16:46:02+00:00"
+        },
+        {
+            "name": "psr/simple-cache",
+            "version": "3.0.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/php-fig/simple-cache.git",
+                "reference": "764e0b3939f5ca87cb904f570ef9be2d78a07865"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/php-fig/simple-cache/zipball/764e0b3939f5ca87cb904f570ef9be2d78a07865",
+                "reference": "764e0b3939f5ca87cb904f570ef9be2d78a07865",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=8.0.0"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "3.0.x-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Psr\\SimpleCache\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "PHP-FIG",
+                    "homepage": "https://www.php-fig.org/"
+                }
+            ],
+            "description": "Common interfaces for simple caching",
+            "keywords": [
+                "cache",
+                "caching",
+                "psr",
+                "psr-16",
+                "simple-cache"
+            ],
+            "support": {
+                "source": "https://github.com/php-fig/simple-cache/tree/3.0.0"
+            },
+            "time": "2021-10-29T13:26:27+00:00"
+        },
+        {
+            "name": "psy/psysh",
+            "version": "v0.11.22",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/bobthecow/psysh.git",
+                "reference": "128fa1b608be651999ed9789c95e6e2a31b5802b"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/bobthecow/psysh/zipball/128fa1b608be651999ed9789c95e6e2a31b5802b",
+                "reference": "128fa1b608be651999ed9789c95e6e2a31b5802b",
+                "shasum": ""
+            },
+            "require": {
+                "ext-json": "*",
+                "ext-tokenizer": "*",
+                "nikic/php-parser": "^4.0 || ^3.1",
+                "php": "^8.0 || ^7.0.8",
+                "symfony/console": "^6.0 || ^5.0 || ^4.0 || ^3.4",
+                "symfony/var-dumper": "^6.0 || ^5.0 || ^4.0 || ^3.4"
+            },
+            "conflict": {
+                "symfony/console": "4.4.37 || 5.3.14 || 5.3.15 || 5.4.3 || 5.4.4 || 6.0.3 || 6.0.4"
+            },
+            "require-dev": {
+                "bamarni/composer-bin-plugin": "^1.2"
+            },
+            "suggest": {
+                "ext-pcntl": "Enabling the PCNTL extension makes PsySH a lot happier :)",
+                "ext-pdo-sqlite": "The doc command requires SQLite to work.",
+                "ext-posix": "If you have PCNTL, you'll want the POSIX extension as well.",
+                "ext-readline": "Enables support for arrow-key history navigation, and showing and manipulating command history."
+            },
+            "bin": [
+                "bin/psysh"
+            ],
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-0.11": "0.11.x-dev"
+                },
+                "bamarni-bin": {
+                    "bin-links": false,
+                    "forward-command": false
+                }
+            },
+            "autoload": {
+                "files": [
+                    "src/functions.php"
+                ],
+                "psr-4": {
+                    "Psy\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Justin Hileman",
+                    "email": "justin@justinhileman.info",
+                    "homepage": "http://justinhileman.com"
+                }
+            ],
+            "description": "An interactive shell for modern PHP.",
+            "homepage": "http://psysh.org",
+            "keywords": [
+                "REPL",
+                "console",
+                "interactive",
+                "shell"
+            ],
+            "support": {
+                "issues": "https://github.com/bobthecow/psysh/issues",
+                "source": "https://github.com/bobthecow/psysh/tree/v0.11.22"
+            },
+            "time": "2023-10-14T21:56:36+00:00"
+        },
+        {
+            "name": "ralouphie/getallheaders",
+            "version": "3.0.3",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/ralouphie/getallheaders.git",
+                "reference": "120b605dfeb996808c31b6477290a714d356e822"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/ralouphie/getallheaders/zipball/120b605dfeb996808c31b6477290a714d356e822",
+                "reference": "120b605dfeb996808c31b6477290a714d356e822",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.6"
+            },
+            "require-dev": {
+                "php-coveralls/php-coveralls": "^2.1",
+                "phpunit/phpunit": "^5 || ^6.5"
+            },
+            "type": "library",
+            "autoload": {
+                "files": [
+                    "src/getallheaders.php"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Ralph Khattar",
+                    "email": "ralph.khattar@gmail.com"
+                }
+            ],
+            "description": "A polyfill for getallheaders.",
+            "support": {
+                "issues": "https://github.com/ralouphie/getallheaders/issues",
+                "source": "https://github.com/ralouphie/getallheaders/tree/develop"
+            },
+            "time": "2019-03-08T08:55:37+00:00"
+        },
+        {
+            "name": "ramsey/collection",
+            "version": "2.0.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/ramsey/collection.git",
+                "reference": "a4b48764bfbb8f3a6a4d1aeb1a35bb5e9ecac4a5"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/ramsey/collection/zipball/a4b48764bfbb8f3a6a4d1aeb1a35bb5e9ecac4a5",
+                "reference": "a4b48764bfbb8f3a6a4d1aeb1a35bb5e9ecac4a5",
+                "shasum": ""
+            },
+            "require": {
+                "php": "^8.1"
+            },
+            "require-dev": {
+                "captainhook/plugin-composer": "^5.3",
+                "ergebnis/composer-normalize": "^2.28.3",
+                "fakerphp/faker": "^1.21",
+                "hamcrest/hamcrest-php": "^2.0",
+                "jangregor/phpstan-prophecy": "^1.0",
+                "mockery/mockery": "^1.5",
+                "php-parallel-lint/php-console-highlighter": "^1.0",
+                "php-parallel-lint/php-parallel-lint": "^1.3",
+                "phpcsstandards/phpcsutils": "^1.0.0-rc1",
+                "phpspec/prophecy-phpunit": "^2.0",
+                "phpstan/extension-installer": "^1.2",
+                "phpstan/phpstan": "^1.9",
+                "phpstan/phpstan-mockery": "^1.1",
+                "phpstan/phpstan-phpunit": "^1.3",
+                "phpunit/phpunit": "^9.5",
+                "psalm/plugin-mockery": "^1.1",
+                "psalm/plugin-phpunit": "^0.18.4",
+                "ramsey/coding-standard": "^2.0.3",
+                "ramsey/conventional-commits": "^1.3",
+                "vimeo/psalm": "^5.4"
+            },
+            "type": "library",
+            "extra": {
+                "captainhook": {
+                    "force-install": true
+                },
+                "ramsey/conventional-commits": {
+                    "configFile": "conventional-commits.json"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Ramsey\\Collection\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Ben Ramsey",
+                    "email": "ben@benramsey.com",
+                    "homepage": "https://benramsey.com"
+                }
+            ],
+            "description": "A PHP library for representing and manipulating collections.",
+            "keywords": [
+                "array",
+                "collection",
+                "hash",
+                "map",
+                "queue",
+                "set"
+            ],
+            "support": {
+                "issues": "https://github.com/ramsey/collection/issues",
+                "source": "https://github.com/ramsey/collection/tree/2.0.0"
+            },
+            "funding": [
+                {
+                    "url": "https://github.com/ramsey",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/ramsey/collection",
+                    "type": "tidelift"
+                }
+            ],
+            "time": "2022-12-31T21:50:55+00:00"
+        },
+        {
+            "name": "ramsey/uuid",
+            "version": "4.7.5",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/ramsey/uuid.git",
+                "reference": "5f0df49ae5ad6efb7afa69e6bfab4e5b1e080d8e"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/ramsey/uuid/zipball/5f0df49ae5ad6efb7afa69e6bfab4e5b1e080d8e",
+                "reference": "5f0df49ae5ad6efb7afa69e6bfab4e5b1e080d8e",
+                "shasum": ""
+            },
+            "require": {
+                "brick/math": "^0.8.8 || ^0.9 || ^0.10 || ^0.11",
+                "ext-json": "*",
+                "php": "^8.0",
+                "ramsey/collection": "^1.2 || ^2.0"
+            },
+            "replace": {
+                "rhumsaa/uuid": "self.version"
+            },
+            "require-dev": {
+                "captainhook/captainhook": "^5.10",
+                "captainhook/plugin-composer": "^5.3",
+                "dealerdirect/phpcodesniffer-composer-installer": "^0.7.0",
+                "doctrine/annotations": "^1.8",
+                "ergebnis/composer-normalize": "^2.15",
+                "mockery/mockery": "^1.3",
+                "paragonie/random-lib": "^2",
+                "php-mock/php-mock": "^2.2",
+                "php-mock/php-mock-mockery": "^1.3",
+                "php-parallel-lint/php-parallel-lint": "^1.1",
+                "phpbench/phpbench": "^1.0",
+                "phpstan/extension-installer": "^1.1",
+                "phpstan/phpstan": "^1.8",
+                "phpstan/phpstan-mockery": "^1.1",
+                "phpstan/phpstan-phpunit": "^1.1",
+                "phpunit/phpunit": "^8.5 || ^9",
+                "ramsey/composer-repl": "^1.4",
+                "slevomat/coding-standard": "^8.4",
+                "squizlabs/php_codesniffer": "^3.5",
+                "vimeo/psalm": "^4.9"
+            },
+            "suggest": {
+                "ext-bcmath": "Enables faster math with arbitrary-precision integers using BCMath.",
+                "ext-gmp": "Enables faster math with arbitrary-precision integers using GMP.",
+                "ext-uuid": "Enables the use of PeclUuidTimeGenerator and PeclUuidRandomGenerator.",
+                "paragonie/random-lib": "Provides RandomLib for use with the RandomLibAdapter",
+                "ramsey/uuid-doctrine": "Allows the use of Ramsey\\Uuid\\Uuid as Doctrine field type."
+            },
+            "type": "library",
+            "extra": {
+                "captainhook": {
+                    "force-install": true
+                }
+            },
+            "autoload": {
+                "files": [
+                    "src/functions.php"
+                ],
+                "psr-4": {
+                    "Ramsey\\Uuid\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "description": "A PHP library for generating and working with universally unique identifiers (UUIDs).",
+            "keywords": [
+                "guid",
+                "identifier",
+                "uuid"
+            ],
+            "support": {
+                "issues": "https://github.com/ramsey/uuid/issues",
+                "source": "https://github.com/ramsey/uuid/tree/4.7.5"
+            },
+            "funding": [
+                {
+                    "url": "https://github.com/ramsey",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/ramsey/uuid",
+                    "type": "tidelift"
+                }
+            ],
+            "time": "2023-11-08T05:53:05+00:00"
+        },
+        {
+            "name": "socialiteproviders/deviantart",
+            "version": "4.1.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/SocialiteProviders/deviantART.git",
+                "reference": "300137195799d29ce7709e96ec2365460f54787f"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/SocialiteProviders/deviantART/zipball/300137195799d29ce7709e96ec2365460f54787f",
+                "reference": "300137195799d29ce7709e96ec2365460f54787f",
+                "shasum": ""
+            },
+            "require": {
+                "ext-json": "*",
+                "php": "^7.2 || ^8.0",
+                "socialiteproviders/manager": "~4.0"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "SocialiteProviders\\Deviantart\\": ""
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Brian Faust",
+                    "email": "hello@brianfaust.de"
+                }
+            ],
+            "description": "deviantART OAuth2 Provider for Laravel Socialite",
+            "support": {
+                "source": "https://github.com/SocialiteProviders/deviantART/tree/4.1.0"
+            },
+            "time": "2020-12-01T23:10:59+00:00"
+        },
+        {
+            "name": "socialiteproviders/discord",
+            "version": "4.2.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/SocialiteProviders/Discord.git",
+                "reference": "c71c379acfdca5ba4aa65a3db5ae5222852a919c"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/SocialiteProviders/Discord/zipball/c71c379acfdca5ba4aa65a3db5ae5222852a919c",
+                "reference": "c71c379acfdca5ba4aa65a3db5ae5222852a919c",
+                "shasum": ""
+            },
+            "require": {
+                "ext-json": "*",
+                "php": "^7.4 || ^8.0",
+                "socialiteproviders/manager": "~4.0"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "SocialiteProviders\\Discord\\": ""
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Christopher Eklund",
+                    "email": "eklundchristopher@gmail.com"
+                }
+            ],
+            "description": "Discord OAuth2 Provider for Laravel Socialite",
+            "keywords": [
+                "discord",
+                "laravel",
+                "oauth",
+                "provider",
+                "socialite"
+            ],
+            "support": {
+                "docs": "https://socialiteproviders.com/discord",
+                "issues": "https://github.com/socialiteproviders/providers/issues",
+                "source": "https://github.com/socialiteproviders/providers"
+            },
+            "time": "2023-07-24T23:28:47+00:00"
+        },
+        {
+            "name": "socialiteproviders/imgur",
+            "version": "4.1.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/SocialiteProviders/Imgur.git",
+                "reference": "5d8d8b25dd939712ae9599811acecbb5a724bf46"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/SocialiteProviders/Imgur/zipball/5d8d8b25dd939712ae9599811acecbb5a724bf46",
+                "reference": "5d8d8b25dd939712ae9599811acecbb5a724bf46",
+                "shasum": ""
+            },
+            "require": {
+                "ext-json": "*",
+                "php": "^7.2 || ^8.0",
+                "socialiteproviders/manager": "~4.0"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "SocialiteProviders\\Imgur\\": ""
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Brian Faust",
+                    "email": "hello@brianfaust.de"
+                }
+            ],
+            "description": "Imgur OAuth2 Provider for Laravel Socialite",
+            "support": {
+                "source": "https://github.com/SocialiteProviders/Imgur/tree/4.1.0"
+            },
+            "time": "2020-12-01T23:10:59+00:00"
+        },
+        {
+            "name": "socialiteproviders/instagram",
+            "version": "5.0.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/SocialiteProviders/Instagram.git",
+                "reference": "c3ef6b6b268de6abf36cc3253b5c6a87255a3564"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/SocialiteProviders/Instagram/zipball/c3ef6b6b268de6abf36cc3253b5c6a87255a3564",
+                "reference": "c3ef6b6b268de6abf36cc3253b5c6a87255a3564",
+                "shasum": ""
+            },
+            "require": {
+                "ext-json": "*",
+                "php": "^7.4 || ^8.0",
+                "socialiteproviders/manager": "~4.0"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "SocialiteProviders\\Instagram\\": ""
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Brian Faust",
+                    "email": "hello@brianfaust.de"
+                }
+            ],
+            "description": "Instagram OAuth2 Provider for Laravel Socialite",
+            "keywords": [
+                "instagram",
+                "laravel",
+                "oauth",
+                "provider",
+                "socialite"
+            ],
+            "support": {
+                "docs": "https://socialiteproviders.com/instagram",
+                "issues": "https://github.com/socialiteproviders/providers/issues",
+                "source": "https://github.com/socialiteproviders/providers"
+            },
+            "time": "2023-01-03T22:48:33+00:00"
+        },
+        {
+            "name": "socialiteproviders/manager",
+            "version": "v4.4.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/SocialiteProviders/Manager.git",
+                "reference": "df5e45b53d918ec3d689f014d98a6c838b98ed96"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/SocialiteProviders/Manager/zipball/df5e45b53d918ec3d689f014d98a6c838b98ed96",
+                "reference": "df5e45b53d918ec3d689f014d98a6c838b98ed96",
+                "shasum": ""
+            },
+            "require": {
+                "illuminate/support": "^6.0 || ^7.0 || ^8.0 || ^9.0 || ^10.0",
+                "laravel/socialite": "~5.0",
+                "php": "^8.0"
+            },
+            "require-dev": {
+                "mockery/mockery": "^1.2",
+                "phpunit/phpunit": "^6.0 || ^9.0"
+            },
+            "type": "library",
+            "extra": {
+                "laravel": {
+                    "providers": [
+                        "SocialiteProviders\\Manager\\ServiceProvider"
+                    ]
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "SocialiteProviders\\Manager\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Andy Wendt",
+                    "email": "andy@awendt.com"
+                },
+                {
+                    "name": "Anton Komarev",
+                    "email": "a.komarev@cybercog.su"
+                },
+                {
+                    "name": "Miguel Piedrafita",
+                    "email": "soy@miguelpiedrafita.com"
+                },
+                {
+                    "name": "atymic",
+                    "email": "atymicq@gmail.com",
+                    "homepage": "https://atymic.dev"
+                }
+            ],
+            "description": "Easily add new or override built-in providers in Laravel Socialite.",
+            "homepage": "https://socialiteproviders.com",
+            "keywords": [
+                "laravel",
+                "manager",
+                "oauth",
+                "providers",
+                "socialite"
+            ],
+            "support": {
+                "issues": "https://github.com/socialiteproviders/manager/issues",
+                "source": "https://github.com/socialiteproviders/manager"
+            },
+            "time": "2023-08-27T23:46:34+00:00"
+        },
+        {
+            "name": "socialiteproviders/tumblr",
+            "version": "4.1.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/SocialiteProviders/Tumblr.git",
+                "reference": "57220a25e3107281395555c1c13f943a53c9001b"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/SocialiteProviders/Tumblr/zipball/57220a25e3107281395555c1c13f943a53c9001b",
+                "reference": "57220a25e3107281395555c1c13f943a53c9001b",
+                "shasum": ""
+            },
+            "require": {
+                "ext-json": "*",
+                "php": "^7.2 || ^8.0",
+                "socialiteproviders/manager": "~4.0"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "SocialiteProviders\\Tumblr\\": ""
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Brian Faust",
+                    "email": "hello@brianfaust.de"
+                }
+            ],
+            "description": "Tumblr OAuth1 Provider for Laravel Socialite",
+            "support": {
+                "source": "https://github.com/SocialiteProviders/Tumblr/tree/4.1.0"
+            },
+            "time": "2020-12-01T23:10:59+00:00"
+        },
+        {
+            "name": "socialiteproviders/twitch",
+            "version": "5.3.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/SocialiteProviders/Twitch.git",
+                "reference": "7accf30ae7a3139b757b4ca8f34989c09a3dbee7"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/SocialiteProviders/Twitch/zipball/7accf30ae7a3139b757b4ca8f34989c09a3dbee7",
+                "reference": "7accf30ae7a3139b757b4ca8f34989c09a3dbee7",
+                "shasum": ""
+            },
+            "require": {
+                "ext-json": "*",
+                "php": "^7.2 || ^8.0",
+                "socialiteproviders/manager": "~4.0"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "SocialiteProviders\\Twitch\\": ""
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Brian Faust",
+                    "email": "hello@brianfaust.de"
+                }
+            ],
+            "description": "Twitch OAuth2 Provider for Laravel Socialite",
+            "support": {
+                "source": "https://github.com/SocialiteProviders/Twitch/tree/5.3.1"
+            },
+            "time": "2020-12-01T23:10:59+00:00"
+        },
+        {
+            "name": "spatie/laravel-feed",
+            "version": "4.3.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/spatie/laravel-feed.git",
+                "reference": "1cf06a43b4ee0fdeb919983a76de68467ccdb844"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/spatie/laravel-feed/zipball/1cf06a43b4ee0fdeb919983a76de68467ccdb844",
+                "reference": "1cf06a43b4ee0fdeb919983a76de68467ccdb844",
+                "shasum": ""
+            },
+            "require": {
+                "illuminate/contracts": "^10.0",
+                "illuminate/http": "^10.0",
+                "illuminate/support": "^10.0",
+                "php": "^8.0",
+                "spatie/laravel-package-tools": "^1.15"
+            },
+            "require-dev": {
+                "orchestra/testbench": "^8.0",
+                "pestphp/pest": "^2.0",
+                "spatie/pest-plugin-snapshots": "^2.0",
+                "spatie/test-time": "^1.2"
+            },
+            "type": "library",
+            "extra": {
+                "laravel": {
+                    "providers": [
+                        "Spatie\\Feed\\FeedServiceProvider"
+                    ]
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Spatie\\Feed\\": "src"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Jolita Grazyte",
+                    "email": "jolita@spatie.be",
+                    "homepage": "https://spatie.be",
+                    "role": "Developer"
+                },
+                {
+                    "name": "Freek Van der Herten",
+                    "email": "freek@spatie.be",
+                    "homepage": "https://spatie.be",
+                    "role": "Developer"
+                },
+                {
+                    "name": "Sebastian De Deyne",
+                    "email": "sebastian@spatie.be",
+                    "homepage": "https://spatie.be",
+                    "role": "Developer"
+                },
+                {
+                    "name": "Patrick Organ",
+                    "homepage": "https://github.com/patinthehat",
+                    "role": "Developer"
+                }
+            ],
+            "description": "Generate rss feeds",
+            "homepage": "https://github.com/spatie/laravel-feed",
+            "keywords": [
+                "laravel",
+                "laravel-feed",
+                "rss",
+                "spatie"
+            ],
+            "support": {
+                "source": "https://github.com/spatie/laravel-feed/tree/4.3.0"
+            },
+            "funding": [
+                {
+                    "url": "https://spatie.be/open-source/support-us",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/spatie",
+                    "type": "github"
+                }
+            ],
+            "time": "2023-08-07T14:46:53+00:00"
+        },
+        {
+            "name": "spatie/laravel-honeypot",
+            "version": "4.4.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/spatie/laravel-honeypot.git",
+                "reference": "85728128acb3ff53ffb23c86b9cc2c3d58355050"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/spatie/laravel-honeypot/zipball/85728128acb3ff53ffb23c86b9cc2c3d58355050",
+                "reference": "85728128acb3ff53ffb23c86b9cc2c3d58355050",
+                "shasum": ""
+            },
+            "require": {
+                "illuminate/contracts": "^8.0|^9.0|^10.0",
+                "illuminate/encryption": "^8.0|^9.0|^10.0",
+                "illuminate/http": "^8.0|^9.0|^10.0",
+                "illuminate/support": "^8.0|^9.0|^10.0",
+                "illuminate/validation": "^8.0|^9.0|^10.0",
+                "nesbot/carbon": "^2.0",
+                "php": "^8.0",
+                "spatie/laravel-package-tools": "^1.9",
+                "symfony/http-foundation": "^5.1.2|^6.0"
+            },
+            "require-dev": {
+                "livewire/livewire": "^2.10",
+                "orchestra/testbench": "^6.23|^7.0|^8.0",
+                "pestphp/pest-plugin-livewire": "^1.0",
+                "phpunit/phpunit": "^9.4",
+                "spatie/pest-plugin-snapshots": "^1.1",
+                "spatie/phpunit-snapshot-assertions": "^4.2",
+                "spatie/test-time": "^1.2.1"
+            },
+            "type": "library",
+            "extra": {
+                "laravel": {
+                    "providers": [
+                        "Spatie\\Honeypot\\HoneypotServiceProvider"
+                    ]
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Spatie\\Honeypot\\": "src"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Freek Van der Herten",
+                    "email": "freek@spatie.be",
+                    "homepage": "https://spatie.be",
+                    "role": "Developer"
+                }
+            ],
+            "description": "Preventing spam submitted through forms",
+            "homepage": "https://github.com/spatie/laravel-honeypot",
+            "keywords": [
+                "laravel-honeypot",
+                "spatie"
+            ],
+            "support": {
+                "source": "https://github.com/spatie/laravel-honeypot/tree/4.4.0"
+            },
+            "funding": [
+                {
+                    "url": "https://spatie.be/open-source/support-us",
+                    "type": "custom"
+                }
+            ],
+            "time": "2023-12-01T10:30:39+00:00"
+        },
+        {
+            "name": "spatie/laravel-package-tools",
+            "version": "1.16.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/spatie/laravel-package-tools.git",
+                "reference": "cc7c991555a37f9fa6b814aa03af73f88026a83d"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/spatie/laravel-package-tools/zipball/cc7c991555a37f9fa6b814aa03af73f88026a83d",
+                "reference": "cc7c991555a37f9fa6b814aa03af73f88026a83d",
+                "shasum": ""
+            },
+            "require": {
+                "illuminate/contracts": "^9.28|^10.0",
+                "php": "^8.0"
+            },
+            "require-dev": {
+                "mockery/mockery": "^1.5",
+                "orchestra/testbench": "^7.7|^8.0",
+                "pestphp/pest": "^1.22",
+                "phpunit/phpunit": "^9.5.24",
+                "spatie/pest-plugin-test-time": "^1.1"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "Spatie\\LaravelPackageTools\\": "src"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Freek Van der Herten",
+                    "email": "freek@spatie.be",
+                    "role": "Developer"
+                }
+            ],
+            "description": "Tools for creating Laravel packages",
+            "homepage": "https://github.com/spatie/laravel-package-tools",
+            "keywords": [
+                "laravel-package-tools",
+                "spatie"
+            ],
+            "support": {
+                "issues": "https://github.com/spatie/laravel-package-tools/issues",
+                "source": "https://github.com/spatie/laravel-package-tools/tree/1.16.1"
+            },
+            "funding": [
+                {
+                    "url": "https://github.com/spatie",
+                    "type": "github"
+                }
+            ],
+            "time": "2023-08-23T09:04:39+00:00"
+        },
+        {
+            "name": "symfony/console",
+            "version": "v6.4.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/console.git",
+                "reference": "a550a7c99daeedef3f9d23fb82e3531525ff11fd"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/console/zipball/a550a7c99daeedef3f9d23fb82e3531525ff11fd",
+                "reference": "a550a7c99daeedef3f9d23fb82e3531525ff11fd",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=8.1",
+                "symfony/deprecation-contracts": "^2.5|^3",
+                "symfony/polyfill-mbstring": "~1.0",
+                "symfony/service-contracts": "^2.5|^3",
+                "symfony/string": "^5.4|^6.0|^7.0"
+            },
+            "conflict": {
+                "symfony/dependency-injection": "<5.4",
+                "symfony/dotenv": "<5.4",
+                "symfony/event-dispatcher": "<5.4",
+                "symfony/lock": "<5.4",
+                "symfony/process": "<5.4"
+            },
+            "provide": {
+                "psr/log-implementation": "1.0|2.0|3.0"
+            },
+            "require-dev": {
+                "psr/log": "^1|^2|^3",
+                "symfony/config": "^5.4|^6.0|^7.0",
+                "symfony/dependency-injection": "^5.4|^6.0|^7.0",
+                "symfony/event-dispatcher": "^5.4|^6.0|^7.0",
+                "symfony/http-foundation": "^6.4|^7.0",
+                "symfony/http-kernel": "^6.4|^7.0",
+                "symfony/lock": "^5.4|^6.0|^7.0",
+                "symfony/messenger": "^5.4|^6.0|^7.0",
+                "symfony/process": "^5.4|^6.0|^7.0",
+                "symfony/stopwatch": "^5.4|^6.0|^7.0",
+                "symfony/var-dumper": "^5.4|^6.0|^7.0"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "Symfony\\Component\\Console\\": ""
+                },
+                "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": "Eases the creation of beautiful and testable command line interfaces",
+            "homepage": "https://symfony.com",
+            "keywords": [
+                "cli",
+                "command-line",
+                "console",
+                "terminal"
+            ],
+            "support": {
+                "source": "https://github.com/symfony/console/tree/v6.4.1"
+            },
+            "funding": [
+                {
+                    "url": "https://symfony.com/sponsor",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/fabpot",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+                    "type": "tidelift"
+                }
+            ],
+            "time": "2023-11-30T10:54:28+00:00"
+        },
+        {
+            "name": "symfony/css-selector",
+            "version": "v6.4.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/css-selector.git",
+                "reference": "d036c6c0d0b09e24a14a35f8292146a658f986e4"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/css-selector/zipball/d036c6c0d0b09e24a14a35f8292146a658f986e4",
+                "reference": "d036c6c0d0b09e24a14a35f8292146a658f986e4",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=8.1"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "Symfony\\Component\\CssSelector\\": ""
+                },
+                "exclude-from-classmap": [
+                    "/Tests/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Fabien Potencier",
+                    "email": "fabien@symfony.com"
+                },
+                {
+                    "name": "Jean-François Simon",
+                    "email": "jeanfrancois.simon@sensiolabs.com"
+                },
+                {
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
+                }
+            ],
+            "description": "Converts CSS selectors to XPath expressions",
+            "homepage": "https://symfony.com",
+            "support": {
+                "source": "https://github.com/symfony/css-selector/tree/v6.4.0"
+            },
+            "funding": [
+                {
+                    "url": "https://symfony.com/sponsor",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/fabpot",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+                    "type": "tidelift"
+                }
+            ],
+            "time": "2023-10-31T08:40:20+00:00"
+        },
+        {
+            "name": "symfony/deprecation-contracts",
+            "version": "v3.4.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/deprecation-contracts.git",
+                "reference": "7c3aff79d10325257a001fcf92d991f24fc967cf"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/deprecation-contracts/zipball/7c3aff79d10325257a001fcf92d991f24fc967cf",
+                "reference": "7c3aff79d10325257a001fcf92d991f24fc967cf",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=8.1"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-main": "3.4-dev"
+                },
+                "thanks": {
+                    "name": "symfony/contracts",
+                    "url": "https://github.com/symfony/contracts"
+                }
+            },
+            "autoload": {
+                "files": [
+                    "function.php"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Nicolas Grekas",
+                    "email": "p@tchwork.com"
+                },
+                {
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
+                }
+            ],
+            "description": "A generic function and convention to trigger deprecation notices",
+            "homepage": "https://symfony.com",
+            "support": {
+                "source": "https://github.com/symfony/deprecation-contracts/tree/v3.4.0"
+            },
+            "funding": [
+                {
+                    "url": "https://symfony.com/sponsor",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/fabpot",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+                    "type": "tidelift"
+                }
+            ],
+            "time": "2023-05-23T14:45:45+00:00"
+        },
+        {
+            "name": "symfony/error-handler",
+            "version": "v6.4.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/error-handler.git",
+                "reference": "c873490a1c97b3a0a4838afc36ff36c112d02788"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/error-handler/zipball/c873490a1c97b3a0a4838afc36ff36c112d02788",
+                "reference": "c873490a1c97b3a0a4838afc36ff36c112d02788",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=8.1",
+                "psr/log": "^1|^2|^3",
+                "symfony/var-dumper": "^5.4|^6.0|^7.0"
+            },
+            "conflict": {
+                "symfony/deprecation-contracts": "<2.5",
+                "symfony/http-kernel": "<6.4"
+            },
+            "require-dev": {
+                "symfony/deprecation-contracts": "^2.5|^3",
+                "symfony/http-kernel": "^6.4|^7.0",
+                "symfony/serializer": "^5.4|^6.0|^7.0"
+            },
+            "bin": [
+                "Resources/bin/patch-type-declarations"
+            ],
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "Symfony\\Component\\ErrorHandler\\": ""
+                },
+                "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": "Provides tools to manage errors and ease debugging PHP code",
+            "homepage": "https://symfony.com",
+            "support": {
+                "source": "https://github.com/symfony/error-handler/tree/v6.4.0"
+            },
+            "funding": [
+                {
+                    "url": "https://symfony.com/sponsor",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/fabpot",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+                    "type": "tidelift"
+                }
+            ],
+            "time": "2023-10-18T09:43:34+00:00"
+        },
+        {
+            "name": "symfony/event-dispatcher",
+            "version": "v6.4.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/event-dispatcher.git",
+                "reference": "d76d2632cfc2206eecb5ad2b26cd5934082941b6"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/d76d2632cfc2206eecb5ad2b26cd5934082941b6",
+                "reference": "d76d2632cfc2206eecb5ad2b26cd5934082941b6",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=8.1",
+                "symfony/event-dispatcher-contracts": "^2.5|^3"
+            },
+            "conflict": {
+                "symfony/dependency-injection": "<5.4",
+                "symfony/service-contracts": "<2.5"
+            },
+            "provide": {
+                "psr/event-dispatcher-implementation": "1.0",
+                "symfony/event-dispatcher-implementation": "2.0|3.0"
+            },
+            "require-dev": {
+                "psr/log": "^1|^2|^3",
+                "symfony/config": "^5.4|^6.0|^7.0",
+                "symfony/dependency-injection": "^5.4|^6.0|^7.0",
+                "symfony/error-handler": "^5.4|^6.0|^7.0",
+                "symfony/expression-language": "^5.4|^6.0|^7.0",
+                "symfony/http-foundation": "^5.4|^6.0|^7.0",
+                "symfony/service-contracts": "^2.5|^3",
+                "symfony/stopwatch": "^5.4|^6.0|^7.0"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "Symfony\\Component\\EventDispatcher\\": ""
+                },
+                "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": "Provides tools that allow your application components to communicate with each other by dispatching events and listening to them",
+            "homepage": "https://symfony.com",
+            "support": {
+                "source": "https://github.com/symfony/event-dispatcher/tree/v6.4.0"
+            },
+            "funding": [
+                {
+                    "url": "https://symfony.com/sponsor",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/fabpot",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+                    "type": "tidelift"
+                }
+            ],
+            "time": "2023-07-27T06:52:43+00:00"
+        },
+        {
+            "name": "symfony/event-dispatcher-contracts",
+            "version": "v3.4.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/event-dispatcher-contracts.git",
+                "reference": "a76aed96a42d2b521153fb382d418e30d18b59df"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/event-dispatcher-contracts/zipball/a76aed96a42d2b521153fb382d418e30d18b59df",
+                "reference": "a76aed96a42d2b521153fb382d418e30d18b59df",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=8.1",
+                "psr/event-dispatcher": "^1"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-main": "3.4-dev"
+                },
+                "thanks": {
+                    "name": "symfony/contracts",
+                    "url": "https://github.com/symfony/contracts"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Symfony\\Contracts\\EventDispatcher\\": ""
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Nicolas Grekas",
+                    "email": "p@tchwork.com"
+                },
+                {
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
+                }
+            ],
+            "description": "Generic abstractions related to dispatching event",
+            "homepage": "https://symfony.com",
+            "keywords": [
+                "abstractions",
+                "contracts",
+                "decoupling",
+                "interfaces",
+                "interoperability",
+                "standards"
+            ],
+            "support": {
+                "source": "https://github.com/symfony/event-dispatcher-contracts/tree/v3.4.0"
+            },
+            "funding": [
+                {
+                    "url": "https://symfony.com/sponsor",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/fabpot",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+                    "type": "tidelift"
+                }
+            ],
+            "time": "2023-05-23T14:45:45+00:00"
+        },
+        {
+            "name": "symfony/finder",
+            "version": "v6.4.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/finder.git",
+                "reference": "11d736e97f116ac375a81f96e662911a34cd50ce"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/finder/zipball/11d736e97f116ac375a81f96e662911a34cd50ce",
+                "reference": "11d736e97f116ac375a81f96e662911a34cd50ce",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=8.1"
+            },
+            "require-dev": {
+                "symfony/filesystem": "^6.0|^7.0"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "Symfony\\Component\\Finder\\": ""
+                },
+                "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": "Finds files and directories via an intuitive fluent interface",
+            "homepage": "https://symfony.com",
+            "support": {
+                "source": "https://github.com/symfony/finder/tree/v6.4.0"
+            },
+            "funding": [
+                {
+                    "url": "https://symfony.com/sponsor",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/fabpot",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+                    "type": "tidelift"
+                }
+            ],
+            "time": "2023-10-31T17:30:12+00:00"
+        },
+        {
+            "name": "symfony/http-foundation",
+            "version": "v6.4.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/http-foundation.git",
+                "reference": "44a6d39a9cc11e154547d882d5aac1e014440771"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/http-foundation/zipball/44a6d39a9cc11e154547d882d5aac1e014440771",
+                "reference": "44a6d39a9cc11e154547d882d5aac1e014440771",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=8.1",
+                "symfony/deprecation-contracts": "^2.5|^3",
+                "symfony/polyfill-mbstring": "~1.1",
+                "symfony/polyfill-php83": "^1.27"
+            },
+            "conflict": {
+                "symfony/cache": "<6.3"
+            },
+            "require-dev": {
+                "doctrine/dbal": "^2.13.1|^3|^4",
+                "predis/predis": "^1.1|^2.0",
+                "symfony/cache": "^6.3|^7.0",
+                "symfony/dependency-injection": "^5.4|^6.0|^7.0",
+                "symfony/expression-language": "^5.4|^6.0|^7.0",
+                "symfony/http-kernel": "^5.4.12|^6.0.12|^6.1.4|^7.0",
+                "symfony/mime": "^5.4|^6.0|^7.0",
+                "symfony/rate-limiter": "^5.4|^6.0|^7.0"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "Symfony\\Component\\HttpFoundation\\": ""
+                },
+                "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": "Defines an object-oriented layer for the HTTP specification",
+            "homepage": "https://symfony.com",
+            "support": {
+                "source": "https://github.com/symfony/http-foundation/tree/v6.4.0"
+            },
+            "funding": [
+                {
+                    "url": "https://symfony.com/sponsor",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/fabpot",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+                    "type": "tidelift"
+                }
+            ],
+            "time": "2023-11-20T16:41:16+00:00"
+        },
+        {
+            "name": "symfony/http-kernel",
+            "version": "v6.4.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/http-kernel.git",
+                "reference": "2953274c16a229b3933ef73a6898e18388e12e1b"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/http-kernel/zipball/2953274c16a229b3933ef73a6898e18388e12e1b",
+                "reference": "2953274c16a229b3933ef73a6898e18388e12e1b",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=8.1",
+                "psr/log": "^1|^2|^3",
+                "symfony/deprecation-contracts": "^2.5|^3",
+                "symfony/error-handler": "^6.4|^7.0",
+                "symfony/event-dispatcher": "^5.4|^6.0|^7.0",
+                "symfony/http-foundation": "^6.4|^7.0",
+                "symfony/polyfill-ctype": "^1.8"
+            },
+            "conflict": {
+                "symfony/browser-kit": "<5.4",
+                "symfony/cache": "<5.4",
+                "symfony/config": "<6.1",
+                "symfony/console": "<5.4",
+                "symfony/dependency-injection": "<6.4",
+                "symfony/doctrine-bridge": "<5.4",
+                "symfony/form": "<5.4",
+                "symfony/http-client": "<5.4",
+                "symfony/http-client-contracts": "<2.5",
+                "symfony/mailer": "<5.4",
+                "symfony/messenger": "<5.4",
+                "symfony/translation": "<5.4",
+                "symfony/translation-contracts": "<2.5",
+                "symfony/twig-bridge": "<5.4",
+                "symfony/validator": "<6.4",
+                "symfony/var-dumper": "<6.3",
+                "twig/twig": "<2.13"
+            },
+            "provide": {
+                "psr/log-implementation": "1.0|2.0|3.0"
+            },
+            "require-dev": {
+                "psr/cache": "^1.0|^2.0|^3.0",
+                "symfony/browser-kit": "^5.4|^6.0|^7.0",
+                "symfony/clock": "^6.2|^7.0",
+                "symfony/config": "^6.1|^7.0",
+                "symfony/console": "^5.4|^6.0|^7.0",
+                "symfony/css-selector": "^5.4|^6.0|^7.0",
+                "symfony/dependency-injection": "^6.4|^7.0",
+                "symfony/dom-crawler": "^5.4|^6.0|^7.0",
+                "symfony/expression-language": "^5.4|^6.0|^7.0",
+                "symfony/finder": "^5.4|^6.0|^7.0",
+                "symfony/http-client-contracts": "^2.5|^3",
+                "symfony/process": "^5.4|^6.0|^7.0",
+                "symfony/property-access": "^5.4.5|^6.0.5|^7.0",
+                "symfony/routing": "^5.4|^6.0|^7.0",
+                "symfony/serializer": "^6.3|^7.0",
+                "symfony/stopwatch": "^5.4|^6.0|^7.0",
+                "symfony/translation": "^5.4|^6.0|^7.0",
+                "symfony/translation-contracts": "^2.5|^3",
+                "symfony/uid": "^5.4|^6.0|^7.0",
+                "symfony/validator": "^6.4|^7.0",
+                "symfony/var-exporter": "^6.2|^7.0",
+                "twig/twig": "^2.13|^3.0.4"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "Symfony\\Component\\HttpKernel\\": ""
+                },
+                "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": "Provides a structured process for converting a Request into a Response",
+            "homepage": "https://symfony.com",
+            "support": {
+                "source": "https://github.com/symfony/http-kernel/tree/v6.4.1"
+            },
+            "funding": [
+                {
+                    "url": "https://symfony.com/sponsor",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/fabpot",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+                    "type": "tidelift"
+                }
+            ],
+            "time": "2023-12-01T17:02:02+00:00"
+        },
+        {
+            "name": "symfony/mailer",
+            "version": "v6.4.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/mailer.git",
+                "reference": "ca8dcf8892cdc5b4358ecf2528429bb5e706f7ba"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/mailer/zipball/ca8dcf8892cdc5b4358ecf2528429bb5e706f7ba",
+                "reference": "ca8dcf8892cdc5b4358ecf2528429bb5e706f7ba",
+                "shasum": ""
+            },
+            "require": {
+                "egulias/email-validator": "^2.1.10|^3|^4",
+                "php": ">=8.1",
+                "psr/event-dispatcher": "^1",
+                "psr/log": "^1|^2|^3",
+                "symfony/event-dispatcher": "^5.4|^6.0|^7.0",
+                "symfony/mime": "^6.2|^7.0",
+                "symfony/service-contracts": "^2.5|^3"
+            },
+            "conflict": {
+                "symfony/http-client-contracts": "<2.5",
+                "symfony/http-kernel": "<5.4",
+                "symfony/messenger": "<6.2",
+                "symfony/mime": "<6.2",
+                "symfony/twig-bridge": "<6.2.1"
+            },
+            "require-dev": {
+                "symfony/console": "^5.4|^6.0|^7.0",
+                "symfony/http-client": "^5.4|^6.0|^7.0",
+                "symfony/messenger": "^6.2|^7.0",
+                "symfony/twig-bridge": "^6.2|^7.0"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "Symfony\\Component\\Mailer\\": ""
+                },
+                "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": "Helps sending emails",
+            "homepage": "https://symfony.com",
+            "support": {
+                "source": "https://github.com/symfony/mailer/tree/v6.4.0"
+            },
+            "funding": [
+                {
+                    "url": "https://symfony.com/sponsor",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/fabpot",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+                    "type": "tidelift"
+                }
+            ],
+            "time": "2023-11-12T18:02:22+00:00"
+        },
+        {
+            "name": "symfony/mime",
+            "version": "v6.4.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/mime.git",
+                "reference": "ca4f58b2ef4baa8f6cecbeca2573f88cd577d205"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/mime/zipball/ca4f58b2ef4baa8f6cecbeca2573f88cd577d205",
+                "reference": "ca4f58b2ef4baa8f6cecbeca2573f88cd577d205",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=8.1",
+                "symfony/deprecation-contracts": "^2.5|^3",
+                "symfony/polyfill-intl-idn": "^1.10",
+                "symfony/polyfill-mbstring": "^1.0"
+            },
+            "conflict": {
+                "egulias/email-validator": "~3.0.0",
+                "phpdocumentor/reflection-docblock": "<3.2.2",
+                "phpdocumentor/type-resolver": "<1.4.0",
+                "symfony/mailer": "<5.4",
+                "symfony/serializer": "<6.3.2"
+            },
+            "require-dev": {
+                "egulias/email-validator": "^2.1.10|^3.1|^4",
+                "league/html-to-markdown": "^5.0",
+                "phpdocumentor/reflection-docblock": "^3.0|^4.0|^5.0",
+                "symfony/dependency-injection": "^5.4|^6.0|^7.0",
+                "symfony/property-access": "^5.4|^6.0|^7.0",
+                "symfony/property-info": "^5.4|^6.0|^7.0",
+                "symfony/serializer": "^6.3.2|^7.0"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "Symfony\\Component\\Mime\\": ""
+                },
+                "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": "Allows manipulating MIME messages",
+            "homepage": "https://symfony.com",
+            "keywords": [
+                "mime",
+                "mime-type"
+            ],
+            "support": {
+                "source": "https://github.com/symfony/mime/tree/v6.4.0"
+            },
+            "funding": [
+                {
+                    "url": "https://symfony.com/sponsor",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/fabpot",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+                    "type": "tidelift"
+                }
+            ],
+            "time": "2023-10-17T11:49:05+00:00"
+        },
+        {
+            "name": "symfony/polyfill-ctype",
+            "version": "v1.28.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/polyfill-ctype.git",
+                "reference": "ea208ce43cbb04af6867b4fdddb1bdbf84cc28cb"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/ea208ce43cbb04af6867b4fdddb1bdbf84cc28cb",
+                "reference": "ea208ce43cbb04af6867b4fdddb1bdbf84cc28cb",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=7.1"
+            },
+            "provide": {
+                "ext-ctype": "*"
+            },
+            "suggest": {
+                "ext-ctype": "For best performance"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-main": "1.28-dev"
+                },
+                "thanks": {
+                    "name": "symfony/polyfill",
+                    "url": "https://github.com/symfony/polyfill"
+                }
+            },
+            "autoload": {
+                "files": [
+                    "bootstrap.php"
+                ],
+                "psr-4": {
+                    "Symfony\\Polyfill\\Ctype\\": ""
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Gert de Pagter",
+                    "email": "BackEndTea@gmail.com"
+                },
+                {
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
+                }
+            ],
+            "description": "Symfony polyfill for ctype functions",
+            "homepage": "https://symfony.com",
+            "keywords": [
+                "compatibility",
+                "ctype",
+                "polyfill",
+                "portable"
+            ],
+            "support": {
+                "source": "https://github.com/symfony/polyfill-ctype/tree/v1.28.0"
+            },
+            "funding": [
+                {
+                    "url": "https://symfony.com/sponsor",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/fabpot",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+                    "type": "tidelift"
+                }
+            ],
+            "time": "2023-01-26T09:26:14+00:00"
+        },
+        {
+            "name": "symfony/polyfill-intl-grapheme",
+            "version": "v1.28.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/polyfill-intl-grapheme.git",
+                "reference": "875e90aeea2777b6f135677f618529449334a612"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/polyfill-intl-grapheme/zipball/875e90aeea2777b6f135677f618529449334a612",
+                "reference": "875e90aeea2777b6f135677f618529449334a612",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=7.1"
+            },
+            "suggest": {
+                "ext-intl": "For best performance"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-main": "1.28-dev"
+                },
+                "thanks": {
+                    "name": "symfony/polyfill",
+                    "url": "https://github.com/symfony/polyfill"
+                }
+            },
+            "autoload": {
+                "files": [
+                    "bootstrap.php"
+                ],
+                "psr-4": {
+                    "Symfony\\Polyfill\\Intl\\Grapheme\\": ""
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Nicolas Grekas",
+                    "email": "p@tchwork.com"
+                },
+                {
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
+                }
+            ],
+            "description": "Symfony polyfill for intl's grapheme_* functions",
+            "homepage": "https://symfony.com",
+            "keywords": [
+                "compatibility",
+                "grapheme",
+                "intl",
+                "polyfill",
+                "portable",
+                "shim"
+            ],
+            "support": {
+                "source": "https://github.com/symfony/polyfill-intl-grapheme/tree/v1.28.0"
+            },
+            "funding": [
+                {
+                    "url": "https://symfony.com/sponsor",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/fabpot",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+                    "type": "tidelift"
+                }
+            ],
+            "time": "2023-01-26T09:26:14+00:00"
+        },
+        {
+            "name": "symfony/polyfill-intl-idn",
+            "version": "v1.28.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/polyfill-intl-idn.git",
+                "reference": "ecaafce9f77234a6a449d29e49267ba10499116d"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/polyfill-intl-idn/zipball/ecaafce9f77234a6a449d29e49267ba10499116d",
+                "reference": "ecaafce9f77234a6a449d29e49267ba10499116d",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=7.1",
+                "symfony/polyfill-intl-normalizer": "^1.10",
+                "symfony/polyfill-php72": "^1.10"
+            },
+            "suggest": {
+                "ext-intl": "For best performance"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-main": "1.28-dev"
+                },
+                "thanks": {
+                    "name": "symfony/polyfill",
+                    "url": "https://github.com/symfony/polyfill"
+                }
+            },
+            "autoload": {
+                "files": [
+                    "bootstrap.php"
+                ],
+                "psr-4": {
+                    "Symfony\\Polyfill\\Intl\\Idn\\": ""
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Laurent Bassin",
+                    "email": "laurent@bassin.info"
+                },
+                {
+                    "name": "Trevor Rowbotham",
+                    "email": "trevor.rowbotham@pm.me"
+                },
+                {
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
+                }
+            ],
+            "description": "Symfony polyfill for intl's idn_to_ascii and idn_to_utf8 functions",
+            "homepage": "https://symfony.com",
+            "keywords": [
+                "compatibility",
+                "idn",
+                "intl",
+                "polyfill",
+                "portable",
+                "shim"
+            ],
+            "support": {
+                "source": "https://github.com/symfony/polyfill-intl-idn/tree/v1.28.0"
+            },
+            "funding": [
+                {
+                    "url": "https://symfony.com/sponsor",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/fabpot",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+                    "type": "tidelift"
+                }
+            ],
+            "time": "2023-01-26T09:30:37+00:00"
+        },
+        {
+            "name": "symfony/polyfill-intl-normalizer",
+            "version": "v1.28.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/polyfill-intl-normalizer.git",
+                "reference": "8c4ad05dd0120b6a53c1ca374dca2ad0a1c4ed92"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/polyfill-intl-normalizer/zipball/8c4ad05dd0120b6a53c1ca374dca2ad0a1c4ed92",
+                "reference": "8c4ad05dd0120b6a53c1ca374dca2ad0a1c4ed92",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=7.1"
+            },
+            "suggest": {
+                "ext-intl": "For best performance"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-main": "1.28-dev"
+                },
+                "thanks": {
+                    "name": "symfony/polyfill",
+                    "url": "https://github.com/symfony/polyfill"
+                }
+            },
+            "autoload": {
+                "files": [
+                    "bootstrap.php"
+                ],
+                "psr-4": {
+                    "Symfony\\Polyfill\\Intl\\Normalizer\\": ""
+                },
+                "classmap": [
+                    "Resources/stubs"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Nicolas Grekas",
+                    "email": "p@tchwork.com"
+                },
+                {
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
+                }
+            ],
+            "description": "Symfony polyfill for intl's Normalizer class and related functions",
+            "homepage": "https://symfony.com",
+            "keywords": [
+                "compatibility",
+                "intl",
+                "normalizer",
+                "polyfill",
+                "portable",
+                "shim"
+            ],
+            "support": {
+                "source": "https://github.com/symfony/polyfill-intl-normalizer/tree/v1.28.0"
+            },
+            "funding": [
+                {
+                    "url": "https://symfony.com/sponsor",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/fabpot",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+                    "type": "tidelift"
+                }
+            ],
+            "time": "2023-01-26T09:26:14+00:00"
+        },
+        {
+            "name": "symfony/polyfill-mbstring",
+            "version": "v1.28.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/polyfill-mbstring.git",
+                "reference": "42292d99c55abe617799667f454222c54c60e229"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/42292d99c55abe617799667f454222c54c60e229",
+                "reference": "42292d99c55abe617799667f454222c54c60e229",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=7.1"
+            },
+            "provide": {
+                "ext-mbstring": "*"
+            },
+            "suggest": {
+                "ext-mbstring": "For best performance"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-main": "1.28-dev"
+                },
+                "thanks": {
+                    "name": "symfony/polyfill",
+                    "url": "https://github.com/symfony/polyfill"
+                }
+            },
+            "autoload": {
+                "files": [
+                    "bootstrap.php"
+                ],
+                "psr-4": {
+                    "Symfony\\Polyfill\\Mbstring\\": ""
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Nicolas Grekas",
+                    "email": "p@tchwork.com"
+                },
+                {
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
+                }
+            ],
+            "description": "Symfony polyfill for the Mbstring extension",
+            "homepage": "https://symfony.com",
+            "keywords": [
+                "compatibility",
+                "mbstring",
+                "polyfill",
+                "portable",
+                "shim"
+            ],
+            "support": {
+                "source": "https://github.com/symfony/polyfill-mbstring/tree/v1.28.0"
+            },
+            "funding": [
+                {
+                    "url": "https://symfony.com/sponsor",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/fabpot",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+                    "type": "tidelift"
+                }
+            ],
+            "time": "2023-07-28T09:04:16+00:00"
+        },
+        {
+            "name": "symfony/polyfill-php72",
+            "version": "v1.28.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/polyfill-php72.git",
+                "reference": "70f4aebd92afca2f865444d30a4d2151c13c3179"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/polyfill-php72/zipball/70f4aebd92afca2f865444d30a4d2151c13c3179",
+                "reference": "70f4aebd92afca2f865444d30a4d2151c13c3179",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=7.1"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-main": "1.28-dev"
+                },
+                "thanks": {
+                    "name": "symfony/polyfill",
+                    "url": "https://github.com/symfony/polyfill"
+                }
+            },
+            "autoload": {
+                "files": [
+                    "bootstrap.php"
+                ],
+                "psr-4": {
+                    "Symfony\\Polyfill\\Php72\\": ""
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Nicolas Grekas",
+                    "email": "p@tchwork.com"
+                },
+                {
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
+                }
+            ],
+            "description": "Symfony polyfill backporting some PHP 7.2+ features to lower PHP versions",
+            "homepage": "https://symfony.com",
+            "keywords": [
+                "compatibility",
+                "polyfill",
+                "portable",
+                "shim"
+            ],
+            "support": {
+                "source": "https://github.com/symfony/polyfill-php72/tree/v1.28.0"
+            },
+            "funding": [
+                {
+                    "url": "https://symfony.com/sponsor",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/fabpot",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+                    "type": "tidelift"
+                }
+            ],
+            "time": "2023-01-26T09:26:14+00:00"
+        },
+        {
+            "name": "symfony/polyfill-php80",
+            "version": "v1.28.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/polyfill-php80.git",
+                "reference": "6caa57379c4aec19c0a12a38b59b26487dcfe4b5"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/polyfill-php80/zipball/6caa57379c4aec19c0a12a38b59b26487dcfe4b5",
+                "reference": "6caa57379c4aec19c0a12a38b59b26487dcfe4b5",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=7.1"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-main": "1.28-dev"
+                },
+                "thanks": {
+                    "name": "symfony/polyfill",
+                    "url": "https://github.com/symfony/polyfill"
+                }
+            },
+            "autoload": {
+                "files": [
+                    "bootstrap.php"
+                ],
+                "psr-4": {
+                    "Symfony\\Polyfill\\Php80\\": ""
+                },
+                "classmap": [
+                    "Resources/stubs"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Ion Bazan",
+                    "email": "ion.bazan@gmail.com"
+                },
+                {
+                    "name": "Nicolas Grekas",
+                    "email": "p@tchwork.com"
+                },
+                {
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
+                }
+            ],
+            "description": "Symfony polyfill backporting some PHP 8.0+ features to lower PHP versions",
+            "homepage": "https://symfony.com",
+            "keywords": [
+                "compatibility",
+                "polyfill",
+                "portable",
+                "shim"
+            ],
+            "support": {
+                "source": "https://github.com/symfony/polyfill-php80/tree/v1.28.0"
+            },
+            "funding": [
+                {
+                    "url": "https://symfony.com/sponsor",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/fabpot",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+                    "type": "tidelift"
+                }
+            ],
+            "time": "2023-01-26T09:26:14+00:00"
+        },
+        {
+            "name": "symfony/polyfill-php83",
+            "version": "v1.28.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/polyfill-php83.git",
+                "reference": "b0f46ebbeeeda3e9d2faebdfbf4b4eae9b59fa11"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/polyfill-php83/zipball/b0f46ebbeeeda3e9d2faebdfbf4b4eae9b59fa11",
+                "reference": "b0f46ebbeeeda3e9d2faebdfbf4b4eae9b59fa11",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=7.1",
+                "symfony/polyfill-php80": "^1.14"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-main": "1.28-dev"
+                },
+                "thanks": {
+                    "name": "symfony/polyfill",
+                    "url": "https://github.com/symfony/polyfill"
+                }
+            },
+            "autoload": {
+                "files": [
+                    "bootstrap.php"
+                ],
+                "psr-4": {
+                    "Symfony\\Polyfill\\Php83\\": ""
+                },
+                "classmap": [
+                    "Resources/stubs"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Nicolas Grekas",
+                    "email": "p@tchwork.com"
+                },
+                {
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
+                }
+            ],
+            "description": "Symfony polyfill backporting some PHP 8.3+ features to lower PHP versions",
+            "homepage": "https://symfony.com",
+            "keywords": [
+                "compatibility",
+                "polyfill",
+                "portable",
+                "shim"
+            ],
+            "support": {
+                "source": "https://github.com/symfony/polyfill-php83/tree/v1.28.0"
+            },
+            "funding": [
+                {
+                    "url": "https://symfony.com/sponsor",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/fabpot",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+                    "type": "tidelift"
+                }
+            ],
+            "time": "2023-08-16T06:22:46+00:00"
+        },
+        {
+            "name": "symfony/polyfill-uuid",
+            "version": "v1.28.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/polyfill-uuid.git",
+                "reference": "9c44518a5aff8da565c8a55dbe85d2769e6f630e"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/polyfill-uuid/zipball/9c44518a5aff8da565c8a55dbe85d2769e6f630e",
+                "reference": "9c44518a5aff8da565c8a55dbe85d2769e6f630e",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=7.1"
+            },
+            "provide": {
+                "ext-uuid": "*"
+            },
+            "suggest": {
+                "ext-uuid": "For best performance"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-main": "1.28-dev"
+                },
+                "thanks": {
+                    "name": "symfony/polyfill",
+                    "url": "https://github.com/symfony/polyfill"
+                }
+            },
+            "autoload": {
+                "files": [
+                    "bootstrap.php"
+                ],
+                "psr-4": {
+                    "Symfony\\Polyfill\\Uuid\\": ""
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Grégoire Pineau",
+                    "email": "lyrixx@lyrixx.info"
+                },
+                {
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
+                }
+            ],
+            "description": "Symfony polyfill for uuid functions",
+            "homepage": "https://symfony.com",
+            "keywords": [
+                "compatibility",
+                "polyfill",
+                "portable",
+                "uuid"
+            ],
+            "support": {
+                "source": "https://github.com/symfony/polyfill-uuid/tree/v1.28.0"
+            },
+            "funding": [
+                {
+                    "url": "https://symfony.com/sponsor",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/fabpot",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+                    "type": "tidelift"
+                }
+            ],
+            "time": "2023-01-26T09:26:14+00:00"
+        },
+        {
+            "name": "symfony/process",
+            "version": "v6.4.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/process.git",
+                "reference": "191703b1566d97a5425dc969e4350d32b8ef17aa"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/process/zipball/191703b1566d97a5425dc969e4350d32b8ef17aa",
+                "reference": "191703b1566d97a5425dc969e4350d32b8ef17aa",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=8.1"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "Symfony\\Component\\Process\\": ""
+                },
+                "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": "Executes commands in sub-processes",
+            "homepage": "https://symfony.com",
+            "support": {
+                "source": "https://github.com/symfony/process/tree/v6.4.0"
+            },
+            "funding": [
+                {
+                    "url": "https://symfony.com/sponsor",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/fabpot",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+                    "type": "tidelift"
+                }
+            ],
+            "time": "2023-11-17T21:06:49+00:00"
+        },
+        {
+            "name": "symfony/routing",
+            "version": "v6.4.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/routing.git",
+                "reference": "0c95c164fdba18b12523b75e64199ca3503e6d40"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/routing/zipball/0c95c164fdba18b12523b75e64199ca3503e6d40",
+                "reference": "0c95c164fdba18b12523b75e64199ca3503e6d40",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=8.1",
+                "symfony/deprecation-contracts": "^2.5|^3"
+            },
+            "conflict": {
+                "doctrine/annotations": "<1.12",
+                "symfony/config": "<6.2",
+                "symfony/dependency-injection": "<5.4",
+                "symfony/yaml": "<5.4"
+            },
+            "require-dev": {
+                "doctrine/annotations": "^1.12|^2",
+                "psr/log": "^1|^2|^3",
+                "symfony/config": "^6.2|^7.0",
+                "symfony/dependency-injection": "^5.4|^6.0|^7.0",
+                "symfony/expression-language": "^5.4|^6.0|^7.0",
+                "symfony/http-foundation": "^5.4|^6.0|^7.0",
+                "symfony/yaml": "^5.4|^6.0|^7.0"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "Symfony\\Component\\Routing\\": ""
+                },
+                "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": "Maps an HTTP request to a set of configuration variables",
+            "homepage": "https://symfony.com",
+            "keywords": [
+                "router",
+                "routing",
+                "uri",
+                "url"
+            ],
+            "support": {
+                "source": "https://github.com/symfony/routing/tree/v6.4.1"
+            },
+            "funding": [
+                {
+                    "url": "https://symfony.com/sponsor",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/fabpot",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+                    "type": "tidelift"
+                }
+            ],
+            "time": "2023-12-01T14:54:37+00:00"
+        },
+        {
+            "name": "symfony/service-contracts",
+            "version": "v3.4.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/service-contracts.git",
+                "reference": "b3313c2dbffaf71c8de2934e2ea56ed2291a3838"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/service-contracts/zipball/b3313c2dbffaf71c8de2934e2ea56ed2291a3838",
+                "reference": "b3313c2dbffaf71c8de2934e2ea56ed2291a3838",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=8.1",
+                "psr/container": "^2.0"
+            },
+            "conflict": {
+                "ext-psr": "<1.1|>=2"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-main": "3.4-dev"
+                },
+                "thanks": {
+                    "name": "symfony/contracts",
+                    "url": "https://github.com/symfony/contracts"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Symfony\\Contracts\\Service\\": ""
+                },
+                "exclude-from-classmap": [
+                    "/Test/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Nicolas Grekas",
+                    "email": "p@tchwork.com"
+                },
+                {
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
+                }
+            ],
+            "description": "Generic abstractions related to writing services",
+            "homepage": "https://symfony.com",
+            "keywords": [
+                "abstractions",
+                "contracts",
+                "decoupling",
+                "interfaces",
+                "interoperability",
+                "standards"
+            ],
+            "support": {
+                "source": "https://github.com/symfony/service-contracts/tree/v3.4.0"
+            },
+            "funding": [
+                {
+                    "url": "https://symfony.com/sponsor",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/fabpot",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+                    "type": "tidelift"
+                }
+            ],
+            "time": "2023-07-30T20:28:31+00:00"
+        },
+        {
+            "name": "symfony/string",
+            "version": "v6.4.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/string.git",
+                "reference": "b45fcf399ea9c3af543a92edf7172ba21174d809"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/string/zipball/b45fcf399ea9c3af543a92edf7172ba21174d809",
+                "reference": "b45fcf399ea9c3af543a92edf7172ba21174d809",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=8.1",
+                "symfony/polyfill-ctype": "~1.8",
+                "symfony/polyfill-intl-grapheme": "~1.0",
+                "symfony/polyfill-intl-normalizer": "~1.0",
+                "symfony/polyfill-mbstring": "~1.0"
+            },
+            "conflict": {
+                "symfony/translation-contracts": "<2.5"
+            },
+            "require-dev": {
+                "symfony/error-handler": "^5.4|^6.0|^7.0",
+                "symfony/http-client": "^5.4|^6.0|^7.0",
+                "symfony/intl": "^6.2|^7.0",
+                "symfony/translation-contracts": "^2.5|^3.0",
+                "symfony/var-exporter": "^5.4|^6.0|^7.0"
+            },
+            "type": "library",
+            "autoload": {
+                "files": [
+                    "Resources/functions.php"
+                ],
+                "psr-4": {
+                    "Symfony\\Component\\String\\": ""
+                },
+                "exclude-from-classmap": [
+                    "/Tests/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Nicolas Grekas",
+                    "email": "p@tchwork.com"
+                },
+                {
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
+                }
+            ],
+            "description": "Provides an object-oriented API to strings and deals with bytes, UTF-8 code points and grapheme clusters in a unified way",
+            "homepage": "https://symfony.com",
+            "keywords": [
+                "grapheme",
+                "i18n",
+                "string",
+                "unicode",
+                "utf-8",
+                "utf8"
+            ],
+            "support": {
+                "source": "https://github.com/symfony/string/tree/v6.4.0"
+            },
+            "funding": [
+                {
+                    "url": "https://symfony.com/sponsor",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/fabpot",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+                    "type": "tidelift"
+                }
+            ],
+            "time": "2023-11-28T20:41:49+00:00"
+        },
+        {
+            "name": "symfony/translation",
+            "version": "v6.4.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/translation.git",
+                "reference": "b1035dbc2a344b21f8fa8ac451c7ecec4ea45f37"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/translation/zipball/b1035dbc2a344b21f8fa8ac451c7ecec4ea45f37",
+                "reference": "b1035dbc2a344b21f8fa8ac451c7ecec4ea45f37",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=8.1",
+                "symfony/deprecation-contracts": "^2.5|^3",
+                "symfony/polyfill-mbstring": "~1.0",
+                "symfony/translation-contracts": "^2.5|^3.0"
+            },
+            "conflict": {
+                "symfony/config": "<5.4",
+                "symfony/console": "<5.4",
+                "symfony/dependency-injection": "<5.4",
+                "symfony/http-client-contracts": "<2.5",
+                "symfony/http-kernel": "<5.4",
+                "symfony/service-contracts": "<2.5",
+                "symfony/twig-bundle": "<5.4",
+                "symfony/yaml": "<5.4"
+            },
+            "provide": {
+                "symfony/translation-implementation": "2.3|3.0"
+            },
+            "require-dev": {
+                "nikic/php-parser": "^4.13",
+                "psr/log": "^1|^2|^3",
+                "symfony/config": "^5.4|^6.0|^7.0",
+                "symfony/console": "^5.4|^6.0|^7.0",
+                "symfony/dependency-injection": "^5.4|^6.0|^7.0",
+                "symfony/finder": "^5.4|^6.0|^7.0",
+                "symfony/http-client-contracts": "^2.5|^3.0",
+                "symfony/http-kernel": "^5.4|^6.0|^7.0",
+                "symfony/intl": "^5.4|^6.0|^7.0",
+                "symfony/polyfill-intl-icu": "^1.21",
+                "symfony/routing": "^5.4|^6.0|^7.0",
+                "symfony/service-contracts": "^2.5|^3",
+                "symfony/yaml": "^5.4|^6.0|^7.0"
+            },
+            "type": "library",
+            "autoload": {
+                "files": [
+                    "Resources/functions.php"
+                ],
+                "psr-4": {
+                    "Symfony\\Component\\Translation\\": ""
+                },
+                "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": "Provides tools to internationalize your application",
+            "homepage": "https://symfony.com",
+            "support": {
+                "source": "https://github.com/symfony/translation/tree/v6.4.0"
+            },
+            "funding": [
+                {
+                    "url": "https://symfony.com/sponsor",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/fabpot",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+                    "type": "tidelift"
+                }
+            ],
+            "time": "2023-11-29T08:14:36+00:00"
+        },
+        {
+            "name": "symfony/translation-contracts",
+            "version": "v3.4.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/translation-contracts.git",
+                "reference": "dee0c6e5b4c07ce851b462530088e64b255ac9c5"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/translation-contracts/zipball/dee0c6e5b4c07ce851b462530088e64b255ac9c5",
+                "reference": "dee0c6e5b4c07ce851b462530088e64b255ac9c5",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=8.1"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-main": "3.4-dev"
+                },
+                "thanks": {
+                    "name": "symfony/contracts",
+                    "url": "https://github.com/symfony/contracts"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Symfony\\Contracts\\Translation\\": ""
+                },
+                "exclude-from-classmap": [
+                    "/Test/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Nicolas Grekas",
+                    "email": "p@tchwork.com"
+                },
+                {
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
+                }
+            ],
+            "description": "Generic abstractions related to translation",
+            "homepage": "https://symfony.com",
+            "keywords": [
+                "abstractions",
+                "contracts",
+                "decoupling",
+                "interfaces",
+                "interoperability",
+                "standards"
+            ],
+            "support": {
+                "source": "https://github.com/symfony/translation-contracts/tree/v3.4.0"
+            },
+            "funding": [
+                {
+                    "url": "https://symfony.com/sponsor",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/fabpot",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+                    "type": "tidelift"
+                }
+            ],
+            "time": "2023-07-25T15:08:44+00:00"
+        },
+        {
+            "name": "symfony/uid",
+            "version": "v6.4.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/uid.git",
+                "reference": "8092dd1b1a41372110d06374f99ee62f7f0b9a92"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/uid/zipball/8092dd1b1a41372110d06374f99ee62f7f0b9a92",
+                "reference": "8092dd1b1a41372110d06374f99ee62f7f0b9a92",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=8.1",
+                "symfony/polyfill-uuid": "^1.15"
+            },
+            "require-dev": {
+                "symfony/console": "^5.4|^6.0|^7.0"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "Symfony\\Component\\Uid\\": ""
+                },
+                "exclude-from-classmap": [
+                    "/Tests/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Grégoire Pineau",
+                    "email": "lyrixx@lyrixx.info"
+                },
+                {
+                    "name": "Nicolas Grekas",
+                    "email": "p@tchwork.com"
+                },
+                {
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
+                }
+            ],
+            "description": "Provides an object-oriented API to generate and represent UIDs",
+            "homepage": "https://symfony.com",
+            "keywords": [
+                "UID",
+                "ulid",
+                "uuid"
+            ],
+            "support": {
+                "source": "https://github.com/symfony/uid/tree/v6.4.0"
+            },
+            "funding": [
+                {
+                    "url": "https://symfony.com/sponsor",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/fabpot",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+                    "type": "tidelift"
+                }
+            ],
+            "time": "2023-10-31T08:18:17+00:00"
+        },
+        {
+            "name": "symfony/var-dumper",
+            "version": "v6.4.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/var-dumper.git",
+                "reference": "c40f7d17e91d8b407582ed51a2bbf83c52c367f6"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/var-dumper/zipball/c40f7d17e91d8b407582ed51a2bbf83c52c367f6",
+                "reference": "c40f7d17e91d8b407582ed51a2bbf83c52c367f6",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=8.1",
+                "symfony/deprecation-contracts": "^2.5|^3",
+                "symfony/polyfill-mbstring": "~1.0"
+            },
+            "conflict": {
+                "symfony/console": "<5.4"
+            },
+            "require-dev": {
+                "ext-iconv": "*",
+                "symfony/console": "^5.4|^6.0|^7.0",
+                "symfony/error-handler": "^6.3|^7.0",
+                "symfony/http-kernel": "^5.4|^6.0|^7.0",
+                "symfony/process": "^5.4|^6.0|^7.0",
+                "symfony/uid": "^5.4|^6.0|^7.0",
+                "twig/twig": "^2.13|^3.0.4"
+            },
+            "bin": [
+                "Resources/bin/var-dump-server"
+            ],
+            "type": "library",
+            "autoload": {
+                "files": [
+                    "Resources/functions/dump.php"
+                ],
+                "psr-4": {
+                    "Symfony\\Component\\VarDumper\\": ""
+                },
+                "exclude-from-classmap": [
+                    "/Tests/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Nicolas Grekas",
+                    "email": "p@tchwork.com"
+                },
+                {
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
+                }
+            ],
+            "description": "Provides mechanisms for walking through any arbitrary PHP variable",
+            "homepage": "https://symfony.com",
+            "keywords": [
+                "debug",
+                "dump"
+            ],
+            "support": {
+                "source": "https://github.com/symfony/var-dumper/tree/v6.4.0"
+            },
+            "funding": [
+                {
+                    "url": "https://symfony.com/sponsor",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/fabpot",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+                    "type": "tidelift"
+                }
+            ],
+            "time": "2023-11-09T08:28:32+00:00"
+        },
+        {
+            "name": "tijsverkoyen/css-to-inline-styles",
+            "version": "v2.2.7",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/tijsverkoyen/CssToInlineStyles.git",
+                "reference": "83ee6f38df0a63106a9e4536e3060458b74ccedb"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/tijsverkoyen/CssToInlineStyles/zipball/83ee6f38df0a63106a9e4536e3060458b74ccedb",
+                "reference": "83ee6f38df0a63106a9e4536e3060458b74ccedb",
+                "shasum": ""
+            },
+            "require": {
+                "ext-dom": "*",
+                "ext-libxml": "*",
+                "php": "^5.5 || ^7.0 || ^8.0",
+                "symfony/css-selector": "^2.7 || ^3.0 || ^4.0 || ^5.0 || ^6.0 || ^7.0"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^4.8.35 || ^5.7 || ^6.0 || ^7.5 || ^8.5.21 || ^9.5.10"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "2.2.x-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "TijsVerkoyen\\CssToInlineStyles\\": "src"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Tijs Verkoyen",
+                    "email": "css_to_inline_styles@verkoyen.eu",
+                    "role": "Developer"
+                }
+            ],
+            "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",
+            "support": {
+                "issues": "https://github.com/tijsverkoyen/CssToInlineStyles/issues",
+                "source": "https://github.com/tijsverkoyen/CssToInlineStyles/tree/v2.2.7"
+            },
+            "time": "2023-12-08T13:03:43+00:00"
+        },
+        {
+            "name": "vlucas/phpdotenv",
+            "version": "v5.6.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/vlucas/phpdotenv.git",
+                "reference": "2cf9fb6054c2bb1d59d1f3817706ecdb9d2934c4"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/vlucas/phpdotenv/zipball/2cf9fb6054c2bb1d59d1f3817706ecdb9d2934c4",
+                "reference": "2cf9fb6054c2bb1d59d1f3817706ecdb9d2934c4",
+                "shasum": ""
+            },
+            "require": {
+                "ext-pcre": "*",
+                "graham-campbell/result-type": "^1.1.2",
+                "php": "^7.2.5 || ^8.0",
+                "phpoption/phpoption": "^1.9.2",
+                "symfony/polyfill-ctype": "^1.24",
+                "symfony/polyfill-mbstring": "^1.24",
+                "symfony/polyfill-php80": "^1.24"
+            },
+            "require-dev": {
+                "bamarni/composer-bin-plugin": "^1.8.2",
+                "ext-filter": "*",
+                "phpunit/phpunit": "^8.5.34 || ^9.6.13 || ^10.4.2"
+            },
+            "suggest": {
+                "ext-filter": "Required to use the boolean validator."
+            },
+            "type": "library",
+            "extra": {
+                "bamarni-bin": {
+                    "bin-links": true,
+                    "forward-command": true
+                },
+                "branch-alias": {
+                    "dev-master": "5.6-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Dotenv\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Graham Campbell",
+                    "email": "hello@gjcampbell.co.uk",
+                    "homepage": "https://github.com/GrahamCampbell"
+                },
+                {
+                    "name": "Vance Lucas",
+                    "email": "vance@vancelucas.com",
+                    "homepage": "https://github.com/vlucas"
+                }
+            ],
+            "description": "Loads environment variables from `.env` to `getenv()`, `$_ENV` and `$_SERVER` automagically.",
+            "keywords": [
+                "dotenv",
+                "env",
+                "environment"
+            ],
+            "support": {
+                "issues": "https://github.com/vlucas/phpdotenv/issues",
+                "source": "https://github.com/vlucas/phpdotenv/tree/v5.6.0"
+            },
+            "funding": [
+                {
+                    "url": "https://github.com/GrahamCampbell",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/vlucas/phpdotenv",
+                    "type": "tidelift"
+                }
+            ],
+            "time": "2023-11-12T22:43:29+00:00"
+        },
+        {
+            "name": "voku/portable-ascii",
+            "version": "2.0.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/voku/portable-ascii.git",
+                "reference": "b56450eed252f6801410d810c8e1727224ae0743"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/voku/portable-ascii/zipball/b56450eed252f6801410d810c8e1727224ae0743",
+                "reference": "b56450eed252f6801410d810c8e1727224ae0743",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=7.0.0"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "~6.0 || ~7.0 || ~9.0"
+            },
+            "suggest": {
+                "ext-intl": "Use Intl for transliterator_transliterate() support"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "voku\\": "src/voku/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Lars Moelleken",
+                    "homepage": "http://www.moelleken.org/"
+                }
+            ],
+            "description": "Portable ASCII library - performance optimized (ascii) string functions for php.",
+            "homepage": "https://github.com/voku/portable-ascii",
+            "keywords": [
+                "ascii",
+                "clean",
+                "php"
+            ],
+            "support": {
+                "issues": "https://github.com/voku/portable-ascii/issues",
+                "source": "https://github.com/voku/portable-ascii/tree/2.0.1"
+            },
+            "funding": [
+                {
+                    "url": "https://www.paypal.me/moelleken",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/voku",
+                    "type": "github"
+                },
+                {
+                    "url": "https://opencollective.com/portable-ascii",
+                    "type": "open_collective"
+                },
+                {
+                    "url": "https://www.patreon.com/voku",
+                    "type": "patreon"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/voku/portable-ascii",
+                    "type": "tidelift"
+                }
+            ],
+            "time": "2022-03-08T17:03:00+00:00"
+        },
+        {
+            "name": "webmozart/assert",
+            "version": "1.11.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/webmozarts/assert.git",
+                "reference": "11cb2199493b2f8a3b53e7f19068fc6aac760991"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/webmozarts/assert/zipball/11cb2199493b2f8a3b53e7f19068fc6aac760991",
+                "reference": "11cb2199493b2f8a3b53e7f19068fc6aac760991",
+                "shasum": ""
+            },
+            "require": {
+                "ext-ctype": "*",
+                "php": "^7.2 || ^8.0"
+            },
+            "conflict": {
+                "phpstan/phpstan": "<0.12.20",
+                "vimeo/psalm": "<4.6.1 || 4.6.2"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^8.5.13"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.10-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Webmozart\\Assert\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Bernhard Schussek",
+                    "email": "bschussek@gmail.com"
+                }
+            ],
+            "description": "Assertions to validate method input/output with nice error messages.",
+            "keywords": [
+                "assert",
+                "check",
+                "validate"
+            ],
+            "support": {
+                "issues": "https://github.com/webmozarts/assert/issues",
+                "source": "https://github.com/webmozarts/assert/tree/1.11.0"
+            },
+            "time": "2022-06-03T18:03:27+00:00"
+        }
+    ],
+    "packages-dev": [
+        {
+            "name": "fakerphp/faker",
+            "version": "v1.23.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/FakerPHP/Faker.git",
+                "reference": "e3daa170d00fde61ea7719ef47bb09bb8f1d9b01"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/FakerPHP/Faker/zipball/e3daa170d00fde61ea7719ef47bb09bb8f1d9b01",
+                "reference": "e3daa170d00fde61ea7719ef47bb09bb8f1d9b01",
+                "shasum": ""
+            },
+            "require": {
+                "php": "^7.4 || ^8.0",
+                "psr/container": "^1.0 || ^2.0",
+                "symfony/deprecation-contracts": "^2.2 || ^3.0"
+            },
+            "conflict": {
+                "fzaninotto/faker": "*"
+            },
+            "require-dev": {
+                "bamarni/composer-bin-plugin": "^1.4.1",
+                "doctrine/persistence": "^1.3 || ^2.0",
+                "ext-intl": "*",
+                "phpunit/phpunit": "^9.5.26",
+                "symfony/phpunit-bridge": "^5.4.16"
+            },
+            "suggest": {
+                "doctrine/orm": "Required to use Faker\\ORM\\Doctrine",
+                "ext-curl": "Required by Faker\\Provider\\Image to download images.",
+                "ext-dom": "Required by Faker\\Provider\\HtmlLorem for generating random HTML.",
+                "ext-iconv": "Required by Faker\\Provider\\ru_RU\\Text::realText() for generating real Russian text.",
+                "ext-mbstring": "Required for multibyte Unicode string functionality."
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-main": "v1.21-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Faker\\": "src/Faker/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "François Zaninotto"
+                }
+            ],
+            "description": "Faker is a PHP library that generates fake data for you.",
+            "keywords": [
+                "data",
+                "faker",
+                "fixtures"
+            ],
+            "support": {
+                "issues": "https://github.com/FakerPHP/Faker/issues",
+                "source": "https://github.com/FakerPHP/Faker/tree/v1.23.0"
+            },
+            "time": "2023-06-12T08:44:38+00:00"
+        },
+        {
+            "name": "filp/whoops",
+            "version": "2.15.4",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/filp/whoops.git",
+                "reference": "a139776fa3f5985a50b509f2a02ff0f709d2a546"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/filp/whoops/zipball/a139776fa3f5985a50b509f2a02ff0f709d2a546",
+                "reference": "a139776fa3f5985a50b509f2a02ff0f709d2a546",
+                "shasum": ""
+            },
+            "require": {
+                "php": "^5.5.9 || ^7.0 || ^8.0",
+                "psr/log": "^1.0.1 || ^2.0 || ^3.0"
+            },
+            "require-dev": {
+                "mockery/mockery": "^0.9 || ^1.0",
+                "phpunit/phpunit": "^4.8.36 || ^5.7.27 || ^6.5.14 || ^7.5.20 || ^8.5.8 || ^9.3.3",
+                "symfony/var-dumper": "^2.6 || ^3.0 || ^4.0 || ^5.0"
+            },
+            "suggest": {
+                "symfony/var-dumper": "Pretty print complex values better with var-dumper available",
+                "whoops/soap": "Formats errors as SOAP responses"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "2.7-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Whoops\\": "src/Whoops/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Filipe Dobreira",
+                    "homepage": "https://github.com/filp",
+                    "role": "Developer"
+                }
+            ],
+            "description": "php error handling for cool kids",
+            "homepage": "https://filp.github.io/whoops/",
+            "keywords": [
+                "error",
+                "exception",
+                "handling",
+                "library",
+                "throwable",
+                "whoops"
+            ],
+            "support": {
+                "issues": "https://github.com/filp/whoops/issues",
+                "source": "https://github.com/filp/whoops/tree/2.15.4"
+            },
+            "funding": [
+                {
+                    "url": "https://github.com/denis-sokolov",
+                    "type": "github"
+                }
+            ],
+            "time": "2023-11-03T12:00:00+00:00"
+        },
+        {
+            "name": "hamcrest/hamcrest-php",
+            "version": "v2.0.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/hamcrest/hamcrest-php.git",
+                "reference": "8c3d0a3f6af734494ad8f6fbbee0ba92422859f3"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/hamcrest/hamcrest-php/zipball/8c3d0a3f6af734494ad8f6fbbee0ba92422859f3",
+                "reference": "8c3d0a3f6af734494ad8f6fbbee0ba92422859f3",
+                "shasum": ""
+            },
+            "require": {
+                "php": "^5.3|^7.0|^8.0"
+            },
+            "replace": {
+                "cordoval/hamcrest-php": "*",
+                "davedevelopment/hamcrest-php": "*",
+                "kodova/hamcrest-php": "*"
+            },
+            "require-dev": {
+                "phpunit/php-file-iterator": "^1.4 || ^2.0",
+                "phpunit/phpunit": "^4.8.36 || ^5.7 || ^6.5 || ^7.0"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "2.1-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "hamcrest"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "description": "This is the PHP port of Hamcrest Matchers",
+            "keywords": [
+                "test"
+            ],
+            "support": {
+                "issues": "https://github.com/hamcrest/hamcrest-php/issues",
+                "source": "https://github.com/hamcrest/hamcrest-php/tree/v2.0.1"
+            },
+            "time": "2020-07-09T08:09:16+00:00"
+        },
+        {
+            "name": "laravel/pint",
+            "version": "v1.13.7",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/laravel/pint.git",
+                "reference": "4157768980dbd977f1c4b4cc94997416d8b30ece"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/laravel/pint/zipball/4157768980dbd977f1c4b4cc94997416d8b30ece",
+                "reference": "4157768980dbd977f1c4b4cc94997416d8b30ece",
+                "shasum": ""
+            },
+            "require": {
+                "ext-json": "*",
+                "ext-mbstring": "*",
+                "ext-tokenizer": "*",
+                "ext-xml": "*",
+                "php": "^8.1.0"
+            },
+            "require-dev": {
+                "friendsofphp/php-cs-fixer": "^3.38.0",
+                "illuminate/view": "^10.30.1",
+                "laravel-zero/framework": "^10.3.0",
+                "mockery/mockery": "^1.6.6",
+                "nunomaduro/larastan": "^2.6.4",
+                "nunomaduro/termwind": "^1.15.1",
+                "pestphp/pest": "^2.24.2"
+            },
+            "bin": [
+                "builds/pint"
+            ],
+            "type": "project",
+            "autoload": {
+                "psr-4": {
+                    "App\\": "app/",
+                    "Database\\Seeders\\": "database/seeders/",
+                    "Database\\Factories\\": "database/factories/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Nuno Maduro",
+                    "email": "enunomaduro@gmail.com"
+                }
+            ],
+            "description": "An opinionated code formatter for PHP.",
+            "homepage": "https://laravel.com",
+            "keywords": [
+                "format",
+                "formatter",
+                "lint",
+                "linter",
+                "php"
+            ],
+            "support": {
+                "issues": "https://github.com/laravel/pint/issues",
+                "source": "https://github.com/laravel/pint"
+            },
+            "time": "2023-12-05T19:43:12+00:00"
+        },
+        {
+            "name": "mockery/mockery",
+            "version": "1.6.7",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/mockery/mockery.git",
+                "reference": "0cc058854b3195ba21dc6b1f7b1f60f4ef3a9c06"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/mockery/mockery/zipball/0cc058854b3195ba21dc6b1f7b1f60f4ef3a9c06",
+                "reference": "0cc058854b3195ba21dc6b1f7b1f60f4ef3a9c06",
+                "shasum": ""
+            },
+            "require": {
+                "hamcrest/hamcrest-php": "^2.0.1",
+                "lib-pcre": ">=7.0",
+                "php": ">=7.3"
+            },
+            "conflict": {
+                "phpunit/phpunit": "<8.0"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^8.5 || ^9.6.10",
+                "symplify/easy-coding-standard": "^12.0.8"
+            },
+            "type": "library",
+            "autoload": {
+                "files": [
+                    "library/helpers.php",
+                    "library/Mockery.php"
+                ],
+                "psr-4": {
+                    "Mockery\\": "library/Mockery"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Pádraic Brady",
+                    "email": "padraic.brady@gmail.com",
+                    "homepage": "https://github.com/padraic",
+                    "role": "Author"
+                },
+                {
+                    "name": "Dave Marshall",
+                    "email": "dave.marshall@atstsolutions.co.uk",
+                    "homepage": "https://davedevelopment.co.uk",
+                    "role": "Developer"
+                },
+                {
+                    "name": "Nathanael Esayeas",
+                    "email": "nathanael.esayeas@protonmail.com",
+                    "homepage": "https://github.com/ghostwriter",
+                    "role": "Lead Developer"
+                }
+            ],
+            "description": "Mockery is a simple yet flexible PHP mock object framework",
+            "homepage": "https://github.com/mockery/mockery",
+            "keywords": [
+                "BDD",
+                "TDD",
+                "library",
+                "mock",
+                "mock objects",
+                "mockery",
+                "stub",
+                "test",
+                "test double",
+                "testing"
+            ],
+            "support": {
+                "docs": "https://docs.mockery.io/",
+                "issues": "https://github.com/mockery/mockery/issues",
+                "rss": "https://github.com/mockery/mockery/releases.atom",
+                "security": "https://github.com/mockery/mockery/security/advisories",
+                "source": "https://github.com/mockery/mockery"
+            },
+            "time": "2023-12-10T02:24:34+00:00"
+        },
+        {
+            "name": "myclabs/deep-copy",
+            "version": "1.11.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/myclabs/DeepCopy.git",
+                "reference": "7284c22080590fb39f2ffa3e9057f10a4ddd0e0c"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/myclabs/DeepCopy/zipball/7284c22080590fb39f2ffa3e9057f10a4ddd0e0c",
+                "reference": "7284c22080590fb39f2ffa3e9057f10a4ddd0e0c",
+                "shasum": ""
+            },
+            "require": {
+                "php": "^7.1 || ^8.0"
+            },
+            "conflict": {
+                "doctrine/collections": "<1.6.8",
+                "doctrine/common": "<2.13.3 || >=3,<3.2.2"
+            },
+            "require-dev": {
+                "doctrine/collections": "^1.6.8",
+                "doctrine/common": "^2.13.3 || ^3.2.2",
+                "phpunit/phpunit": "^7.5.20 || ^8.5.23 || ^9.5.13"
+            },
+            "type": "library",
+            "autoload": {
+                "files": [
+                    "src/DeepCopy/deep_copy.php"
+                ],
+                "psr-4": {
+                    "DeepCopy\\": "src/DeepCopy/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "description": "Create deep copies (clones) of your objects",
+            "keywords": [
+                "clone",
+                "copy",
+                "duplicate",
+                "object",
+                "object graph"
+            ],
+            "support": {
+                "issues": "https://github.com/myclabs/DeepCopy/issues",
+                "source": "https://github.com/myclabs/DeepCopy/tree/1.11.1"
+            },
+            "funding": [
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/myclabs/deep-copy",
+                    "type": "tidelift"
+                }
+            ],
+            "time": "2023-03-08T13:26:56+00:00"
+        },
+        {
+            "name": "nunomaduro/collision",
+            "version": "v7.10.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/nunomaduro/collision.git",
+                "reference": "49ec67fa7b002712da8526678abd651c09f375b2"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/nunomaduro/collision/zipball/49ec67fa7b002712da8526678abd651c09f375b2",
+                "reference": "49ec67fa7b002712da8526678abd651c09f375b2",
+                "shasum": ""
+            },
+            "require": {
+                "filp/whoops": "^2.15.3",
+                "nunomaduro/termwind": "^1.15.1",
+                "php": "^8.1.0",
+                "symfony/console": "^6.3.4"
+            },
+            "conflict": {
+                "laravel/framework": ">=11.0.0"
+            },
+            "require-dev": {
+                "brianium/paratest": "^7.3.0",
+                "laravel/framework": "^10.28.0",
+                "laravel/pint": "^1.13.3",
+                "laravel/sail": "^1.25.0",
+                "laravel/sanctum": "^3.3.1",
+                "laravel/tinker": "^2.8.2",
+                "nunomaduro/larastan": "^2.6.4",
+                "orchestra/testbench-core": "^8.13.0",
+                "pestphp/pest": "^2.23.2",
+                "phpunit/phpunit": "^10.4.1",
+                "sebastian/environment": "^6.0.1",
+                "spatie/laravel-ignition": "^2.3.1"
+            },
+            "type": "library",
+            "extra": {
+                "laravel": {
+                    "providers": [
+                        "NunoMaduro\\Collision\\Adapters\\Laravel\\CollisionServiceProvider"
+                    ]
+                }
+            },
+            "autoload": {
+                "files": [
+                    "./src/Adapters/Phpunit/Autoload.php"
+                ],
+                "psr-4": {
+                    "NunoMaduro\\Collision\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Nuno Maduro",
+                    "email": "enunomaduro@gmail.com"
+                }
+            ],
+            "description": "Cli error handling for console/command-line PHP applications.",
+            "keywords": [
+                "artisan",
+                "cli",
+                "command-line",
+                "console",
+                "error",
+                "handling",
+                "laravel",
+                "laravel-zero",
+                "php",
+                "symfony"
+            ],
+            "support": {
+                "issues": "https://github.com/nunomaduro/collision/issues",
+                "source": "https://github.com/nunomaduro/collision"
+            },
+            "funding": [
+                {
+                    "url": "https://www.paypal.com/paypalme/enunomaduro",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/nunomaduro",
+                    "type": "github"
+                },
+                {
+                    "url": "https://www.patreon.com/nunomaduro",
+                    "type": "patreon"
+                }
+            ],
+            "time": "2023-10-11T15:45:01+00:00"
+        },
+        {
+            "name": "phar-io/manifest",
+            "version": "2.0.3",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/phar-io/manifest.git",
+                "reference": "97803eca37d319dfa7826cc2437fc020857acb53"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/phar-io/manifest/zipball/97803eca37d319dfa7826cc2437fc020857acb53",
+                "reference": "97803eca37d319dfa7826cc2437fc020857acb53",
+                "shasum": ""
+            },
+            "require": {
+                "ext-dom": "*",
+                "ext-phar": "*",
+                "ext-xmlwriter": "*",
+                "phar-io/version": "^3.0.1",
+                "php": "^7.2 || ^8.0"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "2.0.x-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Arne Blankerts",
+                    "email": "arne@blankerts.de",
+                    "role": "Developer"
+                },
+                {
+                    "name": "Sebastian Heuer",
+                    "email": "sebastian@phpeople.de",
+                    "role": "Developer"
+                },
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de",
+                    "role": "Developer"
+                }
+            ],
+            "description": "Component for reading phar.io manifest information from a PHP Archive (PHAR)",
+            "support": {
+                "issues": "https://github.com/phar-io/manifest/issues",
+                "source": "https://github.com/phar-io/manifest/tree/2.0.3"
+            },
+            "time": "2021-07-20T11:28:43+00:00"
+        },
+        {
+            "name": "phar-io/version",
+            "version": "3.2.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/phar-io/version.git",
+                "reference": "4f7fd7836c6f332bb2933569e566a0d6c4cbed74"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/phar-io/version/zipball/4f7fd7836c6f332bb2933569e566a0d6c4cbed74",
+                "reference": "4f7fd7836c6f332bb2933569e566a0d6c4cbed74",
+                "shasum": ""
+            },
+            "require": {
+                "php": "^7.2 || ^8.0"
+            },
+            "type": "library",
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Arne Blankerts",
+                    "email": "arne@blankerts.de",
+                    "role": "Developer"
+                },
+                {
+                    "name": "Sebastian Heuer",
+                    "email": "sebastian@phpeople.de",
+                    "role": "Developer"
+                },
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de",
+                    "role": "Developer"
+                }
+            ],
+            "description": "Library for handling version information and constraints",
+            "support": {
+                "issues": "https://github.com/phar-io/version/issues",
+                "source": "https://github.com/phar-io/version/tree/3.2.1"
+            },
+            "time": "2022-02-21T01:04:05+00:00"
+        },
+        {
+            "name": "phpunit/php-code-coverage",
+            "version": "10.1.10",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/php-code-coverage.git",
+                "reference": "599109c8ca6bae97b23482d557d2874c25a65e59"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/599109c8ca6bae97b23482d557d2874c25a65e59",
+                "reference": "599109c8ca6bae97b23482d557d2874c25a65e59",
+                "shasum": ""
+            },
+            "require": {
+                "ext-dom": "*",
+                "ext-libxml": "*",
+                "ext-xmlwriter": "*",
+                "nikic/php-parser": "^4.15",
+                "php": ">=8.1",
+                "phpunit/php-file-iterator": "^4.0",
+                "phpunit/php-text-template": "^3.0",
+                "sebastian/code-unit-reverse-lookup": "^3.0",
+                "sebastian/complexity": "^3.0",
+                "sebastian/environment": "^6.0",
+                "sebastian/lines-of-code": "^2.0",
+                "sebastian/version": "^4.0",
+                "theseer/tokenizer": "^1.2.0"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^10.1"
+            },
+            "suggest": {
+                "ext-pcov": "PHP extension that provides line coverage",
+                "ext-xdebug": "PHP extension that provides line coverage as well as branch and path coverage"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-main": "10.1-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de",
+                    "role": "lead"
+                }
+            ],
+            "description": "Library that provides collection, processing, and rendering functionality for PHP code coverage information.",
+            "homepage": "https://github.com/sebastianbergmann/php-code-coverage",
+            "keywords": [
+                "coverage",
+                "testing",
+                "xunit"
+            ],
+            "support": {
+                "issues": "https://github.com/sebastianbergmann/php-code-coverage/issues",
+                "security": "https://github.com/sebastianbergmann/php-code-coverage/security/policy",
+                "source": "https://github.com/sebastianbergmann/php-code-coverage/tree/10.1.10"
+            },
+            "funding": [
+                {
+                    "url": "https://github.com/sebastianbergmann",
+                    "type": "github"
+                }
+            ],
+            "time": "2023-12-11T06:28:43+00:00"
+        },
+        {
+            "name": "phpunit/php-file-iterator",
+            "version": "4.1.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/php-file-iterator.git",
+                "reference": "a95037b6d9e608ba092da1b23931e537cadc3c3c"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/php-file-iterator/zipball/a95037b6d9e608ba092da1b23931e537cadc3c3c",
+                "reference": "a95037b6d9e608ba092da1b23931e537cadc3c3c",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=8.1"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^10.0"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-main": "4.0-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de",
+                    "role": "lead"
+                }
+            ],
+            "description": "FilterIterator implementation that filters files based on a list of suffixes.",
+            "homepage": "https://github.com/sebastianbergmann/php-file-iterator/",
+            "keywords": [
+                "filesystem",
+                "iterator"
+            ],
+            "support": {
+                "issues": "https://github.com/sebastianbergmann/php-file-iterator/issues",
+                "security": "https://github.com/sebastianbergmann/php-file-iterator/security/policy",
+                "source": "https://github.com/sebastianbergmann/php-file-iterator/tree/4.1.0"
+            },
+            "funding": [
+                {
+                    "url": "https://github.com/sebastianbergmann",
+                    "type": "github"
+                }
+            ],
+            "time": "2023-08-31T06:24:48+00:00"
+        },
+        {
+            "name": "phpunit/php-invoker",
+            "version": "4.0.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/php-invoker.git",
+                "reference": "f5e568ba02fa5ba0ddd0f618391d5a9ea50b06d7"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/php-invoker/zipball/f5e568ba02fa5ba0ddd0f618391d5a9ea50b06d7",
+                "reference": "f5e568ba02fa5ba0ddd0f618391d5a9ea50b06d7",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=8.1"
+            },
+            "require-dev": {
+                "ext-pcntl": "*",
+                "phpunit/phpunit": "^10.0"
+            },
+            "suggest": {
+                "ext-pcntl": "*"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-main": "4.0-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de",
+                    "role": "lead"
+                }
+            ],
+            "description": "Invoke callables with a timeout",
+            "homepage": "https://github.com/sebastianbergmann/php-invoker/",
+            "keywords": [
+                "process"
+            ],
+            "support": {
+                "issues": "https://github.com/sebastianbergmann/php-invoker/issues",
+                "source": "https://github.com/sebastianbergmann/php-invoker/tree/4.0.0"
+            },
+            "funding": [
+                {
+                    "url": "https://github.com/sebastianbergmann",
+                    "type": "github"
+                }
+            ],
+            "time": "2023-02-03T06:56:09+00:00"
+        },
+        {
+            "name": "phpunit/php-text-template",
+            "version": "3.0.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/php-text-template.git",
+                "reference": "0c7b06ff49e3d5072f057eb1fa59258bf287a748"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/php-text-template/zipball/0c7b06ff49e3d5072f057eb1fa59258bf287a748",
+                "reference": "0c7b06ff49e3d5072f057eb1fa59258bf287a748",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=8.1"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^10.0"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-main": "3.0-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de",
+                    "role": "lead"
+                }
+            ],
+            "description": "Simple template engine.",
+            "homepage": "https://github.com/sebastianbergmann/php-text-template/",
+            "keywords": [
+                "template"
+            ],
+            "support": {
+                "issues": "https://github.com/sebastianbergmann/php-text-template/issues",
+                "security": "https://github.com/sebastianbergmann/php-text-template/security/policy",
+                "source": "https://github.com/sebastianbergmann/php-text-template/tree/3.0.1"
+            },
+            "funding": [
+                {
+                    "url": "https://github.com/sebastianbergmann",
+                    "type": "github"
+                }
+            ],
+            "time": "2023-08-31T14:07:24+00:00"
+        },
+        {
+            "name": "phpunit/php-timer",
+            "version": "6.0.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/php-timer.git",
+                "reference": "e2a2d67966e740530f4a3343fe2e030ffdc1161d"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/php-timer/zipball/e2a2d67966e740530f4a3343fe2e030ffdc1161d",
+                "reference": "e2a2d67966e740530f4a3343fe2e030ffdc1161d",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=8.1"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^10.0"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-main": "6.0-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de",
+                    "role": "lead"
+                }
+            ],
+            "description": "Utility class for timing",
+            "homepage": "https://github.com/sebastianbergmann/php-timer/",
+            "keywords": [
+                "timer"
+            ],
+            "support": {
+                "issues": "https://github.com/sebastianbergmann/php-timer/issues",
+                "source": "https://github.com/sebastianbergmann/php-timer/tree/6.0.0"
+            },
+            "funding": [
+                {
+                    "url": "https://github.com/sebastianbergmann",
+                    "type": "github"
+                }
+            ],
+            "time": "2023-02-03T06:57:52+00:00"
+        },
+        {
+            "name": "phpunit/phpunit",
+            "version": "10.5.3",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/phpunit.git",
+                "reference": "6fce887c71076a73f32fd3e0774a6833fc5c7f19"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/6fce887c71076a73f32fd3e0774a6833fc5c7f19",
+                "reference": "6fce887c71076a73f32fd3e0774a6833fc5c7f19",
+                "shasum": ""
+            },
+            "require": {
+                "ext-dom": "*",
+                "ext-json": "*",
+                "ext-libxml": "*",
+                "ext-mbstring": "*",
+                "ext-xml": "*",
+                "ext-xmlwriter": "*",
+                "myclabs/deep-copy": "^1.10.1",
+                "phar-io/manifest": "^2.0.3",
+                "phar-io/version": "^3.0.2",
+                "php": ">=8.1",
+                "phpunit/php-code-coverage": "^10.1.5",
+                "phpunit/php-file-iterator": "^4.0",
+                "phpunit/php-invoker": "^4.0",
+                "phpunit/php-text-template": "^3.0",
+                "phpunit/php-timer": "^6.0",
+                "sebastian/cli-parser": "^2.0",
+                "sebastian/code-unit": "^2.0",
+                "sebastian/comparator": "^5.0",
+                "sebastian/diff": "^5.0",
+                "sebastian/environment": "^6.0",
+                "sebastian/exporter": "^5.1",
+                "sebastian/global-state": "^6.0.1",
+                "sebastian/object-enumerator": "^5.0",
+                "sebastian/recursion-context": "^5.0",
+                "sebastian/type": "^4.0",
+                "sebastian/version": "^4.0"
+            },
+            "suggest": {
+                "ext-soap": "To be able to generate mocks based on WSDL files"
+            },
+            "bin": [
+                "phpunit"
+            ],
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-main": "10.5-dev"
+                }
+            },
+            "autoload": {
+                "files": [
+                    "src/Framework/Assert/Functions.php"
+                ],
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de",
+                    "role": "lead"
+                }
+            ],
+            "description": "The PHP Unit Testing framework.",
+            "homepage": "https://phpunit.de/",
+            "keywords": [
+                "phpunit",
+                "testing",
+                "xunit"
+            ],
+            "support": {
+                "issues": "https://github.com/sebastianbergmann/phpunit/issues",
+                "security": "https://github.com/sebastianbergmann/phpunit/security/policy",
+                "source": "https://github.com/sebastianbergmann/phpunit/tree/10.5.3"
+            },
+            "funding": [
+                {
+                    "url": "https://phpunit.de/sponsors.html",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/sebastianbergmann",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/phpunit/phpunit",
+                    "type": "tidelift"
+                }
+            ],
+            "time": "2023-12-13T07:25:23+00:00"
+        },
+        {
+            "name": "sebastian/cli-parser",
+            "version": "2.0.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/cli-parser.git",
+                "reference": "efdc130dbbbb8ef0b545a994fd811725c5282cae"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/cli-parser/zipball/efdc130dbbbb8ef0b545a994fd811725c5282cae",
+                "reference": "efdc130dbbbb8ef0b545a994fd811725c5282cae",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=8.1"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^10.0"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-main": "2.0-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de",
+                    "role": "lead"
+                }
+            ],
+            "description": "Library for parsing CLI options",
+            "homepage": "https://github.com/sebastianbergmann/cli-parser",
+            "support": {
+                "issues": "https://github.com/sebastianbergmann/cli-parser/issues",
+                "source": "https://github.com/sebastianbergmann/cli-parser/tree/2.0.0"
+            },
+            "funding": [
+                {
+                    "url": "https://github.com/sebastianbergmann",
+                    "type": "github"
+                }
+            ],
+            "time": "2023-02-03T06:58:15+00:00"
+        },
+        {
+            "name": "sebastian/code-unit",
+            "version": "2.0.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/code-unit.git",
+                "reference": "a81fee9eef0b7a76af11d121767abc44c104e503"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/code-unit/zipball/a81fee9eef0b7a76af11d121767abc44c104e503",
+                "reference": "a81fee9eef0b7a76af11d121767abc44c104e503",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=8.1"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^10.0"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-main": "2.0-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de",
+                    "role": "lead"
+                }
+            ],
+            "description": "Collection of value objects that represent the PHP code units",
+            "homepage": "https://github.com/sebastianbergmann/code-unit",
+            "support": {
+                "issues": "https://github.com/sebastianbergmann/code-unit/issues",
+                "source": "https://github.com/sebastianbergmann/code-unit/tree/2.0.0"
+            },
+            "funding": [
+                {
+                    "url": "https://github.com/sebastianbergmann",
+                    "type": "github"
+                }
+            ],
+            "time": "2023-02-03T06:58:43+00:00"
+        },
+        {
+            "name": "sebastian/code-unit-reverse-lookup",
+            "version": "3.0.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/code-unit-reverse-lookup.git",
+                "reference": "5e3a687f7d8ae33fb362c5c0743794bbb2420a1d"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/code-unit-reverse-lookup/zipball/5e3a687f7d8ae33fb362c5c0743794bbb2420a1d",
+                "reference": "5e3a687f7d8ae33fb362c5c0743794bbb2420a1d",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=8.1"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^10.0"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-main": "3.0-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de"
+                }
+            ],
+            "description": "Looks up which function or method a line of code belongs to",
+            "homepage": "https://github.com/sebastianbergmann/code-unit-reverse-lookup/",
+            "support": {
+                "issues": "https://github.com/sebastianbergmann/code-unit-reverse-lookup/issues",
+                "source": "https://github.com/sebastianbergmann/code-unit-reverse-lookup/tree/3.0.0"
+            },
+            "funding": [
+                {
+                    "url": "https://github.com/sebastianbergmann",
+                    "type": "github"
+                }
+            ],
+            "time": "2023-02-03T06:59:15+00:00"
+        },
+        {
+            "name": "sebastian/comparator",
+            "version": "5.0.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/comparator.git",
+                "reference": "2db5010a484d53ebf536087a70b4a5423c102372"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/comparator/zipball/2db5010a484d53ebf536087a70b4a5423c102372",
+                "reference": "2db5010a484d53ebf536087a70b4a5423c102372",
+                "shasum": ""
+            },
+            "require": {
+                "ext-dom": "*",
+                "ext-mbstring": "*",
+                "php": ">=8.1",
+                "sebastian/diff": "^5.0",
+                "sebastian/exporter": "^5.0"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^10.3"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-main": "5.0-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de"
+                },
+                {
+                    "name": "Jeff Welch",
+                    "email": "whatthejeff@gmail.com"
+                },
+                {
+                    "name": "Volker Dusch",
+                    "email": "github@wallbash.com"
+                },
+                {
+                    "name": "Bernhard Schussek",
+                    "email": "bschussek@2bepublished.at"
+                }
+            ],
+            "description": "Provides the functionality to compare PHP values for equality",
+            "homepage": "https://github.com/sebastianbergmann/comparator",
+            "keywords": [
+                "comparator",
+                "compare",
+                "equality"
+            ],
+            "support": {
+                "issues": "https://github.com/sebastianbergmann/comparator/issues",
+                "security": "https://github.com/sebastianbergmann/comparator/security/policy",
+                "source": "https://github.com/sebastianbergmann/comparator/tree/5.0.1"
+            },
+            "funding": [
+                {
+                    "url": "https://github.com/sebastianbergmann",
+                    "type": "github"
+                }
+            ],
+            "time": "2023-08-14T13:18:12+00:00"
+        },
+        {
+            "name": "sebastian/complexity",
+            "version": "3.1.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/complexity.git",
+                "reference": "68cfb347a44871f01e33ab0ef8215966432f6957"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/complexity/zipball/68cfb347a44871f01e33ab0ef8215966432f6957",
+                "reference": "68cfb347a44871f01e33ab0ef8215966432f6957",
+                "shasum": ""
+            },
+            "require": {
+                "nikic/php-parser": "^4.10",
+                "php": ">=8.1"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^10.0"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-main": "3.1-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de",
+                    "role": "lead"
+                }
+            ],
+            "description": "Library for calculating the complexity of PHP code units",
+            "homepage": "https://github.com/sebastianbergmann/complexity",
+            "support": {
+                "issues": "https://github.com/sebastianbergmann/complexity/issues",
+                "security": "https://github.com/sebastianbergmann/complexity/security/policy",
+                "source": "https://github.com/sebastianbergmann/complexity/tree/3.1.0"
+            },
+            "funding": [
+                {
+                    "url": "https://github.com/sebastianbergmann",
+                    "type": "github"
+                }
+            ],
+            "time": "2023-09-28T11:50:59+00:00"
+        },
+        {
+            "name": "sebastian/diff",
+            "version": "5.0.3",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/diff.git",
+                "reference": "912dc2fbe3e3c1e7873313cc801b100b6c68c87b"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/diff/zipball/912dc2fbe3e3c1e7873313cc801b100b6c68c87b",
+                "reference": "912dc2fbe3e3c1e7873313cc801b100b6c68c87b",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=8.1"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^10.0",
+                "symfony/process": "^4.2 || ^5"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-main": "5.0-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de"
+                },
+                {
+                    "name": "Kore Nordmann",
+                    "email": "mail@kore-nordmann.de"
+                }
+            ],
+            "description": "Diff implementation",
+            "homepage": "https://github.com/sebastianbergmann/diff",
+            "keywords": [
+                "diff",
+                "udiff",
+                "unidiff",
+                "unified diff"
+            ],
+            "support": {
+                "issues": "https://github.com/sebastianbergmann/diff/issues",
+                "security": "https://github.com/sebastianbergmann/diff/security/policy",
+                "source": "https://github.com/sebastianbergmann/diff/tree/5.0.3"
+            },
+            "funding": [
+                {
+                    "url": "https://github.com/sebastianbergmann",
+                    "type": "github"
+                }
+            ],
+            "time": "2023-05-01T07:48:21+00:00"
+        },
+        {
+            "name": "sebastian/environment",
+            "version": "6.0.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/environment.git",
+                "reference": "43c751b41d74f96cbbd4e07b7aec9675651e2951"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/environment/zipball/43c751b41d74f96cbbd4e07b7aec9675651e2951",
+                "reference": "43c751b41d74f96cbbd4e07b7aec9675651e2951",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=8.1"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^10.0"
+            },
+            "suggest": {
+                "ext-posix": "*"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-main": "6.0-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de"
+                }
+            ],
+            "description": "Provides functionality to handle HHVM/PHP environments",
+            "homepage": "https://github.com/sebastianbergmann/environment",
+            "keywords": [
+                "Xdebug",
+                "environment",
+                "hhvm"
+            ],
+            "support": {
+                "issues": "https://github.com/sebastianbergmann/environment/issues",
+                "security": "https://github.com/sebastianbergmann/environment/security/policy",
+                "source": "https://github.com/sebastianbergmann/environment/tree/6.0.1"
+            },
+            "funding": [
+                {
+                    "url": "https://github.com/sebastianbergmann",
+                    "type": "github"
+                }
+            ],
+            "time": "2023-04-11T05:39:26+00:00"
+        },
+        {
+            "name": "sebastian/exporter",
+            "version": "5.1.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/exporter.git",
+                "reference": "64f51654862e0f5e318db7e9dcc2292c63cdbddc"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/exporter/zipball/64f51654862e0f5e318db7e9dcc2292c63cdbddc",
+                "reference": "64f51654862e0f5e318db7e9dcc2292c63cdbddc",
+                "shasum": ""
+            },
+            "require": {
+                "ext-mbstring": "*",
+                "php": ">=8.1",
+                "sebastian/recursion-context": "^5.0"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^10.0"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-main": "5.1-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de"
+                },
+                {
+                    "name": "Jeff Welch",
+                    "email": "whatthejeff@gmail.com"
+                },
+                {
+                    "name": "Volker Dusch",
+                    "email": "github@wallbash.com"
+                },
+                {
+                    "name": "Adam Harvey",
+                    "email": "aharvey@php.net"
+                },
+                {
+                    "name": "Bernhard Schussek",
+                    "email": "bschussek@gmail.com"
+                }
+            ],
+            "description": "Provides the functionality to export PHP variables for visualization",
+            "homepage": "https://www.github.com/sebastianbergmann/exporter",
+            "keywords": [
+                "export",
+                "exporter"
+            ],
+            "support": {
+                "issues": "https://github.com/sebastianbergmann/exporter/issues",
+                "security": "https://github.com/sebastianbergmann/exporter/security/policy",
+                "source": "https://github.com/sebastianbergmann/exporter/tree/5.1.1"
+            },
+            "funding": [
+                {
+                    "url": "https://github.com/sebastianbergmann",
+                    "type": "github"
+                }
+            ],
+            "time": "2023-09-24T13:22:09+00:00"
+        },
+        {
+            "name": "sebastian/global-state",
+            "version": "6.0.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/global-state.git",
+                "reference": "7ea9ead78f6d380d2a667864c132c2f7b83055e4"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/global-state/zipball/7ea9ead78f6d380d2a667864c132c2f7b83055e4",
+                "reference": "7ea9ead78f6d380d2a667864c132c2f7b83055e4",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=8.1",
+                "sebastian/object-reflector": "^3.0",
+                "sebastian/recursion-context": "^5.0"
+            },
+            "require-dev": {
+                "ext-dom": "*",
+                "phpunit/phpunit": "^10.0"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-main": "6.0-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de"
+                }
+            ],
+            "description": "Snapshotting of global state",
+            "homepage": "http://www.github.com/sebastianbergmann/global-state",
+            "keywords": [
+                "global state"
+            ],
+            "support": {
+                "issues": "https://github.com/sebastianbergmann/global-state/issues",
+                "security": "https://github.com/sebastianbergmann/global-state/security/policy",
+                "source": "https://github.com/sebastianbergmann/global-state/tree/6.0.1"
+            },
+            "funding": [
+                {
+                    "url": "https://github.com/sebastianbergmann",
+                    "type": "github"
+                }
+            ],
+            "time": "2023-07-19T07:19:23+00:00"
+        },
+        {
+            "name": "sebastian/lines-of-code",
+            "version": "2.0.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/lines-of-code.git",
+                "reference": "649e40d279e243d985aa8fb6e74dd5bb28dc185d"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/lines-of-code/zipball/649e40d279e243d985aa8fb6e74dd5bb28dc185d",
+                "reference": "649e40d279e243d985aa8fb6e74dd5bb28dc185d",
+                "shasum": ""
+            },
+            "require": {
+                "nikic/php-parser": "^4.10",
+                "php": ">=8.1"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^10.0"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-main": "2.0-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de",
+                    "role": "lead"
+                }
+            ],
+            "description": "Library for counting the lines of code in PHP source code",
+            "homepage": "https://github.com/sebastianbergmann/lines-of-code",
+            "support": {
+                "issues": "https://github.com/sebastianbergmann/lines-of-code/issues",
+                "security": "https://github.com/sebastianbergmann/lines-of-code/security/policy",
+                "source": "https://github.com/sebastianbergmann/lines-of-code/tree/2.0.1"
+            },
+            "funding": [
+                {
+                    "url": "https://github.com/sebastianbergmann",
+                    "type": "github"
+                }
+            ],
+            "time": "2023-08-31T09:25:50+00:00"
+        },
+        {
+            "name": "sebastian/object-enumerator",
+            "version": "5.0.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/object-enumerator.git",
+                "reference": "202d0e344a580d7f7d04b3fafce6933e59dae906"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/object-enumerator/zipball/202d0e344a580d7f7d04b3fafce6933e59dae906",
+                "reference": "202d0e344a580d7f7d04b3fafce6933e59dae906",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=8.1",
+                "sebastian/object-reflector": "^3.0",
+                "sebastian/recursion-context": "^5.0"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^10.0"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-main": "5.0-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de"
+                }
+            ],
+            "description": "Traverses array structures and object graphs to enumerate all referenced objects",
+            "homepage": "https://github.com/sebastianbergmann/object-enumerator/",
+            "support": {
+                "issues": "https://github.com/sebastianbergmann/object-enumerator/issues",
+                "source": "https://github.com/sebastianbergmann/object-enumerator/tree/5.0.0"
+            },
+            "funding": [
+                {
+                    "url": "https://github.com/sebastianbergmann",
+                    "type": "github"
+                }
+            ],
+            "time": "2023-02-03T07:08:32+00:00"
+        },
+        {
+            "name": "sebastian/object-reflector",
+            "version": "3.0.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/object-reflector.git",
+                "reference": "24ed13d98130f0e7122df55d06c5c4942a577957"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/object-reflector/zipball/24ed13d98130f0e7122df55d06c5c4942a577957",
+                "reference": "24ed13d98130f0e7122df55d06c5c4942a577957",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=8.1"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^10.0"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-main": "3.0-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de"
+                }
+            ],
+            "description": "Allows reflection of object attributes, including inherited and non-public ones",
+            "homepage": "https://github.com/sebastianbergmann/object-reflector/",
+            "support": {
+                "issues": "https://github.com/sebastianbergmann/object-reflector/issues",
+                "source": "https://github.com/sebastianbergmann/object-reflector/tree/3.0.0"
+            },
+            "funding": [
+                {
+                    "url": "https://github.com/sebastianbergmann",
+                    "type": "github"
+                }
+            ],
+            "time": "2023-02-03T07:06:18+00:00"
+        },
+        {
+            "name": "sebastian/recursion-context",
+            "version": "5.0.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/recursion-context.git",
+                "reference": "05909fb5bc7df4c52992396d0116aed689f93712"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/recursion-context/zipball/05909fb5bc7df4c52992396d0116aed689f93712",
+                "reference": "05909fb5bc7df4c52992396d0116aed689f93712",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=8.1"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^10.0"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-main": "5.0-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de"
+                },
+                {
+                    "name": "Jeff Welch",
+                    "email": "whatthejeff@gmail.com"
+                },
+                {
+                    "name": "Adam Harvey",
+                    "email": "aharvey@php.net"
+                }
+            ],
+            "description": "Provides functionality to recursively process PHP variables",
+            "homepage": "https://github.com/sebastianbergmann/recursion-context",
+            "support": {
+                "issues": "https://github.com/sebastianbergmann/recursion-context/issues",
+                "source": "https://github.com/sebastianbergmann/recursion-context/tree/5.0.0"
+            },
+            "funding": [
+                {
+                    "url": "https://github.com/sebastianbergmann",
+                    "type": "github"
+                }
+            ],
+            "time": "2023-02-03T07:05:40+00:00"
+        },
+        {
+            "name": "sebastian/type",
+            "version": "4.0.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/type.git",
+                "reference": "462699a16464c3944eefc02ebdd77882bd3925bf"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/type/zipball/462699a16464c3944eefc02ebdd77882bd3925bf",
+                "reference": "462699a16464c3944eefc02ebdd77882bd3925bf",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=8.1"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^10.0"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-main": "4.0-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de",
+                    "role": "lead"
+                }
+            ],
+            "description": "Collection of value objects that represent the types of the PHP type system",
+            "homepage": "https://github.com/sebastianbergmann/type",
+            "support": {
+                "issues": "https://github.com/sebastianbergmann/type/issues",
+                "source": "https://github.com/sebastianbergmann/type/tree/4.0.0"
+            },
+            "funding": [
+                {
+                    "url": "https://github.com/sebastianbergmann",
+                    "type": "github"
+                }
+            ],
+            "time": "2023-02-03T07:10:45+00:00"
+        },
+        {
+            "name": "sebastian/version",
+            "version": "4.0.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/version.git",
+                "reference": "c51fa83a5d8f43f1402e3f32a005e6262244ef17"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/version/zipball/c51fa83a5d8f43f1402e3f32a005e6262244ef17",
+                "reference": "c51fa83a5d8f43f1402e3f32a005e6262244ef17",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=8.1"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-main": "4.0-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de",
+                    "role": "lead"
+                }
+            ],
+            "description": "Library that helps with managing the version number of Git-hosted PHP projects",
+            "homepage": "https://github.com/sebastianbergmann/version",
+            "support": {
+                "issues": "https://github.com/sebastianbergmann/version/issues",
+                "source": "https://github.com/sebastianbergmann/version/tree/4.0.1"
+            },
+            "funding": [
+                {
+                    "url": "https://github.com/sebastianbergmann",
+                    "type": "github"
+                }
+            ],
+            "time": "2023-02-07T11:34:05+00:00"
+        },
+        {
+            "name": "spatie/backtrace",
+            "version": "1.5.3",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/spatie/backtrace.git",
+                "reference": "483f76a82964a0431aa836b6ed0edde0c248e3ab"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/spatie/backtrace/zipball/483f76a82964a0431aa836b6ed0edde0c248e3ab",
+                "reference": "483f76a82964a0431aa836b6ed0edde0c248e3ab",
+                "shasum": ""
+            },
+            "require": {
+                "php": "^7.3|^8.0"
+            },
+            "require-dev": {
+                "ext-json": "*",
+                "phpunit/phpunit": "^9.3",
+                "spatie/phpunit-snapshot-assertions": "^4.2",
+                "symfony/var-dumper": "^5.1"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "Spatie\\Backtrace\\": "src"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Freek Van de Herten",
+                    "email": "freek@spatie.be",
+                    "homepage": "https://spatie.be",
+                    "role": "Developer"
+                }
+            ],
+            "description": "A better backtrace",
+            "homepage": "https://github.com/spatie/backtrace",
+            "keywords": [
+                "Backtrace",
+                "spatie"
+            ],
+            "support": {
+                "source": "https://github.com/spatie/backtrace/tree/1.5.3"
+            },
+            "funding": [
+                {
+                    "url": "https://github.com/sponsors/spatie",
+                    "type": "github"
+                },
+                {
+                    "url": "https://spatie.be/open-source/support-us",
+                    "type": "other"
+                }
+            ],
+            "time": "2023-06-28T12:59:17+00:00"
+        },
+        {
+            "name": "spatie/flare-client-php",
+            "version": "1.4.3",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/spatie/flare-client-php.git",
+                "reference": "5db2fdd743c3ede33f2a5367d89ec1a7c9c1d1ec"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/spatie/flare-client-php/zipball/5db2fdd743c3ede33f2a5367d89ec1a7c9c1d1ec",
+                "reference": "5db2fdd743c3ede33f2a5367d89ec1a7c9c1d1ec",
+                "shasum": ""
+            },
+            "require": {
+                "illuminate/pipeline": "^8.0|^9.0|^10.0|^11.0",
+                "nesbot/carbon": "^2.62.1",
+                "php": "^8.0",
+                "spatie/backtrace": "^1.5.2",
+                "symfony/http-foundation": "^5.2|^6.0|^7.0",
+                "symfony/mime": "^5.2|^6.0|^7.0",
+                "symfony/process": "^5.2|^6.0|^7.0",
+                "symfony/var-dumper": "^5.2|^6.0|^7.0"
+            },
+            "require-dev": {
+                "dms/phpunit-arraysubset-asserts": "^0.5.0",
+                "pestphp/pest": "^1.20|^2.0",
+                "phpstan/extension-installer": "^1.1",
+                "phpstan/phpstan-deprecation-rules": "^1.0",
+                "phpstan/phpstan-phpunit": "^1.0",
+                "spatie/phpunit-snapshot-assertions": "^4.0|^5.0"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-main": "1.3.x-dev"
+                }
+            },
+            "autoload": {
+                "files": [
+                    "src/helpers.php"
+                ],
+                "psr-4": {
+                    "Spatie\\FlareClient\\": "src"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "description": "Send PHP errors to Flare",
+            "homepage": "https://github.com/spatie/flare-client-php",
+            "keywords": [
+                "exception",
+                "flare",
+                "reporting",
+                "spatie"
+            ],
+            "support": {
+                "issues": "https://github.com/spatie/flare-client-php/issues",
+                "source": "https://github.com/spatie/flare-client-php/tree/1.4.3"
+            },
+            "funding": [
+                {
+                    "url": "https://github.com/spatie",
+                    "type": "github"
+                }
+            ],
+            "time": "2023-10-17T15:54:07+00:00"
+        },
+        {
+            "name": "spatie/ignition",
+            "version": "1.11.3",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/spatie/ignition.git",
+                "reference": "3d886de644ff7a5b42e4d27c1e1f67c8b5f00044"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/spatie/ignition/zipball/3d886de644ff7a5b42e4d27c1e1f67c8b5f00044",
+                "reference": "3d886de644ff7a5b42e4d27c1e1f67c8b5f00044",
+                "shasum": ""
+            },
+            "require": {
+                "ext-json": "*",
+                "ext-mbstring": "*",
+                "php": "^8.0",
+                "spatie/backtrace": "^1.5.3",
+                "spatie/flare-client-php": "^1.4.0",
+                "symfony/console": "^5.4|^6.0|^7.0",
+                "symfony/var-dumper": "^5.4|^6.0|^7.0"
+            },
+            "require-dev": {
+                "illuminate/cache": "^9.52|^10.0|^11.0",
+                "mockery/mockery": "^1.4",
+                "pestphp/pest": "^1.20|^2.0",
+                "phpstan/extension-installer": "^1.1",
+                "phpstan/phpstan-deprecation-rules": "^1.0",
+                "phpstan/phpstan-phpunit": "^1.0",
+                "psr/simple-cache-implementation": "*",
+                "symfony/cache": "^5.4|^6.0|^7.0",
+                "symfony/process": "^5.4|^6.0|^7.0",
+                "vlucas/phpdotenv": "^5.5"
+            },
+            "suggest": {
+                "openai-php/client": "Require get solutions from OpenAI",
+                "simple-cache-implementation": "To cache solutions from OpenAI"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-main": "1.5.x-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Spatie\\Ignition\\": "src"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Spatie",
+                    "email": "info@spatie.be",
+                    "role": "Developer"
+                }
+            ],
+            "description": "A beautiful error page for PHP applications.",
+            "homepage": "https://flareapp.io/ignition",
+            "keywords": [
+                "error",
+                "flare",
+                "laravel",
+                "page"
+            ],
+            "support": {
+                "docs": "https://flareapp.io/docs/ignition-for-laravel/introduction",
+                "forum": "https://twitter.com/flareappio",
+                "issues": "https://github.com/spatie/ignition/issues",
+                "source": "https://github.com/spatie/ignition"
+            },
+            "funding": [
+                {
+                    "url": "https://github.com/spatie",
+                    "type": "github"
+                }
+            ],
+            "time": "2023-10-18T14:09:40+00:00"
+        },
+        {
+            "name": "spatie/laravel-ignition",
+            "version": "2.3.3",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/spatie/laravel-ignition.git",
+                "reference": "66499cd3c858642ded56dafb8fa0352057ca20dd"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/spatie/laravel-ignition/zipball/66499cd3c858642ded56dafb8fa0352057ca20dd",
+                "reference": "66499cd3c858642ded56dafb8fa0352057ca20dd",
+                "shasum": ""
+            },
+            "require": {
+                "ext-curl": "*",
+                "ext-json": "*",
+                "ext-mbstring": "*",
+                "illuminate/support": "^10.0",
+                "php": "^8.1",
+                "spatie/flare-client-php": "^1.3.5",
+                "spatie/ignition": "^1.9",
+                "symfony/console": "^6.2.3",
+                "symfony/var-dumper": "^6.2.3"
+            },
+            "require-dev": {
+                "livewire/livewire": "^2.11",
+                "mockery/mockery": "^1.5.1",
+                "openai-php/client": "^0.3.4",
+                "orchestra/testbench": "^8.0",
+                "pestphp/pest": "^1.22.3",
+                "phpstan/extension-installer": "^1.2",
+                "phpstan/phpstan-deprecation-rules": "^1.1.1",
+                "phpstan/phpstan-phpunit": "^1.3.3",
+                "vlucas/phpdotenv": "^5.5"
+            },
+            "suggest": {
+                "openai-php/client": "Require get solutions from OpenAI",
+                "psr/simple-cache-implementation": "Needed to cache solutions from OpenAI"
+            },
+            "type": "library",
+            "extra": {
+                "laravel": {
+                    "providers": [
+                        "Spatie\\LaravelIgnition\\IgnitionServiceProvider"
+                    ],
+                    "aliases": {
+                        "Flare": "Spatie\\LaravelIgnition\\Facades\\Flare"
+                    }
+                }
+            },
+            "autoload": {
+                "files": [
+                    "src/helpers.php"
+                ],
+                "psr-4": {
+                    "Spatie\\LaravelIgnition\\": "src"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Spatie",
+                    "email": "info@spatie.be",
+                    "role": "Developer"
+                }
+            ],
+            "description": "A beautiful error page for Laravel applications.",
+            "homepage": "https://flareapp.io/ignition",
+            "keywords": [
+                "error",
+                "flare",
+                "laravel",
+                "page"
+            ],
+            "support": {
+                "docs": "https://flareapp.io/docs/ignition-for-laravel/introduction",
+                "forum": "https://twitter.com/flareappio",
+                "issues": "https://github.com/spatie/laravel-ignition/issues",
+                "source": "https://github.com/spatie/laravel-ignition"
+            },
+            "funding": [
+                {
+                    "url": "https://github.com/spatie",
+                    "type": "github"
+                }
+            ],
+            "time": "2023-12-21T09:43:05+00:00"
+        },
+        {
+            "name": "theseer/tokenizer",
+            "version": "1.2.2",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/theseer/tokenizer.git",
+                "reference": "b2ad5003ca10d4ee50a12da31de12a5774ba6b96"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/theseer/tokenizer/zipball/b2ad5003ca10d4ee50a12da31de12a5774ba6b96",
+                "reference": "b2ad5003ca10d4ee50a12da31de12a5774ba6b96",
+                "shasum": ""
+            },
+            "require": {
+                "ext-dom": "*",
+                "ext-tokenizer": "*",
+                "ext-xmlwriter": "*",
+                "php": "^7.2 || ^8.0"
+            },
+            "type": "library",
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Arne Blankerts",
+                    "email": "arne@blankerts.de",
+                    "role": "Developer"
+                }
+            ],
+            "description": "A small library for converting tokenized PHP source code into XML and potentially other formats",
+            "support": {
+                "issues": "https://github.com/theseer/tokenizer/issues",
+                "source": "https://github.com/theseer/tokenizer/tree/1.2.2"
+            },
+            "funding": [
+                {
+                    "url": "https://github.com/theseer",
+                    "type": "github"
+                }
+            ],
+            "time": "2023-11-20T00:12:19+00:00"
+        }
+    ],
+    "aliases": [],
+    "minimum-stability": "stable",
+    "stability-flags": [],
+    "prefer-stable": true,
+    "prefer-lowest": false,
+    "platform": {
+        "php": "^8.1"
+    },
+    "platform-dev": [],
+    "plugin-api-version": "2.6.0"
+}
diff --git a/config/app.php b/config/app.php
index c9d7d3e103..1cabee1679 100644
--- a/config/app.php
+++ b/config/app.php
@@ -13,7 +13,7 @@
     |
     */
 
-    'name' => env('APP_NAME', 'Lorekeeper'),
+    'name'            => env('APP_NAME', 'Lorekeeper'),
 
     /*
     |--------------------------------------------------------------------------
@@ -26,7 +26,7 @@
     |
     */
 
-    'env' => env('APP_ENV', 'production'),
+    'env'             => env('APP_ENV', 'production'),
 
     /*
     |--------------------------------------------------------------------------
@@ -39,7 +39,7 @@
     |
     */
 
-    'debug' => env('APP_DEBUG', false),
+    'debug'           => env('APP_DEBUG', false),
 
     /*
     |--------------------------------------------------------------------------
@@ -52,9 +52,9 @@
     |
     */
 
-    'url' => env('APP_URL', 'http://localhost'),
+    'url'             => env('APP_URL', 'http://localhost'),
 
-    'asset_url' => env('ASSET_URL', null),
+    'asset_url'       => env('ASSET_URL', null),
 
     /*
     |--------------------------------------------------------------------------
@@ -67,7 +67,7 @@
     |
     */
 
-    'timezone' => 'UTC',
+    'timezone'        => 'UTC',
 
     /*
     |--------------------------------------------------------------------------
@@ -80,7 +80,7 @@
     |
     */
 
-    'locale' => 'en',
+    'locale'          => 'en',
 
     /*
     |--------------------------------------------------------------------------
@@ -106,7 +106,7 @@
     |
     */
 
-    'faker_locale' => 'en_US',
+    'faker_locale'    => 'en_US',
 
     /*
     |--------------------------------------------------------------------------
@@ -119,9 +119,9 @@
     |
     */
 
-    'key' => env('APP_KEY'),
+    'key'             => env('APP_KEY'),
 
-    'cipher' => 'AES-256-CBC',
+    'cipher'          => 'AES-256-CBC',
 
     /*
     |--------------------------------------------------------------------------
@@ -134,7 +134,7 @@
     |
     */
 
-    'providers' => [
+    'providers'       => [
 
         /*
          * Laravel Framework Service Providers...
@@ -179,6 +179,7 @@
         App\Providers\NotificationsProvider::class,
         App\Providers\CommentProvider::class,
         Intervention\Image\ImageServiceProvider::class,
+        App\Providers\FortifyServiceProvider::class,
 
     ],
 
@@ -193,48 +194,48 @@
     |
     */
 
-    'aliases' => [
-
-        'App' => Illuminate\Support\Facades\App::class,
-        'Arr' => Illuminate\Support\Arr::class,
-        'Artisan' => Illuminate\Support\Facades\Artisan::class,
-        'Auth' => Illuminate\Support\Facades\Auth::class,
-        'Blade' => Illuminate\Support\Facades\Blade::class,
-        'Broadcast' => Illuminate\Support\Facades\Broadcast::class,
-        'Bus' => Illuminate\Support\Facades\Bus::class,
-        'Cache' => Illuminate\Support\Facades\Cache::class,
-        'Config' => Illuminate\Support\Facades\Config::class,
-        'Cookie' => Illuminate\Support\Facades\Cookie::class,
-        'Crypt' => Illuminate\Support\Facades\Crypt::class,
-        'DB' => Illuminate\Support\Facades\DB::class,
-        'Eloquent' => Illuminate\Database\Eloquent\Model::class,
-        'Event' => Illuminate\Support\Facades\Event::class,
-        'File' => Illuminate\Support\Facades\File::class,
-        'Gate' => Illuminate\Support\Facades\Gate::class,
-        'Hash' => Illuminate\Support\Facades\Hash::class,
-        'Lang' => Illuminate\Support\Facades\Lang::class,
-        'Log' => Illuminate\Support\Facades\Log::class,
-        'Mail' => Illuminate\Support\Facades\Mail::class,
-        'Notification' => Illuminate\Support\Facades\Notification::class,
-        'Password' => Illuminate\Support\Facades\Password::class,
-        'Queue' => Illuminate\Support\Facades\Queue::class,
-        'Redirect' => Illuminate\Support\Facades\Redirect::class,
-        'Redis' => Illuminate\Support\Facades\Redis::class,
-        'Request' => Illuminate\Support\Facades\Request::class,
-        'Response' => Illuminate\Support\Facades\Response::class,
-        'Route' => Illuminate\Support\Facades\Route::class,
-        'Schema' => Illuminate\Support\Facades\Schema::class,
-        'Session' => Illuminate\Support\Facades\Session::class,
-        'Storage' => Illuminate\Support\Facades\Storage::class,
-        'Str' => Illuminate\Support\Str::class,
-        'URL' => Illuminate\Support\Facades\URL::class,
-        'Validator' => Illuminate\Support\Facades\Validator::class,
-        'View' => Illuminate\Support\Facades\View::class,
-        'Form' => Collective\Html\FormFacade::class,
-        'Html' => Collective\Html\HtmlFacade::class,
-        'Settings' => App\Facades\Settings::class,
+    'aliases'         => [
+
+        'App'           => Illuminate\Support\Facades\App::class,
+        'Arr'           => Illuminate\Support\Arr::class,
+        'Artisan'       => Illuminate\Support\Facades\Artisan::class,
+        'Auth'          => Illuminate\Support\Facades\Auth::class,
+        'Blade'         => Illuminate\Support\Facades\Blade::class,
+        'Broadcast'     => Illuminate\Support\Facades\Broadcast::class,
+        'Bus'           => Illuminate\Support\Facades\Bus::class,
+        'Cache'         => Illuminate\Support\Facades\Cache::class,
+        'Config'        => Illuminate\Support\Facades\Config::class,
+        'Cookie'        => Illuminate\Support\Facades\Cookie::class,
+        'Crypt'         => Illuminate\Support\Facades\Crypt::class,
+        'DB'            => Illuminate\Support\Facades\DB::class,
+        'Eloquent'      => Illuminate\Database\Eloquent\Model::class,
+        'Event'         => Illuminate\Support\Facades\Event::class,
+        'File'          => Illuminate\Support\Facades\File::class,
+        'Gate'          => Illuminate\Support\Facades\Gate::class,
+        'Hash'          => Illuminate\Support\Facades\Hash::class,
+        'Lang'          => Illuminate\Support\Facades\Lang::class,
+        'Log'           => Illuminate\Support\Facades\Log::class,
+        'Mail'          => Illuminate\Support\Facades\Mail::class,
+        'Notification'  => Illuminate\Support\Facades\Notification::class,
+        'Password'      => Illuminate\Support\Facades\Password::class,
+        'Queue'         => Illuminate\Support\Facades\Queue::class,
+        'Redirect'      => Illuminate\Support\Facades\Redirect::class,
+        'Redis'         => Illuminate\Support\Facades\Redis::class,
+        'Request'       => Illuminate\Support\Facades\Request::class,
+        'Response'      => Illuminate\Support\Facades\Response::class,
+        'Route'         => Illuminate\Support\Facades\Route::class,
+        'Schema'        => Illuminate\Support\Facades\Schema::class,
+        'Session'       => Illuminate\Support\Facades\Session::class,
+        'Storage'       => Illuminate\Support\Facades\Storage::class,
+        'Str'           => Illuminate\Support\Str::class,
+        'URL'           => Illuminate\Support\Facades\URL::class,
+        'Validator'     => Illuminate\Support\Facades\Validator::class,
+        'View'          => Illuminate\Support\Facades\View::class,
+        'Form'          => Collective\Html\FormFacade::class,
+        'Html'          => Collective\Html\HtmlFacade::class,
+        'Settings'      => App\Facades\Settings::class,
         'Notifications' => App\Facades\Notifications::class,
-        'Image' => Intervention\Image\Facades\Image::class
+        'Image'         => Intervention\Image\Facades\Image::class,
 
     ],
 
diff --git a/config/auth.php b/config/auth.php
index ef343f027d..02f37b825a 100644
--- a/config/auth.php
+++ b/config/auth.php
@@ -13,8 +13,8 @@
     |
     */
 
-    'defaults' => [
-        'guard' => 'web',
+    'defaults'  => [
+        'guard'     => 'web',
         'passwords' => 'users',
     ],
 
@@ -35,16 +35,16 @@
     |
     */
 
-    'guards' => [
+    'guards'    => [
         'web' => [
-            'driver' => 'session',
+            'driver'   => 'session',
             'provider' => 'users',
         ],
 
         'api' => [
-            'driver' => 'token',
+            'driver'   => 'token',
             'provider' => 'users',
-            'hash' => false,
+            'hash'     => false,
         ],
     ],
 
@@ -68,7 +68,7 @@
     'providers' => [
         'users' => [
             'driver' => 'eloquent',
-            'model' => App\Models\User\User::class,
+            'model'  => App\Models\User\User::class,
         ],
 
         // 'users' => [
@@ -95,8 +95,8 @@
     'passwords' => [
         'users' => [
             'provider' => 'users',
-            'table' => 'password_resets',
-            'expire' => 60,
+            'table'    => 'password_resets',
+            'expire'   => 60,
         ],
     ],
 
diff --git a/config/broadcasting.php b/config/broadcasting.php
index 3ca45eaa85..e518f964e8 100644
--- a/config/broadcasting.php
+++ b/config/broadcasting.php
@@ -15,7 +15,7 @@
     |
     */
 
-    'default' => env('BROADCAST_DRIVER', 'null'),
+    'default'     => env('BROADCAST_DRIVER', 'null'),
 
     /*
     |--------------------------------------------------------------------------
@@ -31,26 +31,26 @@
     'connections' => [
 
         'pusher' => [
-            'driver' => 'pusher',
-            'key' => env('PUSHER_APP_KEY'),
-            'secret' => env('PUSHER_APP_SECRET'),
-            'app_id' => env('PUSHER_APP_ID'),
+            'driver'  => 'pusher',
+            'key'     => env('PUSHER_APP_KEY'),
+            'secret'  => env('PUSHER_APP_SECRET'),
+            'app_id'  => env('PUSHER_APP_ID'),
             'options' => [
-                'cluster' => env('PUSHER_APP_CLUSTER'),
+                'cluster'   => env('PUSHER_APP_CLUSTER'),
                 'encrypted' => true,
             ],
         ],
 
-        'redis' => [
-            'driver' => 'redis',
+        'redis'  => [
+            'driver'     => 'redis',
             'connection' => 'default',
         ],
 
-        'log' => [
+        'log'    => [
             'driver' => 'log',
         ],
 
-        'null' => [
+        'null'   => [
             'driver' => 'null',
         ],
 
diff --git a/config/cache.php b/config/cache.php
index 49767228e2..6f589327c2 100644
--- a/config/cache.php
+++ b/config/cache.php
@@ -31,57 +31,57 @@
     |
     */
 
-    'stores' => [
+    'stores'  => [
 
-        'apc' => [
+        'apc'       => [
             'driver' => 'apc',
         ],
 
-        'array' => [
+        'array'     => [
             'driver' => 'array',
         ],
 
-        'database' => [
-            'driver' => 'database',
-            'table' => 'cache',
+        'database'  => [
+            'driver'     => 'database',
+            'table'      => 'cache',
             'connection' => null,
         ],
 
-        'file' => [
+        'file'      => [
             'driver' => 'file',
-            'path' => storage_path('framework/cache/data'),
+            'path'   => storage_path('framework/cache/data'),
         ],
 
         'memcached' => [
-            'driver' => 'memcached',
+            'driver'        => 'memcached',
             'persistent_id' => env('MEMCACHED_PERSISTENT_ID'),
-            'sasl' => [
+            'sasl'          => [
                 env('MEMCACHED_USERNAME'),
                 env('MEMCACHED_PASSWORD'),
             ],
-            'options' => [
+            'options'       => [
                 // Memcached::OPT_CONNECT_TIMEOUT => 2000,
             ],
-            'servers' => [
+            'servers'       => [
                 [
-                    'host' => env('MEMCACHED_HOST', '127.0.0.1'),
-                    'port' => env('MEMCACHED_PORT', 11211),
+                    'host'   => env('MEMCACHED_HOST', '127.0.0.1'),
+                    'port'   => env('MEMCACHED_PORT', 11211),
                     'weight' => 100,
                 ],
             ],
         ],
 
-        'redis' => [
-            'driver' => 'redis',
+        'redis'     => [
+            'driver'     => 'redis',
             'connection' => 'cache',
         ],
 
-        'dynamodb' => [
+        'dynamodb'  => [
             'driver' => 'dynamodb',
-            'key' => env('AWS_ACCESS_KEY_ID'),
+            'key'    => env('AWS_ACCESS_KEY_ID'),
             'secret' => env('AWS_SECRET_ACCESS_KEY'),
             'region' => env('AWS_REGION', 'us-east-1'),
-            'table' => env('DYNAMODB_CACHE_TABLE', 'cache'),
+            'table'  => env('DYNAMODB_CACHE_TABLE', 'cache'),
         ],
 
     ],
@@ -97,6 +97,6 @@
     |
     */
 
-    'prefix' => env('CACHE_PREFIX', Str::slug(env('APP_NAME', 'laravel'), '_').'_cache'),
+    'prefix'  => env('CACHE_PREFIX', Str::slug(env('APP_NAME', 'laravel'), '_').'_cache'),
 
 ];
diff --git a/config/database.php b/config/database.php
index 77c31843e0..ab147043c4 100644
--- a/config/database.php
+++ b/config/database.php
@@ -13,7 +13,7 @@
     |
     */
 
-    'default' => env('DB_CONNECTION', 'mysql'),
+    'default'     => env('DB_CONNECTION', 'mysql'),
 
     /*
     |--------------------------------------------------------------------------
@@ -34,54 +34,54 @@
     'connections' => [
 
         'sqlite' => [
-            'driver' => 'sqlite',
-            'database' => env('DB_DATABASE', database_path('database.sqlite')),
-            'prefix' => '',
+            'driver'                  => 'sqlite',
+            'database'                => env('DB_DATABASE', database_path('database.sqlite')),
+            'prefix'                  => '',
             'foreign_key_constraints' => env('DB_FOREIGN_KEYS', true),
         ],
 
-        'mysql' => [
-            'driver' => 'mysql',
-            'host' => env('DB_HOST', '127.0.0.1'),
-            'port' => env('DB_PORT', '3306'),
-            'database' => env('DB_DATABASE', 'forge'),
-            'username' => env('DB_USERNAME', 'forge'),
-            'password' => env('DB_PASSWORD', ''),
-            'unix_socket' => env('DB_SOCKET', ''),
-            'charset' => 'utf8mb4',
-            'collation' => 'utf8mb4_unicode_ci',
-            'prefix' => '',
+        'mysql'  => [
+            'driver'         => 'mysql',
+            'host'           => env('DB_HOST', '127.0.0.1'),
+            'port'           => env('DB_PORT', '3306'),
+            'database'       => env('DB_DATABASE', 'forge'),
+            'username'       => env('DB_USERNAME', 'forge'),
+            'password'       => env('DB_PASSWORD', ''),
+            'unix_socket'    => env('DB_SOCKET', ''),
+            'charset'        => 'utf8mb4',
+            'collation'      => 'utf8mb4_unicode_ci',
+            'prefix'         => '',
             'prefix_indexes' => true,
-            'strict' => true,
-            'engine' => null,
-            'options' => array_filter([
+            'strict'         => true,
+            'engine'         => null,
+            'options'        => array_filter([
                 PDO::MYSQL_ATTR_SSL_CA => env('MYSQL_ATTR_SSL_CA'),
             ]),
         ],
 
-        'pgsql' => [
-            'driver' => 'pgsql',
-            'host' => env('DB_HOST', '127.0.0.1'),
-            'port' => env('DB_PORT', '5432'),
-            'database' => env('DB_DATABASE', 'forge'),
-            'username' => env('DB_USERNAME', 'forge'),
-            'password' => env('DB_PASSWORD', ''),
-            'charset' => 'utf8',
-            'prefix' => '',
+        'pgsql'  => [
+            'driver'         => 'pgsql',
+            'host'           => env('DB_HOST', '127.0.0.1'),
+            'port'           => env('DB_PORT', '5432'),
+            'database'       => env('DB_DATABASE', 'forge'),
+            'username'       => env('DB_USERNAME', 'forge'),
+            'password'       => env('DB_PASSWORD', ''),
+            'charset'        => 'utf8',
+            'prefix'         => '',
             'prefix_indexes' => true,
-            'schema' => 'public',
-            'sslmode' => 'prefer',
+            'schema'         => 'public',
+            'sslmode'        => 'prefer',
         ],
 
         'sqlsrv' => [
-            'driver' => 'sqlsrv',
-            'host' => env('DB_HOST', 'localhost'),
-            'port' => env('DB_PORT', '1433'),
-            'database' => env('DB_DATABASE', 'forge'),
-            'username' => env('DB_USERNAME', 'forge'),
-            'password' => env('DB_PASSWORD', ''),
-            'charset' => 'utf8',
-            'prefix' => '',
+            'driver'         => 'sqlsrv',
+            'host'           => env('DB_HOST', 'localhost'),
+            'port'           => env('DB_PORT', '1433'),
+            'database'       => env('DB_DATABASE', 'forge'),
+            'username'       => env('DB_USERNAME', 'forge'),
+            'password'       => env('DB_PASSWORD', ''),
+            'charset'        => 'utf8',
+            'prefix'         => '',
             'prefix_indexes' => true,
         ],
 
@@ -98,7 +98,7 @@
     |
     */
 
-    'migrations' => 'migrations',
+    'migrations'  => 'migrations',
 
     /*
     |--------------------------------------------------------------------------
@@ -111,25 +111,25 @@
     |
     */
 
-    'redis' => [
+    'redis'       => [
 
-        'client' => env('REDIS_CLIENT', 'predis'),
+        'client'  => env('REDIS_CLIENT', 'predis'),
 
         'options' => [
             'cluster' => env('REDIS_CLUSTER', 'predis'),
         ],
 
         'default' => [
-            'host' => env('REDIS_HOST', '127.0.0.1'),
+            'host'     => env('REDIS_HOST', '127.0.0.1'),
             'password' => env('REDIS_PASSWORD', null),
-            'port' => env('REDIS_PORT', 6379),
+            'port'     => env('REDIS_PORT', 6379),
             'database' => env('REDIS_DB', 0),
         ],
 
-        'cache' => [
-            'host' => env('REDIS_HOST', '127.0.0.1'),
+        'cache'   => [
+            'host'     => env('REDIS_HOST', '127.0.0.1'),
             'password' => env('REDIS_PASSWORD', null),
-            'port' => env('REDIS_PORT', 6379),
+            'port'     => env('REDIS_PORT', 6379),
             'database' => env('REDIS_CACHE_DB', 1),
         ],
 
diff --git a/config/feed.php b/config/feed.php
new file mode 100644
index 0000000000..1369aec0be
--- /dev/null
+++ b/config/feed.php
@@ -0,0 +1,89 @@
+<?php
+
+return [
+    'feeds' => [
+        'news'  => [
+            /*
+             * Here you can specify which class and method will return
+             * the items that should appear in the feed. For example:
+             * 'App\Model@getAllFeedItems'
+             *
+             * You can also pass an argument to that method:
+             * ['App\Model@getAllFeedItems', 'argument']
+             */
+            'items'       => 'App\Models\News@getFeedItems',
+
+            /*
+             * The feed will be available on this url.
+             */
+            'url'         => '/news',
+
+            'title'       => env('APP_NAME', 'Laravel').' ・ News',
+            'description' => 'Site news.',
+            'language'    => 'en-US',
+
+            /*
+             * The format of the feed.  Acceptable values are 'rss', 'atom', or 'json'.
+             */
+            'format'      => 'atom',
+
+            /*
+             * The view that will render the feed.
+             */
+            'view'        => 'feed::atom',
+
+            /*
+             * The type to be used in the <link> tag
+             */
+            'type'        => '',
+
+            /*
+             * The content type for the feed response.  Set to an empty string to automatically
+             * determine the correct value.
+             */
+            'contentType' => '',
+        ],
+
+        'sales' => [
+            /*
+             * Here you can specify which class and method will return
+             * the items that should appear in the feed. For example:
+             * 'App\Model@getAllFeedItems'
+             *
+             * You can also pass an argument to that method:
+             * ['App\Model@getAllFeedItems', 'argument']
+             */
+            'items'       => 'App\Models\Sales\Sales@getFeedItems',
+
+            /*
+             * The feed will be available on this url.
+             */
+            'url'         => '/sales',
+
+            'title'       => env('APP_NAME', 'Laravel').' ・ Sales',
+            'description' => 'Site news.',
+            'language'    => 'en-US',
+
+            /*
+             * The format of the feed.  Acceptable values are 'rss', 'atom', or 'json'.
+             */
+            'format'      => 'atom',
+
+            /*
+             * The view that will render the feed.
+             */
+            'view'        => 'feed::atom',
+
+            /*
+             * The type to be used in the <link> tag
+             */
+            'type'        => '',
+
+            /*
+             * The content type for the feed response.  Set to an empty string to automatically
+             * determine the correct value.
+             */
+            'contentType' => '',
+        ],
+    ],
+];
diff --git a/config/filesystems.php b/config/filesystems.php
index 77fa5ded1d..7907e7b1b4 100644
--- a/config/filesystems.php
+++ b/config/filesystems.php
@@ -26,7 +26,7 @@
     |
     */
 
-    'cloud' => env('FILESYSTEM_CLOUD', 's3'),
+    'cloud'   => env('FILESYSTEM_CLOUD', 's3'),
 
     /*
     |--------------------------------------------------------------------------
@@ -41,27 +41,27 @@
     |
     */
 
-    'disks' => [
+    'disks'   => [
 
-        'local' => [
+        'local'  => [
             'driver' => 'local',
-            'root' => storage_path('app'),
+            'root'   => storage_path('app'),
         ],
 
         'public' => [
-            'driver' => 'local',
-            'root' => storage_path('app/public'),
-            'url' => env('APP_URL').'/storage',
+            'driver'     => 'local',
+            'root'       => storage_path('app/public'),
+            'url'        => env('APP_URL').'/storage',
             'visibility' => 'public',
         ],
 
-        's3' => [
+        's3'     => [
             'driver' => 's3',
-            'key' => env('AWS_ACCESS_KEY_ID'),
+            'key'    => env('AWS_ACCESS_KEY_ID'),
             'secret' => env('AWS_SECRET_ACCESS_KEY'),
             'region' => env('AWS_DEFAULT_REGION'),
             'bucket' => env('AWS_BUCKET'),
-            'url' => env('AWS_URL'),
+            'url'    => env('AWS_URL'),
         ],
 
     ],
diff --git a/config/fortify.php b/config/fortify.php
new file mode 100644
index 0000000000..85501c00d3
--- /dev/null
+++ b/config/fortify.php
@@ -0,0 +1,145 @@
+<?php
+
+use App\Providers\RouteServiceProvider;
+use Laravel\Fortify\Features;
+
+return [
+
+    /*
+    |--------------------------------------------------------------------------
+    | Fortify Guard
+    |--------------------------------------------------------------------------
+    |
+    | Here you may specify which authentication guard Fortify will use while
+    | authenticating users. This value should correspond with one of your
+    | guards that is already present in your "auth" configuration file.
+    |
+    */
+
+    'guard' => 'web',
+
+    /*
+    |--------------------------------------------------------------------------
+    | Fortify Password Broker
+    |--------------------------------------------------------------------------
+    |
+    | Here you may specify which password broker Fortify can use when a user
+    | is resetting their password. This configured value should match one
+    | of your password brokers setup in your "auth" configuration file.
+    |
+    */
+
+    'passwords' => 'users',
+
+    /*
+    |--------------------------------------------------------------------------
+    | Username / Email
+    |--------------------------------------------------------------------------
+    |
+    | This value defines which model attribute should be considered as your
+    | application's "username" field. Typically, this might be the email
+    | address of the users but you are free to change this value here.
+    |
+    | Out of the box, Fortify expects forgot password and reset password
+    | requests to have a field named 'email'. If the application uses
+    | another name for the field you may define it below as needed.
+    |
+    */
+
+    'username' => 'email',
+
+    'email' => 'email',
+
+    /*
+    |--------------------------------------------------------------------------
+    | Home Path
+    |--------------------------------------------------------------------------
+    |
+    | Here you may configure the path where users will get redirected during
+    | authentication or password reset when the operations are successful
+    | and the user is authenticated. You are free to change this value.
+    |
+    */
+
+    'home' => RouteServiceProvider::HOME,
+
+    /*
+    |--------------------------------------------------------------------------
+    | Fortify Routes Prefix / Subdomain
+    |--------------------------------------------------------------------------
+    |
+    | Here you may specify which prefix Fortify will assign to all the routes
+    | that it registers with the application. If necessary, you may change
+    | subdomain under which all of the Fortify routes will be available.
+    |
+    */
+
+    'prefix' => '',
+
+    'domain' => null,
+
+    /*
+    |--------------------------------------------------------------------------
+    | Fortify Routes Middleware
+    |--------------------------------------------------------------------------
+    |
+    | Here you may specify which middleware Fortify will assign to the routes
+    | that it registers with the application. If necessary, you may change
+    | these middleware but typically this provided default is preferred.
+    |
+    */
+
+    'middleware' => ['web', \Spatie\Honeypot\ProtectAgainstSpam::class],
+
+    /*
+    |--------------------------------------------------------------------------
+    | Rate Limiting
+    |--------------------------------------------------------------------------
+    |
+    | By default, Fortify will throttle logins to five requests per minute for
+    | every email and IP address combination. However, if you would like to
+    | specify a custom rate limiter to call then you may specify it here.
+    |
+    */
+
+    'limiters' => [
+        'login'      => 'login',
+        'two-factor' => 'two-factor',
+    ],
+
+    /*
+    |--------------------------------------------------------------------------
+    | Register View Routes
+    |--------------------------------------------------------------------------
+    |
+    | Here you may specify if the routes returning views should be disabled as
+    | you may not need them when building your own application. This may be
+    | especially true if you're writing a custom single-page application.
+    |
+    */
+
+    'views' => true,
+
+    /*
+    |--------------------------------------------------------------------------
+    | Features
+    |--------------------------------------------------------------------------
+    |
+    | Some of the Fortify features are optional. You may disable the features
+    | by removing them from this array. You're free to only remove some of
+    | these features or you can even remove all of these if you need to.
+    |
+    */
+
+    'features' => [
+        Features::registration(),
+        Features::resetPasswords(),
+        Features::emailVerification(),
+        // Features::updateProfileInformation(),
+        // Features::updatePasswords(),
+        Features::twoFactorAuthentication([
+            'confirmPassword' => true,
+        ]),
+    ],
+
+];
diff --git a/config/hashing.php b/config/hashing.php
index 842577087c..0abe6127ca 100644
--- a/config/hashing.php
+++ b/config/hashing.php
@@ -43,10 +43,10 @@
     |
     */
 
-    'argon' => [
-        'memory' => 1024,
+    'argon'  => [
+        'memory'  => 1024,
         'threads' => 2,
-        'time' => 2,
+        'time'    => 2,
     ],
 
 ];
diff --git a/config/honeypot.php b/config/honeypot.php
new file mode 100644
index 0000000000..78f31ea3ee
--- /dev/null
+++ b/config/honeypot.php
@@ -0,0 +1,66 @@
+<?php
+
+use App\Helpers\HoneypotHandler;
+
+return [
+    /*
+     * This switch determines if the honeypot protection should be activated.
+     */
+    'enabled' => env('HONEYPOT_ENABLED', true),
+
+    /*
+     * Here you can specify name of the honeypot field. Any requests that submit a non-empty
+     * value for this name will be discarded. Make sure this name does not
+     * collide with a form field that is actually used.
+     */
+    'name_field_name' => env('HONEYPOT_NAME', 'my_name'),
+
+    /*
+     * When this is activated there will be a random string added
+     * to the name_field_name. This improves the
+     * protection against bots.
+     */
+    'randomize_name_field_name' => env('HONEYPOT_RANDOMIZE', true),
+
+    /*
+     * When this is activated, requests will be checked if
+     * form is submitted faster than this amount of seconds
+     */
+    'valid_from_timestamp' => env('HONEYPOT_VALID_FROM_TIMESTAMP', true),
+
+    /*
+     * This field contains the name of a form field that will be used to verify
+     * if the form wasn't submitted too quickly. Make sure this name does not
+     * collide with a form field that is actually used.
+     */
+    'valid_from_field_name' => env('HONEYPOT_VALID_FROM', 'valid_from'),
+
+    /*
+     * If the form is submitted faster than this amount of seconds
+     * the form submission will be considered invalid.
+     */
+    'amount_of_seconds' => env('HONEYPOT_SECONDS', 3),
+
+    /*
+     * This class is responsible for sending a response to requests that
+     * are detected as being spammy. By default a blank page is shown.
+     *
+     * A valid responder is any class that implements
+     * `Spatie\Honeypot\SpamResponder\SpamResponder`
+     */
+    'respond_to_spam_with' => HoneypotHandler::class,
+
+    /*
+     * When activated, requests will be checked if honeypot fields are missing,
+     * if so the request will be stamped as spam. Be careful! When using the
+     * global middleware be sure to add honeypot fields to each form.
+     */
+    'honeypot_fields_required_for_all_forms' => false,
+
+    /*
+     * This class is responsible for applying all spam protection
+     * rules for a request. In most cases, you shouldn't change
+     * this value.
+     */
+    'spam_protection' => \Spatie\Honeypot\SpamProtection::class,
+];
diff --git a/config/image.php b/config/image.php
new file mode 100644
index 0000000000..67983819d0
--- /dev/null
+++ b/config/image.php
@@ -0,0 +1,20 @@
+<?php
+
+return [
+
+    /*
+    |--------------------------------------------------------------------------
+    | Image Driver
+    |--------------------------------------------------------------------------
+    |
+    | Intervention Image supports "GD Library" and "Imagick" to process images
+    | internally. You may choose one of them according to your PHP
+    | configuration. By default PHP's "GD Library" implementation is used.
+    |
+    | Supported: "gd", "imagick"
+    |
+    */
+
+    'driver' => 'gd',
+
+];
diff --git a/config/logging.php b/config/logging.php
index d09cd7d294..a235a2d29f 100644
--- a/config/logging.php
+++ b/config/logging.php
@@ -16,7 +16,7 @@
     |
     */
 
-    'default' => env('LOG_CHANNEL', 'stack'),
+    'default'  => env('LOG_CHANNEL', 'stack'),
 
     /*
     |--------------------------------------------------------------------------
@@ -34,60 +34,60 @@
     */
 
     'channels' => [
-        'stack' => [
-            'driver' => 'stack',
-            'channels' => ['daily'],
+        'stack'      => [
+            'driver'            => 'stack',
+            'channels'          => ['daily'],
             'ignore_exceptions' => false,
         ],
 
-        'single' => [
+        'single'     => [
             'driver' => 'single',
-            'path' => storage_path('logs/laravel.log'),
-            'level' => 'debug',
+            'path'   => storage_path('logs/laravel.log'),
+            'level'  => 'debug',
         ],
 
-        'daily' => [
+        'daily'      => [
             'driver' => 'daily',
-            'path' => storage_path('logs/laravel.log'),
-            'level' => 'debug',
-            'days' => 14,
+            'path'   => storage_path('logs/laravel.log'),
+            'level'  => 'debug',
+            'days'   => 14,
         ],
 
-        'slack' => [
-            'driver' => 'slack',
-            'url' => env('LOG_SLACK_WEBHOOK_URL'),
+        'slack'      => [
+            'driver'   => 'slack',
+            'url'      => env('LOG_SLACK_WEBHOOK_URL'),
             'username' => 'Laravel Log',
-            'emoji' => ':boom:',
-            'level' => 'critical',
+            'emoji'    => ':boom:',
+            'level'    => 'critical',
         ],
 
         'papertrail' => [
-            'driver' => 'monolog',
-            'level' => 'debug',
-            'handler' => SyslogUdpHandler::class,
+            'driver'       => 'monolog',
+            'level'        => 'debug',
+            'handler'      => SyslogUdpHandler::class,
             'handler_with' => [
                 'host' => env('PAPERTRAIL_URL'),
                 'port' => env('PAPERTRAIL_PORT'),
             ],
         ],
 
-        'stderr' => [
-            'driver' => 'monolog',
-            'handler' => StreamHandler::class,
+        'stderr'     => [
+            'driver'    => 'monolog',
+            'handler'   => StreamHandler::class,
             'formatter' => env('LOG_STDERR_FORMATTER'),
-            'with' => [
+            'with'      => [
                 'stream' => 'php://stderr',
             ],
         ],
 
-        'syslog' => [
+        'syslog'     => [
             'driver' => 'syslog',
-            'level' => 'debug',
+            'level'  => 'debug',
         ],
 
-        'errorlog' => [
+        'errorlog'   => [
             'driver' => 'errorlog',
-            'level' => 'debug',
+            'level'  => 'debug',
         ],
     ],
 
diff --git a/config/lorekeeper/admin_sidebar.php b/config/lorekeeper/admin_sidebar.php
index 7af05883b6..01e5b4df16 100644
--- a/config/lorekeeper/admin_sidebar.php
+++ b/config/lorekeeper/admin_sidebar.php
@@ -14,147 +14,165 @@
     |
     */
 
-    'Admin' => [
+    'Admin'      => [
         'power' => 'admin',
         'links' => [
             [
                 'name' => 'User Ranks',
-                'url' => 'admin/users/ranks'
-            ]
-        ]
+                'url'  => 'admin/users/ranks',
+            ],
+            [
+                'name' => 'Admin Logs',
+                'url'  => 'admin/logs',
+            ],
+            [
+                'name' => 'Staff Reward Settings',
+                'url'  => 'admin/staff-reward-settings',
+            ],
+        ],
     ],
-    'Reports' => [
+    'Reports'    => [
         'power' => 'manage_reports',
         'links' => [
             [
                 'name' => 'Report Queue',
-                'url' => 'admin/reports/pending'
-            ]
-        ]
+                'url'  => 'admin/reports/pending',
+            ],
+        ],
     ],
-    'Site' => [
-        'power' => 'edit_pages',
+    'News' => [
+        'power' => 'manage_news',
         'links' => [
             [
                 'name' => 'News',
-                'url' => 'admin/news'
+                'url'  => 'admin/news',
             ],
+        ],
+    ],
+    'Sales' => [
+        'power' => 'manage_sales',
+        'links' => [
             [
                 'name' => 'Sales',
-                'url' => 'admin/sales'
+                'url'  => 'admin/sales',
             ],
+        ],
+    ],
+    'Pages'       => [
+        'power' => 'edit_pages',
+        'links' => [
             [
                 'name' => 'Pages',
-                'url' => 'admin/pages'
-            ]
-        ]
+                'url'  => 'admin/pages',
+            ],
+        ],
     ],
-    'Users' => [
+    'Users'      => [
         'power' => 'edit_user_info',
         'links' => [
             [
                 'name' => 'User Index',
-                'url' => 'admin/users'
+                'url'  => 'admin/users',
             ],
             [
                 'name' => 'Invitation Keys',
-                'url' => 'admin/invitations'
+                'url'  => 'admin/invitations',
             ],
-        ]
+        ],
     ],
-    'Queues' => [
+    'Queues'     => [
         'power' => 'manage_submissions',
         'links' => [
             [
                 'name' => 'Gallery Submissions',
-                'url' => 'admin/gallery/submissions'
+                'url'  => 'admin/gallery/submissions',
             ],
             [
                 'name' => 'Gallery Currency Awards',
-                'url' => 'admin/gallery/currency'
+                'url'  => 'admin/gallery/currency',
             ],
             [
                 'name' => 'Prompt Submissions',
-                'url' => 'admin/submissions'
+                'url'  => 'admin/submissions',
             ],
             [
                 'name' => 'Claim Submissions',
-                'url' => 'admin/claims'
+                'url'  => 'admin/claims',
             ],
-        ]
+        ],
     ],
-    'Grants' => [
+    'Grants'     => [
         'power' => 'edit_inventories',
         'links' => [
             [
                 'name' => 'Currency Grants',
-                'url' => 'admin/grants/user-currency'
+                'url'  => 'admin/grants/user-currency',
             ],
             [
                 'name' => 'Item Grants',
-                'url' => 'admin/grants/items'
+                'url'  => 'admin/grants/items',
             ],
-        ]
+        ],
     ],
     'Masterlist' => [
         'power' => 'manage_characters',
         'links' => [
             [
                 'name' => 'Create Character',
-                'url' => 'admin/masterlist/create-character'
+                'url'  => 'admin/masterlist/create-character',
             ],
             [
                 'name' => 'Create MYO Slot',
-                'url' => 'admin/masterlist/create-myo'
+                'url'  => 'admin/masterlist/create-myo',
             ],
             [
                 'name' => 'Character Transfers',
-                'url' => 'admin/masterlist/transfers/incoming'
+                'url'  => 'admin/masterlist/transfers/incoming',
             ],
             [
                 'name' => 'Character Trades',
-                'url' => 'admin/masterlist/trades/incoming'
+                'url'  => 'admin/masterlist/trades/incoming',
             ],
             [
                 'name' => 'Design Updates',
-                'url' => 'admin/design-approvals/pending'
+                'url'  => 'admin/design-approvals/pending',
             ],
             [
                 'name' => 'MYO Approvals',
-                'url' => 'admin/myo-approvals/pending'
+                'url'  => 'admin/myo-approvals/pending',
             ],
-        ]
+        ],
     ],
-    'Data' => [
+    'Data'       => [
         'power' => 'edit_data',
         'links' => [
             [
                 'name' => 'Galleries',
-                'url' => 'admin/data/galleries'
+                'url'  => 'admin/data/galleries',
             ],
             [
                 'name' => 'Character Categories',
-                'url' => 'admin/data/character-categories'
+                'url'  => 'admin/data/character-categories',
             ],
             [
                 'name' => 'Sub Masterlists',
-                'url' => 'admin/data/sublists'
+                'url'  => 'admin/data/sublists',
             ],
             [
                 'name' => 'Rarities',
-                'url' => 'admin/data/rarities'
+                'url'  => 'admin/data/rarities',
             ],
             [
                 'name' => 'Species',
-                'url' => 'admin/data/species'
+                'url'  => 'admin/data/species',
             ],
             [
                 'name' => 'Subtypes',
-                'url' => 'admin/data/subtypes'
+                'url'  => 'admin/data/subtypes',
             ],
             [
                 'name' => 'Traits',
-                'url' => 'admin/data/traits'
+                'url'  => 'admin/data/traits',
             ],
             [
                 'name' => 'Character Titles',
@@ -162,50 +180,50 @@
             ],
             [
                 'name' => 'Shops',
-                'url' => 'admin/data/shops'
+                'url'  => 'admin/data/shops',
             ],
             [
                 'name' => 'Currencies',
-                'url' => 'admin/data/currencies'
+                'url'  => 'admin/data/currencies',
             ],
             [
                 'name' => 'Prompts',
-                'url' => 'admin/data/prompts'
+                'url'  => 'admin/data/prompts',
             ],
             [
                 'name' => 'Loot Tables',
-                'url' => 'admin/data/loot-tables'
+                'url'  => 'admin/data/loot-tables',
             ],
             [
                 'name' => 'Items',
-                'url' => 'admin/data/items'
+                'url'  => 'admin/data/items',
             ],
-        ]
+        ],
     ],
-    'Raffles' => [
+    'Raffles'    => [
         'power' => 'manage_raffles',
         'links' => [
             [
                 'name' => 'Raffles',
-                'url' => 'admin/raffles'
+                'url'  => 'admin/raffles',
             ],
-        ]
+        ],
     ],
-    'Settings' => [
+    'Settings'   => [
         'power' => 'edit_site_settings',
         'links' => [
             [
                 'name' => 'Site Settings',
-                'url' => 'admin/settings'
+                'url'  => 'admin/settings',
             ],
             [
                 'name' => 'Site Images',
-                'url' => 'admin/images'
+                'url'  => 'admin/images',
             ],
             [
                 'name' => 'File Manager',
-                'url' => 'admin/files'
+                'url'  => 'admin/files',
             ],
-        ]
+        ],
     ],
 ];
diff --git a/config/lorekeeper/allowed_comment_models.php b/config/lorekeeper/allowed_comment_models.php
new file mode 100644
index 0000000000..4450edff75
--- /dev/null
+++ b/config/lorekeeper/allowed_comment_models.php
@@ -0,0 +1,13 @@
+<?php
+
+return [
+
+    // list of models that can have comments
+    'App\Models\User\UserProfile',
+    'App\Models\News',
+    'App\Models\Sales\Sales',
+    'App\Models\Report\Report',
+    'App\Models\SitePage',
+    'App\Models\Gallery\GallerySubmission',
+
+];
diff --git a/config/lorekeeper/comments.php b/config/lorekeeper/comments.php
index aab62e8f4a..d07eae8481 100644
--- a/config/lorekeeper/comments.php
+++ b/config/lorekeeper/comments.php
@@ -2,36 +2,36 @@
 
 return [
 
-    /**
+    /*
      * To extend the base Comment model one just needs to create a new
      * CustomComment model extending the Comment model shipped with the
      * package and change this configuration option to their extended model.
      */
-    'model' => App\Models\Comment::class,
+    'model'        => App\Models\Comment\Comment::class,
 
-    /**
+    /*
      * You can customize the behaviour of these permissions by
      * creating your own and pointing to it here.
      */
-    'permissions' => [
+    'permissions'  => [
         'create-comment'    => 'App\Policies\CommentPolicy@create',
         'delete-comment'    => 'App\Policies\CommentPolicy@delete',
         'edit-comment'      => 'App\Policies\CommentPolicy@update',
         'reply-to-comment'  => 'App\Policies\CommentPolicy@reply',
     ],
 
-    /**
+    /*
      * The Comment Controller.
      * Change this to your own implementation of the CommentController.
      * You can use the \Laravelista\Comments\CommentControllerInterface.
      */
-    'controller' => 'App\Http\Controllers\Comments\CommentController',
-    
-	/**
+    'controller'   => 'App\Http\Controllers\Comments\CommentController',
+
+    /*
      * Set this option to `true` to enable soft deleting of comments.
      *
      * Comments will be soft deleted using laravels "softDeletes" trait.
      */
-    'soft_deletes' => true
+    'soft_deletes' => true,
 
 ];
diff --git a/config/lorekeeper/ext-tracker/extension_tracker.php b/config/lorekeeper/ext-tracker/extension_tracker.php
new file mode 100644
index 0000000000..f7344c5e1b
--- /dev/null
+++ b/config/lorekeeper/ext-tracker/extension_tracker.php
@@ -0,0 +1,9 @@
+<?php
+
+return [
+    'wiki_key' => 'Extension_Tracker',
+    'creators' => json_encode([
+        'Uri' => 'https://github.com/preimpression/',
+    ]),
+    'version'  => '1.4.0',
+];
diff --git a/config/lorekeeper/extensions.php b/config/lorekeeper/extensions.php
index a17a3540e6..65f0183599 100644
--- a/config/lorekeeper/extensions.php
+++ b/config/lorekeeper/extensions.php
@@ -20,38 +20,90 @@
     */
 
     // Navbar News Notif - Juni
-    'navbar_news_notif' => 0,
+    'navbar_news_notif'                    => 0,
 
     // Species Trait Index - Mercury
-    'species_trait_index' => 0,
+    'species_trait_index'                  => [
+        'enable'       => 0,
+        'trait_modals' => 0, // Enables modals when you click on a trait for more info instead of linking to the traits page - Moif
+    ],
 
     // Character Status Badges - Juni
-    'character_status_badges' => 0,
+    'character_status_badges'              => 0,
 
     // Character TH Profile Link - Juni
-    'character_TH_profile_link' => 0,
+    'character_TH_profile_link'            => 0,
 
     // Design Update Voting - Mercury
-    'design_update_voting' => 0,
+    'design_update_voting'                 => 0,
 
     // Item Entry Expansion - Mercury
-    'item_entry_expansion' => [
-        'extra_fields' => 0,
+    'item_entry_expansion'                 => [
+        'extra_fields'    => 0,
         'resale_function' => 0,
-        'loot_tables' => [
+        'loot_tables'     => [
             // Adds the ability to use either rarity criteria for items or item categories with rarity criteria in loot tables. Note that disabling this does not apply retroactively.
-            'enable' => 0,
-            'alternate_filtering' => 0 // By default this uses more broadly compatible methods to filter by rarity. If you are on Dreamhost/know your DB software can handle searching in JSON, it's recommended to set this to 1 instead.
+            'enable'              => 0,
+            'alternate_filtering' => 0, // By default this uses more broadly compatible methods to filter by rarity. If you are on Dreamhost/know your DB software can handle searching in JSON, it's recommended to set this to 1 instead.
         ],
     ],
 
     // Group Traits By Category - Uri
-    'traits_by_category' => 0,
+    'traits_by_category'                   => 0,
+
+    // Scroll To Top - Uri
+    'scroll_to_top'                        => 0, // 1 - On, 0 - off
 
     // Character Reward Expansion - Uri
-    'character_reward_expansion' => [
-        'expanded' => 1,
+    'character_reward_expansion'           => [
+        'expanded'          => 1,
         'default_recipient' => 0, // 0 to default to the character's owner (if a user), 1 to default to the submission user.
     ],
 
+    // MYO Image Hide/Remove - Mercury
+    // Adds an option when approving MYO submissions to hide or delete the MYO placeholder image
+    'remove_myo_image'                     => 0,
+
+    // Auto-populate New Image Traits - Mercury
+    // Automatically adds the traits present on a character's active image to the list when uploading a new image for an extant character.
+    'autopopulate_image_features'          => 0,
+
+    // Staff Rewards - Mercury
+    'staff_rewards'                        => [
+        'enabled'     => 0,
+        'currency_id' => 1,
+    ],
+
+    // Organised Traits Dropdown - Draginraptor
+    'organised_traits_dropdown'            => 0,
+
+    // Previous & Next buttons on Character pages - Speedy
+    // Adds buttons linking to the previous character as well as the next character on all character pages.
+    'previous_and_next_characters' => [
+        'display' => 0,
+        'reverse' => 0, // By default, 0 has the lower number on the 'Next' side and the higher number on the 'Previous' side, reflecting the default masterlist order. Setting this to 1 reverses this.
+    ],
+
+    // Aliases on Userpage - Speedy
+    'aliases_on_userpage' => 0, // By default, does not display the aliases on userpage. Enable to add a small arrow to display these underneath the primary alias.
+
+    // Show All Recent Submissions - Speedy
+    'show_all_recent_submissions' => [
+        'enable' => 0,
+        'links'  => [
+            'sidebar'      => 1,      // By default, ON, and will display in the sidebar.
+            'indexbutton'  => 1, // By default, ON, and will display a button on the index.
+        ],
+        'section_on_front' => 0, // By default, does not display on the front page. Enable to add a block above the footer.
+    ],
+
+    // collapsible admin sidebar - Newt
+    'collapsible_admin_sidebar' => 0,
+
+    // use gravatar for user avatars - Newt
+    'use_gravatar' => 0,
+
+    // Use ReCaptcha to check new user registrations - Mercury
+    // Requires site key and secret be set in your .env file!
+    'use_recaptcha' => 0,
 ];
diff --git a/config/lorekeeper/group_currency_form.php b/config/lorekeeper/group_currency_form.php
index 26ca3ac4ae..b76df16a49 100644
--- a/config/lorekeeper/group_currency_form.php
+++ b/config/lorekeeper/group_currency_form.php
@@ -30,61 +30,61 @@
     // Each of these has a key, 'label', which corresponds to the form's label as displayed.
 
     // For convenience, this first field has all the possible options/keys, with each commented on!
-    'piece_type' => [
+    'piece_type'  => [
         // This is the name as will be displayed on submissions, not the form itself.
-        'name' => 'Type of Piece',
+        'name'     => 'Type of Piece',
         // This is the label as will be displayed on the form itself, so provide any instruction for the user filling out the form here.
-        'label' => 'Piece Type (Select as many as apply)',
+        'label'    => 'Piece Type (Select as many as apply)',
         // The type of form. In this case, since the user is picking from several options, it's "choice"!
-        'type' => 'choice',
+        'type'     => 'choice',
         // These are the choices themselves. The key is what the form outputs, and the value is the text shown to the user.
-        'choices' => ['art' => 'Digital or Traditional Art', 'lit' => 'Writing and Poetry', 'craft' => 'Craft or Other Physical Item'],
+        'choices'  => ['art' => 'Digital or Traditional Art', 'lit' => 'Writing and Poetry', 'craft' => 'Craft or Other Physical Item'],
         // This makes this field required!
-        'rules' => 'required',
+        'rules'    => 'required',
         // This allows the user to select multiple options! You don't need to set it at all unless you want it to be true,
         // since it will otherwise assume false.
         'multiple' => true,
         // For checkboxes/toggles, this is what the toggle outputs when "on".
-        'value' => null,
-    ], 
-    'art_finish' => [
-        'name' => 'Level of Finish',
-        'label' => 'Level of Finish (For Digital/Traditional Artwork)',
-        'type' => 'choice',
+        'value'    => null,
+    ],
+    'art_finish'  => [
+        'name'    => 'Level of Finish',
+        'label'   => 'Level of Finish (For Digital/Traditional Artwork)',
+        'type'    => 'choice',
         'choices' => ['0.5' => 'Sketch', '1' => 'Clean Lines/Lineless', '3' => 'Painted'],
-    ], 
-    'art_type' => [
-        'name' => 'Art Type',
-        'label' => 'Art Type (For Digital/Traditional Artwork)',
-        'type' => 'choice',
+    ],
+    'art_type'    => [
+        'name'    => 'Art Type',
+        'label'   => 'Art Type (For Digital/Traditional Artwork)',
+        'type'    => 'choice',
         'choices' => ['0' => 'Headshot', '1' => 'Bust', '2' => 'Full Body Chibi', '3' => 'Full Body'],
-    ], 
-    'art_bonus' => [
-        'name' => 'Art Bonuses',
-        'type' => 'choice',
-        'label' => 'Bonus Options (Select as many as apply)',
+    ],
+    'art_bonus'   => [
+        'name'     => 'Art Bonuses',
+        'type'     => 'choice',
+        'label'    => 'Bonus Options (Select as many as apply)',
         // If you wish to have options with all the same value, in this case 1, give them a .1 difference,
         // which can easily be rounded out, but allows for the computer to distinguish between them.
-        'choices' => ['1' => 'Colored', '1.1' => 'Shading', '1.2' => 'Background'],
+        'choices'  => ['1' => 'Colored', '1.1' => 'Shading', '1.2' => 'Background'],
         'multiple' => true,
-    ], 
-    'base' => [
-        'name' => 'On Base/YCH',
+    ],
+    'base'        => [
+        'name'  => 'On Base/YCH',
         'label' => 'Base (P2U/F2U) or YCH',
         // This makes the option a toggle!
-        'type' => 'checkbox',
+        'type'  => 'checkbox',
         'value' => 1,
-    ], 
+    ],
     'frame_count' => [
-        'name' => 'Frame Count',
+        'name'  => 'Frame Count',
         'label' => 'Frame Count (For Animations)',
         // This makes a field the user can enter a number in!
-        'type' => 'number',
-    ], 
-    'word_count' => [
-        'name' => 'Word Count',
+        'type'  => 'number',
+    ],
+    'word_count'  => [
+        'name'  => 'Word Count',
         'label' => 'Word Count (For Writing or Poetry)',
-        'type' => 'number',
+        'type'  => 'number',
     ],
 
 ];
diff --git a/config/lorekeeper/image_files.php b/config/lorekeeper/image_files.php
index 181692471f..936120afdb 100644
--- a/config/lorekeeper/image_files.php
+++ b/config/lorekeeper/image_files.php
@@ -12,54 +12,54 @@
     |
     */
 
-    'header' => [
-        'name' => 'Header Image',
+    'header'          => [
+        'name'        => 'Header Image',
         'description' => 'The header banner displayed at the top of the page. PNG format, default height of 200px. Tiles in both directions.',
-        'filename' => 'header.png'
+        'filename'    => 'header.png',
     ],
-    'characters' => [
-        'name' => 'Characters Icon',
+    'characters'      => [
+        'name'        => 'Characters Icon',
         'description' => 'The characters graphic on the front page. PNG format, default size of 200px x 200px (no restriction).',
-        'filename' => 'characters.png'
+        'filename'    => 'characters.png',
     ],
-    'account' => [
-        'name' => 'Account Icon',
+    'account'         => [
+        'name'        => 'Account Icon',
         'description' => 'The account graphic on the front page. PNG format, default size of 200px x 200px (no restriction).',
-        'filename' => 'account.png'
+        'filename'    => 'account.png',
     ],
-    'inventory' => [
-        'name' => 'Inventory Icon',
+    'inventory'       => [
+        'name'        => 'Inventory Icon',
         'description' => 'The inventory graphic on the front page. PNG format, default size of 200px x 200px (no restriction).',
-        'filename' => 'inventory.png'
+        'filename'    => 'inventory.png',
     ],
-    'currency' => [
-        'name' => 'Currency Icon',
+    'currency'        => [
+        'name'        => 'Currency Icon',
         'description' => 'The bank graphic on the front page. PNG format, default size of 200px x 200px (no restriction).',
-        'filename' => 'currency.png'
+        'filename'    => 'currency.png',
     ],
-    'myo' => [
-        'name' => 'MYO Default Image',
+    'myo'             => [
+        'name'        => 'MYO Default Image',
         'description' => 'The default image used for MYO slots when no image is uploaded. PNG format, no size restriction.',
-        'filename' => 'myo.png'
+        'filename'    => 'myo.png',
     ],
-    'myo-th' => [
-        'name' => 'MYO Default Image (Thumbnail)',
+    'myo-th'          => [
+        'name'        => 'MYO Default Image (Thumbnail)',
         'description' => 'The default masterlist thumbnail used for MYO slots when no image is uploaded. PNG format, size of masterlist thumbnails.',
-        'filename' => 'myo-th.png'
+        'filename'    => 'myo-th.png',
     ],
-    'meta-image' => [
-        'name' => 'Meta Tag Image',
+    'meta-image'      => [
+        'name'        => 'Meta Tag Image',
         'description' => 'The image displayed in meta tag previews on social media, discord, and the like. PNG format, no size restriction.',
-        'filename' => 'meta-image.png'
+        'filename'    => 'meta-image.png',
     ],
-    'watermark' => [
-        'name' => 'Watermark Image',
+    'watermark'       => [
+        'name'        => 'Watermark Image',
         'description' => 'Watermark for applying to masterlist images.',
-        'filename' => 'watermark.png'
+        'filename'    => 'watermark.png',
     ],
     'content_warning' => [
-        'name' => 'Content Warning Thumbnail',
+        'name'        => 'Content Warning Thumbnail',
         'description' => 'Thumbnail used for gallery submissions with a set content warning. PNG format, size of masterlist thumbnails.',
-        'filename' => 'content_warning.png'
+        'filename'    => 'content_warning.png',
     ],
 ];
diff --git a/config/lorekeeper/item_tags.php b/config/lorekeeper/item_tags.php
index e74a6d3e8a..3435be8b6a 100644
--- a/config/lorekeeper/item_tags.php
+++ b/config/lorekeeper/item_tags.php
@@ -13,15 +13,15 @@
     |
     */
 
-    'box' => [
-        'name' => 'Box',
-        'text_color' => '#ffffff',
-        'background_color' => '#f6993f'
+    'box'  => [
+        'name'             => 'Box',
+        'text_color'       => '#ffffff',
+        'background_color' => '#f6993f',
     ],
-    
+
     'slot' => [
-        'name' => 'Slot',
-        'text_color' => '#ffffff',
-        'background_color' => '#1fd1a7'
+        'name'             => 'Slot',
+        'text_color'       => '#ffffff',
+        'background_color' => '#1fd1a7',
     ],
 ];
diff --git a/config/lorekeeper/notifications.php b/config/lorekeeper/notifications.php
index 4ce9d77e33..4e80c5b90f 100644
--- a/config/lorekeeper/notifications.php
+++ b/config/lorekeeper/notifications.php
@@ -12,399 +12,429 @@
     */
 
     // CURRENCY_GRANT
-    0 => [
-        'name' => 'Currency Grant',
+    0   => [
+        'name'    => 'Currency Grant',
         'message' => 'You have received a staff grant of {currency_quantity} {currency_name} from <a href="{sender_url}">{sender_name}</a>. (<a href="{url}">View Bank</a>)',
-        'url' => 'bank'
+        'url'     => 'bank',
     ],
 
     // ITEM_GRANT
-    1 => [
-        'name' => 'Item Grant',
+    1   => [
+        'name'    => 'Item Grant',
         'message' => 'You have received a staff grant of {item_name} (×{item_quantity}) from <a href="{sender_url}">{sender_name}</a>. (<a href="{url}">View Inventory</a>)',
-        'url' => 'inventory'
+        'url'     => 'inventory',
     ],
-    
+
     // CURRENCY_REMOVAL
-    2 => [
-        'name' => 'Currency Removal',
+    2   => [
+        'name'    => 'Currency Removal',
         'message' => '{currency_quantity} {currency_name} was removed from your bank by <a href="{sender_url}">{sender_name}</a>. (<a href="{url}">View Bank</a>)',
-        'url' => 'bank'
+        'url'     => 'bank',
     ],
 
     // ITEM_REMOVAL
-    3 => [
-        'name' => 'Item Removal',
+    3   => [
+        'name'    => 'Item Removal',
         'message' => '{item_name} (×{item_quantity}) was removed from your inventory by <a href="{sender_url}">{sender_name}</a>. (<a href="{url}">View Inventory</a>)',
-        'url' => 'inventory'
+        'url'     => 'inventory',
     ],
 
     // CURRENCY_TRANSFER
-    4 => [
-        'name' => 'Currency Transfer',
+    4   => [
+        'name'    => 'Currency Transfer',
         'message' => 'You have received {currency_quantity} {currency_name} from <a href="{sender_url}">{sender_name}</a>. (<a href="{url}">View Bank</a>)',
-        'url' => 'bank'
+        'url'     => 'bank',
     ],
 
     // ITEM_TRANSFER
-    5 => [
-        'name' => 'Item Transfer',
+    5   => [
+        'name'    => 'Item Transfer',
         'message' => 'You have received {item_name} (×{item_quantity}) from <a href="{sender_url}">{sender_name}</a>. (<a href="{url}">View Inventory</a>)',
-        'url' => 'inventory'
+        'url'     => 'inventory',
     ],
 
     // FORCED_ITEM_TRANSFER
-    6 => [
-        'name' => 'Forced Item Transfer',
+    6   => [
+        'name'    => 'Forced Item Transfer',
         'message' => '{item_name} (×{item_quantity}) was transferred out of your inventory by <a href="{sender_url}">{sender_name}</a>. (<a href="{url}">View Inventory</a>)',
-        'url' => 'inventory'
+        'url'     => 'inventory',
     ],
 
     // CHARACTER_UPLOAD
-    7 => [
-        'name' => 'Character Upload',
+    7   => [
+        'name'    => 'Character Upload',
         'message' => 'A new character (<a href="{character_url}">{character_slug}</a>) has been uploaded for you. (<a href="{url}">View Characters</a>)',
-        'url' => 'characters'
+        'url'     => 'characters',
     ],
 
     // CHARACTER_CURRENCY_GRANT
-    8 => [
-        'name' => 'Character Currency Grant',
+    8   => [
+        'name'    => 'Character Currency Grant',
         'message' => '{character_name} has received a staff grant of {currency_quantity} {currency_name} from <a href="{sender_url}">{sender_name}</a>. (<a href="{url}">View Bank</a>)',
-        'url' => 'character/{character_slug}/bank'
+        'url'     => 'character/{character_slug}/bank',
     ],
-    
+
     // CHARACTER_CURRENCY_REMOVAL
-    9 => [
-        'name' => 'Character Currency Removal',
+    9   => [
+        'name'    => 'Character Currency Removal',
         'message' => '{currency_quantity} {currency_name} was removed from {character_name} by <a href="{sender_url}">{sender_name}</a>. (<a href="{url}">View Bank</a>)',
-        'url' => 'character/{character_slug}/bank'
+        'url'     => 'character/{character_slug}/bank',
     ],
-    
+
     // CHARACTER_PROFILE_EDIT
-    10 => [
-        'name' => 'Character Profile Edited',
+    10  => [
+        'name'    => 'Character Profile Edited',
         'message' => '{character_name}\'s profile was edited by <a href="{sender_url}">{sender_name}</a>. (<a href="{url}">View Character</a>)',
-        'url' => 'character/{character_slug}/profile'
+        'url'     => 'character/{character_slug}/profile',
     ],
-    
+
     // IMAGE_UPLOAD
-    11 => [
-        'name' => 'Image Upload',
+    11  => [
+        'name'    => 'Image Upload',
         'message' => 'A new image for {character_name} was uploaded by <a href="{sender_url}">{sender_name}</a>. (<a href="{url}">View Character</a>)',
-        'url' => 'character/{character_slug}/images'
+        'url'     => 'character/{character_slug}/images',
     ],
 
     // CHARACTER_TRANSFER_RECEIVED
-    12 => [
-        'name' => 'Character Transfer Received',
+    12  => [
+        'name'    => 'Character Transfer Received',
         'message' => 'You have received a transfer for <a href="{character_url}">{character_name}</a> from <a href="{sender_url}">{sender_name}</a>. (<a href="{url}">View Transfers</a>)',
-        'url' => 'characters/transfers/incoming'
+        'url'     => 'characters/transfers/incoming',
     ],
 
     // CHARACTER_TRANSFER_REJECTED
-    13 => [
-        'name' => 'Character Transfer Rejected',
+    13  => [
+        'name'    => 'Character Transfer Rejected',
         'message' => 'Your transfer request for <a href="{character_url}">{character_name}</a> was rejected by <a href="{sender_url}">{sender_name}</a>. (<a href="{url}">View Transfers</a>)',
-        'url' => 'characters/transfers/completed'
+        'url'     => 'characters/transfers/completed',
     ],
 
     // CHARACTER_TRANSFER_CANCELED
-    14 => [
-        'name' => 'Character Transfer Cancelled',
+    14  => [
+        'name'    => 'Character Transfer Cancelled',
         'message' => 'The transfer for <a href="{character_url}">{character_name}</a> was canceled by <a href="{sender_url}">{sender_name}</a>. (<a href="{url}">View Transfers</a>)',
-        'url' => 'characters/transfers/completed'
+        'url'     => 'characters/transfers/completed',
     ],
 
     // CHARACTER_TRANSFER_DENIED
-    15 => [
-        'name' => 'Character Transfer Denied',
+    15  => [
+        'name'    => 'Character Transfer Denied',
         'message' => 'Your transfer request for <a href="{character_url}">{character_name}</a> was denied by <a href="{sender_url}">{sender_name}</a>. (<a href="{url}">View Transfers</a>)',
-        'url' => 'characters/transfers/completed'
+        'url'     => 'characters/transfers/completed',
     ],
 
     // CHARACTER_TRANSFER_ACCEPTED
-    16 => [
-        'name' => 'Character Transfer Accepted',
+    16  => [
+        'name'    => 'Character Transfer Accepted',
         'message' => 'Your transfer request for <a href="{character_url}">{character_name}</a> was accepted by <a href="{sender_url}">{sender_name}</a>. (<a href="{url}">View Transfers</a>)',
-        'url' => 'characters/transfers/completed'
+        'url'     => 'characters/transfers/completed',
     ],
 
     // CHARACTER_TRANSFER_APPROVED
-    17 => [
-        'name' => 'Character Transfer Approved',
+    17  => [
+        'name'    => 'Character Transfer Approved',
         'message' => 'The transfer for <a href="{character_url}">{character_name}</a> was approved by <a href="{sender_url}">{sender_name}</a>. (<a href="{url}">View Transfers</a>)',
-        'url' => 'characters/transfers/completed'
+        'url'     => 'characters/transfers/completed',
     ],
 
     // CHARACTER_SENT
-    18 => [
-        'name' => 'Character Sent',
+    18  => [
+        'name'    => 'Character Sent',
         'message' => '{character_name} was transferred to <a href="{recipient_url}">{recipient_name}</a> by <a href="{sender_url}">{sender_name}</a>. (<a href="{url}">View Character</a>)',
-        'url' => 'character/{character_slug}'
+        'url'     => 'character/{character_slug}',
     ],
 
     // CHARACTER_RECEIVED
-    19 => [
-        'name' => 'Character Received',
+    19  => [
+        'name'    => 'Character Received',
         'message' => '{character_name} was transferred to you by <a href="{sender_url}">{sender_name}</a>. (<a href="{url}">View Character</a>)',
-        'url' => 'character/{character_slug}'
+        'url'     => 'character/{character_slug}',
     ],
 
     // SUBMISSION_APPROVED
-    20 => [
-        'name' => 'Submission Approved',
+    20  => [
+        'name'    => 'Submission Approved',
         'message' => 'Your submission (#{submission_id}) was approved by <a href="{staff_url}">{staff_name}</a>. (<a href="{url}">View Submission</a>)',
-        'url' => 'submissions/view/{submission_id}'
+        'url'     => 'submissions/view/{submission_id}',
     ],
 
     // SUBMISSION_REJECTED
-    21 => [
-        'name' => 'Submission Rejected',
+    21  => [
+        'name'    => 'Submission Rejected',
         'message' => 'Your submission (#{submission_id}) was rejected by <a href="{staff_url}">{staff_name}</a>. (<a href="{url}">View Submission</a>)',
-        'url' => 'submissions/view/{submission_id}'
+        'url'     => 'submissions/view/{submission_id}',
     ],
 
     // CLAIM_APPROVED
-    22 => [
-        'name' => 'Claim Approved',
+    22  => [
+        'name'    => 'Claim Approved',
         'message' => 'Your claim (#{submission_id}) was approved by <a href="{staff_url}">{staff_name}</a>. (<a href="{url}">View Claim</a>)',
-        'url' => 'claims/view/{submission_id}'
+        'url'     => 'claims/view/{submission_id}',
     ],
 
     // CLAIM_REJECTED
-    23 => [
-        'name' => 'Claim Rejected',
+    23  => [
+        'name'    => 'Claim Rejected',
         'message' => 'Your claim (#{submission_id}) was rejected by <a href="{staff_url}">{staff_name}</a>. (<a href="{url}">View Claim</a>)',
-        'url' => 'claims/view/{submission_id}'
+        'url'     => 'claims/view/{submission_id}',
     ],
 
     // MYO_GRANT
-    24 => [
-        'name' => 'MYO Grant',
+    24  => [
+        'name'    => 'MYO Grant',
         'message' => 'A new MYO slot (<a href="{character_url}">{name}</a>) has been created for you. (<a href="{url}">View MYO Slots</a>)',
-        'url' => 'myos'
+        'url'     => 'myos',
     ],
 
     // DESIGN_APPROVED
-    25 => [
-        'name' => 'Design Update Approved',
+    25  => [
+        'name'    => 'Design Update Approved',
         'message' => 'The <a href="{design_url}">design update</a> for <a href="{character_url}">{name}</a> has been approved. (<a href="{url}">View Design Approvals</a>)',
-        'url' => 'designs/approved'
+        'url'     => 'designs/approved',
     ],
 
     // DESIGN_REJECTED
-    26 => [
-        'name' => 'Design Update Requested',
+    26  => [
+        'name'    => 'Design Update Requested',
         'message' => 'The <a href="{design_url}">design update</a> for <a href="{character_url}">{name}</a> has been rejected. (<a href="{url}">View Design Approvals</a>)',
-        'url' => 'designs/rejected'
+        'url'     => 'designs/rejected',
     ],
 
     // DESIGN_CANCELED
-    27 => [
-        'name' => 'Design Update Cancelled',
+    27  => [
+        'name'    => 'Design Update Cancelled',
         'message' => 'The <a href="{design_url}">design update</a> for <a href="{character_url}">{name}</a> has been canceled. (<a href="{url}">View Design Approvals</a>)',
-        'url' => 'designs'
+        'url'     => 'designs',
     ],
 
     // TRADE_RECEIVED
-    28 => [
-        'name' => 'Trade Received',
+    28  => [
+        'name'    => 'Trade Received',
         'message' => 'You have received a new trade from <a href="{sender_url}">{sender_name}</a>. (<a href="{url}">View Trade</a>)',
-        'url' => 'trades/{trade_id}'
+        'url'     => 'trades/{trade_id}',
     ],
 
     // TRADE_UPDATE
-    29 => [
-        'name' => 'Trade Updated',
+    29  => [
+        'name'    => 'Trade Updated',
         'message' => '<a href="{sender_url}">{sender_name}</a> has updated their half of a trade. (<a href="{url}">View Trade</a>)',
-        'url' => 'trades/{trade_id}'
+        'url'     => 'trades/{trade_id}',
     ],
 
     // TRADE_CANCELED
-    30 => [
-        'name' => 'Trade Cancelled',
+    30  => [
+        'name'    => 'Trade Cancelled',
         'message' => '<a href="{sender_url}">{sender_name}</a> has canceled a trade. (<a href="{url}">View Trade</a>)',
-        'url' => 'trades/{trade_id}'
+        'url'     => 'trades/{trade_id}',
     ],
 
     // TRADE_COMPLETED
-    31 => [
-        'name' => 'Trade Completed',
+    31  => [
+        'name'    => 'Trade Completed',
         'message' => 'A trade has been completed. (<a href="{url}">View Trade</a>)',
-        'url' => 'trades/{trade_id}'
+        'url'     => 'trades/{trade_id}',
     ],
 
     // TRADE_REJECTED
-    32 => [
-        'name' => 'Trade Rejected',
+    32  => [
+        'name'    => 'Trade Rejected',
         'message' => 'A trade has been rejected from the character transfer queue. (<a href="{url}">View Trade</a>)',
-        'url' => 'trades/{trade_id}'
+        'url'     => 'trades/{trade_id}',
     ],
 
     // TRADE_CONFIRMED
-    33 => [
-        'name' => 'Trade Confirmed',
+    33  => [
+        'name'    => 'Trade Confirmed',
         'message' => 'A trade has been confirmed and placed in the character transfer queue to be reviewed. (<a href="{url}">View Trade</a>)',
-        'url' => 'trades/{trade_id}'
+        'url'     => 'trades/{trade_id}',
     ],
 
     // BOOKMARK_TRADING
-    34 => [
-        'name' => 'Bookmark Trading Status',
+    34  => [
+        'name'    => 'Bookmark Trading Status',
         'message' => 'A character you have bookmarked (<a href="{character_url}">{character_name}</a>) has had its Open For Trading status changed. (<a href="{url}">View Bookmarks</a>)',
-        'url' => 'account/bookmarks'
+        'url'     => 'account/bookmarks',
     ],
 
     // BOOKMARK_GIFTS
-    35 => [
-        'name' => 'Bookmark Gift Art Status',
+    35  => [
+        'name'    => 'Bookmark Gift Art Status',
         'message' => 'A character you have bookmarked (<a href="{character_url}">{character_name}</a>) has had its Gift Art Allowed status changed. (<a href="{url}">View Bookmarks</a>)',
-        'url' => 'account/bookmarks'
+        'url'     => 'account/bookmarks',
     ],
 
     // BOOKMARK_OWNER
-    36 => [
-        'name' => 'Bookmark Owner',
+    36  => [
+        'name'    => 'Bookmark Owner',
         'message' => 'A character you have bookmarked (<a href="{character_url}">{character_name}</a>) has been transferred to a different owner. (<a href="{url}">View Bookmarks</a>)',
-        'url' => 'account/bookmarks'
+        'url'     => 'account/bookmarks',
     ],
 
     // BOOKMARK_IMAGE
-    37 => [
-        'name' => 'Bookmark Image',
+    37  => [
+        'name'    => 'Bookmark Image',
         'message' => 'A new image has been uploaded for a character you have bookmarked (<a href="{character_url}">{character_name}</a>). (<a href="{url}">View Bookmarks</a>)',
-        'url' => 'account/bookmarks'
+        'url'     => 'account/bookmarks',
     ],
 
     // Technically this was acceptable before this point
     // CHARACTER_TRANSFER_ACCEPTABLE
-    38 => [
-        'name' => 'Character Transfer Acceptable',
+    38  => [
+        'name'    => 'Character Transfer Acceptable',
         'message' => 'The transfer for <a href="{character_url}">{character_name}</a> was approved by <a href="{sender_url}">{sender_name}</a>. (<a href="{url}">View Transfers</a>)',
-        'url' => 'characters/transfers/incoming'
+        'url'     => 'characters/transfers/incoming',
     ],
+
     // BOOKMARK_GIFT_WRITING
-    39 => [
+    39  => [
         'message' => 'A character you have bookmarked (<a href="{character_url}">{character_name}</a>) has had its Gift Writing Allowed status changed. (<a href="{url}">View Bookmarks</a>)',
-        'url' => 'account/bookmarks'
+        'url'     => 'account/bookmarks',
+    ],
+
+    // USER_REACTIVATED
+    103 => [
+        'name'      => 'User Reactivated',
+        'message'   => '<a href="{user_url}">{user_name}\'s</a> account has been reactivated by <a href="{staff_url}">{staff_name}</a>.',
+        'url'       => '',
     ],
+
+    // USER_DEACTIVATED
+    104 => [
+        'name'      => 'User Deactivated',
+        'message'   => '<a href="{user_url}">{user_name}\'s</a> account has been deactivated by <a href="{staff_url}">{staff_name}</a>.',
+        'url'       => '',
+    ],
+
+    // SUBMISSION_CANCELLED
+    108 => [
+        'name'    => 'Submission Cancelled',
+        'message' => 'Your submission (#{submission_id}) was cancelled and sent back to drafts by <a href="{staff_url}">{staff_name}</a>. (<a href="{url}">View Submission</a>)',
+        'url'     => 'submissions/view/{submission_id}',
+    ],
+
+    // CLAIM_CANCELLED
+    109 => [
+        'name'    => 'Claim Cancelled',
+        'message' => 'Your claim (#{submission_id}) was cancelled and sent back to drafts by <a href="{staff_url}">{staff_name}</a>. (<a href="{url}">View Claim</a>)',
+        'url'     => 'claims/view/{submission_id}',
+    ],
+
     // REPORT_ASSIGNED
     220 => [
-        'name' => 'Report Assigned',
+        'name'    => 'Report Assigned',
         'message' => 'Your report (#{report_id}) was assigned to <a href="{staff_url}">{staff_name}</a>, you can expect a response soon. (<a href="{url}">View Report</a>)',
-        'url' => 'reports/view/{report_id}'
+        'url'     => 'reports/view/{report_id}',
     ],
 
     // REPORT_CLOSED
     221 => [
-        'name' => 'Report Closed',
+        'name'    => 'Report Closed',
         'message' => 'Your report (#{report_id}) was closed by <a href="{staff_url}">{staff_name}</a>. (<a href="{url}">View Report</a>)',
-        'url' => 'reports/view/{report_id}'
+        'url'     => 'reports/view/{report_id}',
     ],
     // Comment made on user's model
     // COMMENT_MADE
     239 => [
-        'name' => 'Comment Made',
+        'name'    => 'Comment Made',
         'message' => '<a href="{sender_url}">{sender}</a> has made a comment on {post_type}. <a href="{comment_url}">See Context.</a>',
-        'url' => ''
+        'url'     => '',
     ],
     // Comment recieved reply
     // COMMENT_REPLY
     240 => [
-        'name' => 'Comment Reply',
+        'name'    => 'Comment Reply',
         'message' => '<a href="{sender_url}">{sender}</a> has made a reply to your comment. <a href="comment/{comment_url}">See Reply.</a>',
-        'url' => ''
+        'url'     => '',
     ],
 
     // CHARACTER_ITEM_GRANT
     501 => [
-        'name' => 'Character Item Grant',
+        'name'    => 'Character Item Grant',
         'message' => '{character_name} has received a staff grant of {item_name} (×{item_quantity}) from <a href="{sender_url}">{sender_name}</a>. (<a href="{url}">View Inventory</a>)',
-        'url' => 'character/{character_slug}/inventory'
+        'url'     => 'character/{character_slug}/inventory',
     ],
 
     // CHARACTER_ITEM_REMOVAL
     502 => [
-        'name' => 'Character Item Removal',
+        'name'    => 'Character Item Removal',
         'message' => '{item_name} (×{item_quantity}) was removed from {character_name} by <a href="{sender_url}">{sender_name}</a>. (<a href="{url}">View Inventory</a>)',
-        'url' => 'character/{character_slug}/inventory'
+        'url'     => 'character/{character_slug}/inventory',
     ],
 
     // GALLERY_SUBMISSION_COLLABORATOR
     505 => [
-        'name' => 'Gallery Submission Collaborator',
+        'name'    => 'Gallery Submission Collaborator',
         'message' => '<a href="{sender_url}">{sender}</a> has added you as a collaborator on a gallery submission, which needs your approval. (<a href="{url}">View Submission</a>)',
-        'url' => 'gallery/view/{submission_id}'
+        'url'     => 'gallery/view/{submission_id}',
     ],
 
     // GALLERY_COLLABORATORS_APPROVED
     506 => [
-        'name' => 'Gallery Submission Collaborators Approved',
+        'name'    => 'Gallery Submission Collaborators Approved',
         'message' => 'All of the collaborators on your submission <strong>{submission_title}</strong> (#{submission_id}) have approved it, and it is now pending staff review. (<a href="{url}">View Submission</a>)',
-        'url' => 'gallery/view/{submission_id}'
+        'url'     => 'gallery/view/{submission_id}',
     ],
 
     // GALLERY_SUBMISSION_ACCEPTED
     507 => [
-        'name' => 'Gallery Submission Accepted',
+        'name'    => 'Gallery Submission Accepted',
         'message' => 'Your submission <strong>{submission_title}</strong> (#{submission_id}) was accepted. (<a href="{url}">View Submission</a>)',
-        'url' => 'gallery/queue/{submission_id}'
+        'url'     => 'gallery/queue/{submission_id}',
     ],
 
     // GALLERY_SUBMISSION_REJECTED
     508 => [
-        'name' => 'Gallery Submission Rejected',
+        'name'    => 'Gallery Submission Rejected',
         'message' => 'Your submission <strong>{submission_title}</strong> (#{submission_id}) was rejected. (<a href="{url}">View Submission</a>)',
-        'url' => 'submissions/queue/{submission_id}'
+        'url'     => 'gallery/queue/{submission_id}',
     ],
 
     // GALLERY_SUBMISSION_VALUED
     509 => [
-        'name' => 'Gallery Submission Valued',
+        'name'    => 'Gallery Submission Valued',
         'message' => 'You have been awarded {currency_quantity} {currency_name} for the gallery submission <strong>{submission_title}</strong> (#{submission_id}). (<a href="{url}">View Submission</a>)',
-        'url' => 'gallery/queue/{submission_id}'
+        'url'     => 'gallery/queue/{submission_id}',
     ],
 
     // GALLERY_SUBMISSION_MOVED
     510 => [
-        'name' => 'Gallery Submission Moved',
+        'name'    => 'Gallery Submission Moved',
         'message' => 'Your gallery submission <strong>{submission_title}</strong> (#{submission_id}) has been moved by <a href="{staff_url}">{staff_name}</a>. (<a href="{url}">View Submission</a>)',
-        'url' => 'gallery/view/{submission_id}'
+        'url'     => 'gallery/view/{submission_id}',
     ],
 
     // GALLERY_SUBMISSION_CHARACTER
     511 => [
-        'name' => 'Gallery Submission Character',
+        'name'    => 'Gallery Submission Character',
         'message' => '<a href="{sender_url}">{sender}</a> has added your character <a href="{character_url}">{character}</a> to a gallery submission. (<a href="{url}">View Submission</a>)',
-        'url' => 'gallery/view/{submission_id}'
+        'url'     => 'gallery/view/{submission_id}',
     ],
 
     // GALLERY_SUBMISSION_FAVORITE
     512 => [
-        'name' => 'Gallery Submission Favorite',
+        'name'    => 'Gallery Submission Favorite',
         'message' => '<a href="{sender_url}">{sender}</a> has added your gallery submission <strong>{submission_title}</strong> (#{submission_id}) to their favorites. (<a href="{url}">View Submission</a>)',
-        'url' => 'gallery/view/{submission_id}'
+        'url'     => 'gallery/view/{submission_id}',
     ],
 
     // GALLERY_SUBMISSION_STAFF_COMMENTS
     513 => [
-        'name' => 'Gallery Submission Staff Comments',
+        'name'    => 'Gallery Submission Staff Comments',
         'message' => '<a href="{sender_url}">{sender}</a> updated the staff comments on your gallery submission <strong>{submission_title}</strong> (#{submission_id}). (<a href="{url}">View Submission</a>)',
-        'url' => 'gallery/queue/{submission_id}'
+        'url'     => 'gallery/queue/{submission_id}',
     ],
 
     // GALLERY_SUBMISSION_EDITED
     514 => [
-        'name' => 'Gallery Submission Edited',
+        'name'    => 'Gallery Submission Edited',
         'message' => 'Your gallery submission <strong>{submission_title}</strong> (#{submission_id}) has been edited by <a href="{staff_url}">{staff_name}</a>. (<a href="{url}">View Submission</a>)',
-        'url' => 'gallery/view/{submission_id}'
+        'url'     => 'gallery/view/{submission_id}',
     ],
 
     // GALLERY_SUBMISSION_PARTICIPANT
     515 => [
-        'name' => 'Gallery Submission Participant',
+        'name'    => 'Gallery Submission Participant',
         'message' => '<a href="{sender_url}">{sender}</a> has added you as a participant on a gallery submission. (<a href="{url}">View Submission</a>)',
-        'url' => 'gallery/view/{submission_id}'
+        'url'     => 'gallery/view/{submission_id}',
     ],
 ];
diff --git a/config/lorekeeper/powers.php b/config/lorekeeper/powers.php
index 347d6d5ec5..0a7519d794 100644
--- a/config/lorekeeper/powers.php
+++ b/config/lorekeeper/powers.php
@@ -12,45 +12,59 @@
     */
 
     'edit_site_settings' => [
-        'name' => 'Edit Site Settings',
-        'description' => 'Allow rank to modify site settings and upload new images to replace the site layout images.'
+        'name'        => 'Edit Site Settings',
+        'description' => 'Allow rank to modify site settings and upload new images to replace the site layout images.',
     ],
-    'edit_data' => [
-        'name' => 'Edit World Data',
-        'description' => 'Allow rank to modify the world data. This includes creating/editing/uploading images for species, items, traits, etc.'
+    'edit_data'          => [
+        'name'        => 'Edit World Data',
+        'description' => 'Allow rank to modify the world data. This includes creating/editing/uploading images for species, items, traits, etc.',
     ],
-    'edit_pages' => [
-        'name' => 'Edit Text Pages',
-        'description' => 'Allow rank to create/modify text pages. This includes pages created using the page creator tool and news posts.'
+    'edit_pages'         => [
+        'name'        => 'Edit Text Pages',
+        'description' => 'Allow rank to create/modify text pages. This includes pages created using the page creator tool and news posts.',
     ],
-    'edit_user_info' => [
-        'name' => 'Manage Users',
-        'description' => 'Allow rank to view/modify user account info and create invitation keys. This will grant access to the user admin panel.'
+    'edit_user_info'     => [
+        'name'        => 'Manage Users',
+        'description' => 'Allow rank to view/modify user account info and create invitation keys. This will grant access to the user admin panel.',
     ],
-    'edit_ranks' => [
-        'name' => 'Edit Ranks',
-        'description' => 'Allow rank to change the rank of a user. This power requires the Edit User Info power to be attached as well.'
+    'edit_ranks'         => [
+        'name'        => 'Edit Ranks',
+        'description' => 'Allow rank to change the rank of a user. This power requires the Edit User Info power to be attached as well.',
     ],
-    'edit_inventories' => [
-        'name' => 'Edit Inventories',
-        'description' => 'Allow rank to grant and remove items from user inventories, as well as grant/remove currency from users and characters.'
+    'edit_inventories'   => [
+        'name'        => 'Edit Inventories',
+        'description' => 'Allow rank to grant and remove items from user inventories, as well as grant/remove currency from users and characters.',
     ],
-    'manage_characters' => [
-        'name' => 'Manage Masterlist',
-        'description' => 'Allow rank to create/edit new characters. This includes uploading new images, modifying traits on an existing character and forcing ownership transfers.'
+    'manage_characters'  => [
+        'name'        => 'Manage Masterlist',
+        'description' => 'Allow rank to create/edit new characters. This includes uploading new images, modifying traits on an existing character and forcing ownership transfers.',
     ],
-    'manage_raffles' => [
-        'name' => 'Manage Raffles',
-        'description' => 'Allow rank to create/edit raffles, add/remove tickets for users and roll raffles.'
+    'manage_raffles'     => [
+        'name'        => 'Manage Raffles',
+        'description' => 'Allow rank to create/edit raffles, add/remove tickets for users and roll raffles.',
     ],
     'manage_submissions' => [
-        'name' => 'Manage Submissions',
-        'description' => 'Allow rank to view the submissions queue, edit rewards attached to a submission and approve/reject them.'
+        'name'        => 'Manage Submissions',
+        'description' => 'Allow rank to view the submissions queue, edit rewards attached to a submission and approve/reject them.',
+    ],
+    'manage_reports'     => [
+        'name'        => 'Manage Reports',
+        'description' => 'Allow rank to view the reports queue.',
+    ],
+    'maintenance_access' => [
+        'name'        => 'Has Maintenance Access',
+        'description' => 'Allow rank to browse the site normally during maintenance mode.',
+    ],
+    'manage_news' => [
+        'name'        => 'Manage News',
+        'description' => 'Allow rank to create/edit news posts.',
+    ],
+    'manage_sales' => [
+        'name'        => 'Manage Sales',
+        'description' => 'Allow rank to create/edit sales and comment on sales in preview mode.',
+    ],
+    'comment_on_sales' => [
+        'name'        => 'Comment on Sales',
+        'description' => 'Allow rank to comment on sales in preview mode.',
     ],
-    'manage_reports' => [
-        'name' => 'Manage Reports',
-        'description' => 'Allow rank to view the reports queue.'
-    ]
-
-
 ];
diff --git a/config/lorekeeper/settings.php b/config/lorekeeper/settings.php
index e30c84898e..5b8e020b40 100644
--- a/config/lorekeeper/settings.php
+++ b/config/lorekeeper/settings.php
@@ -24,7 +24,7 @@
     | Do not change this value!
     |
     */
-    'version' => '2.1.7',
+    'version'                                           => '3.0.0',
 
     /*
     |--------------------------------------------------------------------------
@@ -36,7 +36,7 @@
     | site wherever the name needs to be displayed.
     |
     */
-    'site_name' => 'Lorekeeper',
+    'site_name'                                         => 'Lorekeeper',
 
     /*
     |--------------------------------------------------------------------------
@@ -48,7 +48,22 @@
     | It is not, however, displayed on the site itself. This should be kept short and snappy!
     |
     */
-    'site_desc' => 'A Lorekeeper ARPG',
+    'site_desc'                                         => 'A Lorekeeper ARPG',
+
+    /*
+    |--------------------------------------------------------------------------
+    | Alias Requirement
+    |--------------------------------------------------------------------------
+    |
+    | Whether or not users are required to link an off-site account to access
+    | the site's full features. Note that this does not disable aliases outright,
+    | and you should still set up at least one of the auth options provided.
+    | Note also that any functionality which makes use of the alias system
+    | (e.g. ownership checking for characters only associated with an off-site account)
+    | will still work provided users link the relevant alias(es).
+    |
+    */
+    'require_alias'                                     => 1,
 
     /*
     |--------------------------------------------------------------------------
@@ -59,6 +74,7 @@
     |       This is used in the automatic generation of character codes.
     |       {category}: This is replaced by the character category code.
     |       {number}: This is replaced by the character number.
+    /       {year}: This is replaced by the current year.
     |
     |       e.g. Under the default setting ({category}-{number}),
     |       a character in a category called "MYO" (code "MYO") with number 001
@@ -106,13 +122,13 @@
     |       Default: 0/Disabled, 1 to enable.
     |
     */
-    'character_codes' => '{category}-{number}',
-    'character_number_digits' => 3,
-    'character_pull_number' => 'all',
+    'character_codes'                                   => '{category}-{number}',
+    'character_number_digits'                           => 3,
+    'character_pull_number'                             => 'all',
 
-    'reset_character_status_on_transfer' => 0,
-    'reset_character_profile_on_transfer' => 0,
-    'clear_myo_slot_name_on_approval' => 0,
+    'reset_character_status_on_transfer'                => 0,
+    'reset_character_profile_on_transfer'               => 0,
+    'clear_myo_slot_name_on_approval'                   => 0,
 
     /*
     |--------------------------------------------------------------------------
@@ -121,25 +137,30 @@
     |
     | 0: Do not watermark. 1: Automatically watermark masterlist images.
     |
-    | Dimension, in pixels, to scale the shorter dimension (between width/height)
-    | of submitted masterlist images to. Enter "0" to disable resizing.
+    | Dimension, in pixels, to scale submitted masterlist images to. Enter "0" to disable resizing.
+    |
+    | Which dimension to scale submitted masterlist images on. Options are 'shorter' and 'longer'.
+    | Only takes effect if masterlist_image_dimension is set. Defaults to 'shorter'.
     |
     | File format to encode masterlist image uploads to.
     | Set to null to leave images in their original formats.
     | Example:
     | 'masterlist_image_format' => null,
     |
-    | Color to fill non-png images in when masterlist_image_format is set.
+    | Color to fill non-transparent images in when masterlist_image_format is set.
     | This is in an endeavor to make images with a transparent background
     | compress better. Set to null to disable.
     | Example:
-    | 'masterlist_image_background' => 'png',
+    | 'masterlist_image_background' => '#ffffff',
     |
     */
-    'watermark_masterlist_images' => 0,
-    'masterlist_image_dimension' => 0,
-    'masterlist_image_format' => null,
-    'masterlist_image_background' => '#ffffff',
+    'watermark_masterlist_images'                       => 0,
+
+    'masterlist_image_dimension'                        => 0,
+    'masterlist_image_dimension_target'                 => 'shorter',
+
+    'masterlist_image_format'                           => null,
+    'masterlist_image_background'                       => '#ffffff',
 
     /*
     |--------------------------------------------------------------------------
@@ -152,9 +173,15 @@
     | Size, in pixels, to cap full-sized masterlist images at (if storing full-sized images is enabled).
     | Images above this cap in either dimension will be resized to suit. Enter "0" to disable resizing.
     |
+    | File format to encode full-sized masterlist image uploads to.
+    | Set to null to leave images in their original formats.
+    | Example:
+    | 'masterlist_fullsizes_format' => null,
+    |
     */
-    'store_masterlist_fullsizes' => 0,
-    'masterlist_fullsizes_cap' => 0,
+    'store_masterlist_fullsizes'                        => 0,
+    'masterlist_fullsizes_cap'                          => 0,
+    'masterlist_fullsizes_format'                       => null,
 
     /*
     |--------------------------------------------------------------------------
@@ -169,11 +196,37 @@
     | Expects the whole of the character to be visible in the thumbnail.
     |
     */
-    'masterlist_thumbnails' => [
-        'width' => 200,
-        'height' => 200
+    'masterlist_thumbnails'                             => [
+        'width'  => 200,
+        'height' => 200,
     ],
-    'watermark_masterlist_thumbnails' => 0,
+
+    'watermark_masterlist_thumbnails'                   => 0,
+
+    /*
+    |--------------------------------------------------------------------------
+    | Watermark Resizing
+    |--------------------------------------------------------------------------
+    |
+    | This affects the size of the watermark, resizing it to fit the masterlist image.
+    | This requires the 'watermark_masterlist_images' option to be set to 1.
+    |
+    | 0: Does not automatically resize watermark. 1: Resize watermarks.
+    | Expects the whole of the character to be visible in the thumbnail.
+    |
+    | The watermark percent is the scale of the watermark.
+    | The default is '0.9', or 90 percent of the image to be watermarked.
+    |
+    | The final option is to also resize watermarks on thumbnails.
+    | It will assume the same scale as masterlist image.
+    | 0: Does not resize thumbnail watermarks. 1: Resizes thumbnail watermarks.
+    | This requires the 'watermark_masterlist_thumbnails' option to be set to 1.
+    |
+    */
+
+    'watermark_resizing'                                => 0,
+    'watermark_percent'                                 => 0.9,
+    'watermark_resizing_thumb'                          => 0,
 
     /*
     |--------------------------------------------------------------------------
@@ -189,7 +242,45 @@
     | Simply change to "1" to enable, or keep at "0" to disable.
     |
     */
-    'masterlist_image_automation' => 0,
+    'masterlist_image_automation'                       => 0,
+
+    /*
+    |--------------------------------------------------------------------------
+    | Masterlist Image Automation Removing Manual Upload For Users
+    |--------------------------------------------------------------------------
+    |
+    | NOTE: This feature will only function if the above feature, the
+    | Masterlist Image Automation Replacing Cropper, is also enabled.
+    |
+    | The following option is for if you DO want to disable the manual uploading
+    | of thumbnails, to ensure users do not attempt to upload their
+    | own thumbnails regardless of the automation.
+    | This will remove it purely for users, not administration.
+    |
+    | 0: Keeps the manual thumbnail upload for users.
+    | 1: Hides the thumbnail upload for users.
+    |
+    */
+    'masterlist_image_automation_hide_manual_thumbnail' => 0,
+
+    /*
+    |--------------------------------------------------------------------------
+    | Gallery Image Settings
+    |--------------------------------------------------------------------------
+    |
+    | This affects images submitted to on-site galleries.
+    |
+    | Size, in pixels, to cap gallery images at.
+    | Images above this cap in either dimension will be resized to suit. Enter "0" to disable resizing.
+    |
+    | File format to encode gallery image uploads to.
+    | Set to null to leave images in their original formats.
+    | Example:
+    | 'gallery_images_format' => null,
+    |
+    */
+    'gallery_images_cap'    => 0,
+    'gallery_images_format' => null,
 
     /*
     |--------------------------------------------------------------------------
@@ -201,18 +292,18 @@
     | there are limits on data storage, so raising this is not recommended.
     |
     */
-    'trade_asset_limit' => 20,
+    'trade_asset_limit'                                 => 20,
 
     /*
     |--------------------------------------------------------------------------
     | Shop Purchase Limit
     |--------------------------------------------------------------------------
     |
-    | This is an arbitrary upper limit on how many items a uses can buy in a
+    | This is an arbitrary upper limit on how many items a user can buy in a
     | single shop transaction.
     |
     */
-    'default_purchase_limit' => 99,
+    'default_purchase_limit'                            => 99,
 
     /*
     |--------------------------------------------------------------------------
@@ -222,6 +313,32 @@
     | Symbol for the (real world) currency used for sales posts.
     |
     */
-    'currency_symbol' => '$'
+    'currency_symbol'                                   => '$',
 
+    /*
+    |--------------------------------------------------------------------------
+    | User Username Changes
+    |--------------------------------------------------------------------------
+    |
+    | allow_username_changes: Whether or not users can change their usernames.
+    | Set to 0 to disable.
+    |
+    | username_change_cooldown: Cooldown period, in days, before a user can change their username again.
+    | Set to 0 / null to disable.
+    |
+    */
+
+    'allow_username_changes'                            => 0,
+    'username_change_cooldown'                          => 30,
+
+    /*
+    |--------------------------------------------------------------------------
+    | What You See Is What You Get (WYSIWYG) Comments
+    |--------------------------------------------------------------------------
+    |
+    | Whether or not to use a WYSIWYG editor for comments.
+    | 1: Use WYSIWYG editor. 0: Use markdown / plain text editor.
+    |
+    */
+    'wysiwyg_comments'                                  => 1,
 ];
diff --git a/config/lorekeeper/sites.php b/config/lorekeeper/sites.php
index 054d7d8395..3b668b05e9 100644
--- a/config/lorekeeper/sites.php
+++ b/config/lorekeeper/sites.php
@@ -24,76 +24,94 @@
     // Sites in this section use two additional keys; dA is used here as an example to demonstrate them
     // 1 = true/0 = false for both of them.
     'deviantart' => [
-        'full_name'    => 'deviantART',
-        'display_name' => 'dA',
-        'regex'        => '/deviantart\.com\/([A-Za-z0-9_-]+)/',
-        'link'         => 'deviantart.com',
-        'icon'         => 'fab fa-deviantart',
+        'full_name'     => 'deviantART',
+        'display_name'  => 'dA',
+        'regex'         => '/deviantart\.com\/([A-Za-z0-9_-]+)/',
+        'link'          => 'deviantart.com',
+        'icon'          => 'fab fa-deviantart',
 
         // Auth is for whether or not the site should offer this provider as an option for users
         // to authenticate with,
-        'auth' => 1,
+        'auth'          => 1,
+        // Login is for whether the site should be used as a login / registration provider instead of email verification with password
+        // Login can only be used when auth has already been turned on as well.
+        'login'         => 0,
         // while primary alias is whether or not an alias on this site can be a user's primary alias.
         'primary_alias' => 1,
     ],
 
-    'toyhouse' => [
+    'toyhouse'   => [
         'full_name'     => 'Toyhou.se',
         'display_name'  => 'TH',
         'regex'         => '/toyhou\.se\/([A-Za-z0-9_-]+)/',
         'link'          => 'toyhou.se',
         'icon'          => 'fas fa-home',
         'auth'          => 1,
+        'login'         => 1,
         'primary_alias' => 1,
     ],
 
-    'twitter' => [
+    'twitter'    => [
         'full_name'     => 'Twitter',
         'display_name'  => 'twitter',
         'regex'         => '/twitter\.com\/([A-Za-z0-9_-]+)/',
         'link'          => 'twitter.com',
         'icon'          => 'fab fa-twitter',
         'auth'          => 0,
+        'login'         => 0,
         'primary_alias' => 0,
     ],
 
-    'instagram' => [
+    'instagram'  => [
         'full_name'     => 'Instagram',
         'display_name'  => 'ig',
         'regex'         => '/instagram\.com\/([A-Za-z0-9_-]+)/',
         'link'          => 'instagram.com',
         'icon'          => 'fab fa-instagram',
         'auth'          => 0,
+        'login'         => 0,
         'primary_alias' => 0,
     ],
 
-    'tumblr' => [
+    'tumblr'     => [
         'full_name'     => 'Tumblr',
         'display_name'  => 'tumblr',
         'regex'         => '/([A-Za-z0-9_-]+)\.tumblr\.com/',
         'link'          => 'tumblr.com',
         'icon'          => 'fab fa-tumblr',
         'auth'          => 0,
+        'login'         => 0,
         'primary_alias' => 0,
     ],
 
-    'imgur' => [
+    'imgur'      => [
         'full_name'     => 'Imgur',
         'display_name'  => 'imgur',
         'regex'         => '/imgur\.com\/user\/([A-Za-z0-9_-]+)/',
         'link'          => 'imgur.com/user/',
         'icon'          => 'far fa-image',
         'auth'          => 0,
+        'login'         => 0,
         'primary_alias' => 0,
     ],
 
-    'twitch' => [
+    'twitch'     => [
         'full_name'     => 'Twitch.tv',
         'display_name'  => 'twitch',
         'regex'         => '/twitch\.tv\/([A-Za-z0-9_-]+)/',
         'link'          => 'twitch.tv',
         'icon'          => 'fab fa-twitch',
         'auth'          => 0,
+        'login'         => 0,
+        'primary_alias' => 0,
+    ],
+
+    'discord'    => [
+        'full_name'     => 'Discord',
+        'display_name'  => 'discord',
+        'regex'         => '/([A-Za-z0-9_-]+)#([0-9]+)/m',
+        'icon'          => 'fab fa-discord',
+        'auth'          => 0,
         'primary_alias' => 0,
     ],
 
@@ -110,7 +128,7 @@
         'link'         => 'artstation.com',
     ],
 
-    'picarto' => [
+    'picarto'    => [
         'full_name'    => 'Picarto',
         'display_name' => 'picarto',
         'regex'        => '/picarto\.tv\/([A-Za-z0-9_-]+)/',
diff --git a/config/lorekeeper/staff-reward-actions/design_update_vote.php b/config/lorekeeper/staff-reward-actions/design_update_vote.php
new file mode 100644
index 0000000000..5261deeb8d
--- /dev/null
+++ b/config/lorekeeper/staff-reward-actions/design_update_vote.php
@@ -0,0 +1,12 @@
+<?php
+
+return [
+    // Name and description shown in the admin panel
+    'name'        => 'Design Update Voting',
+    'description' => 'Voting on design updates. One time per update.',
+    'actions'     => [
+        // Actions, as reported to admin action logging,
+        // that should use this key's reward value
+        'Voted on Design Update',
+    ],
+];
diff --git a/config/lorekeeper/staff-reward-actions/gallery_submission_value.php b/config/lorekeeper/staff-reward-actions/gallery_submission_value.php
new file mode 100644
index 0000000000..edee6df9a8
--- /dev/null
+++ b/config/lorekeeper/staff-reward-actions/gallery_submission_value.php
@@ -0,0 +1,12 @@
+<?php
+
+return [
+    // Name and description shown in the admin panel
+    'name'        => 'Gallery Submission Valuing',
+    'description' => 'Processing currency rewards for gallery submissions.',
+    'actions'     => [
+        // Actions, as reported to admin action logging,
+        // that should use this key's reward value
+        'Awarded Gallery Submission',
+    ],
+];
diff --git a/config/lorekeeper/staff-reward-actions/gallery_submission_vote.php b/config/lorekeeper/staff-reward-actions/gallery_submission_vote.php
new file mode 100644
index 0000000000..4bc8ceeae5
--- /dev/null
+++ b/config/lorekeeper/staff-reward-actions/gallery_submission_vote.php
@@ -0,0 +1,12 @@
+<?php
+
+return [
+    // Name and description shown in the admin panel
+    'name'        => 'Gallery Submission Voting',
+    'description' => 'Voting on gallery submissions. One time per submission.',
+    'actions'     => [
+        // Actions, as reported to admin action logging,
+        // that should use this key's reward value
+        'Voted on Gallery Submission',
+    ],
+];
diff --git a/config/lorekeeper/staff-reward-actions/process_character_transfer.php b/config/lorekeeper/staff-reward-actions/process_character_transfer.php
new file mode 100644
index 0000000000..bb85496b08
--- /dev/null
+++ b/config/lorekeeper/staff-reward-actions/process_character_transfer.php
@@ -0,0 +1,13 @@
+<?php
+
+return [
+    // Name and description shown in the admin panel
+    'name'        => 'Character Transfer Processing',
+    'description' => 'Approving or rejecting character transfers.',
+    'actions'     => [
+        // Actions, as reported to admin action logging,
+        // that should use this key's reward value
+        'Approved Transfer',
+        'Rejected Transfer',
+    ],
+];
diff --git a/config/lorekeeper/staff-reward-actions/process_design_update.php b/config/lorekeeper/staff-reward-actions/process_design_update.php
new file mode 100644
index 0000000000..01cd6b7c51
--- /dev/null
+++ b/config/lorekeeper/staff-reward-actions/process_design_update.php
@@ -0,0 +1,13 @@
+<?php
+
+return [
+    // Name and description shown in the admin panel
+    'name'        => 'Design Update Processing',
+    'description' => 'Approving or rejecting design updates. Doesn\'t include cancelling.',
+    'actions'     => [
+        // Actions, as reported to admin action logging,
+        // that should use this key's reward value
+        'Rejected Design Update',
+        'Approved Design Update',
+    ],
+];
diff --git a/config/lorekeeper/staff-reward-actions/process_report.php b/config/lorekeeper/staff-reward-actions/process_report.php
new file mode 100644
index 0000000000..cb1c6db596
--- /dev/null
+++ b/config/lorekeeper/staff-reward-actions/process_report.php
@@ -0,0 +1,13 @@
+<?php
+
+return [
+    // Name and description shown in the admin panel
+    'name'        => 'Report Processing',
+    'description' => 'Claiming and closing reports.',
+    'actions'     => [
+        // Actions, as reported to admin action logging,
+        // that should use this key's reward value
+        'Report Assigned',
+        'Report Closed',
+    ],
+];
diff --git a/config/lorekeeper/staff-reward-actions/process_submission.php b/config/lorekeeper/staff-reward-actions/process_submission.php
new file mode 100644
index 0000000000..cbb4ffa48d
--- /dev/null
+++ b/config/lorekeeper/staff-reward-actions/process_submission.php
@@ -0,0 +1,13 @@
+<?php
+
+return [
+    // Name and description shown in the admin panel
+    'name'        => 'Submission/Claim Processing',
+    'description' => 'Approving or rejecting prompt submissions and claims.',
+    'actions'     => [
+        // Actions, as reported to admin action logging,
+        // that should use this key's reward value
+        'Submission Rejected',
+        'Submission Approved',
+    ],
+];
diff --git a/config/lorekeeper/staff-reward-actions/process_trade.php b/config/lorekeeper/staff-reward-actions/process_trade.php
new file mode 100644
index 0000000000..6ccaa89acf
--- /dev/null
+++ b/config/lorekeeper/staff-reward-actions/process_trade.php
@@ -0,0 +1,13 @@
+<?php
+
+return [
+    // Name and description shown in the admin panel
+    'name'        => 'Trade Processing',
+    'description' => 'Approving or rejecting trades.',
+    'actions'     => [
+        // Actions, as reported to admin action logging,
+        // that should use this key's reward value
+        'Approved Trade',
+        'Rejected Trade',
+    ],
+];
diff --git a/config/lorekeeper/text_pages.php b/config/lorekeeper/text_pages.php
index f1542e7732..cb16c4becc 100644
--- a/config/lorekeeper/text_pages.php
+++ b/config/lorekeeper/text_pages.php
@@ -12,22 +12,21 @@
     |
     */
 
-    'terms' => [
+    'terms'   => [
         'title' => 'Terms of Service',
-        'text' => 'This is the terms of usage of your site. Users will see a link to these terms when registering and a Terms link is displayed at the bottom of the layout.'
+        'text'  => 'This is the terms of usage of your site. Users will see a link to these terms when registering and a Terms link is displayed at the bottom of the layout.',
     ],
     'privacy' => [
         'title' => 'Privacy Policy',
-        'text' => 'This is a page that explains how your site might use your members\' data. Users will see a link to this page when registering and a Privacy link is displayed at the bottom of the layout.' 
+        'text'  => 'This is a page that explains how your site might use your members\' data. Users will see a link to this page when registering and a Privacy link is displayed at the bottom of the layout.',
     ],
-    'about' => [
+    'about'   => [
         'title' => 'About',
-        'text' => 'Welcome to Lorekeeper! This page is editable from the admin panel. Besides being displayed on the front page when users are logged out, it is also accessible from the About link at the bottom of the page.'
+        'text'  => 'Welcome to Lorekeeper! This page is editable from the admin panel. Besides being displayed on the front page when users are logged out, it is also accessible from the About link at the bottom of the page.',
     ],
     'credits' => [
         'title' => 'Credits',
-        'text' => 'This page will contain credits for code, art, ect that has been used on your site!'
+        'text'  => 'This page will contain credits for code, art, ect that has been used on your site!',
     ],
 
-
 ];
diff --git a/config/mail.php b/config/mail.php
index 6f8469f824..ec33ccd611 100644
--- a/config/mail.php
+++ b/config/mail.php
@@ -16,7 +16,7 @@
     |
     */
 
-    'driver' => env('MAIL_DRIVER', 'smtp'),
+    'driver'      => env('MAIL_DRIVER', 'smtp'),
 
     /*
     |--------------------------------------------------------------------------
@@ -29,7 +29,7 @@
     |
     */
 
-    'host' => env('MAIL_HOST', 'smtp.mailgun.org'),
+    'host'        => env('MAIL_HOST', 'smtp.mailgun.org'),
 
     /*
     |--------------------------------------------------------------------------
@@ -42,7 +42,7 @@
     |
     */
 
-    'port' => env('MAIL_PORT', 587),
+    'port'        => env('MAIL_PORT', 587),
 
     /*
     |--------------------------------------------------------------------------
@@ -55,9 +55,9 @@
     |
     */
 
-    'from' => [
+    'from'        => [
         'address' => env('MAIL_FROM_ADDRESS', 'hello@example.com'),
-        'name' => env('MAIL_FROM_NAME', 'Example'),
+        'name'    => env('MAIL_FROM_NAME', 'Example'),
     ],
 
     /*
@@ -71,7 +71,7 @@
     |
     */
 
-    'encryption' => env('MAIL_ENCRYPTION', 'tls'),
+    'encryption'  => env('MAIL_ENCRYPTION', 'tls'),
 
     /*
     |--------------------------------------------------------------------------
@@ -84,9 +84,9 @@
     |
     */
 
-    'username' => env('MAIL_USERNAME'),
+    'username'    => env('MAIL_USERNAME'),
 
-    'password' => env('MAIL_PASSWORD'),
+    'password'    => env('MAIL_PASSWORD'),
 
     /*
     |--------------------------------------------------------------------------
@@ -99,7 +99,7 @@
     |
     */
 
-    'sendmail' => '/usr/sbin/sendmail -bs',
+    'sendmail'    => '/usr/sbin/sendmail -bs',
 
     /*
     |--------------------------------------------------------------------------
@@ -112,7 +112,7 @@
     |
     */
 
-    'markdown' => [
+    'markdown'    => [
         'theme' => 'default',
 
         'paths' => [
diff --git a/config/queue.php b/config/queue.php
index ec520ec6f7..033049611e 100644
--- a/config/queue.php
+++ b/config/queue.php
@@ -13,7 +13,7 @@
     |
     */
 
-    'default' => env('QUEUE_CONNECTION', 'sync'),
+    'default'     => env('QUEUE_CONNECTION', 'sync'),
 
     /*
     |--------------------------------------------------------------------------
@@ -30,40 +30,40 @@
 
     'connections' => [
 
-        'sync' => [
+        'sync'       => [
             'driver' => 'sync',
         ],
 
-        'database' => [
-            'driver' => 'database',
-            'table' => 'jobs',
-            'queue' => 'default',
+        'database'   => [
+            'driver'      => 'database',
+            'table'       => 'jobs',
+            'queue'       => 'default',
             'retry_after' => 90,
         ],
 
         'beanstalkd' => [
-            'driver' => 'beanstalkd',
-            'host' => 'localhost',
-            'queue' => 'default',
+            'driver'      => 'beanstalkd',
+            'host'        => 'localhost',
+            'queue'       => 'default',
             'retry_after' => 90,
-            'block_for' => 0,
+            'block_for'   => 0,
         ],
 
-        'sqs' => [
+        'sqs'        => [
             'driver' => 'sqs',
-            'key' => env('AWS_ACCESS_KEY_ID'),
+            'key'    => env('AWS_ACCESS_KEY_ID'),
             'secret' => env('AWS_SECRET_ACCESS_KEY'),
             'prefix' => env('SQS_PREFIX', 'https://sqs.us-east-1.amazonaws.com/your-account-id'),
-            'queue' => env('SQS_QUEUE', 'your-queue-name'),
+            'queue'  => env('SQS_QUEUE', 'your-queue-name'),
             'region' => env('AWS_REGION', 'us-east-1'),
         ],
 
-        'redis' => [
-            'driver' => 'redis',
-            'connection' => 'default',
-            'queue' => env('REDIS_QUEUE', 'default'),
+        'redis'      => [
+            'driver'      => 'redis',
+            'connection'  => 'default',
+            'queue'       => env('REDIS_QUEUE', 'default'),
             'retry_after' => 90,
-            'block_for' => null,
+            'block_for'   => null,
         ],
 
     ],
@@ -79,9 +79,9 @@
     |
     */
 
-    'failed' => [
+    'failed'      => [
         'database' => env('DB_CONNECTION', 'mysql'),
-        'table' => 'failed_jobs',
+        'table'    => 'failed_jobs',
     ],
 
 ];
diff --git a/config/services.php b/config/services.php
index 5f134b798a..998138cae0 100644
--- a/config/services.php
+++ b/config/services.php
@@ -14,27 +14,27 @@
     |
     */
 
-    'mailgun' => [
+    'mailgun'    => [
         'domain'   => env('MAILGUN_DOMAIN'),
         'secret'   => env('MAILGUN_SECRET'),
         'endpoint' => env('MAILGUN_ENDPOINT', 'api.mailgun.net'),
     ],
 
-    'postmark' => [
+    'postmark'   => [
         'token' => env('POSTMARK_TOKEN'),
     ],
 
-    'ses' => [
+    'ses'        => [
         'key'    => env('AWS_ACCESS_KEY_ID'),
         'secret' => env('AWS_SECRET_ACCESS_KEY'),
         'region' => env('AWS_REGION', 'us-east-1'),
     ],
 
-    'sparkpost' => [
+    'sparkpost'  => [
         'secret' => env('SPARKPOST_SECRET'),
     ],
 
-    'stripe' => [
+    'stripe'     => [
         'model'   => App\Models\User\User::class,
         'key'     => env('STRIPE_KEY'),
         'secret'  => env('STRIPE_SECRET'),
@@ -44,7 +44,7 @@
         ],
     ],
 
-    'toyhouse' => [
+    'toyhouse'   => [
         'client_id'     => env('TOYHOUSE_CLIENT_ID'),
         'client_secret' => env('TOYHOUSE_CLIENT_SECRET'),
         'redirect'      => env('TOYHOUSE_REDIRECT_URI', '/auth/callback/toyhouse'),
@@ -56,37 +56,38 @@
         'redirect'      => env('DEVIANTART_REDIRECT_URI', '/auth/callback/deviantart'),
     ],
 
-    'twitter' => [
+    'twitter'    => [
         'client_id'     => env('TWITTER_CLIENT_ID'),
         'client_secret' => env('TWITTER_CLIENT_SECRET'),
         'redirect'      => env('TWITTER_REDIRECT_URI', '/auth/callback/twitter'),
+        'oauth'         => 2,
     ],
 
-    'instagram' => [
+    'instagram'  => [
         'client_id'     => env('INSTAGRAM_CLIENT_ID'),
         'client_secret' => env('INSTAGRAM_CLIENT_SECRET'),
         'redirect'      => env('INSTAGRAM_REDIRECT_URI', '/auth/callback/instagram'),
     ],
 
-    'tumblr' => [
+    'tumblr'     => [
         'client_id'     => env('TUMBLR_CLIENT_ID'),
         'client_secret' => env('TUMBLR_CLIENT_SECRET'),
         'redirect'      => env('TUMBLR_REDIRECT_URI', '/auth/callback/tumblr'),
     ],
 
-    'imgur' => [
+    'imgur'      => [
         'client_id'     => env('IMGUR_CLIENT_ID'),
         'client_secret' => env('IMGUR_CLIENT_SECRET'),
         'redirect'      => env('IMGUR_REDIRECT_URI', '/auth/callback/imgur'),
     ],
 
-    'twitch' => [
+    'twitch'     => [
         'client_id'     => env('TWITCH_CLIENT_ID'),
         'client_secret' => env('TWITCH_CLIENT_SECRET'),
         'redirect'      => env('TWITCH_REDIRECT_URI', '/auth/callback/twitch'),
     ],
 
-    'discord' => [
+    'discord'    => [
         'client_id'     => env('DISCORD_CLIENT_ID'),
         'client_secret' => env('DISCORD_CLIENT_SECRET'),
         'redirect'      => env('DISCORD_REDIRECT_URI', '/auth/callback/discord'),
diff --git a/config/session.php b/config/session.php
index fbb9b4d765..3976ed2d02 100644
--- a/config/session.php
+++ b/config/session.php
@@ -18,7 +18,7 @@
     |
     */
 
-    'driver' => env('SESSION_DRIVER', 'file'),
+    'driver'          => env('SESSION_DRIVER', 'file'),
 
     /*
     |--------------------------------------------------------------------------
@@ -31,7 +31,7 @@
     |
     */
 
-    'lifetime' => env('SESSION_LIFETIME', 120),
+    'lifetime'        => env('SESSION_LIFETIME', 120),
 
     'expire_on_close' => false,
 
@@ -46,7 +46,7 @@
     |
     */
 
-    'encrypt' => false,
+    'encrypt'         => false,
 
     /*
     |--------------------------------------------------------------------------
@@ -59,7 +59,7 @@
     |
     */
 
-    'files' => storage_path('framework/sessions'),
+    'files'           => storage_path('framework/sessions'),
 
     /*
     |--------------------------------------------------------------------------
@@ -72,7 +72,7 @@
     |
     */
 
-    'connection' => env('SESSION_CONNECTION', null),
+    'connection'      => env('SESSION_CONNECTION', null),
 
     /*
     |--------------------------------------------------------------------------
@@ -85,7 +85,7 @@
     |
     */
 
-    'table' => 'sessions',
+    'table'           => 'sessions',
 
     /*
     |--------------------------------------------------------------------------
@@ -98,7 +98,7 @@
     |
     */
 
-    'store' => env('SESSION_STORE', null),
+    'store'           => env('SESSION_STORE', null),
 
     /*
     |--------------------------------------------------------------------------
@@ -111,7 +111,7 @@
     |
     */
 
-    'lottery' => [2, 100],
+    'lottery'         => [2, 100],
 
     /*
     |--------------------------------------------------------------------------
@@ -124,7 +124,7 @@
     |
     */
 
-    'cookie' => env(
+    'cookie'          => env(
         'SESSION_COOKIE',
         Str::slug(env('APP_NAME', 'laravel'), '_').'_session'
     ),
@@ -140,7 +140,7 @@
     |
     */
 
-    'path' => '/',
+    'path'            => '/',
 
     /*
     |--------------------------------------------------------------------------
@@ -153,7 +153,7 @@
     |
     */
 
-    'domain' => env('SESSION_DOMAIN', null),
+    'domain'          => env('SESSION_DOMAIN', null),
 
     /*
     |--------------------------------------------------------------------------
@@ -166,7 +166,7 @@
     |
     */
 
-    'secure' => env('SESSION_SECURE_COOKIE', false),
+    'secure'          => env('SESSION_SECURE_COOKIE', false),
 
     /*
     |--------------------------------------------------------------------------
@@ -179,7 +179,7 @@
     |
     */
 
-    'http_only' => true,
+    'http_only'       => true,
 
     /*
     |--------------------------------------------------------------------------
@@ -194,6 +194,6 @@
     |
     */
 
-    'same_site' => null,
+    'same_site'       => null,
 
 ];
diff --git a/config/view.php b/config/view.php
index 22b8a18d32..138be8bf73 100644
--- a/config/view.php
+++ b/config/view.php
@@ -13,7 +13,7 @@
     |
     */
 
-    'paths' => [
+    'paths'    => [
         resource_path('views'),
     ],
 
diff --git a/database/factories/UserFactory.php b/database/factories/UserFactory.php
index 6cdf48f2cd..9ab8edc773 100644
--- a/database/factories/UserFactory.php
+++ b/database/factories/UserFactory.php
@@ -1,8 +1,8 @@
 <?php
 
 use App\Models\User\User;
-use Illuminate\Support\Str;
 use Faker\Generator as Faker;
+use Illuminate\Support\Str;
 
 /*
 |--------------------------------------------------------------------------
@@ -17,10 +17,10 @@
 
 $factory->define(User::class, function (Faker $faker) {
     return [
-        'name' => $faker->name,
-        'email' => $faker->unique()->safeEmail,
+        'name'              => $faker->name,
+        'email'             => $faker->unique()->safeEmail,
         'email_verified_at' => now(),
-        'password' => '$2y$10$92IXUNpkjO0rOQ5byMi.Ye4oKoEa3Ro9llC/.og/at2.uheWG/igi', // password
-        'remember_token' => Str::random(10),
+        'password'          => '$2y$10$92IXUNpkjO0rOQ5byMi.Ye4oKoEa3Ro9llC/.og/at2.uheWG/igi', // password
+        'remember_token'    => Str::random(10),
     ];
 });
diff --git a/database/migrations/2014_10_12_000000_create_users_table.php b/database/migrations/2014_10_12_000000_create_users_table.php
deleted file mode 100644
index 33f748263e..0000000000
--- a/database/migrations/2014_10_12_000000_create_users_table.php
+++ /dev/null
@@ -1,94 +0,0 @@
-<?php
-
-use Illuminate\Support\Facades\Schema;
-use Illuminate\Database\Schema\Blueprint;
-use Illuminate\Database\Migrations\Migration;
-
-class CreateUsersTable extends Migration
-{
-    /**
-     * Run the migrations.
-     *
-     * @return void
-     */
-    public function up()
-    {
-        // Create user ranks and powers
-        Schema::create('ranks', function(Blueprint $table) {
-            $table->engine = 'InnoDB';
-            $table->increments('id');
-            $table->string('name');
-            $table->string('description', 512)->nullable();
-            $table->integer('sort')->unsigned()->default(0);
-            $table->string('color', 6)->nullable();
-        });
-        Schema::create('rank_powers', function(Blueprint $table) {
-            $table->engine = 'InnoDB';
-            $table->integer('rank_id')->unsigned();
-            $table->string('power')->index(); // Power IDs are defined in a config file
-
-            $table->foreign('rank_id')->references('id')->on('ranks');
-            $table->unique(['rank_id', 'power']);
-        });
-
-        // Create user tables
-        // Running with the default Laravel users table here.
-        Schema::create('users', function (Blueprint $table) {
-            $table->engine = 'InnoDB';
-            $table->increments('id');
-            $table->string('name')->index()->unique();
-            $table->string('alias')->nullable()->index();
-            $table->integer('rank_id')->unsigned()->default(1);
-
-            $table->integer('notifications_unread')->unsigned()->default(0);
-            
-            $table->string('email')->unique();
-            $table->timestamp('email_verified_at')->nullable();
-            $table->string('password');
-            $table->rememberToken();
-            $table->timestamps();
-
-            $table->foreign('rank_id')->references('id')->on('ranks');
-        });
-        Schema::create('user_settings', function (Blueprint $table) {
-            $table->engine = 'InnoDB';
-            $table->integer('user_id')->unsigned();
-            $table->boolean('is_fto')->default(1);
-            $table->integer('character_count')->unsigned()->default(0);
-            $table->integer('myo_slot_count')->unsigned()->default(0);
-
-            $table->foreign('user_id')->references('id')->on('users');
-        });
-
-        // Notifications
-        Schema::create('notifications', function (Blueprint $table) {
-            $table->engine = 'InnoDB';
-            $table->increments('id');
-            $table->integer('user_id')->unsigned();
-
-            $table->integer('notification_type_id')->unsigned(); // Notification type IDs are defined in a config file
-
-            $table->boolean('is_unread')->default(1);
-            $table->timestamps();
-
-            $table->foreign('user_id')->references('id')->on('users');
-        });
-
-    }
-
-    /**
-     * Reverse the migrations.
-     *
-     * @return void
-     */
-    public function down()
-    {
-        Schema::dropIfExists('notifications');
-        
-        Schema::dropIfExists('user_settings');
-        Schema::dropIfExists('users');
-
-        Schema::dropIfExists('rank_powers');
-        Schema::dropIfExists('ranks');
-    }
-}
diff --git a/database/migrations/2014_10_12_100000_create_password_resets_table.php b/database/migrations/2014_10_12_100000_create_password_resets_table.php
deleted file mode 100644
index 4b6627ae75..0000000000
--- a/database/migrations/2014_10_12_100000_create_password_resets_table.php
+++ /dev/null
@@ -1,33 +0,0 @@
-<?php
-
-use Illuminate\Support\Facades\Schema;
-use Illuminate\Database\Schema\Blueprint;
-use Illuminate\Database\Migrations\Migration;
-
-class CreatePasswordResetsTable extends Migration
-{
-    /**
-     * Run the migrations.
-     *
-     * @return void
-     */
-    public function up()
-    {
-        Schema::create('password_resets', function (Blueprint $table) {
-            $table->engine = 'InnoDB';
-            $table->string('email')->index();
-            $table->string('token');
-            $table->timestamp('created_at')->nullable();
-        });
-    }
-
-    /**
-     * Reverse the migrations.
-     *
-     * @return void
-     */
-    public function down()
-    {
-        Schema::dropIfExists('password_resets');
-    }
-}
diff --git a/database/migrations/2014_10_12_200000_add_two_factor_columns_to_users_table.php b/database/migrations/2014_10_12_200000_add_two_factor_columns_to_users_table.php
new file mode 100644
index 0000000000..081cd98115
--- /dev/null
+++ b/database/migrations/2014_10_12_200000_add_two_factor_columns_to_users_table.php
@@ -0,0 +1,31 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+class AddTwoFactorColumnsToUsersTable extends Migration {
+    /**
+     * Run the migrations.
+     */
+    public function up() {
+        Schema::table('users', function (Blueprint $table) {
+            $table->text('two_factor_secret')
+                ->after('password')
+                ->nullable();
+
+            $table->text('two_factor_recovery_codes')
+                ->after('two_factor_secret')
+                ->nullable();
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     */
+    public function down() {
+        Schema::table('users', function (Blueprint $table) {
+            $table->dropColumn('two_factor_secret', 'two_factor_recovery_codes');
+        });
+    }
+}
diff --git a/database/migrations/2018_06_30_113500_create_comments_table.php b/database/migrations/2018_06_30_113500_create_comments_table.php
index 6e19445d72..22393dee19 100644
--- a/database/migrations/2018_06_30_113500_create_comments_table.php
+++ b/database/migrations/2018_06_30_113500_create_comments_table.php
@@ -1,31 +1,27 @@
 <?php
 
-use Illuminate\Support\Facades\Schema;
-use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
 
-class CreateCommentsTable extends Migration
-{
+class CreateCommentsTable extends Migration {
     /**
      * Run the migrations.
-     *
-     * @return void
      */
-    public function up()
-    {
+    public function up() {
         Schema::create('comments', function (Blueprint $table) {
             $table->bigIncrements('id');
 
             $table->string('commenter_id')->nullable();
             $table->string('commenter_type')->nullable();
-            $table->index(["commenter_id", "commenter_type"]);
+            $table->index(['commenter_id', 'commenter_type']);
 
             $table->string('guest_name')->nullable();
             $table->string('guest_email')->nullable();
 
-            $table->string("commentable_type");
-            $table->string("commentable_id");
-            $table->index(["commentable_type", "commentable_id"]);
+            $table->string('commentable_type');
+            $table->string('commentable_id');
+            $table->index(['commentable_type', 'commentable_id']);
 
             $table->text('comment');
 
@@ -34,18 +30,15 @@ public function up()
             $table->unsignedBigInteger('child_id')->nullable();
             $table->foreign('child_id')->references('id')->on('comments')->onDelete('cascade');
 
-			$table->softDeletes();
+            $table->softDeletes();
             $table->timestamps();
         });
     }
 
     /**
      * Reverse the migrations.
-     *
-     * @return void
      */
-    public function down()
-    {
+    public function down() {
         Schema::dropIfExists('comments');
     }
 }
diff --git a/database/migrations/2019_02_27_075638_create_game_tables.php b/database/migrations/2019_02_27_075638_create_game_tables.php
deleted file mode 100644
index 6b3c590b36..0000000000
--- a/database/migrations/2019_02_27_075638_create_game_tables.php
+++ /dev/null
@@ -1,317 +0,0 @@
-<?php
-
-use Illuminate\Support\Facades\Schema;
-use Illuminate\Database\Schema\Blueprint;
-use Illuminate\Database\Migrations\Migration;
-
-class CreateGameTables extends Migration
-{
-    /**
-     * Run the migrations.
-     *
-     * @return void
-     */
-    public function up()
-    {
-        // Tables for actual game use.
-        // Most of these have a description field - these are intended for short descriptions, like
-        // you would find in a tooltip, and should contain a link out to more detailed explanations
-        // if necessary.
-
-        // Create rarity tables ///////////////////////////////////////////////////////////////////
-
-        // Some games will have different systems for rarity, but here's an all-purpose setup
-        Schema::create('rarities', function (Blueprint $table) {
-            $table->engine = 'InnoDB';
-            $table->increments('id');
-            
-            $table->string('name');
-            $table->string('description', 512);
-            $table->integer('sort')->unsigned()->default(0);
-            $table->string('color', 6)->nullable();
-            $table->boolean('has_image')->default(0);
-        });
-
-        // Create item tables /////////////////////////////////////////////////////////////////////
-
-        // Item categories are for sorting types of items in the inventory
-        Schema::create('item_categories', function (Blueprint $table) {
-            $table->engine = 'InnoDB';
-            $table->increments('id');
-            
-            $table->string('name');
-            $table->string('description', 512);
-            $table->integer('sort')->unsigned()->default(0);
-        });
-
-        Schema::create('items', function (Blueprint $table) {
-            $table->engine = 'InnoDB';
-            $table->increments('id');
-            $table->integer('item_category_id')->unsigned()->nullable()->default(null);
-            // For the sake of saving some headaches, item category can be left empty (which will put them in a generic "miscellaneous" category)
-            
-            $table->string('name');
-            $table->string('description', 512);
-            $table->text('specifications')->nullable()->default(null);
-            $table->boolean('has_image')->default(0);
-
-            $table->foreign('item_category_id')->references('id')->on('item_categories');
-        });
-
-        Schema::create('inventory', function (Blueprint $table) {
-            $table->engine = 'InnoDB';
-            $table->increments('id');
-            $table->integer('item_id')->unsigned();
-            $table->integer('user_id')->unsigned();
-
-            $table->integer('count')->unsigned()->default(1);
-
-            $table->string('data', 1024)->nullable(); // includes information like staff notes, etc.
-
-            $table->timestamps();
-            $table->softDeletes();
-
-            $table->foreign('item_id')->references('id')->on('items');
-            $table->foreign('user_id')->references('id')->on('users');
-        });
-
-        Schema::create('inventory_log', function(Blueprint $table) {
-            $table->engine = 'InnoDB';
-            $table->increments('id');
-            $table->integer('item_id')->unsigned();
-            $table->integer('count')->unsigned()->default(1);
-            $table->integer('stack_id')->unsigned();
-
-            $table->integer('sender_id')->unsigned()->nullable();
-            $table->integer('recipient_id')->unsigned()->nullable();
-            $table->string('log'); // Actual log text
-            $table->string('log_type'); // Indicates what type of transaction the item was used in
-            $table->string('data', 1024)->nullable(); // Includes information like staff notes, etc.
-
-            $table->timestamps();
-
-            $table->foreign('item_id')->references('id')->on('items');
-            $table->foreign('stack_id')->references('id')->on('inventory');
-
-            $table->foreign('sender_id')->references('id')->on('users');
-            $table->foreign('recipient_id')->references('id')->on('users');
-        });
-
-        // Create species tables //////////////////////////////////////////////////////////////////
-
-        // These are named "species", but can also be used for making subspecies 
-        // (just change the wording on the views)
-        // I'll add a recipe to add a category above species so that multiple species
-        // with subspecies can be done, it just appears to be uncommon in ARPGs to
-        // have so many levels of options at once.
-        Schema::create('specieses', function(Blueprint $table) {
-            $table->engine = 'InnoDB';
-            $table->increments('id');
-            $table->string('name');
-            $table->string('description', 512);
-            $table->text('specifications')->nullable()->default(null);
-            $table->boolean('has_image')->default(0);
-            $table->integer('sort')->unsigned()->default(0);
-        });
-        // "Trait" is a reserved keyword, so traits are going to be called "features" instead
-        Schema::create('feature_categories', function(Blueprint $table) {
-            $table->engine = 'InnoDB';
-            $table->increments('id');
-
-            $table->string('name');
-            $table->string('description', 512);
-            $table->boolean('has_image')->default(0);
-            $table->integer('sort')->unsigned()->default(0);
-        });
-        Schema::create('features', function(Blueprint $table) {
-            $table->engine = 'InnoDB';
-            $table->increments('id');
-
-            // Once again, this can be left blank to put it in a miscellaneous category
-            $table->integer('feature_category_id')->unsigned()->nullable()->default(null);
-
-            // Species ID can be left as null for a trait that can be used by
-            // any species in the database.
-            $table->integer('species_id')->unsigned()->nullable()->default(null);
-            
-            $table->integer('rarity_id')->unsigned();
-            
-            $table->string('name');
-            $table->string('description', 512);
-            $table->text('specifications')->nullable()->default(null);
-            $table->boolean('has_image')->default(0);
-
-            $table->foreign('feature_category_id')->references('id')->on('feature_categories');
-            $table->foreign('species_id')->references('id')->on('specieses');
-            $table->foreign('rarity_id')->references('id')->on('rarities');
-        });
-
-        // Create character tables ////////////////////////////////////////////////////////////////
-
-        Schema::create('character_categories', function(Blueprint $table) {
-            $table->engine = 'InnoDB';
-            $table->increments('id');
-
-            $table->string('code'); // A short code used to identify the category, e.g. MYO, GEN2, etc.
-            
-            $table->string('name');
-            $table->string('description', 512);
-            $table->boolean('has_image')->default(0);
-            $table->integer('sort')->unsigned()->default(0);
-        });
-
-        Schema::create('character_images', function(Blueprint $table) {
-            $table->engine = 'InnoDB';
-            $table->increments('id');
-
-            $table->integer('character_id')->unsigned();
-            $table->integer('user_id')->unsigned();
-
-            // Credits
-            $table->string('designer_alias')->nullable();
-            $table->string('designer_url')->nullable();
-            $table->string('artist_alias')->nullable();
-            $table->string('artist_url')->nullable();
-
-            // This may get long, so making it a text field
-            // For writing notes about the image.
-            $table->text('description')->nullable();
-
-            // An additional URL reference for this image.
-            // Can be used to link to the original sale post, or a full body image
-            // for a design that's partially obscured.
-            $table->string('url')->nullable();
-
-            $table->boolean('is_visible')->default(1);
-
-            $table->timestamps();
-            $table->softDeletes();
-
-            //$table->foreign('character_id')->references('id')->on('characters');
-            $table->foreign('user_id')->references('id')->on('users');
-
-        });
-
-        // The actual character tables
-        Schema::create('characters', function(Blueprint $table) {
-            $table->engine = 'InnoDB';
-            $table->increments('id');
-
-            $table->integer('character_image_id')->unsigned(); // Default character image to display
-            $table->integer('character_category_id')->unsigned();
-            $table->integer('rarity_id')->unsigned();
-            $table->integer('user_id')->unsigned();
-
-            // Marks if the character is still a MYO slot.
-            $table->boolean('is_myo_slot')->default(0);
-
-            $table->integer('number')->unsigned();
-            $table->string('slug'); // The identifying code for this character
-
-            // For writing additional notes about the character (mod usage)
-            $table->text('description')->nullable();
-
-            // Transfer permissions
-            $table->boolean('is_sellable')->default(1);
-            $table->boolean('is_tradeable')->default(1);
-            $table->boolean('is_giftable')->default(1);
-            $table->integer('sale_value')->default(0);
-            $table->timestamp('transferrable_at')->nullable()->default(null); // Date of transfer cooldown
-            $table->timestamps();
-            $table->softDeletes();
-
-            $table->boolean('is_visible')->default(1);
-        });
-        Schema::create('character_features', function(Blueprint $table) {
-            $table->engine = 'InnoDB';
-            // Images can have different features, so features are attached to images rather than characters
-            $table->integer('character_image_id')->unsigned(); 
-            $table->integer('feature_id')->unsigned(); 
-            $table->string('data'); // Any special notes about the usage of this feature
-
-            $table->unique(['character_image_id', 'feature_id']);
-        });
-
-        Schema::create('character_log', function(Blueprint $table) {
-            $table->engine = 'InnoDB';
-            $table->increments('id');
-            $table->integer('character_id')->unsigned();
-            $table->integer('sender_id')->unsigned();
-            $table->integer('recipient_id')->unsigned();
-            $table->string('log'); // Actual log text
-            $table->string('log_type'); // Transfer, updates etc.
-            $table->string('data', 1024)->nullable(); // Includes information like staff notes, etc.
-
-            $table->timestamps();
-        });
-
-        // A general queue for modifying characters
-        Schema::create('character_submissions', function(Blueprint $table) {
-            $table->engine = 'InnoDB';
-            $table->increments('id');
-            $table->integer('user_id')->unsigned();
-
-            $table->integer('character_id')->unsigned()->nullable()->default(null);
-
-            $table->string('data', 1024)->nullable(); // Includes submitted information about the slot, e.g. traits used
-            $table->text('description')->nullable(); // Optional notes submitted by the user
-
-            // Mod info
-            $table->integer('staff_id')->unsigned();
-            $table->enum('status', ['Pending', 'Approved', 'Rejected', 'Cancelled'])->default('Pending');
-            $table->text('reason')->nullable(); // Include a reason for rejection
-
-            $table->timestamps();
-        });
-        
-
-        // Tracks characters/MYO slots that enter or leave a user's possession.
-        // Main things to track: 
-        // - Bought/traded for/was gifted a character/MYO slot
-        // - Sold/traded away/gifted away a character/MYO slot
-        // - Used a MYO slot (was approved)
-        // Depending on the game owner's preferences, FTO status may be "doesn't currently own a character"
-        // or "never had a character" (sometimes with additional qualifications, but usually the latter)
-        Schema::create('user_character_log', function(Blueprint $table) {
-            $table->engine = 'InnoDB';
-            $table->increments('id');
-            $table->integer('character_id')->unsigned()->nullable()->default(null);
-            $table->integer('sender_id')->unsigned();
-            $table->integer('recipient_id')->unsigned();
-            $table->string('log'); // Actual log text
-            $table->string('log_type'); // Transfer, updates etc.
-            $table->string('data', 1024)->nullable(); // Includes information like staff notes, etc.
-
-            $table->timestamps();
-        });
-
-    }
-
-    /**
-     * Reverse the migrations.
-     *
-     * @return void
-     */
-    public function down()
-    {
-        Schema::dropIfExists('user_character_log');
-        
-        Schema::dropIfExists('character_submissions');
-        Schema::dropIfExists('character_log');
-        Schema::dropIfExists('character_features');
-        Schema::dropIfExists('characters');
-        Schema::dropIfExists('character_images');
-        Schema::dropIfExists('character_categories');
-        
-        Schema::dropIfExists('features');
-        Schema::dropIfExists('feature_categories');
-        Schema::dropIfExists('specieses');
-
-        Schema::dropIfExists('inventory_log');
-        Schema::dropIfExists('inventory');
-        Schema::dropIfExists('items');
-        Schema::dropIfExists('item_categories');
-        
-        Schema::dropIfExists('rarities');
-    }
-}
diff --git a/database/migrations/2019_04_07_130129_add_site_settings.php b/database/migrations/2019_04_07_130129_add_site_settings.php
deleted file mode 100644
index ba9367d92a..0000000000
--- a/database/migrations/2019_04_07_130129_add_site_settings.php
+++ /dev/null
@@ -1,47 +0,0 @@
-<?php
-
-use Illuminate\Support\Facades\Schema;
-use Illuminate\Database\Schema\Blueprint;
-use Illuminate\Database\Migrations\Migration;
-
-class AddSiteSettings extends Migration
-{
-    /**
-     * Run the migrations.
-     *
-     * @return void
-     */
-    public function up()
-    {
-        // 
-        Schema::create('site_settings', function(Blueprint $table) {
-            $table->engine = 'InnoDB';
-            $table->string('key', 50)->unique()->primary();
-            $table->string('value');
-            $table->string('description', 1024);
-        });
-        
-        Schema::create('site_pages', function(Blueprint $table) {
-            $table->engine = 'InnoDB';
-            $table->increments('id');
-            $table->string('key', 30)->unique();
-            $table->string('title', 50);
-            $table->text('text')->nullable();
-            $table->boolean('is_listed')->default(1); // to list on the page directory
-            $table->boolean('is_visible')->default(1); // visibility to users without editing powers
-            $table->timestamps(); // for showing a "last edited" date
-        });
-    }
-
-    /**
-     * Reverse the migrations.
-     *
-     * @return void
-     */
-    public function down()
-    {
-        //
-        Schema::dropIfExists('site_pages');
-        Schema::dropIfExists('site_settings');
-    }
-}
diff --git a/database/migrations/2019_04_09_090831_create_user_log_table.php b/database/migrations/2019_04_09_090831_create_user_log_table.php
deleted file mode 100644
index 590ddd96c1..0000000000
--- a/database/migrations/2019_04_09_090831_create_user_log_table.php
+++ /dev/null
@@ -1,52 +0,0 @@
-<?php
-
-use Illuminate\Support\Facades\Schema;
-use Illuminate\Database\Schema\Blueprint;
-use Illuminate\Database\Migrations\Migration;
-
-class CreateUserLogTable extends Migration
-{
-    /**
-     * Run the migrations.
-     *
-     * @return void
-     */
-    public function up()
-    {
-        // This will log any changes made to user accounts, mainly: 
-        // 1. E-mail address changes (user side)
-        // 2. Username changes (admin side)
-        // 3. Alias clearing (admin side; logs old alias)
-        // 4. Manual FTO status change (admin side)
-        // This is so that
-        // 1. Any changes to user account information made by a mod 
-        //    can be attributed to a staff member. 
-        //    (Possibly overkill for accountability, but...)
-        // 2. If a blacklisted user tries to register, or a user tries to do
-        //    something sketchy with multiple accounts, old logs
-        //    might help confirm their identity.
-        Schema::create('user_update_log', function (Blueprint $table) {
-            $table->engine = 'InnoDB';
-            $table->increments('id');
-            $table->timestamps();
-
-            $table->integer('staff_id')->unsigned()->nullable()->default(null);
-            $table->integer('user_id')->unsigned();
-            $table->string('type', 32);
-            $table->string('data', 512);
-            
-            $table->foreign('user_id')->references('id')->on('users');
-            $table->foreign('staff_id')->references('id')->on('users');
-        });
-    }
-
-    /**
-     * Reverse the migrations.
-     *
-     * @return void
-     */
-    public function down()
-    {
-        Schema::dropIfExists('user_update_log');
-    }
-}
diff --git a/database/migrations/2019_04_09_095513_create_currency_tables.php b/database/migrations/2019_04_09_095513_create_currency_tables.php
deleted file mode 100644
index 509ff74c0f..0000000000
--- a/database/migrations/2019_04_09_095513_create_currency_tables.php
+++ /dev/null
@@ -1,107 +0,0 @@
-<?php
-
-use Illuminate\Support\Facades\Schema;
-use Illuminate\Database\Schema\Blueprint;
-use Illuminate\Database\Migrations\Migration;
-
-class CreateCurrencyTables extends Migration
-{
-    /**
-     * Run the migrations.
-     *
-     * @return void
-     */
-    public function up()
-    {
-        Schema::create('currencies', function (Blueprint $table) {
-            $table->engine = 'InnoDB';
-            $table->increments('id');
-
-            $table->boolean('is_user_owned')->default(0);
-            $table->boolean('is_character_owned')->default(0);
-
-            $table->string('name');
-            $table->string('abbreviation')->nullable()->default(null); // optional short form for the name
-            $table->string('description', 512)->nullable()->default(null);
-            $table->integer('sort_user')->unsigned()->default(0); // larger shows up first
-            $table->integer('sort_character')->unsigned()->default(0); // larger shows up first
-
-            // Applicable only to users. 
-            // Chooses whether to show on the user profile,
-            // or if it's only visible from the bank page.
-            // This allows event-only currencies to be created for short-term use
-            // but not clutter up user profiles. 
-            // (Non-displayed currencies are not listed if the user doesn't own any,
-            // but displayed ones will display as 0.)
-            $table->boolean('is_displayed')->default(1);
-
-            // Transfers are tricky - there are cases where spare "points" are assigned
-            // to the user to distribute freely among their characters.
-            // Theoretically, a game could allow points to be transferred from
-            // characters to users/other characters...but to keep things simple,
-            // user/character transfers are between the owner and their own characters.
-            // (I imagine character-to-user transfers are unusual, but it might just be needed...)
-            $table->boolean('allow_user_to_user')->default(0);
-            $table->boolean('allow_user_to_character')->default(0);
-            $table->boolean('allow_character_to_user')->default(0);
-
-            $table->boolean('has_icon')->default(0); // if an icon exists, it'll be displayed in place of the name/abbrev.
-            $table->boolean('has_image')->default(0); // for showing on the world page. Also optional.
-        });
-
-        Schema::create('banks', function (Blueprint $table) {
-            $table->engine = 'InnoDB';
-            $table->increments('id');
-            $table->integer('user_id')->unsigned()->nullable();
-            $table->integer('character_id')->unsigned()->nullable();
-            $table->integer('currency_id')->unsigned();
-
-            $table->integer('quantity')->default(0);
-            
-            $table->foreign('user_id')->references('id')->on('users');
-            $table->foreign('character_id')->references('id')->on('characters');
-            $table->foreign('currency_id')->references('id')->on('currencies');
-        });
-        
-        Schema::create('banks_log', function (Blueprint $table) {
-            $table->engine = 'InnoDB';
-            $table->increments('id');
-
-            $table->integer('sender_id')->unsigned()->nullable()->default(null);
-            $table->enum('sender_type', ['User', 'Character'])->nullable()->default(null);
-            $table->integer('recipient_id')->unsigned()->nullable()->default(null);
-            $table->enum('recipient_type', ['User', 'Character'])->nullable()->default(null);
-
-            // 1. Staff grant (manual)
-            // 2. Staff removal (manual)
-            // 3. Transferred to other user
-            // 4. Transferred to character
-            // 5. Taken from character
-            // 6. Activity reward
-            // ...and more
-            $table->string('type', 32);
-
-            // Any additional data, e.g. a reason for a staff grant, name of rewarded activity, etc.
-            $table->string('data', 512);
-            
-            $table->integer('currency_id')->unsigned();
-            $table->integer('quantity')->default(0);
-
-            $table->timestamps();
-            
-            $table->foreign('currency_id')->references('id')->on('currencies');
-        });
-    }
-
-    /**
-     * Reverse the migrations.
-     *
-     * @return void
-     */
-    public function down()
-    {
-        Schema::dropIfExists('banks_log');
-        Schema::dropIfExists('banks');
-        Schema::dropIfExists('currencies');
-    }
-}
diff --git a/database/migrations/2019_04_12_123405_fix_data_descriptions.php b/database/migrations/2019_04_12_123405_fix_data_descriptions.php
deleted file mode 100644
index ad502d3cd7..0000000000
--- a/database/migrations/2019_04_12_123405_fix_data_descriptions.php
+++ /dev/null
@@ -1,229 +0,0 @@
-<?php
-
-use Illuminate\Support\Facades\Schema;
-use Illuminate\Database\Schema\Blueprint;
-use Illuminate\Database\Migrations\Migration;
-
-class FixDataDescriptions extends Migration
-{
-    /**
-     * Run the migrations.
-     *
-     * @return void
-     */
-    public function up()
-    {
-        // OK...I decided I wanted to make these all consistent, and also allow HTML,
-        // which means I need a field for the parsed descriptions.
-        // Mildly concerned this is going to bulk up the tables, but I don't think
-        // performance would be a concern on masterlist sites in general...?
-        
-        // One of my earlier concerns was fitting descriptions into tooltips, but thinking about it, 
-        // it's better to just link them to the data entries directly...
-        // I'll eventually add something that'll parse spoiler boxes in text so that 
-        // lengthy information can be collapsed by the description writer.
-
-        Schema::table('ranks', function(Blueprint $table) {
-            $table->dropColumn('description');
-        });
-            
-        Schema::table('ranks', function(Blueprint $table) {
-            $table->text('description')->nullable()->default(null);
-            $table->text('parsed_description')->nullable()->default(null);
-        });
-        
-        Schema::table('rarities', function(Blueprint $table) {
-            $table->dropColumn('description');
-        });
-        
-        Schema::table('rarities', function(Blueprint $table) {
-            $table->text('description')->nullable()->default(null);
-            $table->text('parsed_description')->nullable()->default(null);
-        });
-        
-        Schema::table('item_categories', function(Blueprint $table) {
-            $table->dropColumn('description');
-        });
-
-        Schema::table('item_categories', function(Blueprint $table) {
-            $table->text('description')->nullable()->default(null);
-            $table->text('parsed_description')->nullable()->default(null);
-        });
-        
-        Schema::table('items', function(Blueprint $table) {
-            $table->dropColumn('description');
-            $table->dropColumn('specifications');
-        });
-
-        Schema::table('items', function(Blueprint $table) {
-            $table->text('description')->nullable()->default(null);
-            $table->text('parsed_description')->nullable()->default(null);
-        });
-        
-        Schema::table('specieses', function(Blueprint $table) {
-            $table->dropColumn('description');
-            $table->dropColumn('specifications');
-        });
-
-        Schema::table('specieses', function(Blueprint $table) {
-            $table->text('description')->nullable()->default(null);
-            $table->text('parsed_description')->nullable()->default(null);
-        });
-        
-        Schema::table('feature_categories', function(Blueprint $table) {
-            $table->dropColumn('description');
-        });
-
-        Schema::table('feature_categories', function(Blueprint $table) {
-            $table->text('description')->nullable()->default(null);
-            $table->text('parsed_description')->nullable()->default(null);
-        });
-        
-        Schema::table('features', function(Blueprint $table) {
-            $table->dropColumn('description');
-            $table->dropColumn('specifications');
-        });
-
-        Schema::table('features', function(Blueprint $table) {
-            $table->text('description')->nullable()->default(null);
-            $table->text('parsed_description')->nullable()->default(null);
-        });
-        
-        Schema::table('character_categories', function(Blueprint $table) {
-            $table->dropColumn('description');
-        });
-
-        Schema::table('character_categories', function(Blueprint $table) {
-            $table->text('description')->nullable()->default(null);
-            $table->text('parsed_description')->nullable()->default(null);
-        });
-        
-        Schema::table('character_images', function(Blueprint $table) {
-            $table->text('parsed_description')->nullable()->default(null);
-        });
-        
-        Schema::table('characters', function(Blueprint $table) {
-            $table->text('parsed_description')->nullable()->default(null);
-        });
-        
-        Schema::table('character_submissions', function(Blueprint $table) {
-            $table->text('parsed_description')->nullable()->default(null);
-        });
-        
-        Schema::table('currencies', function(Blueprint $table) {
-            $table->dropColumn('description');
-        });
-
-        Schema::table('currencies', function(Blueprint $table) {
-            $table->text('description')->nullable()->default(null);
-            $table->text('parsed_description')->nullable()->default(null);
-        });
-
-
-    }
-
-    /**
-     * Reverse the migrations.
-     *
-     * @return void
-     */
-    public function down()
-    {
-        //
-        Schema::table('currencies', function(Blueprint $table) {
-            $table->dropColumn('description');
-            $table->dropColumn('parsed_description');
-        });
-
-        Schema::table('currencies', function(Blueprint $table) {
-            $table->string('description', 512)->nullable()->default(null);
-        });
-
-        Schema::table('character_submissions', function(Blueprint $table) {
-            $table->dropColumn('parsed_description');
-        });
-        
-        Schema::table('characters', function(Blueprint $table) {
-            $table->dropColumn('parsed_description');
-        });
-        
-        Schema::table('character_images', function(Blueprint $table) {
-            $table->dropColumn('parsed_description');
-        });
-        
-        Schema::table('character_categories', function(Blueprint $table) {
-            $table->dropColumn('description');
-            $table->dropColumn('parsed_description');
-        });
-
-        Schema::table('character_categories', function(Blueprint $table) {
-            $table->string('description', 512);
-        });
-        
-        Schema::table('features', function(Blueprint $table) {
-            $table->dropColumn('description');
-            $table->dropColumn('parsed_description');
-        });
-
-        Schema::table('features', function(Blueprint $table) {
-            $table->string('description', 512);
-            $table->text('specifications')->nullable()->default(null);
-        });
-        
-        Schema::table('feature_categories', function(Blueprint $table) {
-            $table->dropColumn('description');
-            $table->dropColumn('parsed_description');
-        });
-            
-        Schema::table('feature_categories', function(Blueprint $table) {
-            $table->string('description', 512);
-        });
-        
-        Schema::table('specieses', function(Blueprint $table) {
-            $table->dropColumn('description');
-            $table->dropColumn('parsed_description');
-        });
-            
-        Schema::table('specieses', function(Blueprint $table) {
-            $table->string('description', 512);
-            $table->text('specifications')->nullable()->default(null);
-        });
-        
-        Schema::table('items', function(Blueprint $table) {
-            $table->dropColumn('description');
-            $table->dropColumn('parsed_description');
-        });
-
-        Schema::table('items', function(Blueprint $table) {
-            $table->string('description', 512);
-            $table->text('specifications')->nullable()->default(null);
-        });
-        
-        Schema::table('item_categories', function(Blueprint $table) {
-            $table->dropColumn('description');
-            $table->dropColumn('parsed_description');
-        });
-
-        Schema::table('item_categories', function(Blueprint $table) {
-            $table->string('description', 512);
-        });
-        
-        Schema::table('rarities', function(Blueprint $table) {
-            $table->dropColumn('description');
-            $table->dropColumn('parsed_description');
-        });
-
-        Schema::table('rarities', function(Blueprint $table) {
-            $table->string('description', 512);
-        });
-
-        Schema::table('ranks', function(Blueprint $table) {
-            $table->dropColumn('description');
-            $table->dropColumn('parsed_description');
-        });
-        
-        Schema::table('ranks', function(Blueprint $table) {
-            $table->string('description', 512)->nullable();
-        });
-    }
-}
diff --git a/database/migrations/2019_04_13_094613_add_owned_currencies.php b/database/migrations/2019_04_13_094613_add_owned_currencies.php
deleted file mode 100644
index 7e1092b79c..0000000000
--- a/database/migrations/2019_04_13_094613_add_owned_currencies.php
+++ /dev/null
@@ -1,52 +0,0 @@
-<?php
-
-use Illuminate\Support\Facades\Schema;
-use Illuminate\Database\Schema\Blueprint;
-use Illuminate\Database\Migrations\Migration;
-
-class AddOwnedCurrencies extends Migration
-{
-    /**
-     * Run the migrations.
-     *
-     * @return void
-     */
-    public function up()
-    {
-        //
-        Schema::create('user_currencies', function (Blueprint $table) {
-            $table->engine = 'InnoDB';
-            $table->integer('user_id')->unsigned();
-            $table->integer('currency_id')->unsigned();
-            $table->integer('quantity')->unsigned()->default(0);
-
-            //$table->unique(['user_id', 'currency_id']);
-            $table->primary(['user_id', 'currency_id']);
-
-            $table->foreign('user_id')->references('id')->on('users');
-            $table->foreign('currency_id')->references('id')->on('currencies');
-        });
-        Schema::create('character_currencies', function (Blueprint $table) {
-            $table->engine = 'InnoDB';
-            $table->integer('character_id')->unsigned();
-            $table->integer('currency_id')->unsigned();
-            $table->integer('quantity')->unsigned()->default(0);
-
-            //$table->unique(['character_id', 'currency_id']);
-            $table->primary(['character_id', 'currency_id']);
-
-            $table->foreign('character_id')->references('id')->on('characters');
-            $table->foreign('currency_id')->references('id')->on('currencies');
-        });
-    }
-
-    /**
-     * Reverse the migrations.
-     *
-     * @return void
-     */
-    public function down()
-    {
-        //
-    }
-}
diff --git a/database/migrations/2019_04_14_121447_add_transfer_flag_to_items.php b/database/migrations/2019_04_14_121447_add_transfer_flag_to_items.php
deleted file mode 100644
index 1bcaf9e373..0000000000
--- a/database/migrations/2019_04_14_121447_add_transfer_flag_to_items.php
+++ /dev/null
@@ -1,36 +0,0 @@
-<?php
-
-use Illuminate\Support\Facades\Schema;
-use Illuminate\Database\Schema\Blueprint;
-use Illuminate\Database\Migrations\Migration;
-
-class AddTransferFlagToItems extends Migration
-{
-    /**
-     * Run the migrations.
-     *
-     * @return void
-     */
-    public function up()
-    {
-        Schema::table('items', function (Blueprint $table) {
-            // Flag for whether the item can be transferred between users.
-            // This flag can be overridden when the item is granted to users,
-            // but otherwise will take on this value by default.
-            $table->boolean('allow_transfer')->default(1);
-        });
-    }
-
-    /**
-     * Reverse the migrations.
-     *
-     * @return void
-     */
-    public function down()
-    {
-        Schema::table('items', function (Blueprint $table) {
-            //
-            $table->dropColumn('allow_transfer');
-        });
-    }
-}
diff --git a/database/migrations/2019_04_15_122508_add_prompts_table.php b/database/migrations/2019_04_15_122508_add_prompts_table.php
deleted file mode 100644
index 9356ff25e2..0000000000
--- a/database/migrations/2019_04_15_122508_add_prompts_table.php
+++ /dev/null
@@ -1,59 +0,0 @@
-<?php
-
-use Illuminate\Support\Facades\Schema;
-use Illuminate\Database\Schema\Blueprint;
-use Illuminate\Database\Migrations\Migration;
-
-class AddPromptsTable extends Migration
-{
-    /**
-     * Run the migrations.
-     *
-     * @return void
-     */
-    public function up()
-    {
-        // This will contain art prompts that users can submit art under.
-        // Prompts can have a start and end time, so event-only prompts can be
-        // made and future prompts can be queued.
-        Schema::create('prompts', function (Blueprint $table) {
-            $table->engine = 'InnoDB';
-            $table->increments('id');
-            $table->string('name', 64);
-
-            // The summary will be displayed on the world page, 
-            // with a link to a page that contains the full text of the prompt.
-            $table->string('summary', 256)->nullable()->default(null);
-            $table->text('description')->nullable()->default(null);
-            $table->text('parsed_description')->nullable()->default(null);
-
-            // The active flag is overridden by the start_at and end_at timestamps,
-            // i.e. if either or both of those timestamps are set,
-            // it will have no effect.
-            $table->boolean('is_active')->default(1);
-            $table->timestamp('start_at')->nullable()->default(null);
-            $table->timestamp('end_at')->nullable()->default(null);
-            // When submitting a prompt, the selectable list will only contain prompts between
-            // the start/end times and active prompts.
-
-            // This hides the prompt from the world prompt list before 
-            // the prompt start_at time has been reached.
-            $table->boolean('hide_before_start')->default(0);
-
-            // This hides the prompt from the world prompt list after 
-            // the prompt end_at time has been reached.
-            $table->boolean('hide_after_end')->default(0);
-        });
-    }
-
-    /**
-     * Reverse the migrations.
-     *
-     * @return void
-     */
-    public function down()
-    {
-        //
-        Schema::dropIfExists('prompts');
-    }
-}
diff --git a/database/migrations/2019_04_16_062617_add_parsed_text_to_site_pages.php b/database/migrations/2019_04_16_062617_add_parsed_text_to_site_pages.php
deleted file mode 100644
index c1a11e3e84..0000000000
--- a/database/migrations/2019_04_16_062617_add_parsed_text_to_site_pages.php
+++ /dev/null
@@ -1,39 +0,0 @@
-<?php
-
-use Illuminate\Support\Facades\Schema;
-use Illuminate\Database\Schema\Blueprint;
-use Illuminate\Database\Migrations\Migration;
-
-class AddParsedTextToSitePages extends Migration
-{
-    /**
-     * Run the migrations.
-     *
-     * @return void
-     */
-    public function up()
-    {
-        Schema::table('site_pages', function (Blueprint $table) {
-            //
-            $table->text('parsed_text')->nullable()->default(null);
-
-            // Drop this because pages are now not accessible unless explicitly
-            // linked from another page.
-            $table->dropColumn('is_listed');
-        });
-    }
-
-    /**
-     * Reverse the migrations.
-     *
-     * @return void
-     */
-    public function down()
-    {
-        Schema::table('site_pages', function (Blueprint $table) {
-            //
-            $table->boolean('is_listed')->default(1);
-            $table->dropColumn('parsed_text');
-        });
-    }
-}
diff --git a/database/migrations/2019_04_16_080112_add_invitation_keys.php b/database/migrations/2019_04_16_080112_add_invitation_keys.php
deleted file mode 100644
index 7726e0fbee..0000000000
--- a/database/migrations/2019_04_16_080112_add_invitation_keys.php
+++ /dev/null
@@ -1,41 +0,0 @@
-<?php
-
-use Illuminate\Support\Facades\Schema;
-use Illuminate\Database\Schema\Blueprint;
-use Illuminate\Database\Migrations\Migration;
-
-class AddInvitationKeys extends Migration
-{
-    /**
-     * Run the migrations.
-     *
-     * @return void
-     */
-    public function up()
-    {
-        //
-        Schema::create('invitations', function (Blueprint $table) {
-            $table->engine = 'InnoDB';
-            //
-            $table->increments('id');
-            $table->string('code', 10)->unique();
-            $table->integer('user_id')->unsigned();
-            $table->integer('recipient_id')->unsigned()->nullable()->default(null);
-            $table->timestamps();
-            
-            $table->foreign('user_id')->references('id')->on('users');
-            $table->foreign('recipient_id')->references('id')->on('users');
-        });
-    }
-
-    /**
-     * Reverse the migrations.
-     *
-     * @return void
-     */
-    public function down()
-    {
-        //
-        Schema::dropIfExists('invitations');
-    }
-}
diff --git a/database/migrations/2019_04_19_125212_fix_inventory_tables.php b/database/migrations/2019_04_19_125212_fix_inventory_tables.php
deleted file mode 100644
index c0263e7c63..0000000000
--- a/database/migrations/2019_04_19_125212_fix_inventory_tables.php
+++ /dev/null
@@ -1,75 +0,0 @@
-<?php
-
-use Illuminate\Support\Facades\Schema;
-use Illuminate\Database\Schema\Blueprint;
-use Illuminate\Database\Migrations\Migration;
-
-class FixInventoryTables extends Migration
-{
-    /**
-     * Run the migrations.
-     *
-     * @return void
-     */
-    public function up()
-    {
-        // Turns out I made a user_currencies table on top of the banks one,
-        // so gonna remove the banks ones and rename the logs,
-        // and rename the inventory tables to match the pattern
-        Schema::dropIfExists('banks');
-        Schema::rename('banks_log', 'currencies_log');
-        Schema::rename('inventory', 'user_items');
-        Schema::rename('inventory_log', 'user_items_log');
-        
-        Schema::table('currencies_log', function (Blueprint $table) {
-            $table->dropColumn('data');
-            $table->dropColumn('type');
-        });
-        Schema::table('currencies_log', function (Blueprint $table) {
-            // Standardise with the item logs
-            $table->string('log')->nullable();
-            $table->string('log_type'); 
-            $table->string('data', 1024)->nullable();
-        });
-    }
-
-    /**
-     * Reverse the migrations.
-     *
-     * @return void
-     */
-    public function down()
-    {
-        //
-        Schema::table('currencies_log', function (Blueprint $table) {
-
-            $table->dropColumn('log');
-            $table->dropColumn('log_type');
-            $table->dropColumn('data');
-        });
-        Schema::table('currencies_log', function (Blueprint $table) {
-
-            $table->string('type', 32);
-            $table->string('data', 512);
-        });
-
-
-        Schema::rename('user_items_log', 'inventory_log');
-        Schema::rename('user_items', 'inventory');
-        Schema::rename('currencies_log', 'banks_log');
-
-        Schema::create('banks', function (Blueprint $table) {
-            $table->engine = 'InnoDB';
-            $table->increments('id');
-            $table->integer('user_id')->unsigned()->nullable();
-            $table->integer('character_id')->unsigned()->nullable();
-            $table->integer('currency_id')->unsigned();
-
-            $table->integer('quantity')->default(0);
-            
-            $table->foreign('user_id')->references('id')->on('users');
-            $table->foreign('character_id')->references('id')->on('characters');
-            $table->foreign('currency_id')->references('id')->on('currencies');
-        });
-    }
-}
diff --git a/database/migrations/2019_04_20_140827_fix_user_item_log.php b/database/migrations/2019_04_20_140827_fix_user_item_log.php
deleted file mode 100644
index 8d0c003135..0000000000
--- a/database/migrations/2019_04_20_140827_fix_user_item_log.php
+++ /dev/null
@@ -1,36 +0,0 @@
-<?php
-
-use Illuminate\Support\Facades\Schema;
-use Illuminate\Database\Schema\Blueprint;
-use Illuminate\Database\Migrations\Migration;
-
-class FixUserItemLog extends Migration
-{
-    /**
-     * Run the migrations.
-     *
-     * @return void
-     */
-    public function up()
-    {
-        // Add sign to quantities, also rename count in the items log
-        Schema::table('user_items_log', function(Blueprint $table) {
-            $table->dropColumn('count');
-            $table->integer('quantity')->unsigned()->default(1);
-        });
-    }
-
-    /**
-     * Reverse the migrations.
-     *
-     * @return void
-     */
-    public function down()
-    {
-        //
-        Schema::table('user_items_log', function(Blueprint $table) {
-            $table->dropColumn('quantity');
-            $table->integer('count')->unsigned()->default(1);
-        });
-    }
-}
diff --git a/database/migrations/2019_04_29_080228_fix_inventory_tables_again.php b/database/migrations/2019_04_29_080228_fix_inventory_tables_again.php
deleted file mode 100644
index 2b0e046010..0000000000
--- a/database/migrations/2019_04_29_080228_fix_inventory_tables_again.php
+++ /dev/null
@@ -1,44 +0,0 @@
-<?php
-
-use Illuminate\Support\Facades\Schema;
-use Illuminate\Database\Schema\Blueprint;
-use Illuminate\Database\Migrations\Migration;
-
-class FixInventoryTablesAgain extends Migration
-{
-    /**
-     * Run the migrations.
-     *
-     * @return void
-     */
-    public function up()
-    {
-        //
-        Schema::table('user_items_log', function (Blueprint $table) {
-            $table->dropForeign('inventory_log_stack_id_foreign');
-            $table->dropColumn('stack_id');
-        });
-        Schema::table('user_items_log', function (Blueprint $table) {
-            $table->integer('stack_id')->unsigned()->nullable();
-            $table->foreign('stack_id')->references('id')->on('user_items');
-        });
-    }
-
-    /**
-     * Reverse the migrations.
-     *
-     * @return void
-     */
-    public function down()
-    {
-        //
-        Schema::table('user_items_log', function (Blueprint $table) {
-            $table->dropForeign('inventory_log_stack_id_foreign');
-            $table->dropColumn('stack_id');
-        });
-        Schema::table('user_items_log', function (Blueprint $table) {
-            $table->integer('stack_id')->unsigned();
-            $table->foreign('stack_id')->references('id')->on('user_items');
-        });
-    }
-}
diff --git a/database/migrations/2019_04_30_070721_add_notification_data.php b/database/migrations/2019_04_30_070721_add_notification_data.php
deleted file mode 100644
index dfa20d1e64..0000000000
--- a/database/migrations/2019_04_30_070721_add_notification_data.php
+++ /dev/null
@@ -1,34 +0,0 @@
-<?php
-
-use Illuminate\Support\Facades\Schema;
-use Illuminate\Database\Schema\Blueprint;
-use Illuminate\Database\Migrations\Migration;
-
-class AddNotificationData extends Migration
-{
-    /**
-     * Run the migrations.
-     *
-     * @return void
-     */
-    public function up()
-    {
-        //
-        Schema::table('notifications', function (Blueprint $table) {
-            $table->string('data', 1024)->nullable();
-        });
-    }
-
-    /**
-     * Reverse the migrations.
-     *
-     * @return void
-     */
-    public function down()
-    {
-        //
-        Schema::table('notifications', function (Blueprint $table) {
-            $table->dropColumn('data');
-        });
-    }
-}
diff --git a/database/migrations/2019_05_04_091240_add_news.php b/database/migrations/2019_05_04_091240_add_news.php
deleted file mode 100644
index 8b9f248b33..0000000000
--- a/database/migrations/2019_05_04_091240_add_news.php
+++ /dev/null
@@ -1,51 +0,0 @@
-<?php
-
-use Illuminate\Support\Facades\Schema;
-use Illuminate\Database\Schema\Blueprint;
-use Illuminate\Database\Migrations\Migration;
-
-class AddNews extends Migration
-{
-    /**
-     * Run the migrations.
-     *
-     * @return void
-     */
-    public function up()
-    {
-        //
-        Schema::create('news', function (Blueprint $table) {
-            $table->engine = 'InnoDB';
-            $table->increments('id');
-            $table->integer('user_id')->unsigned();
-
-            $table->string('title');
-            $table->text('text');
-            $table->text('parsed_text');
-
-            $table->boolean('is_visible')->default(1);
-
-            $table->timestamps();
-            $table->timestamp('post_at')->nullable()->default(null);
-
-            $table->foreign('user_id')->references('id')->on('users');
-        });
-        Schema::table('users', function (Blueprint $table) {
-            $table->boolean('is_news_unread')->default(0);
-        });
-    }
-
-    /**
-     * Reverse the migrations.
-     *
-     * @return void
-     */
-    public function down()
-    {
-        //
-        Schema::table('users', function (Blueprint $table) {
-            $table->dropColumn('is_news_unread');
-        });
-        Schema::dropIfExists('news');
-    }
-}
diff --git a/database/migrations/2019_05_11_045038_update_character_tables.php b/database/migrations/2019_05_11_045038_update_character_tables.php
deleted file mode 100644
index e6e440f3ed..0000000000
--- a/database/migrations/2019_05_11_045038_update_character_tables.php
+++ /dev/null
@@ -1,130 +0,0 @@
-<?php
-
-use Illuminate\Support\Facades\Schema;
-use Illuminate\Database\Schema\Blueprint;
-use Illuminate\Database\Migrations\Migration;
-
-class UpdateCharacterTables extends Migration
-{
-    /**
-     * Run the migrations.
-     *
-     * @return void
-     */
-    public function up()
-    {
-        //
-        Schema::table('characters', function (Blueprint $table) {
-            $table->string('name')->nullable()->default(null);
-            $table->boolean('is_gift_art_allowed')->default(0);
-            $table->boolean('is_trading')->default(0);
-
-            // MYO slots are considered separate now
-            $table->dropColumn('is_myo_slot');
-        });
-
-        Schema::table('character_images', function (Blueprint $table) {
-            $table->string('extension', 5);
-            
-            // Whether to use the image cropper to generate the thumbnail
-            $table->boolean('use_cropper')->default(0);
-            $table->integer('x0')->nullable()->default(null);
-            $table->integer('x1')->nullable()->default(null);
-            $table->integer('y0')->nullable()->default(null);
-            $table->integer('y1')->nullable()->default(null);
-
-            // To prevent people from scraping URLs
-            $table->string('hash', 10);
-
-            // Display order on profile
-            $table->integer('sort')->default(0);
-
-            // Marks if the image is valid.
-            // This can be used in cases where you want to display
-            // the image (an old version of the design) for logging purposes, 
-            // but not allow the owner to use the design in the game
-            $table->boolean('is_valid')->default(1);
-
-            // This gets restrictive in cases where there are multiple
-            // artists/designers (e.g. in collabs, or an updated design)
-            // which is actually a fairly common occurrence,
-            // so going to handle this in a separate table
-            $table->dropColumn('artist_url');
-            $table->dropColumn('artist_alias');
-            $table->dropColumn('designer_url');
-            $table->dropColumn('designer_alias');
-        });
-
-        Schema::create('character_image_creators', function (Blueprint $table) {
-            $table->engine = 'InnoDB';
-            $table->increments('id');
-            
-            $table->integer('character_image_id')->unsigned();
-
-            $table->enum('type', ['Artist', 'Designer']);
-            $table->string('url')->nullable()->default(null);
-            $table->string('alias')->nullable()->default(null);
-
-            $table->foreign('character_image_id')->references('id')->on('character_images');
-        });
-
-        Schema::create('character_profiles', function (Blueprint $table) { 
-            $table->engine = 'InnoDB';           
-            $table->integer('character_id')->unsigned();
-
-            $table->text('text')->nullable()->default(null);
-            $table->text('parsed_text')->nullable()->default(null);
-
-            $table->foreign('character_id')->references('id')->on('characters');
-        });
-
-        Schema::create('user_profiles', function (Blueprint $table) {     
-            $table->engine = 'InnoDB';       
-            $table->integer('user_id')->unsigned();
-
-            $table->text('text')->nullable()->default(null);
-            $table->text('parsed_text')->nullable()->default(null);
-
-            $table->foreign('user_id')->references('id')->on('users');
-        });
-
-    }
-
-    /**
-     * Reverse the migrations.
-     *
-     * @return void
-     */
-    public function down()
-    {
-        //
-        Schema::dropIfExists('user_profiles');
-        Schema::dropIfExists('character_profiles');
-        Schema::dropIfExists('character_image_creators');
-
-        Schema::table('character_images', function (Blueprint $table) {
-            $table->dropColumn('extension');
-            $table->dropColumn('use_cropper');
-            $table->dropColumn('x0');
-            $table->dropColumn('x1');
-            $table->dropColumn('y0');
-            $table->dropColumn('y1');
-            $table->dropColumn('hash');
-            $table->dropColumn('sort');
-            $table->dropColumn('is_valid');
-            
-            $table->string('designer_alias');
-            $table->string('designer_url');
-            $table->string('artist_alias');
-            $table->string('artist_url');
-        });
-
-        Schema::table('characters', function (Blueprint $table) {
-            $table->dropColumn('name');
-            $table->dropColumn('is_gift_art_allowed');
-            $table->dropColumn('is_trading');
-
-            $table->boolean('is_myo_slot')->default(0);
-        });
-    }
-}
diff --git a/database/migrations/2019_05_12_064538_add_species_id_to_images.php b/database/migrations/2019_05_12_064538_add_species_id_to_images.php
deleted file mode 100644
index 0bca294164..0000000000
--- a/database/migrations/2019_05_12_064538_add_species_id_to_images.php
+++ /dev/null
@@ -1,60 +0,0 @@
-<?php
-
-use Illuminate\Support\Facades\Schema;
-use Illuminate\Database\Schema\Blueprint;
-use Illuminate\Database\Migrations\Migration;
-
-class AddSpeciesIdToImages extends Migration
-{
-    /**
-     * Run the migrations.
-     *
-     * @return void
-     */
-    public function up()
-    {
-        Schema::table('characters', function (Blueprint $table) {
-            //$table->dropForeign('characters_rarity_id_foreign');
-
-            // Moving this onto images as it can change
-            $table->dropColumn('rarity_id');
-
-            $table->string('owner_alias')->nullable()->default('null');
-        });
-        Schema::table('character_images', function (Blueprint $table) {
-            
-
-            $table->integer('species_id')->unsigned();
-            $table->integer('rarity_id')->unsigned();
-
-            $table->foreign('species_id')->references('id')->on('specieses');
-            $table->foreign('rarity_id')->references('id')->on('rarities');
-        });
-    }
-
-    /**
-     * Reverse the migrations.
-     *
-     * @return void
-     */
-    public function down()
-    {
-        Schema::table('character_images', function (Blueprint $table) {
-            //
-            $table->dropForeign('character_images_species_id_foreign');
-            $table->dropForeign('character_images_rarity_id_foreign');
-            $table->dropColumn('species_id');
-            $table->dropColumn('rarity_id');
-            
-            
-        });
-        Schema::table('characters', function (Blueprint $table) {
-            $table->dropForeign('characters_rarity_id_foreign');
-
-            $table->dropColumn('owner_alias');
-
-            $table->integer('rarity_id')->unsigned();
-            $table->foreign('rarity_id')->references('id')->on('rarities');
-        });
-    }
-}
diff --git a/database/migrations/2019_05_12_100722_make_features_nonunique.php b/database/migrations/2019_05_12_100722_make_features_nonunique.php
deleted file mode 100644
index e207218b30..0000000000
--- a/database/migrations/2019_05_12_100722_make_features_nonunique.php
+++ /dev/null
@@ -1,42 +0,0 @@
-<?php
-
-use Illuminate\Support\Facades\Schema;
-use Illuminate\Database\Schema\Blueprint;
-use Illuminate\Database\Migrations\Migration;
-
-class MakeFeaturesNonunique extends Migration
-{
-    /**
-     * Run the migrations.
-     *
-     * @return void
-     */
-    public function up()
-    {
-        // This probably sounds like a pretty weird change,
-        // but making it so that you can attach multiple of the
-        // same trait to a character.
-        // This is because you might want to attach e.g. multiple
-        // familiar traits to a character, one for each familiar... 
-        // each one can just have a different description.
-        Schema::table('character_features', function (Blueprint $table) {
-            $table->dropIndex('character_features_character_image_id_feature_id_unique');
-
-            $table->increments('id');
-        });
-    }
-
-    /**
-     * Reverse the migrations.
-     *
-     * @return void
-     */
-    public function down()
-    {
-        //
-        Schema::table('character_features', function (Blueprint $table) {
-            $table->dropColumn('id');
-            $table->unique(['character_image_id', 'feature_id']);
-        });
-    }
-}
diff --git a/database/migrations/2019_05_19_054413_make_character_image_id_nullable.php b/database/migrations/2019_05_19_054413_make_character_image_id_nullable.php
deleted file mode 100644
index 4725b9a507..0000000000
--- a/database/migrations/2019_05_19_054413_make_character_image_id_nullable.php
+++ /dev/null
@@ -1,113 +0,0 @@
-<?php
-
-use Illuminate\Support\Facades\Schema;
-use Illuminate\Database\Schema\Blueprint;
-use Illuminate\Database\Migrations\Migration;
-
-class MakeCharacterImageIdNullable extends Migration
-{
-    /**
-     * Run the migrations.
-     *
-     * @return void
-     */
-    public function up()
-    {
-        // Realised I couldn't attach an image to a character without making either the 
-        // character's image ID nullable, or making the image's character ID nullable...
-        // Also, since characters can now be credited to users who don't have an
-        // account, make this column nullable.
-        Schema::table('characters', function (Blueprint $table) {
-            //$table->dropForeign('characters_user_id_foreign');
-
-            $table->dropColumn('character_image_id');
-            $table->dropColumn('user_id');
-        });
-        Schema::table('characters', function (Blueprint $table) {
-            $table->integer('character_image_id')->unsigned()->nullable();
-            $table->integer('user_id')->unsigned()->nullable();
-        });
-
-        // This also isn't necessary
-        Schema::table('character_images', function (Blueprint $table) {
-            $table->dropForeign('character_images_user_id_foreign');
-            $table->dropColumn('user_id');
-        });
-
-        // Modifying these to log user alias,
-        // since characters created before the site was created will
-        // need to be credited to users who don't have an account
-        // and new sales may need to be credited to users before they 
-        // create an account.
-        // However, retaining the recipient ID since characters
-        // may also need to be logged to an account without an alias.
-        Schema::table('character_log', function (Blueprint $table) {
-            $table->dropColumn('recipient_id');
-            $table->string('recipient_alias')->nullable()->default(null);
-        });
-        Schema::table('character_log', function (Blueprint $table) {
-            $table->integer('recipient_id')->unsigned()->nullable()->default(null);
-        });
-        Schema::table('user_character_log', function (Blueprint $table) {
-            $table->dropColumn('recipient_id');
-            $table->string('recipient_alias')->nullable()->default(null);
-        });
-        Schema::table('user_character_log', function (Blueprint $table) {
-            $table->integer('recipient_id')->unsigned()->nullable()->default(null);
-        });
-
-        // Data for traits also needs to be nullable.
-        Schema::table('character_features', function (Blueprint $table) {
-            $table->dropColumn('data');
-        });
-        Schema::table('character_features', function (Blueprint $table) {
-            $table->string('data')->nullable()->default(null);
-        });
-    }
-
-    /**
-     * Reverse the migrations.
-     *
-     * @return void
-     */
-    public function down()
-    {
-        //
-        Schema::table('character_features', function (Blueprint $table) {
-            $table->dropColumn('data');
-        });
-        Schema::table('character_features', function (Blueprint $table) {
-            $table->string('data');
-        });
-        Schema::table('user_character_log', function (Blueprint $table) {
-            $table->dropColumn('recipient_id');
-        });
-        Schema::table('user_character_log', function (Blueprint $table) {
-            $table->dropColumn('recipient_alias');
-            $table->integer('recipient_id')->unsigned();
-        });
-        Schema::table('character_log', function (Blueprint $table) {
-            $table->dropColumn('recipient_id');
-        });
-        Schema::table('character_log', function (Blueprint $table) {
-            $table->dropColumn('recipient_alias');
-            $table->integer('recipient_id')->unsigned();
-        });
-        Schema::table('character_images', function (Blueprint $table) {
-            $table->integer('user_id')->unsigned();
-
-            $table->foreign('user_id')->references('id')->on('users');
-        });
-
-        Schema::table('characters', function (Blueprint $table) {
-            $table->dropColumn('user_id');
-            $table->dropColumn('character_image_id');
-        });
-        Schema::table('characters', function (Blueprint $table) {
-            $table->integer('user_id')->unsigned();
-            $table->integer('character_image_id')->unsigned();
-            
-            $table->foreign('user_id')->references('id')->on('users');
-        });
-    }
-}
diff --git a/database/migrations/2019_05_20_075936_add_character_sort.php b/database/migrations/2019_05_20_075936_add_character_sort.php
deleted file mode 100644
index 3c7de2b295..0000000000
--- a/database/migrations/2019_05_20_075936_add_character_sort.php
+++ /dev/null
@@ -1,34 +0,0 @@
-<?php
-
-use Illuminate\Support\Facades\Schema;
-use Illuminate\Database\Schema\Blueprint;
-use Illuminate\Database\Migrations\Migration;
-
-class AddCharacterSort extends Migration
-{
-    /**
-     * Run the migrations.
-     *
-     * @return void
-     */
-    public function up()
-    {
-        // To allow users to sort their characters
-        Schema::table('characters', function (Blueprint $table) {
-            $table->integer('sort')->unsigned()->default(0);
-        });
-    }
-
-    /**
-     * Reverse the migrations.
-     *
-     * @return void
-     */
-    public function down()
-    {
-        //
-        Schema::table('characters', function (Blueprint $table) {
-            $table->dropColumn('sort');
-        });
-    }
-}
diff --git a/database/migrations/2019_06_01_121701_add_changed_data_to_character_log.php b/database/migrations/2019_06_01_121701_add_changed_data_to_character_log.php
deleted file mode 100644
index fcc28fa59c..0000000000
--- a/database/migrations/2019_06_01_121701_add_changed_data_to_character_log.php
+++ /dev/null
@@ -1,34 +0,0 @@
-<?php
-
-use Illuminate\Support\Facades\Schema;
-use Illuminate\Database\Schema\Blueprint;
-use Illuminate\Database\Migrations\Migration;
-
-class AddChangedDataToCharacterLog extends Migration
-{
-    /**
-     * Run the migrations.
-     *
-     * @return void
-     */
-    public function up()
-    {
-        Schema::table('character_log', function (Blueprint $table) {
-            // This will store the specifics of the changes made
-            $table->text('change_log')->nullable()->default(null);
-        });
-    }
-
-    /**
-     * Reverse the migrations.
-     *
-     * @return void
-     */
-    public function down()
-    {
-        Schema::table('character_log', function (Blueprint $table) {
-            //
-            $table->dropColumn('change_log');
-        });
-    }
-}
diff --git a/database/migrations/2019_06_10_083954_create_character_transfer_tables.php b/database/migrations/2019_06_10_083954_create_character_transfer_tables.php
deleted file mode 100644
index 3e3296e4f1..0000000000
--- a/database/migrations/2019_06_10_083954_create_character_transfer_tables.php
+++ /dev/null
@@ -1,46 +0,0 @@
-<?php
-
-use Illuminate\Support\Facades\Schema;
-use Illuminate\Database\Schema\Blueprint;
-use Illuminate\Database\Migrations\Migration;
-
-class CreateCharacterTransferTables extends Migration
-{
-    /**
-     * Run the migrations.
-     *
-     * @return void
-     */
-    public function up()
-    {
-        Schema::create('character_transfers', function (Blueprint $table) {
-            $table->engine = 'InnoDB';
-            $table->increments('id');
-
-            $table->integer('character_id')->unsigned();
-
-            $table->integer('sender_id')->unsigned();
-            $table->integer('recipient_id')->unsigned();
-            $table->enum('status', ['Pending', 'Accepted', 'Canceled', 'Rejected'])->default('Pending');
-            $table->boolean('is_approved')->default(0);
-
-            // Reason for the transfer being rejected by a mod
-            $table->text('reason')->nullable()->default(null);
-
-            // Information including added cooldowns
-            $table->string('data')->nullable()->default(null);
-
-            $table->timestamps();
-        });
-    }
-
-    /**
-     * Reverse the migrations.
-     *
-     * @return void
-     */
-    public function down()
-    {
-        Schema::dropIfExists('character_transfers');
-    }
-}
diff --git a/database/migrations/2019_07_09_063021_create_raffles.php b/database/migrations/2019_07_09_063021_create_raffles.php
deleted file mode 100644
index c5ed9c696e..0000000000
--- a/database/migrations/2019_07_09_063021_create_raffles.php
+++ /dev/null
@@ -1,59 +0,0 @@
-<?php
-
-use Illuminate\Support\Facades\Schema;
-use Illuminate\Database\Schema\Blueprint;
-use Illuminate\Database\Migrations\Migration;
-
-class CreateRaffles extends Migration
-{
-    /**
-     * Run the migrations.
-     *
-     * @return void
-     */
-    public function up()
-    {
-        Schema::create('raffle_groups', function (Blueprint $table) {
-            $table->engine = 'InnoDB';
-            $table->increments('id');
-            $table->string('name');
-            $table->boolean('is_active');
-        });
-        Schema::create('raffles', function (Blueprint $table) {
-            $table->engine = 'InnoDB';
-            $table->increments('id');
-
-            $table->string('name');
-            $table->boolean('is_active');
-            $table->integer('winner_count')->unsigned()->default(1);
-
-            $table->integer('group_id')->unsigned()->nullable()->default(null);
-            $table->integer('order')->default(1);
-
-            $table->timestamp('rolled_at')->nullable()->default(null);
-        });
-        Schema::create('raffle_tickets', function (Blueprint $table) {
-            $table->engine = 'InnoDB';
-            $table->increments('id');
-
-            $table->integer('user_id')->unsigned()->nullable()->default(null);
-            $table->integer('raffle_id')->unsigned()->nullable()->default(null);
-            $table->string('alias')->nullable()->default(null);
-            $table->timestamp('created_at')->useCurrent();
-
-            $table->integer('position')->unsigned()->nullable()->default(null);
-        });
-    }
-
-    /**
-     * Reverse the migrations.
-     *
-     * @return void
-     */
-    public function down()
-    {
-        Schema::dropIfExists('raffle_tickets');
-        Schema::dropIfExists('raffles');
-        Schema::dropIfExists('raffle_groups');
-    }
-}
diff --git a/database/migrations/2019_07_13_095608_create_loot_tables.php b/database/migrations/2019_07_13_095608_create_loot_tables.php
deleted file mode 100644
index eb3cde785c..0000000000
--- a/database/migrations/2019_07_13_095608_create_loot_tables.php
+++ /dev/null
@@ -1,47 +0,0 @@
-<?php
-
-use Illuminate\Support\Facades\Schema;
-use Illuminate\Database\Schema\Blueprint;
-use Illuminate\Database\Migrations\Migration;
-
-class CreateLootTables extends Migration
-{
-    /**
-     * Run the migrations.
-     *
-     * @return void
-     */
-    public function up()
-    {
-        Schema::create('loot_tables', function (Blueprint $table) {
-            $table->engine = 'InnoDB';
-            $table->increments('id');
-            $table->string('name');
-            $table->string('display_name');
-        });
-
-        // I know this doesn't pluralise this way but 
-        Schema::create('loots', function (Blueprint $table) {
-            $table->engine = 'InnoDB';
-            $table->integer('loot_table_id')->unsigned();
-            $table->string('rewardable_type');
-            $table->integer('rewardable_id')->unsigned();
-            
-            $table->integer('quantity')->unsigned();
-            $table->integer('weight')->unsigned();
-            
-            $table->foreign('loot_table_id')->references('id')->on('loot_tables');
-        });
-    }
-
-    /**
-     * Reverse the migrations.
-     *
-     * @return void
-     */
-    public function down()
-    {
-        Schema::dropIfExists('loots');
-        Schema::dropIfExists('loot_tables');
-    }
-}
diff --git a/database/migrations/2019_07_13_101743_create_prompt_categories.php b/database/migrations/2019_07_13_101743_create_prompt_categories.php
deleted file mode 100644
index 81a6513eec..0000000000
--- a/database/migrations/2019_07_13_101743_create_prompt_categories.php
+++ /dev/null
@@ -1,46 +0,0 @@
-<?php
-
-use Illuminate\Support\Facades\Schema;
-use Illuminate\Database\Schema\Blueprint;
-use Illuminate\Database\Migrations\Migration;
-
-class CreatePromptCategories extends Migration
-{
-    /**
-     * Run the migrations.
-     *
-     * @return void
-     */
-    public function up()
-    {
-        // Prompt categories are for neatly categorising prompts, e.g. regular prompts and event-specific prompts
-        Schema::create('prompt_categories', function (Blueprint $table) {
-            $table->engine = 'InnoDB';
-            $table->increments('id');
-            
-            $table->string('name');
-            $table->text('description')->nullable()->default(null);
-            $table->text('parsed_description')->nullable()->default(null);
-            $table->integer('sort')->unsigned()->default(0);
-            
-            $table->boolean('has_image')->default(0);
-        });
-        Schema::table('prompts', function (Blueprint $table) {
-            $table->integer('prompt_category_id')->unsigned()->default(0);
-            $table->foreign('prompt_category_id')->references('id')->on('prompt_categories');
-        });
-    }
-
-    /**
-     * Reverse the migrations.
-     *
-     * @return void
-     */
-    public function down()
-    {
-        Schema::table('prompts', function (Blueprint $table) {
-            $table->dropColumn('prompt_category_id');
-        });
-        Schema::dropIfExists('prompt_categories');
-    }
-}
diff --git a/database/migrations/2019_07_15_090200_add_prompt_rewards.php b/database/migrations/2019_07_15_090200_add_prompt_rewards.php
deleted file mode 100644
index 208806abf2..0000000000
--- a/database/migrations/2019_07_15_090200_add_prompt_rewards.php
+++ /dev/null
@@ -1,38 +0,0 @@
-<?php
-
-use Illuminate\Support\Facades\Schema;
-use Illuminate\Database\Schema\Blueprint;
-use Illuminate\Database\Migrations\Migration;
-
-class AddPromptRewards extends Migration
-{
-    /**
-     * Run the migrations.
-     *
-     * @return void
-     */
-    public function up()
-    {
-        //
-        Schema::create('prompt_rewards', function (Blueprint $table) {
-            $table->engine = 'InnoDB';
-            $table->integer('prompt_id')->unsigned()->default(0);
-            $table->string('rewardable_type');
-            $table->integer('rewardable_id')->unsigned();
-            $table->integer('quantity')->unsigned();
-            
-            $table->foreign('prompt_id')->references('id')->on('prompts');
-        });
-    }
-
-    /**
-     * Reverse the migrations.
-     *
-     * @return void
-     */
-    public function down()
-    {
-        //
-        Schema::dropIfExists('prompt_rewards');
-    }
-}
diff --git a/database/migrations/2019_07_21_161720_add_prompt_submissions.php b/database/migrations/2019_07_21_161720_add_prompt_submissions.php
deleted file mode 100644
index 766c1698ff..0000000000
--- a/database/migrations/2019_07_21_161720_add_prompt_submissions.php
+++ /dev/null
@@ -1,85 +0,0 @@
-<?php
-
-use Illuminate\Support\Facades\Schema;
-use Illuminate\Database\Schema\Blueprint;
-use Illuminate\Database\Migrations\Migration;
-
-class AddPromptSubmissions extends Migration
-{
-    /**
-     * Run the migrations.
-     *
-     * @return void
-     */
-    public function up()
-    {
-        //
-        Schema::create('submissions', function (Blueprint $table) {
-            $table->engine = 'InnoDB';
-            $table->increments('id');
-            $table->integer('prompt_id')->unsigned()->index();
-
-            $table->integer('user_id')->unsigned()->index();
-            $table->integer('staff_id')->unsigned()->nullable()->default(null);
-
-            $table->string('url', 200);
-            
-            $table->text('comments')->nullable()->default(null);
-            $table->text('staff_comments')->nullable()->default(null);
-
-            $table->enum('status', ['Pending', 'Approved', 'Rejected'])->default('Pending');
-
-            $table->string('data', 512)->nullable()->default(null);
-
-            $table->timestamps();
-        });
-        Schema::create('submission_characters', function (Blueprint $table) {
-            $table->engine = 'InnoDB';
-            $table->increments('id');
-            $table->integer('submission_id')->unsigned()->index();
-            $table->integer('character_id')->unsigned()->index();
-
-            $table->string('data', 512)->nullable()->default(null);
-        });
-        
-        Schema::create('claims', function (Blueprint $table) {
-            $table->engine = 'InnoDB';
-            $table->increments('id');
-
-            $table->integer('user_id')->unsigned()->index();
-            $table->integer('staff_id')->unsigned()->nullable()->default(null)->index();
-
-            $table->string('url');
-            $table->text('comments')->nullable()->default(null);
-            $table->text('staff_comments')->nullable()->default(null);
-
-            $table->string('data', 512)->nullable()->default(null);
-
-            $table->enum('status', ['Pending', 'Approved', 'Rejected'])->default('Pending');
-            
-            $table->timestamps();
-        });
-        Schema::create('claim_characters', function (Blueprint $table) {
-            $table->engine = 'InnoDB';
-            $table->increments('id');
-            $table->integer('claim_id')->unsigned()->index();
-            $table->integer('character_id')->unsigned()->index();
-
-            $table->string('data', 512)->nullable()->default(null);
-        });
-    }
-
-    /**
-     * Reverse the migrations.
-     *
-     * @return void
-     */
-    public function down()
-    {
-        //
-        Schema::dropIfExists('claim_characters');
-        Schema::dropIfExists('claims');
-        Schema::dropIfExists('submission_characters');
-        Schema::dropIfExists('submissions');
-    }
-}
diff --git a/database/migrations/2019_08_06_092958_add_submission_count_to_user_settings.php b/database/migrations/2019_08_06_092958_add_submission_count_to_user_settings.php
deleted file mode 100644
index a72b3da14a..0000000000
--- a/database/migrations/2019_08_06_092958_add_submission_count_to_user_settings.php
+++ /dev/null
@@ -1,37 +0,0 @@
-<?php
-
-use Illuminate\Support\Facades\Schema;
-use Illuminate\Database\Schema\Blueprint;
-use Illuminate\Database\Migrations\Migration;
-
-class AddSubmissionCountToUserSettings extends Migration
-{
-    /**
-     * Run the migrations.
-     *
-     * @return void
-     */
-    public function up()
-    {
-        Schema::table('user_settings', function (Blueprint $table) {
-            //
-            $table->integer('submission_count')->unsigned()->default(0);
-
-            // Apparently this wasn't already primary keyed
-            $table->primary('user_id');
-        });
-    }
-
-    /**
-     * Reverse the migrations.
-     *
-     * @return void
-     */
-    public function down()
-    {
-        Schema::table('user_settings', function (Blueprint $table) {
-            //
-            $table->dropColumn('submission_count');
-        });
-    }
-}
diff --git a/database/migrations/2019_08_09_123451_make_submission_prompt_id_nullable.php b/database/migrations/2019_08_09_123451_make_submission_prompt_id_nullable.php
deleted file mode 100644
index f9117ccceb..0000000000
--- a/database/migrations/2019_08_09_123451_make_submission_prompt_id_nullable.php
+++ /dev/null
@@ -1,42 +0,0 @@
-<?php
-
-use Illuminate\Support\Facades\Schema;
-use Illuminate\Database\Schema\Blueprint;
-use Illuminate\Database\Migrations\Migration;
-
-class MakeSubmissionPromptIdNullable extends Migration
-{
-    /**
-     * Run the migrations.
-     *
-     * @return void
-     */
-    public function up()
-    {
-        // Make the prompt ID nullable, so we can use the same table for claims
-        // The only difference between prompts and claims is that claims don't require a prompt selected.
-        // We'll separate the prompts and claims queues though, so that they can be processed separately
-        Schema::table('submissions', function (Blueprint $table) {
-            $table->dropColumn('prompt_id');
-        });
-        Schema::table('submissions', function (Blueprint $table) {
-            $table->integer('prompt_id')->unsigned()->nullable()->index();
-        });
-    }
-
-    /**
-     * Reverse the migrations.
-     *
-     * @return void
-     */
-    public function down()
-    {
-        //
-        Schema::table('submissions', function (Blueprint $table) {
-            $table->dropColumn('prompt_id');
-        });
-        Schema::table('submissions', function (Blueprint $table) {
-            $table->integer('prompt_id')->unsigned()->index();
-        });
-    }
-}
diff --git a/database/migrations/2019_08_10_120818_add_myo_slots.php b/database/migrations/2019_08_10_120818_add_myo_slots.php
deleted file mode 100644
index 2daa699c94..0000000000
--- a/database/migrations/2019_08_10_120818_add_myo_slots.php
+++ /dev/null
@@ -1,56 +0,0 @@
-<?php
-
-use Illuminate\Support\Facades\Schema;
-use Illuminate\Database\Schema\Blueprint;
-use Illuminate\Database\Migrations\Migration;
-
-class AddMyoSlots extends Migration
-{
-    /**
-     * Run the migrations.
-     *
-     * @return void
-     */
-    public function up()
-    {
-        //
-        Schema::table('characters', function (Blueprint $table) {            
-            $table->boolean('is_myo_slot')->default(0);
-
-            // MYO slots won't have these filled
-            $table->integer('rarity_id')->unsigned()->nullable();
-            $table->integer('character_category_id')->unsigned()->nullable()->change();
-            $table->integer('number')->unsigned()->nullable()->change();
-            $table->string('slug')->nullable()->change();
-        });
-        Schema::table('character_images', function (Blueprint $table) {       
-            // MYO slots won't have these filled
-            $table->integer('rarity_id')->unsigned()->nullable()->change();
-            $table->integer('species_id')->unsigned()->nullable()->change();
-        });
-    }
-
-    /**
-     * Reverse the migrations.
-     *
-     * @return void
-     */
-    public function down()
-    {
-        //
-        Schema::table('character_images', function (Blueprint $table) {       
-            // MYO slots won't have these filled
-            $table->integer('rarity_id')->unsigned()->change();
-            $table->integer('species_id')->unsigned()->change();
-        });
-        Schema::table('characters', function (Blueprint $table) {            
-            $table->dropColumn('is_myo_slot');
-
-            // MYO slots won't have these filled
-            $table->integer('rarity_id')->unsigned()->change();
-            $table->integer('character_category_id')->unsigned()->change();
-            $table->integer('number')->unsigned()->change();
-            $table->string('slug')->change();
-        });
-    }
-}
diff --git a/database/migrations/2019_08_24_101751_add_design_updates.php b/database/migrations/2019_08_24_101751_add_design_updates.php
deleted file mode 100644
index 604fbdad7f..0000000000
--- a/database/migrations/2019_08_24_101751_add_design_updates.php
+++ /dev/null
@@ -1,107 +0,0 @@
-<?php
-
-use Illuminate\Support\Facades\Schema;
-use Illuminate\Database\Schema\Blueprint;
-use Illuminate\Database\Migrations\Migration;
-
-class AddDesignUpdates extends Migration
-{
-    /**
-     * Run the migrations.
-     *
-     * @return void
-     */
-    public function up()
-    {
-        //
-        Schema::create('design_updates', function (Blueprint $table) {
-            $table->engine = 'InnoDB';
-            $table->increments('id');
-            $table->integer('character_id')->unsigned()->index();
-            $table->enum('status', ['Draft', 'Pending', 'Accepted', 'Rejected'])->default('Draft');
-
-            $table->integer('user_id')->unsigned()->index();
-            $table->integer('staff_id')->unsigned()->nullable()->default(null);
-            
-            $table->text('comments')->nullable()->default(null);
-            $table->text('staff_comments')->nullable()->default(null);
-
-            // Items are attached by stack - currencies are listed in data
-            // This will be non-standard in terms of formatting, since we have to note down
-            // whether the currencies came from the user or character
-            $table->string('data', 512)->nullable()->default(null);
-            
-            $table->string('extension', 5)->nullable()->default(null);
-            $table->boolean('use_cropper')->default(0);
-            $table->integer('x0')->nullable()->default(null);
-            $table->integer('x1')->nullable()->default(null);
-            $table->integer('y0')->nullable()->default(null);
-            $table->integer('y1')->nullable()->default(null);
-            $table->string('hash', 10);
-
-            // These are required in the final submission, 
-            // but for the sake of incremental editing they'll be nullable in the meantime
-            $table->integer('species_id')->unsigned()->nullable();
-            $table->integer('rarity_id')->unsigned()->nullable();
-
-            // We're going to use this for the UI - since we're breaking down the editing by parts, 
-            // we want to make it easy for users to know if they've missed a section.
-            // Additionally, validation can be done per section, so submitting the final update is simple.
-            $table->boolean('has_comments')->default(0);
-            $table->boolean('has_image')->default(0);
-            $table->boolean('has_addons')->default(0);
-            $table->boolean('has_features')->default(0);
-
-            $table->timestamps();
-            $table->softDeletes();
-        });
-        
-        // Add a type to the features, so features can be attached to design updates
-        // We'll still use the character image column for the design updates -
-        // it should probably be renamed to be more appropriate though
-        Schema::table('character_features', function(Blueprint $table) {
-            $table->enum('character_type', ['Character', 'Update'])->default('Character');
-        });
-        
-        // Same here, the advantage of doing this is that after everything is good
-        // we only have to swap the type over to "Character" and update the ID
-        // and it's good to go
-        Schema::table('character_image_creators', function(Blueprint $table) {
-            $table->enum('character_type', ['Character', 'Update'])->default('Character');
-        });
-
-        // Add a holding ID and holding type - in the future when we attach
-        // item stacks to secure trade lots, this will also be used
-        // When the item is released from a design update or trade lot that has been
-        // deleted, it'll be returned to the user ID on the stack
-        Schema::table('user_items', function(Blueprint $table) {
-            $table->enum('holding_type', ['Update', 'Trade'])->nullable()->default(null);
-            $table->integer('holding_id')->unsigned()->nullable()->default(null);
-        });
-    }
-
-    /**
-     * Reverse the migrations.
-     *
-     * @return void
-     */
-    public function down()
-    {
-        //
-        Schema::table('user_items', function(Blueprint $table) {
-            $table->dropColumn('holding_type');
-            $table->dropColumn('holding_id');
-        });
-        
-        Schema::table('character_image_creators', function(Blueprint $table) {
-            $table->dropColumn('character_type');
-        });
-        
-        Schema::table('character_features', function(Blueprint $table) {
-            $table->dropColumn('character_type');
-        });
-
-        Schema::dropIfExists('design_update_features');
-        Schema::dropIfExists('design_updates');
-    }
-}
diff --git a/database/migrations/2019_09_02_101303_drop_images_character_foreign_key.php b/database/migrations/2019_09_02_101303_drop_images_character_foreign_key.php
deleted file mode 100644
index 1599dccb7c..0000000000
--- a/database/migrations/2019_09_02_101303_drop_images_character_foreign_key.php
+++ /dev/null
@@ -1,36 +0,0 @@
-<?php
-
-use Illuminate\Support\Facades\Schema;
-use Illuminate\Database\Schema\Blueprint;
-use Illuminate\Database\Migrations\Migration;
-
-class DropImagesCharacterForeignKey extends Migration
-{
-    /**
-     * Run the migrations.
-     *
-     * @return void
-     */
-    public function up()
-    {
-        // Since we're using this table for both character images and design updates,
-        // we need to get rid of this foreign key for it to work with design updates
-        Schema::table('character_image_creators', function(Blueprint $table) {
-            $table->dropForeign(['character_image_id']);
-        });
-
-    }
-
-    /**
-     * Reverse the migrations.
-     *
-     * @return void
-     */
-    public function down()
-    {
-        //
-        Schema::table('character_image_creators', function (Blueprint $table) {
-            $table->foreign('character_image_id')->references('id')->on('character_images');
-        });
-    }
-}
diff --git a/database/migrations/2019_09_08_060400_drop_character_images_foreign_keys.php b/database/migrations/2019_09_08_060400_drop_character_images_foreign_keys.php
deleted file mode 100644
index 58d3e8393a..0000000000
--- a/database/migrations/2019_09_08_060400_drop_character_images_foreign_keys.php
+++ /dev/null
@@ -1,37 +0,0 @@
-<?php
-
-use Illuminate\Support\Facades\Schema;
-use Illuminate\Database\Schema\Blueprint;
-use Illuminate\Database\Migrations\Migration;
-
-class DropCharacterImagesForeignKeys extends Migration
-{
-    /**
-     * Run the migrations.
-     *
-     * @return void
-     */
-    public function up()
-    {
-        // We made these columns nullable, but the foreign keys prevent them from being updated to null
-        // in the case of MYO slots.
-        Schema::table('character_images', function(Blueprint $table) {
-            $table->dropForeign(['species_id']);
-            $table->dropForeign(['rarity_id']);
-        });
-    }
-
-    /**
-     * Reverse the migrations.
-     *
-     * @return void
-     */
-    public function down()
-    {
-        //
-        Schema::table('character_images', function(Blueprint $table) {
-            $table->foreign('species_id')->references('id')->on('specieses');
-            $table->foreign('rarity_id')->references('id')->on('rarities');
-        });
-    }
-}
diff --git a/database/migrations/2019_09_08_063923_add_submitted_at_to_design_updates.php b/database/migrations/2019_09_08_063923_add_submitted_at_to_design_updates.php
deleted file mode 100644
index 09694343fa..0000000000
--- a/database/migrations/2019_09_08_063923_add_submitted_at_to_design_updates.php
+++ /dev/null
@@ -1,34 +0,0 @@
-<?php
-
-use Illuminate\Support\Facades\Schema;
-use Illuminate\Database\Schema\Blueprint;
-use Illuminate\Database\Migrations\Migration;
-
-class AddSubmittedAtToDesignUpdates extends Migration
-{
-    /**
-     * Run the migrations.
-     *
-     * @return void
-     */
-    public function up()
-    {
-        Schema::table('design_updates', function (Blueprint $table) {
-            //
-            $table->timestamp('submitted_at')->nullable()->default(null)->index();
-        });
-    }
-
-    /**
-     * Reverse the migrations.
-     *
-     * @return void
-     */
-    public function down()
-    {
-        Schema::table('design_updates', function (Blueprint $table) {
-            //
-            $table->dropColumn('submitted_at');
-        });
-    }
-}
diff --git a/database/migrations/2019_09_17_110010_rename_design_approval_status.php b/database/migrations/2019_09_17_110010_rename_design_approval_status.php
deleted file mode 100644
index 6e70ffd1ab..0000000000
--- a/database/migrations/2019_09_17_110010_rename_design_approval_status.php
+++ /dev/null
@@ -1,30 +0,0 @@
-<?php
-
-use Illuminate\Support\Facades\Schema;
-use Illuminate\Database\Schema\Blueprint;
-use Illuminate\Database\Migrations\Migration;
-
-class RenameDesignApprovalStatus extends Migration
-{
-    /**
-     * Run the migrations.
-     *
-     * @return void
-     */
-    public function up()
-    {
-        //
-        DB::statement("ALTER TABLE design_updates MODIFY COLUMN status ENUM('Draft', 'Pending', 'Approved', 'Rejected')");
-    }
-
-    /**
-     * Reverse the migrations.
-     *
-     * @return void
-     */
-    public function down()
-    {
-        //
-        DB::statement("ALTER TABLE design_updates MODIFY COLUMN status ENUM('Draft', 'Pending', 'Accepted', 'Rejected')");
-    }
-}
diff --git a/database/migrations/2019_09_28_040911_create_shops.php b/database/migrations/2019_09_28_040911_create_shops.php
deleted file mode 100644
index 3128bd8e1c..0000000000
--- a/database/migrations/2019_09_28_040911_create_shops.php
+++ /dev/null
@@ -1,78 +0,0 @@
-<?php
-
-use Illuminate\Support\Facades\Schema;
-use Illuminate\Database\Schema\Blueprint;
-use Illuminate\Database\Migrations\Migration;
-
-class CreateShops extends Migration
-{
-    /**
-     * Run the migrations.
-     *
-     * @return void
-     */
-    public function up()
-    {
-        Schema::create('shops', function (Blueprint $table) {
-            $table->engine = 'InnoDB';
-            $table->increments('id');
-            $table->string('name');
-            $table->boolean('has_image')->default(0);
-            $table->text('description')->nullable()->default(null);
-            $table->text('parsed_description')->nullable()->default(null);
-
-            $table->integer('sort')->unsigned()->default(0);
-
-            $table->boolean('is_active')->default(1);
-        });
-        Schema::create('shop_stock', function (Blueprint $table) {
-            $table->engine = 'InnoDB';
-            $table->increments('id');
-            $table->integer('shop_id')->unsigned()->index();
-            $table->integer('item_id')->unsigned();
-            
-            $table->integer('currency_id')->unsigned();
-            $table->integer('cost')->default(0);
-
-            // In addition to the currency type,
-            // restrict the bank you can use to buy the item - 
-            // e.g. if you only want characters to be able to buy the item,
-            // turn off use_user_bank so it forces the user to enter a character to buy it
-            // Of course this requires a sanity check to make sure that
-            // the currency type matches up, but that's on the game designer
-            $table->boolean('use_user_bank')->default(1);
-            $table->boolean('use_character_bank')->default(1);
-
-            $table->boolean('is_limited_stock')->default(0);
-            $table->integer('quantity')->default(0);
-            
-            $table->integer('sort')->unsigned()->default(0);
-        });
-        Schema::create('shop_log', function (Blueprint $table) {
-            $table->engine = 'InnoDB';
-            $table->increments('id');
-            $table->integer('shop_id')->unsigned()->index();
-            $table->integer('user_id')->unsigned()->index();
-            $table->integer('character_id')->unsigned()->nullable()->default(null);
-            
-            $table->integer('currency_id')->unsigned();
-            $table->integer('cost')->default(0);
-
-            $table->integer('item_id')->unsigned();
-            $table->integer('quantity')->default(1);
-            $table->timestamps();
-        });
-    }
-
-    /**
-     * Reverse the migrations.
-     *
-     * @return void
-     */
-    public function down()
-    {
-        Schema::dropIfExists('shop_log');
-        Schema::dropIfExists('shop_stock');
-        Schema::dropIfExists('shops');
-    }
-}
diff --git a/database/migrations/2019_10_02_085738_add_shop_purchase_limits.php b/database/migrations/2019_10_02_085738_add_shop_purchase_limits.php
deleted file mode 100644
index 92efdf1391..0000000000
--- a/database/migrations/2019_10_02_085738_add_shop_purchase_limits.php
+++ /dev/null
@@ -1,34 +0,0 @@
-<?php
-
-use Illuminate\Support\Facades\Schema;
-use Illuminate\Database\Schema\Blueprint;
-use Illuminate\Database\Migrations\Migration;
-
-class AddShopPurchaseLimits extends Migration
-{
-    /**
-     * Run the migrations.
-     *
-     * @return void
-     */
-    public function up()
-    {
-        //
-        Schema::table('shop_stock', function (Blueprint $table) {
-            $table->integer('purchase_limit')->unsigned()->default(0);
-        });
-    }
-
-    /**
-     * Reverse the migrations.
-     *
-     * @return void
-     */
-    public function down()
-    {
-        //
-        Schema::table('shop_stock', function (Blueprint $table) {
-            $table->dropColumn('purchase_limit');
-        });
-    }
-}
diff --git a/database/migrations/2019_10_12_095632_add_bans.php b/database/migrations/2019_10_12_095632_add_bans.php
deleted file mode 100644
index bb9c2d6fd5..0000000000
--- a/database/migrations/2019_10_12_095632_add_bans.php
+++ /dev/null
@@ -1,42 +0,0 @@
-<?php
-
-use Illuminate\Support\Facades\Schema;
-use Illuminate\Database\Schema\Blueprint;
-use Illuminate\Database\Migrations\Migration;
-
-class AddBans extends Migration
-{
-    /**
-     * Run the migrations.
-     *
-     * @return void
-     */
-    public function up()
-    {
-        //
-        Schema::table('users', function (Blueprint $table) {
-            $table->boolean('is_banned')->default(0);
-        });
-        Schema::table('user_settings', function (Blueprint $table) {
-            $table->timestamp('banned_at')->nullable()->default(null);
-            $table->text('ban_reason')->nullable()->default(null);
-        });
-    }
-
-    /**
-     * Reverse the migrations.
-     *
-     * @return void
-     */
-    public function down()
-    {
-        //
-        Schema::table('user_settings', function (Blueprint $table) {
-            $table->dropColumn('ban_reason');
-            $table->dropColumn('banned_at');
-        });
-        Schema::table('users', function (Blueprint $table) {
-            $table->dropColumn('is_banned');
-        });
-    }
-}
diff --git a/database/migrations/2019_10_21_081343_add_secure_trades.php b/database/migrations/2019_10_21_081343_add_secure_trades.php
deleted file mode 100644
index 62470122f6..0000000000
--- a/database/migrations/2019_10_21_081343_add_secure_trades.php
+++ /dev/null
@@ -1,59 +0,0 @@
-<?php
-
-use Illuminate\Support\Facades\Schema;
-use Illuminate\Database\Schema\Blueprint;
-use Illuminate\Database\Migrations\Migration;
-
-class AddSecureTrades extends Migration
-{
-    /**
-     * Run the migrations.
-     *
-     * @return void
-     */
-    public function up()
-    {
-        //
-        Schema::create('trades', function (Blueprint $table) {
-            $table->engine = 'InnoDB';
-            $table->increments('id');
-            $table->enum('status', ['Open', 'Pending', 'Completed', 'Rejected', 'Canceled'])->default('Open');
-
-            $table->integer('sender_id')->unsigned();
-            $table->integer('recipient_id')->unsigned();
-            $table->text('comments')->nullable()->default(null);
-
-            $table->boolean('is_sender_confirmed')->default(0);
-            $table->boolean('is_recipient_confirmed')->default(0);
-            $table->boolean('is_confirmed')->default(0);
-            $table->boolean('is_approved')->default(0);
-            
-            // Reason for the transfer being rejected by a mod
-            $table->text('reason')->nullable()->default(null);
-
-            // Information including added cooldowns
-            $table->string('data', 1024)->nullable()->default(null);
-
-            $table->timestamps();
-        });
-        Schema::table('characters', function (Blueprint $table) {
-            // Fill this with a trade ID so we can tell if the character is busy
-            $table->integer('trade_id')->unsigned()->nullable()->default(null);
-        });
-
-    } 
-
-    /**
-     * Reverse the migrations.
-     *
-     * @return void
-     */
-    public function down()
-    {
-        //
-        Schema::table('characters', function (Blueprint $table) {
-            $table->dropColumn('trade_id');
-        });
-        Schema::dropIfExists('trades');
-    }
-}
diff --git a/database/migrations/2019_11_05_062623_modify_trade_confirmation_flags.php b/database/migrations/2019_11_05_062623_modify_trade_confirmation_flags.php
deleted file mode 100644
index aee3a4cf42..0000000000
--- a/database/migrations/2019_11_05_062623_modify_trade_confirmation_flags.php
+++ /dev/null
@@ -1,38 +0,0 @@
-<?php
-
-use Illuminate\Support\Facades\Schema;
-use Illuminate\Database\Schema\Blueprint;
-use Illuminate\Database\Migrations\Migration;
-
-class ModifyTradeConfirmationFlags extends Migration
-{
-    /**
-     * Run the migrations.
-     *
-     * @return void
-     */
-    public function up()
-    {
-        //
-        Schema::table('trades', function (Blueprint $table) {
-            $table->dropColumn('is_confirmed');
-            $table->boolean('is_sender_trade_confirmed')->default(0);
-            $table->boolean('is_recipient_trade_confirmed')->default(0);
-        });
-    }
-
-    /**
-     * Reverse the migrations.
-     *
-     * @return void
-     */
-    public function down()
-    {
-        //
-        Schema::table('trades', function (Blueprint $table) {
-            $table->dropColumn('is_sender_trade_confirmed');
-            $table->dropColumn('is_recipient_trade_confirmed');
-            $table->boolean('is_confirmed')->default(0);
-        });
-    }
-}
diff --git a/database/migrations/2019_12_02_090542_add_staff_id_to_trades.php b/database/migrations/2019_12_02_090542_add_staff_id_to_trades.php
deleted file mode 100644
index 2e8ed895a9..0000000000
--- a/database/migrations/2019_12_02_090542_add_staff_id_to_trades.php
+++ /dev/null
@@ -1,33 +0,0 @@
-<?php
-
-use Illuminate\Support\Facades\Schema;
-use Illuminate\Database\Schema\Blueprint;
-use Illuminate\Database\Migrations\Migration;
-
-class AddStaffIdToTrades extends Migration
-{
-    /**
-     * Run the migrations.
-     *
-     * @return void
-     */
-    public function up()
-    {
-        Schema::table('trades', function (Blueprint $table) {
-            // Add a staff ID so we know who processed the trade, if applicable
-            $table->integer('staff_id')->unsigned()->nullable()->default(null);
-        });
-    }
-
-    /**
-     * Reverse the migrations.
-     *
-     * @return void
-     */
-    public function down()
-    {
-        Schema::table('trades', function (Blueprint $table) {
-            $table->dropColumn('staff_id');
-        });
-    }
-}
diff --git a/database/migrations/2019_12_23_062730_add_item_tags.php b/database/migrations/2019_12_23_062730_add_item_tags.php
deleted file mode 100644
index ed548c582a..0000000000
--- a/database/migrations/2019_12_23_062730_add_item_tags.php
+++ /dev/null
@@ -1,48 +0,0 @@
-<?php
-
-use Illuminate\Support\Facades\Schema;
-use Illuminate\Database\Schema\Blueprint;
-use Illuminate\Database\Migrations\Migration;
-
-class AddItemTags extends Migration
-{
-    /**
-     * Run the migrations.
-     *
-     * @return void
-     */
-    public function up()
-    {
-        // This table tags items with a tag type and data.
-        // Handlers can be implemented for different tag types.
-        Schema::create('item_tags', function (Blueprint $table) {
-            $table->engine = 'InnoDB';
-            $table->increments('id');
-
-            $table->integer('item_id')->unsigned();
-            $table->string('tag')->index();
-
-            // This will hold the data required for using/displaying this item.
-            // Note that the forms for editing the item will also have 
-            // to be created yourself.
-            $table->text('data')->nullable()->default(null);
-
-            // This toggle allows you to disable the item tag,
-            // e.g. in a situation where you want an item to be usable
-            // during an event, but not afterwards and you want to 
-            // preserve the settings so you can reuse it again later
-            $table->boolean('is_active')->default(0);
-        });
-    }
-
-    /**
-     * Reverse the migrations.
-     *
-     * @return void
-     */
-    public function down()
-    {
-        //
-        Schema::dropIfExists('item_tags');
-    }
-}
diff --git a/database/migrations/2020_02_23_135512_make_prompt_category_nullable.php b/database/migrations/2020_02_23_135512_make_prompt_category_nullable.php
deleted file mode 100644
index bc08cfe3e9..0000000000
--- a/database/migrations/2020_02_23_135512_make_prompt_category_nullable.php
+++ /dev/null
@@ -1,35 +0,0 @@
-<?php
-
-use Illuminate\Support\Facades\Schema;
-use Illuminate\Database\Schema\Blueprint;
-use Illuminate\Database\Migrations\Migration;
-
-class MakePromptCategoryNullable extends Migration
-{
-    /**
-     * Run the migrations.
-     *
-     * @return void
-     */
-    public function up()
-    {
-        //
-        Schema::table('prompts', function (Blueprint $table) {
-            $table->integer('prompt_category_id')->unsigned()->nullable()->change();
-        });
-        
-    }
-
-    /**
-     * Reverse the migrations.
-     *
-     * @return void
-     */
-    public function down()
-    {
-        //
-        Schema::table('prompts', function (Blueprint $table) {
-            $table->integer('prompt_category_id')->unsigned()->default(0)->change();
-        });
-    }
-}
diff --git a/database/migrations/2020_03_07_065050_add_bookmarks.php b/database/migrations/2020_03_07_065050_add_bookmarks.php
deleted file mode 100644
index 5a66ff40ca..0000000000
--- a/database/migrations/2020_03_07_065050_add_bookmarks.php
+++ /dev/null
@@ -1,43 +0,0 @@
-<?php
-
-use Illuminate\Support\Facades\Schema;
-use Illuminate\Database\Schema\Blueprint;
-use Illuminate\Database\Migrations\Migration;
-
-class AddBookmarks extends Migration
-{
-    /**
-     * Run the migrations.
-     *
-     * @return void
-     */
-    public function up()
-    {
-        //
-        Schema::create('character_bookmarks', function (Blueprint $table) {
-            $table->engine = 'InnoDB';
-            $table->increments('id');
-
-            $table->integer('user_id')->unsigned()->index();
-            $table->integer('character_id')->unsigned()->index();
-            $table->boolean('notify_on_trade_status')->default(0);
-            $table->boolean('notify_on_gift_art_status')->default(0);
-            $table->boolean('notify_on_transfer')->default(0);
-            $table->boolean('notify_on_image')->default(0);
-            $table->string('comment', 512)->nullable()->default(null);
-
-            $table->unique(['user_id', 'character_id']);
-        });
-    }
-
-    /**
-     * Reverse the migrations.
-     *
-     * @return void
-     */
-    public function down()
-    {
-        //
-        Schema::dropIfExists('character_bookmarks');
-    }
-}
diff --git a/database/migrations/2020_03_14_090241_make_character_log_sender_nullable.php b/database/migrations/2020_03_14_090241_make_character_log_sender_nullable.php
deleted file mode 100644
index 8cc78c991b..0000000000
--- a/database/migrations/2020_03_14_090241_make_character_log_sender_nullable.php
+++ /dev/null
@@ -1,44 +0,0 @@
-<?php
-
-use Illuminate\Support\Facades\Schema;
-use Illuminate\Database\Schema\Blueprint;
-use Illuminate\Database\Migrations\Migration;
-
-class MakeCharacterLogSenderNullable extends Migration
-{
-    /**
-     * Run the migrations.
-     *
-     * @return void
-     */
-    public function up()
-    {
-        // This is required to allow staff to transfer characters from non-registered users around
-        Schema::table('user_character_log', function (Blueprint $table) {
-            $table->string('sender_alias')->nullable();
-            $table->integer('sender_id')->unsigned()->nullable()->change();
-        });
-        Schema::table('character_log', function (Blueprint $table) {
-            $table->string('sender_alias')->nullable();
-            $table->integer('sender_id')->unsigned()->nullable()->change();
-        });
-    }
-
-    /**
-     * Reverse the migrations.
-     *
-     * @return void
-     */
-    public function down()
-    {
-        //
-        Schema::table('user_character_log', function (Blueprint $table) {
-            $table->dropColumn('sender_alias');
-            $table->integer('sender_id')->unsigned()->change();
-        });
-        Schema::table('character_log', function (Blueprint $table) {
-            $table->dropColumn('sender_alias');
-            $table->integer('sender_id')->unsigned()->change();
-        });
-    }
-}
diff --git a/database/migrations/2020_03_14_124534_add_subtypes.php b/database/migrations/2020_03_14_124534_add_subtypes.php
deleted file mode 100644
index 73c4f8d9d6..0000000000
--- a/database/migrations/2020_03_14_124534_add_subtypes.php
+++ /dev/null
@@ -1,65 +0,0 @@
-<?php
-
-use Illuminate\Support\Facades\Schema;
-use Illuminate\Database\Schema\Blueprint;
-use Illuminate\Database\Migrations\Migration;
-
-class AddSubtypes extends Migration
-{
-    /**
-     * Run the migrations.
-     *
-     * @return void
-     */
-    public function up()
-    {
-        // These are basically, subspecies - I've decided to name them "subtypes"
-        // as "subspecies" implies a biological taxonomic relation,
-        // when "subspecies" in closed species tend to be less strictly scientific
-        // and could be magical, could be dynamically changed... 
-        // so something looser like "subtype" would probably be better as a blanket term
-        // for these.
-        Schema::create('subtypes', function(Blueprint $table) {
-            $table->engine = 'InnoDB';
-            $table->increments('id');
-            $table->integer('species_id')->unsigned();
-
-            $table->string('name');
-            $table->boolean('has_image')->default(0);
-            $table->integer('sort')->unsigned()->default(0);
-            $table->text('description')->nullable()->default(null);
-            $table->text('parsed_description')->nullable()->default(null);
-
-            $table->foreign('species_id')->references('id')->on('specieses');
-        });
-        Schema::table('character_images', function(Blueprint $table) {
-            $table->integer('subtype_id')->unsigned()->nullable()->default(null);
-        });
-        Schema::table('design_updates', function(Blueprint $table) {
-            $table->integer('subtype_id')->unsigned()->nullable()->default(null);
-        });
-        Schema::table('character_features', function(Blueprint $table) {
-            $table->integer('subtype_id')->unsigned()->nullable()->default(null);
-        });
-    }
-
-    /**
-     * Reverse the migrations.
-     *
-     * @return void
-     */
-    public function down()
-    {
-        //
-        Schema::table('character_images', function(Blueprint $table) {
-            $table->dropColumn('subtype_id');
-        });
-        Schema::table('design_updates', function(Blueprint $table) {
-            $table->dropColumn('subtype_id');
-        });
-        Schema::table('character_features', function(Blueprint $table) {
-            $table->dropColumn('subtype_id');
-        });
-        Schema::dropIfExists('subtypes');
-    }
-}
diff --git a/database/migrations/2020_03_27_113928_add_subtype_to_features.php b/database/migrations/2020_03_27_113928_add_subtype_to_features.php
deleted file mode 100644
index de9ef875ad..0000000000
--- a/database/migrations/2020_03_27_113928_add_subtype_to_features.php
+++ /dev/null
@@ -1,39 +0,0 @@
-<?php
-
-use Illuminate\Support\Facades\Schema;
-use Illuminate\Database\Schema\Blueprint;
-use Illuminate\Database\Migrations\Migration;
-
-class AddSubtypeToFeatures extends Migration
-{
-    /**
-     * Run the migrations.
-     *
-     * @return void
-     */
-    public function up()
-    {
-        // This column was added to the wrong table
-        Schema::table('character_features', function(Blueprint $table) {
-            $table->dropColumn('subtype_id');
-        });
-        Schema::table('features', function (Blueprint $table) {
-            $table->integer('subtype_id')->unsigned()->nullable()->default(null);
-        });
-    }
-
-    /**
-     * Reverse the migrations.
-     *
-     * @return void
-     */
-    public function down()
-    {
-        Schema::table('features', function(Blueprint $table) {
-            $table->dropColumn('subtype_id');
-        });
-        Schema::table('character_features', function (Blueprint $table) {
-            $table->integer('subtype_id')->unsigned()->nullable()->default(null);
-        });
-    }
-}
diff --git a/database/migrations/2020_04_25_114747_drop_log_foreign_keys.php b/database/migrations/2020_04_25_114747_drop_log_foreign_keys.php
deleted file mode 100644
index 44b5c5bf10..0000000000
--- a/database/migrations/2020_04_25_114747_drop_log_foreign_keys.php
+++ /dev/null
@@ -1,37 +0,0 @@
-<?php
-
-use Illuminate\Support\Facades\Schema;
-use Illuminate\Database\Schema\Blueprint;
-use Illuminate\Database\Migrations\Migration;
-
-class DropLogForeignKeys extends Migration
-{
-    /**
-     * Run the migrations.
-     *
-     * @return void
-     */
-    public function up()
-    {
-        // This will drop the currency log foreign keys, so that currencies can be deleted without issue
-        // even if a log exists for it
-        Schema::table('currencies_log', function(Blueprint $table) {
-            $table->dropForeign('banks_log_currency_id_foreign');
-        });
-    }
-
-    /**
-     * Reverse the migrations.
-     *
-     * @return void
-     */
-    public function down()
-    {
-        // This is not actually a very accurate opposite of the above,
-        // as the old index was created when the table was called banks,
-        // and this will generate a different index name
-        Schema::table('currencies_log', function(Blueprint $table) {
-            $table->foreign('currency_id')->references('id')->on('currencies');
-        });
-    }
-}
diff --git a/database/migrations/2020_05_02_152118_drop_character_myo_counts.php b/database/migrations/2020_05_02_152118_drop_character_myo_counts.php
deleted file mode 100644
index 7761db1269..0000000000
--- a/database/migrations/2020_05_02_152118_drop_character_myo_counts.php
+++ /dev/null
@@ -1,46 +0,0 @@
-<?php
-
-use Illuminate\Support\Facades\Schema;
-use Illuminate\Database\Schema\Blueprint;
-use Illuminate\Database\Migrations\Migration;
-
-use App\Models\User\User;
-
-class DropCharacterMyoCounts extends Migration
-{
-    /**
-     * Run the migrations.
-     *
-     * @return void
-     */
-    public function up()
-    {
-        // This count is not being used anywhere and is inaccurate
-        // depending on your viewing permissions
-        Schema::table('user_settings', function(Blueprint $table) {
-            $table->dropColumn('character_count');
-            $table->dropColumn('myo_slot_count');
-        });
-    }
-
-    /**
-     * Reverse the migrations.
-     *
-     * @return void
-     */
-    public function down()
-    {
-        //
-        Schema::table('user_settings', function(Blueprint $table) {
-            $table->integer('character_count')->unsigned()->default(0);
-            $table->integer('myo_slot_count')->unsigned()->default(0);
-        });
-
-        $users = User::all();
-        foreach($users as $user) {
-            $user->settings->character_count = $user->characters->count();
-            $user_settings->myo_slot_count = $user->myoSlots->count();
-            $user->settings->save();
-        }
-    }
-}
diff --git a/database/migrations/2020_05_10_204920_change_user_items_count_default.php b/database/migrations/2020_05_10_204920_change_user_items_count_default.php
index 523bfa3d87..a8cf467b68 100644
--- a/database/migrations/2020_05_10_204920_change_user_items_count_default.php
+++ b/database/migrations/2020_05_10_204920_change_user_items_count_default.php
@@ -1,28 +1,19 @@
 <?php
 
-use Illuminate\Support\Facades\Schema;
-use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Database\Migrations\Migration;
 
-class ChangeUserItemsCountDefault extends Migration
-{
+class ChangeUserItemsCountDefault extends Migration {
     /**
      * Run the migrations.
-     *
-     * @return void
      */
-    public function up()
-    {
+    public function up() {
         DB::statement('ALTER TABLE user_items ALTER count SET DEFAULT 0;');
     }
 
     /**
      * Reverse the migrations.
-     *
-     * @return void
      */
-    public function down()
-    {
+    public function down() {
         DB::statement('ALTER TABLE user_items ALTER count SET DEFAULT 1;');
     }
 }
diff --git a/database/migrations/2020_05_15_163751_add_holding_count_to_user_items.php b/database/migrations/2020_05_15_163751_add_holding_count_to_user_items.php
index 6505fc0b3c..01ede2ce2c 100644
--- a/database/migrations/2020_05_15_163751_add_holding_count_to_user_items.php
+++ b/database/migrations/2020_05_15_163751_add_holding_count_to_user_items.php
@@ -1,18 +1,14 @@
 <?php
 
-use Illuminate\Support\Facades\Schema;
-use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
 
-class AddHoldingCountToUserItems extends Migration
-{
+class AddHoldingCountToUserItems extends Migration {
     /**
      * Run the migrations.
-     *
-     * @return void
      */
-    public function up()
-    {
+    public function up() {
         Schema::table('user_items', function (Blueprint $table) {
             $table->unsignedInteger('holding_count')->default(0);
         });
@@ -20,11 +16,8 @@ public function up()
 
     /**
      * Reverse the migrations.
-     *
-     * @return void
      */
-    public function down()
-    {
+    public function down() {
         Schema::table('user_items', function (Blueprint $table) {
             $table->dropColumn('holding_count');
         });
diff --git a/database/migrations/2020_05_23_112548_change_item_tracking_system.php b/database/migrations/2020_05_23_112548_change_item_tracking_system.php
index db05424362..c6eab3aeb8 100644
--- a/database/migrations/2020_05_23_112548_change_item_tracking_system.php
+++ b/database/migrations/2020_05_23_112548_change_item_tracking_system.php
@@ -1,18 +1,14 @@
 <?php
 
-use Illuminate\Support\Facades\Schema;
-use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
 
-class ChangeItemTrackingSystem extends Migration
-{
+class ChangeItemTrackingSystem extends Migration {
     /**
      * Run the migrations.
-     *
-     * @return void
      */
-    public function up()
-    {
+    public function up() {
         DB::statement('ALTER TABLE user_items CHANGE `holding_count` `trade_count` INT(10) unsigned;');
 
         Schema::table('user_items', function (Blueprint $table) {
@@ -22,11 +18,8 @@ public function up()
 
     /**
      * Reverse the migrations.
-     *
-     * @return void
      */
-    public function down()
-    {
+    public function down() {
         DB::statement('ALTER TABLE user_items CHANGE `trade_count` `holding_count` INT(10) unsigned;');
 
         Schema::table('user_items', function (Blueprint $table) {
diff --git a/database/migrations/2020_06_01_124250_add_parsed_submission_comments.php b/database/migrations/2020_06_01_124250_add_parsed_submission_comments.php
deleted file mode 100644
index 52be76101f..0000000000
--- a/database/migrations/2020_06_01_124250_add_parsed_submission_comments.php
+++ /dev/null
@@ -1,34 +0,0 @@
-<?php
-
-use Illuminate\Support\Facades\Schema;
-use Illuminate\Database\Schema\Blueprint;
-use Illuminate\Database\Migrations\Migration;
-
-class AddParsedSubmissionComments extends Migration
-{
-    /**
-     * Run the migrations.
-     *
-     * @return void
-     */
-    public function up()
-    {
-        Schema::table('submissions', function (Blueprint $table) {
-            //
-            $table->text('parsed_staff_comments')->nullable()->default(null);
-        });
-    }
-
-    /**
-     * Reverse the migrations.
-     *
-     * @return void
-     */
-    public function down()
-    {
-        Schema::table('submissions', function (Blueprint $table) {
-            //
-            $table->dropColumn('parsed_staff_comments');
-        });
-    }
-}
diff --git a/database/migrations/2020_06_06_194000_add_submission_count.php b/database/migrations/2020_06_06_194000_add_submission_count.php
index 61dad31f07..9b9e18980f 100644
--- a/database/migrations/2020_06_06_194000_add_submission_count.php
+++ b/database/migrations/2020_06_06_194000_add_submission_count.php
@@ -1,18 +1,14 @@
 <?php
 
-use Illuminate\Support\Facades\Schema;
-use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
 
-class AddSubmissionCount extends Migration
-{
+class AddSubmissionCount extends Migration {
     /**
      * Run the migrations.
-     *
-     * @return void
      */
-    public function up()
-    {
+    public function up() {
         Schema::table('user_items', function (Blueprint $table) {
             $table->unsignedInteger('submission_count')->default(0);
         });
@@ -20,11 +16,8 @@ public function up()
 
     /**
      * Reverse the migrations.
-     *
-     * @return void
      */
-    public function down()
-    {
+    public function down() {
         Schema::table('user_items', function (Blueprint $table) {
             //
             $table->dropColumn('submission_count');
diff --git a/database/migrations/2020_06_12_155213_add_character_items_table.php b/database/migrations/2020_06_12_155213_add_character_items_table.php
index 2f23567f24..3400147ee0 100644
--- a/database/migrations/2020_06_12_155213_add_character_items_table.php
+++ b/database/migrations/2020_06_12_155213_add_character_items_table.php
@@ -1,18 +1,14 @@
 <?php
 
-use Illuminate\Support\Facades\Schema;
-use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
 
-class AddCharacterItemsTable extends Migration
-{
+class AddCharacterItemsTable extends Migration {
     /**
      * Run the migrations.
-     *
-     * @return void
      */
-    public function up()
-    {
+    public function up() {
         // Create tables for storing character-owned items and the associated logs.
         Schema::create('character_items', function (Blueprint $table) {
             $table->engine = 'InnoDB';
@@ -31,7 +27,7 @@ public function up()
             $table->foreign('character_id')->references('id')->on('characters');
         });
 
-        Schema::create('character_items_log', function(Blueprint $table) {
+        Schema::create('character_items_log', function (Blueprint $table) {
             $table->engine = 'InnoDB';
             $table->increments('id');
             $table->integer('item_id')->unsigned();
@@ -50,11 +46,8 @@ public function up()
 
     /**
      * Reverse the migrations.
-     *
-     * @return void
      */
-    public function down()
-    {
+    public function down() {
         //
         Schema::dropIfExists('character_items');
         Schema::dropIfExists('character_items_log');
diff --git a/database/migrations/2020_06_12_161322_add_character_transfer_perms_to_item_categories.php b/database/migrations/2020_06_12_161322_add_character_transfer_perms_to_item_categories.php
index ae769df83d..80c156e2ee 100644
--- a/database/migrations/2020_06_12_161322_add_character_transfer_perms_to_item_categories.php
+++ b/database/migrations/2020_06_12_161322_add_character_transfer_perms_to_item_categories.php
@@ -1,18 +1,14 @@
 <?php
 
-use Illuminate\Support\Facades\Schema;
-use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
 
-class AddCharacterTransferPermsToItemCategories extends Migration
-{
+class AddCharacterTransferPermsToItemCategories extends Migration {
     /**
      * Run the migrations.
-     *
-     * @return void
      */
-    public function up()
-    {
+    public function up() {
         Schema::table('item_categories', function (Blueprint $table) {
             // Set whether an item category can be owned by characters.
             $table->boolean('is_character_owned')->default(0);
@@ -24,11 +20,8 @@ public function up()
 
     /**
      * Reverse the migrations.
-     *
-     * @return void
      */
-    public function down()
-    {
+    public function down() {
         Schema::table('item_categories', function (Blueprint $table) {
             $table->dropColumn('is_character_owned');
             $table->dropColumn('character_limit');
diff --git a/database/migrations/2020_06_15_205604_fix_character_item_log_table.php b/database/migrations/2020_06_15_205604_fix_character_item_log_table.php
index 0e56714f28..f31c77b00d 100644
--- a/database/migrations/2020_06_15_205604_fix_character_item_log_table.php
+++ b/database/migrations/2020_06_15_205604_fix_character_item_log_table.php
@@ -1,18 +1,14 @@
 <?php
 
-use Illuminate\Support\Facades\Schema;
-use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
 
-class FixCharacterItemLogTable extends Migration
-{
+class FixCharacterItemLogTable extends Migration {
     /**
      * Run the migrations.
-     *
-     * @return void
      */
-    public function up()
-    {
+    public function up() {
         DB::statement('ALTER TABLE character_items_log CHANGE `count` `quantity` INT(10) unsigned;');
 
         Schema::table('character_items_log', function (Blueprint $table) {
@@ -22,16 +18,12 @@ public function up()
 
     /**
      * Reverse the migrations.
-     *
-     * @return void
      */
-    public function down()
-    {
+    public function down() {
         DB::statement('ALTER TABLE character_items_log CHANGE `quantity` `count` INT(10) unsigned;');
 
         Schema::table('character_items_log', function (Blueprint $table) {
             $table->integer('stack_id')->unsigned()->change();
         });
-        
     }
 }
diff --git a/database/migrations/2020_06_15_232619_add_sender_recipient_type_to_character_items_log.php b/database/migrations/2020_06_15_232619_add_sender_recipient_type_to_character_items_log.php
index b5f1582076..ef31e1263f 100644
--- a/database/migrations/2020_06_15_232619_add_sender_recipient_type_to_character_items_log.php
+++ b/database/migrations/2020_06_15_232619_add_sender_recipient_type_to_character_items_log.php
@@ -1,18 +1,14 @@
 <?php
 
-use Illuminate\Support\Facades\Schema;
-use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
 
-class AddSenderRecipientTypeToCharacterItemsLog extends Migration
-{
+class AddSenderRecipientTypeToCharacterItemsLog extends Migration {
     /**
      * Run the migrations.
-     *
-     * @return void
      */
-    public function up()
-    {
+    public function up() {
         Schema::table('character_items_log', function (Blueprint $table) {
             //Add sender and recipient type
             $table->enum('sender_type', ['User', 'Character'])->nullable()->default(null);
@@ -22,11 +18,8 @@ public function up()
 
     /**
      * Reverse the migrations.
-     *
-     * @return void
      */
-    public function down()
-    {
+    public function down() {
         Schema::table('character_items_log', function (Blueprint $table) {
             //
             $table->dropColumn('sender_type');
diff --git a/database/migrations/2020_06_16_182516_adjust_item_logs_for_character_items.php b/database/migrations/2020_06_16_182516_adjust_item_logs_for_character_items.php
index 3623b5475b..ad3253fad5 100644
--- a/database/migrations/2020_06_16_182516_adjust_item_logs_for_character_items.php
+++ b/database/migrations/2020_06_16_182516_adjust_item_logs_for_character_items.php
@@ -1,18 +1,14 @@
 <?php
 
-use Illuminate\Support\Facades\Schema;
-use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
 
-class AdjustItemLogsForCharacterItems extends Migration
-{
+class AdjustItemLogsForCharacterItems extends Migration {
     /**
      * Run the migrations.
-     *
-     * @return void
      */
-    public function up()
-    {
+    public function up() {
         //Drop character item logs table in favor of adjusting existing logs table to suit
         Schema::dropIfExists('character_items_log');
 
@@ -27,13 +23,10 @@ public function up()
 
     /**
      * Reverse the migrations.
-     *
-     * @return void
      */
-    public function down()
-    {
+    public function down() {
         //
-        Schema::create('character_items_log', function(Blueprint $table) {
+        Schema::create('character_items_log', function (Blueprint $table) {
             $table->engine = 'InnoDB';
             $table->increments('id');
             $table->integer('item_id')->unsigned();
diff --git a/database/migrations/2020_06_16_203821_set_items_log_sender_recipient_default_null.php b/database/migrations/2020_06_16_203821_set_items_log_sender_recipient_default_null.php
index bf6bc7a758..1779a2eb3e 100644
--- a/database/migrations/2020_06_16_203821_set_items_log_sender_recipient_default_null.php
+++ b/database/migrations/2020_06_16_203821_set_items_log_sender_recipient_default_null.php
@@ -1,22 +1,18 @@
 <?php
 
-use Illuminate\Support\Facades\Schema;
-use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
 
-class SetItemsLogSenderRecipientDefaultNull extends Migration
-{
+class SetItemsLogSenderRecipientDefaultNull extends Migration {
     /**
      * Run the migrations.
-     *
-     * @return void
      */
-    public function up()
-    {
+    public function up() {
         //Change default to null going forward
         DB::statement("ALTER TABLE items_log CHANGE COLUMN sender_type sender_type ENUM('User', 'Character') DEFAULT NULL");
         DB::statement("ALTER TABLE items_log CHANGE COLUMN recipient_type recipient_type ENUM('User', 'Character') DEFAULT NULL");
-        
+
         Schema::table('items_log', function (Blueprint $table) {
             //Actually drop them this time, please. Also drop the item_id column
             $table->dropForeign('inventory_log_sender_id_foreign');
@@ -28,11 +24,8 @@ public function up()
 
     /**
      * Reverse the migrations.
-     *
-     * @return void
      */
-    public function down()
-    {
+    public function down() {
         //
         DB::statement("ALTER TABLE items_log CHANGE COLUMN sender_type sender_type ENUM('User', 'Character') DEFAULT 'User'");
         DB::statement("ALTER TABLE items_log CHANGE COLUMN recipient_type recipient_type ENUM('User', 'Character') DEFAULT 'User'");
diff --git a/database/migrations/2020_06_19_142842_item_entry_extension.php b/database/migrations/2020_06_19_142842_item_entry_extension.php
index 278e4c4230..18e3e4a6fc 100644
--- a/database/migrations/2020_06_19_142842_item_entry_extension.php
+++ b/database/migrations/2020_06_19_142842_item_entry_extension.php
@@ -1,18 +1,14 @@
 <?php
 
-use Illuminate\Support\Facades\Schema;
-use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
 
-class ItemEntryExtension extends Migration
-{
+class ItemEntryExtension extends Migration {
     /**
      * Run the migrations.
-     *
-     * @return void
      */
-    public function up()
-    {
+    public function up() {
         // Add columns for rarity, reference link, artist alias/URL, availability, use(s)
         Schema::table('items', function (Blueprint $table) {
             $table->string('data', 1024)->nullable(); // includes rarity and availability information.
@@ -24,11 +20,8 @@ public function up()
 
     /**
      * Reverse the migrations.
-     *
-     * @return void
      */
-    public function down()
-    {
+    public function down() {
         Schema::table('items', function (Blueprint $table) {
             //
             $table->dropColumn('data');
diff --git a/database/migrations/2020_07_27_153640_user_icon_expansion.php b/database/migrations/2020_07_27_153640_user_icon_expansion.php
index 15413e0916..6b73462dcd 100644
--- a/database/migrations/2020_07_27_153640_user_icon_expansion.php
+++ b/database/migrations/2020_07_27_153640_user_icon_expansion.php
@@ -1,18 +1,14 @@
 <?php
 
-use Illuminate\Support\Facades\Schema;
-use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
 
-class UserIconExpansion extends Migration
-{
+class UserIconExpansion extends Migration {
     /**
      * Run the migrations.
-     *
-     * @return void
      */
-    public function up()
-    {
+    public function up() {
         // Add columns for avatar / references your default icon. If you prefer a png etc make sure to change the extension
         Schema::table('users', function (Blueprint $table) {
             $table->string('avatar')->default('default.jpg');
@@ -21,14 +17,11 @@ public function up()
 
     /**
      * Reverse the migrations.
-     *
-     * @return void
      */
-    public function down()
-    {
+    public function down() {
         Schema::table('users', function (Blueprint $table) {
             //
             $table->dropColumn('avatar');
         });
     }
-}
\ No newline at end of file
+}
diff --git a/database/migrations/2020_07_31_185640_add_type_to_design_updates.php b/database/migrations/2020_07_31_185640_add_type_to_design_updates.php
deleted file mode 100644
index 912eae90a0..0000000000
--- a/database/migrations/2020_07_31_185640_add_type_to_design_updates.php
+++ /dev/null
@@ -1,34 +0,0 @@
-<?php
-
-use Illuminate\Support\Facades\Schema;
-use Illuminate\Database\Schema\Blueprint;
-use Illuminate\Database\Migrations\Migration;
-
-class AddTypeToDesignUpdates extends Migration
-{
-    /**
-     * Run the migrations.
-     *
-     * @return void
-     */
-    public function up()
-    {
-        Schema::table('design_updates', function (Blueprint $table) {
-            //
-            $table->enum('update_type', ['MYO', 'Character'])->nullable()->default('Character');
-        });
-    }
-
-    /**
-     * Reverse the migrations.
-     *
-     * @return void
-     */
-    public function down()
-    {
-        Schema::table('design_updates', function (Blueprint $table) {
-            //
-            $table->dropColumn('update_type');
-        });
-    }
-}
diff --git a/database/migrations/2020_07_31_193235_set_design_update_type_null.php b/database/migrations/2020_07_31_193235_set_design_update_type_null.php
deleted file mode 100644
index a4b63e9a14..0000000000
--- a/database/migrations/2020_07_31_193235_set_design_update_type_null.php
+++ /dev/null
@@ -1,30 +0,0 @@
-<?php
-
-use Illuminate\Support\Facades\Schema;
-use Illuminate\Database\Schema\Blueprint;
-use Illuminate\Database\Migrations\Migration;
-
-class SetDesignUpdateTypeNull extends Migration
-{
-    /**
-     * Run the migrations.
-     *
-     * @return void
-     */
-    public function up()
-    {
-        //Change default to null going forward
-        DB::statement("ALTER TABLE design_updates CHANGE COLUMN update_type update_type ENUM('MYO', 'Character') DEFAULT NULL");
-    }
-
-    /**
-     * Reverse the migrations.
-     *
-     * @return void
-     */
-    public function down()
-    {
-        //
-        DB::statement("ALTER TABLE design_updates CHANGE COLUMN update_type update_type ENUM('MYO', 'Character') DEFAULT 'Character'");
-    }
-}
diff --git a/database/migrations/2020_08_10_181928_add_stack_name_to_character_items_table.php b/database/migrations/2020_08_10_181928_add_stack_name_to_character_items_table.php
index 7afc860d90..95a9a6b23c 100644
--- a/database/migrations/2020_08_10_181928_add_stack_name_to_character_items_table.php
+++ b/database/migrations/2020_08_10_181928_add_stack_name_to_character_items_table.php
@@ -1,18 +1,14 @@
 <?php
 
-use Illuminate\Support\Facades\Schema;
-use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
 
-class AddStackNameToCharacterItemsTable extends Migration
-{
+class AddStackNameToCharacterItemsTable extends Migration {
     /**
      * Run the migrations.
-     *
-     * @return void
      */
-    public function up()
-    {
+    public function up() {
         Schema::table('character_items', function (Blueprint $table) {
             //
             $table->text('stack_name')->nullable()->default(null);
@@ -26,11 +22,8 @@ public function up()
 
     /**
      * Reverse the migrations.
-     *
-     * @return void
      */
-    public function down()
-    {
+    public function down() {
         Schema::table('character_items', function (Blueprint $table) {
             $table->dropColumn('stack_name');
         });
diff --git a/database/migrations/2020_08_10_211220_raise_items_log_char_limit.php b/database/migrations/2020_08_10_211220_raise_items_log_char_limit.php
index 280b09bf41..f4caeac6aa 100644
--- a/database/migrations/2020_08_10_211220_raise_items_log_char_limit.php
+++ b/database/migrations/2020_08_10_211220_raise_items_log_char_limit.php
@@ -1,18 +1,14 @@
 <?php
 
-use Illuminate\Support\Facades\Schema;
-use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
 
-class RaiseItemsLogCharLimit extends Migration
-{
+class RaiseItemsLogCharLimit extends Migration {
     /**
      * Run the migrations.
-     *
-     * @return void
      */
-    public function up()
-    {
+    public function up() {
         //
         Schema::table('items_log', function (Blueprint $table) {
             DB::statement('ALTER TABLE items_log MODIFY COLUMN log VARCHAR(1024)');
@@ -21,11 +17,8 @@ public function up()
 
     /**
      * Reverse the migrations.
-     *
-     * @return void
      */
-    public function down()
-    {
+    public function down() {
         //
         Schema::table('items_log', function (Blueprint $table) {
             DB::statement('ALTER TABLE items_log MODIFY COLUMN log VARCHAR(191)');
diff --git a/database/migrations/2020_08_13_173324_add_votes_to_design_updates.php b/database/migrations/2020_08_13_173324_add_votes_to_design_updates.php
index 9f647e3c67..80500cfb9a 100644
--- a/database/migrations/2020_08_13_173324_add_votes_to_design_updates.php
+++ b/database/migrations/2020_08_13_173324_add_votes_to_design_updates.php
@@ -1,18 +1,14 @@
 <?php
 
-use Illuminate\Support\Facades\Schema;
-use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
 
-class AddVotesToDesignUpdates extends Migration
-{
+class AddVotesToDesignUpdates extends Migration {
     /**
      * Run the migrations.
-     *
-     * @return void
      */
-    public function up()
-    {
+    public function up() {
         Schema::table('design_updates', function (Blueprint $table) {
             //
             $table->string('vote_data', 512)->nullable()->default(null);
@@ -21,11 +17,8 @@ public function up()
 
     /**
      * Reverse the migrations.
-     *
-     * @return void
      */
-    public function down()
-    {
+    public function down() {
         Schema::table('design_updates', function (Blueprint $table) {
             //
             $table->dropColumn('vote_data');
diff --git a/database/migrations/2020_08_25_181738_add_fullsize_hash_to_character_images.php b/database/migrations/2020_08_25_181738_add_fullsize_hash_to_character_images.php
index 30245b4551..2da7b3b263 100644
--- a/database/migrations/2020_08_25_181738_add_fullsize_hash_to_character_images.php
+++ b/database/migrations/2020_08_25_181738_add_fullsize_hash_to_character_images.php
@@ -1,18 +1,14 @@
 <?php
 
-use Illuminate\Support\Facades\Schema;
-use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
 
-class AddFullsizeHashToCharacterImages extends Migration
-{
+class AddFullsizeHashToCharacterImages extends Migration {
     /**
      * Run the migrations.
-     *
-     * @return void
      */
-    public function up()
-    {
+    public function up() {
         // To prevent people from scraping URLs
         Schema::table('character_images', function (Blueprint $table) {
             $table->string('fullsize_hash', 20);
@@ -25,11 +21,8 @@ public function up()
 
     /**
      * Reverse the migrations.
-     *
-     * @return void
      */
-    public function down()
-    {
+    public function down() {
         Schema::table('character_images', function (Blueprint $table) {
             $table->dropColumn('fullsize_hash');
         });
diff --git a/database/migrations/2020_08_27_181445_char-link-addon.php b/database/migrations/2020_08_27_181445_char-link-addon.php
index 400c666db7..1e1551c7be 100644
--- a/database/migrations/2020_08_27_181445_char-link-addon.php
+++ b/database/migrations/2020_08_27_181445_char-link-addon.php
@@ -1,18 +1,14 @@
 <?php
 
-use Illuminate\Support\Facades\Schema;
-use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
 
-class CharLinkAddon extends Migration
-{
+class CharLinkAddon extends Migration {
     /**
      * Run the migrations.
-     *
-     * @return void
      */
-    public function up()
-    {
+    public function up() {
         // Add columns
         Schema::table('character_profiles', function (Blueprint $table) {
             $table->string('link', 100)->nullable($value = true);
@@ -21,11 +17,8 @@ public function up()
 
     /**
      * Reverse the migrations.
-     *
-     * @return void
      */
-    public function down()
-    {
+    public function down() {
         Schema::table('character_profiles', function (Blueprint $table) {
             //
             $table->dropColumn('link');
diff --git a/database/migrations/2020_09_01_122320_add_sales.php b/database/migrations/2020_09_01_122320_add_sales.php
index 0b5135dbf0..8a121fc86f 100644
--- a/database/migrations/2020_09_01_122320_add_sales.php
+++ b/database/migrations/2020_09_01_122320_add_sales.php
@@ -1,18 +1,14 @@
 <?php
 
-use Illuminate\Support\Facades\Schema;
-use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
 
-class AddSales extends Migration
-{
+class AddSales extends Migration {
     /**
      * Run the migrations.
-     *
-     * @return void
      */
-    public function up()
-    {
+    public function up() {
         //
         Schema::create('sales', function (Blueprint $table) {
             $table->engine = 'InnoDB';
@@ -37,11 +33,8 @@ public function up()
 
     /**
      * Reverse the migrations.
-     *
-     * @return void
      */
-    public function down()
-    {
+    public function down() {
         //
         Schema::table('users', function (Blueprint $table) {
             $table->dropColumn('is_sales_unread');
diff --git a/database/migrations/2020_09_11_181218_add_is_featured.php b/database/migrations/2020_09_11_181218_add_is_featured.php
index 174351524f..529dfd2809 100644
--- a/database/migrations/2020_09_11_181218_add_is_featured.php
+++ b/database/migrations/2020_09_11_181218_add_is_featured.php
@@ -1,18 +1,14 @@
 <?php
 
-use Illuminate\Support\Facades\Schema;
-use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
 
-class AddIsFeatured extends Migration
-{
+class AddIsFeatured extends Migration {
     /**
      * Run the migrations.
-     *
-     * @return void
      */
-    public function up()
-    {
+    public function up() {
         Schema::table('comments', function (Blueprint $table) {
             $table->integer('is_featured')->default(0);
         });
@@ -20,13 +16,10 @@ public function up()
 
     /**
      * Reverse the migrations.
-     *
-     * @return void
      */
-    public function down()
-    {
+    public function down() {
         Schema::table('comments', function (Blueprint $table) {
             $table->dropColumn('is_featured');
-        }); 
+        });
     }
 }
diff --git a/database/migrations/2020_09_12_181218_add_rank_icon.php b/database/migrations/2020_09_12_181218_add_rank_icon.php
index d8b6af0577..0bc2e05d64 100644
--- a/database/migrations/2020_09_12_181218_add_rank_icon.php
+++ b/database/migrations/2020_09_12_181218_add_rank_icon.php
@@ -1,18 +1,14 @@
 <?php
 
-use Illuminate\Support\Facades\Schema;
-use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
 
-class AddRankIcon extends Migration
-{
+class AddRankIcon extends Migration {
     /**
      * Run the migrations.
-     *
-     * @return void
      */
-    public function up()
-    {
+    public function up() {
         Schema::table('ranks', function (Blueprint $table) {
             $table->string('icon', 100)->after('color')->default('fas fa-user')->nullable();
         });
@@ -20,11 +16,8 @@ public function up()
 
     /**
      * Reverse the migrations.
-     *
-     * @return void
      */
-    public function down()
-    {
+    public function down() {
         Schema::table('ranks', function (Blueprint $table) {
             $table->dropColumn('icon');
         });
diff --git a/database/migrations/2020_09_13_001802_add_toggle_for_comments_on_site_pages.php b/database/migrations/2020_09_13_001802_add_toggle_for_comments_on_site_pages.php
index 9694f58da7..87d13ef73b 100644
--- a/database/migrations/2020_09_13_001802_add_toggle_for_comments_on_site_pages.php
+++ b/database/migrations/2020_09_13_001802_add_toggle_for_comments_on_site_pages.php
@@ -1,18 +1,14 @@
 <?php
 
-use Illuminate\Support\Facades\Schema;
-use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
 
-class AddToggleForCommentsOnSitePages extends Migration
-{
+class AddToggleForCommentsOnSitePages extends Migration {
     /**
      * Run the migrations.
-     *
-     * @return void
      */
-    public function up()
-    {
+    public function up() {
         //
         Schema::table('site_pages', function (Blueprint $table) {
             $table->integer('can_comment')->default(0);
@@ -21,11 +17,8 @@ public function up()
 
     /**
      * Reverse the migrations.
-     *
-     * @return void
      */
-    public function down()
-    {
+    public function down() {
         //
         Schema::table('site_pages', function (Blueprint $table) {
             $table->dropColumn('can_comment');
diff --git a/database/migrations/2020_09_16_190405_make_gallery_tables.php b/database/migrations/2020_09_16_190405_make_gallery_tables.php
index 91c8666dee..44063cc107 100644
--- a/database/migrations/2020_09_16_190405_make_gallery_tables.php
+++ b/database/migrations/2020_09_16_190405_make_gallery_tables.php
@@ -1,23 +1,19 @@
 <?php
 
-use Illuminate\Support\Facades\Schema;
-use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
 
-class MakeGalleryTables extends Migration
-{
+class MakeGalleryTables extends Migration {
     /**
      * Run the migrations.
-     *
-     * @return void
      */
-    public function up()
-    {
+    public function up() {
         // Gallery structure table
         Schema::create('galleries', function (Blueprint $table) {
             $table->engine = 'InnoDB';
             $table->increments('id');
-            
+
             // Parent gallery ID
             $table->integer('parent_id')->unsigned()->nullable();
 
@@ -38,7 +34,7 @@ public function up()
         });
 
         // Gallery submission table
-        Schema::create('gallery_submissions', function(Blueprint $table) {
+        Schema::create('gallery_submissions', function (Blueprint $table) {
             $table->engine = 'InnoDB';
             $table->increments('id');
 
@@ -75,17 +71,13 @@ public function up()
 
             $table->timestamps();
             $table->softDeletes();
-
         });
     }
 
     /**
      * Reverse the migrations.
-     *
-     * @return void
      */
-    public function down()
-    {
+    public function down() {
         //
         Schema::dropIfExists('galleries');
         Schema::dropIfExists('gallery_submissions');
diff --git a/database/migrations/2020_09_17_185436_fix_gallery_tables.php b/database/migrations/2020_09_17_185436_fix_gallery_tables.php
index c75b9c4a20..2355687089 100644
--- a/database/migrations/2020_09_17_185436_fix_gallery_tables.php
+++ b/database/migrations/2020_09_17_185436_fix_gallery_tables.php
@@ -1,18 +1,14 @@
 <?php
 
-use Illuminate\Support\Facades\Schema;
-use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
 
-class FixGalleryTables extends Migration
-{
+class FixGalleryTables extends Migration {
     /**
      * Run the migrations.
-     *
-     * @return void
      */
-    public function up()
-    {
+    public function up() {
         //
         Schema::table('galleries', function (Blueprint $table) {
             //
@@ -49,11 +45,8 @@ public function up()
 
     /**
      * Reverse the migrations.
-     *
-     * @return void
      */
-    public function down()
-    {
+    public function down() {
         //
         Schema::table('galleries', function (Blueprint $table) {
             //
diff --git a/database/migrations/2020_09_18_194615_re_add_gallery_sort.php b/database/migrations/2020_09_18_194615_re_add_gallery_sort.php
index a6743d1e74..1546348f86 100644
--- a/database/migrations/2020_09_18_194615_re_add_gallery_sort.php
+++ b/database/migrations/2020_09_18_194615_re_add_gallery_sort.php
@@ -1,18 +1,14 @@
 <?php
 
-use Illuminate\Support\Facades\Schema;
-use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
 
-class ReAddGallerySort extends Migration
-{
+class ReAddGallerySort extends Migration {
     /**
      * Run the migrations.
-     *
-     * @return void
      */
-    public function up()
-    {
+    public function up() {
         //
         Schema::table('galleries', function (Blueprint $table) {
             //
@@ -22,11 +18,8 @@ public function up()
 
     /**
      * Reverse the migrations.
-     *
-     * @return void
      */
-    public function down()
-    {
+    public function down() {
         //
         Schema::table('galleries', function (Blueprint $table) {
             //
diff --git a/database/migrations/2020_09_18_225657_add_rejected_status_to_gallery_submissions.php b/database/migrations/2020_09_18_225657_add_rejected_status_to_gallery_submissions.php
index 96e75a36f3..582d50f3d5 100644
--- a/database/migrations/2020_09_18_225657_add_rejected_status_to_gallery_submissions.php
+++ b/database/migrations/2020_09_18_225657_add_rejected_status_to_gallery_submissions.php
@@ -1,28 +1,19 @@
 <?php
 
-use Illuminate\Support\Facades\Schema;
-use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Database\Migrations\Migration;
 
-class AddRejectedStatusToGallerySubmissions extends Migration
-{
+class AddRejectedStatusToGallerySubmissions extends Migration {
     /**
      * Run the migrations.
-     *
-     * @return void
      */
-    public function up()
-    {
+    public function up() {
         DB::statement("ALTER TABLE gallery_submissions CHANGE COLUMN status status ENUM('Pending', 'Accepted', 'Rejected') DEFAULT 'Pending'");
     }
 
     /**
      * Reverse the migrations.
-     *
-     * @return void
      */
-    public function down()
-    {
+    public function down() {
         DB::statement("ALTER TABLE gallery_submissions CHANGE COLUMN status status ENUM('Pending', 'Accepted') DEFAULT 'Pending'");
     }
 }
diff --git a/database/migrations/2020_09_19_023205_add_title_to_gallery_submissions.php b/database/migrations/2020_09_19_023205_add_title_to_gallery_submissions.php
index b8011b6fd8..a3a6651d64 100644
--- a/database/migrations/2020_09_19_023205_add_title_to_gallery_submissions.php
+++ b/database/migrations/2020_09_19_023205_add_title_to_gallery_submissions.php
@@ -1,18 +1,14 @@
 <?php
 
-use Illuminate\Support\Facades\Schema;
-use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
 
-class AddTitleToGallerySubmissions extends Migration
-{
+class AddTitleToGallerySubmissions extends Migration {
     /**
      * Run the migrations.
-     *
-     * @return void
      */
-    public function up()
-    {
+    public function up() {
         Schema::table('gallery_submissions', function (Blueprint $table) {
             //
             $table->string('title');
@@ -21,11 +17,8 @@ public function up()
 
     /**
      * Reverse the migrations.
-     *
-     * @return void
      */
-    public function down()
-    {
+    public function down() {
         Schema::table('gallery_submissions', function (Blueprint $table) {
             //
             $table->dropColumn('title');
diff --git a/database/migrations/2020_09_21_205840_transfer_reason.php b/database/migrations/2020_09_21_205840_transfer_reason.php
index 919a93565f..b004c3515b 100644
--- a/database/migrations/2020_09_21_205840_transfer_reason.php
+++ b/database/migrations/2020_09_21_205840_transfer_reason.php
@@ -1,18 +1,14 @@
 <?php
 
-use Illuminate\Support\Facades\Schema;
-use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
 
-class TransferReason extends Migration
-{
+class TransferReason extends Migration {
     /**
      * Run the migrations.
-     *
-     * @return void
      */
-    public function up()
-    {
+    public function up() {
         // Add columns
         Schema::table('character_transfers', function (Blueprint $table) {
             $table->string('user_reason', 200)->nullable($value = true);
@@ -21,11 +17,8 @@ public function up()
 
     /**
      * Reverse the migrations.
-     *
-     * @return void
      */
-    public function down()
-    {
+    public function down() {
         Schema::table('character_transfers', function (Blueprint $table) {
             //
             $table->dropColumn('user_reason');
diff --git a/database/migrations/2020_09_23_020953_set_gallery_submission_hash_nullable.php b/database/migrations/2020_09_23_020953_set_gallery_submission_hash_nullable.php
index 6cfe9705f3..aec1db55d4 100644
--- a/database/migrations/2020_09_23_020953_set_gallery_submission_hash_nullable.php
+++ b/database/migrations/2020_09_23_020953_set_gallery_submission_hash_nullable.php
@@ -1,18 +1,14 @@
 <?php
 
-use Illuminate\Support\Facades\Schema;
-use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
 
-class SetGallerySubmissionHashNullable extends Migration
-{
+class SetGallerySubmissionHashNullable extends Migration {
     /**
      * Run the migrations.
-     *
-     * @return void
      */
-    public function up()
-    {
+    public function up() {
         //
         Schema::table('gallery_submissions', function (Blueprint $table) {
             $table->dropColumn('hash');
@@ -27,11 +23,8 @@ public function up()
 
     /**
      * Reverse the migrations.
-     *
-     * @return void
      */
-    public function down()
-    {
+    public function down() {
         //
         Schema::table('gallery_submissions', function (Blueprint $table) {
             $table->dropColumn('hash');
diff --git a/database/migrations/2020_09_26_140543_add_gallery_favorites_table.php b/database/migrations/2020_09_26_140543_add_gallery_favorites_table.php
index 4a49ee5722..53e8959872 100644
--- a/database/migrations/2020_09_26_140543_add_gallery_favorites_table.php
+++ b/database/migrations/2020_09_26_140543_add_gallery_favorites_table.php
@@ -1,18 +1,14 @@
 <?php
 
-use Illuminate\Support\Facades\Schema;
-use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
 
-class AddGalleryFavoritesTable extends Migration
-{
+class AddGalleryFavoritesTable extends Migration {
     /**
      * Run the migrations.
-     *
-     * @return void
      */
-    public function up()
-    {
+    public function up() {
         //
         Schema::create('gallery_favorites', function (Blueprint $table) {
             $table->engine = 'InnoDB';
@@ -24,11 +20,8 @@ public function up()
 
     /**
      * Reverse the migrations.
-     *
-     * @return void
      */
-    public function down()
-    {
+    public function down() {
         //
         Schema::dropIfExists('gallery_favorites');
     }
diff --git a/database/migrations/2020_10_02_152241_add_staff_comments_to_gallery_submissions.php b/database/migrations/2020_10_02_152241_add_staff_comments_to_gallery_submissions.php
index 9047141683..120647fc93 100644
--- a/database/migrations/2020_10_02_152241_add_staff_comments_to_gallery_submissions.php
+++ b/database/migrations/2020_10_02_152241_add_staff_comments_to_gallery_submissions.php
@@ -1,18 +1,14 @@
 <?php
 
-use Illuminate\Support\Facades\Schema;
-use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
 
-class AddStaffCommentsToGallerySubmissions extends Migration
-{
+class AddStaffCommentsToGallerySubmissions extends Migration {
     /**
      * Run the migrations.
-     *
-     * @return void
      */
-    public function up()
-    {
+    public function up() {
         Schema::table('gallery_submissions', function (Blueprint $table) {
             //
             $table->text('staff_comments')->nullable();
@@ -23,11 +19,8 @@ public function up()
 
     /**
      * Reverse the migrations.
-     *
-     * @return void
      */
-    public function down()
-    {
+    public function down() {
         Schema::table('gallery_submissions', function (Blueprint $table) {
             //
             $table->dropColumn('staff_comments');
diff --git a/database/migrations/2020_10_03_170042_add_valued_status_to_gallery_submissions.php b/database/migrations/2020_10_03_170042_add_valued_status_to_gallery_submissions.php
index c18a7145eb..51d0ae6672 100644
--- a/database/migrations/2020_10_03_170042_add_valued_status_to_gallery_submissions.php
+++ b/database/migrations/2020_10_03_170042_add_valued_status_to_gallery_submissions.php
@@ -1,18 +1,14 @@
 <?php
 
-use Illuminate\Support\Facades\Schema;
-use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
 
-class AddValuedStatusToGallerySubmissions extends Migration
-{
+class AddValuedStatusToGallerySubmissions extends Migration {
     /**
      * Run the migrations.
-     *
-     * @return void
      */
-    public function up()
-    {
+    public function up() {
         Schema::table('gallery_submissions', function (Blueprint $table) {
             //
             $table->boolean('is_valued')->default(0);
@@ -21,11 +17,8 @@ public function up()
 
     /**
      * Reverse the migrations.
-     *
-     * @return void
      */
-    public function down()
-    {
+    public function down() {
         Schema::table('gallery_submissions', function (Blueprint $table) {
             //
             $table->dropColumn('is_valued');
diff --git a/database/migrations/2020_10_03_183104_add_type_to_gallery_submission_collaborators.php b/database/migrations/2020_10_03_183104_add_type_to_gallery_submission_collaborators.php
index 0ec52bd008..b17b65dd61 100644
--- a/database/migrations/2020_10_03_183104_add_type_to_gallery_submission_collaborators.php
+++ b/database/migrations/2020_10_03_183104_add_type_to_gallery_submission_collaborators.php
@@ -1,18 +1,14 @@
 <?php
 
-use Illuminate\Support\Facades\Schema;
-use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
 
-class AddTypeToGallerySubmissionCollaborators extends Migration
-{
+class AddTypeToGallerySubmissionCollaborators extends Migration {
     /**
      * Run the migrations.
-     *
-     * @return void
      */
-    public function up()
-    {
+    public function up() {
         Schema::table('gallery_submission_collaborators', function (Blueprint $table) {
             //
             $table->enum('type', ['Collab', 'Trade', 'Gift', 'Comm', 'Comm (Currency)'])->nullable()->default('Collab');
@@ -21,11 +17,8 @@ public function up()
 
     /**
      * Reverse the migrations.
-     *
-     * @return void
      */
-    public function down()
-    {
+    public function down() {
         Schema::table('gallery_submission_collaborators', function (Blueprint $table) {
             //
             $table->dropColumn('type');
diff --git a/database/migrations/2020_10_03_211413_add_prefix_to_prompts.php b/database/migrations/2020_10_03_211413_add_prefix_to_prompts.php
index e91cdb3196..c039033581 100644
--- a/database/migrations/2020_10_03_211413_add_prefix_to_prompts.php
+++ b/database/migrations/2020_10_03_211413_add_prefix_to_prompts.php
@@ -1,18 +1,14 @@
 <?php
 
-use Illuminate\Support\Facades\Schema;
-use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
 
-class AddPrefixToPrompts extends Migration
-{
+class AddPrefixToPrompts extends Migration {
     /**
      * Run the migrations.
-     *
-     * @return void
      */
-    public function up()
-    {
+    public function up() {
         Schema::table('prompts', function (Blueprint $table) {
             //
             $table->string('prefix', 10)->nullable();
@@ -21,11 +17,8 @@ public function up()
 
     /**
      * Reverse the migrations.
-     *
-     * @return void
      */
-    public function down()
-    {
+    public function down() {
         Schema::table('prompts', function (Blueprint $table) {
             //
             $table->dropColumn('prefix');
diff --git a/database/migrations/2020_10_05_180536_raise_currencies_log_log_character_limit.php b/database/migrations/2020_10_05_180536_raise_currencies_log_log_character_limit.php
index 9cbee272ad..81229be458 100644
--- a/database/migrations/2020_10_05_180536_raise_currencies_log_log_character_limit.php
+++ b/database/migrations/2020_10_05_180536_raise_currencies_log_log_character_limit.php
@@ -1,18 +1,14 @@
 <?php
 
-use Illuminate\Support\Facades\Schema;
-use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
 
-class RaiseCurrenciesLogLogCharacterLimit extends Migration
-{
+class RaiseCurrenciesLogLogCharacterLimit extends Migration {
     /**
      * Run the migrations.
-     *
-     * @return void
      */
-    public function up()
-    {
+    public function up() {
         //
         Schema::table('currecies_log', function (Blueprint $table) {
             DB::statement('ALTER TABLE currencies_log MODIFY COLUMN log VARCHAR(255)');
@@ -21,11 +17,8 @@ public function up()
 
     /**
      * Reverse the migrations.
-     *
-     * @return void
      */
-    public function down()
-    {
+    public function down() {
         //
         Schema::table('currencies_log', function (Blueprint $table) {
             DB::statement('ALTER TABLE currencies_log MODIFY COLUMN log VARCHAR(191)');
diff --git a/database/migrations/2020_10_08_081102_add_sub_masterlist.php b/database/migrations/2020_10_08_081102_add_sub_masterlist.php
index 6fe3a0a185..8b513981f2 100644
--- a/database/migrations/2020_10_08_081102_add_sub_masterlist.php
+++ b/database/migrations/2020_10_08_081102_add_sub_masterlist.php
@@ -1,18 +1,14 @@
 <?php
 
-use Illuminate\Support\Facades\Schema;
-use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
 
-class AddSubMasterlist extends Migration
-{
+class AddSubMasterlist extends Migration {
     /**
      * Run the migrations.
-     *
-     * @return void
      */
-    public function up()
-    {
+    public function up() {
         Schema::table('character_categories', function (Blueprint $table) {
             //adds a setting on character categories which moves those characters to a second masterlist
             //this allows for an NPC masterlist, or a PET masterlist, or a MNT (mount) masterlist
@@ -40,16 +36,13 @@ public function up()
 
     /**
      * Reverse the migrations.
-     *
-     * @return void
      */
-    public function down()
-    {
+    public function down() {
         Schema::table('character_categories', function (Blueprint $table) {
             //
             $table->dropColumn('masterlist_sub_id');
         });
-        
+
         Schema::table('specieses', function (Blueprint $table) {
             //
             $table->dropColumn('masterlist_sub_id');
@@ -58,4 +51,4 @@ public function down()
         //
         Schema::dropIfExists('masterlist_sub');
     }
-}
\ No newline at end of file
+}
diff --git a/database/migrations/2020_10_15_143857_add_user_reports.php b/database/migrations/2020_10_15_143857_add_user_reports.php
index 25ed7df7b5..ac25989452 100644
--- a/database/migrations/2020_10_15_143857_add_user_reports.php
+++ b/database/migrations/2020_10_15_143857_add_user_reports.php
@@ -1,18 +1,14 @@
 <?php
 
-use Illuminate\Support\Facades\Schema;
-use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
 
-class AddUserReports extends Migration
-{
+class AddUserReports extends Migration {
     /**
      * Run the migrations.
-     *
-     * @return void
      */
-    public function up()
-    { 
+    public function up() {
         Schema::create('reports', function (Blueprint $table) {
             $table->engine = 'InnoDB';
             $table->increments('id');
@@ -28,18 +24,15 @@ public function up()
             $table->string('data', 512)->nullable()->default(null);
 
             $table->enum('status', ['Pending', 'Assigned', 'Closed'])->default('Pending');
-            
+
             $table->timestamps();
         });
     }
 
     /**
      * Reverse the migrations.
-     *
-     * @return void
      */
-    public function down()
-    {
+    public function down() {
         Schema::dropIfExists('reports');
     }
 }
diff --git a/database/migrations/2020_10_15_185536_add_bug_report_option.php b/database/migrations/2020_10_15_185536_add_bug_report_option.php
index 3bd9f3b2a9..f90ece9325 100644
--- a/database/migrations/2020_10_15_185536_add_bug_report_option.php
+++ b/database/migrations/2020_10_15_185536_add_bug_report_option.php
@@ -1,18 +1,14 @@
 <?php
 
-use Illuminate\Support\Facades\Schema;
-use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
 
-class AddBugReportOption extends Migration
-{
+class AddBugReportOption extends Migration {
     /**
      * Run the migrations.
-     *
-     * @return void
      */
-    public function up()
-    {
+    public function up() {
         //
         Schema::table('reports', function (Blueprint $table) {
             $table->boolean('is_br')->default(0);
@@ -22,11 +18,8 @@ public function up()
 
     /**
      * Reverse the migrations.
-     *
-     * @return void
      */
-    public function down()
-    {
+    public function down() {
         //
         Schema::table('reports', function (Blueprint $table) {
             $table->dropColumn('is_br');
diff --git a/database/migrations/2020_10_19_144506_add_type_to_comments.php b/database/migrations/2020_10_19_144506_add_type_to_comments.php
index ca20750c03..0b458538f4 100644
--- a/database/migrations/2020_10_19_144506_add_type_to_comments.php
+++ b/database/migrations/2020_10_19_144506_add_type_to_comments.php
@@ -1,31 +1,24 @@
 <?php
 
-use Illuminate\Support\Facades\Schema;
-use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
 
-class AddTypeToComments extends Migration
-{
+class AddTypeToComments extends Migration {
     /**
      * Run the migrations.
-     *
-     * @return void
      */
-    public function up()
-    {
+    public function up() {
         Schema::table('comments', function (Blueprint $table) {
             //
-            $table->string('type')->default("User-User");
+            $table->string('type')->default('User-User');
         });
     }
 
     /**
      * Reverse the migrations.
-     *
-     * @return void
      */
-    public function down()
-    {
+    public function down() {
         Schema::table('comments', function (Blueprint $table) {
             //
             $table->dropColumn('type');
diff --git a/database/migrations/2020_10_30_011826_add_content_warning_to_gallery_submissions.php b/database/migrations/2020_10_30_011826_add_content_warning_to_gallery_submissions.php
index 60b631424f..afa59d78d9 100644
--- a/database/migrations/2020_10_30_011826_add_content_warning_to_gallery_submissions.php
+++ b/database/migrations/2020_10_30_011826_add_content_warning_to_gallery_submissions.php
@@ -1,18 +1,14 @@
 <?php
 
-use Illuminate\Support\Facades\Schema;
-use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
 
-class AddContentWarningToGallerySubmissions extends Migration
-{
+class AddContentWarningToGallerySubmissions extends Migration {
     /**
      * Run the migrations.
-     *
-     * @return void
      */
-    public function up()
-    {
+    public function up() {
         Schema::table('gallery_submissions', function (Blueprint $table) {
             //
             $table->string('content_warning', 255)->nullable();
@@ -21,11 +17,8 @@ public function up()
 
     /**
      * Reverse the migrations.
-     *
-     * @return void
      */
-    public function down()
-    {
+    public function down() {
         Schema::table('gallery_submissions', function (Blueprint $table) {
             //
             $table->dropColumn('content_warning');
diff --git a/database/migrations/2020_10_30_170108_add_gift_writing_status_to_characters.php b/database/migrations/2020_10_30_170108_add_gift_writing_status_to_characters.php
deleted file mode 100644
index 85e4c246f5..0000000000
--- a/database/migrations/2020_10_30_170108_add_gift_writing_status_to_characters.php
+++ /dev/null
@@ -1,44 +0,0 @@
-<?php
-
-use Illuminate\Support\Facades\Schema;
-use Illuminate\Database\Schema\Blueprint;
-use Illuminate\Database\Migrations\Migration;
-
-class AddGiftWritingStatusToCharacters extends Migration
-{
-    /**
-     * Run the migrations.
-     *
-     * @return void
-     */
-    public function up()
-    {
-        Schema::table('characters', function (Blueprint $table) {
-            //
-            $table->boolean('is_gift_writing_allowed')->default(0);
-        });
-
-        Schema::table('character_bookmarks', function (Blueprint $table) {
-            //
-            $table->boolean('notify_on_gift_writing_status')->default(0);
-        });
-    }
-
-    /**
-     * Reverse the migrations.
-     *
-     * @return void
-     */
-    public function down()
-    {
-        Schema::table('characters', function (Blueprint $table) {
-            //
-            $table->dropColumn('is_gift_writing_allowed');
-        });
-
-        Schema::table('character_bookmarks', function (Blueprint $table) {
-            //
-            $table->dropColumn('notify_on_gift_writing_status');
-        });
-    }
-}
diff --git a/database/migrations/2020_11_02_204925_add_delayed_comments_to_sales.php b/database/migrations/2020_11_02_204925_add_delayed_comments_to_sales.php
index 580a10f6f6..37ffa399e0 100644
--- a/database/migrations/2020_11_02_204925_add_delayed_comments_to_sales.php
+++ b/database/migrations/2020_11_02_204925_add_delayed_comments_to_sales.php
@@ -1,18 +1,14 @@
 <?php
 
-use Illuminate\Support\Facades\Schema;
-use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
 
-class AddDelayedCommentsToSales extends Migration
-{
+class AddDelayedCommentsToSales extends Migration {
     /**
      * Run the migrations.
-     *
-     * @return void
      */
-    public function up()
-    {
+    public function up() {
         Schema::table('sales', function (Blueprint $table) {
             $table->timestamp('comments_open_at')->nullable()->default(null);
             $table->boolean('is_open')->default(1);
@@ -21,11 +17,8 @@ public function up()
 
     /**
      * Reverse the migrations.
-     *
-     * @return void
      */
-    public function down()
-    {
+    public function down() {
         Schema::table('sales', function (Blueprint $table) {
             //
             $table->dropColumn('is_open');
diff --git a/database/migrations/2020_11_09_201534_add_user_id_to_character_image_creators.php b/database/migrations/2020_11_09_201534_add_user_id_to_character_image_creators.php
deleted file mode 100644
index 2cca305cd3..0000000000
--- a/database/migrations/2020_11_09_201534_add_user_id_to_character_image_creators.php
+++ /dev/null
@@ -1,34 +0,0 @@
-<?php
-
-use Illuminate\Support\Facades\Schema;
-use Illuminate\Database\Schema\Blueprint;
-use Illuminate\Database\Migrations\Migration;
-
-class AddUserIdToCharacterImageCreators extends Migration
-{
-    /**
-     * Run the migrations.
-     *
-     * @return void
-     */
-    public function up()
-    {
-        Schema::table('character_image_creators', function (Blueprint $table) {
-            //
-            $table->integer('user_id')->unsigned()->nullable();
-        });
-    }
-
-    /**
-     * Reverse the migrations.
-     *
-     * @return void
-     */
-    public function down()
-    {
-        Schema::table('character_image_creators', function (Blueprint $table) {
-            //
-            $table->dropColumn('user_id');
-        });
-    }
-}
diff --git a/database/migrations/2020_11_13_180553_create_aliases_table.php b/database/migrations/2020_11_13_180553_create_aliases_table.php
index a982a1caf9..76dd1620e2 100644
--- a/database/migrations/2020_11_13_180553_create_aliases_table.php
+++ b/database/migrations/2020_11_13_180553_create_aliases_table.php
@@ -1,18 +1,14 @@
 <?php
 
-use Illuminate\Support\Facades\Schema;
-use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
 
-class CreateAliasesTable extends Migration
-{
+class CreateAliasesTable extends Migration {
     /**
      * Run the migrations.
-     *
-     * @return void
      */
-    public function up()
-    {
+    public function up() {
         Schema::create('user_aliases', function (Blueprint $table) {
             $table->engine = 'InnoDB';
             $table->increments('id');
@@ -28,11 +24,8 @@ public function up()
 
     /**
      * Reverse the migrations.
-     *
-     * @return void
      */
-    public function down()
-    {
+    public function down() {
         Schema::dropIfExists('user_aliases');
     }
 }
diff --git a/database/migrations/2020_11_13_184820_add_has_alias_to_users_table.php b/database/migrations/2020_11_13_184820_add_has_alias_to_users_table.php
index e2bb0e3e0b..10d9db8a6f 100644
--- a/database/migrations/2020_11_13_184820_add_has_alias_to_users_table.php
+++ b/database/migrations/2020_11_13_184820_add_has_alias_to_users_table.php
@@ -1,18 +1,14 @@
 <?php
 
-use Illuminate\Support\Facades\Schema;
-use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
 
-class AddHasAliasToUsersTable extends Migration
-{
+class AddHasAliasToUsersTable extends Migration {
     /**
      * Run the migrations.
-     *
-     * @return void
      */
-    public function up()
-    {
+    public function up() {
         Schema::table('users', function (Blueprint $table) {
             //
             $table->boolean('has_alias')->default(0);
@@ -21,11 +17,8 @@ public function up()
 
     /**
      * Reverse the migrations.
-     *
-     * @return void
      */
-    public function down()
-    {
+    public function down() {
         Schema::table('users', function (Blueprint $table) {
             //
             $table->dropColumn('has_alias');
diff --git a/database/migrations/2020_11_17_001602_add_url_to_characters.php b/database/migrations/2020_11_17_001602_add_url_to_characters.php
index 736d7a52f7..4cda0e49ab 100644
--- a/database/migrations/2020_11_17_001602_add_url_to_characters.php
+++ b/database/migrations/2020_11_17_001602_add_url_to_characters.php
@@ -1,18 +1,14 @@
 <?php
 
-use Illuminate\Support\Facades\Schema;
-use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
 
-class AddUrlToCharacters extends Migration
-{
+class AddUrlToCharacters extends Migration {
     /**
      * Run the migrations.
-     *
-     * @return void
      */
-    public function up()
-    {        
+    public function up() {
         Schema::table('characters', function (Blueprint $table) {
             // Create a column to house owner URL
             $table->string('owner_url')->nullable()->default(null)->index();
@@ -26,11 +22,8 @@ public function up()
 
     /**
      * Reverse the migrations.
-     *
-     * @return void
      */
-    public function down()
-    {
+    public function down() {
         Schema::table('characters', function (Blueprint $table) {
             //
             $table->dropColumn('owner_url');
diff --git a/database/migrations/2020_11_17_181454_add_url_to_character_logs.php b/database/migrations/2020_11_17_181454_add_url_to_character_logs.php
index 0392f9a609..94528238eb 100644
--- a/database/migrations/2020_11_17_181454_add_url_to_character_logs.php
+++ b/database/migrations/2020_11_17_181454_add_url_to_character_logs.php
@@ -1,18 +1,14 @@
 <?php
 
-use Illuminate\Support\Facades\Schema;
-use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
 
-class AddUrlToCharacterLogs extends Migration
-{
+class AddUrlToCharacterLogs extends Migration {
     /**
      * Run the migrations.
-     *
-     * @return void
      */
-    public function up()
-    {
+    public function up() {
         Schema::table('character_log', function (Blueprint $table) {
             //
             $table->string('sender_url')->nullable()->default(null);
@@ -28,11 +24,8 @@ public function up()
 
     /**
      * Reverse the migrations.
-     *
-     * @return void
      */
-    public function down()
-    {
+    public function down() {
         Schema::table('character_log', function (Blueprint $table) {
             //
             $table->dropColumn('sender_url');
diff --git a/database/migrations/2020_11_18_011215_add_visibility_toggles_to_prompts.php b/database/migrations/2020_11_18_011215_add_visibility_toggles_to_prompts.php
index 3b6aa37bac..c919cef1d9 100644
--- a/database/migrations/2020_11_18_011215_add_visibility_toggles_to_prompts.php
+++ b/database/migrations/2020_11_18_011215_add_visibility_toggles_to_prompts.php
@@ -1,18 +1,14 @@
 <?php
 
-use Illuminate\Support\Facades\Schema;
-use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
 
-class AddVisibilityTogglesToPrompts extends Migration
-{
+class AddVisibilityTogglesToPrompts extends Migration {
     /**
      * Run the migrations.
-     *
-     * @return void
      */
-    public function up()
-    {
+    public function up() {
         Schema::table('prompts', function (Blueprint $table) {
             //
             $table->integer('hide_submissions')->unsigned()->default(0);
@@ -21,11 +17,8 @@ public function up()
 
     /**
      * Reverse the migrations.
-     *
-     * @return void
      */
-    public function down()
-    {
+    public function down() {
         Schema::table('prompts', function (Blueprint $table) {
             //
             $table->dropColumn('hide_submissions');
diff --git a/database/migrations/2020_11_23_152732_add_site_extensions_table.php b/database/migrations/2020_11_23_152732_add_site_extensions_table.php
index afc1cad73c..9bb904d952 100644
--- a/database/migrations/2020_11_23_152732_add_site_extensions_table.php
+++ b/database/migrations/2020_11_23_152732_add_site_extensions_table.php
@@ -1,18 +1,14 @@
 <?php
 
-use Illuminate\Support\Facades\Schema;
-use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
 
-class AddSiteExtensionsTable extends Migration
-{
+class AddSiteExtensionsTable extends Migration {
     /**
      * Run the migrations.
-     *
-     * @return void
      */
-    public function up()
-    {
+    public function up() {
         Schema::create('site_extensions', function (Blueprint $table) {
             $table->engine = 'InnoDB';
 
@@ -25,11 +21,8 @@ public function up()
 
     /**
      * Reverse the migrations.
-     *
-     * @return void
      */
-    public function down()
-    {
+    public function down() {
         Schema::dropIfExists('site_extensions');
     }
 }
diff --git a/database/migrations/2020_11_25_192234_add_artist_id_to_items.php b/database/migrations/2020_11_25_192234_add_artist_id_to_items.php
index 423756cd5d..bb165c9a75 100644
--- a/database/migrations/2020_11_25_192234_add_artist_id_to_items.php
+++ b/database/migrations/2020_11_25_192234_add_artist_id_to_items.php
@@ -1,18 +1,14 @@
 <?php
 
-use Illuminate\Support\Facades\Schema;
-use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
 
-class AddArtistIdToItems extends Migration
-{
+class AddArtistIdToItems extends Migration {
     /**
      * Run the migrations.
-     *
-     * @return void
      */
-    public function up()
-    {
+    public function up() {
         Schema::table('items', function (Blueprint $table) {
             //
             $table->integer('artist_id')->unsigned()->nullable();
@@ -21,11 +17,8 @@ public function up()
 
     /**
      * Reverse the migrations.
-     *
-     * @return void
      */
-    public function down()
-    {
+    public function down() {
         Schema::table('items', function (Blueprint $table) {
             //
             $table->dropColumn('artist_id');
diff --git a/database/migrations/2020_11_26_060832_make_submissions_url_nullable.php b/database/migrations/2020_11_26_060832_make_submissions_url_nullable.php
index dc5006b1ca..0e611f9e26 100644
--- a/database/migrations/2020_11_26_060832_make_submissions_url_nullable.php
+++ b/database/migrations/2020_11_26_060832_make_submissions_url_nullable.php
@@ -1,30 +1,20 @@
 <?php
 
-use Illuminate\Support\Facades\Schema;
-use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Database\Migrations\Migration;
 
-class MakeSubmissionsUrlNullable extends Migration
-{
+class MakeSubmissionsUrlNullable extends Migration {
     /**
      * Run the migrations.
-     *
-     * @return void
      */
-    public function up()
-    {
+    public function up() {
         //
         DB::statement('ALTER TABLE submissions CHANGE url url VARCHAR(200) NULL');
-
     }
 
     /**
      * Reverse the migrations.
-     *
-     * @return void
      */
-    public function down()
-    {
+    public function down() {
         //
         DB::statement('ALTER TABLE submissions CHANGE url url VARCHAR(200)');
     }
diff --git a/database/migrations/2020_12_04_181214_add_scheduling_to_galleries.php b/database/migrations/2020_12_04_181214_add_scheduling_to_galleries.php
index b23587e0d9..367de1edec 100644
--- a/database/migrations/2020_12_04_181214_add_scheduling_to_galleries.php
+++ b/database/migrations/2020_12_04_181214_add_scheduling_to_galleries.php
@@ -1,18 +1,14 @@
 <?php
 
-use Illuminate\Support\Facades\Schema;
-use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
 
-class AddSchedulingToGalleries extends Migration
-{
+class AddSchedulingToGalleries extends Migration {
     /**
      * Run the migrations.
-     *
-     * @return void
      */
-    public function up()
-    {
+    public function up() {
         Schema::table('galleries', function (Blueprint $table) {
             //
             $table->timestamp('start_at')->nullable()->default(null);
@@ -23,11 +19,8 @@ public function up()
 
     /**
      * Reverse the migrations.
-     *
-     * @return void
      */
-    public function down()
-    {
+    public function down() {
         Schema::table('galleries', function (Blueprint $table) {
             //
             $table->dropColumn('start_at');
diff --git a/database/migrations/2020_12_05_165316_index_gallery_tables.php b/database/migrations/2020_12_05_165316_index_gallery_tables.php
index e23ddf263e..24bf9d1ce5 100644
--- a/database/migrations/2020_12_05_165316_index_gallery_tables.php
+++ b/database/migrations/2020_12_05_165316_index_gallery_tables.php
@@ -1,18 +1,14 @@
 <?php
 
-use Illuminate\Support\Facades\Schema;
-use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
 
-class IndexGalleryTables extends Migration
-{
+class IndexGalleryTables extends Migration {
     /**
      * Run the migrations.
-     *
-     * @return void
      */
-    public function up()
-    {
+    public function up() {
         //
         Schema::table('galleries', function (Blueprint $table) {
             //
@@ -28,11 +24,8 @@ public function up()
 
     /**
      * Reverse the migrations.
-     *
-     * @return void
      */
-    public function down()
-    {
+    public function down() {
         //
         Schema::table('galleries', function (Blueprint $table) {
             //
diff --git a/database/migrations/2021_01_08_230640_add_released_to_items.php b/database/migrations/2021_01_08_230640_add_released_to_items.php
index 8905059608..ec02f97dd3 100644
--- a/database/migrations/2021_01_08_230640_add_released_to_items.php
+++ b/database/migrations/2021_01_08_230640_add_released_to_items.php
@@ -4,15 +4,11 @@
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
 
-class AddReleasedToItems extends Migration
-{
+class AddReleasedToItems extends Migration {
     /**
      * Run the migrations.
-     *
-     * @return void
      */
-    public function up()
-    {
+    public function up() {
         Schema::table('items', function (Blueprint $table) {
             //
             $table->boolean('is_released')->default(1);
@@ -21,11 +17,8 @@ public function up()
 
     /**
      * Reverse the migrations.
-     *
-     * @return void
      */
-    public function down()
-    {
+    public function down() {
         Schema::table('items', function (Blueprint $table) {
             //
             $table->dropColumn('is_released');
diff --git a/database/migrations/2021_01_15_012947_add_select_prompt_to_galleries.php b/database/migrations/2021_01_15_012947_add_select_prompt_to_galleries.php
index 7fa47f2683..e13f4b2bc2 100644
--- a/database/migrations/2021_01_15_012947_add_select_prompt_to_galleries.php
+++ b/database/migrations/2021_01_15_012947_add_select_prompt_to_galleries.php
@@ -4,15 +4,11 @@
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
 
-class AddSelectPromptToGalleries extends Migration
-{
+class AddSelectPromptToGalleries extends Migration {
     /**
      * Run the migrations.
-     *
-     * @return void
      */
-    public function up()
-    {
+    public function up() {
         Schema::table('galleries', function (Blueprint $table) {
             //
             $table->boolean('prompt_selection')->default(0);
@@ -21,11 +17,8 @@ public function up()
 
     /**
      * Reverse the migrations.
-     *
-     * @return void
      */
-    public function down()
-    {
+    public function down() {
         Schema::table('galleries', function (Blueprint $table) {
             //
             $table->dropColumn('prompt_selection');
diff --git a/database/migrations/2021_02_14_231530_change_character_value_to_decimal.php b/database/migrations/2021_02_14_231530_change_character_value_to_decimal.php
index 04498f91d9..0f7de60dfb 100644
--- a/database/migrations/2021_02_14_231530_change_character_value_to_decimal.php
+++ b/database/migrations/2021_02_14_231530_change_character_value_to_decimal.php
@@ -4,15 +4,11 @@
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
 
-class ChangeCharacterValueToDecimal extends Migration
-{
+class ChangeCharacterValueToDecimal extends Migration {
     /**
      * Run the migrations.
-     *
-     * @return void
      */
-    public function up()
-    {
+    public function up() {
         Schema::table('characters', function (Blueprint $table) {
             $table->decimal('sale_value', 13, 2)->default(0.00)->change();
         });
@@ -20,11 +16,8 @@ public function up()
 
     /**
      * Reverse the migrations.
-     *
-     * @return void
      */
-    public function down()
-    {
+    public function down() {
         Schema::table('characters', function (Blueprint $table) {
             $table->integer('sale_value')->nullable(false)->default(0)->change();
         });
diff --git a/database/migrations/2021_03_28_172111_add_item_category_info_to_loots.php b/database/migrations/2021_03_28_172111_add_item_category_info_to_loots.php
index 9b510fa942..668c23e20d 100644
--- a/database/migrations/2021_03_28_172111_add_item_category_info_to_loots.php
+++ b/database/migrations/2021_03_28_172111_add_item_category_info_to_loots.php
@@ -4,15 +4,11 @@
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
 
-class AddItemCategoryInfoToLoots extends Migration
-{
+class AddItemCategoryInfoToLoots extends Migration {
     /**
      * Run the migrations.
-     *
-     * @return void
      */
-    public function up()
-    {
+    public function up() {
         Schema::table('loots', function (Blueprint $table) {
             //
             $table->string('data')->nullable()->default(null);
@@ -21,11 +17,8 @@ public function up()
 
     /**
      * Reverse the migrations.
-     *
-     * @return void
      */
-    public function down()
-    {
+    public function down() {
         Schema::table('loots', function (Blueprint $table) {
             //
             $table->dropColumn('data');
diff --git a/database/migrations/2021_04_22_230225_create_sales_characters.php b/database/migrations/2021_04_22_230225_create_sales_characters.php
index bc5b46d488..652f3937a0 100644
--- a/database/migrations/2021_04_22_230225_create_sales_characters.php
+++ b/database/migrations/2021_04_22_230225_create_sales_characters.php
@@ -4,15 +4,11 @@
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
 
-class CreateSalesCharacters extends Migration
-{
+class CreateSalesCharacters extends Migration {
     /**
      * Run the migrations.
-     *
-     * @return void
      */
-    public function up()
-    {
+    public function up() {
         Schema::create('sales_characters', function (Blueprint $table) {
             $table->engine = 'InnoDB';
             $table->increments('id');
@@ -33,11 +29,8 @@ public function up()
 
     /**
      * Reverse the migrations.
-     *
-     * @return void
      */
-    public function down()
-    {
+    public function down() {
         Schema::dropIfExists('sales_characters');
     }
 }
diff --git a/database/migrations/2021_04_29_175640_add_user_birthday.php b/database/migrations/2021_04_29_175640_add_user_birthday.php
index 8f0067c5d1..5e35edb713 100644
--- a/database/migrations/2021_04_29_175640_add_user_birthday.php
+++ b/database/migrations/2021_04_29_175640_add_user_birthday.php
@@ -4,38 +4,31 @@
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
 
-class AddUserBirthday extends Migration
-{
+class AddUserBirthday extends Migration {
     /**
      * Run the migrations.
-     *
-     * @return void
      */
-    public function up()
-    {
+    public function up() {
         //
-        Schema::table('users', function(Blueprint $table) {
+        Schema::table('users', function (Blueprint $table) {
             $table->timestamp('birthday')->nullable()->default(null);
         });
 
-        Schema::table('user_settings', function(Blueprint $table) {
+        Schema::table('user_settings', function (Blueprint $table) {
             $table->tinyInteger('birthday_setting')->default(0);
         });
     }
 
     /**
      * Reverse the migrations.
-     *
-     * @return void
      */
-    public function down()
-    {
+    public function down() {
         //
-        Schema::table('users', function(Blueprint $table) {
+        Schema::table('users', function (Blueprint $table) {
             $table->dropColumn('birthday');
         });
 
-        Schema::table('user_settings', function(Blueprint $table) {
+        Schema::table('user_settings', function (Blueprint $table) {
             $table->dropcolumn('birthday_setting');
         });
     }
diff --git a/database/migrations/2021_05_19_123518_change_birthday_column_type.php b/database/migrations/2021_05_19_123518_change_birthday_column_type.php
index 7fdaf8f310..5f79666d22 100644
--- a/database/migrations/2021_05_19_123518_change_birthday_column_type.php
+++ b/database/migrations/2021_05_19_123518_change_birthday_column_type.php
@@ -4,30 +4,23 @@
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
 
-class ChangeBirthdayColumnType extends Migration
-{
+class ChangeBirthdayColumnType extends Migration {
     /**
      * Run the migrations.
-     *
-     * @return void
      */
-    public function up()
-    {
+    public function up() {
         //
-        Schema::table('users', function(Blueprint $table) {
+        Schema::table('users', function (Blueprint $table) {
             $table->datetime('birthday')->default(null)->change();
         });
     }
 
     /**
      * Reverse the migrations.
-     *
-     * @return void
      */
-    public function down()
-    {
+    public function down() {
         //#
-        Schema::table('users', function(Blueprint $table) {
+        Schema::table('users', function (Blueprint $table) {
             $table->timestamp('birthday')->default(null)->change();
         });
     }
diff --git a/database/migrations/2021_07_21_103622_create_admin_log_table.php b/database/migrations/2021_07_21_103622_create_admin_log_table.php
new file mode 100644
index 0000000000..94f5a84634
--- /dev/null
+++ b/database/migrations/2021_07_21_103622_create_admin_log_table.php
@@ -0,0 +1,27 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+class CreateAdminLogTable extends Migration {
+    /**
+     * Run the migrations.
+     */
+    public function up() {
+        Schema::create('admin_log', function (Blueprint $table) {
+            $table->id();
+            $table->integer('user_id');
+            $table->string('action');
+            $table->text('action_details');
+            $table->timestamps();
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     */
+    public function down() {
+        Schema::dropIfExists('admin_log');
+    }
+}
diff --git a/database/migrations/2021_09_29_222559_add_ticket_cap_to_raffles.php b/database/migrations/2021_09_29_222559_add_ticket_cap_to_raffles.php
new file mode 100644
index 0000000000..b0f6e2dc61
--- /dev/null
+++ b/database/migrations/2021_09_29_222559_add_ticket_cap_to_raffles.php
@@ -0,0 +1,27 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+class AddTicketCapToRaffles extends Migration {
+    /**
+     * Run the migrations.
+     */
+    public function up() {
+        Schema::table('raffles', function (Blueprint $table) {
+            //
+            $table->integer('ticket_cap')->nullable()->default(null);
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     */
+    public function down() {
+        Schema::table('raffles', function (Blueprint $table) {
+            //
+            $table->dropColumn('ticket_cap');
+        });
+    }
+}
diff --git a/database/migrations/2022_02_18_172555_create_staff_actions_table.php b/database/migrations/2022_02_18_172555_create_staff_actions_table.php
new file mode 100644
index 0000000000..41c1ae7eb8
--- /dev/null
+++ b/database/migrations/2022_02_18_172555_create_staff_actions_table.php
@@ -0,0 +1,28 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+class CreateStaffActionsTable extends Migration {
+    /**
+     * Run the migrations.
+     */
+    public function up() {
+        Schema::create('staff_actions', function (Blueprint $table) {
+            $table->engine = 'InnoDB';
+
+            $table->string('key', 50)->unique()->primary();
+            $table->string('name')->nullable()->default(null);
+            $table->string('description')->nullable()->default(null);
+            $table->integer('value')->default(1);
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     */
+    public function down() {
+        Schema::dropIfExists('staff_actions');
+    }
+}
diff --git a/database/migrations/2020_03_23_075539_add_images_to_prompts.php b/database/migrations/2022_02_19_014311_add_admin_only_to_prompts.php
similarity index 61%
rename from database/migrations/2020_03_23_075539_add_images_to_prompts.php
rename to database/migrations/2022_02_19_014311_add_admin_only_to_prompts.php
index 3e07d4a3aa..879ba23934 100644
--- a/database/migrations/2020_03_23_075539_add_images_to_prompts.php
+++ b/database/migrations/2022_02_19_014311_add_admin_only_to_prompts.php
@@ -1,34 +1,27 @@
 <?php
 
-use Illuminate\Support\Facades\Schema;
-use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
 
-class AddImagesToPrompts extends Migration
-{
+class AddAdminOnlyToPrompts extends Migration {
     /**
      * Run the migrations.
-     *
-     * @return void
      */
-    public function up()
-    {
+    public function up() {
         Schema::table('prompts', function (Blueprint $table) {
             //
-            $table->boolean('has_image')->default(0);
+            $table->boolean('staff_only')->default(0);
         });
     }
 
     /**
      * Reverse the migrations.
-     *
-     * @return void
      */
-    public function down()
-    {
+    public function down() {
         Schema::table('prompts', function (Blueprint $table) {
             //
-            $table->dropColumn('has_image');
+            $table->dropColumn('staff_only');
         });
     }
 }
diff --git a/database/migrations/2022_02_22_130513_raise_currencies_log_character_limit_again.php b/database/migrations/2022_02_22_130513_raise_currencies_log_character_limit_again.php
new file mode 100644
index 0000000000..fad9a8c42e
--- /dev/null
+++ b/database/migrations/2022_02_22_130513_raise_currencies_log_character_limit_again.php
@@ -0,0 +1,27 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+class RaiseCurrenciesLogCharacterLimitAgain extends Migration {
+    /**
+     * Run the migrations.
+     */
+    public function up() {
+        //
+        Schema::table('currecies_log', function (Blueprint $table) {
+            DB::statement('ALTER TABLE currencies_log MODIFY COLUMN log VARCHAR(512)');
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     */
+    public function down() {
+        //
+        Schema::table('currencies_log', function (Blueprint $table) {
+            DB::statement('ALTER TABLE currencies_log MODIFY COLUMN log VARCHAR(255)');
+        });
+    }
+}
diff --git a/database/migrations/2022_04_06_160312_add_disabled_to_users_table.php b/database/migrations/2022_04_06_160312_add_disabled_to_users_table.php
new file mode 100644
index 0000000000..f3f18b3c2a
--- /dev/null
+++ b/database/migrations/2022_04_06_160312_add_disabled_to_users_table.php
@@ -0,0 +1,35 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+class AddDisabledToUsersTable extends Migration {
+    /**
+     * Run the migrations.
+     */
+    public function up() {
+        Schema::table('users', function (Blueprint $table) {
+            $table->boolean('is_deactivated')->default(0);
+            $table->integer('deactivater_id')->unsigned()->index()->nullable()->default(null);
+        });
+        Schema::table('user_settings', function (Blueprint $table) {
+            $table->timestamp('deactivated_at')->nullable()->default(null);
+            $table->text('deactivate_reason')->nullable()->default(null);
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     */
+    public function down() {
+        Schema::table('users', function (Blueprint $table) {
+            $table->dropcolumn('is_deactivated');
+            $table->dropcolumn('deactivater_id');
+        });
+        Schema::table('user_settings', function (Blueprint $table) {
+            $table->dropColumn('deactivate_reason');
+            $table->dropColumn('deactivated_at');
+        });
+    }
+}
diff --git a/database/migrations/2022_05_27_154059_add_likes_to_comments.php b/database/migrations/2022_05_27_154059_add_likes_to_comments.php
new file mode 100644
index 0000000000..ad747a4fac
--- /dev/null
+++ b/database/migrations/2022_05_27_154059_add_likes_to_comments.php
@@ -0,0 +1,34 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+class AddLikesToComments extends Migration {
+    /**
+     * Run the migrations.
+     */
+    public function up() {
+        Schema::table('site_pages', function (Blueprint $table) {
+            $table->integer('allow_dislikes')->default(0);
+        });
+
+        Schema::create('comment_likes', function (Blueprint $table) {
+            //
+            $table->integer('user_id')->unsigned();
+            $table->integer('comment_id')->unsigned();
+            $table->boolean('is_like')->default(true);
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     */
+    public function down() {
+        Schema::table('site_pages', function (Blueprint $table) {
+            $table->dropColumn('allow_dislikes');
+        });
+
+        Schema::dropIfExists('comment_likes');
+    }
+}
diff --git a/database/migrations/2022_08_29_134622_add_is_visible_to_features.php b/database/migrations/2022_08_29_134622_add_is_visible_to_features.php
new file mode 100644
index 0000000000..c1c8ceab21
--- /dev/null
+++ b/database/migrations/2022_08_29_134622_add_is_visible_to_features.php
@@ -0,0 +1,27 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+class AddIsVisibleToFeatures extends Migration {
+    /**
+     * Run the migrations.
+     */
+    public function up() {
+        Schema::table('features', function (Blueprint $table) {
+            //
+            $table->boolean('is_visible')->default(1);
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     */
+    public function down() {
+        Schema::table('features', function (Blueprint $table) {
+            //
+            $table->dropColumn('is_visible');
+        });
+    }
+}
diff --git a/database/migrations/2022_12_15_000150_add_extra_data_to_user_aliases.php b/database/migrations/2022_12_15_000150_add_extra_data_to_user_aliases.php
new file mode 100644
index 0000000000..f9015a2bc2
--- /dev/null
+++ b/database/migrations/2022_12_15_000150_add_extra_data_to_user_aliases.php
@@ -0,0 +1,36 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+class AddExtraDataToUserAliases extends Migration {
+    /**
+     * Run the migrations.
+     */
+    public function up() {
+        Schema::table('user_aliases', function (Blueprint $table) {
+            $table->string('user_snowflake')->nullable()->default(null);
+        });
+
+        Schema::table('users', function (Blueprint $table) {
+            // Making email and password nullable
+            $table->string('email')->nullable()->change();
+            $table->string('password')->nullable()->change();
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     */
+    public function down() {
+        Schema::table('user_aliases', function (Blueprint $table) {
+            $table->dropColumn('user_snowflake');
+        });
+
+        Schema::table('users', function (Blueprint $table) {
+            $table->string('email')->nullable(false)->change();
+            $table->string('password')->nullable(false)->change();
+        });
+    }
+}
diff --git a/database/migrations/2022_12_22_205505_add_is_visible_to_specieses.php b/database/migrations/2022_12_22_205505_add_is_visible_to_specieses.php
new file mode 100644
index 0000000000..58522196ec
--- /dev/null
+++ b/database/migrations/2022_12_22_205505_add_is_visible_to_specieses.php
@@ -0,0 +1,27 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+class AddIsVisibleToSpecieses extends Migration {
+    /**
+     * Run the migrations.
+     */
+    public function up() {
+        Schema::table('specieses', function (Blueprint $table) {
+            //
+            $table->boolean('is_visible')->default(1);
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     */
+    public function down() {
+        Schema::table('specieses', function (Blueprint $table) {
+            //
+            $table->dropColumn('is_visible');
+        });
+    }
+}
diff --git a/database/migrations/2023_01_02_182149_add_draft_to_submissions_table.php b/database/migrations/2023_01_02_182149_add_draft_to_submissions_table.php
new file mode 100644
index 0000000000..bc3fe7d79a
--- /dev/null
+++ b/database/migrations/2023_01_02_182149_add_draft_to_submissions_table.php
@@ -0,0 +1,23 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+class AddDraftToSubmissionsTable extends Migration {
+    /**
+     * Run the migrations.
+     */
+    public function up() {
+        DB::statement('ALTER TABLE submissions modify status enum( "Draft", "Pending", "Approved", "Rejected" )');
+    }
+
+    /**
+     * Reverse the migrations.
+     */
+    public function down() {
+        Schema::table('submissions', function (Blueprint $table) {
+            DB::statement('ALTER TABLE submissions modify status enum( "Pending", "Approved", "Rejected" )');
+        });
+    }
+}
diff --git a/database/migrations/2023_01_13_175257_add_is_visible_to_subtypes.php b/database/migrations/2023_01_13_175257_add_is_visible_to_subtypes.php
new file mode 100644
index 0000000000..bd26e3a458
--- /dev/null
+++ b/database/migrations/2023_01_13_175257_add_is_visible_to_subtypes.php
@@ -0,0 +1,27 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+class AddIsVisibleToSubtypes extends Migration {
+    /**
+     * Run the migrations.
+     */
+    public function up() {
+        Schema::table('subtypes', function (Blueprint $table) {
+            //
+            $table->boolean('is_visible')->default(1);
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     */
+    public function down() {
+        Schema::table('subtypes', function (Blueprint $table) {
+            //
+            $table->dropColumn('is_visible');
+        });
+    }
+}
diff --git a/database/migrations/2023_05_19_052915_add_is_visible_to_character_categories.php b/database/migrations/2023_05_19_052915_add_is_visible_to_character_categories.php
new file mode 100644
index 0000000000..d8c0d55fed
--- /dev/null
+++ b/database/migrations/2023_05_19_052915_add_is_visible_to_character_categories.php
@@ -0,0 +1,25 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+class AddIsVisibleToCharacterCategories extends Migration {
+    /**
+     * Run the migrations.
+     */
+    public function up() {
+        Schema::table('character_categories', function (Blueprint $table) {
+            $table->boolean('is_visible')->default(1);
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     */
+    public function down() {
+        Schema::table('character_categories', function (Blueprint $table) {
+            $table->dropColumn('is_visible');
+        });
+    }
+}
diff --git a/database/migrations/2023_05_19_052922_add_is_visible_to_feature_categories.php b/database/migrations/2023_05_19_052922_add_is_visible_to_feature_categories.php
new file mode 100644
index 0000000000..c48067065b
--- /dev/null
+++ b/database/migrations/2023_05_19_052922_add_is_visible_to_feature_categories.php
@@ -0,0 +1,25 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+class AddIsVisibleToFeatureCategories extends Migration {
+    /**
+     * Run the migrations.
+     */
+    public function up() {
+        Schema::table('feature_categories', function (Blueprint $table) {
+            $table->boolean('is_visible')->default(1);
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     */
+    public function down() {
+        Schema::table('feature_categories', function (Blueprint $table) {
+            $table->dropColumn('is_visible');
+        });
+    }
+}
diff --git a/database/migrations/2019_04_14_120732_add_image_to_item_categories.php b/database/migrations/2023_05_19_052929_add_is_visible_to_item_categories.php
similarity index 54%
rename from database/migrations/2019_04_14_120732_add_image_to_item_categories.php
rename to database/migrations/2023_05_19_052929_add_is_visible_to_item_categories.php
index b21521c233..97533886ad 100644
--- a/database/migrations/2019_04_14_120732_add_image_to_item_categories.php
+++ b/database/migrations/2023_05_19_052929_add_is_visible_to_item_categories.php
@@ -1,34 +1,25 @@
 <?php
 
-use Illuminate\Support\Facades\Schema;
-use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
 
-class AddImageToItemCategories extends Migration
-{
+class AddIsVisibleToItemCategories extends Migration {
     /**
      * Run the migrations.
-     *
-     * @return void
      */
-    public function up()
-    {
+    public function up() {
         Schema::table('item_categories', function (Blueprint $table) {
-            // Adding for the sake of symmetry...
-            $table->boolean('has_image')->default(0);
+            $table->boolean('is_visible')->default(1);
         });
     }
 
     /**
      * Reverse the migrations.
-     *
-     * @return void
      */
-    public function down()
-    {
+    public function down() {
         Schema::table('item_categories', function (Blueprint $table) {
-            //
-            $table->dropColumn('has_image');
+            $table->dropColumn('is_visible');
         });
     }
 }
diff --git a/database/migrations/2023_06_04_174355_add_image_id_to_sales_characters.php b/database/migrations/2023_06_04_174355_add_image_id_to_sales_characters.php
new file mode 100644
index 0000000000..b9c819d071
--- /dev/null
+++ b/database/migrations/2023_06_04_174355_add_image_id_to_sales_characters.php
@@ -0,0 +1,25 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+return new class extends Migration {
+    /**
+     * Run the migrations.
+     */
+    public function up() {
+        Schema::table('sales_characters', function (Blueprint $table) {
+            $table->integer('image_id')->unsigned()->index();
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     */
+    public function down() {
+        Schema::table('sales_characters', function (Blueprint $table) {
+            $table->dropColumn('image_id');
+        });
+    }
+};
diff --git a/database/migrations/2023_12_07_132812_add_comment_history.php b/database/migrations/2023_12_07_132812_add_comment_history.php
new file mode 100644
index 0000000000..3a23e69891
--- /dev/null
+++ b/database/migrations/2023_12_07_132812_add_comment_history.php
@@ -0,0 +1,44 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+class AddCommentHistory extends Migration {
+    /**
+     * Run the migrations.
+     */
+    public function up() {
+        // so if we remigrate it doesnt error
+        if (!Schema::hasColumn('comments', 'updated_at')) {
+            Schema::table('comment_likes', function (Blueprint $table) {
+                // changed tables
+                $table->unsignedBigInteger('comment_id')->change();
+
+                // add foreign keys
+                $table->foreign('comment_id')->references('id')->on('comments')->onDelete('cascade');
+                $table->foreign('user_id')->references('id')->on('users')->onDelete('cascade');
+            });
+        }
+
+        Schema::create('comment_edits', function (Blueprint $table) {
+            $table->id();
+            $table->unsignedBigInteger('comment_id');
+            $table->integer('user_id')->unsigned();
+            $table->text('data');
+            $table->timestamps();
+
+            // add foreign keys
+            $table->foreign('comment_id')->references('id')->on('comments')->onDelete('cascade');
+            $table->foreign('user_id')->references('id')->on('users')->onDelete('cascade');
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     */
+    public function down() {
+        // comment likes cannot be reversed since its a bugfix
+        Schema::dropIfExists('comment_edits');
+    }
+}
diff --git a/database/migrations/2023_12_07_163202_add_fullsize_format_to_character_images.php b/database/migrations/2023_12_07_163202_add_fullsize_format_to_character_images.php
new file mode 100644
index 0000000000..ac86551e6d
--- /dev/null
+++ b/database/migrations/2023_12_07_163202_add_fullsize_format_to_character_images.php
@@ -0,0 +1,27 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+return new class extends Migration {
+    /**
+     * Run the migrations.
+     */
+    public function up() {
+        Schema::table('character_images', function (Blueprint $table) {
+            //
+            $table->string('fullsize_extension')->nullable()->default(null);
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     */
+    public function down() {
+        Schema::table('character_images', function (Blueprint $table) {
+            //
+            $table->dropColumn('fullsize_extension');
+        });
+    }
+};
diff --git a/database/migrations/2023_12_11_190858_add_image_hash_to_images.php b/database/migrations/2023_12_11_190858_add_image_hash_to_images.php
new file mode 100644
index 0000000000..11b6ca4deb
--- /dev/null
+++ b/database/migrations/2023_12_11_190858_add_image_hash_to_images.php
@@ -0,0 +1,91 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+class AddImageHashToImages extends Migration {
+    /**
+     * Run the migrations.
+     */
+    public function up() {
+        Schema::table('subtypes', function (Blueprint $table) {
+            $table->string('hash', 10)->nullable();
+        });
+        Schema::table('specieses', function (Blueprint $table) {
+            $table->string('hash', 10)->nullable();
+        });
+        Schema::table('shops', function (Blueprint $table) {
+            $table->string('hash', 10)->nullable();
+        });
+        Schema::table('prompt_categories', function (Blueprint $table) {
+            $table->string('hash', 10)->nullable();
+        });
+        Schema::table('prompts', function (Blueprint $table) {
+            $table->string('hash', 10)->nullable();
+        });
+        Schema::table('item_categories', function (Blueprint $table) {
+            $table->string('hash', 10)->nullable();
+        });
+        Schema::table('items', function (Blueprint $table) {
+            $table->string('hash', 10)->nullable();
+        });
+        Schema::table('feature_categories', function (Blueprint $table) {
+            $table->string('hash', 10)->nullable();
+        });
+        Schema::table('features', function (Blueprint $table) {
+            $table->string('hash', 10)->nullable();
+        });
+        Schema::table('currencies', function (Blueprint $table) {
+            $table->string('hash', 10)->nullable();
+        });
+        Schema::table('character_categories', function (Blueprint $table) {
+            $table->string('hash', 10)->nullable();
+        });
+        Schema::table('rarities', function (Blueprint $table) {
+            $table->string('hash', 10)->nullable();
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     */
+    public function down() {
+        Schema::table('subtypes', function (Blueprint $table) {
+            $table->dropColumn('hash');
+        });
+        Schema::table('specieses', function (Blueprint $table) {
+            $table->dropColumn('hash');
+        });
+        Schema::table('shops', function (Blueprint $table) {
+            $table->dropColumn('hash');
+        });
+        Schema::table('prompt_categories', function (Blueprint $table) {
+            $table->dropColumn('hash');
+        });
+        Schema::table('prompts', function (Blueprint $table) {
+            $table->dropColumn('hash');
+        });
+        Schema::table('item_categories', function (Blueprint $table) {
+            $table->dropColumn('hash');
+        });
+        Schema::table('items', function (Blueprint $table) {
+            $table->dropColumn('hash');
+        });
+        Schema::table('feature_categories', function (Blueprint $table) {
+            $table->dropColumn('hash');
+        });
+        Schema::table('features', function (Blueprint $table) {
+            $table->dropColumn('hash');
+        });
+        Schema::table('currencies', function (Blueprint $table) {
+            $table->dropColumn('hash');
+        });
+        Schema::table('character_categories', function (Blueprint $table) {
+            $table->dropColumn('hash');
+        });
+        Schema::table('rarities', function (Blueprint $table) {
+            $table->dropColumn('hash');
+        });
+    }
+}
diff --git a/database/migrations/2024_05_16_220813_adjust_database_character_limits.php b/database/migrations/2024_05_16_220813_adjust_database_character_limits.php
new file mode 100644
index 0000000000..5e0b0902e1
--- /dev/null
+++ b/database/migrations/2024_05_16_220813_adjust_database_character_limits.php
@@ -0,0 +1,79 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+class AdjustDatabaseCharacterLimits extends Migration {
+    /**
+     * Run the migrations.
+     */
+    public function up() {
+        Schema::table('character_log', function (Blueprint $table) {
+            $table->text('log')->change();
+            $table->text('data')->nullable()->change();
+        });
+
+        Schema::table('character_items', function (Blueprint $table) {
+            $table->text('data')->nullable()->change();
+        });
+
+        Schema::table('currencies_log', function (Blueprint $table) {
+            $table->text('log')->nullable()->change();
+        });
+
+        Schema::table('items_log', function (Blueprint $table) {
+            $table->text('log')->nullable()->change();
+            $table->text('data')->nullable()->change();
+        });
+
+        Schema::table('user_character_log', function (Blueprint $table) {
+            $table->text('log')->change();
+            $table->text('data')->nullable()->change();
+        });
+
+        Schema::table('user_items', function (Blueprint $table) {
+            $table->text('data')->nullable()->change();
+        });
+
+        Schema::table('user_update_log', function (Blueprint $table) {
+            $table->text('data')->change();
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     */
+    public function down() {
+        Schema::table('character_log', function (Blueprint $table) {
+            $table->string('log', 191)->change();
+            $table->string('data', 1024)->nullable()->change();
+        });
+
+        Schema::table('character_items', function (Blueprint $table) {
+            $table->string('data', 1024)->nullable()->change();
+        });
+
+        Schema::table('currencies_log', function (Blueprint $table) {
+            $table->string('log', 512)->nullable()->change();
+        });
+
+        Schema::table('items_log', function (Blueprint $table) {
+            $table->string('log', 1024)->nullable()->change();
+            $table->string('data', 1024)->nullable()->change();
+        });
+
+        Schema::table('user_character_log', function (Blueprint $table) {
+            $table->string('log', 191)->change();
+            $table->string('data', 1024)->nullable()->change();
+        });
+
+        Schema::table('user_items', function (Blueprint $table) {
+            $table->string('data', 1024)->nullable()->change();
+        });
+
+        Schema::table('user_update_log', function (Blueprint $table) {
+            $table->string('data', 512)->change();
+        });
+    }
+}
diff --git a/database/schema/mysql-schema.dump b/database/schema/mysql-schema.dump
new file mode 100644
index 0000000000..373ef48b7b
--- /dev/null
+++ b/database/schema/mysql-schema.dump
@@ -0,0 +1,984 @@
+/*!40103 SET @OLD_TIME_ZONE=@@TIME_ZONE */;
+/*!40103 SET TIME_ZONE='+00:00' */;
+/*!40014 SET @OLD_UNIQUE_CHECKS=@@UNIQUE_CHECKS, UNIQUE_CHECKS=0 */;
+/*!40014 SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0 */;
+/*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */;
+/*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */;
+DROP TABLE IF EXISTS `character_bookmarks`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `character_bookmarks` (
+  `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
+  `user_id` int(10) unsigned NOT NULL,
+  `character_id` int(10) unsigned NOT NULL,
+  `notify_on_trade_status` tinyint(1) NOT NULL DEFAULT 0,
+  `notify_on_gift_art_status` tinyint(1) NOT NULL DEFAULT 0,
+  `notify_on_transfer` tinyint(1) NOT NULL DEFAULT 0,
+  `notify_on_image` tinyint(1) NOT NULL DEFAULT 0,
+  `comment` varchar(512) COLLATE utf8mb4_unicode_ci DEFAULT NULL,
+  `notify_on_gift_writing_status` tinyint(1) NOT NULL DEFAULT 0,
+  PRIMARY KEY (`id`),
+  UNIQUE KEY `character_bookmarks_user_id_character_id_unique` (`user_id`,`character_id`),
+  KEY `character_bookmarks_user_id_index` (`user_id`),
+  KEY `character_bookmarks_character_id_index` (`character_id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
+/*!40101 SET character_set_client = @saved_cs_client */;
+DROP TABLE IF EXISTS `character_categories`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `character_categories` (
+  `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
+  `code` varchar(191) COLLATE utf8mb4_unicode_ci NOT NULL,
+  `name` varchar(191) COLLATE utf8mb4_unicode_ci NOT NULL,
+  `has_image` tinyint(1) NOT NULL DEFAULT 0,
+  `sort` int(10) unsigned NOT NULL DEFAULT 0,
+  `description` text COLLATE utf8mb4_unicode_ci DEFAULT NULL,
+  `parsed_description` text COLLATE utf8mb4_unicode_ci DEFAULT NULL,
+  PRIMARY KEY (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
+/*!40101 SET character_set_client = @saved_cs_client */;
+DROP TABLE IF EXISTS `character_currencies`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `character_currencies` (
+  `character_id` int(10) unsigned NOT NULL,
+  `currency_id` int(10) unsigned NOT NULL,
+  `quantity` int(10) unsigned NOT NULL DEFAULT 0,
+  PRIMARY KEY (`character_id`,`currency_id`),
+  KEY `character_currencies_currency_id_foreign` (`currency_id`),
+  CONSTRAINT `character_currencies_character_id_foreign` FOREIGN KEY (`character_id`) REFERENCES `characters` (`id`),
+  CONSTRAINT `character_currencies_currency_id_foreign` FOREIGN KEY (`currency_id`) REFERENCES `currencies` (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
+/*!40101 SET character_set_client = @saved_cs_client */;
+DROP TABLE IF EXISTS `character_features`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `character_features` (
+  `character_image_id` int(10) unsigned NOT NULL,
+  `feature_id` int(10) unsigned NOT NULL,
+  `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
+  `data` varchar(191) COLLATE utf8mb4_unicode_ci DEFAULT NULL,
+  `character_type` enum('Character','Update') COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT 'Character',
+  PRIMARY KEY (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
+/*!40101 SET character_set_client = @saved_cs_client */;
+DROP TABLE IF EXISTS `character_image_creators`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `character_image_creators` (
+  `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
+  `character_image_id` int(10) unsigned NOT NULL,
+  `type` enum('Artist','Designer') COLLATE utf8mb4_unicode_ci NOT NULL,
+  `url` varchar(191) COLLATE utf8mb4_unicode_ci DEFAULT NULL,
+  `alias` varchar(191) COLLATE utf8mb4_unicode_ci DEFAULT NULL,
+  `character_type` enum('Character','Update') COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT 'Character',
+  `user_id` int(10) unsigned DEFAULT NULL,
+  PRIMARY KEY (`id`),
+  KEY `character_image_creators_character_image_id_foreign` (`character_image_id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
+/*!40101 SET character_set_client = @saved_cs_client */;
+DROP TABLE IF EXISTS `character_images`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `character_images` (
+  `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
+  `character_id` int(10) unsigned NOT NULL,
+  `description` text COLLATE utf8mb4_unicode_ci DEFAULT NULL,
+  `url` varchar(191) COLLATE utf8mb4_unicode_ci DEFAULT NULL,
+  `is_visible` tinyint(1) NOT NULL DEFAULT 1,
+  `created_at` timestamp NULL DEFAULT NULL,
+  `updated_at` timestamp NULL DEFAULT NULL,
+  `deleted_at` timestamp NULL DEFAULT NULL,
+  `parsed_description` text COLLATE utf8mb4_unicode_ci DEFAULT NULL,
+  `extension` varchar(5) COLLATE utf8mb4_unicode_ci NOT NULL,
+  `use_cropper` tinyint(1) NOT NULL DEFAULT 0,
+  `x0` int(11) DEFAULT NULL,
+  `x1` int(11) DEFAULT NULL,
+  `y0` int(11) DEFAULT NULL,
+  `y1` int(11) DEFAULT NULL,
+  `hash` varchar(10) COLLATE utf8mb4_unicode_ci NOT NULL,
+  `sort` int(11) NOT NULL DEFAULT 0,
+  `is_valid` tinyint(1) NOT NULL DEFAULT 1,
+  `species_id` int(10) unsigned DEFAULT NULL,
+  `rarity_id` int(10) unsigned DEFAULT NULL,
+  `subtype_id` int(10) unsigned DEFAULT NULL,
+  PRIMARY KEY (`id`),
+  KEY `character_images_species_id_foreign` (`species_id`),
+  KEY `character_images_rarity_id_foreign` (`rarity_id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
+/*!40101 SET character_set_client = @saved_cs_client */;
+DROP TABLE IF EXISTS `character_log`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `character_log` (
+  `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
+  `character_id` int(10) unsigned NOT NULL,
+  `sender_id` int(10) unsigned DEFAULT NULL,
+  `log` varchar(191) COLLATE utf8mb4_unicode_ci NOT NULL,
+  `log_type` varchar(191) COLLATE utf8mb4_unicode_ci NOT NULL,
+  `data` varchar(1024) COLLATE utf8mb4_unicode_ci DEFAULT NULL,
+  `created_at` timestamp NULL DEFAULT NULL,
+  `updated_at` timestamp NULL DEFAULT NULL,
+  `recipient_alias` varchar(191) COLLATE utf8mb4_unicode_ci DEFAULT NULL,
+  `recipient_id` int(10) unsigned DEFAULT NULL,
+  `change_log` text COLLATE utf8mb4_unicode_ci DEFAULT NULL,
+  `sender_alias` varchar(191) COLLATE utf8mb4_unicode_ci DEFAULT NULL,
+  PRIMARY KEY (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
+/*!40101 SET character_set_client = @saved_cs_client */;
+DROP TABLE IF EXISTS `character_profiles`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `character_profiles` (
+  `character_id` int(10) unsigned NOT NULL,
+  `text` text COLLATE utf8mb4_unicode_ci DEFAULT NULL,
+  `parsed_text` text COLLATE utf8mb4_unicode_ci DEFAULT NULL,
+  KEY `character_profiles_character_id_foreign` (`character_id`),
+  CONSTRAINT `character_profiles_character_id_foreign` FOREIGN KEY (`character_id`) REFERENCES `characters` (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
+/*!40101 SET character_set_client = @saved_cs_client */;
+DROP TABLE IF EXISTS `character_submissions`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `character_submissions` (
+  `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
+  `user_id` int(10) unsigned NOT NULL,
+  `character_id` int(10) unsigned DEFAULT NULL,
+  `data` varchar(1024) COLLATE utf8mb4_unicode_ci DEFAULT NULL,
+  `description` text COLLATE utf8mb4_unicode_ci DEFAULT NULL,
+  `staff_id` int(10) unsigned NOT NULL,
+  `status` enum('Pending','Approved','Rejected','Cancelled') COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT 'Pending',
+  `reason` text COLLATE utf8mb4_unicode_ci DEFAULT NULL,
+  `created_at` timestamp NULL DEFAULT NULL,
+  `updated_at` timestamp NULL DEFAULT NULL,
+  `parsed_description` text COLLATE utf8mb4_unicode_ci DEFAULT NULL,
+  PRIMARY KEY (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
+/*!40101 SET character_set_client = @saved_cs_client */;
+DROP TABLE IF EXISTS `character_transfers`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `character_transfers` (
+  `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
+  `character_id` int(10) unsigned NOT NULL,
+  `sender_id` int(10) unsigned NOT NULL,
+  `recipient_id` int(10) unsigned NOT NULL,
+  `status` enum('Pending','Accepted','Canceled','Rejected') COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT 'Pending',
+  `is_approved` tinyint(1) NOT NULL DEFAULT 0,
+  `reason` text COLLATE utf8mb4_unicode_ci DEFAULT NULL,
+  `data` varchar(191) COLLATE utf8mb4_unicode_ci DEFAULT NULL,
+  `created_at` timestamp NULL DEFAULT NULL,
+  `updated_at` timestamp NULL DEFAULT NULL,
+  PRIMARY KEY (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
+/*!40101 SET character_set_client = @saved_cs_client */;
+DROP TABLE IF EXISTS `characters`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `characters` (
+  `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
+  `character_category_id` int(10) unsigned DEFAULT NULL,
+  `number` int(10) unsigned DEFAULT NULL,
+  `slug` varchar(191) COLLATE utf8mb4_unicode_ci DEFAULT NULL,
+  `description` text COLLATE utf8mb4_unicode_ci DEFAULT NULL,
+  `is_sellable` tinyint(1) NOT NULL DEFAULT 1,
+  `is_tradeable` tinyint(1) NOT NULL DEFAULT 1,
+  `is_giftable` tinyint(1) NOT NULL DEFAULT 1,
+  `sale_value` int(11) NOT NULL DEFAULT 0,
+  `transferrable_at` timestamp NULL DEFAULT NULL,
+  `created_at` timestamp NULL DEFAULT NULL,
+  `updated_at` timestamp NULL DEFAULT NULL,
+  `deleted_at` timestamp NULL DEFAULT NULL,
+  `is_visible` tinyint(1) NOT NULL DEFAULT 1,
+  `parsed_description` text COLLATE utf8mb4_unicode_ci DEFAULT NULL,
+  `name` varchar(191) COLLATE utf8mb4_unicode_ci DEFAULT NULL,
+  `is_gift_art_allowed` tinyint(1) NOT NULL DEFAULT 0,
+  `is_trading` tinyint(1) NOT NULL DEFAULT 0,
+  `owner_alias` varchar(191) COLLATE utf8mb4_unicode_ci DEFAULT 'null',
+  `character_image_id` int(10) unsigned DEFAULT NULL,
+  `user_id` int(10) unsigned DEFAULT NULL,
+  `sort` int(10) unsigned NOT NULL DEFAULT 0,
+  `is_myo_slot` tinyint(1) NOT NULL DEFAULT 0,
+  `rarity_id` int(10) unsigned DEFAULT NULL,
+  `trade_id` int(10) unsigned DEFAULT NULL,
+  `is_gift_writing_allowed` tinyint(1) NOT NULL DEFAULT 0,
+  PRIMARY KEY (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
+/*!40101 SET character_set_client = @saved_cs_client */;
+DROP TABLE IF EXISTS `claim_characters`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `claim_characters` (
+  `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
+  `claim_id` int(10) unsigned NOT NULL,
+  `character_id` int(10) unsigned NOT NULL,
+  `data` varchar(512) COLLATE utf8mb4_unicode_ci DEFAULT NULL,
+  PRIMARY KEY (`id`),
+  KEY `claim_characters_claim_id_index` (`claim_id`),
+  KEY `claim_characters_character_id_index` (`character_id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
+/*!40101 SET character_set_client = @saved_cs_client */;
+DROP TABLE IF EXISTS `claims`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `claims` (
+  `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
+  `user_id` int(10) unsigned NOT NULL,
+  `staff_id` int(10) unsigned DEFAULT NULL,
+  `url` varchar(191) COLLATE utf8mb4_unicode_ci NOT NULL,
+  `comments` text COLLATE utf8mb4_unicode_ci DEFAULT NULL,
+  `staff_comments` text COLLATE utf8mb4_unicode_ci DEFAULT NULL,
+  `data` varchar(512) COLLATE utf8mb4_unicode_ci DEFAULT NULL,
+  `status` enum('Pending','Approved','Rejected') COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT 'Pending',
+  `created_at` timestamp NULL DEFAULT NULL,
+  `updated_at` timestamp NULL DEFAULT NULL,
+  PRIMARY KEY (`id`),
+  KEY `claims_user_id_index` (`user_id`),
+  KEY `claims_staff_id_index` (`staff_id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
+/*!40101 SET character_set_client = @saved_cs_client */;
+DROP TABLE IF EXISTS `currencies`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `currencies` (
+  `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
+  `is_user_owned` tinyint(1) NOT NULL DEFAULT 0,
+  `is_character_owned` tinyint(1) NOT NULL DEFAULT 0,
+  `name` varchar(191) COLLATE utf8mb4_unicode_ci NOT NULL,
+  `abbreviation` varchar(191) COLLATE utf8mb4_unicode_ci DEFAULT NULL,
+  `sort_user` int(10) unsigned NOT NULL DEFAULT 0,
+  `sort_character` int(10) unsigned NOT NULL DEFAULT 0,
+  `is_displayed` tinyint(1) NOT NULL DEFAULT 1,
+  `allow_user_to_user` tinyint(1) NOT NULL DEFAULT 0,
+  `allow_user_to_character` tinyint(1) NOT NULL DEFAULT 0,
+  `allow_character_to_user` tinyint(1) NOT NULL DEFAULT 0,
+  `has_icon` tinyint(1) NOT NULL DEFAULT 0,
+  `has_image` tinyint(1) NOT NULL DEFAULT 0,
+  `description` text COLLATE utf8mb4_unicode_ci DEFAULT NULL,
+  `parsed_description` text COLLATE utf8mb4_unicode_ci DEFAULT NULL,
+  PRIMARY KEY (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
+/*!40101 SET character_set_client = @saved_cs_client */;
+DROP TABLE IF EXISTS `currencies_log`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `currencies_log` (
+  `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
+  `sender_id` int(10) unsigned DEFAULT NULL,
+  `sender_type` enum('User','Character') COLLATE utf8mb4_unicode_ci DEFAULT NULL,
+  `recipient_id` int(10) unsigned DEFAULT NULL,
+  `recipient_type` enum('User','Character') COLLATE utf8mb4_unicode_ci DEFAULT NULL,
+  `currency_id` int(10) unsigned NOT NULL,
+  `quantity` int(11) NOT NULL DEFAULT 0,
+  `created_at` timestamp NULL DEFAULT NULL,
+  `updated_at` timestamp NULL DEFAULT NULL,
+  `log` varchar(191) COLLATE utf8mb4_unicode_ci DEFAULT NULL,
+  `log_type` varchar(191) COLLATE utf8mb4_unicode_ci NOT NULL,
+  `data` varchar(1024) COLLATE utf8mb4_unicode_ci DEFAULT NULL,
+  PRIMARY KEY (`id`),
+  KEY `banks_log_currency_id_foreign` (`currency_id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
+/*!40101 SET character_set_client = @saved_cs_client */;
+DROP TABLE IF EXISTS `design_updates`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `design_updates` (
+  `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
+  `character_id` int(10) unsigned NOT NULL,
+  `status` enum('Draft','Pending','Approved','Rejected') COLLATE utf8mb4_unicode_ci DEFAULT NULL,
+  `user_id` int(10) unsigned NOT NULL,
+  `staff_id` int(10) unsigned DEFAULT NULL,
+  `comments` text COLLATE utf8mb4_unicode_ci DEFAULT NULL,
+  `staff_comments` text COLLATE utf8mb4_unicode_ci DEFAULT NULL,
+  `data` varchar(512) COLLATE utf8mb4_unicode_ci DEFAULT NULL,
+  `extension` varchar(5) COLLATE utf8mb4_unicode_ci DEFAULT NULL,
+  `use_cropper` tinyint(1) NOT NULL DEFAULT 0,
+  `x0` int(11) DEFAULT NULL,
+  `x1` int(11) DEFAULT NULL,
+  `y0` int(11) DEFAULT NULL,
+  `y1` int(11) DEFAULT NULL,
+  `hash` varchar(10) COLLATE utf8mb4_unicode_ci NOT NULL,
+  `species_id` int(10) unsigned DEFAULT NULL,
+  `rarity_id` int(10) unsigned DEFAULT NULL,
+  `has_comments` tinyint(1) NOT NULL DEFAULT 0,
+  `has_image` tinyint(1) NOT NULL DEFAULT 0,
+  `has_addons` tinyint(1) NOT NULL DEFAULT 0,
+  `has_features` tinyint(1) NOT NULL DEFAULT 0,
+  `created_at` timestamp NULL DEFAULT NULL,
+  `updated_at` timestamp NULL DEFAULT NULL,
+  `deleted_at` timestamp NULL DEFAULT NULL,
+  `submitted_at` timestamp NULL DEFAULT NULL,
+  `subtype_id` int(10) unsigned DEFAULT NULL,
+  `update_type` enum('MYO','Character') COLLATE utf8mb4_unicode_ci DEFAULT NULL,
+  PRIMARY KEY (`id`),
+  KEY `design_updates_character_id_index` (`character_id`),
+  KEY `design_updates_user_id_index` (`user_id`),
+  KEY `design_updates_submitted_at_index` (`submitted_at`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
+/*!40101 SET character_set_client = @saved_cs_client */;
+DROP TABLE IF EXISTS `feature_categories`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `feature_categories` (
+  `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
+  `name` varchar(191) COLLATE utf8mb4_unicode_ci NOT NULL,
+  `has_image` tinyint(1) NOT NULL DEFAULT 0,
+  `sort` int(10) unsigned NOT NULL DEFAULT 0,
+  `description` text COLLATE utf8mb4_unicode_ci DEFAULT NULL,
+  `parsed_description` text COLLATE utf8mb4_unicode_ci DEFAULT NULL,
+  PRIMARY KEY (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
+/*!40101 SET character_set_client = @saved_cs_client */;
+DROP TABLE IF EXISTS `features`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `features` (
+  `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
+  `feature_category_id` int(10) unsigned DEFAULT NULL,
+  `species_id` int(10) unsigned DEFAULT NULL,
+  `rarity_id` int(10) unsigned NOT NULL,
+  `name` varchar(191) COLLATE utf8mb4_unicode_ci NOT NULL,
+  `has_image` tinyint(1) NOT NULL DEFAULT 0,
+  `description` text COLLATE utf8mb4_unicode_ci DEFAULT NULL,
+  `parsed_description` text COLLATE utf8mb4_unicode_ci DEFAULT NULL,
+  `subtype_id` int(10) unsigned DEFAULT NULL,
+  PRIMARY KEY (`id`),
+  KEY `features_feature_category_id_foreign` (`feature_category_id`),
+  KEY `features_species_id_foreign` (`species_id`),
+  KEY `features_rarity_id_foreign` (`rarity_id`),
+  CONSTRAINT `features_feature_category_id_foreign` FOREIGN KEY (`feature_category_id`) REFERENCES `feature_categories` (`id`),
+  CONSTRAINT `features_rarity_id_foreign` FOREIGN KEY (`rarity_id`) REFERENCES `rarities` (`id`),
+  CONSTRAINT `features_species_id_foreign` FOREIGN KEY (`species_id`) REFERENCES `specieses` (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
+/*!40101 SET character_set_client = @saved_cs_client */;
+DROP TABLE IF EXISTS `invitations`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `invitations` (
+  `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
+  `code` varchar(10) COLLATE utf8mb4_unicode_ci NOT NULL,
+  `user_id` int(10) unsigned NOT NULL,
+  `recipient_id` int(10) unsigned DEFAULT NULL,
+  `created_at` timestamp NULL DEFAULT NULL,
+  `updated_at` timestamp NULL DEFAULT NULL,
+  PRIMARY KEY (`id`),
+  UNIQUE KEY `invitations_code_unique` (`code`),
+  KEY `invitations_user_id_foreign` (`user_id`),
+  KEY `invitations_recipient_id_foreign` (`recipient_id`),
+  CONSTRAINT `invitations_recipient_id_foreign` FOREIGN KEY (`recipient_id`) REFERENCES `users` (`id`),
+  CONSTRAINT `invitations_user_id_foreign` FOREIGN KEY (`user_id`) REFERENCES `users` (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
+/*!40101 SET character_set_client = @saved_cs_client */;
+DROP TABLE IF EXISTS `item_categories`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `item_categories` (
+  `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
+  `name` varchar(191) COLLATE utf8mb4_unicode_ci NOT NULL,
+  `sort` int(10) unsigned NOT NULL DEFAULT 0,
+  `description` text COLLATE utf8mb4_unicode_ci DEFAULT NULL,
+  `parsed_description` text COLLATE utf8mb4_unicode_ci DEFAULT NULL,
+  `has_image` tinyint(1) NOT NULL DEFAULT 0,
+  PRIMARY KEY (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
+/*!40101 SET character_set_client = @saved_cs_client */;
+DROP TABLE IF EXISTS `item_tags`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `item_tags` (
+  `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
+  `item_id` int(10) unsigned NOT NULL,
+  `tag` varchar(191) COLLATE utf8mb4_unicode_ci NOT NULL,
+  `data` text COLLATE utf8mb4_unicode_ci DEFAULT NULL,
+  `is_active` tinyint(1) NOT NULL DEFAULT 0,
+  PRIMARY KEY (`id`),
+  KEY `item_tags_tag_index` (`tag`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
+/*!40101 SET character_set_client = @saved_cs_client */;
+DROP TABLE IF EXISTS `items`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `items` (
+  `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
+  `item_category_id` int(10) unsigned DEFAULT NULL,
+  `name` varchar(191) COLLATE utf8mb4_unicode_ci NOT NULL,
+  `has_image` tinyint(1) NOT NULL DEFAULT 0,
+  `description` text COLLATE utf8mb4_unicode_ci DEFAULT NULL,
+  `parsed_description` text COLLATE utf8mb4_unicode_ci DEFAULT NULL,
+  `allow_transfer` tinyint(1) NOT NULL DEFAULT 1,
+  PRIMARY KEY (`id`),
+  KEY `items_item_category_id_foreign` (`item_category_id`),
+  CONSTRAINT `items_item_category_id_foreign` FOREIGN KEY (`item_category_id`) REFERENCES `item_categories` (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
+/*!40101 SET character_set_client = @saved_cs_client */;
+DROP TABLE IF EXISTS `loot_tables`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `loot_tables` (
+  `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
+  `name` varchar(191) COLLATE utf8mb4_unicode_ci NOT NULL,
+  `display_name` varchar(191) COLLATE utf8mb4_unicode_ci NOT NULL,
+  PRIMARY KEY (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
+/*!40101 SET character_set_client = @saved_cs_client */;
+DROP TABLE IF EXISTS `loots`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `loots` (
+  `loot_table_id` int(10) unsigned NOT NULL,
+  `rewardable_type` varchar(191) COLLATE utf8mb4_unicode_ci NOT NULL,
+  `rewardable_id` int(10) unsigned NOT NULL,
+  `quantity` int(10) unsigned NOT NULL,
+  `weight` int(10) unsigned NOT NULL,
+  KEY `loots_loot_table_id_foreign` (`loot_table_id`),
+  CONSTRAINT `loots_loot_table_id_foreign` FOREIGN KEY (`loot_table_id`) REFERENCES `loot_tables` (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
+/*!40101 SET character_set_client = @saved_cs_client */;
+DROP TABLE IF EXISTS `migrations`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `migrations` (
+  `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
+  `migration` varchar(191) COLLATE utf8mb4_unicode_ci NOT NULL,
+  `batch` int(11) NOT NULL,
+  PRIMARY KEY (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
+/*!40101 SET character_set_client = @saved_cs_client */;
+DROP TABLE IF EXISTS `news`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `news` (
+  `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
+  `user_id` int(10) unsigned NOT NULL,
+  `title` varchar(191) COLLATE utf8mb4_unicode_ci NOT NULL,
+  `text` text COLLATE utf8mb4_unicode_ci NOT NULL,
+  `parsed_text` text COLLATE utf8mb4_unicode_ci NOT NULL,
+  `is_visible` tinyint(1) NOT NULL DEFAULT 1,
+  `created_at` timestamp NULL DEFAULT NULL,
+  `updated_at` timestamp NULL DEFAULT NULL,
+  `post_at` timestamp NULL DEFAULT NULL,
+  PRIMARY KEY (`id`),
+  KEY `news_user_id_foreign` (`user_id`),
+  CONSTRAINT `news_user_id_foreign` FOREIGN KEY (`user_id`) REFERENCES `users` (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
+/*!40101 SET character_set_client = @saved_cs_client */;
+DROP TABLE IF EXISTS `notifications`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `notifications` (
+  `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
+  `user_id` int(10) unsigned NOT NULL,
+  `notification_type_id` int(10) unsigned NOT NULL,
+  `is_unread` tinyint(1) NOT NULL DEFAULT 1,
+  `created_at` timestamp NULL DEFAULT NULL,
+  `updated_at` timestamp NULL DEFAULT NULL,
+  `data` varchar(1024) COLLATE utf8mb4_unicode_ci DEFAULT NULL,
+  PRIMARY KEY (`id`),
+  KEY `notifications_user_id_foreign` (`user_id`),
+  CONSTRAINT `notifications_user_id_foreign` FOREIGN KEY (`user_id`) REFERENCES `users` (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
+/*!40101 SET character_set_client = @saved_cs_client */;
+DROP TABLE IF EXISTS `password_resets`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `password_resets` (
+  `email` varchar(191) COLLATE utf8mb4_unicode_ci NOT NULL,
+  `token` varchar(191) COLLATE utf8mb4_unicode_ci NOT NULL,
+  `created_at` timestamp NULL DEFAULT NULL,
+  KEY `password_resets_email_index` (`email`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
+/*!40101 SET character_set_client = @saved_cs_client */;
+DROP TABLE IF EXISTS `prompt_categories`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `prompt_categories` (
+  `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
+  `name` varchar(191) COLLATE utf8mb4_unicode_ci NOT NULL,
+  `description` text COLLATE utf8mb4_unicode_ci DEFAULT NULL,
+  `parsed_description` text COLLATE utf8mb4_unicode_ci DEFAULT NULL,
+  `sort` int(10) unsigned NOT NULL DEFAULT 0,
+  `has_image` tinyint(1) NOT NULL DEFAULT 0,
+  PRIMARY KEY (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
+/*!40101 SET character_set_client = @saved_cs_client */;
+DROP TABLE IF EXISTS `prompt_rewards`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `prompt_rewards` (
+  `prompt_id` int(10) unsigned NOT NULL DEFAULT 0,
+  `rewardable_type` varchar(191) COLLATE utf8mb4_unicode_ci NOT NULL,
+  `rewardable_id` int(10) unsigned NOT NULL,
+  `quantity` int(10) unsigned NOT NULL,
+  KEY `prompt_rewards_prompt_id_foreign` (`prompt_id`),
+  CONSTRAINT `prompt_rewards_prompt_id_foreign` FOREIGN KEY (`prompt_id`) REFERENCES `prompts` (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
+/*!40101 SET character_set_client = @saved_cs_client */;
+DROP TABLE IF EXISTS `prompts`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `prompts` (
+  `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
+  `name` varchar(64) COLLATE utf8mb4_unicode_ci NOT NULL,
+  `summary` varchar(256) COLLATE utf8mb4_unicode_ci DEFAULT NULL,
+  `description` text COLLATE utf8mb4_unicode_ci DEFAULT NULL,
+  `parsed_description` text COLLATE utf8mb4_unicode_ci DEFAULT NULL,
+  `is_active` tinyint(1) NOT NULL DEFAULT 1,
+  `start_at` timestamp NULL DEFAULT NULL,
+  `end_at` timestamp NULL DEFAULT NULL,
+  `hide_before_start` tinyint(1) NOT NULL DEFAULT 0,
+  `hide_after_end` tinyint(1) NOT NULL DEFAULT 0,
+  `prompt_category_id` int(10) unsigned DEFAULT 0,
+  `has_image` tinyint(1) NOT NULL DEFAULT 0,
+  PRIMARY KEY (`id`),
+  KEY `prompts_prompt_category_id_foreign` (`prompt_category_id`),
+  CONSTRAINT `prompts_prompt_category_id_foreign` FOREIGN KEY (`prompt_category_id`) REFERENCES `prompt_categories` (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
+/*!40101 SET character_set_client = @saved_cs_client */;
+DROP TABLE IF EXISTS `raffle_groups`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `raffle_groups` (
+  `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
+  `name` varchar(191) COLLATE utf8mb4_unicode_ci NOT NULL,
+  `is_active` tinyint(1) NOT NULL,
+  PRIMARY KEY (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
+/*!40101 SET character_set_client = @saved_cs_client */;
+DROP TABLE IF EXISTS `raffle_tickets`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `raffle_tickets` (
+  `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
+  `user_id` int(10) unsigned DEFAULT NULL,
+  `raffle_id` int(10) unsigned DEFAULT NULL,
+  `alias` varchar(191) COLLATE utf8mb4_unicode_ci DEFAULT NULL,
+  `created_at` timestamp NOT NULL DEFAULT current_timestamp(),
+  `position` int(10) unsigned DEFAULT NULL,
+  PRIMARY KEY (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
+/*!40101 SET character_set_client = @saved_cs_client */;
+DROP TABLE IF EXISTS `raffles`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `raffles` (
+  `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
+  `name` varchar(191) COLLATE utf8mb4_unicode_ci NOT NULL,
+  `is_active` tinyint(1) NOT NULL,
+  `winner_count` int(10) unsigned NOT NULL DEFAULT 1,
+  `group_id` int(10) unsigned DEFAULT NULL,
+  `order` int(11) NOT NULL DEFAULT 1,
+  `rolled_at` timestamp NULL DEFAULT NULL,
+  PRIMARY KEY (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
+/*!40101 SET character_set_client = @saved_cs_client */;
+DROP TABLE IF EXISTS `rank_powers`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `rank_powers` (
+  `rank_id` int(10) unsigned NOT NULL,
+  `power` varchar(191) COLLATE utf8mb4_unicode_ci NOT NULL,
+  UNIQUE KEY `rank_powers_rank_id_power_unique` (`rank_id`,`power`),
+  KEY `rank_powers_power_index` (`power`),
+  CONSTRAINT `rank_powers_rank_id_foreign` FOREIGN KEY (`rank_id`) REFERENCES `ranks` (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
+/*!40101 SET character_set_client = @saved_cs_client */;
+DROP TABLE IF EXISTS `ranks`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `ranks` (
+  `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
+  `name` varchar(191) COLLATE utf8mb4_unicode_ci NOT NULL,
+  `sort` int(10) unsigned NOT NULL DEFAULT 0,
+  `color` varchar(6) COLLATE utf8mb4_unicode_ci DEFAULT NULL,
+  `description` text COLLATE utf8mb4_unicode_ci DEFAULT NULL,
+  `parsed_description` text COLLATE utf8mb4_unicode_ci DEFAULT NULL,
+  PRIMARY KEY (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
+/*!40101 SET character_set_client = @saved_cs_client */;
+DROP TABLE IF EXISTS `rarities`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `rarities` (
+  `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
+  `name` varchar(191) COLLATE utf8mb4_unicode_ci NOT NULL,
+  `sort` int(10) unsigned NOT NULL DEFAULT 0,
+  `color` varchar(6) COLLATE utf8mb4_unicode_ci DEFAULT NULL,
+  `has_image` tinyint(1) NOT NULL DEFAULT 0,
+  `description` text COLLATE utf8mb4_unicode_ci DEFAULT NULL,
+  `parsed_description` text COLLATE utf8mb4_unicode_ci DEFAULT NULL,
+  PRIMARY KEY (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
+/*!40101 SET character_set_client = @saved_cs_client */;
+DROP TABLE IF EXISTS `shop_log`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `shop_log` (
+  `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
+  `shop_id` int(10) unsigned NOT NULL,
+  `user_id` int(10) unsigned NOT NULL,
+  `character_id` int(10) unsigned DEFAULT NULL,
+  `currency_id` int(10) unsigned NOT NULL,
+  `cost` int(11) NOT NULL DEFAULT 0,
+  `item_id` int(10) unsigned NOT NULL,
+  `quantity` int(11) NOT NULL DEFAULT 1,
+  `created_at` timestamp NULL DEFAULT NULL,
+  `updated_at` timestamp NULL DEFAULT NULL,
+  PRIMARY KEY (`id`),
+  KEY `shop_log_shop_id_index` (`shop_id`),
+  KEY `shop_log_user_id_index` (`user_id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
+/*!40101 SET character_set_client = @saved_cs_client */;
+DROP TABLE IF EXISTS `shop_stock`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `shop_stock` (
+  `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
+  `shop_id` int(10) unsigned NOT NULL,
+  `item_id` int(10) unsigned NOT NULL,
+  `currency_id` int(10) unsigned NOT NULL,
+  `cost` int(11) NOT NULL DEFAULT 0,
+  `use_user_bank` tinyint(1) NOT NULL DEFAULT 1,
+  `use_character_bank` tinyint(1) NOT NULL DEFAULT 1,
+  `is_limited_stock` tinyint(1) NOT NULL DEFAULT 0,
+  `quantity` int(11) NOT NULL DEFAULT 0,
+  `sort` int(10) unsigned NOT NULL DEFAULT 0,
+  `purchase_limit` int(10) unsigned NOT NULL DEFAULT 0,
+  PRIMARY KEY (`id`),
+  KEY `shop_stock_shop_id_index` (`shop_id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
+/*!40101 SET character_set_client = @saved_cs_client */;
+DROP TABLE IF EXISTS `shops`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `shops` (
+  `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
+  `name` varchar(191) COLLATE utf8mb4_unicode_ci NOT NULL,
+  `has_image` tinyint(1) NOT NULL DEFAULT 0,
+  `description` text COLLATE utf8mb4_unicode_ci DEFAULT NULL,
+  `parsed_description` text COLLATE utf8mb4_unicode_ci DEFAULT NULL,
+  `sort` int(10) unsigned NOT NULL DEFAULT 0,
+  `is_active` tinyint(1) NOT NULL DEFAULT 1,
+  PRIMARY KEY (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
+/*!40101 SET character_set_client = @saved_cs_client */;
+DROP TABLE IF EXISTS `site_pages`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `site_pages` (
+  `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
+  `key` varchar(30) COLLATE utf8mb4_unicode_ci NOT NULL,
+  `title` varchar(50) COLLATE utf8mb4_unicode_ci NOT NULL,
+  `text` text COLLATE utf8mb4_unicode_ci DEFAULT NULL,
+  `is_visible` tinyint(1) NOT NULL DEFAULT 1,
+  `created_at` timestamp NULL DEFAULT NULL,
+  `updated_at` timestamp NULL DEFAULT NULL,
+  `parsed_text` text COLLATE utf8mb4_unicode_ci DEFAULT NULL,
+  PRIMARY KEY (`id`),
+  UNIQUE KEY `site_pages_key_unique` (`key`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
+/*!40101 SET character_set_client = @saved_cs_client */;
+DROP TABLE IF EXISTS `site_settings`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `site_settings` (
+  `key` varchar(50) COLLATE utf8mb4_unicode_ci NOT NULL,
+  `value` varchar(191) COLLATE utf8mb4_unicode_ci NOT NULL,
+  `description` varchar(1024) COLLATE utf8mb4_unicode_ci NOT NULL,
+  PRIMARY KEY (`key`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
+/*!40101 SET character_set_client = @saved_cs_client */;
+DROP TABLE IF EXISTS `specieses`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `specieses` (
+  `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
+  `name` varchar(191) COLLATE utf8mb4_unicode_ci NOT NULL,
+  `has_image` tinyint(1) NOT NULL DEFAULT 0,
+  `sort` int(10) unsigned NOT NULL DEFAULT 0,
+  `description` text COLLATE utf8mb4_unicode_ci DEFAULT NULL,
+  `parsed_description` text COLLATE utf8mb4_unicode_ci DEFAULT NULL,
+  PRIMARY KEY (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
+/*!40101 SET character_set_client = @saved_cs_client */;
+DROP TABLE IF EXISTS `submission_characters`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `submission_characters` (
+  `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
+  `submission_id` int(10) unsigned NOT NULL,
+  `character_id` int(10) unsigned NOT NULL,
+  `data` varchar(512) COLLATE utf8mb4_unicode_ci DEFAULT NULL,
+  PRIMARY KEY (`id`),
+  KEY `submission_characters_submission_id_index` (`submission_id`),
+  KEY `submission_characters_character_id_index` (`character_id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
+/*!40101 SET character_set_client = @saved_cs_client */;
+DROP TABLE IF EXISTS `submissions`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `submissions` (
+  `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
+  `user_id` int(10) unsigned NOT NULL,
+  `staff_id` int(10) unsigned DEFAULT NULL,
+  `url` varchar(200) COLLATE utf8mb4_unicode_ci NOT NULL,
+  `comments` text COLLATE utf8mb4_unicode_ci DEFAULT NULL,
+  `staff_comments` text COLLATE utf8mb4_unicode_ci DEFAULT NULL,
+  `status` enum('Pending','Approved','Rejected') COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT 'Pending',
+  `data` varchar(512) COLLATE utf8mb4_unicode_ci DEFAULT NULL,
+  `created_at` timestamp NULL DEFAULT NULL,
+  `updated_at` timestamp NULL DEFAULT NULL,
+  `prompt_id` int(10) unsigned DEFAULT NULL,
+  `parsed_staff_comments` text COLLATE utf8mb4_unicode_ci DEFAULT NULL,
+  PRIMARY KEY (`id`),
+  KEY `submissions_user_id_index` (`user_id`),
+  KEY `submissions_prompt_id_index` (`prompt_id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
+/*!40101 SET character_set_client = @saved_cs_client */;
+DROP TABLE IF EXISTS `subtypes`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `subtypes` (
+  `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
+  `species_id` int(10) unsigned NOT NULL,
+  `name` varchar(191) COLLATE utf8mb4_unicode_ci NOT NULL,
+  `has_image` tinyint(1) NOT NULL DEFAULT 0,
+  `sort` int(10) unsigned NOT NULL DEFAULT 0,
+  `description` text COLLATE utf8mb4_unicode_ci DEFAULT NULL,
+  `parsed_description` text COLLATE utf8mb4_unicode_ci DEFAULT NULL,
+  PRIMARY KEY (`id`),
+  KEY `subtypes_species_id_foreign` (`species_id`),
+  CONSTRAINT `subtypes_species_id_foreign` FOREIGN KEY (`species_id`) REFERENCES `specieses` (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
+/*!40101 SET character_set_client = @saved_cs_client */;
+DROP TABLE IF EXISTS `trades`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `trades` (
+  `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
+  `status` enum('Open','Pending','Completed','Rejected','Canceled') COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT 'Open',
+  `sender_id` int(10) unsigned NOT NULL,
+  `recipient_id` int(10) unsigned NOT NULL,
+  `comments` text COLLATE utf8mb4_unicode_ci DEFAULT NULL,
+  `is_sender_confirmed` tinyint(1) NOT NULL DEFAULT 0,
+  `is_recipient_confirmed` tinyint(1) NOT NULL DEFAULT 0,
+  `is_approved` tinyint(1) NOT NULL DEFAULT 0,
+  `reason` text COLLATE utf8mb4_unicode_ci DEFAULT NULL,
+  `data` varchar(1024) COLLATE utf8mb4_unicode_ci DEFAULT NULL,
+  `created_at` timestamp NULL DEFAULT NULL,
+  `updated_at` timestamp NULL DEFAULT NULL,
+  `is_sender_trade_confirmed` tinyint(1) NOT NULL DEFAULT 0,
+  `is_recipient_trade_confirmed` tinyint(1) NOT NULL DEFAULT 0,
+  `staff_id` int(10) unsigned DEFAULT NULL,
+  PRIMARY KEY (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
+/*!40101 SET character_set_client = @saved_cs_client */;
+DROP TABLE IF EXISTS `user_character_log`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `user_character_log` (
+  `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
+  `character_id` int(10) unsigned DEFAULT NULL,
+  `sender_id` int(10) unsigned DEFAULT NULL,
+  `log` varchar(191) COLLATE utf8mb4_unicode_ci NOT NULL,
+  `log_type` varchar(191) COLLATE utf8mb4_unicode_ci NOT NULL,
+  `data` varchar(1024) COLLATE utf8mb4_unicode_ci DEFAULT NULL,
+  `created_at` timestamp NULL DEFAULT NULL,
+  `updated_at` timestamp NULL DEFAULT NULL,
+  `recipient_alias` varchar(191) COLLATE utf8mb4_unicode_ci DEFAULT NULL,
+  `recipient_id` int(10) unsigned DEFAULT NULL,
+  `sender_alias` varchar(191) COLLATE utf8mb4_unicode_ci DEFAULT NULL,
+  PRIMARY KEY (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
+/*!40101 SET character_set_client = @saved_cs_client */;
+DROP TABLE IF EXISTS `user_currencies`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `user_currencies` (
+  `user_id` int(10) unsigned NOT NULL,
+  `currency_id` int(10) unsigned NOT NULL,
+  `quantity` int(10) unsigned NOT NULL DEFAULT 0,
+  PRIMARY KEY (`user_id`,`currency_id`),
+  KEY `user_currencies_currency_id_foreign` (`currency_id`),
+  CONSTRAINT `user_currencies_currency_id_foreign` FOREIGN KEY (`currency_id`) REFERENCES `currencies` (`id`),
+  CONSTRAINT `user_currencies_user_id_foreign` FOREIGN KEY (`user_id`) REFERENCES `users` (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
+/*!40101 SET character_set_client = @saved_cs_client */;
+DROP TABLE IF EXISTS `user_items`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `user_items` (
+  `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
+  `item_id` int(10) unsigned NOT NULL,
+  `user_id` int(10) unsigned NOT NULL,
+  `count` int(10) unsigned NOT NULL DEFAULT 1,
+  `data` varchar(1024) COLLATE utf8mb4_unicode_ci DEFAULT NULL,
+  `created_at` timestamp NULL DEFAULT NULL,
+  `updated_at` timestamp NULL DEFAULT NULL,
+  `deleted_at` timestamp NULL DEFAULT NULL,
+  `holding_type` enum('Update','Trade') COLLATE utf8mb4_unicode_ci DEFAULT NULL,
+  `holding_id` int(10) unsigned DEFAULT NULL,
+  PRIMARY KEY (`id`),
+  KEY `inventory_item_id_foreign` (`item_id`),
+  KEY `inventory_user_id_foreign` (`user_id`),
+  CONSTRAINT `inventory_item_id_foreign` FOREIGN KEY (`item_id`) REFERENCES `items` (`id`),
+  CONSTRAINT `inventory_user_id_foreign` FOREIGN KEY (`user_id`) REFERENCES `users` (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
+/*!40101 SET character_set_client = @saved_cs_client */;
+DROP TABLE IF EXISTS `user_items_log`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `user_items_log` (
+  `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
+  `item_id` int(10) unsigned NOT NULL,
+  `sender_id` int(10) unsigned DEFAULT NULL,
+  `recipient_id` int(10) unsigned DEFAULT NULL,
+  `log` varchar(191) COLLATE utf8mb4_unicode_ci NOT NULL,
+  `log_type` varchar(191) COLLATE utf8mb4_unicode_ci NOT NULL,
+  `data` varchar(1024) COLLATE utf8mb4_unicode_ci DEFAULT NULL,
+  `created_at` timestamp NULL DEFAULT NULL,
+  `updated_at` timestamp NULL DEFAULT NULL,
+  `quantity` int(10) unsigned NOT NULL DEFAULT 1,
+  `stack_id` int(10) unsigned DEFAULT NULL,
+  PRIMARY KEY (`id`),
+  KEY `inventory_log_item_id_foreign` (`item_id`),
+  KEY `inventory_log_sender_id_foreign` (`sender_id`),
+  KEY `inventory_log_recipient_id_foreign` (`recipient_id`),
+  KEY `user_items_log_stack_id_foreign` (`stack_id`),
+  CONSTRAINT `inventory_log_item_id_foreign` FOREIGN KEY (`item_id`) REFERENCES `items` (`id`),
+  CONSTRAINT `inventory_log_recipient_id_foreign` FOREIGN KEY (`recipient_id`) REFERENCES `users` (`id`),
+  CONSTRAINT `inventory_log_sender_id_foreign` FOREIGN KEY (`sender_id`) REFERENCES `users` (`id`),
+  CONSTRAINT `user_items_log_stack_id_foreign` FOREIGN KEY (`stack_id`) REFERENCES `user_items` (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
+/*!40101 SET character_set_client = @saved_cs_client */;
+DROP TABLE IF EXISTS `user_profiles`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `user_profiles` (
+  `user_id` int(10) unsigned NOT NULL,
+  `text` text COLLATE utf8mb4_unicode_ci DEFAULT NULL,
+  `parsed_text` text COLLATE utf8mb4_unicode_ci DEFAULT NULL,
+  KEY `user_profiles_user_id_foreign` (`user_id`),
+  CONSTRAINT `user_profiles_user_id_foreign` FOREIGN KEY (`user_id`) REFERENCES `users` (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
+/*!40101 SET character_set_client = @saved_cs_client */;
+DROP TABLE IF EXISTS `user_settings`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `user_settings` (
+  `user_id` int(10) unsigned NOT NULL,
+  `is_fto` tinyint(1) NOT NULL DEFAULT 1,
+  `submission_count` int(10) unsigned NOT NULL DEFAULT 0,
+  `banned_at` timestamp NULL DEFAULT NULL,
+  `ban_reason` text COLLATE utf8mb4_unicode_ci DEFAULT NULL,
+  PRIMARY KEY (`user_id`),
+  CONSTRAINT `user_settings_user_id_foreign` FOREIGN KEY (`user_id`) REFERENCES `users` (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
+/*!40101 SET character_set_client = @saved_cs_client */;
+DROP TABLE IF EXISTS `user_update_log`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `user_update_log` (
+  `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
+  `created_at` timestamp NULL DEFAULT NULL,
+  `updated_at` timestamp NULL DEFAULT NULL,
+  `staff_id` int(10) unsigned DEFAULT NULL,
+  `user_id` int(10) unsigned NOT NULL,
+  `type` varchar(32) COLLATE utf8mb4_unicode_ci NOT NULL,
+  `data` varchar(512) COLLATE utf8mb4_unicode_ci NOT NULL,
+  PRIMARY KEY (`id`),
+  KEY `user_update_log_user_id_foreign` (`user_id`),
+  KEY `user_update_log_staff_id_foreign` (`staff_id`),
+  CONSTRAINT `user_update_log_staff_id_foreign` FOREIGN KEY (`staff_id`) REFERENCES `users` (`id`),
+  CONSTRAINT `user_update_log_user_id_foreign` FOREIGN KEY (`user_id`) REFERENCES `users` (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
+/*!40101 SET character_set_client = @saved_cs_client */;
+DROP TABLE IF EXISTS `users`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `users` (
+  `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
+  `name` varchar(191) COLLATE utf8mb4_unicode_ci NOT NULL,
+  `alias` varchar(191) COLLATE utf8mb4_unicode_ci DEFAULT NULL,
+  `rank_id` int(10) unsigned NOT NULL DEFAULT 1,
+  `notifications_unread` int(10) unsigned NOT NULL DEFAULT 0,
+  `email` varchar(191) COLLATE utf8mb4_unicode_ci NOT NULL,
+  `email_verified_at` timestamp NULL DEFAULT NULL,
+  `password` varchar(191) COLLATE utf8mb4_unicode_ci NOT NULL,
+  `remember_token` varchar(100) COLLATE utf8mb4_unicode_ci DEFAULT NULL,
+  `created_at` timestamp NULL DEFAULT NULL,
+  `updated_at` timestamp NULL DEFAULT NULL,
+  `is_news_unread` tinyint(1) NOT NULL DEFAULT 0,
+  `is_banned` tinyint(1) NOT NULL DEFAULT 0,
+  PRIMARY KEY (`id`),
+  UNIQUE KEY `users_name_unique` (`name`),
+  UNIQUE KEY `users_email_unique` (`email`),
+  KEY `users_rank_id_foreign` (`rank_id`),
+  KEY `users_alias_index` (`alias`),
+  CONSTRAINT `users_rank_id_foreign` FOREIGN KEY (`rank_id`) REFERENCES `ranks` (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
+/*!40101 SET character_set_client = @saved_cs_client */;
+/*!40103 SET TIME_ZONE=@OLD_TIME_ZONE */;
+
+/*!40101 SET SQL_MODE=@OLD_SQL_MODE */;
+/*!40014 SET FOREIGN_KEY_CHECKS=@OLD_FOREIGN_KEY_CHECKS */;
+/*!40014 SET UNIQUE_CHECKS=@OLD_UNIQUE_CHECKS */;
+/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
+
+INSERT INTO `migrations` VALUES (1,'2014_10_12_000000_create_users_table',1);
+INSERT INTO `migrations` VALUES (2,'2014_10_12_100000_create_password_resets_table',1);
+INSERT INTO `migrations` VALUES (3,'2019_02_27_075638_create_game_tables',1);
+INSERT INTO `migrations` VALUES (4,'2019_04_07_130129_add_site_settings',1);
+INSERT INTO `migrations` VALUES (5,'2019_04_09_090831_create_user_log_table',1);
+INSERT INTO `migrations` VALUES (6,'2019_04_09_095513_create_currency_tables',1);
+INSERT INTO `migrations` VALUES (7,'2019_04_12_123405_fix_data_descriptions',1);
+INSERT INTO `migrations` VALUES (8,'2019_04_13_094613_add_owned_currencies',1);
+INSERT INTO `migrations` VALUES (9,'2019_04_14_120732_add_image_to_item_categories',1);
+INSERT INTO `migrations` VALUES (10,'2019_04_14_121447_add_transfer_flag_to_items',1);
+INSERT INTO `migrations` VALUES (11,'2019_04_15_122508_add_prompts_table',1);
+INSERT INTO `migrations` VALUES (12,'2019_04_16_062617_add_parsed_text_to_site_pages',1);
+INSERT INTO `migrations` VALUES (13,'2019_04_16_080112_add_invitation_keys',1);
+INSERT INTO `migrations` VALUES (14,'2019_04_19_125212_fix_inventory_tables',1);
+INSERT INTO `migrations` VALUES (15,'2019_04_20_140827_fix_user_item_log',1);
+INSERT INTO `migrations` VALUES (16,'2019_04_29_080228_fix_inventory_tables_again',1);
+INSERT INTO `migrations` VALUES (17,'2019_04_30_070721_add_notification_data',1);
+INSERT INTO `migrations` VALUES (18,'2019_05_04_091240_add_news',1);
+INSERT INTO `migrations` VALUES (19,'2019_05_11_045038_update_character_tables',1);
+INSERT INTO `migrations` VALUES (20,'2019_05_12_064538_add_species_id_to_images',1);
+INSERT INTO `migrations` VALUES (21,'2019_05_12_100722_make_features_nonunique',1);
+INSERT INTO `migrations` VALUES (22,'2019_05_19_054413_make_character_image_id_nullable',1);
+INSERT INTO `migrations` VALUES (23,'2019_05_20_075936_add_character_sort',1);
+INSERT INTO `migrations` VALUES (24,'2019_06_01_121701_add_changed_data_to_character_log',1);
+INSERT INTO `migrations` VALUES (25,'2019_06_10_083954_create_character_transfer_tables',1);
+INSERT INTO `migrations` VALUES (26,'2019_07_09_063021_create_raffles',1);
+INSERT INTO `migrations` VALUES (27,'2019_07_13_095608_create_loot_tables',1);
+INSERT INTO `migrations` VALUES (28,'2019_07_13_101743_create_prompt_categories',1);
+INSERT INTO `migrations` VALUES (29,'2019_07_15_090200_add_prompt_rewards',1);
+INSERT INTO `migrations` VALUES (30,'2019_07_21_161720_add_prompt_submissions',1);
+INSERT INTO `migrations` VALUES (31,'2019_08_06_092958_add_submission_count_to_user_settings',1);
+INSERT INTO `migrations` VALUES (32,'2019_08_09_123451_make_submission_prompt_id_nullable',1);
+INSERT INTO `migrations` VALUES (33,'2019_08_10_120818_add_myo_slots',1);
+INSERT INTO `migrations` VALUES (34,'2019_08_24_101751_add_design_updates',1);
+INSERT INTO `migrations` VALUES (35,'2019_09_02_101303_drop_images_character_foreign_key',1);
+INSERT INTO `migrations` VALUES (36,'2019_09_08_060400_drop_character_images_foreign_keys',1);
+INSERT INTO `migrations` VALUES (37,'2019_09_08_063923_add_submitted_at_to_design_updates',1);
+INSERT INTO `migrations` VALUES (38,'2019_09_17_110010_rename_design_approval_status',1);
+INSERT INTO `migrations` VALUES (39,'2019_09_28_040911_create_shops',1);
+INSERT INTO `migrations` VALUES (40,'2019_10_02_085738_add_shop_purchase_limits',1);
+INSERT INTO `migrations` VALUES (41,'2019_10_12_095632_add_bans',1);
+INSERT INTO `migrations` VALUES (42,'2019_10_21_081343_add_secure_trades',1);
+INSERT INTO `migrations` VALUES (43,'2019_11_05_062623_modify_trade_confirmation_flags',1);
+INSERT INTO `migrations` VALUES (44,'2019_12_02_090542_add_staff_id_to_trades',1);
+INSERT INTO `migrations` VALUES (45,'2019_12_23_062730_add_item_tags',1);
+INSERT INTO `migrations` VALUES (46,'2020_02_23_135512_make_prompt_category_nullable',1);
+INSERT INTO `migrations` VALUES (47,'2020_03_07_065050_add_bookmarks',1);
+INSERT INTO `migrations` VALUES (48,'2020_03_14_090241_make_character_log_sender_nullable',1);
+INSERT INTO `migrations` VALUES (49,'2020_03_14_124534_add_subtypes',1);
+INSERT INTO `migrations` VALUES (50,'2020_03_23_075539_add_images_to_prompts',1);
+INSERT INTO `migrations` VALUES (51,'2020_03_27_113928_add_subtype_to_features',1);
+INSERT INTO `migrations` VALUES (52,'2020_04_25_114747_drop_log_foreign_keys',1);
+INSERT INTO `migrations` VALUES (53,'2020_05_02_152118_drop_character_myo_counts',1);
+INSERT INTO `migrations` VALUES (54,'2020_06_01_124250_add_parsed_submission_comments',1);
+INSERT INTO `migrations` VALUES (55,'2020_07_31_185640_add_type_to_design_updates',1);
+INSERT INTO `migrations` VALUES (56,'2020_07_31_193235_set_design_update_type_null',1);
+INSERT INTO `migrations` VALUES (57,'2020_10_30_170108_add_gift_writing_status_to_characters',1);
+INSERT INTO `migrations` VALUES (58,'2020_11_09_201534_add_user_id_to_character_image_creators',1);
diff --git a/database/seeds/DatabaseSeeder.php b/database/seeds/DatabaseSeeder.php
index 77bee88bc2..22b41ff1a1 100644
--- a/database/seeds/DatabaseSeeder.php
+++ b/database/seeds/DatabaseSeeder.php
@@ -1,25 +1,20 @@
 <?php
 
-use Illuminate\Database\Seeder;
 use App\Models\User\User;
+use Illuminate\Database\Seeder;
 use Illuminate\Support\Facades\Hash;
 
-class DatabaseSeeder extends Seeder
-{
+class DatabaseSeeder extends Seeder {
     /**
      * Seed the application's database.
-     *
-     * @return void
      */
-    public function run()
-    {
+    public function run() {
         // $this->call(UsersTableSeeder::class);
 
-        
-		// create admin
-		$user = User::create([
-            'name' => 'Admin',
-            'email' => 'admin@admin.com',
+        // create admin
+        $user = User::create([
+            'name'     => 'Admin',
+            'email'    => 'admin@admin.com',
             'password' => Hash::make('admin'),
         ]);
         $user->settings()->create([
diff --git a/package-lock.json b/package-lock.json
new file mode 100644
index 0000000000..4100ffe50f
--- /dev/null
+++ b/package-lock.json
@@ -0,0 +1,18199 @@
+{
+    "name": "lorekeeper",
+    "lockfileVersion": 2,
+    "requires": true,
+    "packages": {
+        "": {
+            "devDependencies": {
+                "axios": "^1.6.2",
+                "blade-formatter": "^1.38.6",
+                "bootstrap": "^4.6",
+                "cross-env": "^7.0",
+                "jquery": "^3.7",
+                "laravel-mix": "^6.0.49",
+                "lodash": "^4.17.21",
+                "popper.js": "^1.16",
+                "resolve-url-loader": "^5.0.0",
+                "sass": "^1.69.5",
+                "sass-loader": "^13.3.2",
+                "vue": "^3.3.13"
+            }
+        },
+        "node_modules/@alloc/quick-lru": {
+            "version": "5.2.0",
+            "resolved": "https://registry.npmjs.org/@alloc/quick-lru/-/quick-lru-5.2.0.tgz",
+            "integrity": "sha512-UrcABB+4bUrFABwbluTIBErXwvbsU/V7TZWfmbgJfbkwiBuziS9gxdODUyuiecfdGQ85jglMW6juS3+z5TsKLw==",
+            "dev": true,
+            "engines": {
+                "node": ">=10"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/sindresorhus"
+            }
+        },
+        "node_modules/@ampproject/remapping": {
+            "version": "2.2.0",
+            "resolved": "https://registry.npmjs.org/@ampproject/remapping/-/remapping-2.2.0.tgz",
+            "integrity": "sha512-qRmjj8nj9qmLTQXXmaR1cck3UXSRMPrbsLJAasZpF+t3riI71BXed5ebIOYwQntykeZuhjsdweEc9BxH5Jc26w==",
+            "dev": true,
+            "dependencies": {
+                "@jridgewell/gen-mapping": "^0.1.0",
+                "@jridgewell/trace-mapping": "^0.3.9"
+            },
+            "engines": {
+                "node": ">=6.0.0"
+            }
+        },
+        "node_modules/@babel/code-frame": {
+            "version": "7.22.13",
+            "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.22.13.tgz",
+            "integrity": "sha512-XktuhWlJ5g+3TJXc5upd9Ks1HutSArik6jf2eAjYFyIOf4ej3RN+184cZbzDvbPnuTJIUhPKKJE3cIsYTiAT3w==",
+            "dev": true,
+            "dependencies": {
+                "@babel/highlight": "^7.22.13",
+                "chalk": "^2.4.2"
+            },
+            "engines": {
+                "node": ">=6.9.0"
+            }
+        },
+        "node_modules/@babel/code-frame/node_modules/ansi-styles": {
+            "version": "3.2.1",
+            "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
+            "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
+            "dev": true,
+            "dependencies": {
+                "color-convert": "^1.9.0"
+            },
+            "engines": {
+                "node": ">=4"
+            }
+        },
+        "node_modules/@babel/code-frame/node_modules/chalk": {
+            "version": "2.4.2",
+            "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
+            "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
+            "dev": true,
+            "dependencies": {
+                "ansi-styles": "^3.2.1",
+                "escape-string-regexp": "^1.0.5",
+                "supports-color": "^5.3.0"
+            },
+            "engines": {
+                "node": ">=4"
+            }
+        },
+        "node_modules/@babel/code-frame/node_modules/color-convert": {
+            "version": "1.9.3",
+            "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
+            "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
+            "dev": true,
+            "dependencies": {
+                "color-name": "1.1.3"
+            }
+        },
+        "node_modules/@babel/code-frame/node_modules/color-name": {
+            "version": "1.1.3",
+            "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
+            "integrity": "sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw==",
+            "dev": true
+        },
+        "node_modules/@babel/code-frame/node_modules/has-flag": {
+            "version": "3.0.0",
+            "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
+            "integrity": "sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw==",
+            "dev": true,
+            "engines": {
+                "node": ">=4"
+            }
+        },
+        "node_modules/@babel/code-frame/node_modules/supports-color": {
+            "version": "5.5.0",
+            "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
+            "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
+            "dev": true,
+            "dependencies": {
+                "has-flag": "^3.0.0"
+            },
+            "engines": {
+                "node": ">=4"
+            }
+        },
+        "node_modules/@babel/compat-data": {
+            "version": "7.18.8",
+            "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.18.8.tgz",
+            "integrity": "sha512-HSmX4WZPPK3FUxYp7g2T6EyO8j96HlZJlxmKPSh6KAcqwyDrfx7hKjXpAW/0FhFfTJsR0Yt4lAjLI2coMptIHQ==",
+            "dev": true,
+            "engines": {
+                "node": ">=6.9.0"
+            }
+        },
+        "node_modules/@babel/core": {
+            "version": "7.18.6",
+            "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.18.6.tgz",
+            "integrity": "sha512-cQbWBpxcbbs/IUredIPkHiAGULLV8iwgNRMFzvbhEXISp4f3rUUXE5+TIw6KwUWUR3DwyI6gmBRnmAtYaWehwQ==",
+            "dev": true,
+            "dependencies": {
+                "@ampproject/remapping": "^2.1.0",
+                "@babel/code-frame": "^7.18.6",
+                "@babel/generator": "^7.18.6",
+                "@babel/helper-compilation-targets": "^7.18.6",
+                "@babel/helper-module-transforms": "^7.18.6",
+                "@babel/helpers": "^7.18.6",
+                "@babel/parser": "^7.18.6",
+                "@babel/template": "^7.18.6",
+                "@babel/traverse": "^7.18.6",
+                "@babel/types": "^7.18.6",
+                "convert-source-map": "^1.7.0",
+                "debug": "^4.1.0",
+                "gensync": "^1.0.0-beta.2",
+                "json5": "^2.2.1",
+                "semver": "^6.3.0"
+            },
+            "engines": {
+                "node": ">=6.9.0"
+            },
+            "funding": {
+                "type": "opencollective",
+                "url": "https://opencollective.com/babel"
+            }
+        },
+        "node_modules/@babel/core/node_modules/semver": {
+            "version": "6.3.1",
+            "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
+            "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==",
+            "dev": true,
+            "bin": {
+                "semver": "bin/semver.js"
+            }
+        },
+        "node_modules/@babel/generator": {
+            "version": "7.23.0",
+            "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.23.0.tgz",
+            "integrity": "sha512-lN85QRR+5IbYrMWM6Y4pE/noaQtg4pNiqeNGX60eqOfo6gtEj6uw/JagelB8vVztSd7R6M5n1+PQkDbHbBRU4g==",
+            "dev": true,
+            "dependencies": {
+                "@babel/types": "^7.23.0",
+                "@jridgewell/gen-mapping": "^0.3.2",
+                "@jridgewell/trace-mapping": "^0.3.17",
+                "jsesc": "^2.5.1"
+            },
+            "engines": {
+                "node": ">=6.9.0"
+            }
+        },
+        "node_modules/@babel/generator/node_modules/@jridgewell/gen-mapping": {
+            "version": "0.3.2",
+            "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.2.tgz",
+            "integrity": "sha512-mh65xKQAzI6iBcFzwv28KVWSmCkdRBWoOh+bYQGW3+6OZvbbN3TqMGo5hqYxQniRcH9F2VZIoJCm4pa3BPDK/A==",
+            "dev": true,
+            "dependencies": {
+                "@jridgewell/set-array": "^1.0.1",
+                "@jridgewell/sourcemap-codec": "^1.4.10",
+                "@jridgewell/trace-mapping": "^0.3.9"
+            },
+            "engines": {
+                "node": ">=6.0.0"
+            }
+        },
+        "node_modules/@babel/helper-annotate-as-pure": {
+            "version": "7.18.6",
+            "resolved": "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.18.6.tgz",
+            "integrity": "sha512-duORpUiYrEpzKIop6iNbjnwKLAKnJ47csTyRACyEmWj0QdUrm5aqNJGHSSEQSUAvNW0ojX0dOmK9dZduvkfeXA==",
+            "dev": true,
+            "dependencies": {
+                "@babel/types": "^7.18.6"
+            },
+            "engines": {
+                "node": ">=6.9.0"
+            }
+        },
+        "node_modules/@babel/helper-builder-binary-assignment-operator-visitor": {
+            "version": "7.18.6",
+            "resolved": "https://registry.npmjs.org/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.18.6.tgz",
+            "integrity": "sha512-KT10c1oWEpmrIRYnthbzHgoOf6B+Xd6a5yhdbNtdhtG7aO1or5HViuf1TQR36xY/QprXA5nvxO6nAjhJ4y38jw==",
+            "dev": true,
+            "dependencies": {
+                "@babel/helper-explode-assignable-expression": "^7.18.6",
+                "@babel/types": "^7.18.6"
+            },
+            "engines": {
+                "node": ">=6.9.0"
+            }
+        },
+        "node_modules/@babel/helper-compilation-targets": {
+            "version": "7.18.6",
+            "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.18.6.tgz",
+            "integrity": "sha512-vFjbfhNCzqdeAtZflUFrG5YIFqGTqsctrtkZ1D/NB0mDW9TwW3GmmUepYY4G9wCET5rY5ugz4OGTcLd614IzQg==",
+            "dev": true,
+            "dependencies": {
+                "@babel/compat-data": "^7.18.6",
+                "@babel/helper-validator-option": "^7.18.6",
+                "browserslist": "^4.20.2",
+                "semver": "^6.3.0"
+            },
+            "engines": {
+                "node": ">=6.9.0"
+            },
+            "peerDependencies": {
+                "@babel/core": "^7.0.0"
+            }
+        },
+        "node_modules/@babel/helper-compilation-targets/node_modules/semver": {
+            "version": "6.3.1",
+            "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
+            "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==",
+            "dev": true,
+            "bin": {
+                "semver": "bin/semver.js"
+            }
+        },
+        "node_modules/@babel/helper-create-class-features-plugin": {
+            "version": "7.18.6",
+            "resolved": "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.18.6.tgz",
+            "integrity": "sha512-YfDzdnoxHGV8CzqHGyCbFvXg5QESPFkXlHtvdCkesLjjVMT2Adxe4FGUR5ChIb3DxSaXO12iIOCWoXdsUVwnqw==",
+            "dev": true,
+            "dependencies": {
+                "@babel/helper-annotate-as-pure": "^7.18.6",
+                "@babel/helper-environment-visitor": "^7.18.6",
+                "@babel/helper-function-name": "^7.18.6",
+                "@babel/helper-member-expression-to-functions": "^7.18.6",
+                "@babel/helper-optimise-call-expression": "^7.18.6",
+                "@babel/helper-replace-supers": "^7.18.6",
+                "@babel/helper-split-export-declaration": "^7.18.6"
+            },
+            "engines": {
+                "node": ">=6.9.0"
+            },
+            "peerDependencies": {
+                "@babel/core": "^7.0.0"
+            }
+        },
+        "node_modules/@babel/helper-create-regexp-features-plugin": {
+            "version": "7.18.6",
+            "resolved": "https://registry.npmjs.org/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.18.6.tgz",
+            "integrity": "sha512-7LcpH1wnQLGrI+4v+nPp+zUvIkF9x0ddv1Hkdue10tg3gmRnLy97DXh4STiOf1qeIInyD69Qv5kKSZzKD8B/7A==",
+            "dev": true,
+            "dependencies": {
+                "@babel/helper-annotate-as-pure": "^7.18.6",
+                "regexpu-core": "^5.1.0"
+            },
+            "engines": {
+                "node": ">=6.9.0"
+            },
+            "peerDependencies": {
+                "@babel/core": "^7.0.0"
+            }
+        },
+        "node_modules/@babel/helper-define-polyfill-provider": {
+            "version": "0.3.1",
+            "resolved": "https://registry.npmjs.org/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.3.1.tgz",
+            "integrity": "sha512-J9hGMpJQmtWmj46B3kBHmL38UhJGhYX7eqkcq+2gsstyYt341HmPeWspihX43yVRA0mS+8GGk2Gckc7bY/HCmA==",
+            "dev": true,
+            "dependencies": {
+                "@babel/helper-compilation-targets": "^7.13.0",
+                "@babel/helper-module-imports": "^7.12.13",
+                "@babel/helper-plugin-utils": "^7.13.0",
+                "@babel/traverse": "^7.13.0",
+                "debug": "^4.1.1",
+                "lodash.debounce": "^4.0.8",
+                "resolve": "^1.14.2",
+                "semver": "^6.1.2"
+            },
+            "peerDependencies": {
+                "@babel/core": "^7.4.0-0"
+            }
+        },
+        "node_modules/@babel/helper-define-polyfill-provider/node_modules/semver": {
+            "version": "6.3.1",
+            "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
+            "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==",
+            "dev": true,
+            "bin": {
+                "semver": "bin/semver.js"
+            }
+        },
+        "node_modules/@babel/helper-environment-visitor": {
+            "version": "7.22.20",
+            "resolved": "https://registry.npmjs.org/@babel/helper-environment-visitor/-/helper-environment-visitor-7.22.20.tgz",
+            "integrity": "sha512-zfedSIzFhat/gFhWfHtgWvlec0nqB9YEIVrpuwjruLlXfUSnA8cJB0miHKwqDnQ7d32aKo2xt88/xZptwxbfhA==",
+            "dev": true,
+            "engines": {
+                "node": ">=6.9.0"
+            }
+        },
+        "node_modules/@babel/helper-explode-assignable-expression": {
+            "version": "7.18.6",
+            "resolved": "https://registry.npmjs.org/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.18.6.tgz",
+            "integrity": "sha512-eyAYAsQmB80jNfg4baAtLeWAQHfHFiR483rzFK+BhETlGZaQC9bsfrugfXDCbRHLQbIA7U5NxhhOxN7p/dWIcg==",
+            "dev": true,
+            "dependencies": {
+                "@babel/types": "^7.18.6"
+            },
+            "engines": {
+                "node": ">=6.9.0"
+            }
+        },
+        "node_modules/@babel/helper-function-name": {
+            "version": "7.23.0",
+            "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.23.0.tgz",
+            "integrity": "sha512-OErEqsrxjZTJciZ4Oo+eoZqeW9UIiOcuYKRJA4ZAgV9myA+pOXhhmpfNCKjEH/auVfEYVFJ6y1Tc4r0eIApqiw==",
+            "dev": true,
+            "dependencies": {
+                "@babel/template": "^7.22.15",
+                "@babel/types": "^7.23.0"
+            },
+            "engines": {
+                "node": ">=6.9.0"
+            }
+        },
+        "node_modules/@babel/helper-hoist-variables": {
+            "version": "7.22.5",
+            "resolved": "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.22.5.tgz",
+            "integrity": "sha512-wGjk9QZVzvknA6yKIUURb8zY3grXCcOZt+/7Wcy8O2uctxhplmUPkOdlgoNhmdVee2c92JXbf1xpMtVNbfoxRw==",
+            "dev": true,
+            "dependencies": {
+                "@babel/types": "^7.22.5"
+            },
+            "engines": {
+                "node": ">=6.9.0"
+            }
+        },
+        "node_modules/@babel/helper-member-expression-to-functions": {
+            "version": "7.18.6",
+            "resolved": "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.18.6.tgz",
+            "integrity": "sha512-CeHxqwwipekotzPDUuJOfIMtcIHBuc7WAzLmTYWctVigqS5RktNMQ5bEwQSuGewzYnCtTWa3BARXeiLxDTv+Ng==",
+            "dev": true,
+            "dependencies": {
+                "@babel/types": "^7.18.6"
+            },
+            "engines": {
+                "node": ">=6.9.0"
+            }
+        },
+        "node_modules/@babel/helper-module-imports": {
+            "version": "7.18.6",
+            "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.18.6.tgz",
+            "integrity": "sha512-0NFvs3VkuSYbFi1x2Vd6tKrywq+z/cLeYC/RJNFrIX/30Bf5aiGYbtvGXolEktzJH8o5E5KJ3tT+nkxuuZFVlA==",
+            "dev": true,
+            "dependencies": {
+                "@babel/types": "^7.18.6"
+            },
+            "engines": {
+                "node": ">=6.9.0"
+            }
+        },
+        "node_modules/@babel/helper-module-transforms": {
+            "version": "7.18.8",
+            "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.18.8.tgz",
+            "integrity": "sha512-che3jvZwIcZxrwh63VfnFTUzcAM9v/lznYkkRxIBGMPt1SudOKHAEec0SIRCfiuIzTcF7VGj/CaTT6gY4eWxvA==",
+            "dev": true,
+            "dependencies": {
+                "@babel/helper-environment-visitor": "^7.18.6",
+                "@babel/helper-module-imports": "^7.18.6",
+                "@babel/helper-simple-access": "^7.18.6",
+                "@babel/helper-split-export-declaration": "^7.18.6",
+                "@babel/helper-validator-identifier": "^7.18.6",
+                "@babel/template": "^7.18.6",
+                "@babel/traverse": "^7.18.8",
+                "@babel/types": "^7.18.8"
+            },
+            "engines": {
+                "node": ">=6.9.0"
+            }
+        },
+        "node_modules/@babel/helper-optimise-call-expression": {
+            "version": "7.18.6",
+            "resolved": "https://registry.npmjs.org/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.18.6.tgz",
+            "integrity": "sha512-HP59oD9/fEHQkdcbgFCnbmgH5vIQTJbxh2yf+CdM89/glUNnuzr87Q8GIjGEnOktTROemO0Pe0iPAYbqZuOUiA==",
+            "dev": true,
+            "dependencies": {
+                "@babel/types": "^7.18.6"
+            },
+            "engines": {
+                "node": ">=6.9.0"
+            }
+        },
+        "node_modules/@babel/helper-plugin-utils": {
+            "version": "7.18.6",
+            "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.18.6.tgz",
+            "integrity": "sha512-gvZnm1YAAxh13eJdkb9EWHBnF3eAub3XTLCZEehHT2kWxiKVRL64+ae5Y6Ivne0mVHmMYKT+xWgZO+gQhuLUBg==",
+            "dev": true,
+            "engines": {
+                "node": ">=6.9.0"
+            }
+        },
+        "node_modules/@babel/helper-remap-async-to-generator": {
+            "version": "7.18.6",
+            "resolved": "https://registry.npmjs.org/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.18.6.tgz",
+            "integrity": "sha512-z5wbmV55TveUPZlCLZvxWHtrjuJd+8inFhk7DG0WW87/oJuGDcjDiu7HIvGcpf5464L6xKCg3vNkmlVVz9hwyQ==",
+            "dev": true,
+            "dependencies": {
+                "@babel/helper-annotate-as-pure": "^7.18.6",
+                "@babel/helper-environment-visitor": "^7.18.6",
+                "@babel/helper-wrap-function": "^7.18.6",
+                "@babel/types": "^7.18.6"
+            },
+            "engines": {
+                "node": ">=6.9.0"
+            },
+            "peerDependencies": {
+                "@babel/core": "^7.0.0"
+            }
+        },
+        "node_modules/@babel/helper-replace-supers": {
+            "version": "7.18.6",
+            "resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.18.6.tgz",
+            "integrity": "sha512-fTf7zoXnUGl9gF25fXCWE26t7Tvtyn6H4hkLSYhATwJvw2uYxd3aoXplMSe0g9XbwK7bmxNes7+FGO0rB/xC0g==",
+            "dev": true,
+            "dependencies": {
+                "@babel/helper-environment-visitor": "^7.18.6",
+                "@babel/helper-member-expression-to-functions": "^7.18.6",
+                "@babel/helper-optimise-call-expression": "^7.18.6",
+                "@babel/traverse": "^7.18.6",
+                "@babel/types": "^7.18.6"
+            },
+            "engines": {
+                "node": ">=6.9.0"
+            }
+        },
+        "node_modules/@babel/helper-simple-access": {
+            "version": "7.18.6",
+            "resolved": "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.18.6.tgz",
+            "integrity": "sha512-iNpIgTgyAvDQpDj76POqg+YEt8fPxx3yaNBg3S30dxNKm2SWfYhD0TGrK/Eu9wHpUW63VQU894TsTg+GLbUa1g==",
+            "dev": true,
+            "dependencies": {
+                "@babel/types": "^7.18.6"
+            },
+            "engines": {
+                "node": ">=6.9.0"
+            }
+        },
+        "node_modules/@babel/helper-skip-transparent-expression-wrappers": {
+            "version": "7.18.6",
+            "resolved": "https://registry.npmjs.org/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.18.6.tgz",
+            "integrity": "sha512-4KoLhwGS9vGethZpAhYnMejWkX64wsnHPDwvOsKWU6Fg4+AlK2Jz3TyjQLMEPvz+1zemi/WBdkYxCD0bAfIkiw==",
+            "dev": true,
+            "dependencies": {
+                "@babel/types": "^7.18.6"
+            },
+            "engines": {
+                "node": ">=6.9.0"
+            }
+        },
+        "node_modules/@babel/helper-split-export-declaration": {
+            "version": "7.22.6",
+            "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.22.6.tgz",
+            "integrity": "sha512-AsUnxuLhRYsisFiaJwvp1QF+I3KjD5FOxut14q/GzovUe6orHLesW2C7d754kRm53h5gqrz6sFl6sxc4BVtE/g==",
+            "dev": true,
+            "dependencies": {
+                "@babel/types": "^7.22.5"
+            },
+            "engines": {
+                "node": ">=6.9.0"
+            }
+        },
+        "node_modules/@babel/helper-string-parser": {
+            "version": "7.22.5",
+            "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.22.5.tgz",
+            "integrity": "sha512-mM4COjgZox8U+JcXQwPijIZLElkgEpO5rsERVDJTc2qfCDfERyob6k5WegS14SX18IIjv+XD+GrqNumY5JRCDw==",
+            "dev": true,
+            "engines": {
+                "node": ">=6.9.0"
+            }
+        },
+        "node_modules/@babel/helper-validator-identifier": {
+            "version": "7.22.20",
+            "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.22.20.tgz",
+            "integrity": "sha512-Y4OZ+ytlatR8AI+8KZfKuL5urKp7qey08ha31L8b3BwewJAoJamTzyvxPR/5D+KkdJCGPq/+8TukHBlY10FX9A==",
+            "dev": true,
+            "engines": {
+                "node": ">=6.9.0"
+            }
+        },
+        "node_modules/@babel/helper-validator-option": {
+            "version": "7.18.6",
+            "resolved": "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.18.6.tgz",
+            "integrity": "sha512-XO7gESt5ouv/LRJdrVjkShckw6STTaB7l9BrpBaAHDeF5YZT+01PCwmR0SJHnkW6i8OwW/EVWRShfi4j2x+KQw==",
+            "dev": true,
+            "engines": {
+                "node": ">=6.9.0"
+            }
+        },
+        "node_modules/@babel/helper-wrap-function": {
+            "version": "7.18.6",
+            "resolved": "https://registry.npmjs.org/@babel/helper-wrap-function/-/helper-wrap-function-7.18.6.tgz",
+            "integrity": "sha512-I5/LZfozwMNbwr/b1vhhuYD+J/mU+gfGAj5td7l5Rv9WYmH6i3Om69WGKNmlIpsVW/mF6O5bvTKbvDQZVgjqOw==",
+            "dev": true,
+            "dependencies": {
+                "@babel/helper-function-name": "^7.18.6",
+                "@babel/template": "^7.18.6",
+                "@babel/traverse": "^7.18.6",
+                "@babel/types": "^7.18.6"
+            },
+            "engines": {
+                "node": ">=6.9.0"
+            }
+        },
+        "node_modules/@babel/helpers": {
+            "version": "7.18.6",
+            "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.18.6.tgz",
+            "integrity": "sha512-vzSiiqbQOghPngUYt/zWGvK3LAsPhz55vc9XNN0xAl2gV4ieShI2OQli5duxWHD+72PZPTKAcfcZDE1Cwc5zsQ==",
+            "dev": true,
+            "dependencies": {
+                "@babel/template": "^7.18.6",
+                "@babel/traverse": "^7.18.6",
+                "@babel/types": "^7.18.6"
+            },
+            "engines": {
+                "node": ">=6.9.0"
+            }
+        },
+        "node_modules/@babel/highlight": {
+            "version": "7.22.20",
+            "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.22.20.tgz",
+            "integrity": "sha512-dkdMCN3py0+ksCgYmGG8jKeGA/8Tk+gJwSYYlFGxG5lmhfKNoAy004YpLxpS1W2J8m/EK2Ew+yOs9pVRwO89mg==",
+            "dev": true,
+            "dependencies": {
+                "@babel/helper-validator-identifier": "^7.22.20",
+                "chalk": "^2.4.2",
+                "js-tokens": "^4.0.0"
+            },
+            "engines": {
+                "node": ">=6.9.0"
+            }
+        },
+        "node_modules/@babel/highlight/node_modules/ansi-styles": {
+            "version": "3.2.1",
+            "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
+            "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
+            "dev": true,
+            "dependencies": {
+                "color-convert": "^1.9.0"
+            },
+            "engines": {
+                "node": ">=4"
+            }
+        },
+        "node_modules/@babel/highlight/node_modules/chalk": {
+            "version": "2.4.2",
+            "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
+            "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
+            "dev": true,
+            "dependencies": {
+                "ansi-styles": "^3.2.1",
+                "escape-string-regexp": "^1.0.5",
+                "supports-color": "^5.3.0"
+            },
+            "engines": {
+                "node": ">=4"
+            }
+        },
+        "node_modules/@babel/highlight/node_modules/color-convert": {
+            "version": "1.9.3",
+            "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
+            "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
+            "dev": true,
+            "dependencies": {
+                "color-name": "1.1.3"
+            }
+        },
+        "node_modules/@babel/highlight/node_modules/color-name": {
+            "version": "1.1.3",
+            "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
+            "integrity": "sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw==",
+            "dev": true
+        },
+        "node_modules/@babel/highlight/node_modules/has-flag": {
+            "version": "3.0.0",
+            "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
+            "integrity": "sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw==",
+            "dev": true,
+            "engines": {
+                "node": ">=4"
+            }
+        },
+        "node_modules/@babel/highlight/node_modules/supports-color": {
+            "version": "5.5.0",
+            "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
+            "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
+            "dev": true,
+            "dependencies": {
+                "has-flag": "^3.0.0"
+            },
+            "engines": {
+                "node": ">=4"
+            }
+        },
+        "node_modules/@babel/parser": {
+            "version": "7.23.5",
+            "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.23.5.tgz",
+            "integrity": "sha512-hOOqoiNXrmGdFbhgCzu6GiURxUgM27Xwd/aPuu8RfHEZPBzL1Z54okAHAQjXfcQNwvrlkAmAp4SlRTZ45vlthQ==",
+            "dev": true,
+            "bin": {
+                "parser": "bin/babel-parser.js"
+            },
+            "engines": {
+                "node": ">=6.0.0"
+            }
+        },
+        "node_modules/@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression": {
+            "version": "7.18.6",
+            "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression/-/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.18.6.tgz",
+            "integrity": "sha512-Dgxsyg54Fx1d4Nge8UnvTrED63vrwOdPmyvPzlNN/boaliRP54pm3pGzZD1SJUwrBA+Cs/xdG8kXX6Mn/RfISQ==",
+            "dev": true,
+            "dependencies": {
+                "@babel/helper-plugin-utils": "^7.18.6"
+            },
+            "engines": {
+                "node": ">=6.9.0"
+            },
+            "peerDependencies": {
+                "@babel/core": "^7.0.0"
+            }
+        },
+        "node_modules/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining": {
+            "version": "7.18.6",
+            "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining/-/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.18.6.tgz",
+            "integrity": "sha512-Udgu8ZRgrBrttVz6A0EVL0SJ1z+RLbIeqsu632SA1hf0awEppD6TvdznoH+orIF8wtFFAV/Enmw9Y+9oV8TQcw==",
+            "dev": true,
+            "dependencies": {
+                "@babel/helper-plugin-utils": "^7.18.6",
+                "@babel/helper-skip-transparent-expression-wrappers": "^7.18.6",
+                "@babel/plugin-proposal-optional-chaining": "^7.18.6"
+            },
+            "engines": {
+                "node": ">=6.9.0"
+            },
+            "peerDependencies": {
+                "@babel/core": "^7.13.0"
+            }
+        },
+        "node_modules/@babel/plugin-proposal-async-generator-functions": {
+            "version": "7.18.6",
+            "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.18.6.tgz",
+            "integrity": "sha512-WAz4R9bvozx4qwf74M+sfqPMKfSqwM0phxPTR6iJIi8robgzXwkEgmeJG1gEKhm6sDqT/U9aV3lfcqybIpev8w==",
+            "dev": true,
+            "dependencies": {
+                "@babel/helper-environment-visitor": "^7.18.6",
+                "@babel/helper-plugin-utils": "^7.18.6",
+                "@babel/helper-remap-async-to-generator": "^7.18.6",
+                "@babel/plugin-syntax-async-generators": "^7.8.4"
+            },
+            "engines": {
+                "node": ">=6.9.0"
+            },
+            "peerDependencies": {
+                "@babel/core": "^7.0.0-0"
+            }
+        },
+        "node_modules/@babel/plugin-proposal-class-properties": {
+            "version": "7.18.6",
+            "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.18.6.tgz",
+            "integrity": "sha512-cumfXOF0+nzZrrN8Rf0t7M+tF6sZc7vhQwYQck9q1/5w2OExlD+b4v4RpMJFaV1Z7WcDRgO6FqvxqxGlwo+RHQ==",
+            "dev": true,
+            "dependencies": {
+                "@babel/helper-create-class-features-plugin": "^7.18.6",
+                "@babel/helper-plugin-utils": "^7.18.6"
+            },
+            "engines": {
+                "node": ">=6.9.0"
+            },
+            "peerDependencies": {
+                "@babel/core": "^7.0.0-0"
+            }
+        },
+        "node_modules/@babel/plugin-proposal-class-static-block": {
+            "version": "7.18.6",
+            "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-class-static-block/-/plugin-proposal-class-static-block-7.18.6.tgz",
+            "integrity": "sha512-+I3oIiNxrCpup3Gi8n5IGMwj0gOCAjcJUSQEcotNnCCPMEnixawOQ+KeJPlgfjzx+FKQ1QSyZOWe7wmoJp7vhw==",
+            "dev": true,
+            "dependencies": {
+                "@babel/helper-create-class-features-plugin": "^7.18.6",
+                "@babel/helper-plugin-utils": "^7.18.6",
+                "@babel/plugin-syntax-class-static-block": "^7.14.5"
+            },
+            "engines": {
+                "node": ">=6.9.0"
+            },
+            "peerDependencies": {
+                "@babel/core": "^7.12.0"
+            }
+        },
+        "node_modules/@babel/plugin-proposal-dynamic-import": {
+            "version": "7.18.6",
+            "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-dynamic-import/-/plugin-proposal-dynamic-import-7.18.6.tgz",
+            "integrity": "sha512-1auuwmK+Rz13SJj36R+jqFPMJWyKEDd7lLSdOj4oJK0UTgGueSAtkrCvz9ewmgyU/P941Rv2fQwZJN8s6QruXw==",
+            "dev": true,
+            "dependencies": {
+                "@babel/helper-plugin-utils": "^7.18.6",
+                "@babel/plugin-syntax-dynamic-import": "^7.8.3"
+            },
+            "engines": {
+                "node": ">=6.9.0"
+            },
+            "peerDependencies": {
+                "@babel/core": "^7.0.0-0"
+            }
+        },
+        "node_modules/@babel/plugin-proposal-export-namespace-from": {
+            "version": "7.18.6",
+            "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-export-namespace-from/-/plugin-proposal-export-namespace-from-7.18.6.tgz",
+            "integrity": "sha512-zr/QcUlUo7GPo6+X1wC98NJADqmy5QTFWWhqeQWiki4XHafJtLl/YMGkmRB2szDD2IYJCCdBTd4ElwhId9T7Xw==",
+            "dev": true,
+            "dependencies": {
+                "@babel/helper-plugin-utils": "^7.18.6",
+                "@babel/plugin-syntax-export-namespace-from": "^7.8.3"
+            },
+            "engines": {
+                "node": ">=6.9.0"
+            },
+            "peerDependencies": {
+                "@babel/core": "^7.0.0-0"
+            }
+        },
+        "node_modules/@babel/plugin-proposal-json-strings": {
+            "version": "7.18.6",
+            "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.18.6.tgz",
+            "integrity": "sha512-lr1peyn9kOdbYc0xr0OdHTZ5FMqS6Di+H0Fz2I/JwMzGmzJETNeOFq2pBySw6X/KFL5EWDjlJuMsUGRFb8fQgQ==",
+            "dev": true,
+            "dependencies": {
+                "@babel/helper-plugin-utils": "^7.18.6",
+                "@babel/plugin-syntax-json-strings": "^7.8.3"
+            },
+            "engines": {
+                "node": ">=6.9.0"
+            },
+            "peerDependencies": {
+                "@babel/core": "^7.0.0-0"
+            }
+        },
+        "node_modules/@babel/plugin-proposal-logical-assignment-operators": {
+            "version": "7.18.6",
+            "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-logical-assignment-operators/-/plugin-proposal-logical-assignment-operators-7.18.6.tgz",
+            "integrity": "sha512-zMo66azZth/0tVd7gmkxOkOjs2rpHyhpcFo565PUP37hSp6hSd9uUKIfTDFMz58BwqgQKhJ9YxtM5XddjXVn+Q==",
+            "dev": true,
+            "dependencies": {
+                "@babel/helper-plugin-utils": "^7.18.6",
+                "@babel/plugin-syntax-logical-assignment-operators": "^7.10.4"
+            },
+            "engines": {
+                "node": ">=6.9.0"
+            },
+            "peerDependencies": {
+                "@babel/core": "^7.0.0-0"
+            }
+        },
+        "node_modules/@babel/plugin-proposal-nullish-coalescing-operator": {
+            "version": "7.18.6",
+            "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-nullish-coalescing-operator/-/plugin-proposal-nullish-coalescing-operator-7.18.6.tgz",
+            "integrity": "sha512-wQxQzxYeJqHcfppzBDnm1yAY0jSRkUXR2z8RePZYrKwMKgMlE8+Z6LUno+bd6LvbGh8Gltvy74+9pIYkr+XkKA==",
+            "dev": true,
+            "dependencies": {
+                "@babel/helper-plugin-utils": "^7.18.6",
+                "@babel/plugin-syntax-nullish-coalescing-operator": "^7.8.3"
+            },
+            "engines": {
+                "node": ">=6.9.0"
+            },
+            "peerDependencies": {
+                "@babel/core": "^7.0.0-0"
+            }
+        },
+        "node_modules/@babel/plugin-proposal-numeric-separator": {
+            "version": "7.18.6",
+            "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-numeric-separator/-/plugin-proposal-numeric-separator-7.18.6.tgz",
+            "integrity": "sha512-ozlZFogPqoLm8WBr5Z8UckIoE4YQ5KESVcNudyXOR8uqIkliTEgJ3RoketfG6pmzLdeZF0H/wjE9/cCEitBl7Q==",
+            "dev": true,
+            "dependencies": {
+                "@babel/helper-plugin-utils": "^7.18.6",
+                "@babel/plugin-syntax-numeric-separator": "^7.10.4"
+            },
+            "engines": {
+                "node": ">=6.9.0"
+            },
+            "peerDependencies": {
+                "@babel/core": "^7.0.0-0"
+            }
+        },
+        "node_modules/@babel/plugin-proposal-object-rest-spread": {
+            "version": "7.18.6",
+            "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.18.6.tgz",
+            "integrity": "sha512-9yuM6wr4rIsKa1wlUAbZEazkCrgw2sMPEXCr4Rnwetu7cEW1NydkCWytLuYletbf8vFxdJxFhwEZqMpOx2eZyw==",
+            "dev": true,
+            "dependencies": {
+                "@babel/compat-data": "^7.18.6",
+                "@babel/helper-compilation-targets": "^7.18.6",
+                "@babel/helper-plugin-utils": "^7.18.6",
+                "@babel/plugin-syntax-object-rest-spread": "^7.8.3",
+                "@babel/plugin-transform-parameters": "^7.18.6"
+            },
+            "engines": {
+                "node": ">=6.9.0"
+            },
+            "peerDependencies": {
+                "@babel/core": "^7.0.0-0"
+            }
+        },
+        "node_modules/@babel/plugin-proposal-optional-catch-binding": {
+            "version": "7.18.6",
+            "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-optional-catch-binding/-/plugin-proposal-optional-catch-binding-7.18.6.tgz",
+            "integrity": "sha512-Q40HEhs9DJQyaZfUjjn6vE8Cv4GmMHCYuMGIWUnlxH6400VGxOuwWsPt4FxXxJkC/5eOzgn0z21M9gMT4MOhbw==",
+            "dev": true,
+            "dependencies": {
+                "@babel/helper-plugin-utils": "^7.18.6",
+                "@babel/plugin-syntax-optional-catch-binding": "^7.8.3"
+            },
+            "engines": {
+                "node": ">=6.9.0"
+            },
+            "peerDependencies": {
+                "@babel/core": "^7.0.0-0"
+            }
+        },
+        "node_modules/@babel/plugin-proposal-optional-chaining": {
+            "version": "7.18.6",
+            "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.18.6.tgz",
+            "integrity": "sha512-PatI6elL5eMzoypFAiYDpYQyMtXTn+iMhuxxQt5mAXD4fEmKorpSI3PHd+i3JXBJN3xyA6MvJv7at23HffFHwA==",
+            "dev": true,
+            "dependencies": {
+                "@babel/helper-plugin-utils": "^7.18.6",
+                "@babel/helper-skip-transparent-expression-wrappers": "^7.18.6",
+                "@babel/plugin-syntax-optional-chaining": "^7.8.3"
+            },
+            "engines": {
+                "node": ">=6.9.0"
+            },
+            "peerDependencies": {
+                "@babel/core": "^7.0.0-0"
+            }
+        },
+        "node_modules/@babel/plugin-proposal-private-methods": {
+            "version": "7.18.6",
+            "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-private-methods/-/plugin-proposal-private-methods-7.18.6.tgz",
+            "integrity": "sha512-nutsvktDItsNn4rpGItSNV2sz1XwS+nfU0Rg8aCx3W3NOKVzdMjJRu0O5OkgDp3ZGICSTbgRpxZoWsxoKRvbeA==",
+            "dev": true,
+            "dependencies": {
+                "@babel/helper-create-class-features-plugin": "^7.18.6",
+                "@babel/helper-plugin-utils": "^7.18.6"
+            },
+            "engines": {
+                "node": ">=6.9.0"
+            },
+            "peerDependencies": {
+                "@babel/core": "^7.0.0-0"
+            }
+        },
+        "node_modules/@babel/plugin-proposal-private-property-in-object": {
+            "version": "7.18.6",
+            "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-private-property-in-object/-/plugin-proposal-private-property-in-object-7.18.6.tgz",
+            "integrity": "sha512-9Rysx7FOctvT5ouj5JODjAFAkgGoudQuLPamZb0v1TGLpapdNaftzifU8NTWQm0IRjqoYypdrSmyWgkocDQ8Dw==",
+            "dev": true,
+            "dependencies": {
+                "@babel/helper-annotate-as-pure": "^7.18.6",
+                "@babel/helper-create-class-features-plugin": "^7.18.6",
+                "@babel/helper-plugin-utils": "^7.18.6",
+                "@babel/plugin-syntax-private-property-in-object": "^7.14.5"
+            },
+            "engines": {
+                "node": ">=6.9.0"
+            },
+            "peerDependencies": {
+                "@babel/core": "^7.0.0-0"
+            }
+        },
+        "node_modules/@babel/plugin-proposal-unicode-property-regex": {
+            "version": "7.18.6",
+            "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.18.6.tgz",
+            "integrity": "sha512-2BShG/d5yoZyXZfVePH91urL5wTG6ASZU9M4o03lKK8u8UW1y08OMttBSOADTcJrnPMpvDXRG3G8fyLh4ovs8w==",
+            "dev": true,
+            "dependencies": {
+                "@babel/helper-create-regexp-features-plugin": "^7.18.6",
+                "@babel/helper-plugin-utils": "^7.18.6"
+            },
+            "engines": {
+                "node": ">=4"
+            },
+            "peerDependencies": {
+                "@babel/core": "^7.0.0-0"
+            }
+        },
+        "node_modules/@babel/plugin-syntax-async-generators": {
+            "version": "7.8.4",
+            "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-async-generators/-/plugin-syntax-async-generators-7.8.4.tgz",
+            "integrity": "sha512-tycmZxkGfZaxhMRbXlPXuVFpdWlXpir2W4AMhSJgRKzk/eDlIXOhb2LHWoLpDF7TEHylV5zNhykX6KAgHJmTNw==",
+            "dev": true,
+            "dependencies": {
+                "@babel/helper-plugin-utils": "^7.8.0"
+            },
+            "peerDependencies": {
+                "@babel/core": "^7.0.0-0"
+            }
+        },
+        "node_modules/@babel/plugin-syntax-class-properties": {
+            "version": "7.12.13",
+            "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-class-properties/-/plugin-syntax-class-properties-7.12.13.tgz",
+            "integrity": "sha512-fm4idjKla0YahUNgFNLCB0qySdsoPiZP3iQE3rky0mBUtMZ23yDJ9SJdg6dXTSDnulOVqiF3Hgr9nbXvXTQZYA==",
+            "dev": true,
+            "dependencies": {
+                "@babel/helper-plugin-utils": "^7.12.13"
+            },
+            "peerDependencies": {
+                "@babel/core": "^7.0.0-0"
+            }
+        },
+        "node_modules/@babel/plugin-syntax-class-static-block": {
+            "version": "7.14.5",
+            "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-class-static-block/-/plugin-syntax-class-static-block-7.14.5.tgz",
+            "integrity": "sha512-b+YyPmr6ldyNnM6sqYeMWE+bgJcJpO6yS4QD7ymxgH34GBPNDM/THBh8iunyvKIZztiwLH4CJZ0RxTk9emgpjw==",
+            "dev": true,
+            "dependencies": {
+                "@babel/helper-plugin-utils": "^7.14.5"
+            },
+            "engines": {
+                "node": ">=6.9.0"
+            },
+            "peerDependencies": {
+                "@babel/core": "^7.0.0-0"
+            }
+        },
+        "node_modules/@babel/plugin-syntax-dynamic-import": {
+            "version": "7.8.3",
+            "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-dynamic-import/-/plugin-syntax-dynamic-import-7.8.3.tgz",
+            "integrity": "sha512-5gdGbFon+PszYzqs83S3E5mpi7/y/8M9eC90MRTZfduQOYW76ig6SOSPNe41IG5LoP3FGBn2N0RjVDSQiS94kQ==",
+            "dev": true,
+            "dependencies": {
+                "@babel/helper-plugin-utils": "^7.8.0"
+            },
+            "peerDependencies": {
+                "@babel/core": "^7.0.0-0"
+            }
+        },
+        "node_modules/@babel/plugin-syntax-export-namespace-from": {
+            "version": "7.8.3",
+            "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-export-namespace-from/-/plugin-syntax-export-namespace-from-7.8.3.tgz",
+            "integrity": "sha512-MXf5laXo6c1IbEbegDmzGPwGNTsHZmEy6QGznu5Sh2UCWvueywb2ee+CCE4zQiZstxU9BMoQO9i6zUFSY0Kj0Q==",
+            "dev": true,
+            "dependencies": {
+                "@babel/helper-plugin-utils": "^7.8.3"
+            },
+            "peerDependencies": {
+                "@babel/core": "^7.0.0-0"
+            }
+        },
+        "node_modules/@babel/plugin-syntax-import-assertions": {
+            "version": "7.18.6",
+            "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-import-assertions/-/plugin-syntax-import-assertions-7.18.6.tgz",
+            "integrity": "sha512-/DU3RXad9+bZwrgWJQKbr39gYbJpLJHezqEzRzi/BHRlJ9zsQb4CK2CA/5apllXNomwA1qHwzvHl+AdEmC5krQ==",
+            "dev": true,
+            "dependencies": {
+                "@babel/helper-plugin-utils": "^7.18.6"
+            },
+            "engines": {
+                "node": ">=6.9.0"
+            },
+            "peerDependencies": {
+                "@babel/core": "^7.0.0-0"
+            }
+        },
+        "node_modules/@babel/plugin-syntax-json-strings": {
+            "version": "7.8.3",
+            "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-json-strings/-/plugin-syntax-json-strings-7.8.3.tgz",
+            "integrity": "sha512-lY6kdGpWHvjoe2vk4WrAapEuBR69EMxZl+RoGRhrFGNYVK8mOPAW8VfbT/ZgrFbXlDNiiaxQnAtgVCZ6jv30EA==",
+            "dev": true,
+            "dependencies": {
+                "@babel/helper-plugin-utils": "^7.8.0"
+            },
+            "peerDependencies": {
+                "@babel/core": "^7.0.0-0"
+            }
+        },
+        "node_modules/@babel/plugin-syntax-logical-assignment-operators": {
+            "version": "7.10.4",
+            "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-logical-assignment-operators/-/plugin-syntax-logical-assignment-operators-7.10.4.tgz",
+            "integrity": "sha512-d8waShlpFDinQ5MtvGU9xDAOzKH47+FFoney2baFIoMr952hKOLp1HR7VszoZvOsV/4+RRszNY7D17ba0te0ig==",
+            "dev": true,
+            "dependencies": {
+                "@babel/helper-plugin-utils": "^7.10.4"
+            },
+            "peerDependencies": {
+                "@babel/core": "^7.0.0-0"
+            }
+        },
+        "node_modules/@babel/plugin-syntax-nullish-coalescing-operator": {
+            "version": "7.8.3",
+            "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-nullish-coalescing-operator/-/plugin-syntax-nullish-coalescing-operator-7.8.3.tgz",
+            "integrity": "sha512-aSff4zPII1u2QD7y+F8oDsz19ew4IGEJg9SVW+bqwpwtfFleiQDMdzA/R+UlWDzfnHFCxxleFT0PMIrR36XLNQ==",
+            "dev": true,
+            "dependencies": {
+                "@babel/helper-plugin-utils": "^7.8.0"
+            },
+            "peerDependencies": {
+                "@babel/core": "^7.0.0-0"
+            }
+        },
+        "node_modules/@babel/plugin-syntax-numeric-separator": {
+            "version": "7.10.4",
+            "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-numeric-separator/-/plugin-syntax-numeric-separator-7.10.4.tgz",
+            "integrity": "sha512-9H6YdfkcK/uOnY/K7/aA2xpzaAgkQn37yzWUMRK7OaPOqOpGS1+n0H5hxT9AUw9EsSjPW8SVyMJwYRtWs3X3ug==",
+            "dev": true,
+            "dependencies": {
+                "@babel/helper-plugin-utils": "^7.10.4"
+            },
+            "peerDependencies": {
+                "@babel/core": "^7.0.0-0"
+            }
+        },
+        "node_modules/@babel/plugin-syntax-object-rest-spread": {
+            "version": "7.8.3",
+            "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-object-rest-spread/-/plugin-syntax-object-rest-spread-7.8.3.tgz",
+            "integrity": "sha512-XoqMijGZb9y3y2XskN+P1wUGiVwWZ5JmoDRwx5+3GmEplNyVM2s2Dg8ILFQm8rWM48orGy5YpI5Bl8U1y7ydlA==",
+            "dev": true,
+            "dependencies": {
+                "@babel/helper-plugin-utils": "^7.8.0"
+            },
+            "peerDependencies": {
+                "@babel/core": "^7.0.0-0"
+            }
+        },
+        "node_modules/@babel/plugin-syntax-optional-catch-binding": {
+            "version": "7.8.3",
+            "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-optional-catch-binding/-/plugin-syntax-optional-catch-binding-7.8.3.tgz",
+            "integrity": "sha512-6VPD0Pc1lpTqw0aKoeRTMiB+kWhAoT24PA+ksWSBrFtl5SIRVpZlwN3NNPQjehA2E/91FV3RjLWoVTglWcSV3Q==",
+            "dev": true,
+            "dependencies": {
+                "@babel/helper-plugin-utils": "^7.8.0"
+            },
+            "peerDependencies": {
+                "@babel/core": "^7.0.0-0"
+            }
+        },
+        "node_modules/@babel/plugin-syntax-optional-chaining": {
+            "version": "7.8.3",
+            "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-optional-chaining/-/plugin-syntax-optional-chaining-7.8.3.tgz",
+            "integrity": "sha512-KoK9ErH1MBlCPxV0VANkXW2/dw4vlbGDrFgz8bmUsBGYkFRcbRwMh6cIJubdPrkxRwuGdtCk0v/wPTKbQgBjkg==",
+            "dev": true,
+            "dependencies": {
+                "@babel/helper-plugin-utils": "^7.8.0"
+            },
+            "peerDependencies": {
+                "@babel/core": "^7.0.0-0"
+            }
+        },
+        "node_modules/@babel/plugin-syntax-private-property-in-object": {
+            "version": "7.14.5",
+            "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-private-property-in-object/-/plugin-syntax-private-property-in-object-7.14.5.tgz",
+            "integrity": "sha512-0wVnp9dxJ72ZUJDV27ZfbSj6iHLoytYZmh3rFcxNnvsJF3ktkzLDZPy/mA17HGsaQT3/DQsWYX1f1QGWkCoVUg==",
+            "dev": true,
+            "dependencies": {
+                "@babel/helper-plugin-utils": "^7.14.5"
+            },
+            "engines": {
+                "node": ">=6.9.0"
+            },
+            "peerDependencies": {
+                "@babel/core": "^7.0.0-0"
+            }
+        },
+        "node_modules/@babel/plugin-syntax-top-level-await": {
+            "version": "7.14.5",
+            "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-top-level-await/-/plugin-syntax-top-level-await-7.14.5.tgz",
+            "integrity": "sha512-hx++upLv5U1rgYfwe1xBQUhRmU41NEvpUvrp8jkrSCdvGSnM5/qdRMtylJ6PG5OFkBaHkbTAKTnd3/YyESRHFw==",
+            "dev": true,
+            "dependencies": {
+                "@babel/helper-plugin-utils": "^7.14.5"
+            },
+            "engines": {
+                "node": ">=6.9.0"
+            },
+            "peerDependencies": {
+                "@babel/core": "^7.0.0-0"
+            }
+        },
+        "node_modules/@babel/plugin-transform-arrow-functions": {
+            "version": "7.18.6",
+            "resolved": "https://registry.npmjs.org/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.18.6.tgz",
+            "integrity": "sha512-9S9X9RUefzrsHZmKMbDXxweEH+YlE8JJEuat9FdvW9Qh1cw7W64jELCtWNkPBPX5En45uy28KGvA/AySqUh8CQ==",
+            "dev": true,
+            "dependencies": {
+                "@babel/helper-plugin-utils": "^7.18.6"
+            },
+            "engines": {
+                "node": ">=6.9.0"
+            },
+            "peerDependencies": {
+                "@babel/core": "^7.0.0-0"
+            }
+        },
+        "node_modules/@babel/plugin-transform-async-to-generator": {
+            "version": "7.18.6",
+            "resolved": "https://registry.npmjs.org/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.18.6.tgz",
+            "integrity": "sha512-ARE5wZLKnTgPW7/1ftQmSi1CmkqqHo2DNmtztFhvgtOWSDfq0Cq9/9L+KnZNYSNrydBekhW3rwShduf59RoXag==",
+            "dev": true,
+            "dependencies": {
+                "@babel/helper-module-imports": "^7.18.6",
+                "@babel/helper-plugin-utils": "^7.18.6",
+                "@babel/helper-remap-async-to-generator": "^7.18.6"
+            },
+            "engines": {
+                "node": ">=6.9.0"
+            },
+            "peerDependencies": {
+                "@babel/core": "^7.0.0-0"
+            }
+        },
+        "node_modules/@babel/plugin-transform-block-scoped-functions": {
+            "version": "7.18.6",
+            "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.18.6.tgz",
+            "integrity": "sha512-ExUcOqpPWnliRcPqves5HJcJOvHvIIWfuS4sroBUenPuMdmW+SMHDakmtS7qOo13sVppmUijqeTv7qqGsvURpQ==",
+            "dev": true,
+            "dependencies": {
+                "@babel/helper-plugin-utils": "^7.18.6"
+            },
+            "engines": {
+                "node": ">=6.9.0"
+            },
+            "peerDependencies": {
+                "@babel/core": "^7.0.0-0"
+            }
+        },
+        "node_modules/@babel/plugin-transform-block-scoping": {
+            "version": "7.18.6",
+            "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.18.6.tgz",
+            "integrity": "sha512-pRqwb91C42vs1ahSAWJkxOxU1RHWDn16XAa6ggQ72wjLlWyYeAcLvTtE0aM8ph3KNydy9CQF2nLYcjq1WysgxQ==",
+            "dev": true,
+            "dependencies": {
+                "@babel/helper-plugin-utils": "^7.18.6"
+            },
+            "engines": {
+                "node": ">=6.9.0"
+            },
+            "peerDependencies": {
+                "@babel/core": "^7.0.0-0"
+            }
+        },
+        "node_modules/@babel/plugin-transform-classes": {
+            "version": "7.18.8",
+            "resolved": "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.18.8.tgz",
+            "integrity": "sha512-RySDoXdF6hgHSHuAW4aLGyVQdmvEX/iJtjVre52k0pxRq4hzqze+rAVP++NmNv596brBpYmaiKgTZby7ziBnVg==",
+            "dev": true,
+            "dependencies": {
+                "@babel/helper-annotate-as-pure": "^7.18.6",
+                "@babel/helper-environment-visitor": "^7.18.6",
+                "@babel/helper-function-name": "^7.18.6",
+                "@babel/helper-optimise-call-expression": "^7.18.6",
+                "@babel/helper-plugin-utils": "^7.18.6",
+                "@babel/helper-replace-supers": "^7.18.6",
+                "@babel/helper-split-export-declaration": "^7.18.6",
+                "globals": "^11.1.0"
+            },
+            "engines": {
+                "node": ">=6.9.0"
+            },
+            "peerDependencies": {
+                "@babel/core": "^7.0.0-0"
+            }
+        },
+        "node_modules/@babel/plugin-transform-computed-properties": {
+            "version": "7.18.6",
+            "resolved": "https://registry.npmjs.org/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.18.6.tgz",
+            "integrity": "sha512-9repI4BhNrR0KenoR9vm3/cIc1tSBIo+u1WVjKCAynahj25O8zfbiE6JtAtHPGQSs4yZ+bA8mRasRP+qc+2R5A==",
+            "dev": true,
+            "dependencies": {
+                "@babel/helper-plugin-utils": "^7.18.6"
+            },
+            "engines": {
+                "node": ">=6.9.0"
+            },
+            "peerDependencies": {
+                "@babel/core": "^7.0.0-0"
+            }
+        },
+        "node_modules/@babel/plugin-transform-destructuring": {
+            "version": "7.18.6",
+            "resolved": "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.18.6.tgz",
+            "integrity": "sha512-tgy3u6lRp17ilY8r1kP4i2+HDUwxlVqq3RTc943eAWSzGgpU1qhiKpqZ5CMyHReIYPHdo3Kg8v8edKtDqSVEyQ==",
+            "dev": true,
+            "dependencies": {
+                "@babel/helper-plugin-utils": "^7.18.6"
+            },
+            "engines": {
+                "node": ">=6.9.0"
+            },
+            "peerDependencies": {
+                "@babel/core": "^7.0.0-0"
+            }
+        },
+        "node_modules/@babel/plugin-transform-dotall-regex": {
+            "version": "7.18.6",
+            "resolved": "https://registry.npmjs.org/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.18.6.tgz",
+            "integrity": "sha512-6S3jpun1eEbAxq7TdjLotAsl4WpQI9DxfkycRcKrjhQYzU87qpXdknpBg/e+TdcMehqGnLFi7tnFUBR02Vq6wg==",
+            "dev": true,
+            "dependencies": {
+                "@babel/helper-create-regexp-features-plugin": "^7.18.6",
+                "@babel/helper-plugin-utils": "^7.18.6"
+            },
+            "engines": {
+                "node": ">=6.9.0"
+            },
+            "peerDependencies": {
+                "@babel/core": "^7.0.0-0"
+            }
+        },
+        "node_modules/@babel/plugin-transform-duplicate-keys": {
+            "version": "7.18.6",
+            "resolved": "https://registry.npmjs.org/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.18.6.tgz",
+            "integrity": "sha512-NJU26U/208+sxYszf82nmGYqVF9QN8py2HFTblPT9hbawi8+1C5a9JubODLTGFuT0qlkqVinmkwOD13s0sZktg==",
+            "dev": true,
+            "dependencies": {
+                "@babel/helper-plugin-utils": "^7.18.6"
+            },
+            "engines": {
+                "node": ">=6.9.0"
+            },
+            "peerDependencies": {
+                "@babel/core": "^7.0.0-0"
+            }
+        },
+        "node_modules/@babel/plugin-transform-exponentiation-operator": {
+            "version": "7.18.6",
+            "resolved": "https://registry.npmjs.org/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.18.6.tgz",
+            "integrity": "sha512-wzEtc0+2c88FVR34aQmiz56dxEkxr2g8DQb/KfaFa1JYXOFVsbhvAonFN6PwVWj++fKmku8NP80plJ5Et4wqHw==",
+            "dev": true,
+            "dependencies": {
+                "@babel/helper-builder-binary-assignment-operator-visitor": "^7.18.6",
+                "@babel/helper-plugin-utils": "^7.18.6"
+            },
+            "engines": {
+                "node": ">=6.9.0"
+            },
+            "peerDependencies": {
+                "@babel/core": "^7.0.0-0"
+            }
+        },
+        "node_modules/@babel/plugin-transform-for-of": {
+            "version": "7.18.8",
+            "resolved": "https://registry.npmjs.org/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.18.8.tgz",
+            "integrity": "sha512-yEfTRnjuskWYo0k1mHUqrVWaZwrdq8AYbfrpqULOJOaucGSp4mNMVps+YtA8byoevxS/urwU75vyhQIxcCgiBQ==",
+            "dev": true,
+            "dependencies": {
+                "@babel/helper-plugin-utils": "^7.18.6"
+            },
+            "engines": {
+                "node": ">=6.9.0"
+            },
+            "peerDependencies": {
+                "@babel/core": "^7.0.0-0"
+            }
+        },
+        "node_modules/@babel/plugin-transform-function-name": {
+            "version": "7.18.6",
+            "resolved": "https://registry.npmjs.org/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.18.6.tgz",
+            "integrity": "sha512-kJha/Gbs5RjzIu0CxZwf5e3aTTSlhZnHMT8zPWnJMjNpLOUgqevg+PN5oMH68nMCXnfiMo4Bhgxqj59KHTlAnA==",
+            "dev": true,
+            "dependencies": {
+                "@babel/helper-compilation-targets": "^7.18.6",
+                "@babel/helper-function-name": "^7.18.6",
+                "@babel/helper-plugin-utils": "^7.18.6"
+            },
+            "engines": {
+                "node": ">=6.9.0"
+            },
+            "peerDependencies": {
+                "@babel/core": "^7.0.0-0"
+            }
+        },
+        "node_modules/@babel/plugin-transform-literals": {
+            "version": "7.18.6",
+            "resolved": "https://registry.npmjs.org/@babel/plugin-transform-literals/-/plugin-transform-literals-7.18.6.tgz",
+            "integrity": "sha512-x3HEw0cJZVDoENXOp20HlypIHfl0zMIhMVZEBVTfmqbObIpsMxMbmU5nOEO8R7LYT+z5RORKPlTI5Hj4OsO9/Q==",
+            "dev": true,
+            "dependencies": {
+                "@babel/helper-plugin-utils": "^7.18.6"
+            },
+            "engines": {
+                "node": ">=6.9.0"
+            },
+            "peerDependencies": {
+                "@babel/core": "^7.0.0-0"
+            }
+        },
+        "node_modules/@babel/plugin-transform-member-expression-literals": {
+            "version": "7.18.6",
+            "resolved": "https://registry.npmjs.org/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.18.6.tgz",
+            "integrity": "sha512-qSF1ihLGO3q+/g48k85tUjD033C29TNTVB2paCwZPVmOsjn9pClvYYrM2VeJpBY2bcNkuny0YUyTNRyRxJ54KA==",
+            "dev": true,
+            "dependencies": {
+                "@babel/helper-plugin-utils": "^7.18.6"
+            },
+            "engines": {
+                "node": ">=6.9.0"
+            },
+            "peerDependencies": {
+                "@babel/core": "^7.0.0-0"
+            }
+        },
+        "node_modules/@babel/plugin-transform-modules-amd": {
+            "version": "7.18.6",
+            "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.18.6.tgz",
+            "integrity": "sha512-Pra5aXsmTsOnjM3IajS8rTaLCy++nGM4v3YR4esk5PCsyg9z8NA5oQLwxzMUtDBd8F+UmVza3VxoAaWCbzH1rg==",
+            "dev": true,
+            "dependencies": {
+                "@babel/helper-module-transforms": "^7.18.6",
+                "@babel/helper-plugin-utils": "^7.18.6",
+                "babel-plugin-dynamic-import-node": "^2.3.3"
+            },
+            "engines": {
+                "node": ">=6.9.0"
+            },
+            "peerDependencies": {
+                "@babel/core": "^7.0.0-0"
+            }
+        },
+        "node_modules/@babel/plugin-transform-modules-commonjs": {
+            "version": "7.18.6",
+            "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.18.6.tgz",
+            "integrity": "sha512-Qfv2ZOWikpvmedXQJDSbxNqy7Xr/j2Y8/KfijM0iJyKkBTmWuvCA1yeH1yDM7NJhBW/2aXxeucLj6i80/LAJ/Q==",
+            "dev": true,
+            "dependencies": {
+                "@babel/helper-module-transforms": "^7.18.6",
+                "@babel/helper-plugin-utils": "^7.18.6",
+                "@babel/helper-simple-access": "^7.18.6",
+                "babel-plugin-dynamic-import-node": "^2.3.3"
+            },
+            "engines": {
+                "node": ">=6.9.0"
+            },
+            "peerDependencies": {
+                "@babel/core": "^7.0.0-0"
+            }
+        },
+        "node_modules/@babel/plugin-transform-modules-systemjs": {
+            "version": "7.18.6",
+            "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.18.6.tgz",
+            "integrity": "sha512-UbPYpXxLjTw6w6yXX2BYNxF3p6QY225wcTkfQCy3OMnSlS/C3xGtwUjEzGkldb/sy6PWLiCQ3NbYfjWUTI3t4g==",
+            "dev": true,
+            "dependencies": {
+                "@babel/helper-hoist-variables": "^7.18.6",
+                "@babel/helper-module-transforms": "^7.18.6",
+                "@babel/helper-plugin-utils": "^7.18.6",
+                "@babel/helper-validator-identifier": "^7.18.6",
+                "babel-plugin-dynamic-import-node": "^2.3.3"
+            },
+            "engines": {
+                "node": ">=6.9.0"
+            },
+            "peerDependencies": {
+                "@babel/core": "^7.0.0-0"
+            }
+        },
+        "node_modules/@babel/plugin-transform-modules-umd": {
+            "version": "7.18.6",
+            "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.18.6.tgz",
+            "integrity": "sha512-dcegErExVeXcRqNtkRU/z8WlBLnvD4MRnHgNs3MytRO1Mn1sHRyhbcpYbVMGclAqOjdW+9cfkdZno9dFdfKLfQ==",
+            "dev": true,
+            "dependencies": {
+                "@babel/helper-module-transforms": "^7.18.6",
+                "@babel/helper-plugin-utils": "^7.18.6"
+            },
+            "engines": {
+                "node": ">=6.9.0"
+            },
+            "peerDependencies": {
+                "@babel/core": "^7.0.0-0"
+            }
+        },
+        "node_modules/@babel/plugin-transform-named-capturing-groups-regex": {
+            "version": "7.18.6",
+            "resolved": "https://registry.npmjs.org/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.18.6.tgz",
+            "integrity": "sha512-UmEOGF8XgaIqD74bC8g7iV3RYj8lMf0Bw7NJzvnS9qQhM4mg+1WHKotUIdjxgD2RGrgFLZZPCFPFj3P/kVDYhg==",
+            "dev": true,
+            "dependencies": {
+                "@babel/helper-create-regexp-features-plugin": "^7.18.6",
+                "@babel/helper-plugin-utils": "^7.18.6"
+            },
+            "engines": {
+                "node": ">=6.9.0"
+            },
+            "peerDependencies": {
+                "@babel/core": "^7.0.0"
+            }
+        },
+        "node_modules/@babel/plugin-transform-new-target": {
+            "version": "7.18.6",
+            "resolved": "https://registry.npmjs.org/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.18.6.tgz",
+            "integrity": "sha512-DjwFA/9Iu3Z+vrAn+8pBUGcjhxKguSMlsFqeCKbhb9BAV756v0krzVK04CRDi/4aqmk8BsHb4a/gFcaA5joXRw==",
+            "dev": true,
+            "dependencies": {
+                "@babel/helper-plugin-utils": "^7.18.6"
+            },
+            "engines": {
+                "node": ">=6.9.0"
+            },
+            "peerDependencies": {
+                "@babel/core": "^7.0.0-0"
+            }
+        },
+        "node_modules/@babel/plugin-transform-object-super": {
+            "version": "7.18.6",
+            "resolved": "https://registry.npmjs.org/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.18.6.tgz",
+            "integrity": "sha512-uvGz6zk+pZoS1aTZrOvrbj6Pp/kK2mp45t2B+bTDre2UgsZZ8EZLSJtUg7m/no0zOJUWgFONpB7Zv9W2tSaFlA==",
+            "dev": true,
+            "dependencies": {
+                "@babel/helper-plugin-utils": "^7.18.6",
+                "@babel/helper-replace-supers": "^7.18.6"
+            },
+            "engines": {
+                "node": ">=6.9.0"
+            },
+            "peerDependencies": {
+                "@babel/core": "^7.0.0-0"
+            }
+        },
+        "node_modules/@babel/plugin-transform-parameters": {
+            "version": "7.18.8",
+            "resolved": "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.18.8.tgz",
+            "integrity": "sha512-ivfbE3X2Ss+Fj8nnXvKJS6sjRG4gzwPMsP+taZC+ZzEGjAYlvENixmt1sZ5Ca6tWls+BlKSGKPJ6OOXvXCbkFg==",
+            "dev": true,
+            "dependencies": {
+                "@babel/helper-plugin-utils": "^7.18.6"
+            },
+            "engines": {
+                "node": ">=6.9.0"
+            },
+            "peerDependencies": {
+                "@babel/core": "^7.0.0-0"
+            }
+        },
+        "node_modules/@babel/plugin-transform-property-literals": {
+            "version": "7.18.6",
+            "resolved": "https://registry.npmjs.org/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.18.6.tgz",
+            "integrity": "sha512-cYcs6qlgafTud3PAzrrRNbQtfpQ8+y/+M5tKmksS9+M1ckbH6kzY8MrexEM9mcA6JDsukE19iIRvAyYl463sMg==",
+            "dev": true,
+            "dependencies": {
+                "@babel/helper-plugin-utils": "^7.18.6"
+            },
+            "engines": {
+                "node": ">=6.9.0"
+            },
+            "peerDependencies": {
+                "@babel/core": "^7.0.0-0"
+            }
+        },
+        "node_modules/@babel/plugin-transform-regenerator": {
+            "version": "7.18.6",
+            "resolved": "https://registry.npmjs.org/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.18.6.tgz",
+            "integrity": "sha512-poqRI2+qiSdeldcz4wTSTXBRryoq3Gc70ye7m7UD5Ww0nE29IXqMl6r7Nd15WBgRd74vloEMlShtH6CKxVzfmQ==",
+            "dev": true,
+            "dependencies": {
+                "@babel/helper-plugin-utils": "^7.18.6",
+                "regenerator-transform": "^0.15.0"
+            },
+            "engines": {
+                "node": ">=6.9.0"
+            },
+            "peerDependencies": {
+                "@babel/core": "^7.0.0-0"
+            }
+        },
+        "node_modules/@babel/plugin-transform-reserved-words": {
+            "version": "7.18.6",
+            "resolved": "https://registry.npmjs.org/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.18.6.tgz",
+            "integrity": "sha512-oX/4MyMoypzHjFrT1CdivfKZ+XvIPMFXwwxHp/r0Ddy2Vuomt4HDFGmft1TAY2yiTKiNSsh3kjBAzcM8kSdsjA==",
+            "dev": true,
+            "dependencies": {
+                "@babel/helper-plugin-utils": "^7.18.6"
+            },
+            "engines": {
+                "node": ">=6.9.0"
+            },
+            "peerDependencies": {
+                "@babel/core": "^7.0.0-0"
+            }
+        },
+        "node_modules/@babel/plugin-transform-runtime": {
+            "version": "7.18.6",
+            "resolved": "https://registry.npmjs.org/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.18.6.tgz",
+            "integrity": "sha512-8uRHk9ZmRSnWqUgyae249EJZ94b0yAGLBIqzZzl+0iEdbno55Pmlt/32JZsHwXD9k/uZj18Aqqk35wBX4CBTXA==",
+            "dev": true,
+            "dependencies": {
+                "@babel/helper-module-imports": "^7.18.6",
+                "@babel/helper-plugin-utils": "^7.18.6",
+                "babel-plugin-polyfill-corejs2": "^0.3.1",
+                "babel-plugin-polyfill-corejs3": "^0.5.2",
+                "babel-plugin-polyfill-regenerator": "^0.3.1",
+                "semver": "^6.3.0"
+            },
+            "engines": {
+                "node": ">=6.9.0"
+            },
+            "peerDependencies": {
+                "@babel/core": "^7.0.0-0"
+            }
+        },
+        "node_modules/@babel/plugin-transform-runtime/node_modules/semver": {
+            "version": "6.3.1",
+            "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
+            "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==",
+            "dev": true,
+            "bin": {
+                "semver": "bin/semver.js"
+            }
+        },
+        "node_modules/@babel/plugin-transform-shorthand-properties": {
+            "version": "7.18.6",
+            "resolved": "https://registry.npmjs.org/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.18.6.tgz",
+            "integrity": "sha512-eCLXXJqv8okzg86ywZJbRn19YJHU4XUa55oz2wbHhaQVn/MM+XhukiT7SYqp/7o00dg52Rj51Ny+Ecw4oyoygw==",
+            "dev": true,
+            "dependencies": {
+                "@babel/helper-plugin-utils": "^7.18.6"
+            },
+            "engines": {
+                "node": ">=6.9.0"
+            },
+            "peerDependencies": {
+                "@babel/core": "^7.0.0-0"
+            }
+        },
+        "node_modules/@babel/plugin-transform-spread": {
+            "version": "7.18.6",
+            "resolved": "https://registry.npmjs.org/@babel/plugin-transform-spread/-/plugin-transform-spread-7.18.6.tgz",
+            "integrity": "sha512-ayT53rT/ENF8WWexIRg9AiV9h0aIteyWn5ptfZTZQrjk/+f3WdrJGCY4c9wcgl2+MKkKPhzbYp97FTsquZpDCw==",
+            "dev": true,
+            "dependencies": {
+                "@babel/helper-plugin-utils": "^7.18.6",
+                "@babel/helper-skip-transparent-expression-wrappers": "^7.18.6"
+            },
+            "engines": {
+                "node": ">=6.9.0"
+            },
+            "peerDependencies": {
+                "@babel/core": "^7.0.0-0"
+            }
+        },
+        "node_modules/@babel/plugin-transform-sticky-regex": {
+            "version": "7.18.6",
+            "resolved": "https://registry.npmjs.org/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.18.6.tgz",
+            "integrity": "sha512-kfiDrDQ+PBsQDO85yj1icueWMfGfJFKN1KCkndygtu/C9+XUfydLC8Iv5UYJqRwy4zk8EcplRxEOeLyjq1gm6Q==",
+            "dev": true,
+            "dependencies": {
+                "@babel/helper-plugin-utils": "^7.18.6"
+            },
+            "engines": {
+                "node": ">=6.9.0"
+            },
+            "peerDependencies": {
+                "@babel/core": "^7.0.0-0"
+            }
+        },
+        "node_modules/@babel/plugin-transform-template-literals": {
+            "version": "7.18.6",
+            "resolved": "https://registry.npmjs.org/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.18.6.tgz",
+            "integrity": "sha512-UuqlRrQmT2SWRvahW46cGSany0uTlcj8NYOS5sRGYi8FxPYPoLd5DDmMd32ZXEj2Jq+06uGVQKHxa/hJx2EzKw==",
+            "dev": true,
+            "dependencies": {
+                "@babel/helper-plugin-utils": "^7.18.6"
+            },
+            "engines": {
+                "node": ">=6.9.0"
+            },
+            "peerDependencies": {
+                "@babel/core": "^7.0.0-0"
+            }
+        },
+        "node_modules/@babel/plugin-transform-typeof-symbol": {
+            "version": "7.18.6",
+            "resolved": "https://registry.npmjs.org/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.18.6.tgz",
+            "integrity": "sha512-7m71iS/QhsPk85xSjFPovHPcH3H9qeyzsujhTc+vcdnsXavoWYJ74zx0lP5RhpC5+iDnVLO+PPMHzC11qels1g==",
+            "dev": true,
+            "dependencies": {
+                "@babel/helper-plugin-utils": "^7.18.6"
+            },
+            "engines": {
+                "node": ">=6.9.0"
+            },
+            "peerDependencies": {
+                "@babel/core": "^7.0.0-0"
+            }
+        },
+        "node_modules/@babel/plugin-transform-unicode-escapes": {
+            "version": "7.18.6",
+            "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.18.6.tgz",
+            "integrity": "sha512-XNRwQUXYMP7VLuy54cr/KS/WeL3AZeORhrmeZ7iewgu+X2eBqmpaLI/hzqr9ZxCeUoq0ASK4GUzSM0BDhZkLFw==",
+            "dev": true,
+            "dependencies": {
+                "@babel/helper-plugin-utils": "^7.18.6"
+            },
+            "engines": {
+                "node": ">=6.9.0"
+            },
+            "peerDependencies": {
+                "@babel/core": "^7.0.0-0"
+            }
+        },
+        "node_modules/@babel/plugin-transform-unicode-regex": {
+            "version": "7.18.6",
+            "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.18.6.tgz",
+            "integrity": "sha512-gE7A6Lt7YLnNOL3Pb9BNeZvi+d8l7tcRrG4+pwJjK9hD2xX4mEvjlQW60G9EEmfXVYRPv9VRQcyegIVHCql/AA==",
+            "dev": true,
+            "dependencies": {
+                "@babel/helper-create-regexp-features-plugin": "^7.18.6",
+                "@babel/helper-plugin-utils": "^7.18.6"
+            },
+            "engines": {
+                "node": ">=6.9.0"
+            },
+            "peerDependencies": {
+                "@babel/core": "^7.0.0-0"
+            }
+        },
+        "node_modules/@babel/preset-env": {
+            "version": "7.18.6",
+            "resolved": "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.18.6.tgz",
+            "integrity": "sha512-WrthhuIIYKrEFAwttYzgRNQ5hULGmwTj+D6l7Zdfsv5M7IWV/OZbUfbeL++Qrzx1nVJwWROIFhCHRYQV4xbPNw==",
+            "dev": true,
+            "dependencies": {
+                "@babel/compat-data": "^7.18.6",
+                "@babel/helper-compilation-targets": "^7.18.6",
+                "@babel/helper-plugin-utils": "^7.18.6",
+                "@babel/helper-validator-option": "^7.18.6",
+                "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression": "^7.18.6",
+                "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining": "^7.18.6",
+                "@babel/plugin-proposal-async-generator-functions": "^7.18.6",
+                "@babel/plugin-proposal-class-properties": "^7.18.6",
+                "@babel/plugin-proposal-class-static-block": "^7.18.6",
+                "@babel/plugin-proposal-dynamic-import": "^7.18.6",
+                "@babel/plugin-proposal-export-namespace-from": "^7.18.6",
+                "@babel/plugin-proposal-json-strings": "^7.18.6",
+                "@babel/plugin-proposal-logical-assignment-operators": "^7.18.6",
+                "@babel/plugin-proposal-nullish-coalescing-operator": "^7.18.6",
+                "@babel/plugin-proposal-numeric-separator": "^7.18.6",
+                "@babel/plugin-proposal-object-rest-spread": "^7.18.6",
+                "@babel/plugin-proposal-optional-catch-binding": "^7.18.6",
+                "@babel/plugin-proposal-optional-chaining": "^7.18.6",
+                "@babel/plugin-proposal-private-methods": "^7.18.6",
+                "@babel/plugin-proposal-private-property-in-object": "^7.18.6",
+                "@babel/plugin-proposal-unicode-property-regex": "^7.18.6",
+                "@babel/plugin-syntax-async-generators": "^7.8.4",
+                "@babel/plugin-syntax-class-properties": "^7.12.13",
+                "@babel/plugin-syntax-class-static-block": "^7.14.5",
+                "@babel/plugin-syntax-dynamic-import": "^7.8.3",
+                "@babel/plugin-syntax-export-namespace-from": "^7.8.3",
+                "@babel/plugin-syntax-import-assertions": "^7.18.6",
+                "@babel/plugin-syntax-json-strings": "^7.8.3",
+                "@babel/plugin-syntax-logical-assignment-operators": "^7.10.4",
+                "@babel/plugin-syntax-nullish-coalescing-operator": "^7.8.3",
+                "@babel/plugin-syntax-numeric-separator": "^7.10.4",
+                "@babel/plugin-syntax-object-rest-spread": "^7.8.3",
+                "@babel/plugin-syntax-optional-catch-binding": "^7.8.3",
+                "@babel/plugin-syntax-optional-chaining": "^7.8.3",
+                "@babel/plugin-syntax-private-property-in-object": "^7.14.5",
+                "@babel/plugin-syntax-top-level-await": "^7.14.5",
+                "@babel/plugin-transform-arrow-functions": "^7.18.6",
+                "@babel/plugin-transform-async-to-generator": "^7.18.6",
+                "@babel/plugin-transform-block-scoped-functions": "^7.18.6",
+                "@babel/plugin-transform-block-scoping": "^7.18.6",
+                "@babel/plugin-transform-classes": "^7.18.6",
+                "@babel/plugin-transform-computed-properties": "^7.18.6",
+                "@babel/plugin-transform-destructuring": "^7.18.6",
+                "@babel/plugin-transform-dotall-regex": "^7.18.6",
+                "@babel/plugin-transform-duplicate-keys": "^7.18.6",
+                "@babel/plugin-transform-exponentiation-operator": "^7.18.6",
+                "@babel/plugin-transform-for-of": "^7.18.6",
+                "@babel/plugin-transform-function-name": "^7.18.6",
+                "@babel/plugin-transform-literals": "^7.18.6",
+                "@babel/plugin-transform-member-expression-literals": "^7.18.6",
+                "@babel/plugin-transform-modules-amd": "^7.18.6",
+                "@babel/plugin-transform-modules-commonjs": "^7.18.6",
+                "@babel/plugin-transform-modules-systemjs": "^7.18.6",
+                "@babel/plugin-transform-modules-umd": "^7.18.6",
+                "@babel/plugin-transform-named-capturing-groups-regex": "^7.18.6",
+                "@babel/plugin-transform-new-target": "^7.18.6",
+                "@babel/plugin-transform-object-super": "^7.18.6",
+                "@babel/plugin-transform-parameters": "^7.18.6",
+                "@babel/plugin-transform-property-literals": "^7.18.6",
+                "@babel/plugin-transform-regenerator": "^7.18.6",
+                "@babel/plugin-transform-reserved-words": "^7.18.6",
+                "@babel/plugin-transform-shorthand-properties": "^7.18.6",
+                "@babel/plugin-transform-spread": "^7.18.6",
+                "@babel/plugin-transform-sticky-regex": "^7.18.6",
+                "@babel/plugin-transform-template-literals": "^7.18.6",
+                "@babel/plugin-transform-typeof-symbol": "^7.18.6",
+                "@babel/plugin-transform-unicode-escapes": "^7.18.6",
+                "@babel/plugin-transform-unicode-regex": "^7.18.6",
+                "@babel/preset-modules": "^0.1.5",
+                "@babel/types": "^7.18.6",
+                "babel-plugin-polyfill-corejs2": "^0.3.1",
+                "babel-plugin-polyfill-corejs3": "^0.5.2",
+                "babel-plugin-polyfill-regenerator": "^0.3.1",
+                "core-js-compat": "^3.22.1",
+                "semver": "^6.3.0"
+            },
+            "engines": {
+                "node": ">=6.9.0"
+            },
+            "peerDependencies": {
+                "@babel/core": "^7.0.0-0"
+            }
+        },
+        "node_modules/@babel/preset-env/node_modules/semver": {
+            "version": "6.3.1",
+            "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
+            "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==",
+            "dev": true,
+            "bin": {
+                "semver": "bin/semver.js"
+            }
+        },
+        "node_modules/@babel/preset-modules": {
+            "version": "0.1.5",
+            "resolved": "https://registry.npmjs.org/@babel/preset-modules/-/preset-modules-0.1.5.tgz",
+            "integrity": "sha512-A57th6YRG7oR3cq/yt/Y84MvGgE0eJG2F1JLhKuyG+jFxEgrd/HAMJatiFtmOiZurz+0DkrvbheCLaV5f2JfjA==",
+            "dev": true,
+            "dependencies": {
+                "@babel/helper-plugin-utils": "^7.0.0",
+                "@babel/plugin-proposal-unicode-property-regex": "^7.4.4",
+                "@babel/plugin-transform-dotall-regex": "^7.4.4",
+                "@babel/types": "^7.4.4",
+                "esutils": "^2.0.2"
+            },
+            "peerDependencies": {
+                "@babel/core": "^7.0.0-0"
+            }
+        },
+        "node_modules/@babel/runtime": {
+            "version": "7.18.6",
+            "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.18.6.tgz",
+            "integrity": "sha512-t9wi7/AW6XtKahAe20Yw0/mMljKq0B1r2fPdvaAdV/KPDZewFXdaaa6K7lxmZBZ8FBNpCiAT6iHPmd6QO9bKfQ==",
+            "dev": true,
+            "dependencies": {
+                "regenerator-runtime": "^0.13.4"
+            },
+            "engines": {
+                "node": ">=6.9.0"
+            }
+        },
+        "node_modules/@babel/runtime-corejs3": {
+            "version": "7.18.6",
+            "resolved": "https://registry.npmjs.org/@babel/runtime-corejs3/-/runtime-corejs3-7.18.6.tgz",
+            "integrity": "sha512-cOu5wH2JFBgMjje+a+fz2JNIWU4GzYpl05oSob3UDvBEh6EuIn+TXFHMmBbhSb+k/4HMzgKCQfEEDArAWNF9Cw==",
+            "dev": true,
+            "dependencies": {
+                "core-js-pure": "^3.20.2",
+                "regenerator-runtime": "^0.13.4"
+            },
+            "engines": {
+                "node": ">=6.9.0"
+            }
+        },
+        "node_modules/@babel/template": {
+            "version": "7.22.15",
+            "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.22.15.tgz",
+            "integrity": "sha512-QPErUVm4uyJa60rkI73qneDacvdvzxshT3kksGqlGWYdOTIUOwJ7RDUL8sGqslY1uXWSL6xMFKEXDS3ox2uF0w==",
+            "dev": true,
+            "dependencies": {
+                "@babel/code-frame": "^7.22.13",
+                "@babel/parser": "^7.22.15",
+                "@babel/types": "^7.22.15"
+            },
+            "engines": {
+                "node": ">=6.9.0"
+            }
+        },
+        "node_modules/@babel/traverse": {
+            "version": "7.23.2",
+            "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.23.2.tgz",
+            "integrity": "sha512-azpe59SQ48qG6nu2CzcMLbxUudtN+dOM9kDbUqGq3HXUJRlo7i8fvPoxQUzYgLZ4cMVmuZgm8vvBpNeRhd6XSw==",
+            "dev": true,
+            "dependencies": {
+                "@babel/code-frame": "^7.22.13",
+                "@babel/generator": "^7.23.0",
+                "@babel/helper-environment-visitor": "^7.22.20",
+                "@babel/helper-function-name": "^7.23.0",
+                "@babel/helper-hoist-variables": "^7.22.5",
+                "@babel/helper-split-export-declaration": "^7.22.6",
+                "@babel/parser": "^7.23.0",
+                "@babel/types": "^7.23.0",
+                "debug": "^4.1.0",
+                "globals": "^11.1.0"
+            },
+            "engines": {
+                "node": ">=6.9.0"
+            }
+        },
+        "node_modules/@babel/types": {
+            "version": "7.23.0",
+            "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.23.0.tgz",
+            "integrity": "sha512-0oIyUfKoI3mSqMvsxBdclDwxXKXAUA8v/apZbc+iSyARYou1o8ZGDxbUYyLFoW2arqS2jDGqJuZvv1d/io1axg==",
+            "dev": true,
+            "dependencies": {
+                "@babel/helper-string-parser": "^7.22.5",
+                "@babel/helper-validator-identifier": "^7.22.20",
+                "to-fast-properties": "^2.0.0"
+            },
+            "engines": {
+                "node": ">=6.9.0"
+            }
+        },
+        "node_modules/@colors/colors": {
+            "version": "1.5.0",
+            "resolved": "https://registry.npmjs.org/@colors/colors/-/colors-1.5.0.tgz",
+            "integrity": "sha512-ooWCrlZP11i8GImSjTHYHLkvFDP48nS4+204nGb1RiX/WXYHmJA2III9/e2DWVabCESdW7hBAEzHRqUn9OUVvQ==",
+            "dev": true,
+            "optional": true,
+            "engines": {
+                "node": ">=0.1.90"
+            }
+        },
+        "node_modules/@discoveryjs/json-ext": {
+            "version": "0.5.7",
+            "resolved": "https://registry.npmjs.org/@discoveryjs/json-ext/-/json-ext-0.5.7.tgz",
+            "integrity": "sha512-dBVuXR082gk3jsFp7Rd/JI4kytwGHecnCoTtXFb7DB6CNHp4rg5k1bhg0nWdLGLnOV71lmDzGQaLMy8iPLY0pw==",
+            "dev": true,
+            "engines": {
+                "node": ">=10.0.0"
+            }
+        },
+        "node_modules/@jridgewell/gen-mapping": {
+            "version": "0.1.1",
+            "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.1.1.tgz",
+            "integrity": "sha512-sQXCasFk+U8lWYEe66WxRDOE9PjVz4vSM51fTu3Hw+ClTpUSQb718772vH3pyS5pShp6lvQM7SxgIDXXXmOX7w==",
+            "dev": true,
+            "dependencies": {
+                "@jridgewell/set-array": "^1.0.0",
+                "@jridgewell/sourcemap-codec": "^1.4.10"
+            },
+            "engines": {
+                "node": ">=6.0.0"
+            }
+        },
+        "node_modules/@jridgewell/resolve-uri": {
+            "version": "3.1.0",
+            "resolved": "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.1.0.tgz",
+            "integrity": "sha512-F2msla3tad+Mfht5cJq7LSXcdudKTWCVYUgw6pLFOOHSTtZlj6SWNYAp+AhuqLmWdBO2X5hPrLcu8cVP8fy28w==",
+            "dev": true,
+            "engines": {
+                "node": ">=6.0.0"
+            }
+        },
+        "node_modules/@jridgewell/set-array": {
+            "version": "1.1.2",
+            "resolved": "https://registry.npmjs.org/@jridgewell/set-array/-/set-array-1.1.2.tgz",
+            "integrity": "sha512-xnkseuNADM0gt2bs+BvhO0p78Mk762YnZdsuzFV018NoG1Sj1SCQvpSqa7XUaTam5vAGasABV9qXASMKnFMwMw==",
+            "dev": true,
+            "engines": {
+                "node": ">=6.0.0"
+            }
+        },
+        "node_modules/@jridgewell/source-map": {
+            "version": "0.3.5",
+            "resolved": "https://registry.npmjs.org/@jridgewell/source-map/-/source-map-0.3.5.tgz",
+            "integrity": "sha512-UTYAUj/wviwdsMfzoSJspJxbkH5o1snzwX0//0ENX1u/55kkZZkcTZP6u9bwKGkv+dkk9at4m1Cpt0uY80kcpQ==",
+            "dev": true,
+            "dependencies": {
+                "@jridgewell/gen-mapping": "^0.3.0",
+                "@jridgewell/trace-mapping": "^0.3.9"
+            }
+        },
+        "node_modules/@jridgewell/source-map/node_modules/@jridgewell/gen-mapping": {
+            "version": "0.3.3",
+            "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.3.tgz",
+            "integrity": "sha512-HLhSWOLRi875zjjMG/r+Nv0oCW8umGb0BgEhyX3dDX3egwZtB8PqLnjz3yedt8R5StBrzcg4aBpnh8UA9D1BoQ==",
+            "dev": true,
+            "dependencies": {
+                "@jridgewell/set-array": "^1.0.1",
+                "@jridgewell/sourcemap-codec": "^1.4.10",
+                "@jridgewell/trace-mapping": "^0.3.9"
+            },
+            "engines": {
+                "node": ">=6.0.0"
+            }
+        },
+        "node_modules/@jridgewell/sourcemap-codec": {
+            "version": "1.4.15",
+            "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.15.tgz",
+            "integrity": "sha512-eF2rxCRulEKXHTRiDrDy6erMYWqNw4LPdQ8UQA4huuxaQsVeRPFl2oM8oDGxMFhJUWZf9McpLtJasDDZb/Bpeg==",
+            "dev": true
+        },
+        "node_modules/@jridgewell/trace-mapping": {
+            "version": "0.3.20",
+            "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.20.tgz",
+            "integrity": "sha512-R8LcPeWZol2zR8mmH3JeKQ6QRCFb7XgUhV9ZlGhHLGyg4wpPiPZNQOOWhFZhxKw8u//yTbNGI42Bx/3paXEQ+Q==",
+            "dev": true,
+            "dependencies": {
+                "@jridgewell/resolve-uri": "^3.1.0",
+                "@jridgewell/sourcemap-codec": "^1.4.14"
+            }
+        },
+        "node_modules/@leichtgewicht/ip-codec": {
+            "version": "2.0.4",
+            "resolved": "https://registry.npmjs.org/@leichtgewicht/ip-codec/-/ip-codec-2.0.4.tgz",
+            "integrity": "sha512-Hcv+nVC0kZnQ3tD9GVu5xSMR4VVYOteQIr/hwFPVEvPdlXqgGEuRjiheChHgdM+JyqdgNcmzZOX/tnl0JOiI7A==",
+            "dev": true
+        },
+        "node_modules/@nodelib/fs.scandir": {
+            "version": "2.1.5",
+            "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz",
+            "integrity": "sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g==",
+            "dev": true,
+            "dependencies": {
+                "@nodelib/fs.stat": "2.0.5",
+                "run-parallel": "^1.1.9"
+            },
+            "engines": {
+                "node": ">= 8"
+            }
+        },
+        "node_modules/@nodelib/fs.stat": {
+            "version": "2.0.5",
+            "resolved": "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz",
+            "integrity": "sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A==",
+            "dev": true,
+            "engines": {
+                "node": ">= 8"
+            }
+        },
+        "node_modules/@nodelib/fs.walk": {
+            "version": "1.2.8",
+            "resolved": "https://registry.npmjs.org/@nodelib/fs.walk/-/fs.walk-1.2.8.tgz",
+            "integrity": "sha512-oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg==",
+            "dev": true,
+            "dependencies": {
+                "@nodelib/fs.scandir": "2.1.5",
+                "fastq": "^1.6.0"
+            },
+            "engines": {
+                "node": ">= 8"
+            }
+        },
+        "node_modules/@one-ini/wasm": {
+            "version": "0.1.1",
+            "resolved": "https://registry.npmjs.org/@one-ini/wasm/-/wasm-0.1.1.tgz",
+            "integrity": "sha512-XuySG1E38YScSJoMlqovLru4KTUNSjgVTIjyh7qMX6aNN5HY5Ct5LhRJdxO79JtTzKfzV/bnWpz+zquYrISsvw==",
+            "dev": true
+        },
+        "node_modules/@prettier/plugin-php": {
+            "version": "0.19.7",
+            "resolved": "https://registry.npmjs.org/@prettier/plugin-php/-/plugin-php-0.19.7.tgz",
+            "integrity": "sha512-QOzBs05nwuR92uak7xBHf7RCZCFXml+6Sk3cjTp2ahQlilBtupqlNjitlTXsOfPIAYwlFgLP1oSfyapS6DN00w==",
+            "dev": true,
+            "dependencies": {
+                "linguist-languages": "^7.21.0",
+                "mem": "^8.0.0",
+                "php-parser": "^3.1.5"
+            },
+            "peerDependencies": {
+                "prettier": "^1.15.0 || ^2.0.0"
+            }
+        },
+        "node_modules/@shufo/tailwindcss-class-sorter": {
+            "version": "3.0.1",
+            "resolved": "https://registry.npmjs.org/@shufo/tailwindcss-class-sorter/-/tailwindcss-class-sorter-3.0.1.tgz",
+            "integrity": "sha512-y9SMobvwElX2G6vdg4odJ6UL6hu/o5RlMsdwEeDLGaqHU3BLSw9CeitGgBus6kadjjDdT2wseG0Tl5yXWdc4UQ==",
+            "dev": true,
+            "dependencies": {
+                "escalade": "^3.1.1",
+                "object-hash": "^3.0.0",
+                "tailwindcss": "^3.3.2"
+            },
+            "engines": {
+                "node": ">= 14.0.0"
+            }
+        },
+        "node_modules/@trysound/sax": {
+            "version": "0.2.0",
+            "resolved": "https://registry.npmjs.org/@trysound/sax/-/sax-0.2.0.tgz",
+            "integrity": "sha512-L7z9BgrNEcYyUYtF+HaEfiS5ebkh9jXqbszz7pC0hRBPaatV0XjSD3+eHrpqFemQfgwiFF0QPIarnIihIDn7OA==",
+            "dev": true,
+            "engines": {
+                "node": ">=10.13.0"
+            }
+        },
+        "node_modules/@types/babel__core": {
+            "version": "7.20.3",
+            "resolved": "https://registry.npmjs.org/@types/babel__core/-/babel__core-7.20.3.tgz",
+            "integrity": "sha512-54fjTSeSHwfan8AyHWrKbfBWiEUrNTZsUwPTDSNaaP1QDQIZbeNUg3a59E9D+375MzUw/x1vx2/0F5LBz+AeYA==",
+            "dev": true,
+            "dependencies": {
+                "@babel/parser": "^7.20.7",
+                "@babel/types": "^7.20.7",
+                "@types/babel__generator": "*",
+                "@types/babel__template": "*",
+                "@types/babel__traverse": "*"
+            }
+        },
+        "node_modules/@types/babel__generator": {
+            "version": "7.6.6",
+            "resolved": "https://registry.npmjs.org/@types/babel__generator/-/babel__generator-7.6.6.tgz",
+            "integrity": "sha512-66BXMKb/sUWbMdBNdMvajU7i/44RkrA3z/Yt1c7R5xejt8qh84iU54yUWCtm0QwGJlDcf/gg4zd/x4mpLAlb/w==",
+            "dev": true,
+            "dependencies": {
+                "@babel/types": "^7.0.0"
+            }
+        },
+        "node_modules/@types/babel__template": {
+            "version": "7.4.3",
+            "resolved": "https://registry.npmjs.org/@types/babel__template/-/babel__template-7.4.3.tgz",
+            "integrity": "sha512-ciwyCLeuRfxboZ4isgdNZi/tkt06m8Tw6uGbBSBgWrnnZGNXiEyM27xc/PjXGQLqlZ6ylbgHMnm7ccF9tCkOeQ==",
+            "dev": true,
+            "dependencies": {
+                "@babel/parser": "^7.1.0",
+                "@babel/types": "^7.0.0"
+            }
+        },
+        "node_modules/@types/babel__traverse": {
+            "version": "7.20.3",
+            "resolved": "https://registry.npmjs.org/@types/babel__traverse/-/babel__traverse-7.20.3.tgz",
+            "integrity": "sha512-Lsh766rGEFbaxMIDH7Qa+Yha8cMVI3qAK6CHt3OR0YfxOIn5Z54iHiyDRycHrBqeIiqGa20Kpsv1cavfBKkRSw==",
+            "dev": true,
+            "dependencies": {
+                "@babel/types": "^7.20.7"
+            }
+        },
+        "node_modules/@types/body-parser": {
+            "version": "1.19.4",
+            "resolved": "https://registry.npmjs.org/@types/body-parser/-/body-parser-1.19.4.tgz",
+            "integrity": "sha512-N7UDG0/xiPQa2D/XrVJXjkWbpqHCd2sBaB32ggRF2l83RhPfamgKGF8gwwqyksS95qUS5ZYF9aF+lLPRlwI2UA==",
+            "dev": true,
+            "dependencies": {
+                "@types/connect": "*",
+                "@types/node": "*"
+            }
+        },
+        "node_modules/@types/bonjour": {
+            "version": "3.5.12",
+            "resolved": "https://registry.npmjs.org/@types/bonjour/-/bonjour-3.5.12.tgz",
+            "integrity": "sha512-ky0kWSqXVxSqgqJvPIkgFkcn4C8MnRog308Ou8xBBIVo39OmUFy+jqNe0nPwLCDFxUpmT9EvT91YzOJgkDRcFg==",
+            "dev": true,
+            "dependencies": {
+                "@types/node": "*"
+            }
+        },
+        "node_modules/@types/clean-css": {
+            "version": "4.2.9",
+            "resolved": "https://registry.npmjs.org/@types/clean-css/-/clean-css-4.2.9.tgz",
+            "integrity": "sha512-pjzJ4n5eAXAz/L5Zur4ZymuJUvyo0Uh0iRnRI/1kADFLs76skDky0K0dX1rlv4iXXrJXNk3sxRWVJR7CMDroWA==",
+            "dev": true,
+            "dependencies": {
+                "@types/node": "*",
+                "source-map": "^0.6.0"
+            }
+        },
+        "node_modules/@types/connect": {
+            "version": "3.4.37",
+            "resolved": "https://registry.npmjs.org/@types/connect/-/connect-3.4.37.tgz",
+            "integrity": "sha512-zBUSRqkfZ59OcwXon4HVxhx5oWCJmc0OtBTK05M+p0dYjgN6iTwIL2T/WbsQZrEsdnwaF9cWQ+azOnpPvIqY3Q==",
+            "dev": true,
+            "dependencies": {
+                "@types/node": "*"
+            }
+        },
+        "node_modules/@types/connect-history-api-fallback": {
+            "version": "1.5.2",
+            "resolved": "https://registry.npmjs.org/@types/connect-history-api-fallback/-/connect-history-api-fallback-1.5.2.tgz",
+            "integrity": "sha512-gX2j9x+NzSh4zOhnRPSdPPmTepS4DfxES0AvIFv3jGv5QyeAJf6u6dY5/BAoAJU9Qq1uTvwOku8SSC2GnCRl6Q==",
+            "dev": true,
+            "dependencies": {
+                "@types/express-serve-static-core": "*",
+                "@types/node": "*"
+            }
+        },
+        "node_modules/@types/eslint": {
+            "version": "8.4.5",
+            "resolved": "https://registry.npmjs.org/@types/eslint/-/eslint-8.4.5.tgz",
+            "integrity": "sha512-dhsC09y1gpJWnK+Ff4SGvCuSnk9DaU0BJZSzOwa6GVSg65XtTugLBITDAAzRU5duGBoXBHpdR/9jHGxJjNflJQ==",
+            "dev": true,
+            "dependencies": {
+                "@types/estree": "*",
+                "@types/json-schema": "*"
+            }
+        },
+        "node_modules/@types/eslint-scope": {
+            "version": "3.7.4",
+            "resolved": "https://registry.npmjs.org/@types/eslint-scope/-/eslint-scope-3.7.4.tgz",
+            "integrity": "sha512-9K4zoImiZc3HlIp6AVUDE4CWYx22a+lhSZMYNpbjW04+YF0KWj4pJXnEMjdnFTiQibFFmElcsasJXDbdI/EPhA==",
+            "dev": true,
+            "dependencies": {
+                "@types/eslint": "*",
+                "@types/estree": "*"
+            }
+        },
+        "node_modules/@types/estree": {
+            "version": "1.0.3",
+            "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.3.tgz",
+            "integrity": "sha512-CS2rOaoQ/eAgAfcTfq6amKG7bsN+EMcgGY4FAFQdvSj2y1ixvOZTUA9mOtCai7E1SYu283XNw7urKK30nP3wkQ==",
+            "dev": true
+        },
+        "node_modules/@types/express": {
+            "version": "4.17.20",
+            "resolved": "https://registry.npmjs.org/@types/express/-/express-4.17.20.tgz",
+            "integrity": "sha512-rOaqlkgEvOW495xErXMsmyX3WKBInbhG5eqojXYi3cGUaLoRDlXa5d52fkfWZT963AZ3v2eZ4MbKE6WpDAGVsw==",
+            "dev": true,
+            "dependencies": {
+                "@types/body-parser": "*",
+                "@types/express-serve-static-core": "^4.17.33",
+                "@types/qs": "*",
+                "@types/serve-static": "*"
+            }
+        },
+        "node_modules/@types/express-serve-static-core": {
+            "version": "4.17.39",
+            "resolved": "https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-4.17.39.tgz",
+            "integrity": "sha512-BiEUfAiGCOllomsRAZOiMFP7LAnrifHpt56pc4Z7l9K6ACyN06Ns1JLMBxwkfLOjJRlSf06NwWsT7yzfpaVpyQ==",
+            "dev": true,
+            "dependencies": {
+                "@types/node": "*",
+                "@types/qs": "*",
+                "@types/range-parser": "*",
+                "@types/send": "*"
+            }
+        },
+        "node_modules/@types/glob": {
+            "version": "7.2.0",
+            "resolved": "https://registry.npmjs.org/@types/glob/-/glob-7.2.0.tgz",
+            "integrity": "sha512-ZUxbzKl0IfJILTS6t7ip5fQQM/J3TJYubDm3nMbgubNNYS62eXeUpoLUC8/7fJNiFYHTrGPQn7hspDUzIHX3UA==",
+            "dev": true,
+            "dependencies": {
+                "@types/minimatch": "*",
+                "@types/node": "*"
+            }
+        },
+        "node_modules/@types/http-errors": {
+            "version": "2.0.3",
+            "resolved": "https://registry.npmjs.org/@types/http-errors/-/http-errors-2.0.3.tgz",
+            "integrity": "sha512-pP0P/9BnCj1OVvQR2lF41EkDG/lWWnDyA203b/4Fmi2eTyORnBtcDoKDwjWQthELrBvWkMOrvSOnZ8OVlW6tXA==",
+            "dev": true
+        },
+        "node_modules/@types/http-proxy": {
+            "version": "1.17.13",
+            "resolved": "https://registry.npmjs.org/@types/http-proxy/-/http-proxy-1.17.13.tgz",
+            "integrity": "sha512-GkhdWcMNiR5QSQRYnJ+/oXzu0+7JJEPC8vkWXK351BkhjraZF+1W13CUYARUvX9+NqIU2n6YHA4iwywsc/M6Sw==",
+            "dev": true,
+            "dependencies": {
+                "@types/node": "*"
+            }
+        },
+        "node_modules/@types/imagemin": {
+            "version": "8.0.3",
+            "resolved": "https://registry.npmjs.org/@types/imagemin/-/imagemin-8.0.3.tgz",
+            "integrity": "sha512-se/hpaYxu5DyvPqmUEwbupmbQSx6JNislk0dkoIgWSmArkj+Ow9pGG9pGz8MRmbQDfGNYNzqwPQKHCUy+K+jpQ==",
+            "dev": true,
+            "dependencies": {
+                "@types/node": "*"
+            }
+        },
+        "node_modules/@types/imagemin-gifsicle": {
+            "version": "7.0.3",
+            "resolved": "https://registry.npmjs.org/@types/imagemin-gifsicle/-/imagemin-gifsicle-7.0.3.tgz",
+            "integrity": "sha512-GQBKOk9doOd0Xp7OvO4QDl7U0Vkwk2Ps7J0rxafdAa7wG9lu7idvZTm8TtSZiRtHENdkW88Kz8OjmjMlgeeC5w==",
+            "dev": true,
+            "dependencies": {
+                "@types/imagemin": "*"
+            }
+        },
+        "node_modules/@types/imagemin-mozjpeg": {
+            "version": "8.0.3",
+            "resolved": "https://registry.npmjs.org/@types/imagemin-mozjpeg/-/imagemin-mozjpeg-8.0.3.tgz",
+            "integrity": "sha512-+U/ibETP2/oRqeuaaXa67dEpKHfzmfK0OBVC09AR4c1CIFAKjQ5xY+dxH+fjoMQRlwdcRQLkn/ALtnxSl3Xsqw==",
+            "dev": true,
+            "dependencies": {
+                "@types/imagemin": "*"
+            }
+        },
+        "node_modules/@types/imagemin-optipng": {
+            "version": "5.2.3",
+            "resolved": "https://registry.npmjs.org/@types/imagemin-optipng/-/imagemin-optipng-5.2.3.tgz",
+            "integrity": "sha512-Q80ANbJYn+WgKkWVfx9f7/q4LR6qun4NIiuV1eRWCg8KCAmNrU7ZH16a2hGs9kfkFqyJlhBv6oV9SDXe1vL3aQ==",
+            "dev": true,
+            "dependencies": {
+                "@types/imagemin": "*"
+            }
+        },
+        "node_modules/@types/imagemin-svgo": {
+            "version": "8.0.1",
+            "resolved": "https://registry.npmjs.org/@types/imagemin-svgo/-/imagemin-svgo-8.0.1.tgz",
+            "integrity": "sha512-YafkdrVAcr38U0Ln1C+L1n4SIZqC47VBHTyxCq7gTUSd1R9MdIvMcrljWlgU1M9O68WZDeQWUrKipKYfEOCOvQ==",
+            "dev": true,
+            "dependencies": {
+                "@types/imagemin": "*",
+                "@types/svgo": "^1"
+            }
+        },
+        "node_modules/@types/json-schema": {
+            "version": "7.0.9",
+            "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.9.tgz",
+            "integrity": "sha512-qcUXuemtEu+E5wZSJHNxUXeCZhAfXKQ41D+duX+VYPde7xyEVZci+/oXKJL13tnRs9lR2pr4fod59GT6/X1/yQ==",
+            "dev": true
+        },
+        "node_modules/@types/mime": {
+            "version": "1.3.4",
+            "resolved": "https://registry.npmjs.org/@types/mime/-/mime-1.3.4.tgz",
+            "integrity": "sha512-1Gjee59G25MrQGk8bsNvC6fxNiRgUlGn2wlhGf95a59DrprnnHk80FIMMFG9XHMdrfsuA119ht06QPDXA1Z7tw==",
+            "dev": true
+        },
+        "node_modules/@types/minimatch": {
+            "version": "5.1.2",
+            "resolved": "https://registry.npmjs.org/@types/minimatch/-/minimatch-5.1.2.tgz",
+            "integrity": "sha512-K0VQKziLUWkVKiRVrx4a40iPaxTUefQmjtkQofBkYRcoaaL/8rhwDWww9qWbrgicNOgnpIsMxyNIUM4+n6dUIA==",
+            "dev": true
+        },
+        "node_modules/@types/node": {
+            "version": "18.0.5",
+            "resolved": "https://registry.npmjs.org/@types/node/-/node-18.0.5.tgz",
+            "integrity": "sha512-En7tneq+j0qAiVwysBD79y86MT3ModuoIJbe7JXp+sb5UAjInSShmK3nXXMioBzfF7rXC12hv12d4IyCVwN4dA==",
+            "dev": true
+        },
+        "node_modules/@types/parse-json": {
+            "version": "4.0.1",
+            "resolved": "https://registry.npmjs.org/@types/parse-json/-/parse-json-4.0.1.tgz",
+            "integrity": "sha512-3YmXzzPAdOTVljVMkTMBdBEvlOLg2cDQaDhnnhT3nT9uDbnJzjWhKlzb+desT12Y7tGqaN6d+AbozcKzyL36Ng==",
+            "dev": true
+        },
+        "node_modules/@types/qs": {
+            "version": "6.9.9",
+            "resolved": "https://registry.npmjs.org/@types/qs/-/qs-6.9.9.tgz",
+            "integrity": "sha512-wYLxw35euwqGvTDx6zfY1vokBFnsK0HNrzc6xNHchxfO2hpuRg74GbkEW7e3sSmPvj0TjCDT1VCa6OtHXnubsg==",
+            "dev": true
+        },
+        "node_modules/@types/range-parser": {
+            "version": "1.2.6",
+            "resolved": "https://registry.npmjs.org/@types/range-parser/-/range-parser-1.2.6.tgz",
+            "integrity": "sha512-+0autS93xyXizIYiyL02FCY8N+KkKPhILhcUSA276HxzreZ16kl+cmwvV2qAM/PuCCwPXzOXOWhiPcw20uSFcA==",
+            "dev": true
+        },
+        "node_modules/@types/retry": {
+            "version": "0.12.0",
+            "resolved": "https://registry.npmjs.org/@types/retry/-/retry-0.12.0.tgz",
+            "integrity": "sha512-wWKOClTTiizcZhXnPY4wikVAwmdYHp8q6DmC+EJUzAMsycb7HB32Kh9RN4+0gExjmPmZSAQjgURXIGATPegAvA==",
+            "dev": true
+        },
+        "node_modules/@types/send": {
+            "version": "0.17.3",
+            "resolved": "https://registry.npmjs.org/@types/send/-/send-0.17.3.tgz",
+            "integrity": "sha512-/7fKxvKUoETxjFUsuFlPB9YndePpxxRAOfGC/yJdc9kTjTeP5kRCTzfnE8kPUKCeyiyIZu0YQ76s50hCedI1ug==",
+            "dev": true,
+            "dependencies": {
+                "@types/mime": "^1",
+                "@types/node": "*"
+            }
+        },
+        "node_modules/@types/serve-index": {
+            "version": "1.9.3",
+            "resolved": "https://registry.npmjs.org/@types/serve-index/-/serve-index-1.9.3.tgz",
+            "integrity": "sha512-4KG+yMEuvDPRrYq5fyVm/I2uqAJSAwZK9VSa+Zf+zUq9/oxSSvy3kkIqyL+jjStv6UCVi8/Aho0NHtB1Fwosrg==",
+            "dev": true,
+            "dependencies": {
+                "@types/express": "*"
+            }
+        },
+        "node_modules/@types/serve-static": {
+            "version": "1.15.4",
+            "resolved": "https://registry.npmjs.org/@types/serve-static/-/serve-static-1.15.4.tgz",
+            "integrity": "sha512-aqqNfs1XTF0HDrFdlY//+SGUxmdSUbjeRXb5iaZc3x0/vMbYmdw9qvOgHWOyyLFxSSRnUuP5+724zBgfw8/WAw==",
+            "dev": true,
+            "dependencies": {
+                "@types/http-errors": "*",
+                "@types/mime": "*",
+                "@types/node": "*"
+            }
+        },
+        "node_modules/@types/sockjs": {
+            "version": "0.3.35",
+            "resolved": "https://registry.npmjs.org/@types/sockjs/-/sockjs-0.3.35.tgz",
+            "integrity": "sha512-tIF57KB+ZvOBpAQwSaACfEu7htponHXaFzP7RfKYgsOS0NoYnn+9+jzp7bbq4fWerizI3dTB4NfAZoyeQKWJLw==",
+            "dev": true,
+            "dependencies": {
+                "@types/node": "*"
+            }
+        },
+        "node_modules/@types/svgo": {
+            "version": "1.3.6",
+            "resolved": "https://registry.npmjs.org/@types/svgo/-/svgo-1.3.6.tgz",
+            "integrity": "sha512-AZU7vQcy/4WFEuwnwsNsJnFwupIpbllH1++LXScN6uxT1Z4zPzdrWG97w4/I7eFKFTvfy/bHFStWjdBAg2Vjug==",
+            "dev": true
+        },
+        "node_modules/@types/ws": {
+            "version": "8.5.8",
+            "resolved": "https://registry.npmjs.org/@types/ws/-/ws-8.5.8.tgz",
+            "integrity": "sha512-flUksGIQCnJd6sZ1l5dqCEG/ksaoAg/eUwiLAGTJQcfgvZJKF++Ta4bJA6A5aPSJmsr+xlseHn4KLgVlNnvPTg==",
+            "dev": true,
+            "dependencies": {
+                "@types/node": "*"
+            }
+        },
+        "node_modules/@vue/compiler-core": {
+            "version": "3.3.13",
+            "resolved": "https://registry.npmjs.org/@vue/compiler-core/-/compiler-core-3.3.13.tgz",
+            "integrity": "sha512-bwi9HShGu7uaZLOErZgsH2+ojsEdsjerbf2cMXPwmvcgZfVPZ2BVZzCVnwZBxTAYd6Mzbmf6izcUNDkWnBBQ6A==",
+            "dev": true,
+            "dependencies": {
+                "@babel/parser": "^7.23.5",
+                "@vue/shared": "3.3.13",
+                "estree-walker": "^2.0.2",
+                "source-map-js": "^1.0.2"
+            }
+        },
+        "node_modules/@vue/compiler-dom": {
+            "version": "3.3.13",
+            "resolved": "https://registry.npmjs.org/@vue/compiler-dom/-/compiler-dom-3.3.13.tgz",
+            "integrity": "sha512-EYRDpbLadGtNL0Gph+HoKiYqXLqZ0xSSpR5Dvnu/Ep7ggaCbjRDIus1MMxTS2Qm0koXED4xSlvTZaTnI8cYAsw==",
+            "dev": true,
+            "dependencies": {
+                "@vue/compiler-core": "3.3.13",
+                "@vue/shared": "3.3.13"
+            }
+        },
+        "node_modules/@vue/compiler-sfc": {
+            "version": "3.3.13",
+            "resolved": "https://registry.npmjs.org/@vue/compiler-sfc/-/compiler-sfc-3.3.13.tgz",
+            "integrity": "sha512-DQVmHEy/EKIgggvnGRLx21hSqnr1smUS9Aq8tfxiiot8UR0/pXKHN9k78/qQ7etyQTFj5em5nruODON7dBeumw==",
+            "dev": true,
+            "dependencies": {
+                "@babel/parser": "^7.23.5",
+                "@vue/compiler-core": "3.3.13",
+                "@vue/compiler-dom": "3.3.13",
+                "@vue/compiler-ssr": "3.3.13",
+                "@vue/reactivity-transform": "3.3.13",
+                "@vue/shared": "3.3.13",
+                "estree-walker": "^2.0.2",
+                "magic-string": "^0.30.5",
+                "postcss": "^8.4.32",
+                "source-map-js": "^1.0.2"
+            }
+        },
+        "node_modules/@vue/compiler-ssr": {
+            "version": "3.3.13",
+            "resolved": "https://registry.npmjs.org/@vue/compiler-ssr/-/compiler-ssr-3.3.13.tgz",
+            "integrity": "sha512-d/P3bCeUGmkJNS1QUZSAvoCIW4fkOKK3l2deE7zrp0ypJEy+En2AcypIkqvcFQOcw3F0zt2VfMvNsA9JmExTaw==",
+            "dev": true,
+            "dependencies": {
+                "@vue/compiler-dom": "3.3.13",
+                "@vue/shared": "3.3.13"
+            }
+        },
+        "node_modules/@vue/reactivity": {
+            "version": "3.3.13",
+            "resolved": "https://registry.npmjs.org/@vue/reactivity/-/reactivity-3.3.13.tgz",
+            "integrity": "sha512-fjzCxceMahHhi4AxUBzQqqVhuA21RJ0COaWTbIBl1PruGW1CeY97louZzLi4smpYx+CHfFPPU/CS8NybbGvPKQ==",
+            "dev": true,
+            "dependencies": {
+                "@vue/shared": "3.3.13"
+            }
+        },
+        "node_modules/@vue/reactivity-transform": {
+            "version": "3.3.13",
+            "resolved": "https://registry.npmjs.org/@vue/reactivity-transform/-/reactivity-transform-3.3.13.tgz",
+            "integrity": "sha512-oWnydGH0bBauhXvh5KXUy61xr9gKaMbtsMHk40IK9M4gMuKPJ342tKFarY0eQ6jef8906m35q37wwA8DMZOm5Q==",
+            "dev": true,
+            "dependencies": {
+                "@babel/parser": "^7.23.5",
+                "@vue/compiler-core": "3.3.13",
+                "@vue/shared": "3.3.13",
+                "estree-walker": "^2.0.2",
+                "magic-string": "^0.30.5"
+            }
+        },
+        "node_modules/@vue/runtime-core": {
+            "version": "3.3.13",
+            "resolved": "https://registry.npmjs.org/@vue/runtime-core/-/runtime-core-3.3.13.tgz",
+            "integrity": "sha512-1TzA5TvGuh2zUwMJgdfvrBABWZ7y8kBwBhm7BXk8rvdx2SsgcGfz2ruv2GzuGZNvL1aKnK8CQMV/jFOrxNQUMA==",
+            "dev": true,
+            "dependencies": {
+                "@vue/reactivity": "3.3.13",
+                "@vue/shared": "3.3.13"
+            }
+        },
+        "node_modules/@vue/runtime-dom": {
+            "version": "3.3.13",
+            "resolved": "https://registry.npmjs.org/@vue/runtime-dom/-/runtime-dom-3.3.13.tgz",
+            "integrity": "sha512-JJkpE8R/hJKXqVTgUoODwS5wqKtOsmJPEqmp90PDVGygtJ4C0PtOkcEYXwhiVEmef6xeXcIlrT3Yo5aQ4qkHhQ==",
+            "dev": true,
+            "dependencies": {
+                "@vue/runtime-core": "3.3.13",
+                "@vue/shared": "3.3.13",
+                "csstype": "^3.1.3"
+            }
+        },
+        "node_modules/@vue/server-renderer": {
+            "version": "3.3.13",
+            "resolved": "https://registry.npmjs.org/@vue/server-renderer/-/server-renderer-3.3.13.tgz",
+            "integrity": "sha512-vSnN+nuf6iSqTL3Qgx/9A+BT+0Zf/VJOgF5uMZrKjYPs38GMYyAU1coDyBNHauehXDaP+zl73VhwWv0vBRBHcg==",
+            "dev": true,
+            "dependencies": {
+                "@vue/compiler-ssr": "3.3.13",
+                "@vue/shared": "3.3.13"
+            },
+            "peerDependencies": {
+                "vue": "3.3.13"
+            }
+        },
+        "node_modules/@vue/shared": {
+            "version": "3.3.13",
+            "resolved": "https://registry.npmjs.org/@vue/shared/-/shared-3.3.13.tgz",
+            "integrity": "sha512-/zYUwiHD8j7gKx2argXEMCUXVST6q/21DFU0sTfNX0URJroCe3b1UF6vLJ3lQDfLNIiiRl2ONp7Nh5UVWS6QnA==",
+            "dev": true
+        },
+        "node_modules/@webassemblyjs/ast": {
+            "version": "1.11.6",
+            "resolved": "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.11.6.tgz",
+            "integrity": "sha512-IN1xI7PwOvLPgjcf180gC1bqn3q/QaOCwYUahIOhbYUu8KA/3tw2RT/T0Gidi1l7Hhj5D/INhJxiICObqpMu4Q==",
+            "dev": true,
+            "dependencies": {
+                "@webassemblyjs/helper-numbers": "1.11.6",
+                "@webassemblyjs/helper-wasm-bytecode": "1.11.6"
+            }
+        },
+        "node_modules/@webassemblyjs/floating-point-hex-parser": {
+            "version": "1.11.6",
+            "resolved": "https://registry.npmjs.org/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.11.6.tgz",
+            "integrity": "sha512-ejAj9hfRJ2XMsNHk/v6Fu2dGS+i4UaXBXGemOfQ/JfQ6mdQg/WXtwleQRLLS4OvfDhv8rYnVwH27YJLMyYsxhw==",
+            "dev": true
+        },
+        "node_modules/@webassemblyjs/helper-api-error": {
+            "version": "1.11.6",
+            "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-api-error/-/helper-api-error-1.11.6.tgz",
+            "integrity": "sha512-o0YkoP4pVu4rN8aTJgAyj9hC2Sv5UlkzCHhxqWj8butaLvnpdc2jOwh4ewE6CX0txSfLn/UYaV/pheS2Txg//Q==",
+            "dev": true
+        },
+        "node_modules/@webassemblyjs/helper-buffer": {
+            "version": "1.11.6",
+            "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-buffer/-/helper-buffer-1.11.6.tgz",
+            "integrity": "sha512-z3nFzdcp1mb8nEOFFk8DrYLpHvhKC3grJD2ardfKOzmbmJvEf/tPIqCY+sNcwZIY8ZD7IkB2l7/pqhUhqm7hLA==",
+            "dev": true
+        },
+        "node_modules/@webassemblyjs/helper-numbers": {
+            "version": "1.11.6",
+            "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-numbers/-/helper-numbers-1.11.6.tgz",
+            "integrity": "sha512-vUIhZ8LZoIWHBohiEObxVm6hwP034jwmc9kuq5GdHZH0wiLVLIPcMCdpJzG4C11cHoQ25TFIQj9kaVADVX7N3g==",
+            "dev": true,
+            "dependencies": {
+                "@webassemblyjs/floating-point-hex-parser": "1.11.6",
+                "@webassemblyjs/helper-api-error": "1.11.6",
+                "@xtuc/long": "4.2.2"
+            }
+        },
+        "node_modules/@webassemblyjs/helper-wasm-bytecode": {
+            "version": "1.11.6",
+            "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.11.6.tgz",
+            "integrity": "sha512-sFFHKwcmBprO9e7Icf0+gddyWYDViL8bpPjJJl0WHxCdETktXdmtWLGVzoHbqUcY4Be1LkNfwTmXOJUFZYSJdA==",
+            "dev": true
+        },
+        "node_modules/@webassemblyjs/helper-wasm-section": {
+            "version": "1.11.6",
+            "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.11.6.tgz",
+            "integrity": "sha512-LPpZbSOwTpEC2cgn4hTydySy1Ke+XEu+ETXuoyvuyezHO3Kjdu90KK95Sh9xTbmjrCsUwvWwCOQQNta37VrS9g==",
+            "dev": true,
+            "dependencies": {
+                "@webassemblyjs/ast": "1.11.6",
+                "@webassemblyjs/helper-buffer": "1.11.6",
+                "@webassemblyjs/helper-wasm-bytecode": "1.11.6",
+                "@webassemblyjs/wasm-gen": "1.11.6"
+            }
+        },
+        "node_modules/@webassemblyjs/ieee754": {
+            "version": "1.11.6",
+            "resolved": "https://registry.npmjs.org/@webassemblyjs/ieee754/-/ieee754-1.11.6.tgz",
+            "integrity": "sha512-LM4p2csPNvbij6U1f19v6WR56QZ8JcHg3QIJTlSwzFcmx6WSORicYj6I63f9yU1kEUtrpG+kjkiIAkevHpDXrg==",
+            "dev": true,
+            "dependencies": {
+                "@xtuc/ieee754": "^1.2.0"
+            }
+        },
+        "node_modules/@webassemblyjs/leb128": {
+            "version": "1.11.6",
+            "resolved": "https://registry.npmjs.org/@webassemblyjs/leb128/-/leb128-1.11.6.tgz",
+            "integrity": "sha512-m7a0FhE67DQXgouf1tbN5XQcdWoNgaAuoULHIfGFIEVKA6tu/edls6XnIlkmS6FrXAquJRPni3ZZKjw6FSPjPQ==",
+            "dev": true,
+            "dependencies": {
+                "@xtuc/long": "4.2.2"
+            }
+        },
+        "node_modules/@webassemblyjs/utf8": {
+            "version": "1.11.6",
+            "resolved": "https://registry.npmjs.org/@webassemblyjs/utf8/-/utf8-1.11.6.tgz",
+            "integrity": "sha512-vtXf2wTQ3+up9Zsg8sa2yWiQpzSsMyXj0qViVP6xKGCUT8p8YJ6HqI7l5eCnWx1T/FYdsv07HQs2wTFbbof/RA==",
+            "dev": true
+        },
+        "node_modules/@webassemblyjs/wasm-edit": {
+            "version": "1.11.6",
+            "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-edit/-/wasm-edit-1.11.6.tgz",
+            "integrity": "sha512-Ybn2I6fnfIGuCR+Faaz7YcvtBKxvoLV3Lebn1tM4o/IAJzmi9AWYIPWpyBfU8cC+JxAO57bk4+zdsTjJR+VTOw==",
+            "dev": true,
+            "dependencies": {
+                "@webassemblyjs/ast": "1.11.6",
+                "@webassemblyjs/helper-buffer": "1.11.6",
+                "@webassemblyjs/helper-wasm-bytecode": "1.11.6",
+                "@webassemblyjs/helper-wasm-section": "1.11.6",
+                "@webassemblyjs/wasm-gen": "1.11.6",
+                "@webassemblyjs/wasm-opt": "1.11.6",
+                "@webassemblyjs/wasm-parser": "1.11.6",
+                "@webassemblyjs/wast-printer": "1.11.6"
+            }
+        },
+        "node_modules/@webassemblyjs/wasm-gen": {
+            "version": "1.11.6",
+            "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-gen/-/wasm-gen-1.11.6.tgz",
+            "integrity": "sha512-3XOqkZP/y6B4F0PBAXvI1/bky7GryoogUtfwExeP/v7Nzwo1QLcq5oQmpKlftZLbT+ERUOAZVQjuNVak6UXjPA==",
+            "dev": true,
+            "dependencies": {
+                "@webassemblyjs/ast": "1.11.6",
+                "@webassemblyjs/helper-wasm-bytecode": "1.11.6",
+                "@webassemblyjs/ieee754": "1.11.6",
+                "@webassemblyjs/leb128": "1.11.6",
+                "@webassemblyjs/utf8": "1.11.6"
+            }
+        },
+        "node_modules/@webassemblyjs/wasm-opt": {
+            "version": "1.11.6",
+            "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-opt/-/wasm-opt-1.11.6.tgz",
+            "integrity": "sha512-cOrKuLRE7PCe6AsOVl7WasYf3wbSo4CeOk6PkrjS7g57MFfVUF9u6ysQBBODX0LdgSvQqRiGz3CXvIDKcPNy4g==",
+            "dev": true,
+            "dependencies": {
+                "@webassemblyjs/ast": "1.11.6",
+                "@webassemblyjs/helper-buffer": "1.11.6",
+                "@webassemblyjs/wasm-gen": "1.11.6",
+                "@webassemblyjs/wasm-parser": "1.11.6"
+            }
+        },
+        "node_modules/@webassemblyjs/wasm-parser": {
+            "version": "1.11.6",
+            "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-parser/-/wasm-parser-1.11.6.tgz",
+            "integrity": "sha512-6ZwPeGzMJM3Dqp3hCsLgESxBGtT/OeCvCZ4TA1JUPYgmhAx38tTPR9JaKy0S5H3evQpO/h2uWs2j6Yc/fjkpTQ==",
+            "dev": true,
+            "dependencies": {
+                "@webassemblyjs/ast": "1.11.6",
+                "@webassemblyjs/helper-api-error": "1.11.6",
+                "@webassemblyjs/helper-wasm-bytecode": "1.11.6",
+                "@webassemblyjs/ieee754": "1.11.6",
+                "@webassemblyjs/leb128": "1.11.6",
+                "@webassemblyjs/utf8": "1.11.6"
+            }
+        },
+        "node_modules/@webassemblyjs/wast-printer": {
+            "version": "1.11.6",
+            "resolved": "https://registry.npmjs.org/@webassemblyjs/wast-printer/-/wast-printer-1.11.6.tgz",
+            "integrity": "sha512-JM7AhRcE+yW2GWYaKeHL5vt4xqee5N2WcezptmgyhNS+ScggqcT1OtXykhAb13Sn5Yas0j2uv9tHgrjwvzAP4A==",
+            "dev": true,
+            "dependencies": {
+                "@webassemblyjs/ast": "1.11.6",
+                "@xtuc/long": "4.2.2"
+            }
+        },
+        "node_modules/@webpack-cli/configtest": {
+            "version": "1.2.0",
+            "resolved": "https://registry.npmjs.org/@webpack-cli/configtest/-/configtest-1.2.0.tgz",
+            "integrity": "sha512-4FB8Tj6xyVkyqjj1OaTqCjXYULB9FMkqQ8yGrZjRDrYh0nOE+7Lhs45WioWQQMV+ceFlE368Ukhe6xdvJM9Egg==",
+            "dev": true,
+            "peerDependencies": {
+                "webpack": "4.x.x || 5.x.x",
+                "webpack-cli": "4.x.x"
+            }
+        },
+        "node_modules/@webpack-cli/info": {
+            "version": "1.5.0",
+            "resolved": "https://registry.npmjs.org/@webpack-cli/info/-/info-1.5.0.tgz",
+            "integrity": "sha512-e8tSXZpw2hPl2uMJY6fsMswaok5FdlGNRTktvFk2sD8RjH0hE2+XistawJx1vmKteh4NmGmNUrp+Tb2w+udPcQ==",
+            "dev": true,
+            "dependencies": {
+                "envinfo": "^7.7.3"
+            },
+            "peerDependencies": {
+                "webpack-cli": "4.x.x"
+            }
+        },
+        "node_modules/@webpack-cli/serve": {
+            "version": "1.7.0",
+            "resolved": "https://registry.npmjs.org/@webpack-cli/serve/-/serve-1.7.0.tgz",
+            "integrity": "sha512-oxnCNGj88fL+xzV+dacXs44HcDwf1ovs3AuEzvP7mqXw7fQntqIhQ1BRmynh4qEKQSSSRSWVyXRjmTbZIX9V2Q==",
+            "dev": true,
+            "peerDependencies": {
+                "webpack-cli": "4.x.x"
+            },
+            "peerDependenciesMeta": {
+                "webpack-dev-server": {
+                    "optional": true
+                }
+            }
+        },
+        "node_modules/@xtuc/ieee754": {
+            "version": "1.2.0",
+            "resolved": "https://registry.npmjs.org/@xtuc/ieee754/-/ieee754-1.2.0.tgz",
+            "integrity": "sha512-DX8nKgqcGwsc0eJSqYt5lwP4DH5FlHnmuWWBRy7X0NcaGR0ZtuyeESgMwTYVEtxmsNGY+qit4QYT/MIYTOTPeA==",
+            "dev": true
+        },
+        "node_modules/@xtuc/long": {
+            "version": "4.2.2",
+            "resolved": "https://registry.npmjs.org/@xtuc/long/-/long-4.2.2.tgz",
+            "integrity": "sha512-NuHqBY1PB/D8xU6s/thBgOAiAP7HOYDQ32+BFZILJ8ivkUkAHQnWfn6WhL79Owj1qmUnoN/YPhktdIoucipkAQ==",
+            "dev": true
+        },
+        "node_modules/abbrev": {
+            "version": "1.1.1",
+            "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz",
+            "integrity": "sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==",
+            "dev": true
+        },
+        "node_modules/accepts": {
+            "version": "1.3.8",
+            "resolved": "https://registry.npmjs.org/accepts/-/accepts-1.3.8.tgz",
+            "integrity": "sha512-PYAthTa2m2VKxuvSD3DPC/Gy+U+sOA1LAuT8mkmRuvw+NACSaeXEQ+NHcVF7rONl6qcaxV3Uuemwawk+7+SJLw==",
+            "dev": true,
+            "dependencies": {
+                "mime-types": "~2.1.34",
+                "negotiator": "0.6.3"
+            },
+            "engines": {
+                "node": ">= 0.6"
+            }
+        },
+        "node_modules/acorn": {
+            "version": "8.10.0",
+            "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.10.0.tgz",
+            "integrity": "sha512-F0SAmZ8iUtS//m8DmCTA0jlh6TDKkHQyK6xc6V4KDTyZKA9dnvX9/3sRTVQrWm79glUAZbnmmNcdYwUIHWVybw==",
+            "dev": true,
+            "bin": {
+                "acorn": "bin/acorn"
+            },
+            "engines": {
+                "node": ">=0.4.0"
+            }
+        },
+        "node_modules/acorn-import-assertions": {
+            "version": "1.9.0",
+            "resolved": "https://registry.npmjs.org/acorn-import-assertions/-/acorn-import-assertions-1.9.0.tgz",
+            "integrity": "sha512-cmMwop9x+8KFhxvKrKfPYmN6/pKTYYHBqLa0DfvVZcKMJWNyWLnaqND7dx/qn66R7ewM1UX5XMaDVP5wlVTaVA==",
+            "dev": true,
+            "peerDependencies": {
+                "acorn": "^8"
+            }
+        },
+        "node_modules/adjust-sourcemap-loader": {
+            "version": "4.0.0",
+            "resolved": "https://registry.npmjs.org/adjust-sourcemap-loader/-/adjust-sourcemap-loader-4.0.0.tgz",
+            "integrity": "sha512-OXwN5b9pCUXNQHJpwwD2qP40byEmSgzj8B4ydSN0uMNYWiFmJ6x6KwUllMmfk8Rwu/HJDFR7U8ubsWBoN0Xp0A==",
+            "dev": true,
+            "dependencies": {
+                "loader-utils": "^2.0.0",
+                "regex-parser": "^2.2.11"
+            },
+            "engines": {
+                "node": ">=8.9"
+            }
+        },
+        "node_modules/aigle": {
+            "version": "1.14.1",
+            "resolved": "https://registry.npmjs.org/aigle/-/aigle-1.14.1.tgz",
+            "integrity": "sha512-bCmQ65CEebspmpbWFs6ab3S27TNyVH1b5MledX8KoiGxUhsJmPUUGpaoSijhwawNnq5Lt8jbcq7Z7gUAD0nuTw==",
+            "dev": true,
+            "dependencies": {
+                "aigle-core": "^1.0.0"
+            }
+        },
+        "node_modules/aigle-core": {
+            "version": "1.0.0",
+            "resolved": "https://registry.npmjs.org/aigle-core/-/aigle-core-1.0.0.tgz",
+            "integrity": "sha512-uGFWPumk5DLvYnUphNnff+kWC8VeAnjPbbU8ovsSHflKXGX77SD7cAN/aSBCLX3xnoJAM9KdtRgxUygRnSSu7A==",
+            "dev": true
+        },
+        "node_modules/ajv": {
+            "version": "6.12.6",
+            "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
+            "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
+            "dev": true,
+            "dependencies": {
+                "fast-deep-equal": "^3.1.1",
+                "fast-json-stable-stringify": "^2.0.0",
+                "json-schema-traverse": "^0.4.1",
+                "uri-js": "^4.2.2"
+            },
+            "funding": {
+                "type": "github",
+                "url": "https://github.com/sponsors/epoberezkin"
+            }
+        },
+        "node_modules/ajv-formats": {
+            "version": "2.1.1",
+            "resolved": "https://registry.npmjs.org/ajv-formats/-/ajv-formats-2.1.1.tgz",
+            "integrity": "sha512-Wx0Kx52hxE7C18hkMEggYlEifqWZtYaRgouJor+WMdPnQyEK13vgEWyVNup7SoeeoLMsr4kf5h6dOW11I15MUA==",
+            "dev": true,
+            "dependencies": {
+                "ajv": "^8.0.0"
+            },
+            "peerDependencies": {
+                "ajv": "^8.0.0"
+            },
+            "peerDependenciesMeta": {
+                "ajv": {
+                    "optional": true
+                }
+            }
+        },
+        "node_modules/ajv-formats/node_modules/ajv": {
+            "version": "8.12.0",
+            "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.12.0.tgz",
+            "integrity": "sha512-sRu1kpcO9yLtYxBKvqfTeh9KzZEwO3STyX1HT+4CaDzC6HpTGYhIhPIzj9XuKU7KYDwnaeh5hcOwjy1QuJzBPA==",
+            "dev": true,
+            "dependencies": {
+                "fast-deep-equal": "^3.1.1",
+                "json-schema-traverse": "^1.0.0",
+                "require-from-string": "^2.0.2",
+                "uri-js": "^4.2.2"
+            },
+            "funding": {
+                "type": "github",
+                "url": "https://github.com/sponsors/epoberezkin"
+            }
+        },
+        "node_modules/ajv-formats/node_modules/json-schema-traverse": {
+            "version": "1.0.0",
+            "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz",
+            "integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==",
+            "dev": true
+        },
+        "node_modules/ajv-keywords": {
+            "version": "3.5.2",
+            "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.5.2.tgz",
+            "integrity": "sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==",
+            "dev": true,
+            "peerDependencies": {
+                "ajv": "^6.9.1"
+            }
+        },
+        "node_modules/ansi-html-community": {
+            "version": "0.0.8",
+            "resolved": "https://registry.npmjs.org/ansi-html-community/-/ansi-html-community-0.0.8.tgz",
+            "integrity": "sha512-1APHAyr3+PCamwNw3bXCPp4HFLONZt/yIH0sZp0/469KWNTEy+qN5jQ3GVX6DMZ1UXAi34yVwtTeaG/HpBuuzw==",
+            "dev": true,
+            "engines": [
+                "node >= 0.8.0"
+            ],
+            "bin": {
+                "ansi-html": "bin/ansi-html"
+            }
+        },
+        "node_modules/ansi-regex": {
+            "version": "5.0.1",
+            "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
+            "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
+            "dev": true,
+            "engines": {
+                "node": ">=8"
+            }
+        },
+        "node_modules/ansi-styles": {
+            "version": "4.3.0",
+            "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+            "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+            "dev": true,
+            "dependencies": {
+                "color-convert": "^2.0.1"
+            },
+            "engines": {
+                "node": ">=8"
+            },
+            "funding": {
+                "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+            }
+        },
+        "node_modules/any-promise": {
+            "version": "1.3.0",
+            "resolved": "https://registry.npmjs.org/any-promise/-/any-promise-1.3.0.tgz",
+            "integrity": "sha512-7UvmKalWRt1wgjL1RrGxoSJW/0QZFIegpeGvZG9kjp8vrRu55XTHbwnqq2GpXm9uLbcuhxm3IqX9OB4MZR1b2A==",
+            "dev": true
+        },
+        "node_modules/anymatch": {
+            "version": "3.1.2",
+            "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.2.tgz",
+            "integrity": "sha512-P43ePfOAIupkguHUycrc4qJ9kz8ZiuOUijaETwX7THt0Y/GNK7v0aa8rY816xWjZ7rJdA5XdMcpVFTKMq+RvWg==",
+            "dev": true,
+            "dependencies": {
+                "normalize-path": "^3.0.0",
+                "picomatch": "^2.0.4"
+            },
+            "engines": {
+                "node": ">= 8"
+            }
+        },
+        "node_modules/arg": {
+            "version": "5.0.2",
+            "resolved": "https://registry.npmjs.org/arg/-/arg-5.0.2.tgz",
+            "integrity": "sha512-PYjyFOLKQ9y57JvQ6QLo8dAgNqswh8M1RMJYdQduT6xbWSgK36P/Z/v+p888pM69jMMfS8Xd8F6I1kQ/I9HUGg==",
+            "dev": true
+        },
+        "node_modules/array-flatten": {
+            "version": "2.1.2",
+            "resolved": "https://registry.npmjs.org/array-flatten/-/array-flatten-2.1.2.tgz",
+            "integrity": "sha512-hNfzcOV8W4NdualtqBFPyVO+54DSJuZGY9qT4pRroB6S9e3iiido2ISIC5h9R2sPJ8H3FHCIiEnsv1lPXO3KtQ==",
+            "dev": true
+        },
+        "node_modules/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,
+            "engines": {
+                "node": ">=8"
+            }
+        },
+        "node_modules/asn1.js": {
+            "version": "5.4.1",
+            "resolved": "https://registry.npmjs.org/asn1.js/-/asn1.js-5.4.1.tgz",
+            "integrity": "sha512-+I//4cYPccV8LdmBLiX8CYvf9Sp3vQsrqu2QNXRcrbiWvcx/UdlFiqUJJzxRQxgsZmvhXhn4cSKeSmoFjVdupA==",
+            "dev": true,
+            "dependencies": {
+                "bn.js": "^4.0.0",
+                "inherits": "^2.0.1",
+                "minimalistic-assert": "^1.0.0",
+                "safer-buffer": "^2.1.0"
+            }
+        },
+        "node_modules/asn1.js/node_modules/bn.js": {
+            "version": "4.12.0",
+            "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.0.tgz",
+            "integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA==",
+            "dev": true
+        },
+        "node_modules/assert": {
+            "version": "1.5.1",
+            "resolved": "https://registry.npmjs.org/assert/-/assert-1.5.1.tgz",
+            "integrity": "sha512-zzw1uCAgLbsKwBfFc8CX78DDg+xZeBksSO3vwVIDDN5i94eOrPsSSyiVhmsSABFDM/OcpE2aagCat9dnWQLG1A==",
+            "dev": true,
+            "dependencies": {
+                "object.assign": "^4.1.4",
+                "util": "^0.10.4"
+            }
+        },
+        "node_modules/assert/node_modules/inherits": {
+            "version": "2.0.3",
+            "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
+            "integrity": "sha512-x00IRNXNy63jwGkJmzPigoySHbaqpNuzKbBOmzK+g2OdZpQ9w+sxCN+VSB3ja7IAge2OP2qpfxTjeNcyjmW1uw==",
+            "dev": true
+        },
+        "node_modules/assert/node_modules/util": {
+            "version": "0.10.4",
+            "resolved": "https://registry.npmjs.org/util/-/util-0.10.4.tgz",
+            "integrity": "sha512-0Pm9hTQ3se5ll1XihRic3FDIku70C+iHUdT/W926rSgHV5QgXsYbKZN8MSC3tJtSkhuROzvsQjAaFENRXr+19A==",
+            "dev": true,
+            "dependencies": {
+                "inherits": "2.0.3"
+            }
+        },
+        "node_modules/asynckit": {
+            "version": "0.4.0",
+            "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz",
+            "integrity": "sha1-x57Zf380y48robyXkLzDZkdLS3k= sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q==",
+            "dev": true
+        },
+        "node_modules/autoprefixer": {
+            "version": "10.4.16",
+            "resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-10.4.16.tgz",
+            "integrity": "sha512-7vd3UC6xKp0HLfua5IjZlcXvGAGy7cBAXTg2lyQ/8WpNhd6SiZ8Be+xm3FyBSYJx5GKcpRCzBh7RH4/0dnY+uQ==",
+            "dev": true,
+            "funding": [
+                {
+                    "type": "opencollective",
+                    "url": "https://opencollective.com/postcss/"
+                },
+                {
+                    "type": "tidelift",
+                    "url": "https://tidelift.com/funding/github/npm/autoprefixer"
+                },
+                {
+                    "type": "github",
+                    "url": "https://github.com/sponsors/ai"
+                }
+            ],
+            "dependencies": {
+                "browserslist": "^4.21.10",
+                "caniuse-lite": "^1.0.30001538",
+                "fraction.js": "^4.3.6",
+                "normalize-range": "^0.1.2",
+                "picocolors": "^1.0.0",
+                "postcss-value-parser": "^4.2.0"
+            },
+            "bin": {
+                "autoprefixer": "bin/autoprefixer"
+            },
+            "engines": {
+                "node": "^10 || ^12 || >=14"
+            },
+            "peerDependencies": {
+                "postcss": "^8.1.0"
+            }
+        },
+        "node_modules/axios": {
+            "version": "1.6.2",
+            "resolved": "https://registry.npmjs.org/axios/-/axios-1.6.2.tgz",
+            "integrity": "sha512-7i24Ri4pmDRfJTR7LDBhsOTtcm+9kjX5WiY1X3wIisx6G9So3pfMkEiU7emUBe46oceVImccTEM3k6C5dbVW8A==",
+            "dev": true,
+            "dependencies": {
+                "follow-redirects": "^1.15.0",
+                "form-data": "^4.0.0",
+                "proxy-from-env": "^1.1.0"
+            }
+        },
+        "node_modules/babel-loader": {
+            "version": "8.2.5",
+            "resolved": "https://registry.npmjs.org/babel-loader/-/babel-loader-8.2.5.tgz",
+            "integrity": "sha512-OSiFfH89LrEMiWd4pLNqGz4CwJDtbs2ZVc+iGu2HrkRfPxId9F2anQj38IxWpmRfsUY0aBZYi1EFcd3mhtRMLQ==",
+            "dev": true,
+            "dependencies": {
+                "find-cache-dir": "^3.3.1",
+                "loader-utils": "^2.0.0",
+                "make-dir": "^3.1.0",
+                "schema-utils": "^2.6.5"
+            },
+            "engines": {
+                "node": ">= 8.9"
+            },
+            "peerDependencies": {
+                "@babel/core": "^7.0.0",
+                "webpack": ">=2"
+            }
+        },
+        "node_modules/babel-plugin-dynamic-import-node": {
+            "version": "2.3.3",
+            "resolved": "https://registry.npmjs.org/babel-plugin-dynamic-import-node/-/babel-plugin-dynamic-import-node-2.3.3.tgz",
+            "integrity": "sha512-jZVI+s9Zg3IqA/kdi0i6UDCybUI3aSBLnglhYbSSjKlV7yF1F/5LWv8MakQmvYpnbJDS6fcBL2KzHSxNCMtWSQ==",
+            "dev": true,
+            "dependencies": {
+                "object.assign": "^4.1.0"
+            }
+        },
+        "node_modules/babel-plugin-polyfill-corejs2": {
+            "version": "0.3.1",
+            "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-corejs2/-/babel-plugin-polyfill-corejs2-0.3.1.tgz",
+            "integrity": "sha512-v7/T6EQcNfVLfcN2X8Lulb7DjprieyLWJK/zOWH5DUYcAgex9sP3h25Q+DLsX9TloXe3y1O8l2q2Jv9q8UVB9w==",
+            "dev": true,
+            "dependencies": {
+                "@babel/compat-data": "^7.13.11",
+                "@babel/helper-define-polyfill-provider": "^0.3.1",
+                "semver": "^6.1.1"
+            },
+            "peerDependencies": {
+                "@babel/core": "^7.0.0-0"
+            }
+        },
+        "node_modules/babel-plugin-polyfill-corejs2/node_modules/semver": {
+            "version": "6.3.1",
+            "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
+            "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==",
+            "dev": true,
+            "bin": {
+                "semver": "bin/semver.js"
+            }
+        },
+        "node_modules/babel-plugin-polyfill-corejs3": {
+            "version": "0.5.2",
+            "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.5.2.tgz",
+            "integrity": "sha512-G3uJih0XWiID451fpeFaYGVuxHEjzKTHtc9uGFEjR6hHrvNzeS/PX+LLLcetJcytsB5m4j+K3o/EpXJNb/5IEQ==",
+            "dev": true,
+            "dependencies": {
+                "@babel/helper-define-polyfill-provider": "^0.3.1",
+                "core-js-compat": "^3.21.0"
+            },
+            "peerDependencies": {
+                "@babel/core": "^7.0.0-0"
+            }
+        },
+        "node_modules/babel-plugin-polyfill-regenerator": {
+            "version": "0.3.1",
+            "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-regenerator/-/babel-plugin-polyfill-regenerator-0.3.1.tgz",
+            "integrity": "sha512-Y2B06tvgHYt1x0yz17jGkGeeMr5FeKUu+ASJ+N6nB5lQ8Dapfg42i0OVrf8PNGJ3zKL4A23snMi1IRwrqqND7A==",
+            "dev": true,
+            "dependencies": {
+                "@babel/helper-define-polyfill-provider": "^0.3.1"
+            },
+            "peerDependencies": {
+                "@babel/core": "^7.0.0-0"
+            }
+        },
+        "node_modules/balanced-match": {
+            "version": "1.0.0",
+            "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz",
+            "integrity": "sha512-9Y0g0Q8rmSt+H33DfKv7FOc3v+iRI+o1lbzt8jGcIosYW37IIW/2XVYq5NPdmaD5NQ59Nk26Kl/vZbwW9Fr8vg==",
+            "dev": true
+        },
+        "node_modules/base64-js": {
+            "version": "1.5.1",
+            "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.5.1.tgz",
+            "integrity": "sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==",
+            "dev": true,
+            "funding": [
+                {
+                    "type": "github",
+                    "url": "https://github.com/sponsors/feross"
+                },
+                {
+                    "type": "patreon",
+                    "url": "https://www.patreon.com/feross"
+                },
+                {
+                    "type": "consulting",
+                    "url": "https://feross.org/support"
+                }
+            ]
+        },
+        "node_modules/batch": {
+            "version": "0.6.1",
+            "resolved": "https://registry.npmjs.org/batch/-/batch-0.6.1.tgz",
+            "integrity": "sha512-x+VAiMRL6UPkx+kudNvxTl6hB2XNNCG2r+7wixVfIYwu/2HKRXimwQyaumLjMveWvT2Hkd/cAJw+QBMfJ/EKVw==",
+            "dev": true
+        },
+        "node_modules/big.js": {
+            "version": "5.2.2",
+            "resolved": "https://registry.npmjs.org/big.js/-/big.js-5.2.2.tgz",
+            "integrity": "sha512-vyL2OymJxmarO8gxMr0mhChsO9QGwhynfuu4+MHTAW6czfq9humCB7rKpUjDd9YUiDPU4mzpyupFSvOClAwbmQ==",
+            "dev": true,
+            "engines": {
+                "node": "*"
+            }
+        },
+        "node_modules/binary-extensions": {
+            "version": "2.2.0",
+            "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.2.0.tgz",
+            "integrity": "sha512-jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA==",
+            "dev": true,
+            "engines": {
+                "node": ">=8"
+            }
+        },
+        "node_modules/blade-formatter": {
+            "version": "1.38.6",
+            "resolved": "https://registry.npmjs.org/blade-formatter/-/blade-formatter-1.38.6.tgz",
+            "integrity": "sha512-XwW1A4G7GPXjCG7oPKkvBp8UVb/YS/zoS8FbuuUbrnwzzmoVEe29oSqh1JpCVj9+SI2ye/qohRuXNkwHjcq/Ww==",
+            "dev": true,
+            "dependencies": {
+                "@prettier/plugin-php": "^0.19.7",
+                "@shufo/tailwindcss-class-sorter": "3.0.1",
+                "aigle": "^1.14.1",
+                "ajv": "^8.9.0",
+                "chalk": "^4.1.0",
+                "concat-stream": "^2.0.0",
+                "detect-indent": "^6.0.0",
+                "find-config": "^1.0.0",
+                "glob": "^8.0.1",
+                "html-attribute-sorter": "^0.4.3",
+                "ignore": "^5.1.8",
+                "js-beautify": "^1.14.8",
+                "lodash": "^4.17.19",
+                "php-parser": "3.1.5",
+                "prettier": "^2.2.0",
+                "tailwindcss": "^3.1.8",
+                "vscode-oniguruma": "1.7.0",
+                "vscode-textmate": "^7.0.1",
+                "xregexp": "^5.0.1",
+                "yargs": "^17.3.1"
+            },
+            "bin": {
+                "blade-formatter": "bin/blade-formatter.cjs"
+            },
+            "engines": {
+                "node": ">= 14.0.0"
+            }
+        },
+        "node_modules/blade-formatter/node_modules/ajv": {
+            "version": "8.11.0",
+            "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.11.0.tgz",
+            "integrity": "sha512-wGgprdCvMalC0BztXvitD2hC04YffAvtsUn93JbGXYLAtCUO4xd17mCCZQxUOItiBwZvJScWo8NIvQMQ71rdpg==",
+            "dev": true,
+            "dependencies": {
+                "fast-deep-equal": "^3.1.1",
+                "json-schema-traverse": "^1.0.0",
+                "require-from-string": "^2.0.2",
+                "uri-js": "^4.2.2"
+            },
+            "funding": {
+                "type": "github",
+                "url": "https://github.com/sponsors/epoberezkin"
+            }
+        },
+        "node_modules/blade-formatter/node_modules/brace-expansion": {
+            "version": "2.0.1",
+            "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz",
+            "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==",
+            "dev": true,
+            "dependencies": {
+                "balanced-match": "^1.0.0"
+            }
+        },
+        "node_modules/blade-formatter/node_modules/glob": {
+            "version": "8.0.3",
+            "resolved": "https://registry.npmjs.org/glob/-/glob-8.0.3.tgz",
+            "integrity": "sha512-ull455NHSHI/Y1FqGaaYFaLGkNMMJbavMrEGFXG/PGrg6y7sutWHUHrz6gy6WEBH6akM1M414dWKCNs+IhKdiQ==",
+            "dev": true,
+            "dependencies": {
+                "fs.realpath": "^1.0.0",
+                "inflight": "^1.0.4",
+                "inherits": "2",
+                "minimatch": "^5.0.1",
+                "once": "^1.3.0"
+            },
+            "engines": {
+                "node": ">=12"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/isaacs"
+            }
+        },
+        "node_modules/blade-formatter/node_modules/json-schema-traverse": {
+            "version": "1.0.0",
+            "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz",
+            "integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==",
+            "dev": true
+        },
+        "node_modules/blade-formatter/node_modules/minimatch": {
+            "version": "5.1.0",
+            "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-5.1.0.tgz",
+            "integrity": "sha512-9TPBGGak4nHfGZsPBohm9AWg6NoT7QTCehS3BIJABslyZbzxfV78QM2Y6+i741OPZIafFAaiiEMh5OyIrJPgtg==",
+            "dev": true,
+            "dependencies": {
+                "brace-expansion": "^2.0.1"
+            },
+            "engines": {
+                "node": ">=10"
+            }
+        },
+        "node_modules/bn.js": {
+            "version": "5.2.1",
+            "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-5.2.1.tgz",
+            "integrity": "sha512-eXRvHzWyYPBuB4NBy0cmYQjGitUrtqwbvlzP3G6VFnNRbsZQIxQ10PbKKHt8gZ/HW/D/747aDl+QkDqg3KQLMQ==",
+            "dev": true
+        },
+        "node_modules/body-parser": {
+            "version": "1.20.1",
+            "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.20.1.tgz",
+            "integrity": "sha512-jWi7abTbYwajOytWCQc37VulmWiRae5RyTpaCyDcS5/lMdtwSz5lOpDE67srw/HYe35f1z3fDQw+3txg7gNtWw==",
+            "dev": true,
+            "dependencies": {
+                "bytes": "3.1.2",
+                "content-type": "~1.0.4",
+                "debug": "2.6.9",
+                "depd": "2.0.0",
+                "destroy": "1.2.0",
+                "http-errors": "2.0.0",
+                "iconv-lite": "0.4.24",
+                "on-finished": "2.4.1",
+                "qs": "6.11.0",
+                "raw-body": "2.5.1",
+                "type-is": "~1.6.18",
+                "unpipe": "1.0.0"
+            },
+            "engines": {
+                "node": ">= 0.8",
+                "npm": "1.2.8000 || >= 1.4.16"
+            }
+        },
+        "node_modules/body-parser/node_modules/bytes": {
+            "version": "3.1.2",
+            "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.1.2.tgz",
+            "integrity": "sha512-/Nf7TyzTx6S3yRJObOAV7956r8cr2+Oj8AC5dt8wSP3BQAoeX58NoHyCU8P8zGkNXStjTSi6fzO6F0pBdcYbEg==",
+            "dev": true,
+            "engines": {
+                "node": ">= 0.8"
+            }
+        },
+        "node_modules/body-parser/node_modules/debug": {
+            "version": "2.6.9",
+            "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+            "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+            "dev": true,
+            "dependencies": {
+                "ms": "2.0.0"
+            }
+        },
+        "node_modules/body-parser/node_modules/ms": {
+            "version": "2.0.0",
+            "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+            "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==",
+            "dev": true
+        },
+        "node_modules/body-parser/node_modules/qs": {
+            "version": "6.11.0",
+            "resolved": "https://registry.npmjs.org/qs/-/qs-6.11.0.tgz",
+            "integrity": "sha512-MvjoMCJwEarSbUYk5O+nmoSzSutSsTwF85zcHPQ9OrlFoZOYIjaqBAJIqIXjptyD5vThxGq52Xu/MaJzRkIk4Q==",
+            "dev": true,
+            "dependencies": {
+                "side-channel": "^1.0.4"
+            },
+            "engines": {
+                "node": ">=0.6"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/ljharb"
+            }
+        },
+        "node_modules/bonjour-service": {
+            "version": "1.1.1",
+            "resolved": "https://registry.npmjs.org/bonjour-service/-/bonjour-service-1.1.1.tgz",
+            "integrity": "sha512-Z/5lQRMOG9k7W+FkeGTNjh7htqn/2LMnfOvBZ8pynNZCM9MwkQkI3zeI4oz09uWdcgmgHugVvBqxGg4VQJ5PCg==",
+            "dev": true,
+            "dependencies": {
+                "array-flatten": "^2.1.2",
+                "dns-equal": "^1.0.0",
+                "fast-deep-equal": "^3.1.3",
+                "multicast-dns": "^7.2.5"
+            }
+        },
+        "node_modules/boolbase": {
+            "version": "1.0.0",
+            "resolved": "https://registry.npmjs.org/boolbase/-/boolbase-1.0.0.tgz",
+            "integrity": "sha512-JZOSA7Mo9sNGB8+UjSgzdLtokWAky1zbztM3WRLCbZ70/3cTANmQmOdR7y2g+J0e2WXywy1yS468tY+IruqEww==",
+            "dev": true
+        },
+        "node_modules/bootstrap": {
+            "version": "4.6.2",
+            "resolved": "https://registry.npmjs.org/bootstrap/-/bootstrap-4.6.2.tgz",
+            "integrity": "sha512-51Bbp/Uxr9aTuy6ca/8FbFloBUJZLHwnhTcnjIeRn2suQWsWzcuJhGjKDB5eppVte/8oCdOL3VuwxvZDUggwGQ==",
+            "dev": true,
+            "funding": [
+                {
+                    "type": "github",
+                    "url": "https://github.com/sponsors/twbs"
+                },
+                {
+                    "type": "opencollective",
+                    "url": "https://opencollective.com/bootstrap"
+                }
+            ],
+            "peerDependencies": {
+                "jquery": "1.9.1 - 3",
+                "popper.js": "^1.16.1"
+            }
+        },
+        "node_modules/brace-expansion": {
+            "version": "1.1.11",
+            "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
+            "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
+            "dev": true,
+            "dependencies": {
+                "balanced-match": "^1.0.0",
+                "concat-map": "0.0.1"
+            }
+        },
+        "node_modules/braces": {
+            "version": "3.0.2",
+            "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz",
+            "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==",
+            "dev": true,
+            "dependencies": {
+                "fill-range": "^7.0.1"
+            },
+            "engines": {
+                "node": ">=8"
+            }
+        },
+        "node_modules/brorand": {
+            "version": "1.1.0",
+            "resolved": "https://registry.npmjs.org/brorand/-/brorand-1.1.0.tgz",
+            "integrity": "sha512-cKV8tMCEpQs4hK/ik71d6LrPOnpkpGBR0wzxqr68g2m/LB2GxVYQroAjMJZRVM1Y4BCjCKc3vAamxSzOY2RP+w==",
+            "dev": true
+        },
+        "node_modules/browserify-aes": {
+            "version": "1.2.0",
+            "resolved": "https://registry.npmjs.org/browserify-aes/-/browserify-aes-1.2.0.tgz",
+            "integrity": "sha512-+7CHXqGuspUn/Sl5aO7Ea0xWGAtETPXNSAjHo48JfLdPWcMng33Xe4znFvQweqc/uzk5zSOI3H52CYnjCfb5hA==",
+            "dev": true,
+            "dependencies": {
+                "buffer-xor": "^1.0.3",
+                "cipher-base": "^1.0.0",
+                "create-hash": "^1.1.0",
+                "evp_bytestokey": "^1.0.3",
+                "inherits": "^2.0.1",
+                "safe-buffer": "^5.0.1"
+            }
+        },
+        "node_modules/browserify-cipher": {
+            "version": "1.0.1",
+            "resolved": "https://registry.npmjs.org/browserify-cipher/-/browserify-cipher-1.0.1.tgz",
+            "integrity": "sha512-sPhkz0ARKbf4rRQt2hTpAHqn47X3llLkUGn+xEJzLjwY8LRs2p0v7ljvI5EyoRO/mexrNunNECisZs+gw2zz1w==",
+            "dev": true,
+            "dependencies": {
+                "browserify-aes": "^1.0.4",
+                "browserify-des": "^1.0.0",
+                "evp_bytestokey": "^1.0.0"
+            }
+        },
+        "node_modules/browserify-des": {
+            "version": "1.0.2",
+            "resolved": "https://registry.npmjs.org/browserify-des/-/browserify-des-1.0.2.tgz",
+            "integrity": "sha512-BioO1xf3hFwz4kc6iBhI3ieDFompMhrMlnDFC4/0/vd5MokpuAc3R+LYbwTA9A5Yc9pq9UYPqffKpW2ObuwX5A==",
+            "dev": true,
+            "dependencies": {
+                "cipher-base": "^1.0.1",
+                "des.js": "^1.0.0",
+                "inherits": "^2.0.1",
+                "safe-buffer": "^5.1.2"
+            }
+        },
+        "node_modules/browserify-rsa": {
+            "version": "4.1.0",
+            "resolved": "https://registry.npmjs.org/browserify-rsa/-/browserify-rsa-4.1.0.tgz",
+            "integrity": "sha512-AdEER0Hkspgno2aR97SAf6vi0y0k8NuOpGnVH3O99rcA5Q6sh8QxcngtHuJ6uXwnfAXNM4Gn1Gb7/MV1+Ymbog==",
+            "dev": true,
+            "dependencies": {
+                "bn.js": "^5.0.0",
+                "randombytes": "^2.0.1"
+            }
+        },
+        "node_modules/browserify-sign": {
+            "version": "4.2.2",
+            "resolved": "https://registry.npmjs.org/browserify-sign/-/browserify-sign-4.2.2.tgz",
+            "integrity": "sha512-1rudGyeYY42Dk6texmv7c4VcQ0EsvVbLwZkA+AQB7SxvXxmcD93jcHie8bzecJ+ChDlmAm2Qyu0+Ccg5uhZXCg==",
+            "dev": true,
+            "dependencies": {
+                "bn.js": "^5.2.1",
+                "browserify-rsa": "^4.1.0",
+                "create-hash": "^1.2.0",
+                "create-hmac": "^1.1.7",
+                "elliptic": "^6.5.4",
+                "inherits": "^2.0.4",
+                "parse-asn1": "^5.1.6",
+                "readable-stream": "^3.6.2",
+                "safe-buffer": "^5.2.1"
+            },
+            "engines": {
+                "node": ">= 4"
+            }
+        },
+        "node_modules/browserify-sign/node_modules/safe-buffer": {
+            "version": "5.2.1",
+            "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz",
+            "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==",
+            "dev": true,
+            "funding": [
+                {
+                    "type": "github",
+                    "url": "https://github.com/sponsors/feross"
+                },
+                {
+                    "type": "patreon",
+                    "url": "https://www.patreon.com/feross"
+                },
+                {
+                    "type": "consulting",
+                    "url": "https://feross.org/support"
+                }
+            ]
+        },
+        "node_modules/browserify-zlib": {
+            "version": "0.2.0",
+            "resolved": "https://registry.npmjs.org/browserify-zlib/-/browserify-zlib-0.2.0.tgz",
+            "integrity": "sha512-Z942RysHXmJrhqk88FmKBVq/v5tqmSkDz7p54G/MGyjMnCFFnC79XWNbg+Vta8W6Wb2qtSZTSxIGkJrRpCFEiA==",
+            "dev": true,
+            "dependencies": {
+                "pako": "~1.0.5"
+            }
+        },
+        "node_modules/browserslist": {
+            "version": "4.22.1",
+            "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.22.1.tgz",
+            "integrity": "sha512-FEVc202+2iuClEhZhrWy6ZiAcRLvNMyYcxZ8raemul1DYVOVdFsbqckWLdsixQZCpJlwe77Z3UTalE7jsjnKfQ==",
+            "dev": true,
+            "funding": [
+                {
+                    "type": "opencollective",
+                    "url": "https://opencollective.com/browserslist"
+                },
+                {
+                    "type": "tidelift",
+                    "url": "https://tidelift.com/funding/github/npm/browserslist"
+                },
+                {
+                    "type": "github",
+                    "url": "https://github.com/sponsors/ai"
+                }
+            ],
+            "dependencies": {
+                "caniuse-lite": "^1.0.30001541",
+                "electron-to-chromium": "^1.4.535",
+                "node-releases": "^2.0.13",
+                "update-browserslist-db": "^1.0.13"
+            },
+            "bin": {
+                "browserslist": "cli.js"
+            },
+            "engines": {
+                "node": "^6 || ^7 || ^8 || ^9 || ^10 || ^11 || ^12 || >=13.7"
+            }
+        },
+        "node_modules/buffer": {
+            "version": "4.9.2",
+            "resolved": "https://registry.npmjs.org/buffer/-/buffer-4.9.2.tgz",
+            "integrity": "sha512-xq+q3SRMOxGivLhBNaUdC64hDTQwejJ+H0T/NB1XMtTVEwNTrfFF3gAxiyW0Bu/xWEGhjVKgUcMhCrUy2+uCWg==",
+            "dev": true,
+            "dependencies": {
+                "base64-js": "^1.0.2",
+                "ieee754": "^1.1.4",
+                "isarray": "^1.0.0"
+            }
+        },
+        "node_modules/buffer-from": {
+            "version": "1.1.1",
+            "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.1.tgz",
+            "integrity": "sha512-MQcXEUbCKtEo7bhqEs6560Hyd4XaovZlO/k9V3hjVUF/zwW7KBVdSK4gIt/bzwS9MbR5qob+F5jusZsb0YQK2A==",
+            "dev": true
+        },
+        "node_modules/buffer-xor": {
+            "version": "1.0.3",
+            "resolved": "https://registry.npmjs.org/buffer-xor/-/buffer-xor-1.0.3.tgz",
+            "integrity": "sha512-571s0T7nZWK6vB67HI5dyUF7wXiNcfaPPPTl6zYCNApANjIvYJTg7hlud/+cJpdAhS7dVzqMLmfhfHR3rAcOjQ==",
+            "dev": true
+        },
+        "node_modules/builtin-status-codes": {
+            "version": "3.0.0",
+            "resolved": "https://registry.npmjs.org/builtin-status-codes/-/builtin-status-codes-3.0.0.tgz",
+            "integrity": "sha512-HpGFw18DgFWlncDfjTa2rcQ4W88O1mC8e8yZ2AvQY5KDaktSTwo+KRf6nHK6FRI5FyRyb/5T6+TSxfP7QyGsmQ==",
+            "dev": true
+        },
+        "node_modules/bytes": {
+            "version": "3.0.0",
+            "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.0.0.tgz",
+            "integrity": "sha512-pMhOfFDPiv9t5jjIXkHosWmkSyQbvsgEVNkz0ERHbuLh2T/7j4Mqqpz523Fe8MVY89KC6Sh/QfS2sM+SjgFDcw==",
+            "dev": true,
+            "engines": {
+                "node": ">= 0.8"
+            }
+        },
+        "node_modules/call-bind": {
+            "version": "1.0.2",
+            "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.2.tgz",
+            "integrity": "sha512-7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA==",
+            "dev": true,
+            "dependencies": {
+                "function-bind": "^1.1.1",
+                "get-intrinsic": "^1.0.2"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/ljharb"
+            }
+        },
+        "node_modules/callsites": {
+            "version": "3.1.0",
+            "resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz",
+            "integrity": "sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==",
+            "dev": true,
+            "engines": {
+                "node": ">=6"
+            }
+        },
+        "node_modules/camel-case": {
+            "version": "4.1.2",
+            "resolved": "https://registry.npmjs.org/camel-case/-/camel-case-4.1.2.tgz",
+            "integrity": "sha512-gxGWBrTT1JuMx6R+o5PTXMmUnhnVzLQ9SNutD4YqKtI6ap897t3tKECYla6gCWEkplXnlNybEkZg9GEGxKFCgw==",
+            "dev": true,
+            "dependencies": {
+                "pascal-case": "^3.1.2",
+                "tslib": "^2.0.3"
+            }
+        },
+        "node_modules/camelcase-css": {
+            "version": "2.0.1",
+            "resolved": "https://registry.npmjs.org/camelcase-css/-/camelcase-css-2.0.1.tgz",
+            "integrity": "sha512-QOSvevhslijgYwRx6Rv7zKdMF8lbRmx+uQGx2+vDc+KI/eBnsy9kit5aj23AgGu3pa4t9AgwbnXWqS+iOY+2aA==",
+            "dev": true,
+            "engines": {
+                "node": ">= 6"
+            }
+        },
+        "node_modules/caniuse-api": {
+            "version": "3.0.0",
+            "resolved": "https://registry.npmjs.org/caniuse-api/-/caniuse-api-3.0.0.tgz",
+            "integrity": "sha512-bsTwuIg/BZZK/vreVTYYbSWoe2F+71P7K5QGEX+pT250DZbfU1MQ5prOKpPR+LL6uWKK3KMwMCAS74QB3Um1uw==",
+            "dev": true,
+            "dependencies": {
+                "browserslist": "^4.0.0",
+                "caniuse-lite": "^1.0.0",
+                "lodash.memoize": "^4.1.2",
+                "lodash.uniq": "^4.5.0"
+            }
+        },
+        "node_modules/caniuse-lite": {
+            "version": "1.0.30001551",
+            "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001551.tgz",
+            "integrity": "sha512-vtBAez47BoGMMzlbYhfXrMV1kvRF2WP/lqiMuDu1Sb4EE4LKEgjopFDSRtZfdVnslNRpOqV/woE+Xgrwj6VQlg==",
+            "dev": true,
+            "funding": [
+                {
+                    "type": "opencollective",
+                    "url": "https://opencollective.com/browserslist"
+                },
+                {
+                    "type": "tidelift",
+                    "url": "https://tidelift.com/funding/github/npm/caniuse-lite"
+                },
+                {
+                    "type": "github",
+                    "url": "https://github.com/sponsors/ai"
+                }
+            ]
+        },
+        "node_modules/chalk": {
+            "version": "4.1.2",
+            "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+            "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+            "dev": true,
+            "dependencies": {
+                "ansi-styles": "^4.1.0",
+                "supports-color": "^7.1.0"
+            },
+            "engines": {
+                "node": ">=10"
+            },
+            "funding": {
+                "url": "https://github.com/chalk/chalk?sponsor=1"
+            }
+        },
+        "node_modules/charenc": {
+            "version": "0.0.2",
+            "resolved": "https://registry.npmjs.org/charenc/-/charenc-0.0.2.tgz",
+            "integrity": "sha512-yrLQ/yVUFXkzg7EDQsPieE/53+0RlaWTs+wBrvW36cyilJ2SaDWfl4Yj7MtLTXleV9uEKefbAGUPv2/iWSooRA==",
+            "dev": true,
+            "engines": {
+                "node": "*"
+            }
+        },
+        "node_modules/chokidar": {
+            "version": "3.5.3",
+            "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.5.3.tgz",
+            "integrity": "sha512-Dr3sfKRP6oTcjf2JmUmFJfeVMvXBdegxB0iVQ5eb2V10uFJUCAS8OByZdVAyVb8xXNz3GjjTgj9kLWsZTqE6kw==",
+            "dev": true,
+            "funding": [
+                {
+                    "type": "individual",
+                    "url": "https://paulmillr.com/funding/"
+                }
+            ],
+            "dependencies": {
+                "anymatch": "~3.1.2",
+                "braces": "~3.0.2",
+                "glob-parent": "~5.1.2",
+                "is-binary-path": "~2.1.0",
+                "is-glob": "~4.0.1",
+                "normalize-path": "~3.0.0",
+                "readdirp": "~3.6.0"
+            },
+            "engines": {
+                "node": ">= 8.10.0"
+            },
+            "optionalDependencies": {
+                "fsevents": "~2.3.2"
+            }
+        },
+        "node_modules/chrome-trace-event": {
+            "version": "1.0.3",
+            "resolved": "https://registry.npmjs.org/chrome-trace-event/-/chrome-trace-event-1.0.3.tgz",
+            "integrity": "sha512-p3KULyQg4S7NIHixdwbGX+nFHkoBiA4YQmyWtjb8XngSKV124nJmRysgAeujbUVb15vh+RvFUfCPqU7rXk+hZg==",
+            "dev": true,
+            "engines": {
+                "node": ">=6.0"
+            }
+        },
+        "node_modules/cipher-base": {
+            "version": "1.0.4",
+            "resolved": "https://registry.npmjs.org/cipher-base/-/cipher-base-1.0.4.tgz",
+            "integrity": "sha512-Kkht5ye6ZGmwv40uUDZztayT2ThLQGfnj/T71N/XzeZeo3nf8foyW7zGTsPYkEya3m5f3cAypH+qe7YOrM1U2Q==",
+            "dev": true,
+            "dependencies": {
+                "inherits": "^2.0.1",
+                "safe-buffer": "^5.0.1"
+            }
+        },
+        "node_modules/clean-css": {
+            "version": "5.3.2",
+            "resolved": "https://registry.npmjs.org/clean-css/-/clean-css-5.3.2.tgz",
+            "integrity": "sha512-JVJbM+f3d3Q704rF4bqQ5UUyTtuJ0JRKNbTKVEeujCCBoMdkEi+V+e8oktO9qGQNSvHrFTM6JZRXrUvGR1czww==",
+            "dev": true,
+            "dependencies": {
+                "source-map": "~0.6.0"
+            },
+            "engines": {
+                "node": ">= 10.0"
+            }
+        },
+        "node_modules/cli-table3": {
+            "version": "0.6.3",
+            "resolved": "https://registry.npmjs.org/cli-table3/-/cli-table3-0.6.3.tgz",
+            "integrity": "sha512-w5Jac5SykAeZJKntOxJCrm63Eg5/4dhMWIcuTbo9rpE+brgaSZo0RuNJZeOyMgsUdhDeojvgyQLmjI+K50ZGyg==",
+            "dev": true,
+            "dependencies": {
+                "string-width": "^4.2.0"
+            },
+            "engines": {
+                "node": "10.* || >= 12.*"
+            },
+            "optionalDependencies": {
+                "@colors/colors": "1.5.0"
+            }
+        },
+        "node_modules/cliui": {
+            "version": "7.0.4",
+            "resolved": "https://registry.npmjs.org/cliui/-/cliui-7.0.4.tgz",
+            "integrity": "sha512-OcRE68cOsVMXp1Yvonl/fzkQOyjLSu/8bhPDfQt0e0/Eb283TKP20Fs2MqoPsr9SwA595rRCA+QMzYc9nBP+JQ==",
+            "dev": true,
+            "dependencies": {
+                "string-width": "^4.2.0",
+                "strip-ansi": "^6.0.0",
+                "wrap-ansi": "^7.0.0"
+            }
+        },
+        "node_modules/clone-deep": {
+            "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,
+            "dependencies": {
+                "is-plain-object": "^2.0.4",
+                "kind-of": "^6.0.2",
+                "shallow-clone": "^3.0.0"
+            },
+            "engines": {
+                "node": ">=6"
+            }
+        },
+        "node_modules/collect.js": {
+            "version": "4.34.3",
+            "resolved": "https://registry.npmjs.org/collect.js/-/collect.js-4.34.3.tgz",
+            "integrity": "sha512-aFr67xDazPwthsGm729mnClgNuh15JEagU6McKBKqxuHOkWL7vMFzGbhsXDdPZ+H6ia5QKIMGYuGOMENBHnVpg==",
+            "dev": true
+        },
+        "node_modules/color-convert": {
+            "version": "2.0.1",
+            "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+            "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+            "dev": true,
+            "dependencies": {
+                "color-name": "~1.1.4"
+            },
+            "engines": {
+                "node": ">=7.0.0"
+            }
+        },
+        "node_modules/color-name": {
+            "version": "1.1.4",
+            "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+            "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+            "dev": true
+        },
+        "node_modules/colord": {
+            "version": "2.9.3",
+            "resolved": "https://registry.npmjs.org/colord/-/colord-2.9.3.tgz",
+            "integrity": "sha512-jeC1axXpnb0/2nn/Y1LPuLdgXBLH7aDcHu4KEKfqw3CUhX7ZpfBSlPKyqXE6btIgEzfWtrX3/tyBCaCvXvMkOw==",
+            "dev": true
+        },
+        "node_modules/colorette": {
+            "version": "2.0.20",
+            "resolved": "https://registry.npmjs.org/colorette/-/colorette-2.0.20.tgz",
+            "integrity": "sha512-IfEDxwoWIjkeXL1eXcDiow4UbKjhLdq6/EuSVR9GMN7KVH3r9gQ83e73hsz1Nd1T3ijd5xv1wcWRYO+D6kCI2w==",
+            "dev": true
+        },
+        "node_modules/combined-stream": {
+            "version": "1.0.8",
+            "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz",
+            "integrity": "sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==",
+            "dev": true,
+            "dependencies": {
+                "delayed-stream": "~1.0.0"
+            },
+            "engines": {
+                "node": ">= 0.8"
+            }
+        },
+        "node_modules/commander": {
+            "version": "7.2.0",
+            "resolved": "https://registry.npmjs.org/commander/-/commander-7.2.0.tgz",
+            "integrity": "sha512-QrWXB+ZQSVPmIWIhtEO9H+gwHaMGYiF5ChvoJ+K9ZGHG/sVsa6yiesAD1GC/x46sET00Xlwo1u49RVVVzvcSkw==",
+            "dev": true,
+            "engines": {
+                "node": ">= 10"
+            }
+        },
+        "node_modules/commondir": {
+            "version": "1.0.1",
+            "resolved": "https://registry.npmjs.org/commondir/-/commondir-1.0.1.tgz",
+            "integrity": "sha512-W9pAhw0ja1Edb5GVdIF1mjZw/ASI0AlShXM83UUGe2DVr5TdAPEA1OA8m/g8zWp9x6On7gqufY+FatDbC3MDQg==",
+            "dev": true
+        },
+        "node_modules/compressible": {
+            "version": "2.0.18",
+            "resolved": "https://registry.npmjs.org/compressible/-/compressible-2.0.18.tgz",
+            "integrity": "sha512-AF3r7P5dWxL8MxyITRMlORQNaOA2IkAFaTr4k7BUumjPtRpGDTZpl0Pb1XCO6JeDCBdp126Cgs9sMxqSjgYyRg==",
+            "dev": true,
+            "dependencies": {
+                "mime-db": ">= 1.43.0 < 2"
+            },
+            "engines": {
+                "node": ">= 0.6"
+            }
+        },
+        "node_modules/compression": {
+            "version": "1.7.4",
+            "resolved": "https://registry.npmjs.org/compression/-/compression-1.7.4.tgz",
+            "integrity": "sha512-jaSIDzP9pZVS4ZfQ+TzvtiWhdpFhE2RDHz8QJkpX9SIpLq88VueF5jJw6t+6CUQcAoA6t+x89MLrWAqpfDE8iQ==",
+            "dev": true,
+            "dependencies": {
+                "accepts": "~1.3.5",
+                "bytes": "3.0.0",
+                "compressible": "~2.0.16",
+                "debug": "2.6.9",
+                "on-headers": "~1.0.2",
+                "safe-buffer": "5.1.2",
+                "vary": "~1.1.2"
+            },
+            "engines": {
+                "node": ">= 0.8.0"
+            }
+        },
+        "node_modules/compression/node_modules/debug": {
+            "version": "2.6.9",
+            "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+            "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+            "dev": true,
+            "dependencies": {
+                "ms": "2.0.0"
+            }
+        },
+        "node_modules/compression/node_modules/ms": {
+            "version": "2.0.0",
+            "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+            "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==",
+            "dev": true
+        },
+        "node_modules/concat": {
+            "version": "1.0.3",
+            "resolved": "https://registry.npmjs.org/concat/-/concat-1.0.3.tgz",
+            "integrity": "sha1-QPM1MInWVGdpXLGIa0Xt1jfYzKg= sha512-f/ZaH1aLe64qHgTILdldbvyfGiGF4uzeo9IuXUloIOLQzFmIPloy9QbZadNsuVv0j5qbKQvQb/H/UYf2UsKTpw==",
+            "dev": true,
+            "dependencies": {
+                "commander": "^2.9.0"
+            },
+            "bin": {
+                "concat": "bin/concat"
+            },
+            "engines": {
+                "node": ">=6"
+            }
+        },
+        "node_modules/concat-map": {
+            "version": "0.0.1",
+            "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
+            "integrity": "sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==",
+            "dev": true
+        },
+        "node_modules/concat-stream": {
+            "version": "2.0.0",
+            "resolved": "https://registry.npmjs.org/concat-stream/-/concat-stream-2.0.0.tgz",
+            "integrity": "sha512-MWufYdFw53ccGjCA+Ol7XJYpAlW6/prSMzuPOTRnJGcGzuhLn4Scrz7qf6o8bROZ514ltazcIFJZevcfbo0x7A==",
+            "dev": true,
+            "engines": [
+                "node >= 6.0"
+            ],
+            "dependencies": {
+                "buffer-from": "^1.0.0",
+                "inherits": "^2.0.3",
+                "readable-stream": "^3.0.2",
+                "typedarray": "^0.0.6"
+            }
+        },
+        "node_modules/concat/node_modules/commander": {
+            "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
+        },
+        "node_modules/config-chain": {
+            "version": "1.1.13",
+            "resolved": "https://registry.npmjs.org/config-chain/-/config-chain-1.1.13.tgz",
+            "integrity": "sha512-qj+f8APARXHrM0hraqXYb2/bOVSV4PvJQlNZ/DVj0QrmNM2q2euizkeuVckQ57J+W0mRH6Hvi+k50M4Jul2VRQ==",
+            "dev": true,
+            "dependencies": {
+                "ini": "^1.3.4",
+                "proto-list": "~1.2.1"
+            }
+        },
+        "node_modules/connect-history-api-fallback": {
+            "version": "2.0.0",
+            "resolved": "https://registry.npmjs.org/connect-history-api-fallback/-/connect-history-api-fallback-2.0.0.tgz",
+            "integrity": "sha512-U73+6lQFmfiNPrYbXqr6kZ1i1wiRqXnp2nhMsINseWXO8lDau0LGEffJ8kQi4EjLZympVgRdvqjAgiZ1tgzDDA==",
+            "dev": true,
+            "engines": {
+                "node": ">=0.8"
+            }
+        },
+        "node_modules/consola": {
+            "version": "2.15.3",
+            "resolved": "https://registry.npmjs.org/consola/-/consola-2.15.3.tgz",
+            "integrity": "sha512-9vAdYbHj6x2fLKC4+oPH0kFzY/orMZyG2Aj+kNylHxKGJ/Ed4dpNyAQYwJOdqO4zdM7XpVHmyejQDcQHrnuXbw==",
+            "dev": true
+        },
+        "node_modules/console-browserify": {
+            "version": "1.2.0",
+            "resolved": "https://registry.npmjs.org/console-browserify/-/console-browserify-1.2.0.tgz",
+            "integrity": "sha512-ZMkYO/LkF17QvCPqM0gxw8yUzigAOZOSWSHg91FH6orS7vcEj5dVZTidN2fQ14yBSdg97RqhSNwLUXInd52OTA==",
+            "dev": true
+        },
+        "node_modules/constants-browserify": {
+            "version": "1.0.0",
+            "resolved": "https://registry.npmjs.org/constants-browserify/-/constants-browserify-1.0.0.tgz",
+            "integrity": "sha512-xFxOwqIzR/e1k1gLiWEophSCMqXcwVHIH7akf7b/vxcUeGunlj3hvZaaqxwHsTgn+IndtkQJgSztIDWeumWJDQ==",
+            "dev": true
+        },
+        "node_modules/content-disposition": {
+            "version": "0.5.4",
+            "resolved": "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.4.tgz",
+            "integrity": "sha512-FveZTNuGw04cxlAiWbzi6zTAL/lhehaWbTtgluJh4/E95DqMwTmha3KZN1aAWA8cFIhHzMZUvLevkw5Rqk+tSQ==",
+            "dev": true,
+            "dependencies": {
+                "safe-buffer": "5.2.1"
+            },
+            "engines": {
+                "node": ">= 0.6"
+            }
+        },
+        "node_modules/content-disposition/node_modules/safe-buffer": {
+            "version": "5.2.1",
+            "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz",
+            "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==",
+            "dev": true,
+            "funding": [
+                {
+                    "type": "github",
+                    "url": "https://github.com/sponsors/feross"
+                },
+                {
+                    "type": "patreon",
+                    "url": "https://www.patreon.com/feross"
+                },
+                {
+                    "type": "consulting",
+                    "url": "https://feross.org/support"
+                }
+            ]
+        },
+        "node_modules/content-type": {
+            "version": "1.0.5",
+            "resolved": "https://registry.npmjs.org/content-type/-/content-type-1.0.5.tgz",
+            "integrity": "sha512-nTjqfcBFEipKdXCv4YDQWCfmcLZKm81ldF0pAopTvyrFGVbcR6P/VAAd5G7N+0tTr8QqiU0tFadD6FK4NtJwOA==",
+            "dev": true,
+            "engines": {
+                "node": ">= 0.6"
+            }
+        },
+        "node_modules/convert-source-map": {
+            "version": "1.8.0",
+            "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.8.0.tgz",
+            "integrity": "sha512-+OQdjP49zViI/6i7nIJpA8rAl4sV/JdPfU9nZs3VqOwGIgizICvuN2ru6fMd+4llL0tar18UYJXfZ/TWtmhUjA==",
+            "dev": true,
+            "dependencies": {
+                "safe-buffer": "~5.1.1"
+            }
+        },
+        "node_modules/cookie": {
+            "version": "0.5.0",
+            "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.5.0.tgz",
+            "integrity": "sha512-YZ3GUyn/o8gfKJlnlX7g7xq4gyO6OSuhGPKaaGssGB2qgDUS0gPgtTvoyZLTt9Ab6dC4hfc9dV5arkvc/OCmrw==",
+            "dev": true,
+            "engines": {
+                "node": ">= 0.6"
+            }
+        },
+        "node_modules/cookie-signature": {
+            "version": "1.0.6",
+            "resolved": "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.6.tgz",
+            "integrity": "sha512-QADzlaHc8icV8I7vbaJXJwod9HWYp8uCqf1xa4OfNu1T7JVxQIrUgOWtHdNDtPiywmFbiS12VjotIXLrKM3orQ==",
+            "dev": true
+        },
+        "node_modules/core-js-compat": {
+            "version": "3.33.1",
+            "resolved": "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.33.1.tgz",
+            "integrity": "sha512-6pYKNOgD/j/bkC5xS5IIg6bncid3rfrI42oBH1SQJbsmYPKF7rhzcFzYCcxYMmNQQ0rCEB8WqpW7QHndOggaeQ==",
+            "dev": true,
+            "dependencies": {
+                "browserslist": "^4.22.1"
+            },
+            "funding": {
+                "type": "opencollective",
+                "url": "https://opencollective.com/core-js"
+            }
+        },
+        "node_modules/core-js-pure": {
+            "version": "3.23.5",
+            "resolved": "https://registry.npmjs.org/core-js-pure/-/core-js-pure-3.23.5.tgz",
+            "integrity": "sha512-8t78LdpKSuCq4pJYCYk8hl7XEkAX+BP16yRIwL3AanTksxuEf7CM83vRyctmiEL8NDZ3jpUcv56fk9/zG3aIuw==",
+            "dev": true,
+            "hasInstallScript": true,
+            "funding": {
+                "type": "opencollective",
+                "url": "https://opencollective.com/core-js"
+            }
+        },
+        "node_modules/core-util-is": {
+            "version": "1.0.3",
+            "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.3.tgz",
+            "integrity": "sha512-ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ==",
+            "dev": true
+        },
+        "node_modules/cosmiconfig": {
+            "version": "7.1.0",
+            "resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-7.1.0.tgz",
+            "integrity": "sha512-AdmX6xUzdNASswsFtmwSt7Vj8po9IuqXm0UXz7QKPuEUmPB4XyjGfaAr2PSuELMwkRMVH1EpIkX5bTZGRB3eCA==",
+            "dev": true,
+            "dependencies": {
+                "@types/parse-json": "^4.0.0",
+                "import-fresh": "^3.2.1",
+                "parse-json": "^5.0.0",
+                "path-type": "^4.0.0",
+                "yaml": "^1.10.0"
+            },
+            "engines": {
+                "node": ">=10"
+            }
+        },
+        "node_modules/cosmiconfig/node_modules/yaml": {
+            "version": "1.10.2",
+            "resolved": "https://registry.npmjs.org/yaml/-/yaml-1.10.2.tgz",
+            "integrity": "sha512-r3vXyErRCYJ7wg28yvBY5VSoAF8ZvlcW9/BwUzEtUsjvX/DKs24dIkuwjtuprwJJHsbyUbLApepYTR1BN4uHrg==",
+            "dev": true,
+            "engines": {
+                "node": ">= 6"
+            }
+        },
+        "node_modules/create-ecdh": {
+            "version": "4.0.4",
+            "resolved": "https://registry.npmjs.org/create-ecdh/-/create-ecdh-4.0.4.tgz",
+            "integrity": "sha512-mf+TCx8wWc9VpuxfP2ht0iSISLZnt0JgWlrOKZiNqyUZWnjIaCIVNQArMHnCZKfEYRg6IM7A+NeJoN8gf/Ws0A==",
+            "dev": true,
+            "dependencies": {
+                "bn.js": "^4.1.0",
+                "elliptic": "^6.5.3"
+            }
+        },
+        "node_modules/create-ecdh/node_modules/bn.js": {
+            "version": "4.12.0",
+            "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.0.tgz",
+            "integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA==",
+            "dev": true
+        },
+        "node_modules/create-hash": {
+            "version": "1.2.0",
+            "resolved": "https://registry.npmjs.org/create-hash/-/create-hash-1.2.0.tgz",
+            "integrity": "sha512-z00bCGNHDG8mHAkP7CtT1qVu+bFQUPjYq/4Iv3C3kWjTFV10zIjfSoeqXo9Asws8gwSHDGj/hl2u4OGIjapeCg==",
+            "dev": true,
+            "dependencies": {
+                "cipher-base": "^1.0.1",
+                "inherits": "^2.0.1",
+                "md5.js": "^1.3.4",
+                "ripemd160": "^2.0.1",
+                "sha.js": "^2.4.0"
+            }
+        },
+        "node_modules/create-hmac": {
+            "version": "1.1.7",
+            "resolved": "https://registry.npmjs.org/create-hmac/-/create-hmac-1.1.7.tgz",
+            "integrity": "sha512-MJG9liiZ+ogc4TzUwuvbER1JRdgvUFSB5+VR/g5h82fGaIRWMWddtKBHi7/sVhfjQZ6SehlyhvQYrcYkaUIpLg==",
+            "dev": true,
+            "dependencies": {
+                "cipher-base": "^1.0.3",
+                "create-hash": "^1.1.0",
+                "inherits": "^2.0.1",
+                "ripemd160": "^2.0.0",
+                "safe-buffer": "^5.0.1",
+                "sha.js": "^2.4.8"
+            }
+        },
+        "node_modules/cross-env": {
+            "version": "7.0.3",
+            "resolved": "https://registry.npmjs.org/cross-env/-/cross-env-7.0.3.tgz",
+            "integrity": "sha512-+/HKd6EgcQCJGh2PSjZuUitQBQynKor4wrFbRg4DtAgS1aWO+gU52xpH7M9ScGgXSYmAVS9bIJ8EzuaGw0oNAw==",
+            "dev": true,
+            "dependencies": {
+                "cross-spawn": "^7.0.1"
+            },
+            "bin": {
+                "cross-env": "src/bin/cross-env.js",
+                "cross-env-shell": "src/bin/cross-env-shell.js"
+            },
+            "engines": {
+                "node": ">=10.14",
+                "npm": ">=6",
+                "yarn": ">=1"
+            }
+        },
+        "node_modules/cross-spawn": {
+            "version": "7.0.3",
+            "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz",
+            "integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==",
+            "dev": true,
+            "dependencies": {
+                "path-key": "^3.1.0",
+                "shebang-command": "^2.0.0",
+                "which": "^2.0.1"
+            },
+            "engines": {
+                "node": ">= 8"
+            }
+        },
+        "node_modules/crypt": {
+            "version": "0.0.2",
+            "resolved": "https://registry.npmjs.org/crypt/-/crypt-0.0.2.tgz",
+            "integrity": "sha512-mCxBlsHFYh9C+HVpiEacem8FEBnMXgU9gy4zmNC+SXAZNB/1idgp/aulFJ4FgCi7GPEVbfyng092GqL2k2rmow==",
+            "dev": true,
+            "engines": {
+                "node": "*"
+            }
+        },
+        "node_modules/crypto-browserify": {
+            "version": "3.12.0",
+            "resolved": "https://registry.npmjs.org/crypto-browserify/-/crypto-browserify-3.12.0.tgz",
+            "integrity": "sha512-fz4spIh+znjO2VjL+IdhEpRJ3YN6sMzITSBijk6FK2UvTqruSQW+/cCZTSNsMiZNvUeq0CqurF+dAbyiGOY6Wg==",
+            "dev": true,
+            "dependencies": {
+                "browserify-cipher": "^1.0.0",
+                "browserify-sign": "^4.0.0",
+                "create-ecdh": "^4.0.0",
+                "create-hash": "^1.1.0",
+                "create-hmac": "^1.1.0",
+                "diffie-hellman": "^5.0.0",
+                "inherits": "^2.0.1",
+                "pbkdf2": "^3.0.3",
+                "public-encrypt": "^4.0.0",
+                "randombytes": "^2.0.0",
+                "randomfill": "^1.0.3"
+            },
+            "engines": {
+                "node": "*"
+            }
+        },
+        "node_modules/css-declaration-sorter": {
+            "version": "6.4.1",
+            "resolved": "https://registry.npmjs.org/css-declaration-sorter/-/css-declaration-sorter-6.4.1.tgz",
+            "integrity": "sha512-rtdthzxKuyq6IzqX6jEcIzQF/YqccluefyCYheovBOLhFT/drQA9zj/UbRAa9J7C0o6EG6u3E6g+vKkay7/k3g==",
+            "dev": true,
+            "engines": {
+                "node": "^10 || ^12 || >=14"
+            },
+            "peerDependencies": {
+                "postcss": "^8.0.9"
+            }
+        },
+        "node_modules/css-loader": {
+            "version": "5.2.7",
+            "resolved": "https://registry.npmjs.org/css-loader/-/css-loader-5.2.7.tgz",
+            "integrity": "sha512-Q7mOvpBNBG7YrVGMxRxcBJZFL75o+cH2abNASdibkj/fffYD8qWbInZrD0S9ccI6vZclF3DsHE7njGlLtaHbhg==",
+            "dev": true,
+            "dependencies": {
+                "icss-utils": "^5.1.0",
+                "loader-utils": "^2.0.0",
+                "postcss": "^8.2.15",
+                "postcss-modules-extract-imports": "^3.0.0",
+                "postcss-modules-local-by-default": "^4.0.0",
+                "postcss-modules-scope": "^3.0.0",
+                "postcss-modules-values": "^4.0.0",
+                "postcss-value-parser": "^4.1.0",
+                "schema-utils": "^3.0.0",
+                "semver": "^7.3.5"
+            },
+            "engines": {
+                "node": ">= 10.13.0"
+            },
+            "funding": {
+                "type": "opencollective",
+                "url": "https://opencollective.com/webpack"
+            },
+            "peerDependencies": {
+                "webpack": "^4.27.0 || ^5.0.0"
+            }
+        },
+        "node_modules/css-loader/node_modules/schema-utils": {
+            "version": "3.3.0",
+            "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.3.0.tgz",
+            "integrity": "sha512-pN/yOAvcC+5rQ5nERGuwrjLlYvLTbCibnZ1I7B1LaiAz9BRBlE9GMgE/eqV30P7aJQUf7Ddimy/RsbYO/GrVGg==",
+            "dev": true,
+            "dependencies": {
+                "@types/json-schema": "^7.0.8",
+                "ajv": "^6.12.5",
+                "ajv-keywords": "^3.5.2"
+            },
+            "engines": {
+                "node": ">= 10.13.0"
+            },
+            "funding": {
+                "type": "opencollective",
+                "url": "https://opencollective.com/webpack"
+            }
+        },
+        "node_modules/css-select": {
+            "version": "4.3.0",
+            "resolved": "https://registry.npmjs.org/css-select/-/css-select-4.3.0.tgz",
+            "integrity": "sha512-wPpOYtnsVontu2mODhA19JrqWxNsfdatRKd64kmpRbQgh1KtItko5sTnEpPdpSaJszTOhEMlF/RPz28qj4HqhQ==",
+            "dev": true,
+            "dependencies": {
+                "boolbase": "^1.0.0",
+                "css-what": "^6.0.1",
+                "domhandler": "^4.3.1",
+                "domutils": "^2.8.0",
+                "nth-check": "^2.0.1"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/fb55"
+            }
+        },
+        "node_modules/css-select/node_modules/domhandler": {
+            "version": "4.3.1",
+            "resolved": "https://registry.npmjs.org/domhandler/-/domhandler-4.3.1.tgz",
+            "integrity": "sha512-GrwoxYN+uWlzO8uhUXRl0P+kHE4GtVPfYzVLcUxPL7KNdHKj66vvlhiweIHqYYXWlw+T8iLMp42Lm67ghw4WMQ==",
+            "dev": true,
+            "dependencies": {
+                "domelementtype": "^2.2.0"
+            },
+            "engines": {
+                "node": ">= 4"
+            },
+            "funding": {
+                "url": "https://github.com/fb55/domhandler?sponsor=1"
+            }
+        },
+        "node_modules/css-tree": {
+            "version": "1.1.3",
+            "resolved": "https://registry.npmjs.org/css-tree/-/css-tree-1.1.3.tgz",
+            "integrity": "sha512-tRpdppF7TRazZrjJ6v3stzv93qxRcSsFmW6cX0Zm2NVKpxE1WV1HblnghVv9TreireHkqI/VDEsfolRF1p6y7Q==",
+            "dev": true,
+            "dependencies": {
+                "mdn-data": "2.0.14",
+                "source-map": "^0.6.1"
+            },
+            "engines": {
+                "node": ">=8.0.0"
+            }
+        },
+        "node_modules/css-what": {
+            "version": "6.1.0",
+            "resolved": "https://registry.npmjs.org/css-what/-/css-what-6.1.0.tgz",
+            "integrity": "sha512-HTUrgRJ7r4dsZKU6GjmpfRK1O76h97Z8MfS1G0FozR+oF2kG6Vfe8JE6zwrkbxigziPHinCJ+gCPjA9EaBDtRw==",
+            "dev": true,
+            "engines": {
+                "node": ">= 6"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/fb55"
+            }
+        },
+        "node_modules/cssesc": {
+            "version": "3.0.0",
+            "resolved": "https://registry.npmjs.org/cssesc/-/cssesc-3.0.0.tgz",
+            "integrity": "sha512-/Tb/JcjK111nNScGob5MNtsntNM1aCNUDipB/TkwZFhyDrrE47SOx/18wF2bbjgc3ZzCSKW1T5nt5EbFoAz/Vg==",
+            "dev": true,
+            "bin": {
+                "cssesc": "bin/cssesc"
+            },
+            "engines": {
+                "node": ">=4"
+            }
+        },
+        "node_modules/cssnano": {
+            "version": "5.1.15",
+            "resolved": "https://registry.npmjs.org/cssnano/-/cssnano-5.1.15.tgz",
+            "integrity": "sha512-j+BKgDcLDQA+eDifLx0EO4XSA56b7uut3BQFH+wbSaSTuGLuiyTa/wbRYthUXX8LC9mLg+WWKe8h+qJuwTAbHw==",
+            "dev": true,
+            "dependencies": {
+                "cssnano-preset-default": "^5.2.14",
+                "lilconfig": "^2.0.3",
+                "yaml": "^1.10.2"
+            },
+            "engines": {
+                "node": "^10 || ^12 || >=14.0"
+            },
+            "funding": {
+                "type": "opencollective",
+                "url": "https://opencollective.com/cssnano"
+            },
+            "peerDependencies": {
+                "postcss": "^8.2.15"
+            }
+        },
+        "node_modules/cssnano-preset-default": {
+            "version": "5.2.14",
+            "resolved": "https://registry.npmjs.org/cssnano-preset-default/-/cssnano-preset-default-5.2.14.tgz",
+            "integrity": "sha512-t0SFesj/ZV2OTylqQVOrFgEh5uanxbO6ZAdeCrNsUQ6fVuXwYTxJPNAGvGTxHbD68ldIJNec7PyYZDBrfDQ+6A==",
+            "dev": true,
+            "dependencies": {
+                "css-declaration-sorter": "^6.3.1",
+                "cssnano-utils": "^3.1.0",
+                "postcss-calc": "^8.2.3",
+                "postcss-colormin": "^5.3.1",
+                "postcss-convert-values": "^5.1.3",
+                "postcss-discard-comments": "^5.1.2",
+                "postcss-discard-duplicates": "^5.1.0",
+                "postcss-discard-empty": "^5.1.1",
+                "postcss-discard-overridden": "^5.1.0",
+                "postcss-merge-longhand": "^5.1.7",
+                "postcss-merge-rules": "^5.1.4",
+                "postcss-minify-font-values": "^5.1.0",
+                "postcss-minify-gradients": "^5.1.1",
+                "postcss-minify-params": "^5.1.4",
+                "postcss-minify-selectors": "^5.2.1",
+                "postcss-normalize-charset": "^5.1.0",
+                "postcss-normalize-display-values": "^5.1.0",
+                "postcss-normalize-positions": "^5.1.1",
+                "postcss-normalize-repeat-style": "^5.1.1",
+                "postcss-normalize-string": "^5.1.0",
+                "postcss-normalize-timing-functions": "^5.1.0",
+                "postcss-normalize-unicode": "^5.1.1",
+                "postcss-normalize-url": "^5.1.0",
+                "postcss-normalize-whitespace": "^5.1.1",
+                "postcss-ordered-values": "^5.1.3",
+                "postcss-reduce-initial": "^5.1.2",
+                "postcss-reduce-transforms": "^5.1.0",
+                "postcss-svgo": "^5.1.0",
+                "postcss-unique-selectors": "^5.1.1"
+            },
+            "engines": {
+                "node": "^10 || ^12 || >=14.0"
+            },
+            "peerDependencies": {
+                "postcss": "^8.2.15"
+            }
+        },
+        "node_modules/cssnano-utils": {
+            "version": "3.1.0",
+            "resolved": "https://registry.npmjs.org/cssnano-utils/-/cssnano-utils-3.1.0.tgz",
+            "integrity": "sha512-JQNR19/YZhz4psLX/rQ9M83e3z2Wf/HdJbryzte4a3NSuafyp9w/I4U+hx5C2S9g41qlstH7DEWnZaaj83OuEA==",
+            "dev": true,
+            "engines": {
+                "node": "^10 || ^12 || >=14.0"
+            },
+            "peerDependencies": {
+                "postcss": "^8.2.15"
+            }
+        },
+        "node_modules/cssnano/node_modules/yaml": {
+            "version": "1.10.2",
+            "resolved": "https://registry.npmjs.org/yaml/-/yaml-1.10.2.tgz",
+            "integrity": "sha512-r3vXyErRCYJ7wg28yvBY5VSoAF8ZvlcW9/BwUzEtUsjvX/DKs24dIkuwjtuprwJJHsbyUbLApepYTR1BN4uHrg==",
+            "dev": true,
+            "engines": {
+                "node": ">= 6"
+            }
+        },
+        "node_modules/csso": {
+            "version": "4.2.0",
+            "resolved": "https://registry.npmjs.org/csso/-/csso-4.2.0.tgz",
+            "integrity": "sha512-wvlcdIbf6pwKEk7vHj8/Bkc0B4ylXZruLvOgs9doS5eOsOpuodOV2zJChSpkp+pRpYQLQMeF04nr3Z68Sta9jA==",
+            "dev": true,
+            "dependencies": {
+                "css-tree": "^1.1.2"
+            },
+            "engines": {
+                "node": ">=8.0.0"
+            }
+        },
+        "node_modules/csstype": {
+            "version": "3.1.3",
+            "resolved": "https://registry.npmjs.org/csstype/-/csstype-3.1.3.tgz",
+            "integrity": "sha512-M1uQkMl8rQK/szD0LNhtqxIPLpimGm8sOBwU7lLnCpSbTyY3yeU1Vc7l4KT5zT4s/yOxHH5O7tIuuLOCnLADRw==",
+            "dev": true
+        },
+        "node_modules/debug": {
+            "version": "4.3.4",
+            "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
+            "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
+            "dev": true,
+            "dependencies": {
+                "ms": "2.1.2"
+            },
+            "engines": {
+                "node": ">=6.0"
+            },
+            "peerDependenciesMeta": {
+                "supports-color": {
+                    "optional": true
+                }
+            }
+        },
+        "node_modules/default-gateway": {
+            "version": "6.0.3",
+            "resolved": "https://registry.npmjs.org/default-gateway/-/default-gateway-6.0.3.tgz",
+            "integrity": "sha512-fwSOJsbbNzZ/CUFpqFBqYfYNLj1NbMPm8MMCIzHjC83iSJRBEGmDUxU+WP661BaBQImeC2yHwXtz+P/O9o+XEg==",
+            "dev": true,
+            "dependencies": {
+                "execa": "^5.0.0"
+            },
+            "engines": {
+                "node": ">= 10"
+            }
+        },
+        "node_modules/define-lazy-prop": {
+            "version": "2.0.0",
+            "resolved": "https://registry.npmjs.org/define-lazy-prop/-/define-lazy-prop-2.0.0.tgz",
+            "integrity": "sha512-Ds09qNh8yw3khSjiJjiUInaGX9xlqZDY7JVryGxdxV7NPeuqQfplOpQ66yJFZut3jLa5zOwkXw1g9EI2uKh4Og==",
+            "dev": true,
+            "engines": {
+                "node": ">=8"
+            }
+        },
+        "node_modules/define-properties": {
+            "version": "1.1.4",
+            "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.4.tgz",
+            "integrity": "sha512-uckOqKcfaVvtBdsVkdPv3XjveQJsNQqmhXgRi8uhvWWuPYZCNlzT8qAyblUgNoXdHdjMTzAqeGjAoli8f+bzPA==",
+            "dev": true,
+            "dependencies": {
+                "has-property-descriptors": "^1.0.0",
+                "object-keys": "^1.1.1"
+            },
+            "engines": {
+                "node": ">= 0.4"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/ljharb"
+            }
+        },
+        "node_modules/delayed-stream": {
+            "version": "1.0.0",
+            "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz",
+            "integrity": "sha1-3zrhmayt+31ECqrgsp4icrJOxhk= sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ==",
+            "dev": true,
+            "engines": {
+                "node": ">=0.4.0"
+            }
+        },
+        "node_modules/depd": {
+            "version": "2.0.0",
+            "resolved": "https://registry.npmjs.org/depd/-/depd-2.0.0.tgz",
+            "integrity": "sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw==",
+            "dev": true,
+            "engines": {
+                "node": ">= 0.8"
+            }
+        },
+        "node_modules/des.js": {
+            "version": "1.1.0",
+            "resolved": "https://registry.npmjs.org/des.js/-/des.js-1.1.0.tgz",
+            "integrity": "sha512-r17GxjhUCjSRy8aiJpr8/UadFIzMzJGexI3Nmz4ADi9LYSFx4gTBp80+NaX/YsXWWLhpZ7v/v/ubEc/bCNfKwg==",
+            "dev": true,
+            "dependencies": {
+                "inherits": "^2.0.1",
+                "minimalistic-assert": "^1.0.0"
+            }
+        },
+        "node_modules/destroy": {
+            "version": "1.2.0",
+            "resolved": "https://registry.npmjs.org/destroy/-/destroy-1.2.0.tgz",
+            "integrity": "sha512-2sJGJTaXIIaR1w4iJSNoN0hnMY7Gpc/n8D4qSCJw8QqFWXf7cuAgnEHxBpweaVcPevC2l3KpjYCx3NypQQgaJg==",
+            "dev": true,
+            "engines": {
+                "node": ">= 0.8",
+                "npm": "1.2.8000 || >= 1.4.16"
+            }
+        },
+        "node_modules/detect-indent": {
+            "version": "6.1.0",
+            "resolved": "https://registry.npmjs.org/detect-indent/-/detect-indent-6.1.0.tgz",
+            "integrity": "sha512-reYkTUJAZb9gUuZ2RvVCNhVHdg62RHnJ7WJl8ftMi4diZ6NWlciOzQN88pUhSELEwflJht4oQDv0F0BMlwaYtA==",
+            "dev": true,
+            "engines": {
+                "node": ">=8"
+            }
+        },
+        "node_modules/detect-node": {
+            "version": "2.1.0",
+            "resolved": "https://registry.npmjs.org/detect-node/-/detect-node-2.1.0.tgz",
+            "integrity": "sha512-T0NIuQpnTvFDATNuHN5roPwSBG83rFsuO+MXXH9/3N1eFbn4wcPjttvjMLEPWJ0RGUYgQE7cGgS3tNxbqCGM7g==",
+            "dev": true
+        },
+        "node_modules/didyoumean": {
+            "version": "1.2.2",
+            "resolved": "https://registry.npmjs.org/didyoumean/-/didyoumean-1.2.2.tgz",
+            "integrity": "sha512-gxtyfqMg7GKyhQmb056K7M3xszy/myH8w+B4RT+QXBQsvAOdc3XymqDDPHx1BgPgsdAA5SIifona89YtRATDzw==",
+            "dev": true
+        },
+        "node_modules/diffie-hellman": {
+            "version": "5.0.3",
+            "resolved": "https://registry.npmjs.org/diffie-hellman/-/diffie-hellman-5.0.3.tgz",
+            "integrity": "sha512-kqag/Nl+f3GwyK25fhUMYj81BUOrZ9IuJsjIcDE5icNM9FJHAVm3VcUDxdLPoQtTuUylWm6ZIknYJwwaPxsUzg==",
+            "dev": true,
+            "dependencies": {
+                "bn.js": "^4.1.0",
+                "miller-rabin": "^4.0.0",
+                "randombytes": "^2.0.0"
+            }
+        },
+        "node_modules/diffie-hellman/node_modules/bn.js": {
+            "version": "4.12.0",
+            "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.0.tgz",
+            "integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA==",
+            "dev": true
+        },
+        "node_modules/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,
+            "dependencies": {
+                "path-type": "^4.0.0"
+            },
+            "engines": {
+                "node": ">=8"
+            }
+        },
+        "node_modules/dlv": {
+            "version": "1.1.3",
+            "resolved": "https://registry.npmjs.org/dlv/-/dlv-1.1.3.tgz",
+            "integrity": "sha512-+HlytyjlPKnIG8XuRG8WvmBP8xs8P71y+SKKS6ZXWoEgLuePxtDoUEiH7WkdePWrQ5JBpE6aoVqfZfJUQkjXwA==",
+            "dev": true
+        },
+        "node_modules/dns-equal": {
+            "version": "1.0.0",
+            "resolved": "https://registry.npmjs.org/dns-equal/-/dns-equal-1.0.0.tgz",
+            "integrity": "sha512-z+paD6YUQsk+AbGCEM4PrOXSss5gd66QfcVBFTKR/HpFL9jCqikS94HYwKww6fQyO7IxrIIyUu+g0Ka9tUS2Cg==",
+            "dev": true
+        },
+        "node_modules/dns-packet": {
+            "version": "5.6.1",
+            "resolved": "https://registry.npmjs.org/dns-packet/-/dns-packet-5.6.1.tgz",
+            "integrity": "sha512-l4gcSouhcgIKRvyy99RNVOgxXiicE+2jZoNmaNmZ6JXiGajBOJAesk1OBlJuM5k2c+eudGdLxDqXuPCKIj6kpw==",
+            "dev": true,
+            "dependencies": {
+                "@leichtgewicht/ip-codec": "^2.0.1"
+            },
+            "engines": {
+                "node": ">=6"
+            }
+        },
+        "node_modules/dom-serializer": {
+            "version": "1.4.1",
+            "resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-1.4.1.tgz",
+            "integrity": "sha512-VHwB3KfrcOOkelEG2ZOfxqLZdfkil8PtJi4P8N2MMXucZq2yLp75ClViUlOVwyoHEDjYU433Aq+5zWP61+RGag==",
+            "dev": true,
+            "dependencies": {
+                "domelementtype": "^2.0.1",
+                "domhandler": "^4.2.0",
+                "entities": "^2.0.0"
+            },
+            "funding": {
+                "url": "https://github.com/cheeriojs/dom-serializer?sponsor=1"
+            }
+        },
+        "node_modules/dom-serializer/node_modules/domhandler": {
+            "version": "4.3.1",
+            "resolved": "https://registry.npmjs.org/domhandler/-/domhandler-4.3.1.tgz",
+            "integrity": "sha512-GrwoxYN+uWlzO8uhUXRl0P+kHE4GtVPfYzVLcUxPL7KNdHKj66vvlhiweIHqYYXWlw+T8iLMp42Lm67ghw4WMQ==",
+            "dev": true,
+            "dependencies": {
+                "domelementtype": "^2.2.0"
+            },
+            "engines": {
+                "node": ">= 4"
+            },
+            "funding": {
+                "url": "https://github.com/fb55/domhandler?sponsor=1"
+            }
+        },
+        "node_modules/domain-browser": {
+            "version": "1.2.0",
+            "resolved": "https://registry.npmjs.org/domain-browser/-/domain-browser-1.2.0.tgz",
+            "integrity": "sha512-jnjyiM6eRyZl2H+W8Q/zLMA481hzi0eszAaBUzIVnmYVDBbnLxVNnfu1HgEBvCbL+71FrxMl3E6lpKH7Ge3OXA==",
+            "dev": true,
+            "engines": {
+                "node": ">=0.4",
+                "npm": ">=1.2"
+            }
+        },
+        "node_modules/domelementtype": {
+            "version": "2.3.0",
+            "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-2.3.0.tgz",
+            "integrity": "sha512-OLETBj6w0OsagBwdXnPdN0cnMfF9opN69co+7ZrbfPGrdpPVNBUj02spi6B1N7wChLQiPn4CSH/zJvXw56gmHw==",
+            "dev": true,
+            "funding": [
+                {
+                    "type": "github",
+                    "url": "https://github.com/sponsors/fb55"
+                }
+            ]
+        },
+        "node_modules/domhandler": {
+            "version": "3.3.0",
+            "resolved": "https://registry.npmjs.org/domhandler/-/domhandler-3.3.0.tgz",
+            "integrity": "sha512-J1C5rIANUbuYK+FuFL98650rihynUOEzRLxW+90bKZRWB6A1X1Tf82GxR1qAWLyfNPRvjqfip3Q5tdYlmAa9lA==",
+            "dev": true,
+            "dependencies": {
+                "domelementtype": "^2.0.1"
+            },
+            "engines": {
+                "node": ">= 4"
+            },
+            "funding": {
+                "url": "https://github.com/fb55/domhandler?sponsor=1"
+            }
+        },
+        "node_modules/domutils": {
+            "version": "2.8.0",
+            "resolved": "https://registry.npmjs.org/domutils/-/domutils-2.8.0.tgz",
+            "integrity": "sha512-w96Cjofp72M5IIhpjgobBimYEfoPjx1Vx0BSX9P30WBdZW2WIKU0T1Bd0kz2eNZ9ikjKgHbEyKx8BB6H1L3h3A==",
+            "dev": true,
+            "dependencies": {
+                "dom-serializer": "^1.0.1",
+                "domelementtype": "^2.2.0",
+                "domhandler": "^4.2.0"
+            },
+            "funding": {
+                "url": "https://github.com/fb55/domutils?sponsor=1"
+            }
+        },
+        "node_modules/domutils/node_modules/domhandler": {
+            "version": "4.3.1",
+            "resolved": "https://registry.npmjs.org/domhandler/-/domhandler-4.3.1.tgz",
+            "integrity": "sha512-GrwoxYN+uWlzO8uhUXRl0P+kHE4GtVPfYzVLcUxPL7KNdHKj66vvlhiweIHqYYXWlw+T8iLMp42Lm67ghw4WMQ==",
+            "dev": true,
+            "dependencies": {
+                "domelementtype": "^2.2.0"
+            },
+            "engines": {
+                "node": ">= 4"
+            },
+            "funding": {
+                "url": "https://github.com/fb55/domhandler?sponsor=1"
+            }
+        },
+        "node_modules/dot-case": {
+            "version": "3.0.4",
+            "resolved": "https://registry.npmjs.org/dot-case/-/dot-case-3.0.4.tgz",
+            "integrity": "sha512-Kv5nKlh6yRrdrGvxeJ2e5y2eRUpkUosIW4A2AS38zwSz27zu7ufDwQPi5Jhs3XAlGNetl3bmnGhQsMtkKJnj3w==",
+            "dev": true,
+            "dependencies": {
+                "no-case": "^3.0.4",
+                "tslib": "^2.0.3"
+            }
+        },
+        "node_modules/dotenv": {
+            "version": "10.0.0",
+            "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-10.0.0.tgz",
+            "integrity": "sha512-rlBi9d8jpv9Sf1klPjNfFAuWDjKLwTIJJ/VxtoTwIR6hnZxcEOQCZg2oIL3MWBYw5GpUDKOEnND7LXTbIpQ03Q==",
+            "dev": true,
+            "engines": {
+                "node": ">=10"
+            }
+        },
+        "node_modules/dotenv-expand": {
+            "version": "5.1.0",
+            "resolved": "https://registry.npmjs.org/dotenv-expand/-/dotenv-expand-5.1.0.tgz",
+            "integrity": "sha512-YXQl1DSa4/PQyRfgrv6aoNjhasp/p4qs9FjJ4q4cQk+8m4r6k4ZSiEyytKG8f8W9gi8WsQtIObNmKd+tMzNTmA==",
+            "dev": true
+        },
+        "node_modules/editorconfig": {
+            "version": "1.0.4",
+            "resolved": "https://registry.npmjs.org/editorconfig/-/editorconfig-1.0.4.tgz",
+            "integrity": "sha512-L9Qe08KWTlqYMVvMcTIvMAdl1cDUubzRNYL+WfA4bLDMHe4nemKkpmYzkznE1FwLKu0EEmy6obgQKzMJrg4x9Q==",
+            "dev": true,
+            "dependencies": {
+                "@one-ini/wasm": "0.1.1",
+                "commander": "^10.0.0",
+                "minimatch": "9.0.1",
+                "semver": "^7.5.3"
+            },
+            "bin": {
+                "editorconfig": "bin/editorconfig"
+            },
+            "engines": {
+                "node": ">=14"
+            }
+        },
+        "node_modules/editorconfig/node_modules/brace-expansion": {
+            "version": "2.0.1",
+            "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz",
+            "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==",
+            "dev": true,
+            "dependencies": {
+                "balanced-match": "^1.0.0"
+            }
+        },
+        "node_modules/editorconfig/node_modules/commander": {
+            "version": "10.0.1",
+            "resolved": "https://registry.npmjs.org/commander/-/commander-10.0.1.tgz",
+            "integrity": "sha512-y4Mg2tXshplEbSGzx7amzPwKKOCGuoSRP/CjEdwwk0FOGlUbq6lKuoyDZTNZkmxHdJtp54hdfY/JUrdL7Xfdug==",
+            "dev": true,
+            "engines": {
+                "node": ">=14"
+            }
+        },
+        "node_modules/editorconfig/node_modules/minimatch": {
+            "version": "9.0.1",
+            "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.1.tgz",
+            "integrity": "sha512-0jWhJpD/MdhPXwPuiRkCbfYfSKp2qnn2eOc279qI7f+osl/l+prKSrvhg157zSYvx/1nmgn2NqdT6k2Z7zSH9w==",
+            "dev": true,
+            "dependencies": {
+                "brace-expansion": "^2.0.1"
+            },
+            "engines": {
+                "node": ">=16 || 14 >=14.17"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/isaacs"
+            }
+        },
+        "node_modules/ee-first": {
+            "version": "1.1.1",
+            "resolved": "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz",
+            "integrity": "sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow==",
+            "dev": true
+        },
+        "node_modules/electron-to-chromium": {
+            "version": "1.4.563",
+            "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.563.tgz",
+            "integrity": "sha512-dg5gj5qOgfZNkPNeyKBZQAQitIQ/xwfIDmEQJHCbXaD9ebTZxwJXUsDYcBlAvZGZLi+/354l35J1wkmP6CqYaw==",
+            "dev": true
+        },
+        "node_modules/elliptic": {
+            "version": "6.5.4",
+            "resolved": "https://registry.npmjs.org/elliptic/-/elliptic-6.5.4.tgz",
+            "integrity": "sha512-iLhC6ULemrljPZb+QutR5TQGB+pdW6KGD5RSegS+8sorOZT+rdQFbsQFJgvN3eRqNALqJer4oQ16YvJHlU8hzQ==",
+            "dev": true,
+            "dependencies": {
+                "bn.js": "^4.11.9",
+                "brorand": "^1.1.0",
+                "hash.js": "^1.0.0",
+                "hmac-drbg": "^1.0.1",
+                "inherits": "^2.0.4",
+                "minimalistic-assert": "^1.0.1",
+                "minimalistic-crypto-utils": "^1.0.1"
+            }
+        },
+        "node_modules/elliptic/node_modules/bn.js": {
+            "version": "4.12.0",
+            "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.0.tgz",
+            "integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA==",
+            "dev": true
+        },
+        "node_modules/emoji-regex": {
+            "version": "8.0.0",
+            "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
+            "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
+            "dev": true
+        },
+        "node_modules/emojis-list": {
+            "version": "3.0.0",
+            "resolved": "https://registry.npmjs.org/emojis-list/-/emojis-list-3.0.0.tgz",
+            "integrity": "sha512-/kyM18EfinwXZbno9FyUGeFh87KC8HRQBQGildHZbEuRyWFOmv1U10o9BBp8XVZDVNNuQKyIGIu5ZYAAXJ0V2Q==",
+            "dev": true,
+            "engines": {
+                "node": ">= 4"
+            }
+        },
+        "node_modules/encodeurl": {
+            "version": "1.0.2",
+            "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz",
+            "integrity": "sha512-TPJXq8JqFaVYm2CWmPvnP2Iyo4ZSM7/QKcSmuMLDObfpH5fi7RUGmd/rTDf+rut/saiDiQEeVTNgAmJEdAOx0w==",
+            "dev": true,
+            "engines": {
+                "node": ">= 0.8"
+            }
+        },
+        "node_modules/enhanced-resolve": {
+            "version": "5.15.0",
+            "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.15.0.tgz",
+            "integrity": "sha512-LXYT42KJ7lpIKECr2mAXIaMldcNCh/7E0KBKOu4KSfkHmP+mZmSs+8V5gBAqisWBy0OO4W5Oyys0GO1Y8KtdKg==",
+            "dev": true,
+            "dependencies": {
+                "graceful-fs": "^4.2.4",
+                "tapable": "^2.2.0"
+            },
+            "engines": {
+                "node": ">=10.13.0"
+            }
+        },
+        "node_modules/entities": {
+            "version": "2.2.0",
+            "resolved": "https://registry.npmjs.org/entities/-/entities-2.2.0.tgz",
+            "integrity": "sha512-p92if5Nz619I0w+akJrLZH0MX0Pb5DX39XOwQTtXSdQQOaYH03S1uIQp4mhOZtAXrxq4ViO67YTiLBo2638o9A==",
+            "dev": true,
+            "funding": {
+                "url": "https://github.com/fb55/entities?sponsor=1"
+            }
+        },
+        "node_modules/envinfo": {
+            "version": "7.10.0",
+            "resolved": "https://registry.npmjs.org/envinfo/-/envinfo-7.10.0.tgz",
+            "integrity": "sha512-ZtUjZO6l5mwTHvc1L9+1q5p/R3wTopcfqMW8r5t8SJSKqeVI/LtajORwRFEKpEFuekjD0VBjwu1HMxL4UalIRw==",
+            "dev": true,
+            "bin": {
+                "envinfo": "dist/cli.js"
+            },
+            "engines": {
+                "node": ">=4"
+            }
+        },
+        "node_modules/error-ex": {
+            "version": "1.3.2",
+            "resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.2.tgz",
+            "integrity": "sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==",
+            "dev": true,
+            "dependencies": {
+                "is-arrayish": "^0.2.1"
+            }
+        },
+        "node_modules/es-module-lexer": {
+            "version": "1.3.1",
+            "resolved": "https://registry.npmjs.org/es-module-lexer/-/es-module-lexer-1.3.1.tgz",
+            "integrity": "sha512-JUFAyicQV9mXc3YRxPnDlrfBKpqt6hUYzz9/boprUJHs4e4KVr3XwOF70doO6gwXUor6EWZJAyWAfKki84t20Q==",
+            "dev": true
+        },
+        "node_modules/escalade": {
+            "version": "3.1.1",
+            "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.1.tgz",
+            "integrity": "sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw==",
+            "dev": true,
+            "engines": {
+                "node": ">=6"
+            }
+        },
+        "node_modules/escape-html": {
+            "version": "1.0.3",
+            "resolved": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.3.tgz",
+            "integrity": "sha512-NiSupZ4OeuGwr68lGIeym/ksIZMJodUGOSCZ/FSnTxcrekbvqrgdUxlJOMpijaKZVjAJrWrGs/6Jy8OMuyj9ow==",
+            "dev": true
+        },
+        "node_modules/escape-string-regexp": {
+            "version": "1.0.5",
+            "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
+            "integrity": "sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg==",
+            "dev": true,
+            "engines": {
+                "node": ">=0.8.0"
+            }
+        },
+        "node_modules/eslint-scope": {
+            "version": "5.1.1",
+            "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.1.1.tgz",
+            "integrity": "sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw==",
+            "dev": true,
+            "dependencies": {
+                "esrecurse": "^4.3.0",
+                "estraverse": "^4.1.1"
+            },
+            "engines": {
+                "node": ">=8.0.0"
+            }
+        },
+        "node_modules/esrecurse": {
+            "version": "4.3.0",
+            "resolved": "https://registry.npmjs.org/esrecurse/-/esrecurse-4.3.0.tgz",
+            "integrity": "sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag==",
+            "dev": true,
+            "dependencies": {
+                "estraverse": "^5.2.0"
+            },
+            "engines": {
+                "node": ">=4.0"
+            }
+        },
+        "node_modules/esrecurse/node_modules/estraverse": {
+            "version": "5.3.0",
+            "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz",
+            "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==",
+            "dev": true,
+            "engines": {
+                "node": ">=4.0"
+            }
+        },
+        "node_modules/estraverse": {
+            "version": "4.2.0",
+            "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.2.0.tgz",
+            "integrity": "sha512-VHvyaGnJy+FuGfcfaM7W7OZw4mQiKW73jPHwQXx2VnMSUBajYmytOT5sKEfsBvNPtGX6YDwcrGDz2eocoHg0JA==",
+            "dev": true,
+            "engines": {
+                "node": ">=0.10.0"
+            }
+        },
+        "node_modules/estree-walker": {
+            "version": "2.0.2",
+            "resolved": "https://registry.npmjs.org/estree-walker/-/estree-walker-2.0.2.tgz",
+            "integrity": "sha512-Rfkk/Mp/DL7JVje3u18FxFujQlTNR2q6QfMSMB7AvCBx91NGj/ba3kCfza0f6dVDbw7YlRf/nDrn7pQrCCyQ/w==",
+            "dev": true
+        },
+        "node_modules/esutils": {
+            "version": "2.0.2",
+            "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.2.tgz",
+            "integrity": "sha512-UUPPULqkyAV+M3Shodis7l8D+IyX6V8SbaBnTb449jf3fMTd8+UOZI1Q70NbZVOQkcR91yYgdHsJiMMMVmYshg==",
+            "dev": true,
+            "engines": {
+                "node": ">=0.10.0"
+            }
+        },
+        "node_modules/etag": {
+            "version": "1.8.1",
+            "resolved": "https://registry.npmjs.org/etag/-/etag-1.8.1.tgz",
+            "integrity": "sha512-aIL5Fx7mawVa300al2BnEE4iNvo1qETxLrPI/o05L7z6go7fCw1J6EQmbK4FmJ2AS7kgVF/KEZWufBfdClMcPg==",
+            "dev": true,
+            "engines": {
+                "node": ">= 0.6"
+            }
+        },
+        "node_modules/eventemitter3": {
+            "version": "4.0.7",
+            "resolved": "https://registry.npmjs.org/eventemitter3/-/eventemitter3-4.0.7.tgz",
+            "integrity": "sha512-8guHBZCwKnFhYdHr2ysuRWErTwhoN2X8XELRlrRwpmfeY2jjuUN4taQMsULKUVo1K4DvZl+0pgfyoysHxvmvEw==",
+            "dev": true
+        },
+        "node_modules/events": {
+            "version": "3.3.0",
+            "resolved": "https://registry.npmjs.org/events/-/events-3.3.0.tgz",
+            "integrity": "sha512-mQw+2fkQbALzQ7V0MY0IqdnXNOeTtP4r0lN9z7AAawCXgqea7bDii20AYrIBrFd/Hx0M2Ocz6S111CaFkUcb0Q==",
+            "dev": true,
+            "engines": {
+                "node": ">=0.8.x"
+            }
+        },
+        "node_modules/evp_bytestokey": {
+            "version": "1.0.3",
+            "resolved": "https://registry.npmjs.org/evp_bytestokey/-/evp_bytestokey-1.0.3.tgz",
+            "integrity": "sha512-/f2Go4TognH/KvCISP7OUsHn85hT9nUkxxA9BEWxFn+Oj9o8ZNLm/40hdlgSLyuOimsrTKLUMEorQexp/aPQeA==",
+            "dev": true,
+            "dependencies": {
+                "md5.js": "^1.3.4",
+                "safe-buffer": "^5.1.1"
+            }
+        },
+        "node_modules/execa": {
+            "version": "5.1.1",
+            "resolved": "https://registry.npmjs.org/execa/-/execa-5.1.1.tgz",
+            "integrity": "sha512-8uSpZZocAZRBAPIEINJj3Lo9HyGitllczc27Eh5YYojjMFMn8yHMDMaUHE2Jqfq05D/wucwI4JGURyXt1vchyg==",
+            "dev": true,
+            "dependencies": {
+                "cross-spawn": "^7.0.3",
+                "get-stream": "^6.0.0",
+                "human-signals": "^2.1.0",
+                "is-stream": "^2.0.0",
+                "merge-stream": "^2.0.0",
+                "npm-run-path": "^4.0.1",
+                "onetime": "^5.1.2",
+                "signal-exit": "^3.0.3",
+                "strip-final-newline": "^2.0.0"
+            },
+            "engines": {
+                "node": ">=10"
+            },
+            "funding": {
+                "url": "https://github.com/sindresorhus/execa?sponsor=1"
+            }
+        },
+        "node_modules/express": {
+            "version": "4.18.2",
+            "resolved": "https://registry.npmjs.org/express/-/express-4.18.2.tgz",
+            "integrity": "sha512-5/PsL6iGPdfQ/lKM1UuielYgv3BUoJfz1aUwU9vHZ+J7gyvwdQXFEBIEIaxeGf0GIcreATNyBExtalisDbuMqQ==",
+            "dev": true,
+            "dependencies": {
+                "accepts": "~1.3.8",
+                "array-flatten": "1.1.1",
+                "body-parser": "1.20.1",
+                "content-disposition": "0.5.4",
+                "content-type": "~1.0.4",
+                "cookie": "0.5.0",
+                "cookie-signature": "1.0.6",
+                "debug": "2.6.9",
+                "depd": "2.0.0",
+                "encodeurl": "~1.0.2",
+                "escape-html": "~1.0.3",
+                "etag": "~1.8.1",
+                "finalhandler": "1.2.0",
+                "fresh": "0.5.2",
+                "http-errors": "2.0.0",
+                "merge-descriptors": "1.0.1",
+                "methods": "~1.1.2",
+                "on-finished": "2.4.1",
+                "parseurl": "~1.3.3",
+                "path-to-regexp": "0.1.7",
+                "proxy-addr": "~2.0.7",
+                "qs": "6.11.0",
+                "range-parser": "~1.2.1",
+                "safe-buffer": "5.2.1",
+                "send": "0.18.0",
+                "serve-static": "1.15.0",
+                "setprototypeof": "1.2.0",
+                "statuses": "2.0.1",
+                "type-is": "~1.6.18",
+                "utils-merge": "1.0.1",
+                "vary": "~1.1.2"
+            },
+            "engines": {
+                "node": ">= 0.10.0"
+            }
+        },
+        "node_modules/express/node_modules/array-flatten": {
+            "version": "1.1.1",
+            "resolved": "https://registry.npmjs.org/array-flatten/-/array-flatten-1.1.1.tgz",
+            "integrity": "sha512-PCVAQswWemu6UdxsDFFX/+gVeYqKAod3D3UVm91jHwynguOwAvYPhx8nNlM++NqRcK6CxxpUafjmhIdKiHibqg==",
+            "dev": true
+        },
+        "node_modules/express/node_modules/debug": {
+            "version": "2.6.9",
+            "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+            "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+            "dev": true,
+            "dependencies": {
+                "ms": "2.0.0"
+            }
+        },
+        "node_modules/express/node_modules/ms": {
+            "version": "2.0.0",
+            "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+            "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==",
+            "dev": true
+        },
+        "node_modules/express/node_modules/qs": {
+            "version": "6.11.0",
+            "resolved": "https://registry.npmjs.org/qs/-/qs-6.11.0.tgz",
+            "integrity": "sha512-MvjoMCJwEarSbUYk5O+nmoSzSutSsTwF85zcHPQ9OrlFoZOYIjaqBAJIqIXjptyD5vThxGq52Xu/MaJzRkIk4Q==",
+            "dev": true,
+            "dependencies": {
+                "side-channel": "^1.0.4"
+            },
+            "engines": {
+                "node": ">=0.6"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/ljharb"
+            }
+        },
+        "node_modules/express/node_modules/safe-buffer": {
+            "version": "5.2.1",
+            "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz",
+            "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==",
+            "dev": true,
+            "funding": [
+                {
+                    "type": "github",
+                    "url": "https://github.com/sponsors/feross"
+                },
+                {
+                    "type": "patreon",
+                    "url": "https://www.patreon.com/feross"
+                },
+                {
+                    "type": "consulting",
+                    "url": "https://feross.org/support"
+                }
+            ]
+        },
+        "node_modules/fast-deep-equal": {
+            "version": "3.1.3",
+            "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz",
+            "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==",
+            "dev": true
+        },
+        "node_modules/fast-glob": {
+            "version": "3.3.0",
+            "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.3.0.tgz",
+            "integrity": "sha512-ChDuvbOypPuNjO8yIDf36x7BlZX1smcUMTTcyoIjycexOxd6DFsKsg21qVBzEmr3G7fUKIRy2/psii+CIUt7FA==",
+            "dev": true,
+            "dependencies": {
+                "@nodelib/fs.stat": "^2.0.2",
+                "@nodelib/fs.walk": "^1.2.3",
+                "glob-parent": "^5.1.2",
+                "merge2": "^1.3.0",
+                "micromatch": "^4.0.4"
+            },
+            "engines": {
+                "node": ">=8.6.0"
+            }
+        },
+        "node_modules/fast-json-stable-stringify": {
+            "version": "2.1.0",
+            "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz",
+            "integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==",
+            "dev": true
+        },
+        "node_modules/fastest-levenshtein": {
+            "version": "1.0.16",
+            "resolved": "https://registry.npmjs.org/fastest-levenshtein/-/fastest-levenshtein-1.0.16.tgz",
+            "integrity": "sha512-eRnCtTTtGZFpQCwhJiUOuxPQWRXVKYDn0b2PeHfXL6/Zi53SLAzAHfVhVWK2AryC/WH05kGfxhFIPvTF0SXQzg==",
+            "dev": true,
+            "engines": {
+                "node": ">= 4.9.1"
+            }
+        },
+        "node_modules/fastq": {
+            "version": "1.15.0",
+            "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.15.0.tgz",
+            "integrity": "sha512-wBrocU2LCXXa+lWBt8RoIRD89Fi8OdABODa/kEnyeyjS5aZO5/GNvI5sEINADqP/h8M29UHTHUb53sUu5Ihqdw==",
+            "dev": true,
+            "dependencies": {
+                "reusify": "^1.0.4"
+            }
+        },
+        "node_modules/faye-websocket": {
+            "version": "0.11.4",
+            "resolved": "https://registry.npmjs.org/faye-websocket/-/faye-websocket-0.11.4.tgz",
+            "integrity": "sha512-CzbClwlXAuiRQAlUyfqPgvPoNKTckTPGfwZV4ZdAhVcP2lh9KUxJg2b5GkE7XbjKQ3YJnQ9z6D9ntLAlB+tP8g==",
+            "dev": true,
+            "dependencies": {
+                "websocket-driver": ">=0.5.1"
+            },
+            "engines": {
+                "node": ">=0.8.0"
+            }
+        },
+        "node_modules/file-loader": {
+            "version": "6.2.0",
+            "resolved": "https://registry.npmjs.org/file-loader/-/file-loader-6.2.0.tgz",
+            "integrity": "sha512-qo3glqyTa61Ytg4u73GultjHGjdRyig3tG6lPtyX/jOEJvHif9uB0/OCI2Kif6ctF3caQTW2G5gym21oAsI4pw==",
+            "dev": true,
+            "dependencies": {
+                "loader-utils": "^2.0.0",
+                "schema-utils": "^3.0.0"
+            },
+            "engines": {
+                "node": ">= 10.13.0"
+            },
+            "funding": {
+                "type": "opencollective",
+                "url": "https://opencollective.com/webpack"
+            },
+            "peerDependencies": {
+                "webpack": "^4.0.0 || ^5.0.0"
+            }
+        },
+        "node_modules/file-loader/node_modules/schema-utils": {
+            "version": "3.3.0",
+            "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.3.0.tgz",
+            "integrity": "sha512-pN/yOAvcC+5rQ5nERGuwrjLlYvLTbCibnZ1I7B1LaiAz9BRBlE9GMgE/eqV30P7aJQUf7Ddimy/RsbYO/GrVGg==",
+            "dev": true,
+            "dependencies": {
+                "@types/json-schema": "^7.0.8",
+                "ajv": "^6.12.5",
+                "ajv-keywords": "^3.5.2"
+            },
+            "engines": {
+                "node": ">= 10.13.0"
+            },
+            "funding": {
+                "type": "opencollective",
+                "url": "https://opencollective.com/webpack"
+            }
+        },
+        "node_modules/file-type": {
+            "version": "12.4.2",
+            "resolved": "https://registry.npmjs.org/file-type/-/file-type-12.4.2.tgz",
+            "integrity": "sha512-UssQP5ZgIOKelfsaB5CuGAL+Y+q7EmONuiwF3N5HAH0t27rvrttgi6Ra9k/+DVaY9UF6+ybxu5pOXLUdA8N7Vg==",
+            "dev": true,
+            "engines": {
+                "node": ">=8"
+            }
+        },
+        "node_modules/fill-range": {
+            "version": "7.0.1",
+            "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz",
+            "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==",
+            "dev": true,
+            "dependencies": {
+                "to-regex-range": "^5.0.1"
+            },
+            "engines": {
+                "node": ">=8"
+            }
+        },
+        "node_modules/finalhandler": {
+            "version": "1.2.0",
+            "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.2.0.tgz",
+            "integrity": "sha512-5uXcUVftlQMFnWC9qu/svkWv3GTd2PfUhK/3PLkYNAe7FbqJMt3515HaxE6eRL74GdsriiwujiawdaB1BpEISg==",
+            "dev": true,
+            "dependencies": {
+                "debug": "2.6.9",
+                "encodeurl": "~1.0.2",
+                "escape-html": "~1.0.3",
+                "on-finished": "2.4.1",
+                "parseurl": "~1.3.3",
+                "statuses": "2.0.1",
+                "unpipe": "~1.0.0"
+            },
+            "engines": {
+                "node": ">= 0.8"
+            }
+        },
+        "node_modules/finalhandler/node_modules/debug": {
+            "version": "2.6.9",
+            "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+            "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+            "dev": true,
+            "dependencies": {
+                "ms": "2.0.0"
+            }
+        },
+        "node_modules/finalhandler/node_modules/ms": {
+            "version": "2.0.0",
+            "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+            "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==",
+            "dev": true
+        },
+        "node_modules/find-cache-dir": {
+            "version": "3.3.2",
+            "resolved": "https://registry.npmjs.org/find-cache-dir/-/find-cache-dir-3.3.2.tgz",
+            "integrity": "sha512-wXZV5emFEjrridIgED11OoUKLxiYjAcqot/NJdAkOhlJ+vGzwhOAfcG5OX1jP+S0PcjEn8bdMJv+g2jwQ3Onig==",
+            "dev": true,
+            "dependencies": {
+                "commondir": "^1.0.1",
+                "make-dir": "^3.0.2",
+                "pkg-dir": "^4.1.0"
+            },
+            "engines": {
+                "node": ">=8"
+            },
+            "funding": {
+                "url": "https://github.com/avajs/find-cache-dir?sponsor=1"
+            }
+        },
+        "node_modules/find-config": {
+            "version": "1.0.0",
+            "resolved": "https://registry.npmjs.org/find-config/-/find-config-1.0.0.tgz",
+            "integrity": "sha512-Z+suHH+7LSE40WfUeZPIxSxypCWvrzdVc60xAjUShZeT5eMWM0/FQUduq3HjluyfAHWvC/aOBkT1pTZktyF/jg==",
+            "dev": true,
+            "dependencies": {
+                "user-home": "^2.0.0"
+            },
+            "engines": {
+                "node": ">= 0.12"
+            }
+        },
+        "node_modules/find-up": {
+            "version": "4.1.0",
+            "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz",
+            "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==",
+            "dev": true,
+            "dependencies": {
+                "locate-path": "^5.0.0",
+                "path-exists": "^4.0.0"
+            },
+            "engines": {
+                "node": ">=8"
+            }
+        },
+        "node_modules/flat": {
+            "version": "5.0.2",
+            "resolved": "https://registry.npmjs.org/flat/-/flat-5.0.2.tgz",
+            "integrity": "sha512-b6suED+5/3rTpUBdG1gupIl8MPFCAMA0QXwmljLhvCUKcUvdE4gWky9zpuGCcXHOsz4J9wPGNWq6OKpmIzz3hQ==",
+            "dev": true,
+            "bin": {
+                "flat": "cli.js"
+            }
+        },
+        "node_modules/follow-redirects": {
+            "version": "1.15.2",
+            "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.2.tgz",
+            "integrity": "sha512-VQLG33o04KaQ8uYi2tVNbdrWp1QWxNNea+nmIB4EVM28v0hmP17z7aG1+wAkNzVq4KeXTq3221ye5qTJP91JwA==",
+            "dev": true,
+            "funding": [
+                {
+                    "type": "individual",
+                    "url": "https://github.com/sponsors/RubenVerborgh"
+                }
+            ],
+            "engines": {
+                "node": ">=4.0"
+            },
+            "peerDependenciesMeta": {
+                "debug": {
+                    "optional": true
+                }
+            }
+        },
+        "node_modules/form-data": {
+            "version": "4.0.0",
+            "resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.0.tgz",
+            "integrity": "sha512-ETEklSGi5t0QMZuiXoA/Q6vcnxcLQP5vdugSpuAyi6SVGi2clPPp+xgEhuMaHC+zGgn31Kd235W35f7Hykkaww==",
+            "dev": true,
+            "dependencies": {
+                "asynckit": "^0.4.0",
+                "combined-stream": "^1.0.8",
+                "mime-types": "^2.1.12"
+            },
+            "engines": {
+                "node": ">= 6"
+            }
+        },
+        "node_modules/forwarded": {
+            "version": "0.2.0",
+            "resolved": "https://registry.npmjs.org/forwarded/-/forwarded-0.2.0.tgz",
+            "integrity": "sha512-buRG0fpBtRHSTCOASe6hD258tEubFoRLb4ZNA6NxMVHNw2gOcwHo9wyablzMzOA5z9xA9L1KNjk/Nt6MT9aYow==",
+            "dev": true,
+            "engines": {
+                "node": ">= 0.6"
+            }
+        },
+        "node_modules/fraction.js": {
+            "version": "4.3.7",
+            "resolved": "https://registry.npmjs.org/fraction.js/-/fraction.js-4.3.7.tgz",
+            "integrity": "sha512-ZsDfxO51wGAXREY55a7la9LScWpwv9RxIrYABrlvOFBlH/ShPnrtsXeuUIfXKKOVicNxQ+o8JTbJvjS4M89yew==",
+            "dev": true,
+            "engines": {
+                "node": "*"
+            },
+            "funding": {
+                "type": "patreon",
+                "url": "https://github.com/sponsors/rawify"
+            }
+        },
+        "node_modules/fresh": {
+            "version": "0.5.2",
+            "resolved": "https://registry.npmjs.org/fresh/-/fresh-0.5.2.tgz",
+            "integrity": "sha512-zJ2mQYM18rEFOudeV4GShTGIQ7RbzA7ozbU9I/XBpm7kqgMywgmylMwXHxZJmkVoYkna9d2pVXVXPdYTP9ej8Q==",
+            "dev": true,
+            "engines": {
+                "node": ">= 0.6"
+            }
+        },
+        "node_modules/fs-extra": {
+            "version": "10.1.0",
+            "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-10.1.0.tgz",
+            "integrity": "sha512-oRXApq54ETRj4eMiFzGnHWGy+zo5raudjuxN0b8H7s/RU2oW0Wvsx9O0ACRN/kRq9E8Vu/ReskGB5o3ji+FzHQ==",
+            "dev": true,
+            "dependencies": {
+                "graceful-fs": "^4.2.0",
+                "jsonfile": "^6.0.1",
+                "universalify": "^2.0.0"
+            },
+            "engines": {
+                "node": ">=12"
+            }
+        },
+        "node_modules/fs-monkey": {
+            "version": "1.0.5",
+            "resolved": "https://registry.npmjs.org/fs-monkey/-/fs-monkey-1.0.5.tgz",
+            "integrity": "sha512-8uMbBjrhzW76TYgEV27Y5E//W2f/lTFmx78P2w19FZSxarhI/798APGQyuGCwmkNxgwGRhrLfvWyLBvNtuOmew==",
+            "dev": true
+        },
+        "node_modules/fs.realpath": {
+            "version": "1.0.0",
+            "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
+            "integrity": "sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==",
+            "dev": true
+        },
+        "node_modules/fsevents": {
+            "version": "2.3.2",
+            "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.2.tgz",
+            "integrity": "sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==",
+            "dev": true,
+            "hasInstallScript": true,
+            "optional": true,
+            "os": [
+                "darwin"
+            ],
+            "engines": {
+                "node": "^8.16.0 || ^10.6.0 || >=11.0.0"
+            }
+        },
+        "node_modules/function-bind": {
+            "version": "1.1.1",
+            "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz",
+            "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==",
+            "dev": true
+        },
+        "node_modules/gensync": {
+            "version": "1.0.0-beta.2",
+            "resolved": "https://registry.npmjs.org/gensync/-/gensync-1.0.0-beta.2.tgz",
+            "integrity": "sha512-3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg==",
+            "dev": true,
+            "engines": {
+                "node": ">=6.9.0"
+            }
+        },
+        "node_modules/get-caller-file": {
+            "version": "2.0.5",
+            "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz",
+            "integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==",
+            "dev": true,
+            "engines": {
+                "node": "6.* || 8.* || >= 10.*"
+            }
+        },
+        "node_modules/get-intrinsic": {
+            "version": "1.1.2",
+            "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.1.2.tgz",
+            "integrity": "sha512-Jfm3OyCxHh9DJyc28qGk+JmfkpO41A4XkneDSujN9MDXrm4oDKdHvndhZ2dN94+ERNfkYJWDclW6k2L/ZGHjXA==",
+            "dev": true,
+            "dependencies": {
+                "function-bind": "^1.1.1",
+                "has": "^1.0.3",
+                "has-symbols": "^1.0.3"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/ljharb"
+            }
+        },
+        "node_modules/get-stream": {
+            "version": "6.0.1",
+            "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-6.0.1.tgz",
+            "integrity": "sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg==",
+            "dev": true,
+            "engines": {
+                "node": ">=10"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/sindresorhus"
+            }
+        },
+        "node_modules/glob": {
+            "version": "7.2.3",
+            "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz",
+            "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==",
+            "dev": true,
+            "dependencies": {
+                "fs.realpath": "^1.0.0",
+                "inflight": "^1.0.4",
+                "inherits": "2",
+                "minimatch": "^3.1.1",
+                "once": "^1.3.0",
+                "path-is-absolute": "^1.0.0"
+            },
+            "engines": {
+                "node": "*"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/isaacs"
+            }
+        },
+        "node_modules/glob-parent": {
+            "version": "5.1.2",
+            "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz",
+            "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==",
+            "dev": true,
+            "dependencies": {
+                "is-glob": "^4.0.1"
+            },
+            "engines": {
+                "node": ">= 6"
+            }
+        },
+        "node_modules/glob-to-regexp": {
+            "version": "0.4.1",
+            "resolved": "https://registry.npmjs.org/glob-to-regexp/-/glob-to-regexp-0.4.1.tgz",
+            "integrity": "sha512-lkX1HJXwyMcprw/5YUZc2s7DrpAiHB21/V+E1rHUrVNokkvB6bqMzT0VfV6/86ZNabt1k14YOIaT7nDvOX3Iiw==",
+            "dev": true
+        },
+        "node_modules/globals": {
+            "version": "11.11.0",
+            "resolved": "https://registry.npmjs.org/globals/-/globals-11.11.0.tgz",
+            "integrity": "sha512-WHq43gS+6ufNOEqlrDBxVEbb8ntfXrfAUU2ZOpCxrBdGKW3gyv8mCxAfIBD0DroPKGrJ2eSsXsLtY9MPntsyTw==",
+            "dev": true,
+            "engines": {
+                "node": ">=4"
+            }
+        },
+        "node_modules/globby": {
+            "version": "10.0.2",
+            "resolved": "https://registry.npmjs.org/globby/-/globby-10.0.2.tgz",
+            "integrity": "sha512-7dUi7RvCoT/xast/o/dLN53oqND4yk0nsHkhRgn9w65C4PofCLOoJ39iSOg+qVDdWQPIEj+eszMHQ+aLVwwQSg==",
+            "dev": true,
+            "dependencies": {
+                "@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"
+            },
+            "engines": {
+                "node": ">=8"
+            }
+        },
+        "node_modules/graceful-fs": {
+            "version": "4.2.10",
+            "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.10.tgz",
+            "integrity": "sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA==",
+            "dev": true
+        },
+        "node_modules/growly": {
+            "version": "1.3.0",
+            "resolved": "https://registry.npmjs.org/growly/-/growly-1.3.0.tgz",
+            "integrity": "sha512-+xGQY0YyAWCnqy7Cd++hc2JqMYzlm0dG30Jd0beaA64sROr8C4nt8Yc9V5Ro3avlSUDTN0ulqP/VBKi1/lLygw==",
+            "dev": true
+        },
+        "node_modules/handle-thing": {
+            "version": "2.0.1",
+            "resolved": "https://registry.npmjs.org/handle-thing/-/handle-thing-2.0.1.tgz",
+            "integrity": "sha512-9Qn4yBxelxoh2Ow62nP+Ka/kMnOXRi8BXnRaUwezLNhqelnN49xKz4F/dPP8OYLxLxq6JDtZb2i9XznUQbNPTg==",
+            "dev": true
+        },
+        "node_modules/has": {
+            "version": "1.0.3",
+            "resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz",
+            "integrity": "sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==",
+            "dev": true,
+            "dependencies": {
+                "function-bind": "^1.1.1"
+            },
+            "engines": {
+                "node": ">= 0.4.0"
+            }
+        },
+        "node_modules/has-flag": {
+            "version": "4.0.0",
+            "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+            "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+            "dev": true,
+            "engines": {
+                "node": ">=8"
+            }
+        },
+        "node_modules/has-property-descriptors": {
+            "version": "1.0.0",
+            "resolved": "https://registry.npmjs.org/has-property-descriptors/-/has-property-descriptors-1.0.0.tgz",
+            "integrity": "sha512-62DVLZGoiEBDHQyqG4w9xCuZ7eJEwNmJRWw2VY84Oedb7WFcA27fiEVe8oUQx9hAUJ4ekurquucTGwsyO1XGdQ==",
+            "dev": true,
+            "dependencies": {
+                "get-intrinsic": "^1.1.1"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/ljharb"
+            }
+        },
+        "node_modules/has-symbols": {
+            "version": "1.0.3",
+            "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.3.tgz",
+            "integrity": "sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A==",
+            "dev": true,
+            "engines": {
+                "node": ">= 0.4"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/ljharb"
+            }
+        },
+        "node_modules/hash-base": {
+            "version": "3.1.0",
+            "resolved": "https://registry.npmjs.org/hash-base/-/hash-base-3.1.0.tgz",
+            "integrity": "sha512-1nmYp/rhMDiE7AYkDw+lLwlAzz0AntGIe51F3RfFfEqyQ3feY2eI/NcwC6umIQVOASPMsWJLJScWKSSvzL9IVA==",
+            "dev": true,
+            "dependencies": {
+                "inherits": "^2.0.4",
+                "readable-stream": "^3.6.0",
+                "safe-buffer": "^5.2.0"
+            },
+            "engines": {
+                "node": ">=4"
+            }
+        },
+        "node_modules/hash-base/node_modules/safe-buffer": {
+            "version": "5.2.1",
+            "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz",
+            "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==",
+            "dev": true,
+            "funding": [
+                {
+                    "type": "github",
+                    "url": "https://github.com/sponsors/feross"
+                },
+                {
+                    "type": "patreon",
+                    "url": "https://www.patreon.com/feross"
+                },
+                {
+                    "type": "consulting",
+                    "url": "https://feross.org/support"
+                }
+            ]
+        },
+        "node_modules/hash-sum": {
+            "version": "1.0.2",
+            "resolved": "https://registry.npmjs.org/hash-sum/-/hash-sum-1.0.2.tgz",
+            "integrity": "sha512-fUs4B4L+mlt8/XAtSOGMUO1TXmAelItBPtJG7CyHJfYTdDjwisntGO2JQz7oUsatOY9o68+57eziUVNw/mRHmA==",
+            "dev": true
+        },
+        "node_modules/hash.js": {
+            "version": "1.1.7",
+            "resolved": "https://registry.npmjs.org/hash.js/-/hash.js-1.1.7.tgz",
+            "integrity": "sha512-taOaskGt4z4SOANNseOviYDvjEJinIkRgmp7LbKP2YTTmVxWBl87s/uzK9r+44BclBSp2X7K1hqeNfz9JbBeXA==",
+            "dev": true,
+            "dependencies": {
+                "inherits": "^2.0.3",
+                "minimalistic-assert": "^1.0.1"
+            }
+        },
+        "node_modules/he": {
+            "version": "1.2.0",
+            "resolved": "https://registry.npmjs.org/he/-/he-1.2.0.tgz",
+            "integrity": "sha512-F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw==",
+            "dev": true,
+            "bin": {
+                "he": "bin/he"
+            }
+        },
+        "node_modules/hmac-drbg": {
+            "version": "1.0.1",
+            "resolved": "https://registry.npmjs.org/hmac-drbg/-/hmac-drbg-1.0.1.tgz",
+            "integrity": "sha512-Tti3gMqLdZfhOQY1Mzf/AanLiqh1WTiJgEj26ZuYQ9fbkLomzGchCws4FyrSd4VkpBfiNhaE1On+lOz894jvXg==",
+            "dev": true,
+            "dependencies": {
+                "hash.js": "^1.0.3",
+                "minimalistic-assert": "^1.0.0",
+                "minimalistic-crypto-utils": "^1.0.1"
+            }
+        },
+        "node_modules/hpack.js": {
+            "version": "2.1.6",
+            "resolved": "https://registry.npmjs.org/hpack.js/-/hpack.js-2.1.6.tgz",
+            "integrity": "sha512-zJxVehUdMGIKsRaNt7apO2Gqp0BdqW5yaiGHXXmbpvxgBYVZnAql+BJb4RO5ad2MgpbZKn5G6nMnegrH1FcNYQ==",
+            "dev": true,
+            "dependencies": {
+                "inherits": "^2.0.1",
+                "obuf": "^1.0.0",
+                "readable-stream": "^2.0.1",
+                "wbuf": "^1.1.0"
+            }
+        },
+        "node_modules/hpack.js/node_modules/readable-stream": {
+            "version": "2.3.8",
+            "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.8.tgz",
+            "integrity": "sha512-8p0AUk4XODgIewSi0l8Epjs+EVnWiK7NoDIEGU0HhE7+ZyY8D1IMY7odu5lRrFXGg71L15KG8QrPmum45RTtdA==",
+            "dev": true,
+            "dependencies": {
+                "core-util-is": "~1.0.0",
+                "inherits": "~2.0.3",
+                "isarray": "~1.0.0",
+                "process-nextick-args": "~2.0.0",
+                "safe-buffer": "~5.1.1",
+                "string_decoder": "~1.1.1",
+                "util-deprecate": "~1.0.1"
+            }
+        },
+        "node_modules/hpack.js/node_modules/string_decoder": {
+            "version": "1.1.1",
+            "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
+            "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
+            "dev": true,
+            "dependencies": {
+                "safe-buffer": "~5.1.0"
+            }
+        },
+        "node_modules/html-attribute-sorter": {
+            "version": "0.4.3",
+            "resolved": "https://registry.npmjs.org/html-attribute-sorter/-/html-attribute-sorter-0.4.3.tgz",
+            "integrity": "sha512-HWSvaXJki44tg0uR1t+j5pRdUVpNiZcJaoB/PFhss/YoAw9cxUDLCpIBbLWQmKjBQfWk91P6LaRnredEyabrDw==",
+            "dev": true,
+            "engines": {
+                "node": ">= 12.0.0"
+            }
+        },
+        "node_modules/html-entities": {
+            "version": "2.4.0",
+            "resolved": "https://registry.npmjs.org/html-entities/-/html-entities-2.4.0.tgz",
+            "integrity": "sha512-igBTJcNNNhvZFRtm8uA6xMY6xYleeDwn3PeBCkDz7tHttv4F2hsDI2aPgNERWzvRcNYHNT3ymRaQzllmXj4YsQ==",
+            "dev": true,
+            "funding": [
+                {
+                    "type": "github",
+                    "url": "https://github.com/sponsors/mdevils"
+                },
+                {
+                    "type": "patreon",
+                    "url": "https://patreon.com/mdevils"
+                }
+            ]
+        },
+        "node_modules/html-loader": {
+            "version": "1.3.2",
+            "resolved": "https://registry.npmjs.org/html-loader/-/html-loader-1.3.2.tgz",
+            "integrity": "sha512-DEkUwSd0sijK5PF3kRWspYi56XP7bTNkyg5YWSzBdjaSDmvCufep5c4Vpb3PBf6lUL0YPtLwBfy9fL0t5hBAGA==",
+            "dev": true,
+            "dependencies": {
+                "html-minifier-terser": "^5.1.1",
+                "htmlparser2": "^4.1.0",
+                "loader-utils": "^2.0.0",
+                "schema-utils": "^3.0.0"
+            },
+            "engines": {
+                "node": ">= 10.13.0"
+            },
+            "funding": {
+                "type": "opencollective",
+                "url": "https://opencollective.com/webpack"
+            },
+            "peerDependencies": {
+                "webpack": "^4.0.0 || ^5.0.0"
+            }
+        },
+        "node_modules/html-loader/node_modules/schema-utils": {
+            "version": "3.3.0",
+            "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.3.0.tgz",
+            "integrity": "sha512-pN/yOAvcC+5rQ5nERGuwrjLlYvLTbCibnZ1I7B1LaiAz9BRBlE9GMgE/eqV30P7aJQUf7Ddimy/RsbYO/GrVGg==",
+            "dev": true,
+            "dependencies": {
+                "@types/json-schema": "^7.0.8",
+                "ajv": "^6.12.5",
+                "ajv-keywords": "^3.5.2"
+            },
+            "engines": {
+                "node": ">= 10.13.0"
+            },
+            "funding": {
+                "type": "opencollective",
+                "url": "https://opencollective.com/webpack"
+            }
+        },
+        "node_modules/html-minifier-terser": {
+            "version": "5.1.1",
+            "resolved": "https://registry.npmjs.org/html-minifier-terser/-/html-minifier-terser-5.1.1.tgz",
+            "integrity": "sha512-ZPr5MNObqnV/T9akshPKbVgyOqLmy+Bxo7juKCfTfnjNniTAMdy4hz21YQqoofMBJD2kdREaqPPdThoR78Tgxg==",
+            "dev": true,
+            "dependencies": {
+                "camel-case": "^4.1.1",
+                "clean-css": "^4.2.3",
+                "commander": "^4.1.1",
+                "he": "^1.2.0",
+                "param-case": "^3.0.3",
+                "relateurl": "^0.2.7",
+                "terser": "^4.6.3"
+            },
+            "bin": {
+                "html-minifier-terser": "cli.js"
+            },
+            "engines": {
+                "node": ">=6"
+            }
+        },
+        "node_modules/html-minifier-terser/node_modules/clean-css": {
+            "version": "4.2.4",
+            "resolved": "https://registry.npmjs.org/clean-css/-/clean-css-4.2.4.tgz",
+            "integrity": "sha512-EJUDT7nDVFDvaQgAo2G/PJvxmp1o/c6iXLbswsBbUFXi1Nr+AjA2cKmfbKDMjMvzEe75g3P6JkaDDAKk96A85A==",
+            "dev": true,
+            "dependencies": {
+                "source-map": "~0.6.0"
+            },
+            "engines": {
+                "node": ">= 4.0"
+            }
+        },
+        "node_modules/html-minifier-terser/node_modules/commander": {
+            "version": "4.1.1",
+            "resolved": "https://registry.npmjs.org/commander/-/commander-4.1.1.tgz",
+            "integrity": "sha512-NOKm8xhkzAjzFx8B2v5OAHT+u5pRQc2UCa2Vq9jYL/31o2wi9mxBA7LIFs3sV5VSC49z6pEhfbMULvShKj26WA==",
+            "dev": true,
+            "engines": {
+                "node": ">= 6"
+            }
+        },
+        "node_modules/html-minifier-terser/node_modules/terser": {
+            "version": "4.8.1",
+            "resolved": "https://registry.npmjs.org/terser/-/terser-4.8.1.tgz",
+            "integrity": "sha512-4GnLC0x667eJG0ewJTa6z/yXrbLGv80D9Ru6HIpCQmO+Q4PfEtBFi0ObSckqwL6VyQv/7ENJieXHo2ANmdQwgw==",
+            "dev": true,
+            "dependencies": {
+                "commander": "^2.20.0",
+                "source-map": "~0.6.1",
+                "source-map-support": "~0.5.12"
+            },
+            "bin": {
+                "terser": "bin/terser"
+            },
+            "engines": {
+                "node": ">=6.0.0"
+            }
+        },
+        "node_modules/html-minifier-terser/node_modules/terser/node_modules/commander": {
+            "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
+        },
+        "node_modules/htmlparser2": {
+            "version": "4.1.0",
+            "resolved": "https://registry.npmjs.org/htmlparser2/-/htmlparser2-4.1.0.tgz",
+            "integrity": "sha512-4zDq1a1zhE4gQso/c5LP1OtrhYTncXNSpvJYtWJBtXAETPlMfi3IFNjGuQbYLuVY4ZR0QMqRVvo4Pdy9KLyP8Q==",
+            "dev": true,
+            "dependencies": {
+                "domelementtype": "^2.0.1",
+                "domhandler": "^3.0.0",
+                "domutils": "^2.0.0",
+                "entities": "^2.0.0"
+            }
+        },
+        "node_modules/http-deceiver": {
+            "version": "1.2.7",
+            "resolved": "https://registry.npmjs.org/http-deceiver/-/http-deceiver-1.2.7.tgz",
+            "integrity": "sha512-LmpOGxTfbpgtGVxJrj5k7asXHCgNZp5nLfp+hWc8QQRqtb7fUy6kRY3BO1h9ddF6yIPYUARgxGOwB42DnxIaNw==",
+            "dev": true
+        },
+        "node_modules/http-errors": {
+            "version": "2.0.0",
+            "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-2.0.0.tgz",
+            "integrity": "sha512-FtwrG/euBzaEjYeRqOgly7G0qviiXoJWnvEH2Z1plBdXgbyjv34pHTSb9zoeHMyDy33+DWy5Wt9Wo+TURtOYSQ==",
+            "dev": true,
+            "dependencies": {
+                "depd": "2.0.0",
+                "inherits": "2.0.4",
+                "setprototypeof": "1.2.0",
+                "statuses": "2.0.1",
+                "toidentifier": "1.0.1"
+            },
+            "engines": {
+                "node": ">= 0.8"
+            }
+        },
+        "node_modules/http-parser-js": {
+            "version": "0.5.8",
+            "resolved": "https://registry.npmjs.org/http-parser-js/-/http-parser-js-0.5.8.tgz",
+            "integrity": "sha512-SGeBX54F94Wgu5RH3X5jsDtf4eHyRogWX1XGT3b4HuW3tQPM4AaBzoUji/4AAJNXCEOWZ5O0DgZmJw1947gD5Q==",
+            "dev": true
+        },
+        "node_modules/http-proxy": {
+            "version": "1.18.1",
+            "resolved": "https://registry.npmjs.org/http-proxy/-/http-proxy-1.18.1.tgz",
+            "integrity": "sha512-7mz/721AbnJwIVbnaSv1Cz3Am0ZLT/UBwkC92VlxhXv/k/BBQfM2fXElQNC27BVGr0uwUpplYPQM9LnaBMR5NQ==",
+            "dev": true,
+            "dependencies": {
+                "eventemitter3": "^4.0.0",
+                "follow-redirects": "^1.0.0",
+                "requires-port": "^1.0.0"
+            },
+            "engines": {
+                "node": ">=8.0.0"
+            }
+        },
+        "node_modules/http-proxy-middleware": {
+            "version": "2.0.6",
+            "resolved": "https://registry.npmjs.org/http-proxy-middleware/-/http-proxy-middleware-2.0.6.tgz",
+            "integrity": "sha512-ya/UeJ6HVBYxrgYotAZo1KvPWlgB48kUJLDePFeneHsVujFaW5WNj2NgWCAE//B1Dl02BIfYlpNgBy8Kf8Rjmw==",
+            "dev": true,
+            "dependencies": {
+                "@types/http-proxy": "^1.17.8",
+                "http-proxy": "^1.18.1",
+                "is-glob": "^4.0.1",
+                "is-plain-obj": "^3.0.0",
+                "micromatch": "^4.0.2"
+            },
+            "engines": {
+                "node": ">=12.0.0"
+            },
+            "peerDependencies": {
+                "@types/express": "^4.17.13"
+            },
+            "peerDependenciesMeta": {
+                "@types/express": {
+                    "optional": true
+                }
+            }
+        },
+        "node_modules/https-browserify": {
+            "version": "1.0.0",
+            "resolved": "https://registry.npmjs.org/https-browserify/-/https-browserify-1.0.0.tgz",
+            "integrity": "sha512-J+FkSdyD+0mA0N+81tMotaRMfSL9SGi+xpD3T6YApKsc3bGSXJlfXri3VyFOeYkfLRQisDk1W+jIFFKBeUBbBg==",
+            "dev": true
+        },
+        "node_modules/human-signals": {
+            "version": "2.1.0",
+            "resolved": "https://registry.npmjs.org/human-signals/-/human-signals-2.1.0.tgz",
+            "integrity": "sha512-B4FFZ6q/T2jhhksgkbEW3HBvWIfDW85snkQgawt07S7J5QXTk6BkNV+0yAeZrM5QpMAdYlocGoljn0sJ/WQkFw==",
+            "dev": true,
+            "engines": {
+                "node": ">=10.17.0"
+            }
+        },
+        "node_modules/iconv-lite": {
+            "version": "0.4.24",
+            "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz",
+            "integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==",
+            "dev": true,
+            "dependencies": {
+                "safer-buffer": ">= 2.1.2 < 3"
+            },
+            "engines": {
+                "node": ">=0.10.0"
+            }
+        },
+        "node_modules/icss-utils": {
+            "version": "5.1.0",
+            "resolved": "https://registry.npmjs.org/icss-utils/-/icss-utils-5.1.0.tgz",
+            "integrity": "sha512-soFhflCVWLfRNOPU3iv5Z9VUdT44xFRbzjLsEzSr5AQmgqPMTHdU3PMT1Cf1ssx8fLNJDA1juftYl+PUcv3MqA==",
+            "dev": true,
+            "engines": {
+                "node": "^10 || ^12 || >= 14"
+            },
+            "peerDependencies": {
+                "postcss": "^8.1.0"
+            }
+        },
+        "node_modules/ieee754": {
+            "version": "1.2.1",
+            "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.2.1.tgz",
+            "integrity": "sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==",
+            "dev": true,
+            "funding": [
+                {
+                    "type": "github",
+                    "url": "https://github.com/sponsors/feross"
+                },
+                {
+                    "type": "patreon",
+                    "url": "https://www.patreon.com/feross"
+                },
+                {
+                    "type": "consulting",
+                    "url": "https://feross.org/support"
+                }
+            ]
+        },
+        "node_modules/ignore": {
+            "version": "5.2.0",
+            "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.2.0.tgz",
+            "integrity": "sha512-CmxgYGiEPCLhfLnpPp1MoRmifwEIOgjcHXxOBjv7mY96c+eWScsOP9c112ZyLdWHi0FxHjI+4uVhKYp/gcdRmQ==",
+            "dev": true,
+            "engines": {
+                "node": ">= 4"
+            }
+        },
+        "node_modules/imagemin": {
+            "version": "7.0.1",
+            "resolved": "https://registry.npmjs.org/imagemin/-/imagemin-7.0.1.tgz",
+            "integrity": "sha512-33AmZ+xjZhg2JMCe+vDf6a9mzWukE7l+wAtesjE7KyteqqKjzxv7aVQeWnul1Ve26mWvEQqyPwl0OctNBfSR9w==",
+            "dev": true,
+            "dependencies": {
+                "file-type": "^12.0.0",
+                "globby": "^10.0.0",
+                "graceful-fs": "^4.2.2",
+                "junk": "^3.1.0",
+                "make-dir": "^3.0.0",
+                "p-pipe": "^3.0.0",
+                "replace-ext": "^1.0.0"
+            },
+            "engines": {
+                "node": ">=8"
+            }
+        },
+        "node_modules/img-loader": {
+            "version": "4.0.0",
+            "resolved": "https://registry.npmjs.org/img-loader/-/img-loader-4.0.0.tgz",
+            "integrity": "sha512-UwRcPQdwdOyEHyCxe1V9s9YFwInwEWCpoO+kJGfIqDrBDqA8jZUsEZTxQ0JteNPGw/Gupmwesk2OhLTcnw6tnQ==",
+            "dev": true,
+            "dependencies": {
+                "loader-utils": "^1.1.0"
+            },
+            "engines": {
+                "node": ">=12"
+            },
+            "peerDependencies": {
+                "imagemin": "^5.0.0 || ^6.0.0 || ^7.0.0 || ^8.0.0"
+            }
+        },
+        "node_modules/img-loader/node_modules/json5": {
+            "version": "1.0.2",
+            "resolved": "https://registry.npmjs.org/json5/-/json5-1.0.2.tgz",
+            "integrity": "sha512-g1MWMLBiz8FKi1e4w0UyVL3w+iJceWAFBAaBnnGKOpNa5f8TLktkbre1+s6oICydWAm+HRUGTmI+//xv2hvXYA==",
+            "dev": true,
+            "dependencies": {
+                "minimist": "^1.2.0"
+            },
+            "bin": {
+                "json5": "lib/cli.js"
+            }
+        },
+        "node_modules/img-loader/node_modules/loader-utils": {
+            "version": "1.4.2",
+            "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-1.4.2.tgz",
+            "integrity": "sha512-I5d00Pd/jwMD2QCduo657+YM/6L3KZu++pmX9VFncxaxvHcru9jx1lBaFft+r4Mt2jK0Yhp41XlRAihzPxHNCg==",
+            "dev": true,
+            "dependencies": {
+                "big.js": "^5.2.2",
+                "emojis-list": "^3.0.0",
+                "json5": "^1.0.1"
+            },
+            "engines": {
+                "node": ">=4.0.0"
+            }
+        },
+        "node_modules/immutable": {
+            "version": "4.0.0",
+            "resolved": "https://registry.npmjs.org/immutable/-/immutable-4.0.0.tgz",
+            "integrity": "sha512-zIE9hX70qew5qTUjSS7wi1iwj/l7+m54KWU247nhM3v806UdGj1yDndXj+IOYxxtW9zyLI+xqFNZjTuDaLUqFw==",
+            "dev": true
+        },
+        "node_modules/import-fresh": {
+            "version": "3.3.0",
+            "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.3.0.tgz",
+            "integrity": "sha512-veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw==",
+            "dev": true,
+            "dependencies": {
+                "parent-module": "^1.0.0",
+                "resolve-from": "^4.0.0"
+            },
+            "engines": {
+                "node": ">=6"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/sindresorhus"
+            }
+        },
+        "node_modules/import-local": {
+            "version": "3.1.0",
+            "resolved": "https://registry.npmjs.org/import-local/-/import-local-3.1.0.tgz",
+            "integrity": "sha512-ASB07uLtnDs1o6EHjKpX34BKYDSqnFerfTOJL2HvMqF70LnxpjkzDB8J44oT9pu4AMPkQwf8jl6szgvNd2tRIg==",
+            "dev": true,
+            "dependencies": {
+                "pkg-dir": "^4.2.0",
+                "resolve-cwd": "^3.0.0"
+            },
+            "bin": {
+                "import-local-fixture": "fixtures/cli.js"
+            },
+            "engines": {
+                "node": ">=8"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/sindresorhus"
+            }
+        },
+        "node_modules/inflight": {
+            "version": "1.0.6",
+            "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
+            "integrity": "sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA==",
+            "dev": true,
+            "dependencies": {
+                "once": "^1.3.0",
+                "wrappy": "1"
+            }
+        },
+        "node_modules/inherits": {
+            "version": "2.0.4",
+            "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",
+            "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==",
+            "dev": true
+        },
+        "node_modules/ini": {
+            "version": "1.3.8",
+            "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.8.tgz",
+            "integrity": "sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew==",
+            "dev": true
+        },
+        "node_modules/interpret": {
+            "version": "2.2.0",
+            "resolved": "https://registry.npmjs.org/interpret/-/interpret-2.2.0.tgz",
+            "integrity": "sha512-Ju0Bz/cEia55xDwUWEa8+olFpCiQoypjnQySseKtmjNrnps3P+xfpUmGr90T7yjlVJmOtybRvPXhKMbHr+fWnw==",
+            "dev": true,
+            "engines": {
+                "node": ">= 0.10"
+            }
+        },
+        "node_modules/ipaddr.js": {
+            "version": "2.1.0",
+            "resolved": "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-2.1.0.tgz",
+            "integrity": "sha512-LlbxQ7xKzfBusov6UMi4MFpEg0m+mAm9xyNGEduwXMEDuf4WfzB/RZwMVYEd7IKGvh4IUkEXYxtAVu9T3OelJQ==",
+            "dev": true,
+            "engines": {
+                "node": ">= 10"
+            }
+        },
+        "node_modules/is-arrayish": {
+            "version": "0.2.1",
+            "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz",
+            "integrity": "sha512-zz06S8t0ozoDXMG+ube26zeCTNXcKIPJZJi8hBrF4idCLms4CG9QtK7qBl1boi5ODzFpjswb5JPmHCbMpjaYzg==",
+            "dev": true
+        },
+        "node_modules/is-binary-path": {
+            "version": "2.1.0",
+            "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-2.1.0.tgz",
+            "integrity": "sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==",
+            "dev": true,
+            "dependencies": {
+                "binary-extensions": "^2.0.0"
+            },
+            "engines": {
+                "node": ">=8"
+            }
+        },
+        "node_modules/is-buffer": {
+            "version": "1.1.6",
+            "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz",
+            "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==",
+            "dev": true
+        },
+        "node_modules/is-core-module": {
+            "version": "2.12.1",
+            "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.12.1.tgz",
+            "integrity": "sha512-Q4ZuBAe2FUsKtyQJoQHlvP8OvBERxO3jEmy1I7hcRXcJBGGHFh/aJBswbXuS9sgrDH2QUO8ilkwNPHvHMd8clg==",
+            "dev": true,
+            "dependencies": {
+                "has": "^1.0.3"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/ljharb"
+            }
+        },
+        "node_modules/is-docker": {
+            "version": "2.2.1",
+            "resolved": "https://registry.npmjs.org/is-docker/-/is-docker-2.2.1.tgz",
+            "integrity": "sha512-F+i2BKsFrH66iaUFc0woD8sLy8getkwTwtOBjvs56Cx4CgJDeKQeqfz8wAYiSb8JOprWhHH5p77PbmYCvvUuXQ==",
+            "dev": true,
+            "bin": {
+                "is-docker": "cli.js"
+            },
+            "engines": {
+                "node": ">=8"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/sindresorhus"
+            }
+        },
+        "node_modules/is-extglob": {
+            "version": "2.1.1",
+            "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz",
+            "integrity": "sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==",
+            "dev": true,
+            "engines": {
+                "node": ">=0.10.0"
+            }
+        },
+        "node_modules/is-fullwidth-code-point": {
+            "version": "3.0.0",
+            "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
+            "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
+            "dev": true,
+            "engines": {
+                "node": ">=8"
+            }
+        },
+        "node_modules/is-glob": {
+            "version": "4.0.3",
+            "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz",
+            "integrity": "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==",
+            "dev": true,
+            "dependencies": {
+                "is-extglob": "^2.1.1"
+            },
+            "engines": {
+                "node": ">=0.10.0"
+            }
+        },
+        "node_modules/is-number": {
+            "version": "7.0.0",
+            "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
+            "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==",
+            "dev": true,
+            "engines": {
+                "node": ">=0.12.0"
+            }
+        },
+        "node_modules/is-plain-obj": {
+            "version": "3.0.0",
+            "resolved": "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-3.0.0.tgz",
+            "integrity": "sha512-gwsOE28k+23GP1B6vFl1oVh/WOzmawBrKwo5Ev6wMKzPkaXaCDIQKzLnvsA42DRlbVTWorkgTKIviAKCWkfUwA==",
+            "dev": true,
+            "engines": {
+                "node": ">=10"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/sindresorhus"
+            }
+        },
+        "node_modules/is-plain-object": {
+            "version": "2.0.4",
+            "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz",
+            "integrity": "sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==",
+            "dev": true,
+            "dependencies": {
+                "isobject": "^3.0.1"
+            },
+            "engines": {
+                "node": ">=0.10.0"
+            }
+        },
+        "node_modules/is-stream": {
+            "version": "2.0.1",
+            "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-2.0.1.tgz",
+            "integrity": "sha512-hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg==",
+            "dev": true,
+            "engines": {
+                "node": ">=8"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/sindresorhus"
+            }
+        },
+        "node_modules/is-wsl": {
+            "version": "2.2.0",
+            "resolved": "https://registry.npmjs.org/is-wsl/-/is-wsl-2.2.0.tgz",
+            "integrity": "sha512-fKzAra0rGJUUBwGBgNkHZuToZcn+TtXHpeCgmkMJMMYx1sQDYaCSyjJBSCa2nH1DGm7s3n1oBnohoVTBaN7Lww==",
+            "dev": true,
+            "dependencies": {
+                "is-docker": "^2.0.0"
+            },
+            "engines": {
+                "node": ">=8"
+            }
+        },
+        "node_modules/isarray": {
+            "version": "1.0.0",
+            "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
+            "integrity": "sha512-VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ==",
+            "dev": true
+        },
+        "node_modules/isexe": {
+            "version": "2.0.0",
+            "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz",
+            "integrity": "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==",
+            "dev": true
+        },
+        "node_modules/isobject": {
+            "version": "3.0.1",
+            "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
+            "integrity": "sha512-WhB9zCku7EGTj/HQQRz5aUQEUeoQZH2bWcltRErOpymJ4boYE6wL9Tbr23krRPSZ+C5zqNSrSw+Cc7sZZ4b7vg==",
+            "dev": true,
+            "engines": {
+                "node": ">=0.10.0"
+            }
+        },
+        "node_modules/jest-worker": {
+            "version": "27.5.1",
+            "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-27.5.1.tgz",
+            "integrity": "sha512-7vuh85V5cdDofPyxn58nrPjBktZo0u9x1g8WtjQol+jZDaE+fhN+cIvTj11GndBnMnyfrUOG1sZQxCdjKh+DKg==",
+            "dev": true,
+            "dependencies": {
+                "@types/node": "*",
+                "merge-stream": "^2.0.0",
+                "supports-color": "^8.0.0"
+            },
+            "engines": {
+                "node": ">= 10.13.0"
+            }
+        },
+        "node_modules/jest-worker/node_modules/supports-color": {
+            "version": "8.1.1",
+            "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz",
+            "integrity": "sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==",
+            "dev": true,
+            "dependencies": {
+                "has-flag": "^4.0.0"
+            },
+            "engines": {
+                "node": ">=10"
+            },
+            "funding": {
+                "url": "https://github.com/chalk/supports-color?sponsor=1"
+            }
+        },
+        "node_modules/jiti": {
+            "version": "1.19.1",
+            "resolved": "https://registry.npmjs.org/jiti/-/jiti-1.19.1.tgz",
+            "integrity": "sha512-oVhqoRDaBXf7sjkll95LHVS6Myyyb1zaunVwk4Z0+WPSW4gjS0pl01zYKHScTuyEhQsFxV5L4DR5r+YqSyqyyg==",
+            "dev": true,
+            "bin": {
+                "jiti": "bin/jiti.js"
+            }
+        },
+        "node_modules/jquery": {
+            "version": "3.7.1",
+            "resolved": "https://registry.npmjs.org/jquery/-/jquery-3.7.1.tgz",
+            "integrity": "sha512-m4avr8yL8kmFN8psrbFFFmB/If14iN5o9nw/NgnnM+kybDJpRsAynV2BsfpTYrTRysYUdADVD7CkUUizgkpLfg==",
+            "dev": true
+        },
+        "node_modules/js-beautify": {
+            "version": "1.14.9",
+            "resolved": "https://registry.npmjs.org/js-beautify/-/js-beautify-1.14.9.tgz",
+            "integrity": "sha512-coM7xq1syLcMyuVGyToxcj2AlzhkDjmfklL8r0JgJ7A76wyGMpJ1oA35mr4APdYNO/o/4YY8H54NQIJzhMbhBg==",
+            "dev": true,
+            "dependencies": {
+                "config-chain": "^1.1.13",
+                "editorconfig": "^1.0.3",
+                "glob": "^8.1.0",
+                "nopt": "^6.0.0"
+            },
+            "bin": {
+                "css-beautify": "js/bin/css-beautify.js",
+                "html-beautify": "js/bin/html-beautify.js",
+                "js-beautify": "js/bin/js-beautify.js"
+            },
+            "engines": {
+                "node": ">=12"
+            }
+        },
+        "node_modules/js-beautify/node_modules/brace-expansion": {
+            "version": "2.0.1",
+            "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz",
+            "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==",
+            "dev": true,
+            "dependencies": {
+                "balanced-match": "^1.0.0"
+            }
+        },
+        "node_modules/js-beautify/node_modules/glob": {
+            "version": "8.1.0",
+            "resolved": "https://registry.npmjs.org/glob/-/glob-8.1.0.tgz",
+            "integrity": "sha512-r8hpEjiQEYlF2QU0df3dS+nxxSIreXQS1qRhMJM0Q5NDdR386C7jb7Hwwod8Fgiuex+k0GFjgft18yvxm5XoCQ==",
+            "dev": true,
+            "dependencies": {
+                "fs.realpath": "^1.0.0",
+                "inflight": "^1.0.4",
+                "inherits": "2",
+                "minimatch": "^5.0.1",
+                "once": "^1.3.0"
+            },
+            "engines": {
+                "node": ">=12"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/isaacs"
+            }
+        },
+        "node_modules/js-beautify/node_modules/minimatch": {
+            "version": "5.1.6",
+            "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-5.1.6.tgz",
+            "integrity": "sha512-lKwV/1brpG6mBUFHtb7NUmtABCb2WZZmm2wNiOA5hAb8VdCS4B3dtMWyvcoViccwAW/COERjXLt0zP1zXUN26g==",
+            "dev": true,
+            "dependencies": {
+                "brace-expansion": "^2.0.1"
+            },
+            "engines": {
+                "node": ">=10"
+            }
+        },
+        "node_modules/js-tokens": {
+            "version": "4.0.0",
+            "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz",
+            "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==",
+            "dev": true
+        },
+        "node_modules/jsesc": {
+            "version": "2.5.2",
+            "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-2.5.2.tgz",
+            "integrity": "sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA==",
+            "dev": true,
+            "bin": {
+                "jsesc": "bin/jsesc"
+            },
+            "engines": {
+                "node": ">=4"
+            }
+        },
+        "node_modules/json-parse-even-better-errors": {
+            "version": "2.3.1",
+            "resolved": "https://registry.npmjs.org/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz",
+            "integrity": "sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w==",
+            "dev": true
+        },
+        "node_modules/json-schema-traverse": {
+            "version": "0.4.1",
+            "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
+            "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
+            "dev": true
+        },
+        "node_modules/json5": {
+            "version": "2.2.3",
+            "resolved": "https://registry.npmjs.org/json5/-/json5-2.2.3.tgz",
+            "integrity": "sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg==",
+            "dev": true,
+            "bin": {
+                "json5": "lib/cli.js"
+            },
+            "engines": {
+                "node": ">=6"
+            }
+        },
+        "node_modules/jsonfile": {
+            "version": "6.1.0",
+            "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.1.0.tgz",
+            "integrity": "sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ==",
+            "dev": true,
+            "dependencies": {
+                "universalify": "^2.0.0"
+            },
+            "optionalDependencies": {
+                "graceful-fs": "^4.1.6"
+            }
+        },
+        "node_modules/junk": {
+            "version": "3.1.0",
+            "resolved": "https://registry.npmjs.org/junk/-/junk-3.1.0.tgz",
+            "integrity": "sha512-pBxcB3LFc8QVgdggvZWyeys+hnrNWg4OcZIU/1X59k5jQdLBlCsYGRQaz234SqoRLTCgMH00fY0xRJH+F9METQ==",
+            "dev": true,
+            "engines": {
+                "node": ">=8"
+            }
+        },
+        "node_modules/kind-of": {
+            "version": "6.0.3",
+            "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
+            "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==",
+            "dev": true,
+            "engines": {
+                "node": ">=0.10.0"
+            }
+        },
+        "node_modules/klona": {
+            "version": "2.0.6",
+            "resolved": "https://registry.npmjs.org/klona/-/klona-2.0.6.tgz",
+            "integrity": "sha512-dhG34DXATL5hSxJbIexCft8FChFXtmskoZYnoPWjXQuebWYCNkVeV3KkGegCK9CP1oswI/vQibS2GY7Em/sJJA==",
+            "dev": true,
+            "engines": {
+                "node": ">= 8"
+            }
+        },
+        "node_modules/laravel-mix": {
+            "version": "6.0.49",
+            "resolved": "https://registry.npmjs.org/laravel-mix/-/laravel-mix-6.0.49.tgz",
+            "integrity": "sha512-bBMFpFjp26XfijPvY5y9zGKud7VqlyOE0OWUcPo3vTBY5asw8LTjafAbee1dhfLz6PWNqDziz69CP78ELSpfKw==",
+            "dev": true,
+            "dependencies": {
+                "@babel/core": "^7.15.8",
+                "@babel/plugin-proposal-object-rest-spread": "^7.15.6",
+                "@babel/plugin-syntax-dynamic-import": "^7.8.3",
+                "@babel/plugin-transform-runtime": "^7.15.8",
+                "@babel/preset-env": "^7.15.8",
+                "@babel/runtime": "^7.15.4",
+                "@types/babel__core": "^7.1.16",
+                "@types/clean-css": "^4.2.5",
+                "@types/imagemin-gifsicle": "^7.0.1",
+                "@types/imagemin-mozjpeg": "^8.0.1",
+                "@types/imagemin-optipng": "^5.2.1",
+                "@types/imagemin-svgo": "^8.0.0",
+                "autoprefixer": "^10.4.0",
+                "babel-loader": "^8.2.3",
+                "chalk": "^4.1.2",
+                "chokidar": "^3.5.2",
+                "clean-css": "^5.2.4",
+                "cli-table3": "^0.6.0",
+                "collect.js": "^4.28.5",
+                "commander": "^7.2.0",
+                "concat": "^1.0.3",
+                "css-loader": "^5.2.6",
+                "cssnano": "^5.0.8",
+                "dotenv": "^10.0.0",
+                "dotenv-expand": "^5.1.0",
+                "file-loader": "^6.2.0",
+                "fs-extra": "^10.0.0",
+                "glob": "^7.2.0",
+                "html-loader": "^1.3.2",
+                "imagemin": "^7.0.1",
+                "img-loader": "^4.0.0",
+                "lodash": "^4.17.21",
+                "md5": "^2.3.0",
+                "mini-css-extract-plugin": "^1.6.2",
+                "node-libs-browser": "^2.2.1",
+                "postcss-load-config": "^3.1.0",
+                "postcss-loader": "^6.2.0",
+                "semver": "^7.3.5",
+                "strip-ansi": "^6.0.0",
+                "style-loader": "^2.0.0",
+                "terser": "^5.9.0",
+                "terser-webpack-plugin": "^5.2.4",
+                "vue-style-loader": "^4.1.3",
+                "webpack": "^5.60.0",
+                "webpack-cli": "^4.9.1",
+                "webpack-dev-server": "^4.7.3",
+                "webpack-merge": "^5.8.0",
+                "webpack-notifier": "^1.14.1",
+                "webpackbar": "^5.0.0-3",
+                "yargs": "^17.2.1"
+            },
+            "bin": {
+                "laravel-mix": "bin/cli.js",
+                "mix": "bin/cli.js"
+            },
+            "engines": {
+                "node": ">=12.14.0"
+            },
+            "peerDependencies": {
+                "@babel/core": "^7.15.8",
+                "@babel/plugin-proposal-object-rest-spread": "^7.15.6",
+                "@babel/plugin-syntax-dynamic-import": "^7.8.3",
+                "@babel/plugin-transform-runtime": "^7.15.8",
+                "@babel/preset-env": "^7.15.8",
+                "postcss": "^8.3.11",
+                "webpack": "^5.60.0",
+                "webpack-cli": "^4.9.1"
+            }
+        },
+        "node_modules/laravel-mix/node_modules/postcss-load-config": {
+            "version": "3.1.4",
+            "resolved": "https://registry.npmjs.org/postcss-load-config/-/postcss-load-config-3.1.4.tgz",
+            "integrity": "sha512-6DiM4E7v4coTE4uzA8U//WhtPwyhiim3eyjEMFCnUpzbrkK9wJHgKDT2mR+HbtSrd/NubVaYTOpSpjUl8NQeRg==",
+            "dev": true,
+            "dependencies": {
+                "lilconfig": "^2.0.5",
+                "yaml": "^1.10.2"
+            },
+            "engines": {
+                "node": ">= 10"
+            },
+            "funding": {
+                "type": "opencollective",
+                "url": "https://opencollective.com/postcss/"
+            },
+            "peerDependencies": {
+                "postcss": ">=8.0.9",
+                "ts-node": ">=9.0.0"
+            },
+            "peerDependenciesMeta": {
+                "postcss": {
+                    "optional": true
+                },
+                "ts-node": {
+                    "optional": true
+                }
+            }
+        },
+        "node_modules/laravel-mix/node_modules/yaml": {
+            "version": "1.10.2",
+            "resolved": "https://registry.npmjs.org/yaml/-/yaml-1.10.2.tgz",
+            "integrity": "sha512-r3vXyErRCYJ7wg28yvBY5VSoAF8ZvlcW9/BwUzEtUsjvX/DKs24dIkuwjtuprwJJHsbyUbLApepYTR1BN4uHrg==",
+            "dev": true,
+            "engines": {
+                "node": ">= 6"
+            }
+        },
+        "node_modules/launch-editor": {
+            "version": "2.6.1",
+            "resolved": "https://registry.npmjs.org/launch-editor/-/launch-editor-2.6.1.tgz",
+            "integrity": "sha512-eB/uXmFVpY4zezmGp5XtU21kwo7GBbKB+EQ+UZeWtGb9yAM5xt/Evk+lYH3eRNAtId+ej4u7TYPFZ07w4s7rRw==",
+            "dev": true,
+            "dependencies": {
+                "picocolors": "^1.0.0",
+                "shell-quote": "^1.8.1"
+            }
+        },
+        "node_modules/lilconfig": {
+            "version": "2.1.0",
+            "resolved": "https://registry.npmjs.org/lilconfig/-/lilconfig-2.1.0.tgz",
+            "integrity": "sha512-utWOt/GHzuUxnLKxB6dk81RoOeoNeHgbrXiuGk4yyF5qlRz+iIVWu56E2fqGHFrXz0QNUhLB/8nKqvRH66JKGQ==",
+            "dev": true,
+            "engines": {
+                "node": ">=10"
+            }
+        },
+        "node_modules/lines-and-columns": {
+            "version": "1.2.4",
+            "resolved": "https://registry.npmjs.org/lines-and-columns/-/lines-and-columns-1.2.4.tgz",
+            "integrity": "sha512-7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg==",
+            "dev": true
+        },
+        "node_modules/linguist-languages": {
+            "version": "7.26.1",
+            "resolved": "https://registry.npmjs.org/linguist-languages/-/linguist-languages-7.26.1.tgz",
+            "integrity": "sha512-B9O5pDocOkfswmA0qKrqdfeua1TxeQ5PPWdsuo5QRXFv2N0tB3plY+DVWvSWiGkjdqKNU3KBjJYHs/jRXG0adw==",
+            "dev": true
+        },
+        "node_modules/loader-runner": {
+            "version": "4.3.0",
+            "resolved": "https://registry.npmjs.org/loader-runner/-/loader-runner-4.3.0.tgz",
+            "integrity": "sha512-3R/1M+yS3j5ou80Me59j7F9IMs4PXs3VqRrm0TU3AbKPxlmpoY1TNscJV/oGJXo8qCatFGTfDbY6W6ipGOYXfg==",
+            "dev": true,
+            "engines": {
+                "node": ">=6.11.5"
+            }
+        },
+        "node_modules/loader-utils": {
+            "version": "2.0.4",
+            "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.4.tgz",
+            "integrity": "sha512-xXqpXoINfFhgua9xiqD8fPFHgkoq1mmmpE92WlDbm9rNRd/EbRb+Gqf908T2DMfuHjjJlksiK2RbHVOdD/MqSw==",
+            "dev": true,
+            "dependencies": {
+                "big.js": "^5.2.2",
+                "emojis-list": "^3.0.0",
+                "json5": "^2.1.2"
+            },
+            "engines": {
+                "node": ">=8.9.0"
+            }
+        },
+        "node_modules/locate-path": {
+            "version": "5.0.0",
+            "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz",
+            "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==",
+            "dev": true,
+            "dependencies": {
+                "p-locate": "^4.1.0"
+            },
+            "engines": {
+                "node": ">=8"
+            }
+        },
+        "node_modules/lodash": {
+            "version": "4.17.21",
+            "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz",
+            "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==",
+            "dev": true
+        },
+        "node_modules/lodash.debounce": {
+            "version": "4.0.8",
+            "resolved": "https://registry.npmjs.org/lodash.debounce/-/lodash.debounce-4.0.8.tgz",
+            "integrity": "sha512-FT1yDzDYEoYWhnSGnpE/4Kj1fLZkDFyqRb7fNt6FdYOSxlUWAtp42Eh6Wb0rGIv/m9Bgo7x4GhQbm5Ys4SG5ow==",
+            "dev": true
+        },
+        "node_modules/lodash.memoize": {
+            "version": "4.1.2",
+            "resolved": "https://registry.npmjs.org/lodash.memoize/-/lodash.memoize-4.1.2.tgz",
+            "integrity": "sha512-t7j+NzmgnQzTAYXcsHYLgimltOV1MXHtlOWf6GjL9Kj8GK5FInw5JotxvbOs+IvV1/Dzo04/fCGfLVs7aXb4Ag==",
+            "dev": true
+        },
+        "node_modules/lodash.uniq": {
+            "version": "4.5.0",
+            "resolved": "https://registry.npmjs.org/lodash.uniq/-/lodash.uniq-4.5.0.tgz",
+            "integrity": "sha512-xfBaXQd9ryd9dlSDvnvI0lvxfLJlYAZzXomUYzLKtUeOQvOP5piqAWuGtrhWeqaXK9hhoM/iyJc5AV+XfsX3HQ==",
+            "dev": true
+        },
+        "node_modules/lower-case": {
+            "version": "2.0.2",
+            "resolved": "https://registry.npmjs.org/lower-case/-/lower-case-2.0.2.tgz",
+            "integrity": "sha512-7fm3l3NAF9WfN6W3JOmf5drwpVqX78JtoGJ3A6W0a6ZnldM41w2fV5D490psKFTpMds8TJse/eHLFFsNHHjHgg==",
+            "dev": true,
+            "dependencies": {
+                "tslib": "^2.0.3"
+            }
+        },
+        "node_modules/lru-cache": {
+            "version": "6.0.0",
+            "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
+            "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
+            "dev": true,
+            "dependencies": {
+                "yallist": "^4.0.0"
+            },
+            "engines": {
+                "node": ">=10"
+            }
+        },
+        "node_modules/magic-string": {
+            "version": "0.30.5",
+            "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.30.5.tgz",
+            "integrity": "sha512-7xlpfBaQaP/T6Vh8MO/EqXSW5En6INHEvEXQiuff7Gku0PWjU3uf6w/j9o7O+SpB5fOAkrI5HeoNgwjEO0pFsA==",
+            "dev": true,
+            "dependencies": {
+                "@jridgewell/sourcemap-codec": "^1.4.15"
+            },
+            "engines": {
+                "node": ">=12"
+            }
+        },
+        "node_modules/make-dir": {
+            "version": "3.1.0",
+            "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-3.1.0.tgz",
+            "integrity": "sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw==",
+            "dev": true,
+            "dependencies": {
+                "semver": "^6.0.0"
+            },
+            "engines": {
+                "node": ">=8"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/sindresorhus"
+            }
+        },
+        "node_modules/make-dir/node_modules/semver": {
+            "version": "6.3.1",
+            "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
+            "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==",
+            "dev": true,
+            "bin": {
+                "semver": "bin/semver.js"
+            }
+        },
+        "node_modules/map-age-cleaner": {
+            "version": "0.1.3",
+            "resolved": "https://registry.npmjs.org/map-age-cleaner/-/map-age-cleaner-0.1.3.tgz",
+            "integrity": "sha512-bJzx6nMoP6PDLPBFmg7+xRKeFZvFboMrGlxmNj9ClvX53KrmvM5bXFXEWjbz4cz1AFn+jWJ9z/DJSz7hrs0w3w==",
+            "dev": true,
+            "dependencies": {
+                "p-defer": "^1.0.0"
+            },
+            "engines": {
+                "node": ">=6"
+            }
+        },
+        "node_modules/md5": {
+            "version": "2.3.0",
+            "resolved": "https://registry.npmjs.org/md5/-/md5-2.3.0.tgz",
+            "integrity": "sha512-T1GITYmFaKuO91vxyoQMFETst+O71VUPEU3ze5GNzDm0OWdP8v1ziTaAEPUr/3kLsY3Sftgz242A1SetQiDL7g==",
+            "dev": true,
+            "dependencies": {
+                "charenc": "0.0.2",
+                "crypt": "0.0.2",
+                "is-buffer": "~1.1.6"
+            }
+        },
+        "node_modules/md5.js": {
+            "version": "1.3.5",
+            "resolved": "https://registry.npmjs.org/md5.js/-/md5.js-1.3.5.tgz",
+            "integrity": "sha512-xitP+WxNPcTTOgnTJcrhM0xvdPepipPSf3I8EIpGKeFLjt3PlJLIDG3u8EX53ZIubkb+5U2+3rELYpEhHhzdkg==",
+            "dev": true,
+            "dependencies": {
+                "hash-base": "^3.0.0",
+                "inherits": "^2.0.1",
+                "safe-buffer": "^5.1.2"
+            }
+        },
+        "node_modules/mdn-data": {
+            "version": "2.0.14",
+            "resolved": "https://registry.npmjs.org/mdn-data/-/mdn-data-2.0.14.tgz",
+            "integrity": "sha512-dn6wd0uw5GsdswPFfsgMp5NSB0/aDe6fK94YJV/AJDYXL6HVLWBsxeq7js7Ad+mU2K9LAlwpk6kN2D5mwCPVow==",
+            "dev": true
+        },
+        "node_modules/media-typer": {
+            "version": "0.3.0",
+            "resolved": "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz",
+            "integrity": "sha512-dq+qelQ9akHpcOl/gUVRTxVIOkAJ1wR3QAvb4RsVjS8oVoFjDGTc679wJYmUmknUF5HwMLOgb5O+a3KxfWapPQ==",
+            "dev": true,
+            "engines": {
+                "node": ">= 0.6"
+            }
+        },
+        "node_modules/mem": {
+            "version": "8.1.1",
+            "resolved": "https://registry.npmjs.org/mem/-/mem-8.1.1.tgz",
+            "integrity": "sha512-qFCFUDs7U3b8mBDPyz5EToEKoAkgCzqquIgi9nkkR9bixxOVOre+09lbuH7+9Kn2NFpm56M3GUWVbU2hQgdACA==",
+            "dev": true,
+            "dependencies": {
+                "map-age-cleaner": "^0.1.3",
+                "mimic-fn": "^3.1.0"
+            },
+            "engines": {
+                "node": ">=10"
+            },
+            "funding": {
+                "url": "https://github.com/sindresorhus/mem?sponsor=1"
+            }
+        },
+        "node_modules/memfs": {
+            "version": "3.5.3",
+            "resolved": "https://registry.npmjs.org/memfs/-/memfs-3.5.3.tgz",
+            "integrity": "sha512-UERzLsxzllchadvbPs5aolHh65ISpKpM+ccLbOJ8/vvpBKmAWf+la7dXFy7Mr0ySHbdHrFv5kGFCUHHe6GFEmw==",
+            "dev": true,
+            "dependencies": {
+                "fs-monkey": "^1.0.4"
+            },
+            "engines": {
+                "node": ">= 4.0.0"
+            }
+        },
+        "node_modules/merge-descriptors": {
+            "version": "1.0.1",
+            "resolved": "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.1.tgz",
+            "integrity": "sha512-cCi6g3/Zr1iqQi6ySbseM1Xvooa98N0w31jzUYrXPX2xqObmFGHJ0tQ5u74H3mVh7wLouTseZyYIq39g8cNp1w==",
+            "dev": true
+        },
+        "node_modules/merge-stream": {
+            "version": "2.0.0",
+            "resolved": "https://registry.npmjs.org/merge-stream/-/merge-stream-2.0.0.tgz",
+            "integrity": "sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w==",
+            "dev": true
+        },
+        "node_modules/merge2": {
+            "version": "1.4.1",
+            "resolved": "https://registry.npmjs.org/merge2/-/merge2-1.4.1.tgz",
+            "integrity": "sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==",
+            "dev": true,
+            "engines": {
+                "node": ">= 8"
+            }
+        },
+        "node_modules/methods": {
+            "version": "1.1.2",
+            "resolved": "https://registry.npmjs.org/methods/-/methods-1.1.2.tgz",
+            "integrity": "sha512-iclAHeNqNm68zFtnZ0e+1L2yUIdvzNoauKU4WBA3VvH/vPFieF7qfRlwUZU+DA9P9bPXIS90ulxoUoCH23sV2w==",
+            "dev": true,
+            "engines": {
+                "node": ">= 0.6"
+            }
+        },
+        "node_modules/micromatch": {
+            "version": "4.0.5",
+            "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.5.tgz",
+            "integrity": "sha512-DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA==",
+            "dev": true,
+            "dependencies": {
+                "braces": "^3.0.2",
+                "picomatch": "^2.3.1"
+            },
+            "engines": {
+                "node": ">=8.6"
+            }
+        },
+        "node_modules/miller-rabin": {
+            "version": "4.0.1",
+            "resolved": "https://registry.npmjs.org/miller-rabin/-/miller-rabin-4.0.1.tgz",
+            "integrity": "sha512-115fLhvZVqWwHPbClyntxEVfVDfl9DLLTuJvq3g2O/Oxi8AiNouAHvDSzHS0viUJc+V5vm3eq91Xwqn9dp4jRA==",
+            "dev": true,
+            "dependencies": {
+                "bn.js": "^4.0.0",
+                "brorand": "^1.0.1"
+            },
+            "bin": {
+                "miller-rabin": "bin/miller-rabin"
+            }
+        },
+        "node_modules/miller-rabin/node_modules/bn.js": {
+            "version": "4.12.0",
+            "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.0.tgz",
+            "integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA==",
+            "dev": true
+        },
+        "node_modules/mime": {
+            "version": "1.6.0",
+            "resolved": "https://registry.npmjs.org/mime/-/mime-1.6.0.tgz",
+            "integrity": "sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==",
+            "dev": true,
+            "bin": {
+                "mime": "cli.js"
+            },
+            "engines": {
+                "node": ">=4"
+            }
+        },
+        "node_modules/mime-db": {
+            "version": "1.52.0",
+            "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.52.0.tgz",
+            "integrity": "sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==",
+            "dev": true,
+            "engines": {
+                "node": ">= 0.6"
+            }
+        },
+        "node_modules/mime-types": {
+            "version": "2.1.35",
+            "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.35.tgz",
+            "integrity": "sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==",
+            "dev": true,
+            "dependencies": {
+                "mime-db": "1.52.0"
+            },
+            "engines": {
+                "node": ">= 0.6"
+            }
+        },
+        "node_modules/mimic-fn": {
+            "version": "3.1.0",
+            "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-3.1.0.tgz",
+            "integrity": "sha512-Ysbi9uYW9hFyfrThdDEQuykN4Ey6BuwPD2kpI5ES/nFTDn/98yxYNLZJcgUAKPT/mcrLLKaGzJR9YVxJrIdASQ==",
+            "dev": true,
+            "engines": {
+                "node": ">=8"
+            }
+        },
+        "node_modules/mini-css-extract-plugin": {
+            "version": "1.6.2",
+            "resolved": "https://registry.npmjs.org/mini-css-extract-plugin/-/mini-css-extract-plugin-1.6.2.tgz",
+            "integrity": "sha512-WhDvO3SjGm40oV5y26GjMJYjd2UMqrLAGKy5YS2/3QKJy2F7jgynuHTir/tgUUOiNQu5saXHdc8reo7YuhhT4Q==",
+            "dev": true,
+            "dependencies": {
+                "loader-utils": "^2.0.0",
+                "schema-utils": "^3.0.0",
+                "webpack-sources": "^1.1.0"
+            },
+            "engines": {
+                "node": ">= 10.13.0"
+            },
+            "funding": {
+                "type": "opencollective",
+                "url": "https://opencollective.com/webpack"
+            },
+            "peerDependencies": {
+                "webpack": "^4.4.0 || ^5.0.0"
+            }
+        },
+        "node_modules/mini-css-extract-plugin/node_modules/schema-utils": {
+            "version": "3.3.0",
+            "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.3.0.tgz",
+            "integrity": "sha512-pN/yOAvcC+5rQ5nERGuwrjLlYvLTbCibnZ1I7B1LaiAz9BRBlE9GMgE/eqV30P7aJQUf7Ddimy/RsbYO/GrVGg==",
+            "dev": true,
+            "dependencies": {
+                "@types/json-schema": "^7.0.8",
+                "ajv": "^6.12.5",
+                "ajv-keywords": "^3.5.2"
+            },
+            "engines": {
+                "node": ">= 10.13.0"
+            },
+            "funding": {
+                "type": "opencollective",
+                "url": "https://opencollective.com/webpack"
+            }
+        },
+        "node_modules/minimalistic-assert": {
+            "version": "1.0.1",
+            "resolved": "https://registry.npmjs.org/minimalistic-assert/-/minimalistic-assert-1.0.1.tgz",
+            "integrity": "sha512-UtJcAD4yEaGtjPezWuO9wC4nwUnVH/8/Im3yEHQP4b67cXlD/Qr9hdITCU1xDbSEXg2XKNaP8jsReV7vQd00/A==",
+            "dev": true
+        },
+        "node_modules/minimalistic-crypto-utils": {
+            "version": "1.0.1",
+            "resolved": "https://registry.npmjs.org/minimalistic-crypto-utils/-/minimalistic-crypto-utils-1.0.1.tgz",
+            "integrity": "sha512-JIYlbt6g8i5jKfJ3xz7rF0LXmv2TkDxBLUkiBeZ7bAx4GnnNMr8xFpGnOxn6GhTEHx3SjRrZEoU+j04prX1ktg==",
+            "dev": true
+        },
+        "node_modules/minimatch": {
+            "version": "3.1.2",
+            "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
+            "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
+            "dev": true,
+            "dependencies": {
+                "brace-expansion": "^1.1.7"
+            },
+            "engines": {
+                "node": "*"
+            }
+        },
+        "node_modules/minimist": {
+            "version": "1.2.8",
+            "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.8.tgz",
+            "integrity": "sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA==",
+            "dev": true,
+            "funding": {
+                "url": "https://github.com/sponsors/ljharb"
+            }
+        },
+        "node_modules/ms": {
+            "version": "2.1.2",
+            "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
+            "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
+            "dev": true
+        },
+        "node_modules/multicast-dns": {
+            "version": "7.2.5",
+            "resolved": "https://registry.npmjs.org/multicast-dns/-/multicast-dns-7.2.5.tgz",
+            "integrity": "sha512-2eznPJP8z2BFLX50tf0LuODrpINqP1RVIm/CObbTcBRITQgmC/TjcREF1NeTBzIcR5XO/ukWo+YHOjBbFwIupg==",
+            "dev": true,
+            "dependencies": {
+                "dns-packet": "^5.2.2",
+                "thunky": "^1.0.2"
+            },
+            "bin": {
+                "multicast-dns": "cli.js"
+            }
+        },
+        "node_modules/mz": {
+            "version": "2.7.0",
+            "resolved": "https://registry.npmjs.org/mz/-/mz-2.7.0.tgz",
+            "integrity": "sha512-z81GNO7nnYMEhrGh9LeymoE4+Yr0Wn5McHIZMK5cfQCl+NDX08sCZgUc9/6MHni9IWuFLm1Z3HTCXu2z9fN62Q==",
+            "dev": true,
+            "dependencies": {
+                "any-promise": "^1.0.0",
+                "object-assign": "^4.0.1",
+                "thenify-all": "^1.0.0"
+            }
+        },
+        "node_modules/nanoid": {
+            "version": "3.3.7",
+            "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.7.tgz",
+            "integrity": "sha512-eSRppjcPIatRIMC1U6UngP8XFcz8MQWGQdt1MTBQ7NaAmvXDfvNxbvWV3x2y6CdEUciCSsDHDQZbhYaB8QEo2g==",
+            "dev": true,
+            "funding": [
+                {
+                    "type": "github",
+                    "url": "https://github.com/sponsors/ai"
+                }
+            ],
+            "bin": {
+                "nanoid": "bin/nanoid.cjs"
+            },
+            "engines": {
+                "node": "^10 || ^12 || ^13.7 || ^14 || >=15.0.1"
+            }
+        },
+        "node_modules/negotiator": {
+            "version": "0.6.3",
+            "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.3.tgz",
+            "integrity": "sha512-+EUsqGPLsM+j/zdChZjsnX51g4XrHFOIXwfnCVPGlQk/k5giakcKsuxCObBRu6DSm9opw/O6slWbJdghQM4bBg==",
+            "dev": true,
+            "engines": {
+                "node": ">= 0.6"
+            }
+        },
+        "node_modules/neo-async": {
+            "version": "2.6.2",
+            "resolved": "https://registry.npmjs.org/neo-async/-/neo-async-2.6.2.tgz",
+            "integrity": "sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==",
+            "dev": true
+        },
+        "node_modules/no-case": {
+            "version": "3.0.4",
+            "resolved": "https://registry.npmjs.org/no-case/-/no-case-3.0.4.tgz",
+            "integrity": "sha512-fgAN3jGAh+RoxUGZHTSOLJIqUc2wmoBwGR4tbpNAKmmovFoWq0OdRkb0VkldReO2a2iBT/OEulG9XSUc10r3zg==",
+            "dev": true,
+            "dependencies": {
+                "lower-case": "^2.0.2",
+                "tslib": "^2.0.3"
+            }
+        },
+        "node_modules/node-forge": {
+            "version": "1.3.1",
+            "resolved": "https://registry.npmjs.org/node-forge/-/node-forge-1.3.1.tgz",
+            "integrity": "sha512-dPEtOeMvF9VMcYV/1Wb8CPoVAXtp6MKMlcbAt4ddqmGqUJ6fQZFXkNZNkNlfevtNkGtaSoXf/vNNNSvgrdXwtA==",
+            "dev": true,
+            "engines": {
+                "node": ">= 6.13.0"
+            }
+        },
+        "node_modules/node-libs-browser": {
+            "version": "2.2.1",
+            "resolved": "https://registry.npmjs.org/node-libs-browser/-/node-libs-browser-2.2.1.tgz",
+            "integrity": "sha512-h/zcD8H9kaDZ9ALUWwlBUDo6TKF8a7qBSCSEGfjTVIYeqsioSKaAX+BN7NgiMGp6iSIXZ3PxgCu8KS3b71YK5Q==",
+            "dev": true,
+            "dependencies": {
+                "assert": "^1.1.1",
+                "browserify-zlib": "^0.2.0",
+                "buffer": "^4.3.0",
+                "console-browserify": "^1.1.0",
+                "constants-browserify": "^1.0.0",
+                "crypto-browserify": "^3.11.0",
+                "domain-browser": "^1.1.1",
+                "events": "^3.0.0",
+                "https-browserify": "^1.0.0",
+                "os-browserify": "^0.3.0",
+                "path-browserify": "0.0.1",
+                "process": "^0.11.10",
+                "punycode": "^1.2.4",
+                "querystring-es3": "^0.2.0",
+                "readable-stream": "^2.3.3",
+                "stream-browserify": "^2.0.1",
+                "stream-http": "^2.7.2",
+                "string_decoder": "^1.0.0",
+                "timers-browserify": "^2.0.4",
+                "tty-browserify": "0.0.0",
+                "url": "^0.11.0",
+                "util": "^0.11.0",
+                "vm-browserify": "^1.0.1"
+            }
+        },
+        "node_modules/node-libs-browser/node_modules/readable-stream": {
+            "version": "2.3.8",
+            "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.8.tgz",
+            "integrity": "sha512-8p0AUk4XODgIewSi0l8Epjs+EVnWiK7NoDIEGU0HhE7+ZyY8D1IMY7odu5lRrFXGg71L15KG8QrPmum45RTtdA==",
+            "dev": true,
+            "dependencies": {
+                "core-util-is": "~1.0.0",
+                "inherits": "~2.0.3",
+                "isarray": "~1.0.0",
+                "process-nextick-args": "~2.0.0",
+                "safe-buffer": "~5.1.1",
+                "string_decoder": "~1.1.1",
+                "util-deprecate": "~1.0.1"
+            }
+        },
+        "node_modules/node-libs-browser/node_modules/string_decoder": {
+            "version": "1.1.1",
+            "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
+            "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
+            "dev": true,
+            "dependencies": {
+                "safe-buffer": "~5.1.0"
+            }
+        },
+        "node_modules/node-notifier": {
+            "version": "9.0.1",
+            "resolved": "https://registry.npmjs.org/node-notifier/-/node-notifier-9.0.1.tgz",
+            "integrity": "sha512-fPNFIp2hF/Dq7qLDzSg4vZ0J4e9v60gJR+Qx7RbjbWqzPDdEqeVpEx5CFeDAELIl+A/woaaNn1fQ5nEVerMxJg==",
+            "dev": true,
+            "dependencies": {
+                "growly": "^1.3.0",
+                "is-wsl": "^2.2.0",
+                "semver": "^7.3.2",
+                "shellwords": "^0.1.1",
+                "uuid": "^8.3.0",
+                "which": "^2.0.2"
+            }
+        },
+        "node_modules/node-releases": {
+            "version": "2.0.13",
+            "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.13.tgz",
+            "integrity": "sha512-uYr7J37ae/ORWdZeQ1xxMJe3NtdmqMC/JZK+geofDrkLUApKRHPd18/TxtBOJ4A0/+uUIliorNrfYV6s1b02eQ==",
+            "dev": true
+        },
+        "node_modules/nopt": {
+            "version": "6.0.0",
+            "resolved": "https://registry.npmjs.org/nopt/-/nopt-6.0.0.tgz",
+            "integrity": "sha512-ZwLpbTgdhuZUnZzjd7nb1ZV+4DoiC6/sfiVKok72ym/4Tlf+DFdlHYmT2JPmcNNWV6Pi3SDf1kT+A4r9RTuT9g==",
+            "dev": true,
+            "dependencies": {
+                "abbrev": "^1.0.0"
+            },
+            "bin": {
+                "nopt": "bin/nopt.js"
+            },
+            "engines": {
+                "node": "^12.13.0 || ^14.15.0 || >=16.0.0"
+            }
+        },
+        "node_modules/normalize-path": {
+            "version": "3.0.0",
+            "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz",
+            "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==",
+            "dev": true,
+            "engines": {
+                "node": ">=0.10.0"
+            }
+        },
+        "node_modules/normalize-range": {
+            "version": "0.1.2",
+            "resolved": "https://registry.npmjs.org/normalize-range/-/normalize-range-0.1.2.tgz",
+            "integrity": "sha512-bdok/XvKII3nUpklnV6P2hxtMNrCboOjAcyBuQnWEhO665FwrSNRxU+AqpsyvO6LgGYPspN+lu5CLtw4jPRKNA==",
+            "dev": true,
+            "engines": {
+                "node": ">=0.10.0"
+            }
+        },
+        "node_modules/normalize-url": {
+            "version": "6.1.0",
+            "resolved": "https://registry.npmjs.org/normalize-url/-/normalize-url-6.1.0.tgz",
+            "integrity": "sha512-DlL+XwOy3NxAQ8xuC0okPgK46iuVNAK01YN7RueYBqqFeGsBjV9XmCAzAdgt+667bCl5kPh9EqKKDwnaPG1I7A==",
+            "dev": true,
+            "engines": {
+                "node": ">=10"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/sindresorhus"
+            }
+        },
+        "node_modules/npm-run-path": {
+            "version": "4.0.1",
+            "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-4.0.1.tgz",
+            "integrity": "sha512-S48WzZW777zhNIrn7gxOlISNAqi9ZC/uQFnRdbeIHhZhCA6UqpkOT8T1G7BvfdgP4Er8gF4sUbaS0i7QvIfCWw==",
+            "dev": true,
+            "dependencies": {
+                "path-key": "^3.0.0"
+            },
+            "engines": {
+                "node": ">=8"
+            }
+        },
+        "node_modules/nth-check": {
+            "version": "2.1.1",
+            "resolved": "https://registry.npmjs.org/nth-check/-/nth-check-2.1.1.tgz",
+            "integrity": "sha512-lqjrjmaOoAnWfMmBPL+XNnynZh2+swxiX3WUE0s4yEHI6m+AwrK2UZOimIRl3X/4QctVqS8AiZjFqyOGrMXb/w==",
+            "dev": true,
+            "dependencies": {
+                "boolbase": "^1.0.0"
+            },
+            "funding": {
+                "url": "https://github.com/fb55/nth-check?sponsor=1"
+            }
+        },
+        "node_modules/object-assign": {
+            "version": "4.1.1",
+            "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
+            "integrity": "sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg==",
+            "dev": true,
+            "engines": {
+                "node": ">=0.10.0"
+            }
+        },
+        "node_modules/object-hash": {
+            "version": "3.0.0",
+            "resolved": "https://registry.npmjs.org/object-hash/-/object-hash-3.0.0.tgz",
+            "integrity": "sha512-RSn9F68PjH9HqtltsSnqYC1XXoWe9Bju5+213R98cNGttag9q9yAOTzdbsqvIa7aNm5WffBZFpWYr2aWrklWAw==",
+            "dev": true,
+            "engines": {
+                "node": ">= 6"
+            }
+        },
+        "node_modules/object-inspect": {
+            "version": "1.13.1",
+            "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.13.1.tgz",
+            "integrity": "sha512-5qoj1RUiKOMsCCNLV1CBiPYE10sziTsnmNxkAI/rZhiD63CF7IqdFGC/XzjWjpSgLf0LxXX3bDFIh0E18f6UhQ==",
+            "dev": true,
+            "funding": {
+                "url": "https://github.com/sponsors/ljharb"
+            }
+        },
+        "node_modules/object-keys": {
+            "version": "1.1.1",
+            "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.1.1.tgz",
+            "integrity": "sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==",
+            "dev": true,
+            "engines": {
+                "node": ">= 0.4"
+            }
+        },
+        "node_modules/object.assign": {
+            "version": "4.1.4",
+            "resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.4.tgz",
+            "integrity": "sha512-1mxKf0e58bvyjSCtKYY4sRe9itRk3PJpquJOjeIkz885CczcI4IvJJDLPS72oowuSh+pBxUFROpX+TU++hxhZQ==",
+            "dev": true,
+            "dependencies": {
+                "call-bind": "^1.0.2",
+                "define-properties": "^1.1.4",
+                "has-symbols": "^1.0.3",
+                "object-keys": "^1.1.1"
+            },
+            "engines": {
+                "node": ">= 0.4"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/ljharb"
+            }
+        },
+        "node_modules/obuf": {
+            "version": "1.1.2",
+            "resolved": "https://registry.npmjs.org/obuf/-/obuf-1.1.2.tgz",
+            "integrity": "sha512-PX1wu0AmAdPqOL1mWhqmlOd8kOIZQwGZw6rh7uby9fTc5lhaOWFLX3I6R1hrF9k3zUY40e6igsLGkDXK92LJNg==",
+            "dev": true
+        },
+        "node_modules/on-finished": {
+            "version": "2.4.1",
+            "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.4.1.tgz",
+            "integrity": "sha512-oVlzkg3ENAhCk2zdv7IJwd/QUD4z2RxRwpkcGY8psCVcCYZNq4wYnVWALHM+brtuJjePWiYF/ClmuDr8Ch5+kg==",
+            "dev": true,
+            "dependencies": {
+                "ee-first": "1.1.1"
+            },
+            "engines": {
+                "node": ">= 0.8"
+            }
+        },
+        "node_modules/on-headers": {
+            "version": "1.0.2",
+            "resolved": "https://registry.npmjs.org/on-headers/-/on-headers-1.0.2.tgz",
+            "integrity": "sha512-pZAE+FJLoyITytdqK0U5s+FIpjN0JP3OzFi/u8Rx+EV5/W+JTWGXG8xFzevE7AjBfDqHv/8vL8qQsIhHnqRkrA==",
+            "dev": true,
+            "engines": {
+                "node": ">= 0.8"
+            }
+        },
+        "node_modules/once": {
+            "version": "1.4.0",
+            "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
+            "integrity": "sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==",
+            "dev": true,
+            "dependencies": {
+                "wrappy": "1"
+            }
+        },
+        "node_modules/onetime": {
+            "version": "5.1.2",
+            "resolved": "https://registry.npmjs.org/onetime/-/onetime-5.1.2.tgz",
+            "integrity": "sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg==",
+            "dev": true,
+            "dependencies": {
+                "mimic-fn": "^2.1.0"
+            },
+            "engines": {
+                "node": ">=6"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/sindresorhus"
+            }
+        },
+        "node_modules/onetime/node_modules/mimic-fn": {
+            "version": "2.1.0",
+            "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz",
+            "integrity": "sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==",
+            "dev": true,
+            "engines": {
+                "node": ">=6"
+            }
+        },
+        "node_modules/open": {
+            "version": "8.4.2",
+            "resolved": "https://registry.npmjs.org/open/-/open-8.4.2.tgz",
+            "integrity": "sha512-7x81NCL719oNbsq/3mh+hVrAWmFuEYUqrq/Iw3kUzH8ReypT9QQ0BLoJS7/G9k6N81XjW4qHWtjWwe/9eLy1EQ==",
+            "dev": true,
+            "dependencies": {
+                "define-lazy-prop": "^2.0.0",
+                "is-docker": "^2.1.1",
+                "is-wsl": "^2.2.0"
+            },
+            "engines": {
+                "node": ">=12"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/sindresorhus"
+            }
+        },
+        "node_modules/os-browserify": {
+            "version": "0.3.0",
+            "resolved": "https://registry.npmjs.org/os-browserify/-/os-browserify-0.3.0.tgz",
+            "integrity": "sha512-gjcpUc3clBf9+210TRaDWbf+rZZZEshZ+DlXMRCeAjp0xhTrnQsKHypIy1J3d5hKdUzj69t708EHtU8P6bUn0A==",
+            "dev": true
+        },
+        "node_modules/os-homedir": {
+            "version": "1.0.2",
+            "resolved": "https://registry.npmjs.org/os-homedir/-/os-homedir-1.0.2.tgz",
+            "integrity": "sha512-B5JU3cabzk8c67mRRd3ECmROafjYMXbuzlwtqdM8IbS8ktlTix8aFGb2bAGKrSRIlnfKwovGUUr72JUPyOb6kQ==",
+            "dev": true,
+            "engines": {
+                "node": ">=0.10.0"
+            }
+        },
+        "node_modules/p-defer": {
+            "version": "1.0.0",
+            "resolved": "https://registry.npmjs.org/p-defer/-/p-defer-1.0.0.tgz",
+            "integrity": "sha512-wB3wfAxZpk2AzOfUMJNL+d36xothRSyj8EXOa4f6GMqYDN9BJaaSISbsk+wS9abmnebVw95C2Kb5t85UmpCxuw==",
+            "dev": true,
+            "engines": {
+                "node": ">=4"
+            }
+        },
+        "node_modules/p-limit": {
+            "version": "2.3.0",
+            "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
+            "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
+            "dev": true,
+            "dependencies": {
+                "p-try": "^2.0.0"
+            },
+            "engines": {
+                "node": ">=6"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/sindresorhus"
+            }
+        },
+        "node_modules/p-locate": {
+            "version": "4.1.0",
+            "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz",
+            "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==",
+            "dev": true,
+            "dependencies": {
+                "p-limit": "^2.2.0"
+            },
+            "engines": {
+                "node": ">=8"
+            }
+        },
+        "node_modules/p-pipe": {
+            "version": "3.1.0",
+            "resolved": "https://registry.npmjs.org/p-pipe/-/p-pipe-3.1.0.tgz",
+            "integrity": "sha512-08pj8ATpzMR0Y80x50yJHn37NF6vjrqHutASaX5LiH5npS9XPvrUmscd9MF5R4fuYRHOxQR1FfMIlF7AzwoPqw==",
+            "dev": true,
+            "engines": {
+                "node": ">=8"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/sindresorhus"
+            }
+        },
+        "node_modules/p-retry": {
+            "version": "4.6.2",
+            "resolved": "https://registry.npmjs.org/p-retry/-/p-retry-4.6.2.tgz",
+            "integrity": "sha512-312Id396EbJdvRONlngUx0NydfrIQ5lsYu0znKVUzVvArzEIt08V1qhtyESbGVd1FGX7UKtiFp5uwKZdM8wIuQ==",
+            "dev": true,
+            "dependencies": {
+                "@types/retry": "0.12.0",
+                "retry": "^0.13.1"
+            },
+            "engines": {
+                "node": ">=8"
+            }
+        },
+        "node_modules/p-try": {
+            "version": "2.0.0",
+            "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.0.0.tgz",
+            "integrity": "sha512-hMp0onDKIajHfIkdRk3P4CdCmErkYAxxDtP3Wx/4nZ3aGlau2VKh3mZpcuFkH27WQkL/3WBCPOktzA9ZOAnMQQ==",
+            "dev": true,
+            "engines": {
+                "node": ">=6"
+            }
+        },
+        "node_modules/pako": {
+            "version": "1.0.11",
+            "resolved": "https://registry.npmjs.org/pako/-/pako-1.0.11.tgz",
+            "integrity": "sha512-4hLB8Py4zZce5s4yd9XzopqwVv/yGNhV1Bl8NTmCq1763HeK2+EwVTv+leGeL13Dnh2wfbqowVPXCIO0z4taYw==",
+            "dev": true
+        },
+        "node_modules/param-case": {
+            "version": "3.0.4",
+            "resolved": "https://registry.npmjs.org/param-case/-/param-case-3.0.4.tgz",
+            "integrity": "sha512-RXlj7zCYokReqWpOPH9oYivUzLYZ5vAPIfEmCTNViosC78F8F0H9y7T7gG2M39ymgutxF5gcFEsyZQSph9Bp3A==",
+            "dev": true,
+            "dependencies": {
+                "dot-case": "^3.0.4",
+                "tslib": "^2.0.3"
+            }
+        },
+        "node_modules/parent-module": {
+            "version": "1.0.1",
+            "resolved": "https://registry.npmjs.org/parent-module/-/parent-module-1.0.1.tgz",
+            "integrity": "sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==",
+            "dev": true,
+            "dependencies": {
+                "callsites": "^3.0.0"
+            },
+            "engines": {
+                "node": ">=6"
+            }
+        },
+        "node_modules/parse-asn1": {
+            "version": "5.1.6",
+            "resolved": "https://registry.npmjs.org/parse-asn1/-/parse-asn1-5.1.6.tgz",
+            "integrity": "sha512-RnZRo1EPU6JBnra2vGHj0yhp6ebyjBZpmUCLHWiFhxlzvBCCpAuZ7elsBp1PVAbQN0/04VD/19rfzlBSwLstMw==",
+            "dev": true,
+            "dependencies": {
+                "asn1.js": "^5.2.0",
+                "browserify-aes": "^1.0.0",
+                "evp_bytestokey": "^1.0.0",
+                "pbkdf2": "^3.0.3",
+                "safe-buffer": "^5.1.1"
+            }
+        },
+        "node_modules/parse-json": {
+            "version": "5.2.0",
+            "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-5.2.0.tgz",
+            "integrity": "sha512-ayCKvm/phCGxOkYRSCM82iDwct8/EonSEgCSxWxD7ve6jHggsFl4fZVQBPRNgQoKiuV/odhFrGzQXZwbifC8Rg==",
+            "dev": true,
+            "dependencies": {
+                "@babel/code-frame": "^7.0.0",
+                "error-ex": "^1.3.1",
+                "json-parse-even-better-errors": "^2.3.0",
+                "lines-and-columns": "^1.1.6"
+            },
+            "engines": {
+                "node": ">=8"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/sindresorhus"
+            }
+        },
+        "node_modules/parseurl": {
+            "version": "1.3.3",
+            "resolved": "https://registry.npmjs.org/parseurl/-/parseurl-1.3.3.tgz",
+            "integrity": "sha512-CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ==",
+            "dev": true,
+            "engines": {
+                "node": ">= 0.8"
+            }
+        },
+        "node_modules/pascal-case": {
+            "version": "3.1.2",
+            "resolved": "https://registry.npmjs.org/pascal-case/-/pascal-case-3.1.2.tgz",
+            "integrity": "sha512-uWlGT3YSnK9x3BQJaOdcZwrnV6hPpd8jFH1/ucpiLRPh/2zCVJKS19E4GvYHvaCcACn3foXZ0cLB9Wrx1KGe5g==",
+            "dev": true,
+            "dependencies": {
+                "no-case": "^3.0.4",
+                "tslib": "^2.0.3"
+            }
+        },
+        "node_modules/path-browserify": {
+            "version": "0.0.1",
+            "resolved": "https://registry.npmjs.org/path-browserify/-/path-browserify-0.0.1.tgz",
+            "integrity": "sha512-BapA40NHICOS+USX9SN4tyhq+A2RrN/Ws5F0Z5aMHDp98Fl86lX8Oti8B7uN93L4Ifv4fHOEA+pQw87gmMO/lQ==",
+            "dev": true
+        },
+        "node_modules/path-exists": {
+            "version": "4.0.0",
+            "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz",
+            "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==",
+            "dev": true,
+            "engines": {
+                "node": ">=8"
+            }
+        },
+        "node_modules/path-is-absolute": {
+            "version": "1.0.1",
+            "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
+            "integrity": "sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg==",
+            "dev": true,
+            "engines": {
+                "node": ">=0.10.0"
+            }
+        },
+        "node_modules/path-key": {
+            "version": "3.1.1",
+            "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz",
+            "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==",
+            "dev": true,
+            "engines": {
+                "node": ">=8"
+            }
+        },
+        "node_modules/path-parse": {
+            "version": "1.0.7",
+            "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.7.tgz",
+            "integrity": "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==",
+            "dev": true
+        },
+        "node_modules/path-to-regexp": {
+            "version": "0.1.7",
+            "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.7.tgz",
+            "integrity": "sha512-5DFkuoqlv1uYQKxy8omFBeJPQcdoE07Kv2sferDCrAq1ohOU+MSDswDIbnx3YAM60qIOnYa53wBhXW0EbMonrQ==",
+            "dev": true
+        },
+        "node_modules/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,
+            "engines": {
+                "node": ">=8"
+            }
+        },
+        "node_modules/pbkdf2": {
+            "version": "3.1.2",
+            "resolved": "https://registry.npmjs.org/pbkdf2/-/pbkdf2-3.1.2.tgz",
+            "integrity": "sha512-iuh7L6jA7JEGu2WxDwtQP1ddOpaJNC4KlDEFfdQajSGgGPNi4OyDc2R7QnbY2bR9QjBVGwgvTdNJZoE7RaxUMA==",
+            "dev": true,
+            "dependencies": {
+                "create-hash": "^1.1.2",
+                "create-hmac": "^1.1.4",
+                "ripemd160": "^2.0.1",
+                "safe-buffer": "^5.0.1",
+                "sha.js": "^2.4.8"
+            },
+            "engines": {
+                "node": ">=0.12"
+            }
+        },
+        "node_modules/php-parser": {
+            "version": "3.1.5",
+            "resolved": "https://registry.npmjs.org/php-parser/-/php-parser-3.1.5.tgz",
+            "integrity": "sha512-jEY2DcbgCm5aclzBdfW86GM6VEIWcSlhTBSHN1qhJguVePlYe28GhwS0yoeLYXpM2K8y6wzLwrbq814n2PHSoQ==",
+            "dev": true
+        },
+        "node_modules/picocolors": {
+            "version": "1.0.0",
+            "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.0.0.tgz",
+            "integrity": "sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ==",
+            "dev": true
+        },
+        "node_modules/picomatch": {
+            "version": "2.3.1",
+            "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz",
+            "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==",
+            "dev": true,
+            "engines": {
+                "node": ">=8.6"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/jonschlinkert"
+            }
+        },
+        "node_modules/pify": {
+            "version": "2.3.0",
+            "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
+            "integrity": "sha512-udgsAY+fTnvv7kI7aaxbqwWNb0AHiB0qBO89PZKPkoTmGOgdbrHDKD+0B2X4uTfJ/FT1R09r9gTsjUjNJotuog==",
+            "dev": true,
+            "engines": {
+                "node": ">=0.10.0"
+            }
+        },
+        "node_modules/pirates": {
+            "version": "4.0.6",
+            "resolved": "https://registry.npmjs.org/pirates/-/pirates-4.0.6.tgz",
+            "integrity": "sha512-saLsH7WeYYPiD25LDuLRRY/i+6HaPYr6G1OUlN39otzkSTxKnubR9RTxS3/Kk50s1g2JTgFwWQDQyplC5/SHZg==",
+            "dev": true,
+            "engines": {
+                "node": ">= 6"
+            }
+        },
+        "node_modules/pkg-dir": {
+            "version": "4.2.0",
+            "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-4.2.0.tgz",
+            "integrity": "sha512-HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ==",
+            "dev": true,
+            "dependencies": {
+                "find-up": "^4.0.0"
+            },
+            "engines": {
+                "node": ">=8"
+            }
+        },
+        "node_modules/popper.js": {
+            "version": "1.16.1",
+            "resolved": "https://registry.npmjs.org/popper.js/-/popper.js-1.16.1.tgz",
+            "integrity": "sha512-Wb4p1J4zyFTbM+u6WuO4XstYx4Ky9Cewe4DWrel7B0w6VVICvPwdOpotjzcf6eD8TsckVnIMNONQyPIUFOUbCQ==",
+            "deprecated": "You can find the new Popper v2 at @popperjs/core, this package is dedicated to the legacy v1",
+            "dev": true,
+            "funding": {
+                "type": "opencollective",
+                "url": "https://opencollective.com/popperjs"
+            }
+        },
+        "node_modules/postcss": {
+            "version": "8.4.32",
+            "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.32.tgz",
+            "integrity": "sha512-D/kj5JNu6oo2EIy+XL/26JEDTlIbB8hw85G8StOE6L74RQAVVP5rej6wxCNqyMbR4RkPfqvezVbPw81Ngd6Kcw==",
+            "dev": true,
+            "funding": [
+                {
+                    "type": "opencollective",
+                    "url": "https://opencollective.com/postcss/"
+                },
+                {
+                    "type": "tidelift",
+                    "url": "https://tidelift.com/funding/github/npm/postcss"
+                },
+                {
+                    "type": "github",
+                    "url": "https://github.com/sponsors/ai"
+                }
+            ],
+            "dependencies": {
+                "nanoid": "^3.3.7",
+                "picocolors": "^1.0.0",
+                "source-map-js": "^1.0.2"
+            },
+            "engines": {
+                "node": "^10 || ^12 || >=14"
+            }
+        },
+        "node_modules/postcss-calc": {
+            "version": "8.2.4",
+            "resolved": "https://registry.npmjs.org/postcss-calc/-/postcss-calc-8.2.4.tgz",
+            "integrity": "sha512-SmWMSJmB8MRnnULldx0lQIyhSNvuDl9HfrZkaqqE/WHAhToYsAvDq+yAsA/kIyINDszOp3Rh0GFoNuH5Ypsm3Q==",
+            "dev": true,
+            "dependencies": {
+                "postcss-selector-parser": "^6.0.9",
+                "postcss-value-parser": "^4.2.0"
+            },
+            "peerDependencies": {
+                "postcss": "^8.2.2"
+            }
+        },
+        "node_modules/postcss-colormin": {
+            "version": "5.3.1",
+            "resolved": "https://registry.npmjs.org/postcss-colormin/-/postcss-colormin-5.3.1.tgz",
+            "integrity": "sha512-UsWQG0AqTFQmpBegeLLc1+c3jIqBNB0zlDGRWR+dQ3pRKJL1oeMzyqmH3o2PIfn9MBdNrVPWhDbT769LxCTLJQ==",
+            "dev": true,
+            "dependencies": {
+                "browserslist": "^4.21.4",
+                "caniuse-api": "^3.0.0",
+                "colord": "^2.9.1",
+                "postcss-value-parser": "^4.2.0"
+            },
+            "engines": {
+                "node": "^10 || ^12 || >=14.0"
+            },
+            "peerDependencies": {
+                "postcss": "^8.2.15"
+            }
+        },
+        "node_modules/postcss-convert-values": {
+            "version": "5.1.3",
+            "resolved": "https://registry.npmjs.org/postcss-convert-values/-/postcss-convert-values-5.1.3.tgz",
+            "integrity": "sha512-82pC1xkJZtcJEfiLw6UXnXVXScgtBrjlO5CBmuDQc+dlb88ZYheFsjTn40+zBVi3DkfF7iezO0nJUPLcJK3pvA==",
+            "dev": true,
+            "dependencies": {
+                "browserslist": "^4.21.4",
+                "postcss-value-parser": "^4.2.0"
+            },
+            "engines": {
+                "node": "^10 || ^12 || >=14.0"
+            },
+            "peerDependencies": {
+                "postcss": "^8.2.15"
+            }
+        },
+        "node_modules/postcss-discard-comments": {
+            "version": "5.1.2",
+            "resolved": "https://registry.npmjs.org/postcss-discard-comments/-/postcss-discard-comments-5.1.2.tgz",
+            "integrity": "sha512-+L8208OVbHVF2UQf1iDmRcbdjJkuBF6IS29yBDSiWUIzpYaAhtNl6JYnYm12FnkeCwQqF5LeklOu6rAqgfBZqQ==",
+            "dev": true,
+            "engines": {
+                "node": "^10 || ^12 || >=14.0"
+            },
+            "peerDependencies": {
+                "postcss": "^8.2.15"
+            }
+        },
+        "node_modules/postcss-discard-duplicates": {
+            "version": "5.1.0",
+            "resolved": "https://registry.npmjs.org/postcss-discard-duplicates/-/postcss-discard-duplicates-5.1.0.tgz",
+            "integrity": "sha512-zmX3IoSI2aoenxHV6C7plngHWWhUOV3sP1T8y2ifzxzbtnuhk1EdPwm0S1bIUNaJ2eNbWeGLEwzw8huPD67aQw==",
+            "dev": true,
+            "engines": {
+                "node": "^10 || ^12 || >=14.0"
+            },
+            "peerDependencies": {
+                "postcss": "^8.2.15"
+            }
+        },
+        "node_modules/postcss-discard-empty": {
+            "version": "5.1.1",
+            "resolved": "https://registry.npmjs.org/postcss-discard-empty/-/postcss-discard-empty-5.1.1.tgz",
+            "integrity": "sha512-zPz4WljiSuLWsI0ir4Mcnr4qQQ5e1Ukc3i7UfE2XcrwKK2LIPIqE5jxMRxO6GbI3cv//ztXDsXwEWT3BHOGh3A==",
+            "dev": true,
+            "engines": {
+                "node": "^10 || ^12 || >=14.0"
+            },
+            "peerDependencies": {
+                "postcss": "^8.2.15"
+            }
+        },
+        "node_modules/postcss-discard-overridden": {
+            "version": "5.1.0",
+            "resolved": "https://registry.npmjs.org/postcss-discard-overridden/-/postcss-discard-overridden-5.1.0.tgz",
+            "integrity": "sha512-21nOL7RqWR1kasIVdKs8HNqQJhFxLsyRfAnUDm4Fe4t4mCWL9OJiHvlHPjcd8zc5Myu89b/7wZDnOSjFgeWRtw==",
+            "dev": true,
+            "engines": {
+                "node": "^10 || ^12 || >=14.0"
+            },
+            "peerDependencies": {
+                "postcss": "^8.2.15"
+            }
+        },
+        "node_modules/postcss-import": {
+            "version": "15.1.0",
+            "resolved": "https://registry.npmjs.org/postcss-import/-/postcss-import-15.1.0.tgz",
+            "integrity": "sha512-hpr+J05B2FVYUAXHeK1YyI267J/dDDhMU6B6civm8hSY1jYJnBXxzKDKDswzJmtLHryrjhnDjqqp/49t8FALew==",
+            "dev": true,
+            "dependencies": {
+                "postcss-value-parser": "^4.0.0",
+                "read-cache": "^1.0.0",
+                "resolve": "^1.1.7"
+            },
+            "engines": {
+                "node": ">=14.0.0"
+            },
+            "peerDependencies": {
+                "postcss": "^8.0.0"
+            }
+        },
+        "node_modules/postcss-js": {
+            "version": "4.0.1",
+            "resolved": "https://registry.npmjs.org/postcss-js/-/postcss-js-4.0.1.tgz",
+            "integrity": "sha512-dDLF8pEO191hJMtlHFPRa8xsizHaM82MLfNkUHdUtVEV3tgTp5oj+8qbEqYM57SLfc74KSbw//4SeJma2LRVIw==",
+            "dev": true,
+            "dependencies": {
+                "camelcase-css": "^2.0.1"
+            },
+            "engines": {
+                "node": "^12 || ^14 || >= 16"
+            },
+            "funding": {
+                "type": "opencollective",
+                "url": "https://opencollective.com/postcss/"
+            },
+            "peerDependencies": {
+                "postcss": "^8.4.21"
+            }
+        },
+        "node_modules/postcss-load-config": {
+            "version": "4.0.1",
+            "resolved": "https://registry.npmjs.org/postcss-load-config/-/postcss-load-config-4.0.1.tgz",
+            "integrity": "sha512-vEJIc8RdiBRu3oRAI0ymerOn+7rPuMvRXslTvZUKZonDHFIczxztIyJ1urxM1x9JXEikvpWWTUUqal5j/8QgvA==",
+            "dev": true,
+            "dependencies": {
+                "lilconfig": "^2.0.5",
+                "yaml": "^2.1.1"
+            },
+            "engines": {
+                "node": ">= 14"
+            },
+            "funding": {
+                "type": "opencollective",
+                "url": "https://opencollective.com/postcss/"
+            },
+            "peerDependencies": {
+                "postcss": ">=8.0.9",
+                "ts-node": ">=9.0.0"
+            },
+            "peerDependenciesMeta": {
+                "postcss": {
+                    "optional": true
+                },
+                "ts-node": {
+                    "optional": true
+                }
+            }
+        },
+        "node_modules/postcss-loader": {
+            "version": "6.2.1",
+            "resolved": "https://registry.npmjs.org/postcss-loader/-/postcss-loader-6.2.1.tgz",
+            "integrity": "sha512-WbbYpmAaKcux/P66bZ40bpWsBucjx/TTgVVzRZ9yUO8yQfVBlameJ0ZGVaPfH64hNSBh63a+ICP5nqOpBA0w+Q==",
+            "dev": true,
+            "dependencies": {
+                "cosmiconfig": "^7.0.0",
+                "klona": "^2.0.5",
+                "semver": "^7.3.5"
+            },
+            "engines": {
+                "node": ">= 12.13.0"
+            },
+            "funding": {
+                "type": "opencollective",
+                "url": "https://opencollective.com/webpack"
+            },
+            "peerDependencies": {
+                "postcss": "^7.0.0 || ^8.0.1",
+                "webpack": "^5.0.0"
+            }
+        },
+        "node_modules/postcss-merge-longhand": {
+            "version": "5.1.7",
+            "resolved": "https://registry.npmjs.org/postcss-merge-longhand/-/postcss-merge-longhand-5.1.7.tgz",
+            "integrity": "sha512-YCI9gZB+PLNskrK0BB3/2OzPnGhPkBEwmwhfYk1ilBHYVAZB7/tkTHFBAnCrvBBOmeYyMYw3DMjT55SyxMBzjQ==",
+            "dev": true,
+            "dependencies": {
+                "postcss-value-parser": "^4.2.0",
+                "stylehacks": "^5.1.1"
+            },
+            "engines": {
+                "node": "^10 || ^12 || >=14.0"
+            },
+            "peerDependencies": {
+                "postcss": "^8.2.15"
+            }
+        },
+        "node_modules/postcss-merge-rules": {
+            "version": "5.1.4",
+            "resolved": "https://registry.npmjs.org/postcss-merge-rules/-/postcss-merge-rules-5.1.4.tgz",
+            "integrity": "sha512-0R2IuYpgU93y9lhVbO/OylTtKMVcHb67zjWIfCiKR9rWL3GUk1677LAqD/BcHizukdZEjT8Ru3oHRoAYoJy44g==",
+            "dev": true,
+            "dependencies": {
+                "browserslist": "^4.21.4",
+                "caniuse-api": "^3.0.0",
+                "cssnano-utils": "^3.1.0",
+                "postcss-selector-parser": "^6.0.5"
+            },
+            "engines": {
+                "node": "^10 || ^12 || >=14.0"
+            },
+            "peerDependencies": {
+                "postcss": "^8.2.15"
+            }
+        },
+        "node_modules/postcss-minify-font-values": {
+            "version": "5.1.0",
+            "resolved": "https://registry.npmjs.org/postcss-minify-font-values/-/postcss-minify-font-values-5.1.0.tgz",
+            "integrity": "sha512-el3mYTgx13ZAPPirSVsHqFzl+BBBDrXvbySvPGFnQcTI4iNslrPaFq4muTkLZmKlGk4gyFAYUBMH30+HurREyA==",
+            "dev": true,
+            "dependencies": {
+                "postcss-value-parser": "^4.2.0"
+            },
+            "engines": {
+                "node": "^10 || ^12 || >=14.0"
+            },
+            "peerDependencies": {
+                "postcss": "^8.2.15"
+            }
+        },
+        "node_modules/postcss-minify-gradients": {
+            "version": "5.1.1",
+            "resolved": "https://registry.npmjs.org/postcss-minify-gradients/-/postcss-minify-gradients-5.1.1.tgz",
+            "integrity": "sha512-VGvXMTpCEo4qHTNSa9A0a3D+dxGFZCYwR6Jokk+/3oB6flu2/PnPXAh2x7x52EkY5xlIHLm+Le8tJxe/7TNhzw==",
+            "dev": true,
+            "dependencies": {
+                "colord": "^2.9.1",
+                "cssnano-utils": "^3.1.0",
+                "postcss-value-parser": "^4.2.0"
+            },
+            "engines": {
+                "node": "^10 || ^12 || >=14.0"
+            },
+            "peerDependencies": {
+                "postcss": "^8.2.15"
+            }
+        },
+        "node_modules/postcss-minify-params": {
+            "version": "5.1.4",
+            "resolved": "https://registry.npmjs.org/postcss-minify-params/-/postcss-minify-params-5.1.4.tgz",
+            "integrity": "sha512-+mePA3MgdmVmv6g+30rn57USjOGSAyuxUmkfiWpzalZ8aiBkdPYjXWtHuwJGm1v5Ojy0Z0LaSYhHaLJQB0P8Jw==",
+            "dev": true,
+            "dependencies": {
+                "browserslist": "^4.21.4",
+                "cssnano-utils": "^3.1.0",
+                "postcss-value-parser": "^4.2.0"
+            },
+            "engines": {
+                "node": "^10 || ^12 || >=14.0"
+            },
+            "peerDependencies": {
+                "postcss": "^8.2.15"
+            }
+        },
+        "node_modules/postcss-minify-selectors": {
+            "version": "5.2.1",
+            "resolved": "https://registry.npmjs.org/postcss-minify-selectors/-/postcss-minify-selectors-5.2.1.tgz",
+            "integrity": "sha512-nPJu7OjZJTsVUmPdm2TcaiohIwxP+v8ha9NehQ2ye9szv4orirRU3SDdtUmKH+10nzn0bAyOXZ0UEr7OpvLehg==",
+            "dev": true,
+            "dependencies": {
+                "postcss-selector-parser": "^6.0.5"
+            },
+            "engines": {
+                "node": "^10 || ^12 || >=14.0"
+            },
+            "peerDependencies": {
+                "postcss": "^8.2.15"
+            }
+        },
+        "node_modules/postcss-modules-extract-imports": {
+            "version": "3.0.0",
+            "resolved": "https://registry.npmjs.org/postcss-modules-extract-imports/-/postcss-modules-extract-imports-3.0.0.tgz",
+            "integrity": "sha512-bdHleFnP3kZ4NYDhuGlVK+CMrQ/pqUm8bx/oGL93K6gVwiclvX5x0n76fYMKuIGKzlABOy13zsvqjb0f92TEXw==",
+            "dev": true,
+            "engines": {
+                "node": "^10 || ^12 || >= 14"
+            },
+            "peerDependencies": {
+                "postcss": "^8.1.0"
+            }
+        },
+        "node_modules/postcss-modules-local-by-default": {
+            "version": "4.0.3",
+            "resolved": "https://registry.npmjs.org/postcss-modules-local-by-default/-/postcss-modules-local-by-default-4.0.3.tgz",
+            "integrity": "sha512-2/u2zraspoACtrbFRnTijMiQtb4GW4BvatjaG/bCjYQo8kLTdevCUlwuBHx2sCnSyrI3x3qj4ZK1j5LQBgzmwA==",
+            "dev": true,
+            "dependencies": {
+                "icss-utils": "^5.0.0",
+                "postcss-selector-parser": "^6.0.2",
+                "postcss-value-parser": "^4.1.0"
+            },
+            "engines": {
+                "node": "^10 || ^12 || >= 14"
+            },
+            "peerDependencies": {
+                "postcss": "^8.1.0"
+            }
+        },
+        "node_modules/postcss-modules-scope": {
+            "version": "3.0.0",
+            "resolved": "https://registry.npmjs.org/postcss-modules-scope/-/postcss-modules-scope-3.0.0.tgz",
+            "integrity": "sha512-hncihwFA2yPath8oZ15PZqvWGkWf+XUfQgUGamS4LqoP1anQLOsOJw0vr7J7IwLpoY9fatA2qiGUGmuZL0Iqlg==",
+            "dev": true,
+            "dependencies": {
+                "postcss-selector-parser": "^6.0.4"
+            },
+            "engines": {
+                "node": "^10 || ^12 || >= 14"
+            },
+            "peerDependencies": {
+                "postcss": "^8.1.0"
+            }
+        },
+        "node_modules/postcss-modules-values": {
+            "version": "4.0.0",
+            "resolved": "https://registry.npmjs.org/postcss-modules-values/-/postcss-modules-values-4.0.0.tgz",
+            "integrity": "sha512-RDxHkAiEGI78gS2ofyvCsu7iycRv7oqw5xMWn9iMoR0N/7mf9D50ecQqUo5BZ9Zh2vH4bCUR/ktCqbB9m8vJjQ==",
+            "dev": true,
+            "dependencies": {
+                "icss-utils": "^5.0.0"
+            },
+            "engines": {
+                "node": "^10 || ^12 || >= 14"
+            },
+            "peerDependencies": {
+                "postcss": "^8.1.0"
+            }
+        },
+        "node_modules/postcss-nested": {
+            "version": "6.0.1",
+            "resolved": "https://registry.npmjs.org/postcss-nested/-/postcss-nested-6.0.1.tgz",
+            "integrity": "sha512-mEp4xPMi5bSWiMbsgoPfcP74lsWLHkQbZc3sY+jWYd65CUwXrUaTp0fmNpa01ZcETKlIgUdFN/MpS2xZtqL9dQ==",
+            "dev": true,
+            "dependencies": {
+                "postcss-selector-parser": "^6.0.11"
+            },
+            "engines": {
+                "node": ">=12.0"
+            },
+            "funding": {
+                "type": "opencollective",
+                "url": "https://opencollective.com/postcss/"
+            },
+            "peerDependencies": {
+                "postcss": "^8.2.14"
+            }
+        },
+        "node_modules/postcss-normalize-charset": {
+            "version": "5.1.0",
+            "resolved": "https://registry.npmjs.org/postcss-normalize-charset/-/postcss-normalize-charset-5.1.0.tgz",
+            "integrity": "sha512-mSgUJ+pd/ldRGVx26p2wz9dNZ7ji6Pn8VWBajMXFf8jk7vUoSrZ2lt/wZR7DtlZYKesmZI680qjr2CeFF2fbUg==",
+            "dev": true,
+            "engines": {
+                "node": "^10 || ^12 || >=14.0"
+            },
+            "peerDependencies": {
+                "postcss": "^8.2.15"
+            }
+        },
+        "node_modules/postcss-normalize-display-values": {
+            "version": "5.1.0",
+            "resolved": "https://registry.npmjs.org/postcss-normalize-display-values/-/postcss-normalize-display-values-5.1.0.tgz",
+            "integrity": "sha512-WP4KIM4o2dazQXWmFaqMmcvsKmhdINFblgSeRgn8BJ6vxaMyaJkwAzpPpuvSIoG/rmX3M+IrRZEz2H0glrQNEA==",
+            "dev": true,
+            "dependencies": {
+                "postcss-value-parser": "^4.2.0"
+            },
+            "engines": {
+                "node": "^10 || ^12 || >=14.0"
+            },
+            "peerDependencies": {
+                "postcss": "^8.2.15"
+            }
+        },
+        "node_modules/postcss-normalize-positions": {
+            "version": "5.1.1",
+            "resolved": "https://registry.npmjs.org/postcss-normalize-positions/-/postcss-normalize-positions-5.1.1.tgz",
+            "integrity": "sha512-6UpCb0G4eofTCQLFVuI3EVNZzBNPiIKcA1AKVka+31fTVySphr3VUgAIULBhxZkKgwLImhzMR2Bw1ORK+37INg==",
+            "dev": true,
+            "dependencies": {
+                "postcss-value-parser": "^4.2.0"
+            },
+            "engines": {
+                "node": "^10 || ^12 || >=14.0"
+            },
+            "peerDependencies": {
+                "postcss": "^8.2.15"
+            }
+        },
+        "node_modules/postcss-normalize-repeat-style": {
+            "version": "5.1.1",
+            "resolved": "https://registry.npmjs.org/postcss-normalize-repeat-style/-/postcss-normalize-repeat-style-5.1.1.tgz",
+            "integrity": "sha512-mFpLspGWkQtBcWIRFLmewo8aC3ImN2i/J3v8YCFUwDnPu3Xz4rLohDO26lGjwNsQxB3YF0KKRwspGzE2JEuS0g==",
+            "dev": true,
+            "dependencies": {
+                "postcss-value-parser": "^4.2.0"
+            },
+            "engines": {
+                "node": "^10 || ^12 || >=14.0"
+            },
+            "peerDependencies": {
+                "postcss": "^8.2.15"
+            }
+        },
+        "node_modules/postcss-normalize-string": {
+            "version": "5.1.0",
+            "resolved": "https://registry.npmjs.org/postcss-normalize-string/-/postcss-normalize-string-5.1.0.tgz",
+            "integrity": "sha512-oYiIJOf4T9T1N4i+abeIc7Vgm/xPCGih4bZz5Nm0/ARVJ7K6xrDlLwvwqOydvyL3RHNf8qZk6vo3aatiw/go3w==",
+            "dev": true,
+            "dependencies": {
+                "postcss-value-parser": "^4.2.0"
+            },
+            "engines": {
+                "node": "^10 || ^12 || >=14.0"
+            },
+            "peerDependencies": {
+                "postcss": "^8.2.15"
+            }
+        },
+        "node_modules/postcss-normalize-timing-functions": {
+            "version": "5.1.0",
+            "resolved": "https://registry.npmjs.org/postcss-normalize-timing-functions/-/postcss-normalize-timing-functions-5.1.0.tgz",
+            "integrity": "sha512-DOEkzJ4SAXv5xkHl0Wa9cZLF3WCBhF3o1SKVxKQAa+0pYKlueTpCgvkFAHfk+Y64ezX9+nITGrDZeVGgITJXjg==",
+            "dev": true,
+            "dependencies": {
+                "postcss-value-parser": "^4.2.0"
+            },
+            "engines": {
+                "node": "^10 || ^12 || >=14.0"
+            },
+            "peerDependencies": {
+                "postcss": "^8.2.15"
+            }
+        },
+        "node_modules/postcss-normalize-unicode": {
+            "version": "5.1.1",
+            "resolved": "https://registry.npmjs.org/postcss-normalize-unicode/-/postcss-normalize-unicode-5.1.1.tgz",
+            "integrity": "sha512-qnCL5jzkNUmKVhZoENp1mJiGNPcsJCs1aaRmURmeJGES23Z/ajaln+EPTD+rBeNkSryI+2WTdW+lwcVdOikrpA==",
+            "dev": true,
+            "dependencies": {
+                "browserslist": "^4.21.4",
+                "postcss-value-parser": "^4.2.0"
+            },
+            "engines": {
+                "node": "^10 || ^12 || >=14.0"
+            },
+            "peerDependencies": {
+                "postcss": "^8.2.15"
+            }
+        },
+        "node_modules/postcss-normalize-url": {
+            "version": "5.1.0",
+            "resolved": "https://registry.npmjs.org/postcss-normalize-url/-/postcss-normalize-url-5.1.0.tgz",
+            "integrity": "sha512-5upGeDO+PVthOxSmds43ZeMeZfKH+/DKgGRD7TElkkyS46JXAUhMzIKiCa7BabPeIy3AQcTkXwVVN7DbqsiCew==",
+            "dev": true,
+            "dependencies": {
+                "normalize-url": "^6.0.1",
+                "postcss-value-parser": "^4.2.0"
+            },
+            "engines": {
+                "node": "^10 || ^12 || >=14.0"
+            },
+            "peerDependencies": {
+                "postcss": "^8.2.15"
+            }
+        },
+        "node_modules/postcss-normalize-whitespace": {
+            "version": "5.1.1",
+            "resolved": "https://registry.npmjs.org/postcss-normalize-whitespace/-/postcss-normalize-whitespace-5.1.1.tgz",
+            "integrity": "sha512-83ZJ4t3NUDETIHTa3uEg6asWjSBYL5EdkVB0sDncx9ERzOKBVJIUeDO9RyA9Zwtig8El1d79HBp0JEi8wvGQnA==",
+            "dev": true,
+            "dependencies": {
+                "postcss-value-parser": "^4.2.0"
+            },
+            "engines": {
+                "node": "^10 || ^12 || >=14.0"
+            },
+            "peerDependencies": {
+                "postcss": "^8.2.15"
+            }
+        },
+        "node_modules/postcss-ordered-values": {
+            "version": "5.1.3",
+            "resolved": "https://registry.npmjs.org/postcss-ordered-values/-/postcss-ordered-values-5.1.3.tgz",
+            "integrity": "sha512-9UO79VUhPwEkzbb3RNpqqghc6lcYej1aveQteWY+4POIwlqkYE21HKWaLDF6lWNuqCobEAyTovVhtI32Rbv2RQ==",
+            "dev": true,
+            "dependencies": {
+                "cssnano-utils": "^3.1.0",
+                "postcss-value-parser": "^4.2.0"
+            },
+            "engines": {
+                "node": "^10 || ^12 || >=14.0"
+            },
+            "peerDependencies": {
+                "postcss": "^8.2.15"
+            }
+        },
+        "node_modules/postcss-reduce-initial": {
+            "version": "5.1.2",
+            "resolved": "https://registry.npmjs.org/postcss-reduce-initial/-/postcss-reduce-initial-5.1.2.tgz",
+            "integrity": "sha512-dE/y2XRaqAi6OvjzD22pjTUQ8eOfc6m/natGHgKFBK9DxFmIm69YmaRVQrGgFlEfc1HePIurY0TmDeROK05rIg==",
+            "dev": true,
+            "dependencies": {
+                "browserslist": "^4.21.4",
+                "caniuse-api": "^3.0.0"
+            },
+            "engines": {
+                "node": "^10 || ^12 || >=14.0"
+            },
+            "peerDependencies": {
+                "postcss": "^8.2.15"
+            }
+        },
+        "node_modules/postcss-reduce-transforms": {
+            "version": "5.1.0",
+            "resolved": "https://registry.npmjs.org/postcss-reduce-transforms/-/postcss-reduce-transforms-5.1.0.tgz",
+            "integrity": "sha512-2fbdbmgir5AvpW9RLtdONx1QoYG2/EtqpNQbFASDlixBbAYuTcJ0dECwlqNqH7VbaUnEnh8SrxOe2sRIn24XyQ==",
+            "dev": true,
+            "dependencies": {
+                "postcss-value-parser": "^4.2.0"
+            },
+            "engines": {
+                "node": "^10 || ^12 || >=14.0"
+            },
+            "peerDependencies": {
+                "postcss": "^8.2.15"
+            }
+        },
+        "node_modules/postcss-selector-parser": {
+            "version": "6.0.13",
+            "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.0.13.tgz",
+            "integrity": "sha512-EaV1Gl4mUEV4ddhDnv/xtj7sxwrwxdetHdWUGnT4VJQf+4d05v6lHYZr8N573k5Z0BViss7BDhfWtKS3+sfAqQ==",
+            "dev": true,
+            "dependencies": {
+                "cssesc": "^3.0.0",
+                "util-deprecate": "^1.0.2"
+            },
+            "engines": {
+                "node": ">=4"
+            }
+        },
+        "node_modules/postcss-svgo": {
+            "version": "5.1.0",
+            "resolved": "https://registry.npmjs.org/postcss-svgo/-/postcss-svgo-5.1.0.tgz",
+            "integrity": "sha512-D75KsH1zm5ZrHyxPakAxJWtkyXew5qwS70v56exwvw542d9CRtTo78K0WeFxZB4G7JXKKMbEZtZayTGdIky/eA==",
+            "dev": true,
+            "dependencies": {
+                "postcss-value-parser": "^4.2.0",
+                "svgo": "^2.7.0"
+            },
+            "engines": {
+                "node": "^10 || ^12 || >=14.0"
+            },
+            "peerDependencies": {
+                "postcss": "^8.2.15"
+            }
+        },
+        "node_modules/postcss-unique-selectors": {
+            "version": "5.1.1",
+            "resolved": "https://registry.npmjs.org/postcss-unique-selectors/-/postcss-unique-selectors-5.1.1.tgz",
+            "integrity": "sha512-5JiODlELrz8L2HwxfPnhOWZYWDxVHWL83ufOv84NrcgipI7TaeRsatAhK4Tr2/ZiYldpK/wBvw5BD3qfaK96GA==",
+            "dev": true,
+            "dependencies": {
+                "postcss-selector-parser": "^6.0.5"
+            },
+            "engines": {
+                "node": "^10 || ^12 || >=14.0"
+            },
+            "peerDependencies": {
+                "postcss": "^8.2.15"
+            }
+        },
+        "node_modules/postcss-value-parser": {
+            "version": "4.2.0",
+            "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.2.0.tgz",
+            "integrity": "sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ==",
+            "dev": true
+        },
+        "node_modules/prettier": {
+            "version": "2.7.1",
+            "resolved": "https://registry.npmjs.org/prettier/-/prettier-2.7.1.tgz",
+            "integrity": "sha512-ujppO+MkdPqoVINuDFDRLClm7D78qbDt0/NR+wp5FqEZOoTNAjPHWj17QRhu7geIHJfcNhRk1XVQmF8Bp3ye+g==",
+            "dev": true,
+            "bin": {
+                "prettier": "bin-prettier.js"
+            },
+            "engines": {
+                "node": ">=10.13.0"
+            },
+            "funding": {
+                "url": "https://github.com/prettier/prettier?sponsor=1"
+            }
+        },
+        "node_modules/pretty-time": {
+            "version": "1.1.0",
+            "resolved": "https://registry.npmjs.org/pretty-time/-/pretty-time-1.1.0.tgz",
+            "integrity": "sha512-28iF6xPQrP8Oa6uxE6a1biz+lWeTOAPKggvjB8HAs6nVMKZwf5bG++632Dx614hIWgUPkgivRfG+a8uAXGTIbA==",
+            "dev": true,
+            "engines": {
+                "node": ">=4"
+            }
+        },
+        "node_modules/process": {
+            "version": "0.11.10",
+            "resolved": "https://registry.npmjs.org/process/-/process-0.11.10.tgz",
+            "integrity": "sha512-cdGef/drWFoydD1JsMzuFf8100nZl+GT+yacc2bEced5f9Rjk4z+WtFUTBu9PhOi9j/jfmBPu0mMEY4wIdAF8A==",
+            "dev": true,
+            "engines": {
+                "node": ">= 0.6.0"
+            }
+        },
+        "node_modules/process-nextick-args": {
+            "version": "2.0.1",
+            "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.1.tgz",
+            "integrity": "sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==",
+            "dev": true
+        },
+        "node_modules/proto-list": {
+            "version": "1.2.4",
+            "resolved": "https://registry.npmjs.org/proto-list/-/proto-list-1.2.4.tgz",
+            "integrity": "sha512-vtK/94akxsTMhe0/cbfpR+syPuszcuwhqVjJq26CuNDgFGj682oRBXOP5MJpv2r7JtE8MsiepGIqvvOTBwn2vA==",
+            "dev": true
+        },
+        "node_modules/proxy-addr": {
+            "version": "2.0.7",
+            "resolved": "https://registry.npmjs.org/proxy-addr/-/proxy-addr-2.0.7.tgz",
+            "integrity": "sha512-llQsMLSUDUPT44jdrU/O37qlnifitDP+ZwrmmZcoSKyLKvtZxpyV0n2/bD/N4tBAAZ/gJEdZU7KMraoK1+XYAg==",
+            "dev": true,
+            "dependencies": {
+                "forwarded": "0.2.0",
+                "ipaddr.js": "1.9.1"
+            },
+            "engines": {
+                "node": ">= 0.10"
+            }
+        },
+        "node_modules/proxy-addr/node_modules/ipaddr.js": {
+            "version": "1.9.1",
+            "resolved": "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.9.1.tgz",
+            "integrity": "sha512-0KI/607xoxSToH7GjN1FfSbLoU0+btTicjsQSWQlh/hZykN8KpmMf7uYwPW3R+akZ6R/w18ZlXSHBYXiYUPO3g==",
+            "dev": true,
+            "engines": {
+                "node": ">= 0.10"
+            }
+        },
+        "node_modules/proxy-from-env": {
+            "version": "1.1.0",
+            "resolved": "https://registry.npmjs.org/proxy-from-env/-/proxy-from-env-1.1.0.tgz",
+            "integrity": "sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg==",
+            "dev": true
+        },
+        "node_modules/public-encrypt": {
+            "version": "4.0.3",
+            "resolved": "https://registry.npmjs.org/public-encrypt/-/public-encrypt-4.0.3.tgz",
+            "integrity": "sha512-zVpa8oKZSz5bTMTFClc1fQOnyyEzpl5ozpi1B5YcvBrdohMjH2rfsBtyXcuNuwjsDIXmBYlF2N5FlJYhR29t8Q==",
+            "dev": true,
+            "dependencies": {
+                "bn.js": "^4.1.0",
+                "browserify-rsa": "^4.0.0",
+                "create-hash": "^1.1.0",
+                "parse-asn1": "^5.0.0",
+                "randombytes": "^2.0.1",
+                "safe-buffer": "^5.1.2"
+            }
+        },
+        "node_modules/public-encrypt/node_modules/bn.js": {
+            "version": "4.12.0",
+            "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.0.tgz",
+            "integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA==",
+            "dev": true
+        },
+        "node_modules/punycode": {
+            "version": "1.4.1",
+            "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz",
+            "integrity": "sha512-jmYNElW7yvO7TV33CjSmvSiE2yco3bV2czu/OzDKdMNVZQWfxCblURLhf+47syQRBntjfLdd/H0egrzIG+oaFQ==",
+            "dev": true
+        },
+        "node_modules/qs": {
+            "version": "6.11.2",
+            "resolved": "https://registry.npmjs.org/qs/-/qs-6.11.2.tgz",
+            "integrity": "sha512-tDNIz22aBzCDxLtVH++VnTfzxlfeK5CbqohpSqpJgj1Wg/cQbStNAz3NuqCs5vV+pjBsK4x4pN9HlVh7rcYRiA==",
+            "dev": true,
+            "dependencies": {
+                "side-channel": "^1.0.4"
+            },
+            "engines": {
+                "node": ">=0.6"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/ljharb"
+            }
+        },
+        "node_modules/querystring-es3": {
+            "version": "0.2.1",
+            "resolved": "https://registry.npmjs.org/querystring-es3/-/querystring-es3-0.2.1.tgz",
+            "integrity": "sha512-773xhDQnZBMFobEiztv8LIl70ch5MSF/jUQVlhwFyBILqq96anmoctVIYz+ZRp0qbCKATTn6ev02M3r7Ga5vqA==",
+            "dev": true,
+            "engines": {
+                "node": ">=0.4.x"
+            }
+        },
+        "node_modules/queue-microtask": {
+            "version": "1.2.3",
+            "resolved": "https://registry.npmjs.org/queue-microtask/-/queue-microtask-1.2.3.tgz",
+            "integrity": "sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A==",
+            "dev": true,
+            "funding": [
+                {
+                    "type": "github",
+                    "url": "https://github.com/sponsors/feross"
+                },
+                {
+                    "type": "patreon",
+                    "url": "https://www.patreon.com/feross"
+                },
+                {
+                    "type": "consulting",
+                    "url": "https://feross.org/support"
+                }
+            ]
+        },
+        "node_modules/randombytes": {
+            "version": "2.1.0",
+            "resolved": "https://registry.npmjs.org/randombytes/-/randombytes-2.1.0.tgz",
+            "integrity": "sha512-vYl3iOX+4CKUWuxGi9Ukhie6fsqXqS9FE2Zaic4tNFD2N2QQaXOMFbuKK4QmDHC0JO6B1Zp41J0LpT0oR68amQ==",
+            "dev": true,
+            "dependencies": {
+                "safe-buffer": "^5.1.0"
+            }
+        },
+        "node_modules/randomfill": {
+            "version": "1.0.4",
+            "resolved": "https://registry.npmjs.org/randomfill/-/randomfill-1.0.4.tgz",
+            "integrity": "sha512-87lcbR8+MhcWcUiQ+9e+Rwx8MyR2P7qnt15ynUlbm3TU/fjbgz4GsvfSUDTemtCCtVCqb4ZcEFlyPNTh9bBTLw==",
+            "dev": true,
+            "dependencies": {
+                "randombytes": "^2.0.5",
+                "safe-buffer": "^5.1.0"
+            }
+        },
+        "node_modules/range-parser": {
+            "version": "1.2.1",
+            "resolved": "https://registry.npmjs.org/range-parser/-/range-parser-1.2.1.tgz",
+            "integrity": "sha512-Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg==",
+            "dev": true,
+            "engines": {
+                "node": ">= 0.6"
+            }
+        },
+        "node_modules/raw-body": {
+            "version": "2.5.1",
+            "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.5.1.tgz",
+            "integrity": "sha512-qqJBtEyVgS0ZmPGdCFPWJ3FreoqvG4MVQln/kCgF7Olq95IbOp0/BWyMwbdtn4VTvkM8Y7khCQ2Xgk/tcrCXig==",
+            "dev": true,
+            "dependencies": {
+                "bytes": "3.1.2",
+                "http-errors": "2.0.0",
+                "iconv-lite": "0.4.24",
+                "unpipe": "1.0.0"
+            },
+            "engines": {
+                "node": ">= 0.8"
+            }
+        },
+        "node_modules/raw-body/node_modules/bytes": {
+            "version": "3.1.2",
+            "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.1.2.tgz",
+            "integrity": "sha512-/Nf7TyzTx6S3yRJObOAV7956r8cr2+Oj8AC5dt8wSP3BQAoeX58NoHyCU8P8zGkNXStjTSi6fzO6F0pBdcYbEg==",
+            "dev": true,
+            "engines": {
+                "node": ">= 0.8"
+            }
+        },
+        "node_modules/read-cache": {
+            "version": "1.0.0",
+            "resolved": "https://registry.npmjs.org/read-cache/-/read-cache-1.0.0.tgz",
+            "integrity": "sha512-Owdv/Ft7IjOgm/i0xvNDZ1LrRANRfew4b2prF3OWMQLxLfu3bS8FVhCsrSCMK4lR56Y9ya+AThoTpDCTxCmpRA==",
+            "dev": true,
+            "dependencies": {
+                "pify": "^2.3.0"
+            }
+        },
+        "node_modules/readable-stream": {
+            "version": "3.6.2",
+            "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.2.tgz",
+            "integrity": "sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA==",
+            "dev": true,
+            "dependencies": {
+                "inherits": "^2.0.3",
+                "string_decoder": "^1.1.1",
+                "util-deprecate": "^1.0.1"
+            },
+            "engines": {
+                "node": ">= 6"
+            }
+        },
+        "node_modules/readdirp": {
+            "version": "3.6.0",
+            "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.6.0.tgz",
+            "integrity": "sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA==",
+            "dev": true,
+            "dependencies": {
+                "picomatch": "^2.2.1"
+            },
+            "engines": {
+                "node": ">=8.10.0"
+            }
+        },
+        "node_modules/rechoir": {
+            "version": "0.7.1",
+            "resolved": "https://registry.npmjs.org/rechoir/-/rechoir-0.7.1.tgz",
+            "integrity": "sha512-/njmZ8s1wVeR6pjTZ+0nCnv8SpZNRMT2D1RLOJQESlYFDBvwpTA4KWJpZ+sBJ4+vhjILRcK7JIFdGCdxEAAitg==",
+            "dev": true,
+            "dependencies": {
+                "resolve": "^1.9.0"
+            },
+            "engines": {
+                "node": ">= 0.10"
+            }
+        },
+        "node_modules/regenerate": {
+            "version": "1.4.2",
+            "resolved": "https://registry.npmjs.org/regenerate/-/regenerate-1.4.2.tgz",
+            "integrity": "sha512-zrceR/XhGYU/d/opr2EKO7aRHUeiBI8qjtfHqADTwZd6Szfy16la6kqD0MIUs5z5hx6AaKa+PixpPrR289+I0A==",
+            "dev": true
+        },
+        "node_modules/regenerate-unicode-properties": {
+            "version": "10.0.1",
+            "resolved": "https://registry.npmjs.org/regenerate-unicode-properties/-/regenerate-unicode-properties-10.0.1.tgz",
+            "integrity": "sha512-vn5DU6yg6h8hP/2OkQo3K7uVILvY4iu0oI4t3HFa81UPkhGJwkRwM10JEc3upjdhHjs/k8GJY1sRBhk5sr69Bw==",
+            "dev": true,
+            "dependencies": {
+                "regenerate": "^1.4.2"
+            },
+            "engines": {
+                "node": ">=4"
+            }
+        },
+        "node_modules/regenerator-runtime": {
+            "version": "0.13.9",
+            "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.9.tgz",
+            "integrity": "sha512-p3VT+cOEgxFsRRA9X4lkI1E+k2/CtnKtU4gcxyaCUreilL/vqI6CdZ3wxVUx3UOUg+gnUOQQcRI7BmSI656MYA==",
+            "dev": true
+        },
+        "node_modules/regenerator-transform": {
+            "version": "0.15.0",
+            "resolved": "https://registry.npmjs.org/regenerator-transform/-/regenerator-transform-0.15.0.tgz",
+            "integrity": "sha512-LsrGtPmbYg19bcPHwdtmXwbW+TqNvtY4riE3P83foeHRroMbH6/2ddFBfab3t7kbzc7v7p4wbkIecHImqt0QNg==",
+            "dev": true,
+            "dependencies": {
+                "@babel/runtime": "^7.8.4"
+            }
+        },
+        "node_modules/regex-parser": {
+            "version": "2.2.11",
+            "resolved": "https://registry.npmjs.org/regex-parser/-/regex-parser-2.2.11.tgz",
+            "integrity": "sha512-jbD/FT0+9MBU2XAZluI7w2OBs1RBi6p9M83nkoZayQXXU9e8Robt69FcZc7wU4eJD/YFTjn1JdCk3rbMJajz8Q==",
+            "dev": true
+        },
+        "node_modules/regexpu-core": {
+            "version": "5.1.0",
+            "resolved": "https://registry.npmjs.org/regexpu-core/-/regexpu-core-5.1.0.tgz",
+            "integrity": "sha512-bb6hk+xWd2PEOkj5It46A16zFMs2mv86Iwpdu94la4S3sJ7C973h2dHpYKwIBGaWSO7cIRJ+UX0IeMaWcO4qwA==",
+            "dev": true,
+            "dependencies": {
+                "regenerate": "^1.4.2",
+                "regenerate-unicode-properties": "^10.0.1",
+                "regjsgen": "^0.6.0",
+                "regjsparser": "^0.8.2",
+                "unicode-match-property-ecmascript": "^2.0.0",
+                "unicode-match-property-value-ecmascript": "^2.0.0"
+            },
+            "engines": {
+                "node": ">=4"
+            }
+        },
+        "node_modules/regjsgen": {
+            "version": "0.6.0",
+            "resolved": "https://registry.npmjs.org/regjsgen/-/regjsgen-0.6.0.tgz",
+            "integrity": "sha512-ozE883Uigtqj3bx7OhL1KNbCzGyW2NQZPl6Hs09WTvCuZD5sTI4JY58bkbQWa/Y9hxIsvJ3M8Nbf7j54IqeZbA==",
+            "dev": true
+        },
+        "node_modules/regjsparser": {
+            "version": "0.8.4",
+            "resolved": "https://registry.npmjs.org/regjsparser/-/regjsparser-0.8.4.tgz",
+            "integrity": "sha512-J3LABycON/VNEu3abOviqGHuB/LOtOQj8SKmfP9anY5GfAVw/SPjwzSjxGjbZXIxbGfqTHtJw58C2Li/WkStmA==",
+            "dev": true,
+            "dependencies": {
+                "jsesc": "~0.5.0"
+            },
+            "bin": {
+                "regjsparser": "bin/parser"
+            }
+        },
+        "node_modules/regjsparser/node_modules/jsesc": {
+            "version": "0.5.0",
+            "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-0.5.0.tgz",
+            "integrity": "sha512-uZz5UnB7u4T9LvwmFqXii7pZSouaRPorGs5who1Ip7VO0wxanFvBL7GkM6dTHlgX+jhBApRetaWpnDabOeTcnA==",
+            "dev": true,
+            "bin": {
+                "jsesc": "bin/jsesc"
+            }
+        },
+        "node_modules/relateurl": {
+            "version": "0.2.7",
+            "resolved": "https://registry.npmjs.org/relateurl/-/relateurl-0.2.7.tgz",
+            "integrity": "sha512-G08Dxvm4iDN3MLM0EsP62EDV9IuhXPR6blNz6Utcp7zyV3tr4HVNINt6MpaRWbxoOHT3Q7YN2P+jaHX8vUbgog==",
+            "dev": true,
+            "engines": {
+                "node": ">= 0.10"
+            }
+        },
+        "node_modules/replace-ext": {
+            "version": "1.0.1",
+            "resolved": "https://registry.npmjs.org/replace-ext/-/replace-ext-1.0.1.tgz",
+            "integrity": "sha512-yD5BHCe7quCgBph4rMQ+0KkIRKwWCrHDOX1p1Gp6HwjPM5kVoCdKGNhN7ydqqsX6lJEnQDKZ/tFMiEdQ1dvPEw==",
+            "dev": true,
+            "engines": {
+                "node": ">= 0.10"
+            }
+        },
+        "node_modules/require-directory": {
+            "version": "2.1.1",
+            "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz",
+            "integrity": "sha512-fGxEI7+wsG9xrvdjsrlmL22OMTTiHRwAMroiEeMgq8gzoLC/PQr7RsRDSTLUg/bZAZtF+TVIkHc6/4RIKrui+Q==",
+            "dev": true,
+            "engines": {
+                "node": ">=0.10.0"
+            }
+        },
+        "node_modules/require-from-string": {
+            "version": "2.0.2",
+            "resolved": "https://registry.npmjs.org/require-from-string/-/require-from-string-2.0.2.tgz",
+            "integrity": "sha512-Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw==",
+            "dev": true,
+            "engines": {
+                "node": ">=0.10.0"
+            }
+        },
+        "node_modules/requires-port": {
+            "version": "1.0.0",
+            "resolved": "https://registry.npmjs.org/requires-port/-/requires-port-1.0.0.tgz",
+            "integrity": "sha512-KigOCHcocU3XODJxsu8i/j8T9tzT4adHiecwORRQ0ZZFcp7ahwXuRU1m+yuO90C5ZUyGeGfocHDI14M3L3yDAQ==",
+            "dev": true
+        },
+        "node_modules/resolve": {
+            "version": "1.22.2",
+            "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.2.tgz",
+            "integrity": "sha512-Sb+mjNHOULsBv818T40qSPeRiuWLyaGMa5ewydRLFimneixmVy2zdivRl+AF6jaYPC8ERxGDmFSiqui6SfPd+g==",
+            "dev": true,
+            "dependencies": {
+                "is-core-module": "^2.11.0",
+                "path-parse": "^1.0.7",
+                "supports-preserve-symlinks-flag": "^1.0.0"
+            },
+            "bin": {
+                "resolve": "bin/resolve"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/ljharb"
+            }
+        },
+        "node_modules/resolve-cwd": {
+            "version": "3.0.0",
+            "resolved": "https://registry.npmjs.org/resolve-cwd/-/resolve-cwd-3.0.0.tgz",
+            "integrity": "sha512-OrZaX2Mb+rJCpH/6CpSqt9xFVpN++x01XnN2ie9g6P5/3xelLAkXWVADpdz1IHD/KFfEXyE6V0U01OQ3UO2rEg==",
+            "dev": true,
+            "dependencies": {
+                "resolve-from": "^5.0.0"
+            },
+            "engines": {
+                "node": ">=8"
+            }
+        },
+        "node_modules/resolve-cwd/node_modules/resolve-from": {
+            "version": "5.0.0",
+            "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-5.0.0.tgz",
+            "integrity": "sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw==",
+            "dev": true,
+            "engines": {
+                "node": ">=8"
+            }
+        },
+        "node_modules/resolve-from": {
+            "version": "4.0.0",
+            "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz",
+            "integrity": "sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==",
+            "dev": true,
+            "engines": {
+                "node": ">=4"
+            }
+        },
+        "node_modules/resolve-url-loader": {
+            "version": "5.0.0",
+            "resolved": "https://registry.npmjs.org/resolve-url-loader/-/resolve-url-loader-5.0.0.tgz",
+            "integrity": "sha512-uZtduh8/8srhBoMx//5bwqjQ+rfYOUq8zC9NrMUGtjBiGTtFJM42s58/36+hTqeqINcnYe08Nj3LkK9lW4N8Xg==",
+            "dev": true,
+            "dependencies": {
+                "adjust-sourcemap-loader": "^4.0.0",
+                "convert-source-map": "^1.7.0",
+                "loader-utils": "^2.0.0",
+                "postcss": "^8.2.14",
+                "source-map": "0.6.1"
+            },
+            "engines": {
+                "node": ">=12"
+            }
+        },
+        "node_modules/retry": {
+            "version": "0.13.1",
+            "resolved": "https://registry.npmjs.org/retry/-/retry-0.13.1.tgz",
+            "integrity": "sha512-XQBQ3I8W1Cge0Seh+6gjj03LbmRFWuoszgK9ooCpwYIrhhoO80pfq4cUkU5DkknwfOfFteRwlZ56PYOGYyFWdg==",
+            "dev": true,
+            "engines": {
+                "node": ">= 4"
+            }
+        },
+        "node_modules/reusify": {
+            "version": "1.0.4",
+            "resolved": "https://registry.npmjs.org/reusify/-/reusify-1.0.4.tgz",
+            "integrity": "sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw==",
+            "dev": true,
+            "engines": {
+                "iojs": ">=1.0.0",
+                "node": ">=0.10.0"
+            }
+        },
+        "node_modules/rimraf": {
+            "version": "3.0.2",
+            "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz",
+            "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==",
+            "dev": true,
+            "dependencies": {
+                "glob": "^7.1.3"
+            },
+            "bin": {
+                "rimraf": "bin.js"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/isaacs"
+            }
+        },
+        "node_modules/ripemd160": {
+            "version": "2.0.2",
+            "resolved": "https://registry.npmjs.org/ripemd160/-/ripemd160-2.0.2.tgz",
+            "integrity": "sha512-ii4iagi25WusVoiC4B4lq7pbXfAp3D9v5CwfkY33vffw2+pkDjY1D8GaN7spsxvCSx8dkPqOZCEZyfxcmJG2IA==",
+            "dev": true,
+            "dependencies": {
+                "hash-base": "^3.0.0",
+                "inherits": "^2.0.1"
+            }
+        },
+        "node_modules/run-parallel": {
+            "version": "1.2.0",
+            "resolved": "https://registry.npmjs.org/run-parallel/-/run-parallel-1.2.0.tgz",
+            "integrity": "sha512-5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA==",
+            "dev": true,
+            "funding": [
+                {
+                    "type": "github",
+                    "url": "https://github.com/sponsors/feross"
+                },
+                {
+                    "type": "patreon",
+                    "url": "https://www.patreon.com/feross"
+                },
+                {
+                    "type": "consulting",
+                    "url": "https://feross.org/support"
+                }
+            ],
+            "dependencies": {
+                "queue-microtask": "^1.2.2"
+            }
+        },
+        "node_modules/safe-buffer": {
+            "version": "5.1.2",
+            "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
+            "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==",
+            "dev": true
+        },
+        "node_modules/safer-buffer": {
+            "version": "2.1.2",
+            "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz",
+            "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==",
+            "dev": true
+        },
+        "node_modules/sass": {
+            "version": "1.69.5",
+            "resolved": "https://registry.npmjs.org/sass/-/sass-1.69.5.tgz",
+            "integrity": "sha512-qg2+UCJibLr2LCVOt3OlPhr/dqVHWOa9XtZf2OjbLs/T4VPSJ00udtgJxH3neXZm+QqX8B+3cU7RaLqp1iVfcQ==",
+            "dev": true,
+            "dependencies": {
+                "chokidar": ">=3.0.0 <4.0.0",
+                "immutable": "^4.0.0",
+                "source-map-js": ">=0.6.2 <2.0.0"
+            },
+            "bin": {
+                "sass": "sass.js"
+            },
+            "engines": {
+                "node": ">=14.0.0"
+            }
+        },
+        "node_modules/sass-loader": {
+            "version": "13.3.2",
+            "resolved": "https://registry.npmjs.org/sass-loader/-/sass-loader-13.3.2.tgz",
+            "integrity": "sha512-CQbKl57kdEv+KDLquhC+gE3pXt74LEAzm+tzywcA0/aHZuub8wTErbjAoNI57rPUWRYRNC5WUnNl8eGJNbDdwg==",
+            "dev": true,
+            "dependencies": {
+                "neo-async": "^2.6.2"
+            },
+            "engines": {
+                "node": ">= 14.15.0"
+            },
+            "funding": {
+                "type": "opencollective",
+                "url": "https://opencollective.com/webpack"
+            },
+            "peerDependencies": {
+                "fibers": ">= 3.1.0",
+                "node-sass": "^4.0.0 || ^5.0.0 || ^6.0.0 || ^7.0.0 || ^8.0.0 || ^9.0.0",
+                "sass": "^1.3.0",
+                "sass-embedded": "*",
+                "webpack": "^5.0.0"
+            },
+            "peerDependenciesMeta": {
+                "fibers": {
+                    "optional": true
+                },
+                "node-sass": {
+                    "optional": true
+                },
+                "sass": {
+                    "optional": true
+                },
+                "sass-embedded": {
+                    "optional": true
+                }
+            }
+        },
+        "node_modules/schema-utils": {
+            "version": "2.7.1",
+            "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-2.7.1.tgz",
+            "integrity": "sha512-SHiNtMOUGWBQJwzISiVYKu82GiV4QYGePp3odlY1tuKO7gPtphAT5R/py0fA6xtbgLL/RvtJZnU9b8s0F1q0Xg==",
+            "dev": true,
+            "dependencies": {
+                "@types/json-schema": "^7.0.5",
+                "ajv": "^6.12.4",
+                "ajv-keywords": "^3.5.2"
+            },
+            "engines": {
+                "node": ">= 8.9.0"
+            },
+            "funding": {
+                "type": "opencollective",
+                "url": "https://opencollective.com/webpack"
+            }
+        },
+        "node_modules/select-hose": {
+            "version": "2.0.0",
+            "resolved": "https://registry.npmjs.org/select-hose/-/select-hose-2.0.0.tgz",
+            "integrity": "sha512-mEugaLK+YfkijB4fx0e6kImuJdCIt2LxCRcbEYPqRGCs4F2ogyfZU5IAZRdjCP8JPq2AtdNoC/Dux63d9Kiryg==",
+            "dev": true
+        },
+        "node_modules/selfsigned": {
+            "version": "2.1.1",
+            "resolved": "https://registry.npmjs.org/selfsigned/-/selfsigned-2.1.1.tgz",
+            "integrity": "sha512-GSL3aowiF7wa/WtSFwnUrludWFoNhftq8bUkH9pkzjpN2XSPOAYEgg6e0sS9s0rZwgJzJiQRPU18A6clnoW5wQ==",
+            "dev": true,
+            "dependencies": {
+                "node-forge": "^1"
+            },
+            "engines": {
+                "node": ">=10"
+            }
+        },
+        "node_modules/semver": {
+            "version": "7.5.4",
+            "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz",
+            "integrity": "sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==",
+            "dev": true,
+            "dependencies": {
+                "lru-cache": "^6.0.0"
+            },
+            "bin": {
+                "semver": "bin/semver.js"
+            },
+            "engines": {
+                "node": ">=10"
+            }
+        },
+        "node_modules/send": {
+            "version": "0.18.0",
+            "resolved": "https://registry.npmjs.org/send/-/send-0.18.0.tgz",
+            "integrity": "sha512-qqWzuOjSFOuqPjFe4NOsMLafToQQwBSOEpS+FwEt3A2V3vKubTquT3vmLTQpFgMXp8AlFWFuP1qKaJZOtPpVXg==",
+            "dev": true,
+            "dependencies": {
+                "debug": "2.6.9",
+                "depd": "2.0.0",
+                "destroy": "1.2.0",
+                "encodeurl": "~1.0.2",
+                "escape-html": "~1.0.3",
+                "etag": "~1.8.1",
+                "fresh": "0.5.2",
+                "http-errors": "2.0.0",
+                "mime": "1.6.0",
+                "ms": "2.1.3",
+                "on-finished": "2.4.1",
+                "range-parser": "~1.2.1",
+                "statuses": "2.0.1"
+            },
+            "engines": {
+                "node": ">= 0.8.0"
+            }
+        },
+        "node_modules/send/node_modules/debug": {
+            "version": "2.6.9",
+            "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+            "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+            "dev": true,
+            "dependencies": {
+                "ms": "2.0.0"
+            }
+        },
+        "node_modules/send/node_modules/debug/node_modules/ms": {
+            "version": "2.0.0",
+            "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+            "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==",
+            "dev": true
+        },
+        "node_modules/send/node_modules/ms": {
+            "version": "2.1.3",
+            "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",
+            "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==",
+            "dev": true
+        },
+        "node_modules/serialize-javascript": {
+            "version": "6.0.1",
+            "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-6.0.1.tgz",
+            "integrity": "sha512-owoXEFjWRllis8/M1Q+Cw5k8ZH40e3zhp/ovX+Xr/vi1qj6QesbyXXViFbpNvWvPNAD62SutwEXavefrLJWj7w==",
+            "dev": true,
+            "dependencies": {
+                "randombytes": "^2.1.0"
+            }
+        },
+        "node_modules/serve-index": {
+            "version": "1.9.1",
+            "resolved": "https://registry.npmjs.org/serve-index/-/serve-index-1.9.1.tgz",
+            "integrity": "sha512-pXHfKNP4qujrtteMrSBb0rc8HJ9Ms/GrXwcUtUtD5s4ewDJI8bT3Cz2zTVRMKtri49pLx2e0Ya8ziP5Ya2pZZw==",
+            "dev": true,
+            "dependencies": {
+                "accepts": "~1.3.4",
+                "batch": "0.6.1",
+                "debug": "2.6.9",
+                "escape-html": "~1.0.3",
+                "http-errors": "~1.6.2",
+                "mime-types": "~2.1.17",
+                "parseurl": "~1.3.2"
+            },
+            "engines": {
+                "node": ">= 0.8.0"
+            }
+        },
+        "node_modules/serve-index/node_modules/debug": {
+            "version": "2.6.9",
+            "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+            "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+            "dev": true,
+            "dependencies": {
+                "ms": "2.0.0"
+            }
+        },
+        "node_modules/serve-index/node_modules/depd": {
+            "version": "1.1.2",
+            "resolved": "https://registry.npmjs.org/depd/-/depd-1.1.2.tgz",
+            "integrity": "sha512-7emPTl6Dpo6JRXOXjLRxck+FlLRX5847cLKEn00PLAgc3g2hTZZgr+e4c2v6QpSmLeFP3n5yUo7ft6avBK/5jQ==",
+            "dev": true,
+            "engines": {
+                "node": ">= 0.6"
+            }
+        },
+        "node_modules/serve-index/node_modules/http-errors": {
+            "version": "1.6.3",
+            "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.6.3.tgz",
+            "integrity": "sha512-lks+lVC8dgGyh97jxvxeYTWQFvh4uw4yC12gVl63Cg30sjPX4wuGcdkICVXDAESr6OJGjqGA8Iz5mkeN6zlD7A==",
+            "dev": true,
+            "dependencies": {
+                "depd": "~1.1.2",
+                "inherits": "2.0.3",
+                "setprototypeof": "1.1.0",
+                "statuses": ">= 1.4.0 < 2"
+            },
+            "engines": {
+                "node": ">= 0.6"
+            }
+        },
+        "node_modules/serve-index/node_modules/inherits": {
+            "version": "2.0.3",
+            "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
+            "integrity": "sha512-x00IRNXNy63jwGkJmzPigoySHbaqpNuzKbBOmzK+g2OdZpQ9w+sxCN+VSB3ja7IAge2OP2qpfxTjeNcyjmW1uw==",
+            "dev": true
+        },
+        "node_modules/serve-index/node_modules/ms": {
+            "version": "2.0.0",
+            "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+            "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==",
+            "dev": true
+        },
+        "node_modules/serve-index/node_modules/setprototypeof": {
+            "version": "1.1.0",
+            "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.1.0.tgz",
+            "integrity": "sha512-BvE/TwpZX4FXExxOxZyRGQQv651MSwmWKZGqvmPcRIjDqWub67kTKuIMx43cZZrS/cBBzwBcNDWoFxt2XEFIpQ==",
+            "dev": true
+        },
+        "node_modules/serve-index/node_modules/statuses": {
+            "version": "1.5.0",
+            "resolved": "https://registry.npmjs.org/statuses/-/statuses-1.5.0.tgz",
+            "integrity": "sha512-OpZ3zP+jT1PI7I8nemJX4AKmAX070ZkYPVWV/AaKTJl+tXCTGyVdC1a4SL8RUQYEwk/f34ZX8UTykN68FwrqAA==",
+            "dev": true,
+            "engines": {
+                "node": ">= 0.6"
+            }
+        },
+        "node_modules/serve-static": {
+            "version": "1.15.0",
+            "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.15.0.tgz",
+            "integrity": "sha512-XGuRDNjXUijsUL0vl6nSD7cwURuzEgglbOaFuZM9g3kwDXOWVTck0jLzjPzGD+TazWbboZYu52/9/XPdUgne9g==",
+            "dev": true,
+            "dependencies": {
+                "encodeurl": "~1.0.2",
+                "escape-html": "~1.0.3",
+                "parseurl": "~1.3.3",
+                "send": "0.18.0"
+            },
+            "engines": {
+                "node": ">= 0.8.0"
+            }
+        },
+        "node_modules/setimmediate": {
+            "version": "1.0.5",
+            "resolved": "https://registry.npmjs.org/setimmediate/-/setimmediate-1.0.5.tgz",
+            "integrity": "sha512-MATJdZp8sLqDl/68LfQmbP8zKPLQNV6BIZoIgrscFDQ+RsvK/BxeDQOgyxKKoh0y/8h3BqVFnCqQ/gd+reiIXA==",
+            "dev": true
+        },
+        "node_modules/setprototypeof": {
+            "version": "1.2.0",
+            "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.2.0.tgz",
+            "integrity": "sha512-E5LDX7Wrp85Kil5bhZv46j8jOeboKq5JMmYM3gVGdGH8xFpPWXUMsNrlODCrkoxMEeNi/XZIwuRvY4XNwYMJpw==",
+            "dev": true
+        },
+        "node_modules/sha.js": {
+            "version": "2.4.11",
+            "resolved": "https://registry.npmjs.org/sha.js/-/sha.js-2.4.11.tgz",
+            "integrity": "sha512-QMEp5B7cftE7APOjk5Y6xgrbWu+WkLVQwk8JNjZ8nKRciZaByEW6MubieAiToS7+dwvrjGhH8jRXz3MVd0AYqQ==",
+            "dev": true,
+            "dependencies": {
+                "inherits": "^2.0.1",
+                "safe-buffer": "^5.0.1"
+            },
+            "bin": {
+                "sha.js": "bin.js"
+            }
+        },
+        "node_modules/shallow-clone": {
+            "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,
+            "dependencies": {
+                "kind-of": "^6.0.2"
+            },
+            "engines": {
+                "node": ">=8"
+            }
+        },
+        "node_modules/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,
+            "dependencies": {
+                "shebang-regex": "^3.0.0"
+            },
+            "engines": {
+                "node": ">=8"
+            }
+        },
+        "node_modules/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,
+            "engines": {
+                "node": ">=8"
+            }
+        },
+        "node_modules/shell-quote": {
+            "version": "1.8.1",
+            "resolved": "https://registry.npmjs.org/shell-quote/-/shell-quote-1.8.1.tgz",
+            "integrity": "sha512-6j1W9l1iAs/4xYBI1SYOVZyFcCis9b4KCLQ8fgAGG07QvzaRLVVRQvAy85yNmmZSjYjg4MWh4gNvlPujU/5LpA==",
+            "dev": true,
+            "funding": {
+                "url": "https://github.com/sponsors/ljharb"
+            }
+        },
+        "node_modules/shellwords": {
+            "version": "0.1.1",
+            "resolved": "https://registry.npmjs.org/shellwords/-/shellwords-0.1.1.tgz",
+            "integrity": "sha512-vFwSUfQvqybiICwZY5+DAWIPLKsWO31Q91JSKl3UYv+K5c2QRPzn0qzec6QPu1Qc9eHYItiP3NdJqNVqetYAww==",
+            "dev": true
+        },
+        "node_modules/side-channel": {
+            "version": "1.0.4",
+            "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.0.4.tgz",
+            "integrity": "sha512-q5XPytqFEIKHkGdiMIrY10mvLRvnQh42/+GoBlFW3b2LXLE2xxJpZFdm94we0BaoV3RwJyGqg5wS7epxTv0Zvw==",
+            "dev": true,
+            "dependencies": {
+                "call-bind": "^1.0.0",
+                "get-intrinsic": "^1.0.2",
+                "object-inspect": "^1.9.0"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/ljharb"
+            }
+        },
+        "node_modules/signal-exit": {
+            "version": "3.0.7",
+            "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.7.tgz",
+            "integrity": "sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==",
+            "dev": true
+        },
+        "node_modules/slash": {
+            "version": "3.0.0",
+            "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz",
+            "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==",
+            "dev": true,
+            "engines": {
+                "node": ">=8"
+            }
+        },
+        "node_modules/sockjs": {
+            "version": "0.3.24",
+            "resolved": "https://registry.npmjs.org/sockjs/-/sockjs-0.3.24.tgz",
+            "integrity": "sha512-GJgLTZ7vYb/JtPSSZ10hsOYIvEYsjbNU+zPdIHcUaWVNUEPivzxku31865sSSud0Da0W4lEeOPlmw93zLQchuQ==",
+            "dev": true,
+            "dependencies": {
+                "faye-websocket": "^0.11.3",
+                "uuid": "^8.3.2",
+                "websocket-driver": "^0.7.4"
+            }
+        },
+        "node_modules/source-list-map": {
+            "version": "2.0.1",
+            "resolved": "https://registry.npmjs.org/source-list-map/-/source-list-map-2.0.1.tgz",
+            "integrity": "sha512-qnQ7gVMxGNxsiL4lEuJwe/To8UnK7fAnmbGEEH8RpLouuKbeEm0lhbQVFIrNSuB+G7tVrAlVsZgETT5nljf+Iw==",
+            "dev": true
+        },
+        "node_modules/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,
+            "engines": {
+                "node": ">=0.10.0"
+            }
+        },
+        "node_modules/source-map-js": {
+            "version": "1.0.2",
+            "resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.0.2.tgz",
+            "integrity": "sha512-R0XvVJ9WusLiqTCEiGCmICCMplcCkIwwR11mOSD9CR5u+IXYdiseeEuXCVAjS54zqwkLcPNnmU4OeJ6tUrWhDw==",
+            "dev": true,
+            "engines": {
+                "node": ">=0.10.0"
+            }
+        },
+        "node_modules/source-map-support": {
+            "version": "0.5.21",
+            "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.21.tgz",
+            "integrity": "sha512-uBHU3L3czsIyYXKX88fdrGovxdSCoTGDRZ6SYXtSRxLZUzHg5P/66Ht6uoUlHu9EZod+inXhKo3qQgwXUT/y1w==",
+            "dev": true,
+            "dependencies": {
+                "buffer-from": "^1.0.0",
+                "source-map": "^0.6.0"
+            }
+        },
+        "node_modules/spdy": {
+            "version": "4.0.2",
+            "resolved": "https://registry.npmjs.org/spdy/-/spdy-4.0.2.tgz",
+            "integrity": "sha512-r46gZQZQV+Kl9oItvl1JZZqJKGr+oEkB08A6BzkiR7593/7IbtuncXHd2YoYeTsG4157ZssMu9KYvUHLcjcDoA==",
+            "dev": true,
+            "dependencies": {
+                "debug": "^4.1.0",
+                "handle-thing": "^2.0.0",
+                "http-deceiver": "^1.2.7",
+                "select-hose": "^2.0.0",
+                "spdy-transport": "^3.0.0"
+            },
+            "engines": {
+                "node": ">=6.0.0"
+            }
+        },
+        "node_modules/spdy-transport": {
+            "version": "3.0.0",
+            "resolved": "https://registry.npmjs.org/spdy-transport/-/spdy-transport-3.0.0.tgz",
+            "integrity": "sha512-hsLVFE5SjA6TCisWeJXFKniGGOpBgMLmerfO2aCyCU5s7nJ/rpAepqmFifv/GCbSbueEeAJJnmSQ2rKC/g8Fcw==",
+            "dev": true,
+            "dependencies": {
+                "debug": "^4.1.0",
+                "detect-node": "^2.0.4",
+                "hpack.js": "^2.1.6",
+                "obuf": "^1.1.2",
+                "readable-stream": "^3.0.6",
+                "wbuf": "^1.7.3"
+            }
+        },
+        "node_modules/stable": {
+            "version": "0.1.8",
+            "resolved": "https://registry.npmjs.org/stable/-/stable-0.1.8.tgz",
+            "integrity": "sha512-ji9qxRnOVfcuLDySj9qzhGSEFVobyt1kIOSkj1qZzYLzq7Tos/oUUWvotUPQLlrsidqsK6tBH89Bc9kL5zHA6w==",
+            "deprecated": "Modern JS already guarantees Array#sort() is a stable sort, so this library is deprecated. See the compatibility table on MDN: https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/sort#browser_compatibility",
+            "dev": true
+        },
+        "node_modules/statuses": {
+            "version": "2.0.1",
+            "resolved": "https://registry.npmjs.org/statuses/-/statuses-2.0.1.tgz",
+            "integrity": "sha512-RwNA9Z/7PrK06rYLIzFMlaF+l73iwpzsqRIFgbMLbTcLD6cOao82TaWefPXQvB2fOC4AjuYSEndS7N/mTCbkdQ==",
+            "dev": true,
+            "engines": {
+                "node": ">= 0.8"
+            }
+        },
+        "node_modules/std-env": {
+            "version": "3.4.3",
+            "resolved": "https://registry.npmjs.org/std-env/-/std-env-3.4.3.tgz",
+            "integrity": "sha512-f9aPhy8fYBuMN+sNfakZV18U39PbalgjXG3lLB9WkaYTxijru61wb57V9wxxNthXM5Sd88ETBWi29qLAsHO52Q==",
+            "dev": true
+        },
+        "node_modules/stream-browserify": {
+            "version": "2.0.2",
+            "resolved": "https://registry.npmjs.org/stream-browserify/-/stream-browserify-2.0.2.tgz",
+            "integrity": "sha512-nX6hmklHs/gr2FuxYDltq8fJA1GDlxKQCz8O/IM4atRqBH8OORmBNgfvW5gG10GT/qQ9u0CzIvr2X5Pkt6ntqg==",
+            "dev": true,
+            "dependencies": {
+                "inherits": "~2.0.1",
+                "readable-stream": "^2.0.2"
+            }
+        },
+        "node_modules/stream-browserify/node_modules/readable-stream": {
+            "version": "2.3.8",
+            "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.8.tgz",
+            "integrity": "sha512-8p0AUk4XODgIewSi0l8Epjs+EVnWiK7NoDIEGU0HhE7+ZyY8D1IMY7odu5lRrFXGg71L15KG8QrPmum45RTtdA==",
+            "dev": true,
+            "dependencies": {
+                "core-util-is": "~1.0.0",
+                "inherits": "~2.0.3",
+                "isarray": "~1.0.0",
+                "process-nextick-args": "~2.0.0",
+                "safe-buffer": "~5.1.1",
+                "string_decoder": "~1.1.1",
+                "util-deprecate": "~1.0.1"
+            }
+        },
+        "node_modules/stream-browserify/node_modules/string_decoder": {
+            "version": "1.1.1",
+            "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
+            "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
+            "dev": true,
+            "dependencies": {
+                "safe-buffer": "~5.1.0"
+            }
+        },
+        "node_modules/stream-http": {
+            "version": "2.8.3",
+            "resolved": "https://registry.npmjs.org/stream-http/-/stream-http-2.8.3.tgz",
+            "integrity": "sha512-+TSkfINHDo4J+ZobQLWiMouQYB+UVYFttRA94FpEzzJ7ZdqcL4uUUQ7WkdkI4DSozGmgBUE/a47L+38PenXhUw==",
+            "dev": true,
+            "dependencies": {
+                "builtin-status-codes": "^3.0.0",
+                "inherits": "^2.0.1",
+                "readable-stream": "^2.3.6",
+                "to-arraybuffer": "^1.0.0",
+                "xtend": "^4.0.0"
+            }
+        },
+        "node_modules/stream-http/node_modules/readable-stream": {
+            "version": "2.3.8",
+            "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.8.tgz",
+            "integrity": "sha512-8p0AUk4XODgIewSi0l8Epjs+EVnWiK7NoDIEGU0HhE7+ZyY8D1IMY7odu5lRrFXGg71L15KG8QrPmum45RTtdA==",
+            "dev": true,
+            "dependencies": {
+                "core-util-is": "~1.0.0",
+                "inherits": "~2.0.3",
+                "isarray": "~1.0.0",
+                "process-nextick-args": "~2.0.0",
+                "safe-buffer": "~5.1.1",
+                "string_decoder": "~1.1.1",
+                "util-deprecate": "~1.0.1"
+            }
+        },
+        "node_modules/stream-http/node_modules/string_decoder": {
+            "version": "1.1.1",
+            "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
+            "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
+            "dev": true,
+            "dependencies": {
+                "safe-buffer": "~5.1.0"
+            }
+        },
+        "node_modules/string_decoder": {
+            "version": "1.2.0",
+            "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.2.0.tgz",
+            "integrity": "sha512-6YqyX6ZWEYguAxgZzHGL7SsCeGx3V2TtOTqZz1xSTSWnqsbWwbptafNyvf/ACquZUXV3DANr5BDIwNYe1mN42w==",
+            "dev": true,
+            "dependencies": {
+                "safe-buffer": "~5.1.0"
+            }
+        },
+        "node_modules/string-width": {
+            "version": "4.2.3",
+            "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
+            "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
+            "dev": true,
+            "dependencies": {
+                "emoji-regex": "^8.0.0",
+                "is-fullwidth-code-point": "^3.0.0",
+                "strip-ansi": "^6.0.1"
+            },
+            "engines": {
+                "node": ">=8"
+            }
+        },
+        "node_modules/strip-ansi": {
+            "version": "6.0.1",
+            "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
+            "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
+            "dev": true,
+            "dependencies": {
+                "ansi-regex": "^5.0.1"
+            },
+            "engines": {
+                "node": ">=8"
+            }
+        },
+        "node_modules/strip-final-newline": {
+            "version": "2.0.0",
+            "resolved": "https://registry.npmjs.org/strip-final-newline/-/strip-final-newline-2.0.0.tgz",
+            "integrity": "sha512-BrpvfNAE3dcvq7ll3xVumzjKjZQ5tI1sEUIKr3Uoks0XUl45St3FlatVqef9prk4jRDzhW6WZg+3bk93y6pLjA==",
+            "dev": true,
+            "engines": {
+                "node": ">=6"
+            }
+        },
+        "node_modules/style-loader": {
+            "version": "2.0.0",
+            "resolved": "https://registry.npmjs.org/style-loader/-/style-loader-2.0.0.tgz",
+            "integrity": "sha512-Z0gYUJmzZ6ZdRUqpg1r8GsaFKypE+3xAzuFeMuoHgjc9KZv3wMyCRjQIWEbhoFSq7+7yoHXySDJyyWQaPajeiQ==",
+            "dev": true,
+            "dependencies": {
+                "loader-utils": "^2.0.0",
+                "schema-utils": "^3.0.0"
+            },
+            "engines": {
+                "node": ">= 10.13.0"
+            },
+            "funding": {
+                "type": "opencollective",
+                "url": "https://opencollective.com/webpack"
+            },
+            "peerDependencies": {
+                "webpack": "^4.0.0 || ^5.0.0"
+            }
+        },
+        "node_modules/style-loader/node_modules/schema-utils": {
+            "version": "3.3.0",
+            "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.3.0.tgz",
+            "integrity": "sha512-pN/yOAvcC+5rQ5nERGuwrjLlYvLTbCibnZ1I7B1LaiAz9BRBlE9GMgE/eqV30P7aJQUf7Ddimy/RsbYO/GrVGg==",
+            "dev": true,
+            "dependencies": {
+                "@types/json-schema": "^7.0.8",
+                "ajv": "^6.12.5",
+                "ajv-keywords": "^3.5.2"
+            },
+            "engines": {
+                "node": ">= 10.13.0"
+            },
+            "funding": {
+                "type": "opencollective",
+                "url": "https://opencollective.com/webpack"
+            }
+        },
+        "node_modules/stylehacks": {
+            "version": "5.1.1",
+            "resolved": "https://registry.npmjs.org/stylehacks/-/stylehacks-5.1.1.tgz",
+            "integrity": "sha512-sBpcd5Hx7G6seo7b1LkpttvTz7ikD0LlH5RmdcBNb6fFR0Fl7LQwHDFr300q4cwUqi+IYrFGmsIHieMBfnN/Bw==",
+            "dev": true,
+            "dependencies": {
+                "browserslist": "^4.21.4",
+                "postcss-selector-parser": "^6.0.4"
+            },
+            "engines": {
+                "node": "^10 || ^12 || >=14.0"
+            },
+            "peerDependencies": {
+                "postcss": "^8.2.15"
+            }
+        },
+        "node_modules/sucrase": {
+            "version": "3.32.0",
+            "resolved": "https://registry.npmjs.org/sucrase/-/sucrase-3.32.0.tgz",
+            "integrity": "sha512-ydQOU34rpSyj2TGyz4D2p8rbktIOZ8QY9s+DGLvFU1i5pWJE8vkpruCjGCMHsdXwnD7JDcS+noSwM/a7zyNFDQ==",
+            "dev": true,
+            "dependencies": {
+                "@jridgewell/gen-mapping": "^0.3.2",
+                "commander": "^4.0.0",
+                "glob": "7.1.6",
+                "lines-and-columns": "^1.1.6",
+                "mz": "^2.7.0",
+                "pirates": "^4.0.1",
+                "ts-interface-checker": "^0.1.9"
+            },
+            "bin": {
+                "sucrase": "bin/sucrase",
+                "sucrase-node": "bin/sucrase-node"
+            },
+            "engines": {
+                "node": ">=8"
+            }
+        },
+        "node_modules/sucrase/node_modules/@jridgewell/gen-mapping": {
+            "version": "0.3.3",
+            "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.3.tgz",
+            "integrity": "sha512-HLhSWOLRi875zjjMG/r+Nv0oCW8umGb0BgEhyX3dDX3egwZtB8PqLnjz3yedt8R5StBrzcg4aBpnh8UA9D1BoQ==",
+            "dev": true,
+            "dependencies": {
+                "@jridgewell/set-array": "^1.0.1",
+                "@jridgewell/sourcemap-codec": "^1.4.10",
+                "@jridgewell/trace-mapping": "^0.3.9"
+            },
+            "engines": {
+                "node": ">=6.0.0"
+            }
+        },
+        "node_modules/sucrase/node_modules/commander": {
+            "version": "4.1.1",
+            "resolved": "https://registry.npmjs.org/commander/-/commander-4.1.1.tgz",
+            "integrity": "sha512-NOKm8xhkzAjzFx8B2v5OAHT+u5pRQc2UCa2Vq9jYL/31o2wi9mxBA7LIFs3sV5VSC49z6pEhfbMULvShKj26WA==",
+            "dev": true,
+            "engines": {
+                "node": ">= 6"
+            }
+        },
+        "node_modules/sucrase/node_modules/glob": {
+            "version": "7.1.6",
+            "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.6.tgz",
+            "integrity": "sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA==",
+            "dev": true,
+            "dependencies": {
+                "fs.realpath": "^1.0.0",
+                "inflight": "^1.0.4",
+                "inherits": "2",
+                "minimatch": "^3.0.4",
+                "once": "^1.3.0",
+                "path-is-absolute": "^1.0.0"
+            },
+            "engines": {
+                "node": "*"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/isaacs"
+            }
+        },
+        "node_modules/supports-color": {
+            "version": "7.2.0",
+            "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+            "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+            "dev": true,
+            "dependencies": {
+                "has-flag": "^4.0.0"
+            },
+            "engines": {
+                "node": ">=8"
+            }
+        },
+        "node_modules/supports-preserve-symlinks-flag": {
+            "version": "1.0.0",
+            "resolved": "https://registry.npmjs.org/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz",
+            "integrity": "sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w==",
+            "dev": true,
+            "engines": {
+                "node": ">= 0.4"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/ljharb"
+            }
+        },
+        "node_modules/svgo": {
+            "version": "2.8.0",
+            "resolved": "https://registry.npmjs.org/svgo/-/svgo-2.8.0.tgz",
+            "integrity": "sha512-+N/Q9kV1+F+UeWYoSiULYo4xYSDQlTgb+ayMobAXPwMnLvop7oxKMo9OzIrX5x3eS4L4f2UHhc9axXwY8DpChg==",
+            "dev": true,
+            "dependencies": {
+                "@trysound/sax": "0.2.0",
+                "commander": "^7.2.0",
+                "css-select": "^4.1.3",
+                "css-tree": "^1.1.3",
+                "csso": "^4.2.0",
+                "picocolors": "^1.0.0",
+                "stable": "^0.1.8"
+            },
+            "bin": {
+                "svgo": "bin/svgo"
+            },
+            "engines": {
+                "node": ">=10.13.0"
+            }
+        },
+        "node_modules/tailwindcss": {
+            "version": "3.3.2",
+            "resolved": "https://registry.npmjs.org/tailwindcss/-/tailwindcss-3.3.2.tgz",
+            "integrity": "sha512-9jPkMiIBXvPc2KywkraqsUfbfj+dHDb+JPWtSJa9MLFdrPyazI7q6WX2sUrm7R9eVR7qqv3Pas7EvQFzxKnI6w==",
+            "dev": true,
+            "dependencies": {
+                "@alloc/quick-lru": "^5.2.0",
+                "arg": "^5.0.2",
+                "chokidar": "^3.5.3",
+                "didyoumean": "^1.2.2",
+                "dlv": "^1.1.3",
+                "fast-glob": "^3.2.12",
+                "glob-parent": "^6.0.2",
+                "is-glob": "^4.0.3",
+                "jiti": "^1.18.2",
+                "lilconfig": "^2.1.0",
+                "micromatch": "^4.0.5",
+                "normalize-path": "^3.0.0",
+                "object-hash": "^3.0.0",
+                "picocolors": "^1.0.0",
+                "postcss": "^8.4.23",
+                "postcss-import": "^15.1.0",
+                "postcss-js": "^4.0.1",
+                "postcss-load-config": "^4.0.1",
+                "postcss-nested": "^6.0.1",
+                "postcss-selector-parser": "^6.0.11",
+                "postcss-value-parser": "^4.2.0",
+                "resolve": "^1.22.2",
+                "sucrase": "^3.32.0"
+            },
+            "bin": {
+                "tailwind": "lib/cli.js",
+                "tailwindcss": "lib/cli.js"
+            },
+            "engines": {
+                "node": ">=14.0.0"
+            }
+        },
+        "node_modules/tailwindcss/node_modules/glob-parent": {
+            "version": "6.0.2",
+            "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-6.0.2.tgz",
+            "integrity": "sha512-XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A==",
+            "dev": true,
+            "dependencies": {
+                "is-glob": "^4.0.3"
+            },
+            "engines": {
+                "node": ">=10.13.0"
+            }
+        },
+        "node_modules/tapable": {
+            "version": "2.2.1",
+            "resolved": "https://registry.npmjs.org/tapable/-/tapable-2.2.1.tgz",
+            "integrity": "sha512-GNzQvQTOIP6RyTfE2Qxb8ZVlNmw0n88vp1szwWRimP02mnTsx3Wtn5qRdqY9w2XduFNUgvOwhNnQsjwCp+kqaQ==",
+            "dev": true,
+            "engines": {
+                "node": ">=6"
+            }
+        },
+        "node_modules/terser": {
+            "version": "5.22.0",
+            "resolved": "https://registry.npmjs.org/terser/-/terser-5.22.0.tgz",
+            "integrity": "sha512-hHZVLgRA2z4NWcN6aS5rQDc+7Dcy58HOf2zbYwmFcQ+ua3h6eEFf5lIDKTzbWwlazPyOZsFQO8V80/IjVNExEw==",
+            "dev": true,
+            "dependencies": {
+                "@jridgewell/source-map": "^0.3.3",
+                "acorn": "^8.8.2",
+                "commander": "^2.20.0",
+                "source-map-support": "~0.5.20"
+            },
+            "bin": {
+                "terser": "bin/terser"
+            },
+            "engines": {
+                "node": ">=10"
+            }
+        },
+        "node_modules/terser-webpack-plugin": {
+            "version": "5.3.9",
+            "resolved": "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-5.3.9.tgz",
+            "integrity": "sha512-ZuXsqE07EcggTWQjXUj+Aot/OMcD0bMKGgF63f7UxYcu5/AJF53aIpK1YoP5xR9l6s/Hy2b+t1AM0bLNPRuhwA==",
+            "dev": true,
+            "dependencies": {
+                "@jridgewell/trace-mapping": "^0.3.17",
+                "jest-worker": "^27.4.5",
+                "schema-utils": "^3.1.1",
+                "serialize-javascript": "^6.0.1",
+                "terser": "^5.16.8"
+            },
+            "engines": {
+                "node": ">= 10.13.0"
+            },
+            "funding": {
+                "type": "opencollective",
+                "url": "https://opencollective.com/webpack"
+            },
+            "peerDependencies": {
+                "webpack": "^5.1.0"
+            },
+            "peerDependenciesMeta": {
+                "@swc/core": {
+                    "optional": true
+                },
+                "esbuild": {
+                    "optional": true
+                },
+                "uglify-js": {
+                    "optional": true
+                }
+            }
+        },
+        "node_modules/terser-webpack-plugin/node_modules/schema-utils": {
+            "version": "3.3.0",
+            "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.3.0.tgz",
+            "integrity": "sha512-pN/yOAvcC+5rQ5nERGuwrjLlYvLTbCibnZ1I7B1LaiAz9BRBlE9GMgE/eqV30P7aJQUf7Ddimy/RsbYO/GrVGg==",
+            "dev": true,
+            "dependencies": {
+                "@types/json-schema": "^7.0.8",
+                "ajv": "^6.12.5",
+                "ajv-keywords": "^3.5.2"
+            },
+            "engines": {
+                "node": ">= 10.13.0"
+            },
+            "funding": {
+                "type": "opencollective",
+                "url": "https://opencollective.com/webpack"
+            }
+        },
+        "node_modules/terser/node_modules/commander": {
+            "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
+        },
+        "node_modules/thenify": {
+            "version": "3.3.1",
+            "resolved": "https://registry.npmjs.org/thenify/-/thenify-3.3.1.tgz",
+            "integrity": "sha512-RVZSIV5IG10Hk3enotrhvz0T9em6cyHBLkH/YAZuKqd8hRkKhSfCGIcP2KUY0EPxndzANBmNllzWPwak+bheSw==",
+            "dev": true,
+            "dependencies": {
+                "any-promise": "^1.0.0"
+            }
+        },
+        "node_modules/thenify-all": {
+            "version": "1.6.0",
+            "resolved": "https://registry.npmjs.org/thenify-all/-/thenify-all-1.6.0.tgz",
+            "integrity": "sha512-RNxQH/qI8/t3thXJDwcstUO4zeqo64+Uy/+sNVRBx4Xn2OX+OZ9oP+iJnNFqplFra2ZUVeKCSa2oVWi3T4uVmA==",
+            "dev": true,
+            "dependencies": {
+                "thenify": ">= 3.1.0 < 4"
+            },
+            "engines": {
+                "node": ">=0.8"
+            }
+        },
+        "node_modules/thunky": {
+            "version": "1.1.0",
+            "resolved": "https://registry.npmjs.org/thunky/-/thunky-1.1.0.tgz",
+            "integrity": "sha512-eHY7nBftgThBqOyHGVN+l8gF0BucP09fMo0oO/Lb0w1OF80dJv+lDVpXG60WMQvkcxAkNybKsrEIE3ZtKGmPrA==",
+            "dev": true
+        },
+        "node_modules/timers-browserify": {
+            "version": "2.0.12",
+            "resolved": "https://registry.npmjs.org/timers-browserify/-/timers-browserify-2.0.12.tgz",
+            "integrity": "sha512-9phl76Cqm6FhSX9Xe1ZUAMLtm1BLkKj2Qd5ApyWkXzsMRaA7dgr81kf4wJmQf/hAvg8EEyJxDo3du/0KlhPiKQ==",
+            "dev": true,
+            "dependencies": {
+                "setimmediate": "^1.0.4"
+            },
+            "engines": {
+                "node": ">=0.6.0"
+            }
+        },
+        "node_modules/to-arraybuffer": {
+            "version": "1.0.1",
+            "resolved": "https://registry.npmjs.org/to-arraybuffer/-/to-arraybuffer-1.0.1.tgz",
+            "integrity": "sha512-okFlQcoGTi4LQBG/PgSYblw9VOyptsz2KJZqc6qtgGdes8VktzUQkj4BI2blit072iS8VODNcMA+tvnS9dnuMA==",
+            "dev": true
+        },
+        "node_modules/to-fast-properties": {
+            "version": "2.0.0",
+            "resolved": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-2.0.0.tgz",
+            "integrity": "sha512-/OaKK0xYrs3DmxRYqL/yDc+FxFUVYhDlXMhRmv3z915w2HF1tnN1omB354j8VUGO/hbRzyD6Y3sA7v7GS/ceog==",
+            "dev": true,
+            "engines": {
+                "node": ">=4"
+            }
+        },
+        "node_modules/to-regex-range": {
+            "version": "5.0.1",
+            "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz",
+            "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==",
+            "dev": true,
+            "dependencies": {
+                "is-number": "^7.0.0"
+            },
+            "engines": {
+                "node": ">=8.0"
+            }
+        },
+        "node_modules/toidentifier": {
+            "version": "1.0.1",
+            "resolved": "https://registry.npmjs.org/toidentifier/-/toidentifier-1.0.1.tgz",
+            "integrity": "sha512-o5sSPKEkg/DIQNmH43V0/uerLrpzVedkUh8tGNvaeXpfpuwjKenlSox/2O/BTlZUtEe+JG7s5YhEz608PlAHRA==",
+            "dev": true,
+            "engines": {
+                "node": ">=0.6"
+            }
+        },
+        "node_modules/ts-interface-checker": {
+            "version": "0.1.13",
+            "resolved": "https://registry.npmjs.org/ts-interface-checker/-/ts-interface-checker-0.1.13.tgz",
+            "integrity": "sha512-Y/arvbn+rrz3JCKl9C4kVNfTfSm2/mEp5FSz5EsZSANGPSlQrpRI5M4PKF+mJnE52jOO90PnPSc3Ur3bTQw0gA==",
+            "dev": true
+        },
+        "node_modules/tslib": {
+            "version": "2.6.2",
+            "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.2.tgz",
+            "integrity": "sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q==",
+            "dev": true
+        },
+        "node_modules/tty-browserify": {
+            "version": "0.0.0",
+            "resolved": "https://registry.npmjs.org/tty-browserify/-/tty-browserify-0.0.0.tgz",
+            "integrity": "sha512-JVa5ijo+j/sOoHGjw0sxw734b1LhBkQ3bvUGNdxnVXDCX81Yx7TFgnZygxrIIWn23hbfTaMYLwRmAxFyDuFmIw==",
+            "dev": true
+        },
+        "node_modules/type-is": {
+            "version": "1.6.18",
+            "resolved": "https://registry.npmjs.org/type-is/-/type-is-1.6.18.tgz",
+            "integrity": "sha512-TkRKr9sUTxEH8MdfuCSP7VizJyzRNMjj2J2do2Jr3Kym598JVdEksuzPQCnlFPW4ky9Q+iA+ma9BGm06XQBy8g==",
+            "dev": true,
+            "dependencies": {
+                "media-typer": "0.3.0",
+                "mime-types": "~2.1.24"
+            },
+            "engines": {
+                "node": ">= 0.6"
+            }
+        },
+        "node_modules/typedarray": {
+            "version": "0.0.6",
+            "resolved": "https://registry.npmjs.org/typedarray/-/typedarray-0.0.6.tgz",
+            "integrity": "sha512-/aCDEGatGvZ2BIk+HmLf4ifCJFwvKFNb9/JeZPMulfgFracn9QFcAf5GO8B/mweUjSoblS5In0cWhqpfs/5PQA==",
+            "dev": true
+        },
+        "node_modules/unicode-canonical-property-names-ecmascript": {
+            "version": "2.0.0",
+            "resolved": "https://registry.npmjs.org/unicode-canonical-property-names-ecmascript/-/unicode-canonical-property-names-ecmascript-2.0.0.tgz",
+            "integrity": "sha512-yY5PpDlfVIU5+y/BSCxAJRBIS1Zc2dDG3Ujq+sR0U+JjUevW2JhocOF+soROYDSaAezOzOKuyyixhD6mBknSmQ==",
+            "dev": true,
+            "engines": {
+                "node": ">=4"
+            }
+        },
+        "node_modules/unicode-match-property-ecmascript": {
+            "version": "2.0.0",
+            "resolved": "https://registry.npmjs.org/unicode-match-property-ecmascript/-/unicode-match-property-ecmascript-2.0.0.tgz",
+            "integrity": "sha512-5kaZCrbp5mmbz5ulBkDkbY0SsPOjKqVS35VpL9ulMPfSl0J0Xsm+9Evphv9CoIZFwre7aJoa94AY6seMKGVN5Q==",
+            "dev": true,
+            "dependencies": {
+                "unicode-canonical-property-names-ecmascript": "^2.0.0",
+                "unicode-property-aliases-ecmascript": "^2.0.0"
+            },
+            "engines": {
+                "node": ">=4"
+            }
+        },
+        "node_modules/unicode-match-property-value-ecmascript": {
+            "version": "2.0.0",
+            "resolved": "https://registry.npmjs.org/unicode-match-property-value-ecmascript/-/unicode-match-property-value-ecmascript-2.0.0.tgz",
+            "integrity": "sha512-7Yhkc0Ye+t4PNYzOGKedDhXbYIBe1XEQYQxOPyhcXNMJ0WCABqqj6ckydd6pWRZTHV4GuCPKdBAUiMc60tsKVw==",
+            "dev": true,
+            "engines": {
+                "node": ">=4"
+            }
+        },
+        "node_modules/unicode-property-aliases-ecmascript": {
+            "version": "2.0.0",
+            "resolved": "https://registry.npmjs.org/unicode-property-aliases-ecmascript/-/unicode-property-aliases-ecmascript-2.0.0.tgz",
+            "integrity": "sha512-5Zfuy9q/DFr4tfO7ZPeVXb1aPoeQSdeFMLpYuFebehDAhbuevLs5yxSZmIFN1tP5F9Wl4IpJrYojg85/zgyZHQ==",
+            "dev": true,
+            "engines": {
+                "node": ">=4"
+            }
+        },
+        "node_modules/universalify": {
+            "version": "2.0.0",
+            "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.0.tgz",
+            "integrity": "sha512-hAZsKq7Yy11Zu1DE0OzWjw7nnLZmJZYTDZZyEFHZdUhV8FkH5MCfoU1XMaxXovpyW5nq5scPqq0ZDP9Zyl04oQ==",
+            "dev": true,
+            "engines": {
+                "node": ">= 10.0.0"
+            }
+        },
+        "node_modules/unpipe": {
+            "version": "1.0.0",
+            "resolved": "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz",
+            "integrity": "sha512-pjy2bYhSsufwWlKwPc+l3cN7+wuJlK6uz0YdJEOlQDbl6jo/YlPi4mb8agUkVC8BF7V8NuzeyPNqRksA3hztKQ==",
+            "dev": true,
+            "engines": {
+                "node": ">= 0.8"
+            }
+        },
+        "node_modules/update-browserslist-db": {
+            "version": "1.0.13",
+            "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.0.13.tgz",
+            "integrity": "sha512-xebP81SNcPuNpPP3uzeW1NYXxI3rxyJzF3pD6sH4jE7o/IX+WtSpwnVU+qIsDPyk0d3hmFQ7mjqc6AtV604hbg==",
+            "dev": true,
+            "funding": [
+                {
+                    "type": "opencollective",
+                    "url": "https://opencollective.com/browserslist"
+                },
+                {
+                    "type": "tidelift",
+                    "url": "https://tidelift.com/funding/github/npm/browserslist"
+                },
+                {
+                    "type": "github",
+                    "url": "https://github.com/sponsors/ai"
+                }
+            ],
+            "dependencies": {
+                "escalade": "^3.1.1",
+                "picocolors": "^1.0.0"
+            },
+            "bin": {
+                "update-browserslist-db": "cli.js"
+            },
+            "peerDependencies": {
+                "browserslist": ">= 4.21.0"
+            }
+        },
+        "node_modules/uri-js": {
+            "version": "4.4.1",
+            "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.4.1.tgz",
+            "integrity": "sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==",
+            "dev": true,
+            "dependencies": {
+                "punycode": "^2.1.0"
+            }
+        },
+        "node_modules/uri-js/node_modules/punycode": {
+            "version": "2.1.1",
+            "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz",
+            "integrity": "sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==",
+            "dev": true,
+            "engines": {
+                "node": ">=6"
+            }
+        },
+        "node_modules/url": {
+            "version": "0.11.3",
+            "resolved": "https://registry.npmjs.org/url/-/url-0.11.3.tgz",
+            "integrity": "sha512-6hxOLGfZASQK/cijlZnZJTq8OXAkt/3YGfQX45vvMYXpZoo8NdWZcY73K108Jf759lS1Bv/8wXnHDTSz17dSRw==",
+            "dev": true,
+            "dependencies": {
+                "punycode": "^1.4.1",
+                "qs": "^6.11.2"
+            }
+        },
+        "node_modules/user-home": {
+            "version": "2.0.0",
+            "resolved": "https://registry.npmjs.org/user-home/-/user-home-2.0.0.tgz",
+            "integrity": "sha512-KMWqdlOcjCYdtIJpicDSFBQ8nFwS2i9sslAd6f4+CBGcU4gist2REnr2fxj2YocvJFxSF3ZOHLYLVZnUxv4BZQ==",
+            "dev": true,
+            "dependencies": {
+                "os-homedir": "^1.0.0"
+            },
+            "engines": {
+                "node": ">=0.10.0"
+            }
+        },
+        "node_modules/util": {
+            "version": "0.11.1",
+            "resolved": "https://registry.npmjs.org/util/-/util-0.11.1.tgz",
+            "integrity": "sha512-HShAsny+zS2TZfaXxD9tYj4HQGlBezXZMZuM/S5PKLLoZkShZiGk9o5CzukI1LVHZvjdvZ2Sj1aW/Ndn2NB/HQ==",
+            "dev": true,
+            "dependencies": {
+                "inherits": "2.0.3"
+            }
+        },
+        "node_modules/util-deprecate": {
+            "version": "1.0.2",
+            "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
+            "integrity": "sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==",
+            "dev": true
+        },
+        "node_modules/util/node_modules/inherits": {
+            "version": "2.0.3",
+            "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
+            "integrity": "sha512-x00IRNXNy63jwGkJmzPigoySHbaqpNuzKbBOmzK+g2OdZpQ9w+sxCN+VSB3ja7IAge2OP2qpfxTjeNcyjmW1uw==",
+            "dev": true
+        },
+        "node_modules/utils-merge": {
+            "version": "1.0.1",
+            "resolved": "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.1.tgz",
+            "integrity": "sha512-pMZTvIkT1d+TFGvDOqodOclx0QWkkgi6Tdoa8gC8ffGAAqz9pzPTZWAybbsHHoED/ztMtkv/VoYTYyShUn81hA==",
+            "dev": true,
+            "engines": {
+                "node": ">= 0.4.0"
+            }
+        },
+        "node_modules/uuid": {
+            "version": "8.3.2",
+            "resolved": "https://registry.npmjs.org/uuid/-/uuid-8.3.2.tgz",
+            "integrity": "sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==",
+            "dev": true,
+            "bin": {
+                "uuid": "dist/bin/uuid"
+            }
+        },
+        "node_modules/vary": {
+            "version": "1.1.2",
+            "resolved": "https://registry.npmjs.org/vary/-/vary-1.1.2.tgz",
+            "integrity": "sha512-BNGbWLfd0eUPabhkXUVm0j8uuvREyTh5ovRa/dyow/BqAbZJyC+5fU+IzQOzmAKzYqYRAISoRhdQr3eIZ/PXqg==",
+            "dev": true,
+            "engines": {
+                "node": ">= 0.8"
+            }
+        },
+        "node_modules/vm-browserify": {
+            "version": "1.1.2",
+            "resolved": "https://registry.npmjs.org/vm-browserify/-/vm-browserify-1.1.2.tgz",
+            "integrity": "sha512-2ham8XPWTONajOR0ohOKOHXkm3+gaBmGut3SRuu75xLd/RRaY6vqgh8NBYYk7+RW3u5AtzPQZG8F10LHkl0lAQ==",
+            "dev": true
+        },
+        "node_modules/vscode-oniguruma": {
+            "version": "1.7.0",
+            "resolved": "https://registry.npmjs.org/vscode-oniguruma/-/vscode-oniguruma-1.7.0.tgz",
+            "integrity": "sha512-L9WMGRfrjOhgHSdOYgCt/yRMsXzLDJSL7BPrOZt73gU0iWO4mpqzqQzOz5srxqTvMBaR0XZTSrVWo4j55Rc6cA==",
+            "dev": true
+        },
+        "node_modules/vscode-textmate": {
+            "version": "7.0.1",
+            "resolved": "https://registry.npmjs.org/vscode-textmate/-/vscode-textmate-7.0.1.tgz",
+            "integrity": "sha512-zQ5U/nuXAAMsh691FtV0wPz89nSkHbs+IQV8FDk+wew9BlSDhf4UmWGlWJfTR2Ti6xZv87Tj5fENzKf6Qk7aLw==",
+            "dev": true
+        },
+        "node_modules/vue": {
+            "version": "3.3.13",
+            "resolved": "https://registry.npmjs.org/vue/-/vue-3.3.13.tgz",
+            "integrity": "sha512-LDnUpQvDgsfc0u/YgtAgTMXJlJQqjkxW1PVcOnJA5cshPleULDjHi7U45pl2VJYazSSvLH8UKcid/kzH8I0a0Q==",
+            "dev": true,
+            "dependencies": {
+                "@vue/compiler-dom": "3.3.13",
+                "@vue/compiler-sfc": "3.3.13",
+                "@vue/runtime-dom": "3.3.13",
+                "@vue/server-renderer": "3.3.13",
+                "@vue/shared": "3.3.13"
+            },
+            "peerDependencies": {
+                "typescript": "*"
+            },
+            "peerDependenciesMeta": {
+                "typescript": {
+                    "optional": true
+                }
+            }
+        },
+        "node_modules/vue-style-loader": {
+            "version": "4.1.3",
+            "resolved": "https://registry.npmjs.org/vue-style-loader/-/vue-style-loader-4.1.3.tgz",
+            "integrity": "sha512-sFuh0xfbtpRlKfm39ss/ikqs9AbKCoXZBpHeVZ8Tx650o0k0q/YCM7FRvigtxpACezfq6af+a7JeqVTWvncqDg==",
+            "dev": true,
+            "dependencies": {
+                "hash-sum": "^1.0.2",
+                "loader-utils": "^1.0.2"
+            }
+        },
+        "node_modules/vue-style-loader/node_modules/json5": {
+            "version": "1.0.2",
+            "resolved": "https://registry.npmjs.org/json5/-/json5-1.0.2.tgz",
+            "integrity": "sha512-g1MWMLBiz8FKi1e4w0UyVL3w+iJceWAFBAaBnnGKOpNa5f8TLktkbre1+s6oICydWAm+HRUGTmI+//xv2hvXYA==",
+            "dev": true,
+            "dependencies": {
+                "minimist": "^1.2.0"
+            },
+            "bin": {
+                "json5": "lib/cli.js"
+            }
+        },
+        "node_modules/vue-style-loader/node_modules/loader-utils": {
+            "version": "1.4.2",
+            "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-1.4.2.tgz",
+            "integrity": "sha512-I5d00Pd/jwMD2QCduo657+YM/6L3KZu++pmX9VFncxaxvHcru9jx1lBaFft+r4Mt2jK0Yhp41XlRAihzPxHNCg==",
+            "dev": true,
+            "dependencies": {
+                "big.js": "^5.2.2",
+                "emojis-list": "^3.0.0",
+                "json5": "^1.0.1"
+            },
+            "engines": {
+                "node": ">=4.0.0"
+            }
+        },
+        "node_modules/watchpack": {
+            "version": "2.4.0",
+            "resolved": "https://registry.npmjs.org/watchpack/-/watchpack-2.4.0.tgz",
+            "integrity": "sha512-Lcvm7MGST/4fup+ifyKi2hjyIAwcdI4HRgtvTpIUxBRhB+RFtUh8XtDOxUfctVCnhVi+QQj49i91OyvzkJl6cg==",
+            "dev": true,
+            "dependencies": {
+                "glob-to-regexp": "^0.4.1",
+                "graceful-fs": "^4.1.2"
+            },
+            "engines": {
+                "node": ">=10.13.0"
+            }
+        },
+        "node_modules/wbuf": {
+            "version": "1.7.3",
+            "resolved": "https://registry.npmjs.org/wbuf/-/wbuf-1.7.3.tgz",
+            "integrity": "sha512-O84QOnr0icsbFGLS0O3bI5FswxzRr8/gHwWkDlQFskhSPryQXvrTMxjxGP4+iWYoauLoBvfDpkrOauZ+0iZpDA==",
+            "dev": true,
+            "dependencies": {
+                "minimalistic-assert": "^1.0.0"
+            }
+        },
+        "node_modules/webpack": {
+            "version": "5.89.0",
+            "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.89.0.tgz",
+            "integrity": "sha512-qyfIC10pOr70V+jkmud8tMfajraGCZMBWJtrmuBymQKCrLTRejBI8STDp1MCyZu/QTdZSeacCQYpYNQVOzX5kw==",
+            "dev": true,
+            "dependencies": {
+                "@types/eslint-scope": "^3.7.3",
+                "@types/estree": "^1.0.0",
+                "@webassemblyjs/ast": "^1.11.5",
+                "@webassemblyjs/wasm-edit": "^1.11.5",
+                "@webassemblyjs/wasm-parser": "^1.11.5",
+                "acorn": "^8.7.1",
+                "acorn-import-assertions": "^1.9.0",
+                "browserslist": "^4.14.5",
+                "chrome-trace-event": "^1.0.2",
+                "enhanced-resolve": "^5.15.0",
+                "es-module-lexer": "^1.2.1",
+                "eslint-scope": "5.1.1",
+                "events": "^3.2.0",
+                "glob-to-regexp": "^0.4.1",
+                "graceful-fs": "^4.2.9",
+                "json-parse-even-better-errors": "^2.3.1",
+                "loader-runner": "^4.2.0",
+                "mime-types": "^2.1.27",
+                "neo-async": "^2.6.2",
+                "schema-utils": "^3.2.0",
+                "tapable": "^2.1.1",
+                "terser-webpack-plugin": "^5.3.7",
+                "watchpack": "^2.4.0",
+                "webpack-sources": "^3.2.3"
+            },
+            "bin": {
+                "webpack": "bin/webpack.js"
+            },
+            "engines": {
+                "node": ">=10.13.0"
+            },
+            "funding": {
+                "type": "opencollective",
+                "url": "https://opencollective.com/webpack"
+            },
+            "peerDependenciesMeta": {
+                "webpack-cli": {
+                    "optional": true
+                }
+            }
+        },
+        "node_modules/webpack-cli": {
+            "version": "4.10.0",
+            "resolved": "https://registry.npmjs.org/webpack-cli/-/webpack-cli-4.10.0.tgz",
+            "integrity": "sha512-NLhDfH/h4O6UOy+0LSso42xvYypClINuMNBVVzX4vX98TmTaTUxwRbXdhucbFMd2qLaCTcLq/PdYrvi8onw90w==",
+            "dev": true,
+            "dependencies": {
+                "@discoveryjs/json-ext": "^0.5.0",
+                "@webpack-cli/configtest": "^1.2.0",
+                "@webpack-cli/info": "^1.5.0",
+                "@webpack-cli/serve": "^1.7.0",
+                "colorette": "^2.0.14",
+                "commander": "^7.0.0",
+                "cross-spawn": "^7.0.3",
+                "fastest-levenshtein": "^1.0.12",
+                "import-local": "^3.0.2",
+                "interpret": "^2.2.0",
+                "rechoir": "^0.7.0",
+                "webpack-merge": "^5.7.3"
+            },
+            "bin": {
+                "webpack-cli": "bin/cli.js"
+            },
+            "engines": {
+                "node": ">=10.13.0"
+            },
+            "funding": {
+                "type": "opencollective",
+                "url": "https://opencollective.com/webpack"
+            },
+            "peerDependencies": {
+                "webpack": "4.x.x || 5.x.x"
+            },
+            "peerDependenciesMeta": {
+                "@webpack-cli/generators": {
+                    "optional": true
+                },
+                "@webpack-cli/migrate": {
+                    "optional": true
+                },
+                "webpack-bundle-analyzer": {
+                    "optional": true
+                },
+                "webpack-dev-server": {
+                    "optional": true
+                }
+            }
+        },
+        "node_modules/webpack-dev-middleware": {
+            "version": "5.3.3",
+            "resolved": "https://registry.npmjs.org/webpack-dev-middleware/-/webpack-dev-middleware-5.3.3.tgz",
+            "integrity": "sha512-hj5CYrY0bZLB+eTO+x/j67Pkrquiy7kWepMHmUMoPsmcUaeEnQJqFzHJOyxgWlq746/wUuA64p9ta34Kyb01pA==",
+            "dev": true,
+            "dependencies": {
+                "colorette": "^2.0.10",
+                "memfs": "^3.4.3",
+                "mime-types": "^2.1.31",
+                "range-parser": "^1.2.1",
+                "schema-utils": "^4.0.0"
+            },
+            "engines": {
+                "node": ">= 12.13.0"
+            },
+            "funding": {
+                "type": "opencollective",
+                "url": "https://opencollective.com/webpack"
+            },
+            "peerDependencies": {
+                "webpack": "^4.0.0 || ^5.0.0"
+            }
+        },
+        "node_modules/webpack-dev-middleware/node_modules/ajv": {
+            "version": "8.12.0",
+            "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.12.0.tgz",
+            "integrity": "sha512-sRu1kpcO9yLtYxBKvqfTeh9KzZEwO3STyX1HT+4CaDzC6HpTGYhIhPIzj9XuKU7KYDwnaeh5hcOwjy1QuJzBPA==",
+            "dev": true,
+            "dependencies": {
+                "fast-deep-equal": "^3.1.1",
+                "json-schema-traverse": "^1.0.0",
+                "require-from-string": "^2.0.2",
+                "uri-js": "^4.2.2"
+            },
+            "funding": {
+                "type": "github",
+                "url": "https://github.com/sponsors/epoberezkin"
+            }
+        },
+        "node_modules/webpack-dev-middleware/node_modules/ajv-keywords": {
+            "version": "5.1.0",
+            "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-5.1.0.tgz",
+            "integrity": "sha512-YCS/JNFAUyr5vAuhk1DWm1CBxRHW9LbJ2ozWeemrIqpbsqKjHVxYPyi5GC0rjZIT5JxJ3virVTS8wk4i/Z+krw==",
+            "dev": true,
+            "dependencies": {
+                "fast-deep-equal": "^3.1.3"
+            },
+            "peerDependencies": {
+                "ajv": "^8.8.2"
+            }
+        },
+        "node_modules/webpack-dev-middleware/node_modules/json-schema-traverse": {
+            "version": "1.0.0",
+            "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz",
+            "integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==",
+            "dev": true
+        },
+        "node_modules/webpack-dev-middleware/node_modules/schema-utils": {
+            "version": "4.2.0",
+            "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-4.2.0.tgz",
+            "integrity": "sha512-L0jRsrPpjdckP3oPug3/VxNKt2trR8TcabrM6FOAAlvC/9Phcmm+cuAgTlxBqdBR1WJx7Naj9WHw+aOmheSVbw==",
+            "dev": true,
+            "dependencies": {
+                "@types/json-schema": "^7.0.9",
+                "ajv": "^8.9.0",
+                "ajv-formats": "^2.1.1",
+                "ajv-keywords": "^5.1.0"
+            },
+            "engines": {
+                "node": ">= 12.13.0"
+            },
+            "funding": {
+                "type": "opencollective",
+                "url": "https://opencollective.com/webpack"
+            }
+        },
+        "node_modules/webpack-dev-server": {
+            "version": "4.15.1",
+            "resolved": "https://registry.npmjs.org/webpack-dev-server/-/webpack-dev-server-4.15.1.tgz",
+            "integrity": "sha512-5hbAst3h3C3L8w6W4P96L5vaV0PxSmJhxZvWKYIdgxOQm8pNZ5dEOmmSLBVpP85ReeyRt6AS1QJNyo/oFFPeVA==",
+            "dev": true,
+            "dependencies": {
+                "@types/bonjour": "^3.5.9",
+                "@types/connect-history-api-fallback": "^1.3.5",
+                "@types/express": "^4.17.13",
+                "@types/serve-index": "^1.9.1",
+                "@types/serve-static": "^1.13.10",
+                "@types/sockjs": "^0.3.33",
+                "@types/ws": "^8.5.5",
+                "ansi-html-community": "^0.0.8",
+                "bonjour-service": "^1.0.11",
+                "chokidar": "^3.5.3",
+                "colorette": "^2.0.10",
+                "compression": "^1.7.4",
+                "connect-history-api-fallback": "^2.0.0",
+                "default-gateway": "^6.0.3",
+                "express": "^4.17.3",
+                "graceful-fs": "^4.2.6",
+                "html-entities": "^2.3.2",
+                "http-proxy-middleware": "^2.0.3",
+                "ipaddr.js": "^2.0.1",
+                "launch-editor": "^2.6.0",
+                "open": "^8.0.9",
+                "p-retry": "^4.5.0",
+                "rimraf": "^3.0.2",
+                "schema-utils": "^4.0.0",
+                "selfsigned": "^2.1.1",
+                "serve-index": "^1.9.1",
+                "sockjs": "^0.3.24",
+                "spdy": "^4.0.2",
+                "webpack-dev-middleware": "^5.3.1",
+                "ws": "^8.13.0"
+            },
+            "bin": {
+                "webpack-dev-server": "bin/webpack-dev-server.js"
+            },
+            "engines": {
+                "node": ">= 12.13.0"
+            },
+            "funding": {
+                "type": "opencollective",
+                "url": "https://opencollective.com/webpack"
+            },
+            "peerDependencies": {
+                "webpack": "^4.37.0 || ^5.0.0"
+            },
+            "peerDependenciesMeta": {
+                "webpack": {
+                    "optional": true
+                },
+                "webpack-cli": {
+                    "optional": true
+                }
+            }
+        },
+        "node_modules/webpack-dev-server/node_modules/ajv": {
+            "version": "8.12.0",
+            "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.12.0.tgz",
+            "integrity": "sha512-sRu1kpcO9yLtYxBKvqfTeh9KzZEwO3STyX1HT+4CaDzC6HpTGYhIhPIzj9XuKU7KYDwnaeh5hcOwjy1QuJzBPA==",
+            "dev": true,
+            "dependencies": {
+                "fast-deep-equal": "^3.1.1",
+                "json-schema-traverse": "^1.0.0",
+                "require-from-string": "^2.0.2",
+                "uri-js": "^4.2.2"
+            },
+            "funding": {
+                "type": "github",
+                "url": "https://github.com/sponsors/epoberezkin"
+            }
+        },
+        "node_modules/webpack-dev-server/node_modules/ajv-keywords": {
+            "version": "5.1.0",
+            "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-5.1.0.tgz",
+            "integrity": "sha512-YCS/JNFAUyr5vAuhk1DWm1CBxRHW9LbJ2ozWeemrIqpbsqKjHVxYPyi5GC0rjZIT5JxJ3virVTS8wk4i/Z+krw==",
+            "dev": true,
+            "dependencies": {
+                "fast-deep-equal": "^3.1.3"
+            },
+            "peerDependencies": {
+                "ajv": "^8.8.2"
+            }
+        },
+        "node_modules/webpack-dev-server/node_modules/json-schema-traverse": {
+            "version": "1.0.0",
+            "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz",
+            "integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==",
+            "dev": true
+        },
+        "node_modules/webpack-dev-server/node_modules/schema-utils": {
+            "version": "4.2.0",
+            "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-4.2.0.tgz",
+            "integrity": "sha512-L0jRsrPpjdckP3oPug3/VxNKt2trR8TcabrM6FOAAlvC/9Phcmm+cuAgTlxBqdBR1WJx7Naj9WHw+aOmheSVbw==",
+            "dev": true,
+            "dependencies": {
+                "@types/json-schema": "^7.0.9",
+                "ajv": "^8.9.0",
+                "ajv-formats": "^2.1.1",
+                "ajv-keywords": "^5.1.0"
+            },
+            "engines": {
+                "node": ">= 12.13.0"
+            },
+            "funding": {
+                "type": "opencollective",
+                "url": "https://opencollective.com/webpack"
+            }
+        },
+        "node_modules/webpack-merge": {
+            "version": "5.10.0",
+            "resolved": "https://registry.npmjs.org/webpack-merge/-/webpack-merge-5.10.0.tgz",
+            "integrity": "sha512-+4zXKdx7UnO+1jaN4l2lHVD+mFvnlZQP/6ljaJVb4SZiwIKeUnrT5l0gkT8z+n4hKpC+jpOv6O9R+gLtag7pSA==",
+            "dev": true,
+            "dependencies": {
+                "clone-deep": "^4.0.1",
+                "flat": "^5.0.2",
+                "wildcard": "^2.0.0"
+            },
+            "engines": {
+                "node": ">=10.0.0"
+            }
+        },
+        "node_modules/webpack-notifier": {
+            "version": "1.15.0",
+            "resolved": "https://registry.npmjs.org/webpack-notifier/-/webpack-notifier-1.15.0.tgz",
+            "integrity": "sha512-N2V8UMgRB5komdXQRavBsRpw0hPhJq2/SWNOGuhrXpIgRhcMexzkGQysUyGStHLV5hkUlgpRiF7IUXoBqyMmzQ==",
+            "dev": true,
+            "dependencies": {
+                "node-notifier": "^9.0.0",
+                "strip-ansi": "^6.0.0"
+            },
+            "peerDependencies": {
+                "@types/webpack": ">4.41.31"
+            },
+            "peerDependenciesMeta": {
+                "@types/webpack": {
+                    "optional": true
+                }
+            }
+        },
+        "node_modules/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,
+            "dependencies": {
+                "source-list-map": "^2.0.0",
+                "source-map": "~0.6.1"
+            }
+        },
+        "node_modules/webpack/node_modules/schema-utils": {
+            "version": "3.3.0",
+            "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.3.0.tgz",
+            "integrity": "sha512-pN/yOAvcC+5rQ5nERGuwrjLlYvLTbCibnZ1I7B1LaiAz9BRBlE9GMgE/eqV30P7aJQUf7Ddimy/RsbYO/GrVGg==",
+            "dev": true,
+            "dependencies": {
+                "@types/json-schema": "^7.0.8",
+                "ajv": "^6.12.5",
+                "ajv-keywords": "^3.5.2"
+            },
+            "engines": {
+                "node": ">= 10.13.0"
+            },
+            "funding": {
+                "type": "opencollective",
+                "url": "https://opencollective.com/webpack"
+            }
+        },
+        "node_modules/webpack/node_modules/webpack-sources": {
+            "version": "3.2.3",
+            "resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-3.2.3.tgz",
+            "integrity": "sha512-/DyMEOrDgLKKIG0fmvtz+4dUX/3Ghozwgm6iPp8KRhvn+eQf9+Q7GWxVNMk3+uCPWfdXYC4ExGBckIXdFEfH1w==",
+            "dev": true,
+            "engines": {
+                "node": ">=10.13.0"
+            }
+        },
+        "node_modules/webpackbar": {
+            "version": "5.0.2",
+            "resolved": "https://registry.npmjs.org/webpackbar/-/webpackbar-5.0.2.tgz",
+            "integrity": "sha512-BmFJo7veBDgQzfWXl/wwYXr/VFus0614qZ8i9znqcl9fnEdiVkdbi0TedLQ6xAK92HZHDJ0QmyQ0fmuZPAgCYQ==",
+            "dev": true,
+            "dependencies": {
+                "chalk": "^4.1.0",
+                "consola": "^2.15.3",
+                "pretty-time": "^1.1.0",
+                "std-env": "^3.0.1"
+            },
+            "engines": {
+                "node": ">=12"
+            },
+            "peerDependencies": {
+                "webpack": "3 || 4 || 5"
+            }
+        },
+        "node_modules/websocket-driver": {
+            "version": "0.7.4",
+            "resolved": "https://registry.npmjs.org/websocket-driver/-/websocket-driver-0.7.4.tgz",
+            "integrity": "sha512-b17KeDIQVjvb0ssuSDF2cYXSg2iztliJ4B9WdsuB6J952qCPKmnVq4DyW5motImXHDC1cBT/1UezrJVsKw5zjg==",
+            "dev": true,
+            "dependencies": {
+                "http-parser-js": ">=0.5.1",
+                "safe-buffer": ">=5.1.0",
+                "websocket-extensions": ">=0.1.1"
+            },
+            "engines": {
+                "node": ">=0.8.0"
+            }
+        },
+        "node_modules/websocket-extensions": {
+            "version": "0.1.4",
+            "resolved": "https://registry.npmjs.org/websocket-extensions/-/websocket-extensions-0.1.4.tgz",
+            "integrity": "sha512-OqedPIGOfsDlo31UNwYbCFMSaO9m9G/0faIHj5/dZFDMFqPTcx6UwqyOy3COEaEOg/9VsGIpdqn62W5KhoKSpg==",
+            "dev": true,
+            "engines": {
+                "node": ">=0.8.0"
+            }
+        },
+        "node_modules/which": {
+            "version": "2.0.2",
+            "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
+            "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==",
+            "dev": true,
+            "dependencies": {
+                "isexe": "^2.0.0"
+            },
+            "bin": {
+                "node-which": "bin/node-which"
+            },
+            "engines": {
+                "node": ">= 8"
+            }
+        },
+        "node_modules/wildcard": {
+            "version": "2.0.1",
+            "resolved": "https://registry.npmjs.org/wildcard/-/wildcard-2.0.1.tgz",
+            "integrity": "sha512-CC1bOL87PIWSBhDcTrdeLo6eGT7mCFtrg0uIJtqJUFyK+eJnzl8A1niH56uu7KMa5XFrtiV+AQuHO3n7DsHnLQ==",
+            "dev": true
+        },
+        "node_modules/wrap-ansi": {
+            "version": "7.0.0",
+            "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz",
+            "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==",
+            "dev": true,
+            "dependencies": {
+                "ansi-styles": "^4.0.0",
+                "string-width": "^4.1.0",
+                "strip-ansi": "^6.0.0"
+            },
+            "engines": {
+                "node": ">=10"
+            },
+            "funding": {
+                "url": "https://github.com/chalk/wrap-ansi?sponsor=1"
+            }
+        },
+        "node_modules/wrappy": {
+            "version": "1.0.2",
+            "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
+            "integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==",
+            "dev": true
+        },
+        "node_modules/ws": {
+            "version": "8.14.2",
+            "resolved": "https://registry.npmjs.org/ws/-/ws-8.14.2.tgz",
+            "integrity": "sha512-wEBG1ftX4jcglPxgFCMJmZ2PLtSbJ2Peg6TmpJFTbe9GZYOQCDPdMYu/Tm0/bGZkw8paZnJY45J4K2PZrLYq8g==",
+            "dev": true,
+            "engines": {
+                "node": ">=10.0.0"
+            },
+            "peerDependencies": {
+                "bufferutil": "^4.0.1",
+                "utf-8-validate": ">=5.0.2"
+            },
+            "peerDependenciesMeta": {
+                "bufferutil": {
+                    "optional": true
+                },
+                "utf-8-validate": {
+                    "optional": true
+                }
+            }
+        },
+        "node_modules/xregexp": {
+            "version": "5.1.1",
+            "resolved": "https://registry.npmjs.org/xregexp/-/xregexp-5.1.1.tgz",
+            "integrity": "sha512-fKXeVorD+CzWvFs7VBuKTYIW63YD1e1osxwQ8caZ6o1jg6pDAbABDG54LCIq0j5cy7PjRvGIq6sef9DYPXpncg==",
+            "dev": true,
+            "dependencies": {
+                "@babel/runtime-corejs3": "^7.16.5"
+            }
+        },
+        "node_modules/xtend": {
+            "version": "4.0.2",
+            "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.2.tgz",
+            "integrity": "sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ==",
+            "dev": true,
+            "engines": {
+                "node": ">=0.4"
+            }
+        },
+        "node_modules/y18n": {
+            "version": "5.0.8",
+            "resolved": "https://registry.npmjs.org/y18n/-/y18n-5.0.8.tgz",
+            "integrity": "sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==",
+            "dev": true,
+            "engines": {
+                "node": ">=10"
+            }
+        },
+        "node_modules/yallist": {
+            "version": "4.0.0",
+            "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
+            "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
+            "dev": true
+        },
+        "node_modules/yaml": {
+            "version": "2.3.1",
+            "resolved": "https://registry.npmjs.org/yaml/-/yaml-2.3.1.tgz",
+            "integrity": "sha512-2eHWfjaoXgTBC2jNM1LRef62VQa0umtvRiDSk6HSzW7RvS5YtkabJrwYLLEKWBc8a5U2PTSCs+dJjUTJdlHsWQ==",
+            "dev": true,
+            "engines": {
+                "node": ">= 14"
+            }
+        },
+        "node_modules/yargs": {
+            "version": "17.5.1",
+            "resolved": "https://registry.npmjs.org/yargs/-/yargs-17.5.1.tgz",
+            "integrity": "sha512-t6YAJcxDkNX7NFYiVtKvWUz8l+PaKTLiL63mJYWR2GnHq2gjEWISzsLp9wg3aY36dY1j+gfIEL3pIF+XlJJfbA==",
+            "dev": true,
+            "dependencies": {
+                "cliui": "^7.0.2",
+                "escalade": "^3.1.1",
+                "get-caller-file": "^2.0.5",
+                "require-directory": "^2.1.1",
+                "string-width": "^4.2.3",
+                "y18n": "^5.0.5",
+                "yargs-parser": "^21.0.0"
+            },
+            "engines": {
+                "node": ">=12"
+            }
+        },
+        "node_modules/yargs-parser": {
+            "version": "21.0.1",
+            "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-21.0.1.tgz",
+            "integrity": "sha512-9BK1jFpLzJROCI5TzwZL/TU4gqjK5xiHV/RfWLOahrjAko/e4DJkRDZQXfvqAsiZzzYhgAzbgz6lg48jcm4GLg==",
+            "dev": true,
+            "engines": {
+                "node": ">=12"
+            }
+        }
+    },
+    "dependencies": {
+        "@alloc/quick-lru": {
+            "version": "5.2.0",
+            "resolved": "https://registry.npmjs.org/@alloc/quick-lru/-/quick-lru-5.2.0.tgz",
+            "integrity": "sha512-UrcABB+4bUrFABwbluTIBErXwvbsU/V7TZWfmbgJfbkwiBuziS9gxdODUyuiecfdGQ85jglMW6juS3+z5TsKLw==",
+            "dev": true
+        },
+        "@ampproject/remapping": {
+            "version": "2.2.0",
+            "resolved": "https://registry.npmjs.org/@ampproject/remapping/-/remapping-2.2.0.tgz",
+            "integrity": "sha512-qRmjj8nj9qmLTQXXmaR1cck3UXSRMPrbsLJAasZpF+t3riI71BXed5ebIOYwQntykeZuhjsdweEc9BxH5Jc26w==",
+            "dev": true,
+            "requires": {
+                "@jridgewell/gen-mapping": "^0.1.0",
+                "@jridgewell/trace-mapping": "^0.3.9"
+            }
+        },
+        "@babel/code-frame": {
+            "version": "7.22.13",
+            "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.22.13.tgz",
+            "integrity": "sha512-XktuhWlJ5g+3TJXc5upd9Ks1HutSArik6jf2eAjYFyIOf4ej3RN+184cZbzDvbPnuTJIUhPKKJE3cIsYTiAT3w==",
+            "dev": true,
+            "requires": {
+                "@babel/highlight": "^7.22.13",
+                "chalk": "^2.4.2"
+            },
+            "dependencies": {
+                "ansi-styles": {
+                    "version": "3.2.1",
+                    "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
+                    "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
+                    "dev": true,
+                    "requires": {
+                        "color-convert": "^1.9.0"
+                    }
+                },
+                "chalk": {
+                    "version": "2.4.2",
+                    "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
+                    "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
+                    "dev": true,
+                    "requires": {
+                        "ansi-styles": "^3.2.1",
+                        "escape-string-regexp": "^1.0.5",
+                        "supports-color": "^5.3.0"
+                    }
+                },
+                "color-convert": {
+                    "version": "1.9.3",
+                    "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
+                    "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
+                    "dev": true,
+                    "requires": {
+                        "color-name": "1.1.3"
+                    }
+                },
+                "color-name": {
+                    "version": "1.1.3",
+                    "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
+                    "integrity": "sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw==",
+                    "dev": true
+                },
+                "has-flag": {
+                    "version": "3.0.0",
+                    "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
+                    "integrity": "sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw==",
+                    "dev": true
+                },
+                "supports-color": {
+                    "version": "5.5.0",
+                    "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
+                    "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
+                    "dev": true,
+                    "requires": {
+                        "has-flag": "^3.0.0"
+                    }
+                }
+            }
+        },
+        "@babel/compat-data": {
+            "version": "7.18.8",
+            "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.18.8.tgz",
+            "integrity": "sha512-HSmX4WZPPK3FUxYp7g2T6EyO8j96HlZJlxmKPSh6KAcqwyDrfx7hKjXpAW/0FhFfTJsR0Yt4lAjLI2coMptIHQ==",
+            "dev": true
+        },
+        "@babel/core": {
+            "version": "7.18.6",
+            "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.18.6.tgz",
+            "integrity": "sha512-cQbWBpxcbbs/IUredIPkHiAGULLV8iwgNRMFzvbhEXISp4f3rUUXE5+TIw6KwUWUR3DwyI6gmBRnmAtYaWehwQ==",
+            "dev": true,
+            "requires": {
+                "@ampproject/remapping": "^2.1.0",
+                "@babel/code-frame": "^7.18.6",
+                "@babel/generator": "^7.18.6",
+                "@babel/helper-compilation-targets": "^7.18.6",
+                "@babel/helper-module-transforms": "^7.18.6",
+                "@babel/helpers": "^7.18.6",
+                "@babel/parser": "^7.18.6",
+                "@babel/template": "^7.18.6",
+                "@babel/traverse": "^7.18.6",
+                "@babel/types": "^7.18.6",
+                "convert-source-map": "^1.7.0",
+                "debug": "^4.1.0",
+                "gensync": "^1.0.0-beta.2",
+                "json5": "^2.2.1",
+                "semver": "^6.3.0"
+            },
+            "dependencies": {
+                "semver": {
+                    "version": "6.3.1",
+                    "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
+                    "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==",
+                    "dev": true
+                }
+            }
+        },
+        "@babel/generator": {
+            "version": "7.23.0",
+            "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.23.0.tgz",
+            "integrity": "sha512-lN85QRR+5IbYrMWM6Y4pE/noaQtg4pNiqeNGX60eqOfo6gtEj6uw/JagelB8vVztSd7R6M5n1+PQkDbHbBRU4g==",
+            "dev": true,
+            "requires": {
+                "@babel/types": "^7.23.0",
+                "@jridgewell/gen-mapping": "^0.3.2",
+                "@jridgewell/trace-mapping": "^0.3.17",
+                "jsesc": "^2.5.1"
+            },
+            "dependencies": {
+                "@jridgewell/gen-mapping": {
+                    "version": "0.3.2",
+                    "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.2.tgz",
+                    "integrity": "sha512-mh65xKQAzI6iBcFzwv28KVWSmCkdRBWoOh+bYQGW3+6OZvbbN3TqMGo5hqYxQniRcH9F2VZIoJCm4pa3BPDK/A==",
+                    "dev": true,
+                    "requires": {
+                        "@jridgewell/set-array": "^1.0.1",
+                        "@jridgewell/sourcemap-codec": "^1.4.10",
+                        "@jridgewell/trace-mapping": "^0.3.9"
+                    }
+                }
+            }
+        },
+        "@babel/helper-annotate-as-pure": {
+            "version": "7.18.6",
+            "resolved": "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.18.6.tgz",
+            "integrity": "sha512-duORpUiYrEpzKIop6iNbjnwKLAKnJ47csTyRACyEmWj0QdUrm5aqNJGHSSEQSUAvNW0ojX0dOmK9dZduvkfeXA==",
+            "dev": true,
+            "requires": {
+                "@babel/types": "^7.18.6"
+            }
+        },
+        "@babel/helper-builder-binary-assignment-operator-visitor": {
+            "version": "7.18.6",
+            "resolved": "https://registry.npmjs.org/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.18.6.tgz",
+            "integrity": "sha512-KT10c1oWEpmrIRYnthbzHgoOf6B+Xd6a5yhdbNtdhtG7aO1or5HViuf1TQR36xY/QprXA5nvxO6nAjhJ4y38jw==",
+            "dev": true,
+            "requires": {
+                "@babel/helper-explode-assignable-expression": "^7.18.6",
+                "@babel/types": "^7.18.6"
+            }
+        },
+        "@babel/helper-compilation-targets": {
+            "version": "7.18.6",
+            "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.18.6.tgz",
+            "integrity": "sha512-vFjbfhNCzqdeAtZflUFrG5YIFqGTqsctrtkZ1D/NB0mDW9TwW3GmmUepYY4G9wCET5rY5ugz4OGTcLd614IzQg==",
+            "dev": true,
+            "requires": {
+                "@babel/compat-data": "^7.18.6",
+                "@babel/helper-validator-option": "^7.18.6",
+                "browserslist": "^4.20.2",
+                "semver": "^6.3.0"
+            },
+            "dependencies": {
+                "semver": {
+                    "version": "6.3.1",
+                    "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
+                    "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==",
+                    "dev": true
+                }
+            }
+        },
+        "@babel/helper-create-class-features-plugin": {
+            "version": "7.18.6",
+            "resolved": "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.18.6.tgz",
+            "integrity": "sha512-YfDzdnoxHGV8CzqHGyCbFvXg5QESPFkXlHtvdCkesLjjVMT2Adxe4FGUR5ChIb3DxSaXO12iIOCWoXdsUVwnqw==",
+            "dev": true,
+            "requires": {
+                "@babel/helper-annotate-as-pure": "^7.18.6",
+                "@babel/helper-environment-visitor": "^7.18.6",
+                "@babel/helper-function-name": "^7.18.6",
+                "@babel/helper-member-expression-to-functions": "^7.18.6",
+                "@babel/helper-optimise-call-expression": "^7.18.6",
+                "@babel/helper-replace-supers": "^7.18.6",
+                "@babel/helper-split-export-declaration": "^7.18.6"
+            }
+        },
+        "@babel/helper-create-regexp-features-plugin": {
+            "version": "7.18.6",
+            "resolved": "https://registry.npmjs.org/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.18.6.tgz",
+            "integrity": "sha512-7LcpH1wnQLGrI+4v+nPp+zUvIkF9x0ddv1Hkdue10tg3gmRnLy97DXh4STiOf1qeIInyD69Qv5kKSZzKD8B/7A==",
+            "dev": true,
+            "requires": {
+                "@babel/helper-annotate-as-pure": "^7.18.6",
+                "regexpu-core": "^5.1.0"
+            }
+        },
+        "@babel/helper-define-polyfill-provider": {
+            "version": "0.3.1",
+            "resolved": "https://registry.npmjs.org/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.3.1.tgz",
+            "integrity": "sha512-J9hGMpJQmtWmj46B3kBHmL38UhJGhYX7eqkcq+2gsstyYt341HmPeWspihX43yVRA0mS+8GGk2Gckc7bY/HCmA==",
+            "dev": true,
+            "requires": {
+                "@babel/helper-compilation-targets": "^7.13.0",
+                "@babel/helper-module-imports": "^7.12.13",
+                "@babel/helper-plugin-utils": "^7.13.0",
+                "@babel/traverse": "^7.13.0",
+                "debug": "^4.1.1",
+                "lodash.debounce": "^4.0.8",
+                "resolve": "^1.14.2",
+                "semver": "^6.1.2"
+            },
+            "dependencies": {
+                "semver": {
+                    "version": "6.3.1",
+                    "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
+                    "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==",
+                    "dev": true
+                }
+            }
+        },
+        "@babel/helper-environment-visitor": {
+            "version": "7.22.20",
+            "resolved": "https://registry.npmjs.org/@babel/helper-environment-visitor/-/helper-environment-visitor-7.22.20.tgz",
+            "integrity": "sha512-zfedSIzFhat/gFhWfHtgWvlec0nqB9YEIVrpuwjruLlXfUSnA8cJB0miHKwqDnQ7d32aKo2xt88/xZptwxbfhA==",
+            "dev": true
+        },
+        "@babel/helper-explode-assignable-expression": {
+            "version": "7.18.6",
+            "resolved": "https://registry.npmjs.org/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.18.6.tgz",
+            "integrity": "sha512-eyAYAsQmB80jNfg4baAtLeWAQHfHFiR483rzFK+BhETlGZaQC9bsfrugfXDCbRHLQbIA7U5NxhhOxN7p/dWIcg==",
+            "dev": true,
+            "requires": {
+                "@babel/types": "^7.18.6"
+            }
+        },
+        "@babel/helper-function-name": {
+            "version": "7.23.0",
+            "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.23.0.tgz",
+            "integrity": "sha512-OErEqsrxjZTJciZ4Oo+eoZqeW9UIiOcuYKRJA4ZAgV9myA+pOXhhmpfNCKjEH/auVfEYVFJ6y1Tc4r0eIApqiw==",
+            "dev": true,
+            "requires": {
+                "@babel/template": "^7.22.15",
+                "@babel/types": "^7.23.0"
+            }
+        },
+        "@babel/helper-hoist-variables": {
+            "version": "7.22.5",
+            "resolved": "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.22.5.tgz",
+            "integrity": "sha512-wGjk9QZVzvknA6yKIUURb8zY3grXCcOZt+/7Wcy8O2uctxhplmUPkOdlgoNhmdVee2c92JXbf1xpMtVNbfoxRw==",
+            "dev": true,
+            "requires": {
+                "@babel/types": "^7.22.5"
+            }
+        },
+        "@babel/helper-member-expression-to-functions": {
+            "version": "7.18.6",
+            "resolved": "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.18.6.tgz",
+            "integrity": "sha512-CeHxqwwipekotzPDUuJOfIMtcIHBuc7WAzLmTYWctVigqS5RktNMQ5bEwQSuGewzYnCtTWa3BARXeiLxDTv+Ng==",
+            "dev": true,
+            "requires": {
+                "@babel/types": "^7.18.6"
+            }
+        },
+        "@babel/helper-module-imports": {
+            "version": "7.18.6",
+            "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.18.6.tgz",
+            "integrity": "sha512-0NFvs3VkuSYbFi1x2Vd6tKrywq+z/cLeYC/RJNFrIX/30Bf5aiGYbtvGXolEktzJH8o5E5KJ3tT+nkxuuZFVlA==",
+            "dev": true,
+            "requires": {
+                "@babel/types": "^7.18.6"
+            }
+        },
+        "@babel/helper-module-transforms": {
+            "version": "7.18.8",
+            "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.18.8.tgz",
+            "integrity": "sha512-che3jvZwIcZxrwh63VfnFTUzcAM9v/lznYkkRxIBGMPt1SudOKHAEec0SIRCfiuIzTcF7VGj/CaTT6gY4eWxvA==",
+            "dev": true,
+            "requires": {
+                "@babel/helper-environment-visitor": "^7.18.6",
+                "@babel/helper-module-imports": "^7.18.6",
+                "@babel/helper-simple-access": "^7.18.6",
+                "@babel/helper-split-export-declaration": "^7.18.6",
+                "@babel/helper-validator-identifier": "^7.18.6",
+                "@babel/template": "^7.18.6",
+                "@babel/traverse": "^7.18.8",
+                "@babel/types": "^7.18.8"
+            }
+        },
+        "@babel/helper-optimise-call-expression": {
+            "version": "7.18.6",
+            "resolved": "https://registry.npmjs.org/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.18.6.tgz",
+            "integrity": "sha512-HP59oD9/fEHQkdcbgFCnbmgH5vIQTJbxh2yf+CdM89/glUNnuzr87Q8GIjGEnOktTROemO0Pe0iPAYbqZuOUiA==",
+            "dev": true,
+            "requires": {
+                "@babel/types": "^7.18.6"
+            }
+        },
+        "@babel/helper-plugin-utils": {
+            "version": "7.18.6",
+            "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.18.6.tgz",
+            "integrity": "sha512-gvZnm1YAAxh13eJdkb9EWHBnF3eAub3XTLCZEehHT2kWxiKVRL64+ae5Y6Ivne0mVHmMYKT+xWgZO+gQhuLUBg==",
+            "dev": true
+        },
+        "@babel/helper-remap-async-to-generator": {
+            "version": "7.18.6",
+            "resolved": "https://registry.npmjs.org/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.18.6.tgz",
+            "integrity": "sha512-z5wbmV55TveUPZlCLZvxWHtrjuJd+8inFhk7DG0WW87/oJuGDcjDiu7HIvGcpf5464L6xKCg3vNkmlVVz9hwyQ==",
+            "dev": true,
+            "requires": {
+                "@babel/helper-annotate-as-pure": "^7.18.6",
+                "@babel/helper-environment-visitor": "^7.18.6",
+                "@babel/helper-wrap-function": "^7.18.6",
+                "@babel/types": "^7.18.6"
+            }
+        },
+        "@babel/helper-replace-supers": {
+            "version": "7.18.6",
+            "resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.18.6.tgz",
+            "integrity": "sha512-fTf7zoXnUGl9gF25fXCWE26t7Tvtyn6H4hkLSYhATwJvw2uYxd3aoXplMSe0g9XbwK7bmxNes7+FGO0rB/xC0g==",
+            "dev": true,
+            "requires": {
+                "@babel/helper-environment-visitor": "^7.18.6",
+                "@babel/helper-member-expression-to-functions": "^7.18.6",
+                "@babel/helper-optimise-call-expression": "^7.18.6",
+                "@babel/traverse": "^7.18.6",
+                "@babel/types": "^7.18.6"
+            }
+        },
+        "@babel/helper-simple-access": {
+            "version": "7.18.6",
+            "resolved": "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.18.6.tgz",
+            "integrity": "sha512-iNpIgTgyAvDQpDj76POqg+YEt8fPxx3yaNBg3S30dxNKm2SWfYhD0TGrK/Eu9wHpUW63VQU894TsTg+GLbUa1g==",
+            "dev": true,
+            "requires": {
+                "@babel/types": "^7.18.6"
+            }
+        },
+        "@babel/helper-skip-transparent-expression-wrappers": {
+            "version": "7.18.6",
+            "resolved": "https://registry.npmjs.org/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.18.6.tgz",
+            "integrity": "sha512-4KoLhwGS9vGethZpAhYnMejWkX64wsnHPDwvOsKWU6Fg4+AlK2Jz3TyjQLMEPvz+1zemi/WBdkYxCD0bAfIkiw==",
+            "dev": true,
+            "requires": {
+                "@babel/types": "^7.18.6"
+            }
+        },
+        "@babel/helper-split-export-declaration": {
+            "version": "7.22.6",
+            "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.22.6.tgz",
+            "integrity": "sha512-AsUnxuLhRYsisFiaJwvp1QF+I3KjD5FOxut14q/GzovUe6orHLesW2C7d754kRm53h5gqrz6sFl6sxc4BVtE/g==",
+            "dev": true,
+            "requires": {
+                "@babel/types": "^7.22.5"
+            }
+        },
+        "@babel/helper-string-parser": {
+            "version": "7.22.5",
+            "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.22.5.tgz",
+            "integrity": "sha512-mM4COjgZox8U+JcXQwPijIZLElkgEpO5rsERVDJTc2qfCDfERyob6k5WegS14SX18IIjv+XD+GrqNumY5JRCDw==",
+            "dev": true
+        },
+        "@babel/helper-validator-identifier": {
+            "version": "7.22.20",
+            "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.22.20.tgz",
+            "integrity": "sha512-Y4OZ+ytlatR8AI+8KZfKuL5urKp7qey08ha31L8b3BwewJAoJamTzyvxPR/5D+KkdJCGPq/+8TukHBlY10FX9A==",
+            "dev": true
+        },
+        "@babel/helper-validator-option": {
+            "version": "7.18.6",
+            "resolved": "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.18.6.tgz",
+            "integrity": "sha512-XO7gESt5ouv/LRJdrVjkShckw6STTaB7l9BrpBaAHDeF5YZT+01PCwmR0SJHnkW6i8OwW/EVWRShfi4j2x+KQw==",
+            "dev": true
+        },
+        "@babel/helper-wrap-function": {
+            "version": "7.18.6",
+            "resolved": "https://registry.npmjs.org/@babel/helper-wrap-function/-/helper-wrap-function-7.18.6.tgz",
+            "integrity": "sha512-I5/LZfozwMNbwr/b1vhhuYD+J/mU+gfGAj5td7l5Rv9WYmH6i3Om69WGKNmlIpsVW/mF6O5bvTKbvDQZVgjqOw==",
+            "dev": true,
+            "requires": {
+                "@babel/helper-function-name": "^7.18.6",
+                "@babel/template": "^7.18.6",
+                "@babel/traverse": "^7.18.6",
+                "@babel/types": "^7.18.6"
+            }
+        },
+        "@babel/helpers": {
+            "version": "7.18.6",
+            "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.18.6.tgz",
+            "integrity": "sha512-vzSiiqbQOghPngUYt/zWGvK3LAsPhz55vc9XNN0xAl2gV4ieShI2OQli5duxWHD+72PZPTKAcfcZDE1Cwc5zsQ==",
+            "dev": true,
+            "requires": {
+                "@babel/template": "^7.18.6",
+                "@babel/traverse": "^7.18.6",
+                "@babel/types": "^7.18.6"
+            }
+        },
+        "@babel/highlight": {
+            "version": "7.22.20",
+            "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.22.20.tgz",
+            "integrity": "sha512-dkdMCN3py0+ksCgYmGG8jKeGA/8Tk+gJwSYYlFGxG5lmhfKNoAy004YpLxpS1W2J8m/EK2Ew+yOs9pVRwO89mg==",
+            "dev": true,
+            "requires": {
+                "@babel/helper-validator-identifier": "^7.22.20",
+                "chalk": "^2.4.2",
+                "js-tokens": "^4.0.0"
+            },
+            "dependencies": {
+                "ansi-styles": {
+                    "version": "3.2.1",
+                    "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
+                    "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
+                    "dev": true,
+                    "requires": {
+                        "color-convert": "^1.9.0"
+                    }
+                },
+                "chalk": {
+                    "version": "2.4.2",
+                    "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
+                    "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
+                    "dev": true,
+                    "requires": {
+                        "ansi-styles": "^3.2.1",
+                        "escape-string-regexp": "^1.0.5",
+                        "supports-color": "^5.3.0"
+                    }
+                },
+                "color-convert": {
+                    "version": "1.9.3",
+                    "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
+                    "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
+                    "dev": true,
+                    "requires": {
+                        "color-name": "1.1.3"
+                    }
+                },
+                "color-name": {
+                    "version": "1.1.3",
+                    "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
+                    "integrity": "sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw==",
+                    "dev": true
+                },
+                "has-flag": {
+                    "version": "3.0.0",
+                    "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
+                    "integrity": "sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw==",
+                    "dev": true
+                },
+                "supports-color": {
+                    "version": "5.5.0",
+                    "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
+                    "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
+                    "dev": true,
+                    "requires": {
+                        "has-flag": "^3.0.0"
+                    }
+                }
+            }
+        },
+        "@babel/parser": {
+            "version": "7.23.5",
+            "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.23.5.tgz",
+            "integrity": "sha512-hOOqoiNXrmGdFbhgCzu6GiURxUgM27Xwd/aPuu8RfHEZPBzL1Z54okAHAQjXfcQNwvrlkAmAp4SlRTZ45vlthQ==",
+            "dev": true
+        },
+        "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression": {
+            "version": "7.18.6",
+            "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression/-/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.18.6.tgz",
+            "integrity": "sha512-Dgxsyg54Fx1d4Nge8UnvTrED63vrwOdPmyvPzlNN/boaliRP54pm3pGzZD1SJUwrBA+Cs/xdG8kXX6Mn/RfISQ==",
+            "dev": true,
+            "requires": {
+                "@babel/helper-plugin-utils": "^7.18.6"
+            }
+        },
+        "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining": {
+            "version": "7.18.6",
+            "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining/-/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.18.6.tgz",
+            "integrity": "sha512-Udgu8ZRgrBrttVz6A0EVL0SJ1z+RLbIeqsu632SA1hf0awEppD6TvdznoH+orIF8wtFFAV/Enmw9Y+9oV8TQcw==",
+            "dev": true,
+            "requires": {
+                "@babel/helper-plugin-utils": "^7.18.6",
+                "@babel/helper-skip-transparent-expression-wrappers": "^7.18.6",
+                "@babel/plugin-proposal-optional-chaining": "^7.18.6"
+            }
+        },
+        "@babel/plugin-proposal-async-generator-functions": {
+            "version": "7.18.6",
+            "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.18.6.tgz",
+            "integrity": "sha512-WAz4R9bvozx4qwf74M+sfqPMKfSqwM0phxPTR6iJIi8robgzXwkEgmeJG1gEKhm6sDqT/U9aV3lfcqybIpev8w==",
+            "dev": true,
+            "requires": {
+                "@babel/helper-environment-visitor": "^7.18.6",
+                "@babel/helper-plugin-utils": "^7.18.6",
+                "@babel/helper-remap-async-to-generator": "^7.18.6",
+                "@babel/plugin-syntax-async-generators": "^7.8.4"
+            }
+        },
+        "@babel/plugin-proposal-class-properties": {
+            "version": "7.18.6",
+            "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.18.6.tgz",
+            "integrity": "sha512-cumfXOF0+nzZrrN8Rf0t7M+tF6sZc7vhQwYQck9q1/5w2OExlD+b4v4RpMJFaV1Z7WcDRgO6FqvxqxGlwo+RHQ==",
+            "dev": true,
+            "requires": {
+                "@babel/helper-create-class-features-plugin": "^7.18.6",
+                "@babel/helper-plugin-utils": "^7.18.6"
+            }
+        },
+        "@babel/plugin-proposal-class-static-block": {
+            "version": "7.18.6",
+            "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-class-static-block/-/plugin-proposal-class-static-block-7.18.6.tgz",
+            "integrity": "sha512-+I3oIiNxrCpup3Gi8n5IGMwj0gOCAjcJUSQEcotNnCCPMEnixawOQ+KeJPlgfjzx+FKQ1QSyZOWe7wmoJp7vhw==",
+            "dev": true,
+            "requires": {
+                "@babel/helper-create-class-features-plugin": "^7.18.6",
+                "@babel/helper-plugin-utils": "^7.18.6",
+                "@babel/plugin-syntax-class-static-block": "^7.14.5"
+            }
+        },
+        "@babel/plugin-proposal-dynamic-import": {
+            "version": "7.18.6",
+            "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-dynamic-import/-/plugin-proposal-dynamic-import-7.18.6.tgz",
+            "integrity": "sha512-1auuwmK+Rz13SJj36R+jqFPMJWyKEDd7lLSdOj4oJK0UTgGueSAtkrCvz9ewmgyU/P941Rv2fQwZJN8s6QruXw==",
+            "dev": true,
+            "requires": {
+                "@babel/helper-plugin-utils": "^7.18.6",
+                "@babel/plugin-syntax-dynamic-import": "^7.8.3"
+            }
+        },
+        "@babel/plugin-proposal-export-namespace-from": {
+            "version": "7.18.6",
+            "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-export-namespace-from/-/plugin-proposal-export-namespace-from-7.18.6.tgz",
+            "integrity": "sha512-zr/QcUlUo7GPo6+X1wC98NJADqmy5QTFWWhqeQWiki4XHafJtLl/YMGkmRB2szDD2IYJCCdBTd4ElwhId9T7Xw==",
+            "dev": true,
+            "requires": {
+                "@babel/helper-plugin-utils": "^7.18.6",
+                "@babel/plugin-syntax-export-namespace-from": "^7.8.3"
+            }
+        },
+        "@babel/plugin-proposal-json-strings": {
+            "version": "7.18.6",
+            "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.18.6.tgz",
+            "integrity": "sha512-lr1peyn9kOdbYc0xr0OdHTZ5FMqS6Di+H0Fz2I/JwMzGmzJETNeOFq2pBySw6X/KFL5EWDjlJuMsUGRFb8fQgQ==",
+            "dev": true,
+            "requires": {
+                "@babel/helper-plugin-utils": "^7.18.6",
+                "@babel/plugin-syntax-json-strings": "^7.8.3"
+            }
+        },
+        "@babel/plugin-proposal-logical-assignment-operators": {
+            "version": "7.18.6",
+            "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-logical-assignment-operators/-/plugin-proposal-logical-assignment-operators-7.18.6.tgz",
+            "integrity": "sha512-zMo66azZth/0tVd7gmkxOkOjs2rpHyhpcFo565PUP37hSp6hSd9uUKIfTDFMz58BwqgQKhJ9YxtM5XddjXVn+Q==",
+            "dev": true,
+            "requires": {
+                "@babel/helper-plugin-utils": "^7.18.6",
+                "@babel/plugin-syntax-logical-assignment-operators": "^7.10.4"
+            }
+        },
+        "@babel/plugin-proposal-nullish-coalescing-operator": {
+            "version": "7.18.6",
+            "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-nullish-coalescing-operator/-/plugin-proposal-nullish-coalescing-operator-7.18.6.tgz",
+            "integrity": "sha512-wQxQzxYeJqHcfppzBDnm1yAY0jSRkUXR2z8RePZYrKwMKgMlE8+Z6LUno+bd6LvbGh8Gltvy74+9pIYkr+XkKA==",
+            "dev": true,
+            "requires": {
+                "@babel/helper-plugin-utils": "^7.18.6",
+                "@babel/plugin-syntax-nullish-coalescing-operator": "^7.8.3"
+            }
+        },
+        "@babel/plugin-proposal-numeric-separator": {
+            "version": "7.18.6",
+            "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-numeric-separator/-/plugin-proposal-numeric-separator-7.18.6.tgz",
+            "integrity": "sha512-ozlZFogPqoLm8WBr5Z8UckIoE4YQ5KESVcNudyXOR8uqIkliTEgJ3RoketfG6pmzLdeZF0H/wjE9/cCEitBl7Q==",
+            "dev": true,
+            "requires": {
+                "@babel/helper-plugin-utils": "^7.18.6",
+                "@babel/plugin-syntax-numeric-separator": "^7.10.4"
+            }
+        },
+        "@babel/plugin-proposal-object-rest-spread": {
+            "version": "7.18.6",
+            "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.18.6.tgz",
+            "integrity": "sha512-9yuM6wr4rIsKa1wlUAbZEazkCrgw2sMPEXCr4Rnwetu7cEW1NydkCWytLuYletbf8vFxdJxFhwEZqMpOx2eZyw==",
+            "dev": true,
+            "requires": {
+                "@babel/compat-data": "^7.18.6",
+                "@babel/helper-compilation-targets": "^7.18.6",
+                "@babel/helper-plugin-utils": "^7.18.6",
+                "@babel/plugin-syntax-object-rest-spread": "^7.8.3",
+                "@babel/plugin-transform-parameters": "^7.18.6"
+            }
+        },
+        "@babel/plugin-proposal-optional-catch-binding": {
+            "version": "7.18.6",
+            "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-optional-catch-binding/-/plugin-proposal-optional-catch-binding-7.18.6.tgz",
+            "integrity": "sha512-Q40HEhs9DJQyaZfUjjn6vE8Cv4GmMHCYuMGIWUnlxH6400VGxOuwWsPt4FxXxJkC/5eOzgn0z21M9gMT4MOhbw==",
+            "dev": true,
+            "requires": {
+                "@babel/helper-plugin-utils": "^7.18.6",
+                "@babel/plugin-syntax-optional-catch-binding": "^7.8.3"
+            }
+        },
+        "@babel/plugin-proposal-optional-chaining": {
+            "version": "7.18.6",
+            "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.18.6.tgz",
+            "integrity": "sha512-PatI6elL5eMzoypFAiYDpYQyMtXTn+iMhuxxQt5mAXD4fEmKorpSI3PHd+i3JXBJN3xyA6MvJv7at23HffFHwA==",
+            "dev": true,
+            "requires": {
+                "@babel/helper-plugin-utils": "^7.18.6",
+                "@babel/helper-skip-transparent-expression-wrappers": "^7.18.6",
+                "@babel/plugin-syntax-optional-chaining": "^7.8.3"
+            }
+        },
+        "@babel/plugin-proposal-private-methods": {
+            "version": "7.18.6",
+            "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-private-methods/-/plugin-proposal-private-methods-7.18.6.tgz",
+            "integrity": "sha512-nutsvktDItsNn4rpGItSNV2sz1XwS+nfU0Rg8aCx3W3NOKVzdMjJRu0O5OkgDp3ZGICSTbgRpxZoWsxoKRvbeA==",
+            "dev": true,
+            "requires": {
+                "@babel/helper-create-class-features-plugin": "^7.18.6",
+                "@babel/helper-plugin-utils": "^7.18.6"
+            }
+        },
+        "@babel/plugin-proposal-private-property-in-object": {
+            "version": "7.18.6",
+            "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-private-property-in-object/-/plugin-proposal-private-property-in-object-7.18.6.tgz",
+            "integrity": "sha512-9Rysx7FOctvT5ouj5JODjAFAkgGoudQuLPamZb0v1TGLpapdNaftzifU8NTWQm0IRjqoYypdrSmyWgkocDQ8Dw==",
+            "dev": true,
+            "requires": {
+                "@babel/helper-annotate-as-pure": "^7.18.6",
+                "@babel/helper-create-class-features-plugin": "^7.18.6",
+                "@babel/helper-plugin-utils": "^7.18.6",
+                "@babel/plugin-syntax-private-property-in-object": "^7.14.5"
+            }
+        },
+        "@babel/plugin-proposal-unicode-property-regex": {
+            "version": "7.18.6",
+            "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.18.6.tgz",
+            "integrity": "sha512-2BShG/d5yoZyXZfVePH91urL5wTG6ASZU9M4o03lKK8u8UW1y08OMttBSOADTcJrnPMpvDXRG3G8fyLh4ovs8w==",
+            "dev": true,
+            "requires": {
+                "@babel/helper-create-regexp-features-plugin": "^7.18.6",
+                "@babel/helper-plugin-utils": "^7.18.6"
+            }
+        },
+        "@babel/plugin-syntax-async-generators": {
+            "version": "7.8.4",
+            "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-async-generators/-/plugin-syntax-async-generators-7.8.4.tgz",
+            "integrity": "sha512-tycmZxkGfZaxhMRbXlPXuVFpdWlXpir2W4AMhSJgRKzk/eDlIXOhb2LHWoLpDF7TEHylV5zNhykX6KAgHJmTNw==",
+            "dev": true,
+            "requires": {
+                "@babel/helper-plugin-utils": "^7.8.0"
+            }
+        },
+        "@babel/plugin-syntax-class-properties": {
+            "version": "7.12.13",
+            "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-class-properties/-/plugin-syntax-class-properties-7.12.13.tgz",
+            "integrity": "sha512-fm4idjKla0YahUNgFNLCB0qySdsoPiZP3iQE3rky0mBUtMZ23yDJ9SJdg6dXTSDnulOVqiF3Hgr9nbXvXTQZYA==",
+            "dev": true,
+            "requires": {
+                "@babel/helper-plugin-utils": "^7.12.13"
+            }
+        },
+        "@babel/plugin-syntax-class-static-block": {
+            "version": "7.14.5",
+            "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-class-static-block/-/plugin-syntax-class-static-block-7.14.5.tgz",
+            "integrity": "sha512-b+YyPmr6ldyNnM6sqYeMWE+bgJcJpO6yS4QD7ymxgH34GBPNDM/THBh8iunyvKIZztiwLH4CJZ0RxTk9emgpjw==",
+            "dev": true,
+            "requires": {
+                "@babel/helper-plugin-utils": "^7.14.5"
+            }
+        },
+        "@babel/plugin-syntax-dynamic-import": {
+            "version": "7.8.3",
+            "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-dynamic-import/-/plugin-syntax-dynamic-import-7.8.3.tgz",
+            "integrity": "sha512-5gdGbFon+PszYzqs83S3E5mpi7/y/8M9eC90MRTZfduQOYW76ig6SOSPNe41IG5LoP3FGBn2N0RjVDSQiS94kQ==",
+            "dev": true,
+            "requires": {
+                "@babel/helper-plugin-utils": "^7.8.0"
+            }
+        },
+        "@babel/plugin-syntax-export-namespace-from": {
+            "version": "7.8.3",
+            "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-export-namespace-from/-/plugin-syntax-export-namespace-from-7.8.3.tgz",
+            "integrity": "sha512-MXf5laXo6c1IbEbegDmzGPwGNTsHZmEy6QGznu5Sh2UCWvueywb2ee+CCE4zQiZstxU9BMoQO9i6zUFSY0Kj0Q==",
+            "dev": true,
+            "requires": {
+                "@babel/helper-plugin-utils": "^7.8.3"
+            }
+        },
+        "@babel/plugin-syntax-import-assertions": {
+            "version": "7.18.6",
+            "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-import-assertions/-/plugin-syntax-import-assertions-7.18.6.tgz",
+            "integrity": "sha512-/DU3RXad9+bZwrgWJQKbr39gYbJpLJHezqEzRzi/BHRlJ9zsQb4CK2CA/5apllXNomwA1qHwzvHl+AdEmC5krQ==",
+            "dev": true,
+            "requires": {
+                "@babel/helper-plugin-utils": "^7.18.6"
+            }
+        },
+        "@babel/plugin-syntax-json-strings": {
+            "version": "7.8.3",
+            "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-json-strings/-/plugin-syntax-json-strings-7.8.3.tgz",
+            "integrity": "sha512-lY6kdGpWHvjoe2vk4WrAapEuBR69EMxZl+RoGRhrFGNYVK8mOPAW8VfbT/ZgrFbXlDNiiaxQnAtgVCZ6jv30EA==",
+            "dev": true,
+            "requires": {
+                "@babel/helper-plugin-utils": "^7.8.0"
+            }
+        },
+        "@babel/plugin-syntax-logical-assignment-operators": {
+            "version": "7.10.4",
+            "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-logical-assignment-operators/-/plugin-syntax-logical-assignment-operators-7.10.4.tgz",
+            "integrity": "sha512-d8waShlpFDinQ5MtvGU9xDAOzKH47+FFoney2baFIoMr952hKOLp1HR7VszoZvOsV/4+RRszNY7D17ba0te0ig==",
+            "dev": true,
+            "requires": {
+                "@babel/helper-plugin-utils": "^7.10.4"
+            }
+        },
+        "@babel/plugin-syntax-nullish-coalescing-operator": {
+            "version": "7.8.3",
+            "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-nullish-coalescing-operator/-/plugin-syntax-nullish-coalescing-operator-7.8.3.tgz",
+            "integrity": "sha512-aSff4zPII1u2QD7y+F8oDsz19ew4IGEJg9SVW+bqwpwtfFleiQDMdzA/R+UlWDzfnHFCxxleFT0PMIrR36XLNQ==",
+            "dev": true,
+            "requires": {
+                "@babel/helper-plugin-utils": "^7.8.0"
+            }
+        },
+        "@babel/plugin-syntax-numeric-separator": {
+            "version": "7.10.4",
+            "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-numeric-separator/-/plugin-syntax-numeric-separator-7.10.4.tgz",
+            "integrity": "sha512-9H6YdfkcK/uOnY/K7/aA2xpzaAgkQn37yzWUMRK7OaPOqOpGS1+n0H5hxT9AUw9EsSjPW8SVyMJwYRtWs3X3ug==",
+            "dev": true,
+            "requires": {
+                "@babel/helper-plugin-utils": "^7.10.4"
+            }
+        },
+        "@babel/plugin-syntax-object-rest-spread": {
+            "version": "7.8.3",
+            "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-object-rest-spread/-/plugin-syntax-object-rest-spread-7.8.3.tgz",
+            "integrity": "sha512-XoqMijGZb9y3y2XskN+P1wUGiVwWZ5JmoDRwx5+3GmEplNyVM2s2Dg8ILFQm8rWM48orGy5YpI5Bl8U1y7ydlA==",
+            "dev": true,
+            "requires": {
+                "@babel/helper-plugin-utils": "^7.8.0"
+            }
+        },
+        "@babel/plugin-syntax-optional-catch-binding": {
+            "version": "7.8.3",
+            "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-optional-catch-binding/-/plugin-syntax-optional-catch-binding-7.8.3.tgz",
+            "integrity": "sha512-6VPD0Pc1lpTqw0aKoeRTMiB+kWhAoT24PA+ksWSBrFtl5SIRVpZlwN3NNPQjehA2E/91FV3RjLWoVTglWcSV3Q==",
+            "dev": true,
+            "requires": {
+                "@babel/helper-plugin-utils": "^7.8.0"
+            }
+        },
+        "@babel/plugin-syntax-optional-chaining": {
+            "version": "7.8.3",
+            "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-optional-chaining/-/plugin-syntax-optional-chaining-7.8.3.tgz",
+            "integrity": "sha512-KoK9ErH1MBlCPxV0VANkXW2/dw4vlbGDrFgz8bmUsBGYkFRcbRwMh6cIJubdPrkxRwuGdtCk0v/wPTKbQgBjkg==",
+            "dev": true,
+            "requires": {
+                "@babel/helper-plugin-utils": "^7.8.0"
+            }
+        },
+        "@babel/plugin-syntax-private-property-in-object": {
+            "version": "7.14.5",
+            "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-private-property-in-object/-/plugin-syntax-private-property-in-object-7.14.5.tgz",
+            "integrity": "sha512-0wVnp9dxJ72ZUJDV27ZfbSj6iHLoytYZmh3rFcxNnvsJF3ktkzLDZPy/mA17HGsaQT3/DQsWYX1f1QGWkCoVUg==",
+            "dev": true,
+            "requires": {
+                "@babel/helper-plugin-utils": "^7.14.5"
+            }
+        },
+        "@babel/plugin-syntax-top-level-await": {
+            "version": "7.14.5",
+            "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-top-level-await/-/plugin-syntax-top-level-await-7.14.5.tgz",
+            "integrity": "sha512-hx++upLv5U1rgYfwe1xBQUhRmU41NEvpUvrp8jkrSCdvGSnM5/qdRMtylJ6PG5OFkBaHkbTAKTnd3/YyESRHFw==",
+            "dev": true,
+            "requires": {
+                "@babel/helper-plugin-utils": "^7.14.5"
+            }
+        },
+        "@babel/plugin-transform-arrow-functions": {
+            "version": "7.18.6",
+            "resolved": "https://registry.npmjs.org/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.18.6.tgz",
+            "integrity": "sha512-9S9X9RUefzrsHZmKMbDXxweEH+YlE8JJEuat9FdvW9Qh1cw7W64jELCtWNkPBPX5En45uy28KGvA/AySqUh8CQ==",
+            "dev": true,
+            "requires": {
+                "@babel/helper-plugin-utils": "^7.18.6"
+            }
+        },
+        "@babel/plugin-transform-async-to-generator": {
+            "version": "7.18.6",
+            "resolved": "https://registry.npmjs.org/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.18.6.tgz",
+            "integrity": "sha512-ARE5wZLKnTgPW7/1ftQmSi1CmkqqHo2DNmtztFhvgtOWSDfq0Cq9/9L+KnZNYSNrydBekhW3rwShduf59RoXag==",
+            "dev": true,
+            "requires": {
+                "@babel/helper-module-imports": "^7.18.6",
+                "@babel/helper-plugin-utils": "^7.18.6",
+                "@babel/helper-remap-async-to-generator": "^7.18.6"
+            }
+        },
+        "@babel/plugin-transform-block-scoped-functions": {
+            "version": "7.18.6",
+            "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.18.6.tgz",
+            "integrity": "sha512-ExUcOqpPWnliRcPqves5HJcJOvHvIIWfuS4sroBUenPuMdmW+SMHDakmtS7qOo13sVppmUijqeTv7qqGsvURpQ==",
+            "dev": true,
+            "requires": {
+                "@babel/helper-plugin-utils": "^7.18.6"
+            }
+        },
+        "@babel/plugin-transform-block-scoping": {
+            "version": "7.18.6",
+            "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.18.6.tgz",
+            "integrity": "sha512-pRqwb91C42vs1ahSAWJkxOxU1RHWDn16XAa6ggQ72wjLlWyYeAcLvTtE0aM8ph3KNydy9CQF2nLYcjq1WysgxQ==",
+            "dev": true,
+            "requires": {
+                "@babel/helper-plugin-utils": "^7.18.6"
+            }
+        },
+        "@babel/plugin-transform-classes": {
+            "version": "7.18.8",
+            "resolved": "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.18.8.tgz",
+            "integrity": "sha512-RySDoXdF6hgHSHuAW4aLGyVQdmvEX/iJtjVre52k0pxRq4hzqze+rAVP++NmNv596brBpYmaiKgTZby7ziBnVg==",
+            "dev": true,
+            "requires": {
+                "@babel/helper-annotate-as-pure": "^7.18.6",
+                "@babel/helper-environment-visitor": "^7.18.6",
+                "@babel/helper-function-name": "^7.18.6",
+                "@babel/helper-optimise-call-expression": "^7.18.6",
+                "@babel/helper-plugin-utils": "^7.18.6",
+                "@babel/helper-replace-supers": "^7.18.6",
+                "@babel/helper-split-export-declaration": "^7.18.6",
+                "globals": "^11.1.0"
+            }
+        },
+        "@babel/plugin-transform-computed-properties": {
+            "version": "7.18.6",
+            "resolved": "https://registry.npmjs.org/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.18.6.tgz",
+            "integrity": "sha512-9repI4BhNrR0KenoR9vm3/cIc1tSBIo+u1WVjKCAynahj25O8zfbiE6JtAtHPGQSs4yZ+bA8mRasRP+qc+2R5A==",
+            "dev": true,
+            "requires": {
+                "@babel/helper-plugin-utils": "^7.18.6"
+            }
+        },
+        "@babel/plugin-transform-destructuring": {
+            "version": "7.18.6",
+            "resolved": "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.18.6.tgz",
+            "integrity": "sha512-tgy3u6lRp17ilY8r1kP4i2+HDUwxlVqq3RTc943eAWSzGgpU1qhiKpqZ5CMyHReIYPHdo3Kg8v8edKtDqSVEyQ==",
+            "dev": true,
+            "requires": {
+                "@babel/helper-plugin-utils": "^7.18.6"
+            }
+        },
+        "@babel/plugin-transform-dotall-regex": {
+            "version": "7.18.6",
+            "resolved": "https://registry.npmjs.org/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.18.6.tgz",
+            "integrity": "sha512-6S3jpun1eEbAxq7TdjLotAsl4WpQI9DxfkycRcKrjhQYzU87qpXdknpBg/e+TdcMehqGnLFi7tnFUBR02Vq6wg==",
+            "dev": true,
+            "requires": {
+                "@babel/helper-create-regexp-features-plugin": "^7.18.6",
+                "@babel/helper-plugin-utils": "^7.18.6"
+            }
+        },
+        "@babel/plugin-transform-duplicate-keys": {
+            "version": "7.18.6",
+            "resolved": "https://registry.npmjs.org/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.18.6.tgz",
+            "integrity": "sha512-NJU26U/208+sxYszf82nmGYqVF9QN8py2HFTblPT9hbawi8+1C5a9JubODLTGFuT0qlkqVinmkwOD13s0sZktg==",
+            "dev": true,
+            "requires": {
+                "@babel/helper-plugin-utils": "^7.18.6"
+            }
+        },
+        "@babel/plugin-transform-exponentiation-operator": {
+            "version": "7.18.6",
+            "resolved": "https://registry.npmjs.org/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.18.6.tgz",
+            "integrity": "sha512-wzEtc0+2c88FVR34aQmiz56dxEkxr2g8DQb/KfaFa1JYXOFVsbhvAonFN6PwVWj++fKmku8NP80plJ5Et4wqHw==",
+            "dev": true,
+            "requires": {
+                "@babel/helper-builder-binary-assignment-operator-visitor": "^7.18.6",
+                "@babel/helper-plugin-utils": "^7.18.6"
+            }
+        },
+        "@babel/plugin-transform-for-of": {
+            "version": "7.18.8",
+            "resolved": "https://registry.npmjs.org/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.18.8.tgz",
+            "integrity": "sha512-yEfTRnjuskWYo0k1mHUqrVWaZwrdq8AYbfrpqULOJOaucGSp4mNMVps+YtA8byoevxS/urwU75vyhQIxcCgiBQ==",
+            "dev": true,
+            "requires": {
+                "@babel/helper-plugin-utils": "^7.18.6"
+            }
+        },
+        "@babel/plugin-transform-function-name": {
+            "version": "7.18.6",
+            "resolved": "https://registry.npmjs.org/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.18.6.tgz",
+            "integrity": "sha512-kJha/Gbs5RjzIu0CxZwf5e3aTTSlhZnHMT8zPWnJMjNpLOUgqevg+PN5oMH68nMCXnfiMo4Bhgxqj59KHTlAnA==",
+            "dev": true,
+            "requires": {
+                "@babel/helper-compilation-targets": "^7.18.6",
+                "@babel/helper-function-name": "^7.18.6",
+                "@babel/helper-plugin-utils": "^7.18.6"
+            }
+        },
+        "@babel/plugin-transform-literals": {
+            "version": "7.18.6",
+            "resolved": "https://registry.npmjs.org/@babel/plugin-transform-literals/-/plugin-transform-literals-7.18.6.tgz",
+            "integrity": "sha512-x3HEw0cJZVDoENXOp20HlypIHfl0zMIhMVZEBVTfmqbObIpsMxMbmU5nOEO8R7LYT+z5RORKPlTI5Hj4OsO9/Q==",
+            "dev": true,
+            "requires": {
+                "@babel/helper-plugin-utils": "^7.18.6"
+            }
+        },
+        "@babel/plugin-transform-member-expression-literals": {
+            "version": "7.18.6",
+            "resolved": "https://registry.npmjs.org/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.18.6.tgz",
+            "integrity": "sha512-qSF1ihLGO3q+/g48k85tUjD033C29TNTVB2paCwZPVmOsjn9pClvYYrM2VeJpBY2bcNkuny0YUyTNRyRxJ54KA==",
+            "dev": true,
+            "requires": {
+                "@babel/helper-plugin-utils": "^7.18.6"
+            }
+        },
+        "@babel/plugin-transform-modules-amd": {
+            "version": "7.18.6",
+            "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.18.6.tgz",
+            "integrity": "sha512-Pra5aXsmTsOnjM3IajS8rTaLCy++nGM4v3YR4esk5PCsyg9z8NA5oQLwxzMUtDBd8F+UmVza3VxoAaWCbzH1rg==",
+            "dev": true,
+            "requires": {
+                "@babel/helper-module-transforms": "^7.18.6",
+                "@babel/helper-plugin-utils": "^7.18.6",
+                "babel-plugin-dynamic-import-node": "^2.3.3"
+            }
+        },
+        "@babel/plugin-transform-modules-commonjs": {
+            "version": "7.18.6",
+            "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.18.6.tgz",
+            "integrity": "sha512-Qfv2ZOWikpvmedXQJDSbxNqy7Xr/j2Y8/KfijM0iJyKkBTmWuvCA1yeH1yDM7NJhBW/2aXxeucLj6i80/LAJ/Q==",
+            "dev": true,
+            "requires": {
+                "@babel/helper-module-transforms": "^7.18.6",
+                "@babel/helper-plugin-utils": "^7.18.6",
+                "@babel/helper-simple-access": "^7.18.6",
+                "babel-plugin-dynamic-import-node": "^2.3.3"
+            }
+        },
+        "@babel/plugin-transform-modules-systemjs": {
+            "version": "7.18.6",
+            "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.18.6.tgz",
+            "integrity": "sha512-UbPYpXxLjTw6w6yXX2BYNxF3p6QY225wcTkfQCy3OMnSlS/C3xGtwUjEzGkldb/sy6PWLiCQ3NbYfjWUTI3t4g==",
+            "dev": true,
+            "requires": {
+                "@babel/helper-hoist-variables": "^7.18.6",
+                "@babel/helper-module-transforms": "^7.18.6",
+                "@babel/helper-plugin-utils": "^7.18.6",
+                "@babel/helper-validator-identifier": "^7.18.6",
+                "babel-plugin-dynamic-import-node": "^2.3.3"
+            }
+        },
+        "@babel/plugin-transform-modules-umd": {
+            "version": "7.18.6",
+            "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.18.6.tgz",
+            "integrity": "sha512-dcegErExVeXcRqNtkRU/z8WlBLnvD4MRnHgNs3MytRO1Mn1sHRyhbcpYbVMGclAqOjdW+9cfkdZno9dFdfKLfQ==",
+            "dev": true,
+            "requires": {
+                "@babel/helper-module-transforms": "^7.18.6",
+                "@babel/helper-plugin-utils": "^7.18.6"
+            }
+        },
+        "@babel/plugin-transform-named-capturing-groups-regex": {
+            "version": "7.18.6",
+            "resolved": "https://registry.npmjs.org/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.18.6.tgz",
+            "integrity": "sha512-UmEOGF8XgaIqD74bC8g7iV3RYj8lMf0Bw7NJzvnS9qQhM4mg+1WHKotUIdjxgD2RGrgFLZZPCFPFj3P/kVDYhg==",
+            "dev": true,
+            "requires": {
+                "@babel/helper-create-regexp-features-plugin": "^7.18.6",
+                "@babel/helper-plugin-utils": "^7.18.6"
+            }
+        },
+        "@babel/plugin-transform-new-target": {
+            "version": "7.18.6",
+            "resolved": "https://registry.npmjs.org/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.18.6.tgz",
+            "integrity": "sha512-DjwFA/9Iu3Z+vrAn+8pBUGcjhxKguSMlsFqeCKbhb9BAV756v0krzVK04CRDi/4aqmk8BsHb4a/gFcaA5joXRw==",
+            "dev": true,
+            "requires": {
+                "@babel/helper-plugin-utils": "^7.18.6"
+            }
+        },
+        "@babel/plugin-transform-object-super": {
+            "version": "7.18.6",
+            "resolved": "https://registry.npmjs.org/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.18.6.tgz",
+            "integrity": "sha512-uvGz6zk+pZoS1aTZrOvrbj6Pp/kK2mp45t2B+bTDre2UgsZZ8EZLSJtUg7m/no0zOJUWgFONpB7Zv9W2tSaFlA==",
+            "dev": true,
+            "requires": {
+                "@babel/helper-plugin-utils": "^7.18.6",
+                "@babel/helper-replace-supers": "^7.18.6"
+            }
+        },
+        "@babel/plugin-transform-parameters": {
+            "version": "7.18.8",
+            "resolved": "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.18.8.tgz",
+            "integrity": "sha512-ivfbE3X2Ss+Fj8nnXvKJS6sjRG4gzwPMsP+taZC+ZzEGjAYlvENixmt1sZ5Ca6tWls+BlKSGKPJ6OOXvXCbkFg==",
+            "dev": true,
+            "requires": {
+                "@babel/helper-plugin-utils": "^7.18.6"
+            }
+        },
+        "@babel/plugin-transform-property-literals": {
+            "version": "7.18.6",
+            "resolved": "https://registry.npmjs.org/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.18.6.tgz",
+            "integrity": "sha512-cYcs6qlgafTud3PAzrrRNbQtfpQ8+y/+M5tKmksS9+M1ckbH6kzY8MrexEM9mcA6JDsukE19iIRvAyYl463sMg==",
+            "dev": true,
+            "requires": {
+                "@babel/helper-plugin-utils": "^7.18.6"
+            }
+        },
+        "@babel/plugin-transform-regenerator": {
+            "version": "7.18.6",
+            "resolved": "https://registry.npmjs.org/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.18.6.tgz",
+            "integrity": "sha512-poqRI2+qiSdeldcz4wTSTXBRryoq3Gc70ye7m7UD5Ww0nE29IXqMl6r7Nd15WBgRd74vloEMlShtH6CKxVzfmQ==",
+            "dev": true,
+            "requires": {
+                "@babel/helper-plugin-utils": "^7.18.6",
+                "regenerator-transform": "^0.15.0"
+            }
+        },
+        "@babel/plugin-transform-reserved-words": {
+            "version": "7.18.6",
+            "resolved": "https://registry.npmjs.org/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.18.6.tgz",
+            "integrity": "sha512-oX/4MyMoypzHjFrT1CdivfKZ+XvIPMFXwwxHp/r0Ddy2Vuomt4HDFGmft1TAY2yiTKiNSsh3kjBAzcM8kSdsjA==",
+            "dev": true,
+            "requires": {
+                "@babel/helper-plugin-utils": "^7.18.6"
+            }
+        },
+        "@babel/plugin-transform-runtime": {
+            "version": "7.18.6",
+            "resolved": "https://registry.npmjs.org/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.18.6.tgz",
+            "integrity": "sha512-8uRHk9ZmRSnWqUgyae249EJZ94b0yAGLBIqzZzl+0iEdbno55Pmlt/32JZsHwXD9k/uZj18Aqqk35wBX4CBTXA==",
+            "dev": true,
+            "requires": {
+                "@babel/helper-module-imports": "^7.18.6",
+                "@babel/helper-plugin-utils": "^7.18.6",
+                "babel-plugin-polyfill-corejs2": "^0.3.1",
+                "babel-plugin-polyfill-corejs3": "^0.5.2",
+                "babel-plugin-polyfill-regenerator": "^0.3.1",
+                "semver": "^6.3.0"
+            },
+            "dependencies": {
+                "semver": {
+                    "version": "6.3.1",
+                    "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
+                    "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==",
+                    "dev": true
+                }
+            }
+        },
+        "@babel/plugin-transform-shorthand-properties": {
+            "version": "7.18.6",
+            "resolved": "https://registry.npmjs.org/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.18.6.tgz",
+            "integrity": "sha512-eCLXXJqv8okzg86ywZJbRn19YJHU4XUa55oz2wbHhaQVn/MM+XhukiT7SYqp/7o00dg52Rj51Ny+Ecw4oyoygw==",
+            "dev": true,
+            "requires": {
+                "@babel/helper-plugin-utils": "^7.18.6"
+            }
+        },
+        "@babel/plugin-transform-spread": {
+            "version": "7.18.6",
+            "resolved": "https://registry.npmjs.org/@babel/plugin-transform-spread/-/plugin-transform-spread-7.18.6.tgz",
+            "integrity": "sha512-ayT53rT/ENF8WWexIRg9AiV9h0aIteyWn5ptfZTZQrjk/+f3WdrJGCY4c9wcgl2+MKkKPhzbYp97FTsquZpDCw==",
+            "dev": true,
+            "requires": {
+                "@babel/helper-plugin-utils": "^7.18.6",
+                "@babel/helper-skip-transparent-expression-wrappers": "^7.18.6"
+            }
+        },
+        "@babel/plugin-transform-sticky-regex": {
+            "version": "7.18.6",
+            "resolved": "https://registry.npmjs.org/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.18.6.tgz",
+            "integrity": "sha512-kfiDrDQ+PBsQDO85yj1icueWMfGfJFKN1KCkndygtu/C9+XUfydLC8Iv5UYJqRwy4zk8EcplRxEOeLyjq1gm6Q==",
+            "dev": true,
+            "requires": {
+                "@babel/helper-plugin-utils": "^7.18.6"
+            }
+        },
+        "@babel/plugin-transform-template-literals": {
+            "version": "7.18.6",
+            "resolved": "https://registry.npmjs.org/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.18.6.tgz",
+            "integrity": "sha512-UuqlRrQmT2SWRvahW46cGSany0uTlcj8NYOS5sRGYi8FxPYPoLd5DDmMd32ZXEj2Jq+06uGVQKHxa/hJx2EzKw==",
+            "dev": true,
+            "requires": {
+                "@babel/helper-plugin-utils": "^7.18.6"
+            }
+        },
+        "@babel/plugin-transform-typeof-symbol": {
+            "version": "7.18.6",
+            "resolved": "https://registry.npmjs.org/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.18.6.tgz",
+            "integrity": "sha512-7m71iS/QhsPk85xSjFPovHPcH3H9qeyzsujhTc+vcdnsXavoWYJ74zx0lP5RhpC5+iDnVLO+PPMHzC11qels1g==",
+            "dev": true,
+            "requires": {
+                "@babel/helper-plugin-utils": "^7.18.6"
+            }
+        },
+        "@babel/plugin-transform-unicode-escapes": {
+            "version": "7.18.6",
+            "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.18.6.tgz",
+            "integrity": "sha512-XNRwQUXYMP7VLuy54cr/KS/WeL3AZeORhrmeZ7iewgu+X2eBqmpaLI/hzqr9ZxCeUoq0ASK4GUzSM0BDhZkLFw==",
+            "dev": true,
+            "requires": {
+                "@babel/helper-plugin-utils": "^7.18.6"
+            }
+        },
+        "@babel/plugin-transform-unicode-regex": {
+            "version": "7.18.6",
+            "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.18.6.tgz",
+            "integrity": "sha512-gE7A6Lt7YLnNOL3Pb9BNeZvi+d8l7tcRrG4+pwJjK9hD2xX4mEvjlQW60G9EEmfXVYRPv9VRQcyegIVHCql/AA==",
+            "dev": true,
+            "requires": {
+                "@babel/helper-create-regexp-features-plugin": "^7.18.6",
+                "@babel/helper-plugin-utils": "^7.18.6"
+            }
+        },
+        "@babel/preset-env": {
+            "version": "7.18.6",
+            "resolved": "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.18.6.tgz",
+            "integrity": "sha512-WrthhuIIYKrEFAwttYzgRNQ5hULGmwTj+D6l7Zdfsv5M7IWV/OZbUfbeL++Qrzx1nVJwWROIFhCHRYQV4xbPNw==",
+            "dev": true,
+            "requires": {
+                "@babel/compat-data": "^7.18.6",
+                "@babel/helper-compilation-targets": "^7.18.6",
+                "@babel/helper-plugin-utils": "^7.18.6",
+                "@babel/helper-validator-option": "^7.18.6",
+                "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression": "^7.18.6",
+                "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining": "^7.18.6",
+                "@babel/plugin-proposal-async-generator-functions": "^7.18.6",
+                "@babel/plugin-proposal-class-properties": "^7.18.6",
+                "@babel/plugin-proposal-class-static-block": "^7.18.6",
+                "@babel/plugin-proposal-dynamic-import": "^7.18.6",
+                "@babel/plugin-proposal-export-namespace-from": "^7.18.6",
+                "@babel/plugin-proposal-json-strings": "^7.18.6",
+                "@babel/plugin-proposal-logical-assignment-operators": "^7.18.6",
+                "@babel/plugin-proposal-nullish-coalescing-operator": "^7.18.6",
+                "@babel/plugin-proposal-numeric-separator": "^7.18.6",
+                "@babel/plugin-proposal-object-rest-spread": "^7.18.6",
+                "@babel/plugin-proposal-optional-catch-binding": "^7.18.6",
+                "@babel/plugin-proposal-optional-chaining": "^7.18.6",
+                "@babel/plugin-proposal-private-methods": "^7.18.6",
+                "@babel/plugin-proposal-private-property-in-object": "^7.18.6",
+                "@babel/plugin-proposal-unicode-property-regex": "^7.18.6",
+                "@babel/plugin-syntax-async-generators": "^7.8.4",
+                "@babel/plugin-syntax-class-properties": "^7.12.13",
+                "@babel/plugin-syntax-class-static-block": "^7.14.5",
+                "@babel/plugin-syntax-dynamic-import": "^7.8.3",
+                "@babel/plugin-syntax-export-namespace-from": "^7.8.3",
+                "@babel/plugin-syntax-import-assertions": "^7.18.6",
+                "@babel/plugin-syntax-json-strings": "^7.8.3",
+                "@babel/plugin-syntax-logical-assignment-operators": "^7.10.4",
+                "@babel/plugin-syntax-nullish-coalescing-operator": "^7.8.3",
+                "@babel/plugin-syntax-numeric-separator": "^7.10.4",
+                "@babel/plugin-syntax-object-rest-spread": "^7.8.3",
+                "@babel/plugin-syntax-optional-catch-binding": "^7.8.3",
+                "@babel/plugin-syntax-optional-chaining": "^7.8.3",
+                "@babel/plugin-syntax-private-property-in-object": "^7.14.5",
+                "@babel/plugin-syntax-top-level-await": "^7.14.5",
+                "@babel/plugin-transform-arrow-functions": "^7.18.6",
+                "@babel/plugin-transform-async-to-generator": "^7.18.6",
+                "@babel/plugin-transform-block-scoped-functions": "^7.18.6",
+                "@babel/plugin-transform-block-scoping": "^7.18.6",
+                "@babel/plugin-transform-classes": "^7.18.6",
+                "@babel/plugin-transform-computed-properties": "^7.18.6",
+                "@babel/plugin-transform-destructuring": "^7.18.6",
+                "@babel/plugin-transform-dotall-regex": "^7.18.6",
+                "@babel/plugin-transform-duplicate-keys": "^7.18.6",
+                "@babel/plugin-transform-exponentiation-operator": "^7.18.6",
+                "@babel/plugin-transform-for-of": "^7.18.6",
+                "@babel/plugin-transform-function-name": "^7.18.6",
+                "@babel/plugin-transform-literals": "^7.18.6",
+                "@babel/plugin-transform-member-expression-literals": "^7.18.6",
+                "@babel/plugin-transform-modules-amd": "^7.18.6",
+                "@babel/plugin-transform-modules-commonjs": "^7.18.6",
+                "@babel/plugin-transform-modules-systemjs": "^7.18.6",
+                "@babel/plugin-transform-modules-umd": "^7.18.6",
+                "@babel/plugin-transform-named-capturing-groups-regex": "^7.18.6",
+                "@babel/plugin-transform-new-target": "^7.18.6",
+                "@babel/plugin-transform-object-super": "^7.18.6",
+                "@babel/plugin-transform-parameters": "^7.18.6",
+                "@babel/plugin-transform-property-literals": "^7.18.6",
+                "@babel/plugin-transform-regenerator": "^7.18.6",
+                "@babel/plugin-transform-reserved-words": "^7.18.6",
+                "@babel/plugin-transform-shorthand-properties": "^7.18.6",
+                "@babel/plugin-transform-spread": "^7.18.6",
+                "@babel/plugin-transform-sticky-regex": "^7.18.6",
+                "@babel/plugin-transform-template-literals": "^7.18.6",
+                "@babel/plugin-transform-typeof-symbol": "^7.18.6",
+                "@babel/plugin-transform-unicode-escapes": "^7.18.6",
+                "@babel/plugin-transform-unicode-regex": "^7.18.6",
+                "@babel/preset-modules": "^0.1.5",
+                "@babel/types": "^7.18.6",
+                "babel-plugin-polyfill-corejs2": "^0.3.1",
+                "babel-plugin-polyfill-corejs3": "^0.5.2",
+                "babel-plugin-polyfill-regenerator": "^0.3.1",
+                "core-js-compat": "^3.22.1",
+                "semver": "^6.3.0"
+            },
+            "dependencies": {
+                "semver": {
+                    "version": "6.3.1",
+                    "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
+                    "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==",
+                    "dev": true
+                }
+            }
+        },
+        "@babel/preset-modules": {
+            "version": "0.1.5",
+            "resolved": "https://registry.npmjs.org/@babel/preset-modules/-/preset-modules-0.1.5.tgz",
+            "integrity": "sha512-A57th6YRG7oR3cq/yt/Y84MvGgE0eJG2F1JLhKuyG+jFxEgrd/HAMJatiFtmOiZurz+0DkrvbheCLaV5f2JfjA==",
+            "dev": true,
+            "requires": {
+                "@babel/helper-plugin-utils": "^7.0.0",
+                "@babel/plugin-proposal-unicode-property-regex": "^7.4.4",
+                "@babel/plugin-transform-dotall-regex": "^7.4.4",
+                "@babel/types": "^7.4.4",
+                "esutils": "^2.0.2"
+            }
+        },
+        "@babel/runtime": {
+            "version": "7.18.6",
+            "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.18.6.tgz",
+            "integrity": "sha512-t9wi7/AW6XtKahAe20Yw0/mMljKq0B1r2fPdvaAdV/KPDZewFXdaaa6K7lxmZBZ8FBNpCiAT6iHPmd6QO9bKfQ==",
+            "dev": true,
+            "requires": {
+                "regenerator-runtime": "^0.13.4"
+            }
+        },
+        "@babel/runtime-corejs3": {
+            "version": "7.18.6",
+            "resolved": "https://registry.npmjs.org/@babel/runtime-corejs3/-/runtime-corejs3-7.18.6.tgz",
+            "integrity": "sha512-cOu5wH2JFBgMjje+a+fz2JNIWU4GzYpl05oSob3UDvBEh6EuIn+TXFHMmBbhSb+k/4HMzgKCQfEEDArAWNF9Cw==",
+            "dev": true,
+            "requires": {
+                "core-js-pure": "^3.20.2",
+                "regenerator-runtime": "^0.13.4"
+            }
+        },
+        "@babel/template": {
+            "version": "7.22.15",
+            "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.22.15.tgz",
+            "integrity": "sha512-QPErUVm4uyJa60rkI73qneDacvdvzxshT3kksGqlGWYdOTIUOwJ7RDUL8sGqslY1uXWSL6xMFKEXDS3ox2uF0w==",
+            "dev": true,
+            "requires": {
+                "@babel/code-frame": "^7.22.13",
+                "@babel/parser": "^7.22.15",
+                "@babel/types": "^7.22.15"
+            }
+        },
+        "@babel/traverse": {
+            "version": "7.23.2",
+            "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.23.2.tgz",
+            "integrity": "sha512-azpe59SQ48qG6nu2CzcMLbxUudtN+dOM9kDbUqGq3HXUJRlo7i8fvPoxQUzYgLZ4cMVmuZgm8vvBpNeRhd6XSw==",
+            "dev": true,
+            "requires": {
+                "@babel/code-frame": "^7.22.13",
+                "@babel/generator": "^7.23.0",
+                "@babel/helper-environment-visitor": "^7.22.20",
+                "@babel/helper-function-name": "^7.23.0",
+                "@babel/helper-hoist-variables": "^7.22.5",
+                "@babel/helper-split-export-declaration": "^7.22.6",
+                "@babel/parser": "^7.23.0",
+                "@babel/types": "^7.23.0",
+                "debug": "^4.1.0",
+                "globals": "^11.1.0"
+            }
+        },
+        "@babel/types": {
+            "version": "7.23.0",
+            "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.23.0.tgz",
+            "integrity": "sha512-0oIyUfKoI3mSqMvsxBdclDwxXKXAUA8v/apZbc+iSyARYou1o8ZGDxbUYyLFoW2arqS2jDGqJuZvv1d/io1axg==",
+            "dev": true,
+            "requires": {
+                "@babel/helper-string-parser": "^7.22.5",
+                "@babel/helper-validator-identifier": "^7.22.20",
+                "to-fast-properties": "^2.0.0"
+            }
+        },
+        "@colors/colors": {
+            "version": "1.5.0",
+            "resolved": "https://registry.npmjs.org/@colors/colors/-/colors-1.5.0.tgz",
+            "integrity": "sha512-ooWCrlZP11i8GImSjTHYHLkvFDP48nS4+204nGb1RiX/WXYHmJA2III9/e2DWVabCESdW7hBAEzHRqUn9OUVvQ==",
+            "dev": true,
+            "optional": true
+        },
+        "@discoveryjs/json-ext": {
+            "version": "0.5.7",
+            "resolved": "https://registry.npmjs.org/@discoveryjs/json-ext/-/json-ext-0.5.7.tgz",
+            "integrity": "sha512-dBVuXR082gk3jsFp7Rd/JI4kytwGHecnCoTtXFb7DB6CNHp4rg5k1bhg0nWdLGLnOV71lmDzGQaLMy8iPLY0pw==",
+            "dev": true
+        },
+        "@jridgewell/gen-mapping": {
+            "version": "0.1.1",
+            "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.1.1.tgz",
+            "integrity": "sha512-sQXCasFk+U8lWYEe66WxRDOE9PjVz4vSM51fTu3Hw+ClTpUSQb718772vH3pyS5pShp6lvQM7SxgIDXXXmOX7w==",
+            "dev": true,
+            "requires": {
+                "@jridgewell/set-array": "^1.0.0",
+                "@jridgewell/sourcemap-codec": "^1.4.10"
+            }
+        },
+        "@jridgewell/resolve-uri": {
+            "version": "3.1.0",
+            "resolved": "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.1.0.tgz",
+            "integrity": "sha512-F2msla3tad+Mfht5cJq7LSXcdudKTWCVYUgw6pLFOOHSTtZlj6SWNYAp+AhuqLmWdBO2X5hPrLcu8cVP8fy28w==",
+            "dev": true
+        },
+        "@jridgewell/set-array": {
+            "version": "1.1.2",
+            "resolved": "https://registry.npmjs.org/@jridgewell/set-array/-/set-array-1.1.2.tgz",
+            "integrity": "sha512-xnkseuNADM0gt2bs+BvhO0p78Mk762YnZdsuzFV018NoG1Sj1SCQvpSqa7XUaTam5vAGasABV9qXASMKnFMwMw==",
+            "dev": true
+        },
+        "@jridgewell/source-map": {
+            "version": "0.3.5",
+            "resolved": "https://registry.npmjs.org/@jridgewell/source-map/-/source-map-0.3.5.tgz",
+            "integrity": "sha512-UTYAUj/wviwdsMfzoSJspJxbkH5o1snzwX0//0ENX1u/55kkZZkcTZP6u9bwKGkv+dkk9at4m1Cpt0uY80kcpQ==",
+            "dev": true,
+            "requires": {
+                "@jridgewell/gen-mapping": "^0.3.0",
+                "@jridgewell/trace-mapping": "^0.3.9"
+            },
+            "dependencies": {
+                "@jridgewell/gen-mapping": {
+                    "version": "0.3.3",
+                    "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.3.tgz",
+                    "integrity": "sha512-HLhSWOLRi875zjjMG/r+Nv0oCW8umGb0BgEhyX3dDX3egwZtB8PqLnjz3yedt8R5StBrzcg4aBpnh8UA9D1BoQ==",
+                    "dev": true,
+                    "requires": {
+                        "@jridgewell/set-array": "^1.0.1",
+                        "@jridgewell/sourcemap-codec": "^1.4.10",
+                        "@jridgewell/trace-mapping": "^0.3.9"
+                    }
+                }
+            }
+        },
+        "@jridgewell/sourcemap-codec": {
+            "version": "1.4.15",
+            "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.15.tgz",
+            "integrity": "sha512-eF2rxCRulEKXHTRiDrDy6erMYWqNw4LPdQ8UQA4huuxaQsVeRPFl2oM8oDGxMFhJUWZf9McpLtJasDDZb/Bpeg==",
+            "dev": true
+        },
+        "@jridgewell/trace-mapping": {
+            "version": "0.3.20",
+            "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.20.tgz",
+            "integrity": "sha512-R8LcPeWZol2zR8mmH3JeKQ6QRCFb7XgUhV9ZlGhHLGyg4wpPiPZNQOOWhFZhxKw8u//yTbNGI42Bx/3paXEQ+Q==",
+            "dev": true,
+            "requires": {
+                "@jridgewell/resolve-uri": "^3.1.0",
+                "@jridgewell/sourcemap-codec": "^1.4.14"
+            }
+        },
+        "@leichtgewicht/ip-codec": {
+            "version": "2.0.4",
+            "resolved": "https://registry.npmjs.org/@leichtgewicht/ip-codec/-/ip-codec-2.0.4.tgz",
+            "integrity": "sha512-Hcv+nVC0kZnQ3tD9GVu5xSMR4VVYOteQIr/hwFPVEvPdlXqgGEuRjiheChHgdM+JyqdgNcmzZOX/tnl0JOiI7A==",
+            "dev": true
+        },
+        "@nodelib/fs.scandir": {
+            "version": "2.1.5",
+            "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz",
+            "integrity": "sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g==",
+            "dev": true,
+            "requires": {
+                "@nodelib/fs.stat": "2.0.5",
+                "run-parallel": "^1.1.9"
+            }
+        },
+        "@nodelib/fs.stat": {
+            "version": "2.0.5",
+            "resolved": "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz",
+            "integrity": "sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A==",
+            "dev": true
+        },
+        "@nodelib/fs.walk": {
+            "version": "1.2.8",
+            "resolved": "https://registry.npmjs.org/@nodelib/fs.walk/-/fs.walk-1.2.8.tgz",
+            "integrity": "sha512-oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg==",
+            "dev": true,
+            "requires": {
+                "@nodelib/fs.scandir": "2.1.5",
+                "fastq": "^1.6.0"
+            }
+        },
+        "@one-ini/wasm": {
+            "version": "0.1.1",
+            "resolved": "https://registry.npmjs.org/@one-ini/wasm/-/wasm-0.1.1.tgz",
+            "integrity": "sha512-XuySG1E38YScSJoMlqovLru4KTUNSjgVTIjyh7qMX6aNN5HY5Ct5LhRJdxO79JtTzKfzV/bnWpz+zquYrISsvw==",
+            "dev": true
+        },
+        "@prettier/plugin-php": {
+            "version": "0.19.7",
+            "resolved": "https://registry.npmjs.org/@prettier/plugin-php/-/plugin-php-0.19.7.tgz",
+            "integrity": "sha512-QOzBs05nwuR92uak7xBHf7RCZCFXml+6Sk3cjTp2ahQlilBtupqlNjitlTXsOfPIAYwlFgLP1oSfyapS6DN00w==",
+            "dev": true,
+            "requires": {
+                "linguist-languages": "^7.21.0",
+                "mem": "^8.0.0",
+                "php-parser": "^3.1.5"
+            }
+        },
+        "@shufo/tailwindcss-class-sorter": {
+            "version": "3.0.1",
+            "resolved": "https://registry.npmjs.org/@shufo/tailwindcss-class-sorter/-/tailwindcss-class-sorter-3.0.1.tgz",
+            "integrity": "sha512-y9SMobvwElX2G6vdg4odJ6UL6hu/o5RlMsdwEeDLGaqHU3BLSw9CeitGgBus6kadjjDdT2wseG0Tl5yXWdc4UQ==",
+            "dev": true,
+            "requires": {
+                "escalade": "^3.1.1",
+                "object-hash": "^3.0.0",
+                "tailwindcss": "^3.3.2"
+            }
+        },
+        "@trysound/sax": {
+            "version": "0.2.0",
+            "resolved": "https://registry.npmjs.org/@trysound/sax/-/sax-0.2.0.tgz",
+            "integrity": "sha512-L7z9BgrNEcYyUYtF+HaEfiS5ebkh9jXqbszz7pC0hRBPaatV0XjSD3+eHrpqFemQfgwiFF0QPIarnIihIDn7OA==",
+            "dev": true
+        },
+        "@types/babel__core": {
+            "version": "7.20.3",
+            "resolved": "https://registry.npmjs.org/@types/babel__core/-/babel__core-7.20.3.tgz",
+            "integrity": "sha512-54fjTSeSHwfan8AyHWrKbfBWiEUrNTZsUwPTDSNaaP1QDQIZbeNUg3a59E9D+375MzUw/x1vx2/0F5LBz+AeYA==",
+            "dev": true,
+            "requires": {
+                "@babel/parser": "^7.20.7",
+                "@babel/types": "^7.20.7",
+                "@types/babel__generator": "*",
+                "@types/babel__template": "*",
+                "@types/babel__traverse": "*"
+            }
+        },
+        "@types/babel__generator": {
+            "version": "7.6.6",
+            "resolved": "https://registry.npmjs.org/@types/babel__generator/-/babel__generator-7.6.6.tgz",
+            "integrity": "sha512-66BXMKb/sUWbMdBNdMvajU7i/44RkrA3z/Yt1c7R5xejt8qh84iU54yUWCtm0QwGJlDcf/gg4zd/x4mpLAlb/w==",
+            "dev": true,
+            "requires": {
+                "@babel/types": "^7.0.0"
+            }
+        },
+        "@types/babel__template": {
+            "version": "7.4.3",
+            "resolved": "https://registry.npmjs.org/@types/babel__template/-/babel__template-7.4.3.tgz",
+            "integrity": "sha512-ciwyCLeuRfxboZ4isgdNZi/tkt06m8Tw6uGbBSBgWrnnZGNXiEyM27xc/PjXGQLqlZ6ylbgHMnm7ccF9tCkOeQ==",
+            "dev": true,
+            "requires": {
+                "@babel/parser": "^7.1.0",
+                "@babel/types": "^7.0.0"
+            }
+        },
+        "@types/babel__traverse": {
+            "version": "7.20.3",
+            "resolved": "https://registry.npmjs.org/@types/babel__traverse/-/babel__traverse-7.20.3.tgz",
+            "integrity": "sha512-Lsh766rGEFbaxMIDH7Qa+Yha8cMVI3qAK6CHt3OR0YfxOIn5Z54iHiyDRycHrBqeIiqGa20Kpsv1cavfBKkRSw==",
+            "dev": true,
+            "requires": {
+                "@babel/types": "^7.20.7"
+            }
+        },
+        "@types/body-parser": {
+            "version": "1.19.4",
+            "resolved": "https://registry.npmjs.org/@types/body-parser/-/body-parser-1.19.4.tgz",
+            "integrity": "sha512-N7UDG0/xiPQa2D/XrVJXjkWbpqHCd2sBaB32ggRF2l83RhPfamgKGF8gwwqyksS95qUS5ZYF9aF+lLPRlwI2UA==",
+            "dev": true,
+            "requires": {
+                "@types/connect": "*",
+                "@types/node": "*"
+            }
+        },
+        "@types/bonjour": {
+            "version": "3.5.12",
+            "resolved": "https://registry.npmjs.org/@types/bonjour/-/bonjour-3.5.12.tgz",
+            "integrity": "sha512-ky0kWSqXVxSqgqJvPIkgFkcn4C8MnRog308Ou8xBBIVo39OmUFy+jqNe0nPwLCDFxUpmT9EvT91YzOJgkDRcFg==",
+            "dev": true,
+            "requires": {
+                "@types/node": "*"
+            }
+        },
+        "@types/clean-css": {
+            "version": "4.2.9",
+            "resolved": "https://registry.npmjs.org/@types/clean-css/-/clean-css-4.2.9.tgz",
+            "integrity": "sha512-pjzJ4n5eAXAz/L5Zur4ZymuJUvyo0Uh0iRnRI/1kADFLs76skDky0K0dX1rlv4iXXrJXNk3sxRWVJR7CMDroWA==",
+            "dev": true,
+            "requires": {
+                "@types/node": "*",
+                "source-map": "^0.6.0"
+            }
+        },
+        "@types/connect": {
+            "version": "3.4.37",
+            "resolved": "https://registry.npmjs.org/@types/connect/-/connect-3.4.37.tgz",
+            "integrity": "sha512-zBUSRqkfZ59OcwXon4HVxhx5oWCJmc0OtBTK05M+p0dYjgN6iTwIL2T/WbsQZrEsdnwaF9cWQ+azOnpPvIqY3Q==",
+            "dev": true,
+            "requires": {
+                "@types/node": "*"
+            }
+        },
+        "@types/connect-history-api-fallback": {
+            "version": "1.5.2",
+            "resolved": "https://registry.npmjs.org/@types/connect-history-api-fallback/-/connect-history-api-fallback-1.5.2.tgz",
+            "integrity": "sha512-gX2j9x+NzSh4zOhnRPSdPPmTepS4DfxES0AvIFv3jGv5QyeAJf6u6dY5/BAoAJU9Qq1uTvwOku8SSC2GnCRl6Q==",
+            "dev": true,
+            "requires": {
+                "@types/express-serve-static-core": "*",
+                "@types/node": "*"
+            }
+        },
+        "@types/eslint": {
+            "version": "8.4.5",
+            "resolved": "https://registry.npmjs.org/@types/eslint/-/eslint-8.4.5.tgz",
+            "integrity": "sha512-dhsC09y1gpJWnK+Ff4SGvCuSnk9DaU0BJZSzOwa6GVSg65XtTugLBITDAAzRU5duGBoXBHpdR/9jHGxJjNflJQ==",
+            "dev": true,
+            "requires": {
+                "@types/estree": "*",
+                "@types/json-schema": "*"
+            }
+        },
+        "@types/eslint-scope": {
+            "version": "3.7.4",
+            "resolved": "https://registry.npmjs.org/@types/eslint-scope/-/eslint-scope-3.7.4.tgz",
+            "integrity": "sha512-9K4zoImiZc3HlIp6AVUDE4CWYx22a+lhSZMYNpbjW04+YF0KWj4pJXnEMjdnFTiQibFFmElcsasJXDbdI/EPhA==",
+            "dev": true,
+            "requires": {
+                "@types/eslint": "*",
+                "@types/estree": "*"
+            }
+        },
+        "@types/estree": {
+            "version": "1.0.3",
+            "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.3.tgz",
+            "integrity": "sha512-CS2rOaoQ/eAgAfcTfq6amKG7bsN+EMcgGY4FAFQdvSj2y1ixvOZTUA9mOtCai7E1SYu283XNw7urKK30nP3wkQ==",
+            "dev": true
+        },
+        "@types/express": {
+            "version": "4.17.20",
+            "resolved": "https://registry.npmjs.org/@types/express/-/express-4.17.20.tgz",
+            "integrity": "sha512-rOaqlkgEvOW495xErXMsmyX3WKBInbhG5eqojXYi3cGUaLoRDlXa5d52fkfWZT963AZ3v2eZ4MbKE6WpDAGVsw==",
+            "dev": true,
+            "requires": {
+                "@types/body-parser": "*",
+                "@types/express-serve-static-core": "^4.17.33",
+                "@types/qs": "*",
+                "@types/serve-static": "*"
+            }
+        },
+        "@types/express-serve-static-core": {
+            "version": "4.17.39",
+            "resolved": "https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-4.17.39.tgz",
+            "integrity": "sha512-BiEUfAiGCOllomsRAZOiMFP7LAnrifHpt56pc4Z7l9K6ACyN06Ns1JLMBxwkfLOjJRlSf06NwWsT7yzfpaVpyQ==",
+            "dev": true,
+            "requires": {
+                "@types/node": "*",
+                "@types/qs": "*",
+                "@types/range-parser": "*",
+                "@types/send": "*"
+            }
+        },
+        "@types/glob": {
+            "version": "7.2.0",
+            "resolved": "https://registry.npmjs.org/@types/glob/-/glob-7.2.0.tgz",
+            "integrity": "sha512-ZUxbzKl0IfJILTS6t7ip5fQQM/J3TJYubDm3nMbgubNNYS62eXeUpoLUC8/7fJNiFYHTrGPQn7hspDUzIHX3UA==",
+            "dev": true,
+            "requires": {
+                "@types/minimatch": "*",
+                "@types/node": "*"
+            }
+        },
+        "@types/http-errors": {
+            "version": "2.0.3",
+            "resolved": "https://registry.npmjs.org/@types/http-errors/-/http-errors-2.0.3.tgz",
+            "integrity": "sha512-pP0P/9BnCj1OVvQR2lF41EkDG/lWWnDyA203b/4Fmi2eTyORnBtcDoKDwjWQthELrBvWkMOrvSOnZ8OVlW6tXA==",
+            "dev": true
+        },
+        "@types/http-proxy": {
+            "version": "1.17.13",
+            "resolved": "https://registry.npmjs.org/@types/http-proxy/-/http-proxy-1.17.13.tgz",
+            "integrity": "sha512-GkhdWcMNiR5QSQRYnJ+/oXzu0+7JJEPC8vkWXK351BkhjraZF+1W13CUYARUvX9+NqIU2n6YHA4iwywsc/M6Sw==",
+            "dev": true,
+            "requires": {
+                "@types/node": "*"
+            }
+        },
+        "@types/imagemin": {
+            "version": "8.0.3",
+            "resolved": "https://registry.npmjs.org/@types/imagemin/-/imagemin-8.0.3.tgz",
+            "integrity": "sha512-se/hpaYxu5DyvPqmUEwbupmbQSx6JNislk0dkoIgWSmArkj+Ow9pGG9pGz8MRmbQDfGNYNzqwPQKHCUy+K+jpQ==",
+            "dev": true,
+            "requires": {
+                "@types/node": "*"
+            }
+        },
+        "@types/imagemin-gifsicle": {
+            "version": "7.0.3",
+            "resolved": "https://registry.npmjs.org/@types/imagemin-gifsicle/-/imagemin-gifsicle-7.0.3.tgz",
+            "integrity": "sha512-GQBKOk9doOd0Xp7OvO4QDl7U0Vkwk2Ps7J0rxafdAa7wG9lu7idvZTm8TtSZiRtHENdkW88Kz8OjmjMlgeeC5w==",
+            "dev": true,
+            "requires": {
+                "@types/imagemin": "*"
+            }
+        },
+        "@types/imagemin-mozjpeg": {
+            "version": "8.0.3",
+            "resolved": "https://registry.npmjs.org/@types/imagemin-mozjpeg/-/imagemin-mozjpeg-8.0.3.tgz",
+            "integrity": "sha512-+U/ibETP2/oRqeuaaXa67dEpKHfzmfK0OBVC09AR4c1CIFAKjQ5xY+dxH+fjoMQRlwdcRQLkn/ALtnxSl3Xsqw==",
+            "dev": true,
+            "requires": {
+                "@types/imagemin": "*"
+            }
+        },
+        "@types/imagemin-optipng": {
+            "version": "5.2.3",
+            "resolved": "https://registry.npmjs.org/@types/imagemin-optipng/-/imagemin-optipng-5.2.3.tgz",
+            "integrity": "sha512-Q80ANbJYn+WgKkWVfx9f7/q4LR6qun4NIiuV1eRWCg8KCAmNrU7ZH16a2hGs9kfkFqyJlhBv6oV9SDXe1vL3aQ==",
+            "dev": true,
+            "requires": {
+                "@types/imagemin": "*"
+            }
+        },
+        "@types/imagemin-svgo": {
+            "version": "8.0.1",
+            "resolved": "https://registry.npmjs.org/@types/imagemin-svgo/-/imagemin-svgo-8.0.1.tgz",
+            "integrity": "sha512-YafkdrVAcr38U0Ln1C+L1n4SIZqC47VBHTyxCq7gTUSd1R9MdIvMcrljWlgU1M9O68WZDeQWUrKipKYfEOCOvQ==",
+            "dev": true,
+            "requires": {
+                "@types/imagemin": "*",
+                "@types/svgo": "^1"
+            }
+        },
+        "@types/json-schema": {
+            "version": "7.0.9",
+            "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.9.tgz",
+            "integrity": "sha512-qcUXuemtEu+E5wZSJHNxUXeCZhAfXKQ41D+duX+VYPde7xyEVZci+/oXKJL13tnRs9lR2pr4fod59GT6/X1/yQ==",
+            "dev": true
+        },
+        "@types/mime": {
+            "version": "1.3.4",
+            "resolved": "https://registry.npmjs.org/@types/mime/-/mime-1.3.4.tgz",
+            "integrity": "sha512-1Gjee59G25MrQGk8bsNvC6fxNiRgUlGn2wlhGf95a59DrprnnHk80FIMMFG9XHMdrfsuA119ht06QPDXA1Z7tw==",
+            "dev": true
+        },
+        "@types/minimatch": {
+            "version": "5.1.2",
+            "resolved": "https://registry.npmjs.org/@types/minimatch/-/minimatch-5.1.2.tgz",
+            "integrity": "sha512-K0VQKziLUWkVKiRVrx4a40iPaxTUefQmjtkQofBkYRcoaaL/8rhwDWww9qWbrgicNOgnpIsMxyNIUM4+n6dUIA==",
+            "dev": true
+        },
+        "@types/node": {
+            "version": "18.0.5",
+            "resolved": "https://registry.npmjs.org/@types/node/-/node-18.0.5.tgz",
+            "integrity": "sha512-En7tneq+j0qAiVwysBD79y86MT3ModuoIJbe7JXp+sb5UAjInSShmK3nXXMioBzfF7rXC12hv12d4IyCVwN4dA==",
+            "dev": true
+        },
+        "@types/parse-json": {
+            "version": "4.0.1",
+            "resolved": "https://registry.npmjs.org/@types/parse-json/-/parse-json-4.0.1.tgz",
+            "integrity": "sha512-3YmXzzPAdOTVljVMkTMBdBEvlOLg2cDQaDhnnhT3nT9uDbnJzjWhKlzb+desT12Y7tGqaN6d+AbozcKzyL36Ng==",
+            "dev": true
+        },
+        "@types/qs": {
+            "version": "6.9.9",
+            "resolved": "https://registry.npmjs.org/@types/qs/-/qs-6.9.9.tgz",
+            "integrity": "sha512-wYLxw35euwqGvTDx6zfY1vokBFnsK0HNrzc6xNHchxfO2hpuRg74GbkEW7e3sSmPvj0TjCDT1VCa6OtHXnubsg==",
+            "dev": true
+        },
+        "@types/range-parser": {
+            "version": "1.2.6",
+            "resolved": "https://registry.npmjs.org/@types/range-parser/-/range-parser-1.2.6.tgz",
+            "integrity": "sha512-+0autS93xyXizIYiyL02FCY8N+KkKPhILhcUSA276HxzreZ16kl+cmwvV2qAM/PuCCwPXzOXOWhiPcw20uSFcA==",
+            "dev": true
+        },
+        "@types/retry": {
+            "version": "0.12.0",
+            "resolved": "https://registry.npmjs.org/@types/retry/-/retry-0.12.0.tgz",
+            "integrity": "sha512-wWKOClTTiizcZhXnPY4wikVAwmdYHp8q6DmC+EJUzAMsycb7HB32Kh9RN4+0gExjmPmZSAQjgURXIGATPegAvA==",
+            "dev": true
+        },
+        "@types/send": {
+            "version": "0.17.3",
+            "resolved": "https://registry.npmjs.org/@types/send/-/send-0.17.3.tgz",
+            "integrity": "sha512-/7fKxvKUoETxjFUsuFlPB9YndePpxxRAOfGC/yJdc9kTjTeP5kRCTzfnE8kPUKCeyiyIZu0YQ76s50hCedI1ug==",
+            "dev": true,
+            "requires": {
+                "@types/mime": "^1",
+                "@types/node": "*"
+            }
+        },
+        "@types/serve-index": {
+            "version": "1.9.3",
+            "resolved": "https://registry.npmjs.org/@types/serve-index/-/serve-index-1.9.3.tgz",
+            "integrity": "sha512-4KG+yMEuvDPRrYq5fyVm/I2uqAJSAwZK9VSa+Zf+zUq9/oxSSvy3kkIqyL+jjStv6UCVi8/Aho0NHtB1Fwosrg==",
+            "dev": true,
+            "requires": {
+                "@types/express": "*"
+            }
+        },
+        "@types/serve-static": {
+            "version": "1.15.4",
+            "resolved": "https://registry.npmjs.org/@types/serve-static/-/serve-static-1.15.4.tgz",
+            "integrity": "sha512-aqqNfs1XTF0HDrFdlY//+SGUxmdSUbjeRXb5iaZc3x0/vMbYmdw9qvOgHWOyyLFxSSRnUuP5+724zBgfw8/WAw==",
+            "dev": true,
+            "requires": {
+                "@types/http-errors": "*",
+                "@types/mime": "*",
+                "@types/node": "*"
+            }
+        },
+        "@types/sockjs": {
+            "version": "0.3.35",
+            "resolved": "https://registry.npmjs.org/@types/sockjs/-/sockjs-0.3.35.tgz",
+            "integrity": "sha512-tIF57KB+ZvOBpAQwSaACfEu7htponHXaFzP7RfKYgsOS0NoYnn+9+jzp7bbq4fWerizI3dTB4NfAZoyeQKWJLw==",
+            "dev": true,
+            "requires": {
+                "@types/node": "*"
+            }
+        },
+        "@types/svgo": {
+            "version": "1.3.6",
+            "resolved": "https://registry.npmjs.org/@types/svgo/-/svgo-1.3.6.tgz",
+            "integrity": "sha512-AZU7vQcy/4WFEuwnwsNsJnFwupIpbllH1++LXScN6uxT1Z4zPzdrWG97w4/I7eFKFTvfy/bHFStWjdBAg2Vjug==",
+            "dev": true
+        },
+        "@types/ws": {
+            "version": "8.5.8",
+            "resolved": "https://registry.npmjs.org/@types/ws/-/ws-8.5.8.tgz",
+            "integrity": "sha512-flUksGIQCnJd6sZ1l5dqCEG/ksaoAg/eUwiLAGTJQcfgvZJKF++Ta4bJA6A5aPSJmsr+xlseHn4KLgVlNnvPTg==",
+            "dev": true,
+            "requires": {
+                "@types/node": "*"
+            }
+        },
+        "@vue/compiler-core": {
+            "version": "3.3.13",
+            "resolved": "https://registry.npmjs.org/@vue/compiler-core/-/compiler-core-3.3.13.tgz",
+            "integrity": "sha512-bwi9HShGu7uaZLOErZgsH2+ojsEdsjerbf2cMXPwmvcgZfVPZ2BVZzCVnwZBxTAYd6Mzbmf6izcUNDkWnBBQ6A==",
+            "dev": true,
+            "requires": {
+                "@babel/parser": "^7.23.5",
+                "@vue/shared": "3.3.13",
+                "estree-walker": "^2.0.2",
+                "source-map-js": "^1.0.2"
+            }
+        },
+        "@vue/compiler-dom": {
+            "version": "3.3.13",
+            "resolved": "https://registry.npmjs.org/@vue/compiler-dom/-/compiler-dom-3.3.13.tgz",
+            "integrity": "sha512-EYRDpbLadGtNL0Gph+HoKiYqXLqZ0xSSpR5Dvnu/Ep7ggaCbjRDIus1MMxTS2Qm0koXED4xSlvTZaTnI8cYAsw==",
+            "dev": true,
+            "requires": {
+                "@vue/compiler-core": "3.3.13",
+                "@vue/shared": "3.3.13"
+            }
+        },
+        "@vue/compiler-sfc": {
+            "version": "3.3.13",
+            "resolved": "https://registry.npmjs.org/@vue/compiler-sfc/-/compiler-sfc-3.3.13.tgz",
+            "integrity": "sha512-DQVmHEy/EKIgggvnGRLx21hSqnr1smUS9Aq8tfxiiot8UR0/pXKHN9k78/qQ7etyQTFj5em5nruODON7dBeumw==",
+            "dev": true,
+            "requires": {
+                "@babel/parser": "^7.23.5",
+                "@vue/compiler-core": "3.3.13",
+                "@vue/compiler-dom": "3.3.13",
+                "@vue/compiler-ssr": "3.3.13",
+                "@vue/reactivity-transform": "3.3.13",
+                "@vue/shared": "3.3.13",
+                "estree-walker": "^2.0.2",
+                "magic-string": "^0.30.5",
+                "postcss": "^8.4.32",
+                "source-map-js": "^1.0.2"
+            }
+        },
+        "@vue/compiler-ssr": {
+            "version": "3.3.13",
+            "resolved": "https://registry.npmjs.org/@vue/compiler-ssr/-/compiler-ssr-3.3.13.tgz",
+            "integrity": "sha512-d/P3bCeUGmkJNS1QUZSAvoCIW4fkOKK3l2deE7zrp0ypJEy+En2AcypIkqvcFQOcw3F0zt2VfMvNsA9JmExTaw==",
+            "dev": true,
+            "requires": {
+                "@vue/compiler-dom": "3.3.13",
+                "@vue/shared": "3.3.13"
+            }
+        },
+        "@vue/reactivity": {
+            "version": "3.3.13",
+            "resolved": "https://registry.npmjs.org/@vue/reactivity/-/reactivity-3.3.13.tgz",
+            "integrity": "sha512-fjzCxceMahHhi4AxUBzQqqVhuA21RJ0COaWTbIBl1PruGW1CeY97louZzLi4smpYx+CHfFPPU/CS8NybbGvPKQ==",
+            "dev": true,
+            "requires": {
+                "@vue/shared": "3.3.13"
+            }
+        },
+        "@vue/reactivity-transform": {
+            "version": "3.3.13",
+            "resolved": "https://registry.npmjs.org/@vue/reactivity-transform/-/reactivity-transform-3.3.13.tgz",
+            "integrity": "sha512-oWnydGH0bBauhXvh5KXUy61xr9gKaMbtsMHk40IK9M4gMuKPJ342tKFarY0eQ6jef8906m35q37wwA8DMZOm5Q==",
+            "dev": true,
+            "requires": {
+                "@babel/parser": "^7.23.5",
+                "@vue/compiler-core": "3.3.13",
+                "@vue/shared": "3.3.13",
+                "estree-walker": "^2.0.2",
+                "magic-string": "^0.30.5"
+            }
+        },
+        "@vue/runtime-core": {
+            "version": "3.3.13",
+            "resolved": "https://registry.npmjs.org/@vue/runtime-core/-/runtime-core-3.3.13.tgz",
+            "integrity": "sha512-1TzA5TvGuh2zUwMJgdfvrBABWZ7y8kBwBhm7BXk8rvdx2SsgcGfz2ruv2GzuGZNvL1aKnK8CQMV/jFOrxNQUMA==",
+            "dev": true,
+            "requires": {
+                "@vue/reactivity": "3.3.13",
+                "@vue/shared": "3.3.13"
+            }
+        },
+        "@vue/runtime-dom": {
+            "version": "3.3.13",
+            "resolved": "https://registry.npmjs.org/@vue/runtime-dom/-/runtime-dom-3.3.13.tgz",
+            "integrity": "sha512-JJkpE8R/hJKXqVTgUoODwS5wqKtOsmJPEqmp90PDVGygtJ4C0PtOkcEYXwhiVEmef6xeXcIlrT3Yo5aQ4qkHhQ==",
+            "dev": true,
+            "requires": {
+                "@vue/runtime-core": "3.3.13",
+                "@vue/shared": "3.3.13",
+                "csstype": "^3.1.3"
+            }
+        },
+        "@vue/server-renderer": {
+            "version": "3.3.13",
+            "resolved": "https://registry.npmjs.org/@vue/server-renderer/-/server-renderer-3.3.13.tgz",
+            "integrity": "sha512-vSnN+nuf6iSqTL3Qgx/9A+BT+0Zf/VJOgF5uMZrKjYPs38GMYyAU1coDyBNHauehXDaP+zl73VhwWv0vBRBHcg==",
+            "dev": true,
+            "requires": {
+                "@vue/compiler-ssr": "3.3.13",
+                "@vue/shared": "3.3.13"
+            }
+        },
+        "@vue/shared": {
+            "version": "3.3.13",
+            "resolved": "https://registry.npmjs.org/@vue/shared/-/shared-3.3.13.tgz",
+            "integrity": "sha512-/zYUwiHD8j7gKx2argXEMCUXVST6q/21DFU0sTfNX0URJroCe3b1UF6vLJ3lQDfLNIiiRl2ONp7Nh5UVWS6QnA==",
+            "dev": true
+        },
+        "@webassemblyjs/ast": {
+            "version": "1.11.6",
+            "resolved": "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.11.6.tgz",
+            "integrity": "sha512-IN1xI7PwOvLPgjcf180gC1bqn3q/QaOCwYUahIOhbYUu8KA/3tw2RT/T0Gidi1l7Hhj5D/INhJxiICObqpMu4Q==",
+            "dev": true,
+            "requires": {
+                "@webassemblyjs/helper-numbers": "1.11.6",
+                "@webassemblyjs/helper-wasm-bytecode": "1.11.6"
+            }
+        },
+        "@webassemblyjs/floating-point-hex-parser": {
+            "version": "1.11.6",
+            "resolved": "https://registry.npmjs.org/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.11.6.tgz",
+            "integrity": "sha512-ejAj9hfRJ2XMsNHk/v6Fu2dGS+i4UaXBXGemOfQ/JfQ6mdQg/WXtwleQRLLS4OvfDhv8rYnVwH27YJLMyYsxhw==",
+            "dev": true
+        },
+        "@webassemblyjs/helper-api-error": {
+            "version": "1.11.6",
+            "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-api-error/-/helper-api-error-1.11.6.tgz",
+            "integrity": "sha512-o0YkoP4pVu4rN8aTJgAyj9hC2Sv5UlkzCHhxqWj8butaLvnpdc2jOwh4ewE6CX0txSfLn/UYaV/pheS2Txg//Q==",
+            "dev": true
+        },
+        "@webassemblyjs/helper-buffer": {
+            "version": "1.11.6",
+            "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-buffer/-/helper-buffer-1.11.6.tgz",
+            "integrity": "sha512-z3nFzdcp1mb8nEOFFk8DrYLpHvhKC3grJD2ardfKOzmbmJvEf/tPIqCY+sNcwZIY8ZD7IkB2l7/pqhUhqm7hLA==",
+            "dev": true
+        },
+        "@webassemblyjs/helper-numbers": {
+            "version": "1.11.6",
+            "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-numbers/-/helper-numbers-1.11.6.tgz",
+            "integrity": "sha512-vUIhZ8LZoIWHBohiEObxVm6hwP034jwmc9kuq5GdHZH0wiLVLIPcMCdpJzG4C11cHoQ25TFIQj9kaVADVX7N3g==",
+            "dev": true,
+            "requires": {
+                "@webassemblyjs/floating-point-hex-parser": "1.11.6",
+                "@webassemblyjs/helper-api-error": "1.11.6",
+                "@xtuc/long": "4.2.2"
+            }
+        },
+        "@webassemblyjs/helper-wasm-bytecode": {
+            "version": "1.11.6",
+            "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.11.6.tgz",
+            "integrity": "sha512-sFFHKwcmBprO9e7Icf0+gddyWYDViL8bpPjJJl0WHxCdETktXdmtWLGVzoHbqUcY4Be1LkNfwTmXOJUFZYSJdA==",
+            "dev": true
+        },
+        "@webassemblyjs/helper-wasm-section": {
+            "version": "1.11.6",
+            "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.11.6.tgz",
+            "integrity": "sha512-LPpZbSOwTpEC2cgn4hTydySy1Ke+XEu+ETXuoyvuyezHO3Kjdu90KK95Sh9xTbmjrCsUwvWwCOQQNta37VrS9g==",
+            "dev": true,
+            "requires": {
+                "@webassemblyjs/ast": "1.11.6",
+                "@webassemblyjs/helper-buffer": "1.11.6",
+                "@webassemblyjs/helper-wasm-bytecode": "1.11.6",
+                "@webassemblyjs/wasm-gen": "1.11.6"
+            }
+        },
+        "@webassemblyjs/ieee754": {
+            "version": "1.11.6",
+            "resolved": "https://registry.npmjs.org/@webassemblyjs/ieee754/-/ieee754-1.11.6.tgz",
+            "integrity": "sha512-LM4p2csPNvbij6U1f19v6WR56QZ8JcHg3QIJTlSwzFcmx6WSORicYj6I63f9yU1kEUtrpG+kjkiIAkevHpDXrg==",
+            "dev": true,
+            "requires": {
+                "@xtuc/ieee754": "^1.2.0"
+            }
+        },
+        "@webassemblyjs/leb128": {
+            "version": "1.11.6",
+            "resolved": "https://registry.npmjs.org/@webassemblyjs/leb128/-/leb128-1.11.6.tgz",
+            "integrity": "sha512-m7a0FhE67DQXgouf1tbN5XQcdWoNgaAuoULHIfGFIEVKA6tu/edls6XnIlkmS6FrXAquJRPni3ZZKjw6FSPjPQ==",
+            "dev": true,
+            "requires": {
+                "@xtuc/long": "4.2.2"
+            }
+        },
+        "@webassemblyjs/utf8": {
+            "version": "1.11.6",
+            "resolved": "https://registry.npmjs.org/@webassemblyjs/utf8/-/utf8-1.11.6.tgz",
+            "integrity": "sha512-vtXf2wTQ3+up9Zsg8sa2yWiQpzSsMyXj0qViVP6xKGCUT8p8YJ6HqI7l5eCnWx1T/FYdsv07HQs2wTFbbof/RA==",
+            "dev": true
+        },
+        "@webassemblyjs/wasm-edit": {
+            "version": "1.11.6",
+            "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-edit/-/wasm-edit-1.11.6.tgz",
+            "integrity": "sha512-Ybn2I6fnfIGuCR+Faaz7YcvtBKxvoLV3Lebn1tM4o/IAJzmi9AWYIPWpyBfU8cC+JxAO57bk4+zdsTjJR+VTOw==",
+            "dev": true,
+            "requires": {
+                "@webassemblyjs/ast": "1.11.6",
+                "@webassemblyjs/helper-buffer": "1.11.6",
+                "@webassemblyjs/helper-wasm-bytecode": "1.11.6",
+                "@webassemblyjs/helper-wasm-section": "1.11.6",
+                "@webassemblyjs/wasm-gen": "1.11.6",
+                "@webassemblyjs/wasm-opt": "1.11.6",
+                "@webassemblyjs/wasm-parser": "1.11.6",
+                "@webassemblyjs/wast-printer": "1.11.6"
+            }
+        },
+        "@webassemblyjs/wasm-gen": {
+            "version": "1.11.6",
+            "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-gen/-/wasm-gen-1.11.6.tgz",
+            "integrity": "sha512-3XOqkZP/y6B4F0PBAXvI1/bky7GryoogUtfwExeP/v7Nzwo1QLcq5oQmpKlftZLbT+ERUOAZVQjuNVak6UXjPA==",
+            "dev": true,
+            "requires": {
+                "@webassemblyjs/ast": "1.11.6",
+                "@webassemblyjs/helper-wasm-bytecode": "1.11.6",
+                "@webassemblyjs/ieee754": "1.11.6",
+                "@webassemblyjs/leb128": "1.11.6",
+                "@webassemblyjs/utf8": "1.11.6"
+            }
+        },
+        "@webassemblyjs/wasm-opt": {
+            "version": "1.11.6",
+            "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-opt/-/wasm-opt-1.11.6.tgz",
+            "integrity": "sha512-cOrKuLRE7PCe6AsOVl7WasYf3wbSo4CeOk6PkrjS7g57MFfVUF9u6ysQBBODX0LdgSvQqRiGz3CXvIDKcPNy4g==",
+            "dev": true,
+            "requires": {
+                "@webassemblyjs/ast": "1.11.6",
+                "@webassemblyjs/helper-buffer": "1.11.6",
+                "@webassemblyjs/wasm-gen": "1.11.6",
+                "@webassemblyjs/wasm-parser": "1.11.6"
+            }
+        },
+        "@webassemblyjs/wasm-parser": {
+            "version": "1.11.6",
+            "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-parser/-/wasm-parser-1.11.6.tgz",
+            "integrity": "sha512-6ZwPeGzMJM3Dqp3hCsLgESxBGtT/OeCvCZ4TA1JUPYgmhAx38tTPR9JaKy0S5H3evQpO/h2uWs2j6Yc/fjkpTQ==",
+            "dev": true,
+            "requires": {
+                "@webassemblyjs/ast": "1.11.6",
+                "@webassemblyjs/helper-api-error": "1.11.6",
+                "@webassemblyjs/helper-wasm-bytecode": "1.11.6",
+                "@webassemblyjs/ieee754": "1.11.6",
+                "@webassemblyjs/leb128": "1.11.6",
+                "@webassemblyjs/utf8": "1.11.6"
+            }
+        },
+        "@webassemblyjs/wast-printer": {
+            "version": "1.11.6",
+            "resolved": "https://registry.npmjs.org/@webassemblyjs/wast-printer/-/wast-printer-1.11.6.tgz",
+            "integrity": "sha512-JM7AhRcE+yW2GWYaKeHL5vt4xqee5N2WcezptmgyhNS+ScggqcT1OtXykhAb13Sn5Yas0j2uv9tHgrjwvzAP4A==",
+            "dev": true,
+            "requires": {
+                "@webassemblyjs/ast": "1.11.6",
+                "@xtuc/long": "4.2.2"
+            }
+        },
+        "@webpack-cli/configtest": {
+            "version": "1.2.0",
+            "resolved": "https://registry.npmjs.org/@webpack-cli/configtest/-/configtest-1.2.0.tgz",
+            "integrity": "sha512-4FB8Tj6xyVkyqjj1OaTqCjXYULB9FMkqQ8yGrZjRDrYh0nOE+7Lhs45WioWQQMV+ceFlE368Ukhe6xdvJM9Egg==",
+            "dev": true,
+            "requires": {}
+        },
+        "@webpack-cli/info": {
+            "version": "1.5.0",
+            "resolved": "https://registry.npmjs.org/@webpack-cli/info/-/info-1.5.0.tgz",
+            "integrity": "sha512-e8tSXZpw2hPl2uMJY6fsMswaok5FdlGNRTktvFk2sD8RjH0hE2+XistawJx1vmKteh4NmGmNUrp+Tb2w+udPcQ==",
+            "dev": true,
+            "requires": {
+                "envinfo": "^7.7.3"
+            }
+        },
+        "@webpack-cli/serve": {
+            "version": "1.7.0",
+            "resolved": "https://registry.npmjs.org/@webpack-cli/serve/-/serve-1.7.0.tgz",
+            "integrity": "sha512-oxnCNGj88fL+xzV+dacXs44HcDwf1ovs3AuEzvP7mqXw7fQntqIhQ1BRmynh4qEKQSSSRSWVyXRjmTbZIX9V2Q==",
+            "dev": true,
+            "requires": {}
+        },
+        "@xtuc/ieee754": {
+            "version": "1.2.0",
+            "resolved": "https://registry.npmjs.org/@xtuc/ieee754/-/ieee754-1.2.0.tgz",
+            "integrity": "sha512-DX8nKgqcGwsc0eJSqYt5lwP4DH5FlHnmuWWBRy7X0NcaGR0ZtuyeESgMwTYVEtxmsNGY+qit4QYT/MIYTOTPeA==",
+            "dev": true
+        },
+        "@xtuc/long": {
+            "version": "4.2.2",
+            "resolved": "https://registry.npmjs.org/@xtuc/long/-/long-4.2.2.tgz",
+            "integrity": "sha512-NuHqBY1PB/D8xU6s/thBgOAiAP7HOYDQ32+BFZILJ8ivkUkAHQnWfn6WhL79Owj1qmUnoN/YPhktdIoucipkAQ==",
+            "dev": true
+        },
+        "abbrev": {
+            "version": "1.1.1",
+            "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz",
+            "integrity": "sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==",
+            "dev": true
+        },
+        "accepts": {
+            "version": "1.3.8",
+            "resolved": "https://registry.npmjs.org/accepts/-/accepts-1.3.8.tgz",
+            "integrity": "sha512-PYAthTa2m2VKxuvSD3DPC/Gy+U+sOA1LAuT8mkmRuvw+NACSaeXEQ+NHcVF7rONl6qcaxV3Uuemwawk+7+SJLw==",
+            "dev": true,
+            "requires": {
+                "mime-types": "~2.1.34",
+                "negotiator": "0.6.3"
+            }
+        },
+        "acorn": {
+            "version": "8.10.0",
+            "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.10.0.tgz",
+            "integrity": "sha512-F0SAmZ8iUtS//m8DmCTA0jlh6TDKkHQyK6xc6V4KDTyZKA9dnvX9/3sRTVQrWm79glUAZbnmmNcdYwUIHWVybw==",
+            "dev": true
+        },
+        "acorn-import-assertions": {
+            "version": "1.9.0",
+            "resolved": "https://registry.npmjs.org/acorn-import-assertions/-/acorn-import-assertions-1.9.0.tgz",
+            "integrity": "sha512-cmMwop9x+8KFhxvKrKfPYmN6/pKTYYHBqLa0DfvVZcKMJWNyWLnaqND7dx/qn66R7ewM1UX5XMaDVP5wlVTaVA==",
+            "dev": true,
+            "requires": {}
+        },
+        "adjust-sourcemap-loader": {
+            "version": "4.0.0",
+            "resolved": "https://registry.npmjs.org/adjust-sourcemap-loader/-/adjust-sourcemap-loader-4.0.0.tgz",
+            "integrity": "sha512-OXwN5b9pCUXNQHJpwwD2qP40byEmSgzj8B4ydSN0uMNYWiFmJ6x6KwUllMmfk8Rwu/HJDFR7U8ubsWBoN0Xp0A==",
+            "dev": true,
+            "requires": {
+                "loader-utils": "^2.0.0",
+                "regex-parser": "^2.2.11"
+            }
+        },
+        "aigle": {
+            "version": "1.14.1",
+            "resolved": "https://registry.npmjs.org/aigle/-/aigle-1.14.1.tgz",
+            "integrity": "sha512-bCmQ65CEebspmpbWFs6ab3S27TNyVH1b5MledX8KoiGxUhsJmPUUGpaoSijhwawNnq5Lt8jbcq7Z7gUAD0nuTw==",
+            "dev": true,
+            "requires": {
+                "aigle-core": "^1.0.0"
+            }
+        },
+        "aigle-core": {
+            "version": "1.0.0",
+            "resolved": "https://registry.npmjs.org/aigle-core/-/aigle-core-1.0.0.tgz",
+            "integrity": "sha512-uGFWPumk5DLvYnUphNnff+kWC8VeAnjPbbU8ovsSHflKXGX77SD7cAN/aSBCLX3xnoJAM9KdtRgxUygRnSSu7A==",
+            "dev": true
+        },
+        "ajv": {
+            "version": "6.12.6",
+            "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
+            "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
+            "dev": true,
+            "requires": {
+                "fast-deep-equal": "^3.1.1",
+                "fast-json-stable-stringify": "^2.0.0",
+                "json-schema-traverse": "^0.4.1",
+                "uri-js": "^4.2.2"
+            }
+        },
+        "ajv-formats": {
+            "version": "2.1.1",
+            "resolved": "https://registry.npmjs.org/ajv-formats/-/ajv-formats-2.1.1.tgz",
+            "integrity": "sha512-Wx0Kx52hxE7C18hkMEggYlEifqWZtYaRgouJor+WMdPnQyEK13vgEWyVNup7SoeeoLMsr4kf5h6dOW11I15MUA==",
+            "dev": true,
+            "requires": {
+                "ajv": "^8.0.0"
+            },
+            "dependencies": {
+                "ajv": {
+                    "version": "8.12.0",
+                    "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.12.0.tgz",
+                    "integrity": "sha512-sRu1kpcO9yLtYxBKvqfTeh9KzZEwO3STyX1HT+4CaDzC6HpTGYhIhPIzj9XuKU7KYDwnaeh5hcOwjy1QuJzBPA==",
+                    "dev": true,
+                    "requires": {
+                        "fast-deep-equal": "^3.1.1",
+                        "json-schema-traverse": "^1.0.0",
+                        "require-from-string": "^2.0.2",
+                        "uri-js": "^4.2.2"
+                    }
+                },
+                "json-schema-traverse": {
+                    "version": "1.0.0",
+                    "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz",
+                    "integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==",
+                    "dev": true
+                }
+            }
+        },
+        "ajv-keywords": {
+            "version": "3.5.2",
+            "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.5.2.tgz",
+            "integrity": "sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==",
+            "dev": true,
+            "requires": {}
+        },
+        "ansi-html-community": {
+            "version": "0.0.8",
+            "resolved": "https://registry.npmjs.org/ansi-html-community/-/ansi-html-community-0.0.8.tgz",
+            "integrity": "sha512-1APHAyr3+PCamwNw3bXCPp4HFLONZt/yIH0sZp0/469KWNTEy+qN5jQ3GVX6DMZ1UXAi34yVwtTeaG/HpBuuzw==",
+            "dev": true
+        },
+        "ansi-regex": {
+            "version": "5.0.1",
+            "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
+            "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
+            "dev": true
+        },
+        "ansi-styles": {
+            "version": "4.3.0",
+            "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+            "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+            "dev": true,
+            "requires": {
+                "color-convert": "^2.0.1"
+            }
+        },
+        "any-promise": {
+            "version": "1.3.0",
+            "resolved": "https://registry.npmjs.org/any-promise/-/any-promise-1.3.0.tgz",
+            "integrity": "sha512-7UvmKalWRt1wgjL1RrGxoSJW/0QZFIegpeGvZG9kjp8vrRu55XTHbwnqq2GpXm9uLbcuhxm3IqX9OB4MZR1b2A==",
+            "dev": true
+        },
+        "anymatch": {
+            "version": "3.1.2",
+            "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.2.tgz",
+            "integrity": "sha512-P43ePfOAIupkguHUycrc4qJ9kz8ZiuOUijaETwX7THt0Y/GNK7v0aa8rY816xWjZ7rJdA5XdMcpVFTKMq+RvWg==",
+            "dev": true,
+            "requires": {
+                "normalize-path": "^3.0.0",
+                "picomatch": "^2.0.4"
+            }
+        },
+        "arg": {
+            "version": "5.0.2",
+            "resolved": "https://registry.npmjs.org/arg/-/arg-5.0.2.tgz",
+            "integrity": "sha512-PYjyFOLKQ9y57JvQ6QLo8dAgNqswh8M1RMJYdQduT6xbWSgK36P/Z/v+p888pM69jMMfS8Xd8F6I1kQ/I9HUGg==",
+            "dev": true
+        },
+        "array-flatten": {
+            "version": "2.1.2",
+            "resolved": "https://registry.npmjs.org/array-flatten/-/array-flatten-2.1.2.tgz",
+            "integrity": "sha512-hNfzcOV8W4NdualtqBFPyVO+54DSJuZGY9qT4pRroB6S9e3iiido2ISIC5h9R2sPJ8H3FHCIiEnsv1lPXO3KtQ==",
+            "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
+        },
+        "asn1.js": {
+            "version": "5.4.1",
+            "resolved": "https://registry.npmjs.org/asn1.js/-/asn1.js-5.4.1.tgz",
+            "integrity": "sha512-+I//4cYPccV8LdmBLiX8CYvf9Sp3vQsrqu2QNXRcrbiWvcx/UdlFiqUJJzxRQxgsZmvhXhn4cSKeSmoFjVdupA==",
+            "dev": true,
+            "requires": {
+                "bn.js": "^4.0.0",
+                "inherits": "^2.0.1",
+                "minimalistic-assert": "^1.0.0",
+                "safer-buffer": "^2.1.0"
+            },
+            "dependencies": {
+                "bn.js": {
+                    "version": "4.12.0",
+                    "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.0.tgz",
+                    "integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA==",
+                    "dev": true
+                }
+            }
+        },
+        "assert": {
+            "version": "1.5.1",
+            "resolved": "https://registry.npmjs.org/assert/-/assert-1.5.1.tgz",
+            "integrity": "sha512-zzw1uCAgLbsKwBfFc8CX78DDg+xZeBksSO3vwVIDDN5i94eOrPsSSyiVhmsSABFDM/OcpE2aagCat9dnWQLG1A==",
+            "dev": true,
+            "requires": {
+                "object.assign": "^4.1.4",
+                "util": "^0.10.4"
+            },
+            "dependencies": {
+                "inherits": {
+                    "version": "2.0.3",
+                    "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
+                    "integrity": "sha512-x00IRNXNy63jwGkJmzPigoySHbaqpNuzKbBOmzK+g2OdZpQ9w+sxCN+VSB3ja7IAge2OP2qpfxTjeNcyjmW1uw==",
+                    "dev": true
+                },
+                "util": {
+                    "version": "0.10.4",
+                    "resolved": "https://registry.npmjs.org/util/-/util-0.10.4.tgz",
+                    "integrity": "sha512-0Pm9hTQ3se5ll1XihRic3FDIku70C+iHUdT/W926rSgHV5QgXsYbKZN8MSC3tJtSkhuROzvsQjAaFENRXr+19A==",
+                    "dev": true,
+                    "requires": {
+                        "inherits": "2.0.3"
+                    }
+                }
+            }
+        },
+        "asynckit": {
+            "version": "0.4.0",
+            "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz",
+            "integrity": "sha1-x57Zf380y48robyXkLzDZkdLS3k= sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q==",
+            "dev": true
+        },
+        "autoprefixer": {
+            "version": "10.4.16",
+            "resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-10.4.16.tgz",
+            "integrity": "sha512-7vd3UC6xKp0HLfua5IjZlcXvGAGy7cBAXTg2lyQ/8WpNhd6SiZ8Be+xm3FyBSYJx5GKcpRCzBh7RH4/0dnY+uQ==",
+            "dev": true,
+            "requires": {
+                "browserslist": "^4.21.10",
+                "caniuse-lite": "^1.0.30001538",
+                "fraction.js": "^4.3.6",
+                "normalize-range": "^0.1.2",
+                "picocolors": "^1.0.0",
+                "postcss-value-parser": "^4.2.0"
+            }
+        },
+        "axios": {
+            "version": "1.6.2",
+            "resolved": "https://registry.npmjs.org/axios/-/axios-1.6.2.tgz",
+            "integrity": "sha512-7i24Ri4pmDRfJTR7LDBhsOTtcm+9kjX5WiY1X3wIisx6G9So3pfMkEiU7emUBe46oceVImccTEM3k6C5dbVW8A==",
+            "dev": true,
+            "requires": {
+                "follow-redirects": "^1.15.0",
+                "form-data": "^4.0.0",
+                "proxy-from-env": "^1.1.0"
+            }
+        },
+        "babel-loader": {
+            "version": "8.2.5",
+            "resolved": "https://registry.npmjs.org/babel-loader/-/babel-loader-8.2.5.tgz",
+            "integrity": "sha512-OSiFfH89LrEMiWd4pLNqGz4CwJDtbs2ZVc+iGu2HrkRfPxId9F2anQj38IxWpmRfsUY0aBZYi1EFcd3mhtRMLQ==",
+            "dev": true,
+            "requires": {
+                "find-cache-dir": "^3.3.1",
+                "loader-utils": "^2.0.0",
+                "make-dir": "^3.1.0",
+                "schema-utils": "^2.6.5"
+            }
+        },
+        "babel-plugin-dynamic-import-node": {
+            "version": "2.3.3",
+            "resolved": "https://registry.npmjs.org/babel-plugin-dynamic-import-node/-/babel-plugin-dynamic-import-node-2.3.3.tgz",
+            "integrity": "sha512-jZVI+s9Zg3IqA/kdi0i6UDCybUI3aSBLnglhYbSSjKlV7yF1F/5LWv8MakQmvYpnbJDS6fcBL2KzHSxNCMtWSQ==",
+            "dev": true,
+            "requires": {
+                "object.assign": "^4.1.0"
+            }
+        },
+        "babel-plugin-polyfill-corejs2": {
+            "version": "0.3.1",
+            "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-corejs2/-/babel-plugin-polyfill-corejs2-0.3.1.tgz",
+            "integrity": "sha512-v7/T6EQcNfVLfcN2X8Lulb7DjprieyLWJK/zOWH5DUYcAgex9sP3h25Q+DLsX9TloXe3y1O8l2q2Jv9q8UVB9w==",
+            "dev": true,
+            "requires": {
+                "@babel/compat-data": "^7.13.11",
+                "@babel/helper-define-polyfill-provider": "^0.3.1",
+                "semver": "^6.1.1"
+            },
+            "dependencies": {
+                "semver": {
+                    "version": "6.3.1",
+                    "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
+                    "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==",
+                    "dev": true
+                }
+            }
+        },
+        "babel-plugin-polyfill-corejs3": {
+            "version": "0.5.2",
+            "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.5.2.tgz",
+            "integrity": "sha512-G3uJih0XWiID451fpeFaYGVuxHEjzKTHtc9uGFEjR6hHrvNzeS/PX+LLLcetJcytsB5m4j+K3o/EpXJNb/5IEQ==",
+            "dev": true,
+            "requires": {
+                "@babel/helper-define-polyfill-provider": "^0.3.1",
+                "core-js-compat": "^3.21.0"
+            }
+        },
+        "babel-plugin-polyfill-regenerator": {
+            "version": "0.3.1",
+            "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-regenerator/-/babel-plugin-polyfill-regenerator-0.3.1.tgz",
+            "integrity": "sha512-Y2B06tvgHYt1x0yz17jGkGeeMr5FeKUu+ASJ+N6nB5lQ8Dapfg42i0OVrf8PNGJ3zKL4A23snMi1IRwrqqND7A==",
+            "dev": true,
+            "requires": {
+                "@babel/helper-define-polyfill-provider": "^0.3.1"
+            }
+        },
+        "balanced-match": {
+            "version": "1.0.0",
+            "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz",
+            "integrity": "sha512-9Y0g0Q8rmSt+H33DfKv7FOc3v+iRI+o1lbzt8jGcIosYW37IIW/2XVYq5NPdmaD5NQ59Nk26Kl/vZbwW9Fr8vg==",
+            "dev": true
+        },
+        "base64-js": {
+            "version": "1.5.1",
+            "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.5.1.tgz",
+            "integrity": "sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==",
+            "dev": true
+        },
+        "batch": {
+            "version": "0.6.1",
+            "resolved": "https://registry.npmjs.org/batch/-/batch-0.6.1.tgz",
+            "integrity": "sha512-x+VAiMRL6UPkx+kudNvxTl6hB2XNNCG2r+7wixVfIYwu/2HKRXimwQyaumLjMveWvT2Hkd/cAJw+QBMfJ/EKVw==",
+            "dev": true
+        },
+        "big.js": {
+            "version": "5.2.2",
+            "resolved": "https://registry.npmjs.org/big.js/-/big.js-5.2.2.tgz",
+            "integrity": "sha512-vyL2OymJxmarO8gxMr0mhChsO9QGwhynfuu4+MHTAW6czfq9humCB7rKpUjDd9YUiDPU4mzpyupFSvOClAwbmQ==",
+            "dev": true
+        },
+        "binary-extensions": {
+            "version": "2.2.0",
+            "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.2.0.tgz",
+            "integrity": "sha512-jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA==",
+            "dev": true
+        },
+        "blade-formatter": {
+            "version": "1.38.6",
+            "resolved": "https://registry.npmjs.org/blade-formatter/-/blade-formatter-1.38.6.tgz",
+            "integrity": "sha512-XwW1A4G7GPXjCG7oPKkvBp8UVb/YS/zoS8FbuuUbrnwzzmoVEe29oSqh1JpCVj9+SI2ye/qohRuXNkwHjcq/Ww==",
+            "dev": true,
+            "requires": {
+                "@prettier/plugin-php": "^0.19.7",
+                "@shufo/tailwindcss-class-sorter": "3.0.1",
+                "aigle": "^1.14.1",
+                "ajv": "^8.9.0",
+                "chalk": "^4.1.0",
+                "concat-stream": "^2.0.0",
+                "detect-indent": "^6.0.0",
+                "find-config": "^1.0.0",
+                "glob": "^8.0.1",
+                "html-attribute-sorter": "^0.4.3",
+                "ignore": "^5.1.8",
+                "js-beautify": "^1.14.8",
+                "lodash": "^4.17.19",
+                "php-parser": "3.1.5",
+                "prettier": "^2.2.0",
+                "tailwindcss": "^3.1.8",
+                "vscode-oniguruma": "1.7.0",
+                "vscode-textmate": "^7.0.1",
+                "xregexp": "^5.0.1",
+                "yargs": "^17.3.1"
+            },
+            "dependencies": {
+                "ajv": {
+                    "version": "8.11.0",
+                    "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.11.0.tgz",
+                    "integrity": "sha512-wGgprdCvMalC0BztXvitD2hC04YffAvtsUn93JbGXYLAtCUO4xd17mCCZQxUOItiBwZvJScWo8NIvQMQ71rdpg==",
+                    "dev": true,
+                    "requires": {
+                        "fast-deep-equal": "^3.1.1",
+                        "json-schema-traverse": "^1.0.0",
+                        "require-from-string": "^2.0.2",
+                        "uri-js": "^4.2.2"
+                    }
+                },
+                "brace-expansion": {
+                    "version": "2.0.1",
+                    "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz",
+                    "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==",
+                    "dev": true,
+                    "requires": {
+                        "balanced-match": "^1.0.0"
+                    }
+                },
+                "glob": {
+                    "version": "8.0.3",
+                    "resolved": "https://registry.npmjs.org/glob/-/glob-8.0.3.tgz",
+                    "integrity": "sha512-ull455NHSHI/Y1FqGaaYFaLGkNMMJbavMrEGFXG/PGrg6y7sutWHUHrz6gy6WEBH6akM1M414dWKCNs+IhKdiQ==",
+                    "dev": true,
+                    "requires": {
+                        "fs.realpath": "^1.0.0",
+                        "inflight": "^1.0.4",
+                        "inherits": "2",
+                        "minimatch": "^5.0.1",
+                        "once": "^1.3.0"
+                    }
+                },
+                "json-schema-traverse": {
+                    "version": "1.0.0",
+                    "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz",
+                    "integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==",
+                    "dev": true
+                },
+                "minimatch": {
+                    "version": "5.1.0",
+                    "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-5.1.0.tgz",
+                    "integrity": "sha512-9TPBGGak4nHfGZsPBohm9AWg6NoT7QTCehS3BIJABslyZbzxfV78QM2Y6+i741OPZIafFAaiiEMh5OyIrJPgtg==",
+                    "dev": true,
+                    "requires": {
+                        "brace-expansion": "^2.0.1"
+                    }
+                }
+            }
+        },
+        "bn.js": {
+            "version": "5.2.1",
+            "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-5.2.1.tgz",
+            "integrity": "sha512-eXRvHzWyYPBuB4NBy0cmYQjGitUrtqwbvlzP3G6VFnNRbsZQIxQ10PbKKHt8gZ/HW/D/747aDl+QkDqg3KQLMQ==",
+            "dev": true
+        },
+        "body-parser": {
+            "version": "1.20.1",
+            "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.20.1.tgz",
+            "integrity": "sha512-jWi7abTbYwajOytWCQc37VulmWiRae5RyTpaCyDcS5/lMdtwSz5lOpDE67srw/HYe35f1z3fDQw+3txg7gNtWw==",
+            "dev": true,
+            "requires": {
+                "bytes": "3.1.2",
+                "content-type": "~1.0.4",
+                "debug": "2.6.9",
+                "depd": "2.0.0",
+                "destroy": "1.2.0",
+                "http-errors": "2.0.0",
+                "iconv-lite": "0.4.24",
+                "on-finished": "2.4.1",
+                "qs": "6.11.0",
+                "raw-body": "2.5.1",
+                "type-is": "~1.6.18",
+                "unpipe": "1.0.0"
+            },
+            "dependencies": {
+                "bytes": {
+                    "version": "3.1.2",
+                    "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.1.2.tgz",
+                    "integrity": "sha512-/Nf7TyzTx6S3yRJObOAV7956r8cr2+Oj8AC5dt8wSP3BQAoeX58NoHyCU8P8zGkNXStjTSi6fzO6F0pBdcYbEg==",
+                    "dev": true
+                },
+                "debug": {
+                    "version": "2.6.9",
+                    "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+                    "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+                    "dev": true,
+                    "requires": {
+                        "ms": "2.0.0"
+                    }
+                },
+                "ms": {
+                    "version": "2.0.0",
+                    "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+                    "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==",
+                    "dev": true
+                },
+                "qs": {
+                    "version": "6.11.0",
+                    "resolved": "https://registry.npmjs.org/qs/-/qs-6.11.0.tgz",
+                    "integrity": "sha512-MvjoMCJwEarSbUYk5O+nmoSzSutSsTwF85zcHPQ9OrlFoZOYIjaqBAJIqIXjptyD5vThxGq52Xu/MaJzRkIk4Q==",
+                    "dev": true,
+                    "requires": {
+                        "side-channel": "^1.0.4"
+                    }
+                }
+            }
+        },
+        "bonjour-service": {
+            "version": "1.1.1",
+            "resolved": "https://registry.npmjs.org/bonjour-service/-/bonjour-service-1.1.1.tgz",
+            "integrity": "sha512-Z/5lQRMOG9k7W+FkeGTNjh7htqn/2LMnfOvBZ8pynNZCM9MwkQkI3zeI4oz09uWdcgmgHugVvBqxGg4VQJ5PCg==",
+            "dev": true,
+            "requires": {
+                "array-flatten": "^2.1.2",
+                "dns-equal": "^1.0.0",
+                "fast-deep-equal": "^3.1.3",
+                "multicast-dns": "^7.2.5"
+            }
+        },
+        "boolbase": {
+            "version": "1.0.0",
+            "resolved": "https://registry.npmjs.org/boolbase/-/boolbase-1.0.0.tgz",
+            "integrity": "sha512-JZOSA7Mo9sNGB8+UjSgzdLtokWAky1zbztM3WRLCbZ70/3cTANmQmOdR7y2g+J0e2WXywy1yS468tY+IruqEww==",
+            "dev": true
+        },
+        "bootstrap": {
+            "version": "4.6.2",
+            "resolved": "https://registry.npmjs.org/bootstrap/-/bootstrap-4.6.2.tgz",
+            "integrity": "sha512-51Bbp/Uxr9aTuy6ca/8FbFloBUJZLHwnhTcnjIeRn2suQWsWzcuJhGjKDB5eppVte/8oCdOL3VuwxvZDUggwGQ==",
+            "dev": true,
+            "requires": {}
+        },
+        "brace-expansion": {
+            "version": "1.1.11",
+            "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
+            "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
+            "dev": true,
+            "requires": {
+                "balanced-match": "^1.0.0",
+                "concat-map": "0.0.1"
+            }
+        },
+        "braces": {
+            "version": "3.0.2",
+            "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz",
+            "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==",
+            "dev": true,
+            "requires": {
+                "fill-range": "^7.0.1"
+            }
+        },
+        "brorand": {
+            "version": "1.1.0",
+            "resolved": "https://registry.npmjs.org/brorand/-/brorand-1.1.0.tgz",
+            "integrity": "sha512-cKV8tMCEpQs4hK/ik71d6LrPOnpkpGBR0wzxqr68g2m/LB2GxVYQroAjMJZRVM1Y4BCjCKc3vAamxSzOY2RP+w==",
+            "dev": true
+        },
+        "browserify-aes": {
+            "version": "1.2.0",
+            "resolved": "https://registry.npmjs.org/browserify-aes/-/browserify-aes-1.2.0.tgz",
+            "integrity": "sha512-+7CHXqGuspUn/Sl5aO7Ea0xWGAtETPXNSAjHo48JfLdPWcMng33Xe4znFvQweqc/uzk5zSOI3H52CYnjCfb5hA==",
+            "dev": true,
+            "requires": {
+                "buffer-xor": "^1.0.3",
+                "cipher-base": "^1.0.0",
+                "create-hash": "^1.1.0",
+                "evp_bytestokey": "^1.0.3",
+                "inherits": "^2.0.1",
+                "safe-buffer": "^5.0.1"
+            }
+        },
+        "browserify-cipher": {
+            "version": "1.0.1",
+            "resolved": "https://registry.npmjs.org/browserify-cipher/-/browserify-cipher-1.0.1.tgz",
+            "integrity": "sha512-sPhkz0ARKbf4rRQt2hTpAHqn47X3llLkUGn+xEJzLjwY8LRs2p0v7ljvI5EyoRO/mexrNunNECisZs+gw2zz1w==",
+            "dev": true,
+            "requires": {
+                "browserify-aes": "^1.0.4",
+                "browserify-des": "^1.0.0",
+                "evp_bytestokey": "^1.0.0"
+            }
+        },
+        "browserify-des": {
+            "version": "1.0.2",
+            "resolved": "https://registry.npmjs.org/browserify-des/-/browserify-des-1.0.2.tgz",
+            "integrity": "sha512-BioO1xf3hFwz4kc6iBhI3ieDFompMhrMlnDFC4/0/vd5MokpuAc3R+LYbwTA9A5Yc9pq9UYPqffKpW2ObuwX5A==",
+            "dev": true,
+            "requires": {
+                "cipher-base": "^1.0.1",
+                "des.js": "^1.0.0",
+                "inherits": "^2.0.1",
+                "safe-buffer": "^5.1.2"
+            }
+        },
+        "browserify-rsa": {
+            "version": "4.1.0",
+            "resolved": "https://registry.npmjs.org/browserify-rsa/-/browserify-rsa-4.1.0.tgz",
+            "integrity": "sha512-AdEER0Hkspgno2aR97SAf6vi0y0k8NuOpGnVH3O99rcA5Q6sh8QxcngtHuJ6uXwnfAXNM4Gn1Gb7/MV1+Ymbog==",
+            "dev": true,
+            "requires": {
+                "bn.js": "^5.0.0",
+                "randombytes": "^2.0.1"
+            }
+        },
+        "browserify-sign": {
+            "version": "4.2.2",
+            "resolved": "https://registry.npmjs.org/browserify-sign/-/browserify-sign-4.2.2.tgz",
+            "integrity": "sha512-1rudGyeYY42Dk6texmv7c4VcQ0EsvVbLwZkA+AQB7SxvXxmcD93jcHie8bzecJ+ChDlmAm2Qyu0+Ccg5uhZXCg==",
+            "dev": true,
+            "requires": {
+                "bn.js": "^5.2.1",
+                "browserify-rsa": "^4.1.0",
+                "create-hash": "^1.2.0",
+                "create-hmac": "^1.1.7",
+                "elliptic": "^6.5.4",
+                "inherits": "^2.0.4",
+                "parse-asn1": "^5.1.6",
+                "readable-stream": "^3.6.2",
+                "safe-buffer": "^5.2.1"
+            },
+            "dependencies": {
+                "safe-buffer": {
+                    "version": "5.2.1",
+                    "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz",
+                    "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==",
+                    "dev": true
+                }
+            }
+        },
+        "browserify-zlib": {
+            "version": "0.2.0",
+            "resolved": "https://registry.npmjs.org/browserify-zlib/-/browserify-zlib-0.2.0.tgz",
+            "integrity": "sha512-Z942RysHXmJrhqk88FmKBVq/v5tqmSkDz7p54G/MGyjMnCFFnC79XWNbg+Vta8W6Wb2qtSZTSxIGkJrRpCFEiA==",
+            "dev": true,
+            "requires": {
+                "pako": "~1.0.5"
+            }
+        },
+        "browserslist": {
+            "version": "4.22.1",
+            "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.22.1.tgz",
+            "integrity": "sha512-FEVc202+2iuClEhZhrWy6ZiAcRLvNMyYcxZ8raemul1DYVOVdFsbqckWLdsixQZCpJlwe77Z3UTalE7jsjnKfQ==",
+            "dev": true,
+            "requires": {
+                "caniuse-lite": "^1.0.30001541",
+                "electron-to-chromium": "^1.4.535",
+                "node-releases": "^2.0.13",
+                "update-browserslist-db": "^1.0.13"
+            }
+        },
+        "buffer": {
+            "version": "4.9.2",
+            "resolved": "https://registry.npmjs.org/buffer/-/buffer-4.9.2.tgz",
+            "integrity": "sha512-xq+q3SRMOxGivLhBNaUdC64hDTQwejJ+H0T/NB1XMtTVEwNTrfFF3gAxiyW0Bu/xWEGhjVKgUcMhCrUy2+uCWg==",
+            "dev": true,
+            "requires": {
+                "base64-js": "^1.0.2",
+                "ieee754": "^1.1.4",
+                "isarray": "^1.0.0"
+            }
+        },
+        "buffer-from": {
+            "version": "1.1.1",
+            "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.1.tgz",
+            "integrity": "sha512-MQcXEUbCKtEo7bhqEs6560Hyd4XaovZlO/k9V3hjVUF/zwW7KBVdSK4gIt/bzwS9MbR5qob+F5jusZsb0YQK2A==",
+            "dev": true
+        },
+        "buffer-xor": {
+            "version": "1.0.3",
+            "resolved": "https://registry.npmjs.org/buffer-xor/-/buffer-xor-1.0.3.tgz",
+            "integrity": "sha512-571s0T7nZWK6vB67HI5dyUF7wXiNcfaPPPTl6zYCNApANjIvYJTg7hlud/+cJpdAhS7dVzqMLmfhfHR3rAcOjQ==",
+            "dev": true
+        },
+        "builtin-status-codes": {
+            "version": "3.0.0",
+            "resolved": "https://registry.npmjs.org/builtin-status-codes/-/builtin-status-codes-3.0.0.tgz",
+            "integrity": "sha512-HpGFw18DgFWlncDfjTa2rcQ4W88O1mC8e8yZ2AvQY5KDaktSTwo+KRf6nHK6FRI5FyRyb/5T6+TSxfP7QyGsmQ==",
+            "dev": true
+        },
+        "bytes": {
+            "version": "3.0.0",
+            "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.0.0.tgz",
+            "integrity": "sha512-pMhOfFDPiv9t5jjIXkHosWmkSyQbvsgEVNkz0ERHbuLh2T/7j4Mqqpz523Fe8MVY89KC6Sh/QfS2sM+SjgFDcw==",
+            "dev": true
+        },
+        "call-bind": {
+            "version": "1.0.2",
+            "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.2.tgz",
+            "integrity": "sha512-7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA==",
+            "dev": true,
+            "requires": {
+                "function-bind": "^1.1.1",
+                "get-intrinsic": "^1.0.2"
+            }
+        },
+        "callsites": {
+            "version": "3.1.0",
+            "resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz",
+            "integrity": "sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==",
+            "dev": true
+        },
+        "camel-case": {
+            "version": "4.1.2",
+            "resolved": "https://registry.npmjs.org/camel-case/-/camel-case-4.1.2.tgz",
+            "integrity": "sha512-gxGWBrTT1JuMx6R+o5PTXMmUnhnVzLQ9SNutD4YqKtI6ap897t3tKECYla6gCWEkplXnlNybEkZg9GEGxKFCgw==",
+            "dev": true,
+            "requires": {
+                "pascal-case": "^3.1.2",
+                "tslib": "^2.0.3"
+            }
+        },
+        "camelcase-css": {
+            "version": "2.0.1",
+            "resolved": "https://registry.npmjs.org/camelcase-css/-/camelcase-css-2.0.1.tgz",
+            "integrity": "sha512-QOSvevhslijgYwRx6Rv7zKdMF8lbRmx+uQGx2+vDc+KI/eBnsy9kit5aj23AgGu3pa4t9AgwbnXWqS+iOY+2aA==",
+            "dev": true
+        },
+        "caniuse-api": {
+            "version": "3.0.0",
+            "resolved": "https://registry.npmjs.org/caniuse-api/-/caniuse-api-3.0.0.tgz",
+            "integrity": "sha512-bsTwuIg/BZZK/vreVTYYbSWoe2F+71P7K5QGEX+pT250DZbfU1MQ5prOKpPR+LL6uWKK3KMwMCAS74QB3Um1uw==",
+            "dev": true,
+            "requires": {
+                "browserslist": "^4.0.0",
+                "caniuse-lite": "^1.0.0",
+                "lodash.memoize": "^4.1.2",
+                "lodash.uniq": "^4.5.0"
+            }
+        },
+        "caniuse-lite": {
+            "version": "1.0.30001551",
+            "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001551.tgz",
+            "integrity": "sha512-vtBAez47BoGMMzlbYhfXrMV1kvRF2WP/lqiMuDu1Sb4EE4LKEgjopFDSRtZfdVnslNRpOqV/woE+Xgrwj6VQlg==",
+            "dev": true
+        },
+        "chalk": {
+            "version": "4.1.2",
+            "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+            "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+            "dev": true,
+            "requires": {
+                "ansi-styles": "^4.1.0",
+                "supports-color": "^7.1.0"
+            }
+        },
+        "charenc": {
+            "version": "0.0.2",
+            "resolved": "https://registry.npmjs.org/charenc/-/charenc-0.0.2.tgz",
+            "integrity": "sha512-yrLQ/yVUFXkzg7EDQsPieE/53+0RlaWTs+wBrvW36cyilJ2SaDWfl4Yj7MtLTXleV9uEKefbAGUPv2/iWSooRA==",
+            "dev": true
+        },
+        "chokidar": {
+            "version": "3.5.3",
+            "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.5.3.tgz",
+            "integrity": "sha512-Dr3sfKRP6oTcjf2JmUmFJfeVMvXBdegxB0iVQ5eb2V10uFJUCAS8OByZdVAyVb8xXNz3GjjTgj9kLWsZTqE6kw==",
+            "dev": true,
+            "requires": {
+                "anymatch": "~3.1.2",
+                "braces": "~3.0.2",
+                "fsevents": "~2.3.2",
+                "glob-parent": "~5.1.2",
+                "is-binary-path": "~2.1.0",
+                "is-glob": "~4.0.1",
+                "normalize-path": "~3.0.0",
+                "readdirp": "~3.6.0"
+            }
+        },
+        "chrome-trace-event": {
+            "version": "1.0.3",
+            "resolved": "https://registry.npmjs.org/chrome-trace-event/-/chrome-trace-event-1.0.3.tgz",
+            "integrity": "sha512-p3KULyQg4S7NIHixdwbGX+nFHkoBiA4YQmyWtjb8XngSKV124nJmRysgAeujbUVb15vh+RvFUfCPqU7rXk+hZg==",
+            "dev": true
+        },
+        "cipher-base": {
+            "version": "1.0.4",
+            "resolved": "https://registry.npmjs.org/cipher-base/-/cipher-base-1.0.4.tgz",
+            "integrity": "sha512-Kkht5ye6ZGmwv40uUDZztayT2ThLQGfnj/T71N/XzeZeo3nf8foyW7zGTsPYkEya3m5f3cAypH+qe7YOrM1U2Q==",
+            "dev": true,
+            "requires": {
+                "inherits": "^2.0.1",
+                "safe-buffer": "^5.0.1"
+            }
+        },
+        "clean-css": {
+            "version": "5.3.2",
+            "resolved": "https://registry.npmjs.org/clean-css/-/clean-css-5.3.2.tgz",
+            "integrity": "sha512-JVJbM+f3d3Q704rF4bqQ5UUyTtuJ0JRKNbTKVEeujCCBoMdkEi+V+e8oktO9qGQNSvHrFTM6JZRXrUvGR1czww==",
+            "dev": true,
+            "requires": {
+                "source-map": "~0.6.0"
+            }
+        },
+        "cli-table3": {
+            "version": "0.6.3",
+            "resolved": "https://registry.npmjs.org/cli-table3/-/cli-table3-0.6.3.tgz",
+            "integrity": "sha512-w5Jac5SykAeZJKntOxJCrm63Eg5/4dhMWIcuTbo9rpE+brgaSZo0RuNJZeOyMgsUdhDeojvgyQLmjI+K50ZGyg==",
+            "dev": true,
+            "requires": {
+                "@colors/colors": "1.5.0",
+                "string-width": "^4.2.0"
+            }
+        },
+        "cliui": {
+            "version": "7.0.4",
+            "resolved": "https://registry.npmjs.org/cliui/-/cliui-7.0.4.tgz",
+            "integrity": "sha512-OcRE68cOsVMXp1Yvonl/fzkQOyjLSu/8bhPDfQt0e0/Eb283TKP20Fs2MqoPsr9SwA595rRCA+QMzYc9nBP+JQ==",
+            "dev": true,
+            "requires": {
+                "string-width": "^4.2.0",
+                "strip-ansi": "^6.0.0",
+                "wrap-ansi": "^7.0.0"
+            }
+        },
+        "clone-deep": {
+            "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": {
+                "is-plain-object": "^2.0.4",
+                "kind-of": "^6.0.2",
+                "shallow-clone": "^3.0.0"
+            }
+        },
+        "collect.js": {
+            "version": "4.34.3",
+            "resolved": "https://registry.npmjs.org/collect.js/-/collect.js-4.34.3.tgz",
+            "integrity": "sha512-aFr67xDazPwthsGm729mnClgNuh15JEagU6McKBKqxuHOkWL7vMFzGbhsXDdPZ+H6ia5QKIMGYuGOMENBHnVpg==",
+            "dev": true
+        },
+        "color-convert": {
+            "version": "2.0.1",
+            "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+            "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+            "dev": true,
+            "requires": {
+                "color-name": "~1.1.4"
+            }
+        },
+        "color-name": {
+            "version": "1.1.4",
+            "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+            "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+            "dev": true
+        },
+        "colord": {
+            "version": "2.9.3",
+            "resolved": "https://registry.npmjs.org/colord/-/colord-2.9.3.tgz",
+            "integrity": "sha512-jeC1axXpnb0/2nn/Y1LPuLdgXBLH7aDcHu4KEKfqw3CUhX7ZpfBSlPKyqXE6btIgEzfWtrX3/tyBCaCvXvMkOw==",
+            "dev": true
+        },
+        "colorette": {
+            "version": "2.0.20",
+            "resolved": "https://registry.npmjs.org/colorette/-/colorette-2.0.20.tgz",
+            "integrity": "sha512-IfEDxwoWIjkeXL1eXcDiow4UbKjhLdq6/EuSVR9GMN7KVH3r9gQ83e73hsz1Nd1T3ijd5xv1wcWRYO+D6kCI2w==",
+            "dev": true
+        },
+        "combined-stream": {
+            "version": "1.0.8",
+            "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz",
+            "integrity": "sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==",
+            "dev": true,
+            "requires": {
+                "delayed-stream": "~1.0.0"
+            }
+        },
+        "commander": {
+            "version": "7.2.0",
+            "resolved": "https://registry.npmjs.org/commander/-/commander-7.2.0.tgz",
+            "integrity": "sha512-QrWXB+ZQSVPmIWIhtEO9H+gwHaMGYiF5ChvoJ+K9ZGHG/sVsa6yiesAD1GC/x46sET00Xlwo1u49RVVVzvcSkw==",
+            "dev": true
+        },
+        "commondir": {
+            "version": "1.0.1",
+            "resolved": "https://registry.npmjs.org/commondir/-/commondir-1.0.1.tgz",
+            "integrity": "sha512-W9pAhw0ja1Edb5GVdIF1mjZw/ASI0AlShXM83UUGe2DVr5TdAPEA1OA8m/g8zWp9x6On7gqufY+FatDbC3MDQg==",
+            "dev": true
+        },
+        "compressible": {
+            "version": "2.0.18",
+            "resolved": "https://registry.npmjs.org/compressible/-/compressible-2.0.18.tgz",
+            "integrity": "sha512-AF3r7P5dWxL8MxyITRMlORQNaOA2IkAFaTr4k7BUumjPtRpGDTZpl0Pb1XCO6JeDCBdp126Cgs9sMxqSjgYyRg==",
+            "dev": true,
+            "requires": {
+                "mime-db": ">= 1.43.0 < 2"
+            }
+        },
+        "compression": {
+            "version": "1.7.4",
+            "resolved": "https://registry.npmjs.org/compression/-/compression-1.7.4.tgz",
+            "integrity": "sha512-jaSIDzP9pZVS4ZfQ+TzvtiWhdpFhE2RDHz8QJkpX9SIpLq88VueF5jJw6t+6CUQcAoA6t+x89MLrWAqpfDE8iQ==",
+            "dev": true,
+            "requires": {
+                "accepts": "~1.3.5",
+                "bytes": "3.0.0",
+                "compressible": "~2.0.16",
+                "debug": "2.6.9",
+                "on-headers": "~1.0.2",
+                "safe-buffer": "5.1.2",
+                "vary": "~1.1.2"
+            },
+            "dependencies": {
+                "debug": {
+                    "version": "2.6.9",
+                    "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+                    "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+                    "dev": true,
+                    "requires": {
+                        "ms": "2.0.0"
+                    }
+                },
+                "ms": {
+                    "version": "2.0.0",
+                    "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+                    "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==",
+                    "dev": true
+                }
+            }
+        },
+        "concat": {
+            "version": "1.0.3",
+            "resolved": "https://registry.npmjs.org/concat/-/concat-1.0.3.tgz",
+            "integrity": "sha1-QPM1MInWVGdpXLGIa0Xt1jfYzKg= sha512-f/ZaH1aLe64qHgTILdldbvyfGiGF4uzeo9IuXUloIOLQzFmIPloy9QbZadNsuVv0j5qbKQvQb/H/UYf2UsKTpw==",
+            "dev": true,
+            "requires": {
+                "commander": "^2.9.0"
+            },
+            "dependencies": {
+                "commander": {
+                    "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
+                }
+            }
+        },
+        "concat-map": {
+            "version": "0.0.1",
+            "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
+            "integrity": "sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==",
+            "dev": true
+        },
+        "concat-stream": {
+            "version": "2.0.0",
+            "resolved": "https://registry.npmjs.org/concat-stream/-/concat-stream-2.0.0.tgz",
+            "integrity": "sha512-MWufYdFw53ccGjCA+Ol7XJYpAlW6/prSMzuPOTRnJGcGzuhLn4Scrz7qf6o8bROZ514ltazcIFJZevcfbo0x7A==",
+            "dev": true,
+            "requires": {
+                "buffer-from": "^1.0.0",
+                "inherits": "^2.0.3",
+                "readable-stream": "^3.0.2",
+                "typedarray": "^0.0.6"
+            }
+        },
+        "config-chain": {
+            "version": "1.1.13",
+            "resolved": "https://registry.npmjs.org/config-chain/-/config-chain-1.1.13.tgz",
+            "integrity": "sha512-qj+f8APARXHrM0hraqXYb2/bOVSV4PvJQlNZ/DVj0QrmNM2q2euizkeuVckQ57J+W0mRH6Hvi+k50M4Jul2VRQ==",
+            "dev": true,
+            "requires": {
+                "ini": "^1.3.4",
+                "proto-list": "~1.2.1"
+            }
+        },
+        "connect-history-api-fallback": {
+            "version": "2.0.0",
+            "resolved": "https://registry.npmjs.org/connect-history-api-fallback/-/connect-history-api-fallback-2.0.0.tgz",
+            "integrity": "sha512-U73+6lQFmfiNPrYbXqr6kZ1i1wiRqXnp2nhMsINseWXO8lDau0LGEffJ8kQi4EjLZympVgRdvqjAgiZ1tgzDDA==",
+            "dev": true
+        },
+        "consola": {
+            "version": "2.15.3",
+            "resolved": "https://registry.npmjs.org/consola/-/consola-2.15.3.tgz",
+            "integrity": "sha512-9vAdYbHj6x2fLKC4+oPH0kFzY/orMZyG2Aj+kNylHxKGJ/Ed4dpNyAQYwJOdqO4zdM7XpVHmyejQDcQHrnuXbw==",
+            "dev": true
+        },
+        "console-browserify": {
+            "version": "1.2.0",
+            "resolved": "https://registry.npmjs.org/console-browserify/-/console-browserify-1.2.0.tgz",
+            "integrity": "sha512-ZMkYO/LkF17QvCPqM0gxw8yUzigAOZOSWSHg91FH6orS7vcEj5dVZTidN2fQ14yBSdg97RqhSNwLUXInd52OTA==",
+            "dev": true
+        },
+        "constants-browserify": {
+            "version": "1.0.0",
+            "resolved": "https://registry.npmjs.org/constants-browserify/-/constants-browserify-1.0.0.tgz",
+            "integrity": "sha512-xFxOwqIzR/e1k1gLiWEophSCMqXcwVHIH7akf7b/vxcUeGunlj3hvZaaqxwHsTgn+IndtkQJgSztIDWeumWJDQ==",
+            "dev": true
+        },
+        "content-disposition": {
+            "version": "0.5.4",
+            "resolved": "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.4.tgz",
+            "integrity": "sha512-FveZTNuGw04cxlAiWbzi6zTAL/lhehaWbTtgluJh4/E95DqMwTmha3KZN1aAWA8cFIhHzMZUvLevkw5Rqk+tSQ==",
+            "dev": true,
+            "requires": {
+                "safe-buffer": "5.2.1"
+            },
+            "dependencies": {
+                "safe-buffer": {
+                    "version": "5.2.1",
+                    "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz",
+                    "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==",
+                    "dev": true
+                }
+            }
+        },
+        "content-type": {
+            "version": "1.0.5",
+            "resolved": "https://registry.npmjs.org/content-type/-/content-type-1.0.5.tgz",
+            "integrity": "sha512-nTjqfcBFEipKdXCv4YDQWCfmcLZKm81ldF0pAopTvyrFGVbcR6P/VAAd5G7N+0tTr8QqiU0tFadD6FK4NtJwOA==",
+            "dev": true
+        },
+        "convert-source-map": {
+            "version": "1.8.0",
+            "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.8.0.tgz",
+            "integrity": "sha512-+OQdjP49zViI/6i7nIJpA8rAl4sV/JdPfU9nZs3VqOwGIgizICvuN2ru6fMd+4llL0tar18UYJXfZ/TWtmhUjA==",
+            "dev": true,
+            "requires": {
+                "safe-buffer": "~5.1.1"
+            }
+        },
+        "cookie": {
+            "version": "0.5.0",
+            "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.5.0.tgz",
+            "integrity": "sha512-YZ3GUyn/o8gfKJlnlX7g7xq4gyO6OSuhGPKaaGssGB2qgDUS0gPgtTvoyZLTt9Ab6dC4hfc9dV5arkvc/OCmrw==",
+            "dev": true
+        },
+        "cookie-signature": {
+            "version": "1.0.6",
+            "resolved": "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.6.tgz",
+            "integrity": "sha512-QADzlaHc8icV8I7vbaJXJwod9HWYp8uCqf1xa4OfNu1T7JVxQIrUgOWtHdNDtPiywmFbiS12VjotIXLrKM3orQ==",
+            "dev": true
+        },
+        "core-js-compat": {
+            "version": "3.33.1",
+            "resolved": "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.33.1.tgz",
+            "integrity": "sha512-6pYKNOgD/j/bkC5xS5IIg6bncid3rfrI42oBH1SQJbsmYPKF7rhzcFzYCcxYMmNQQ0rCEB8WqpW7QHndOggaeQ==",
+            "dev": true,
+            "requires": {
+                "browserslist": "^4.22.1"
+            }
+        },
+        "core-js-pure": {
+            "version": "3.23.5",
+            "resolved": "https://registry.npmjs.org/core-js-pure/-/core-js-pure-3.23.5.tgz",
+            "integrity": "sha512-8t78LdpKSuCq4pJYCYk8hl7XEkAX+BP16yRIwL3AanTksxuEf7CM83vRyctmiEL8NDZ3jpUcv56fk9/zG3aIuw==",
+            "dev": true
+        },
+        "core-util-is": {
+            "version": "1.0.3",
+            "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.3.tgz",
+            "integrity": "sha512-ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ==",
+            "dev": true
+        },
+        "cosmiconfig": {
+            "version": "7.1.0",
+            "resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-7.1.0.tgz",
+            "integrity": "sha512-AdmX6xUzdNASswsFtmwSt7Vj8po9IuqXm0UXz7QKPuEUmPB4XyjGfaAr2PSuELMwkRMVH1EpIkX5bTZGRB3eCA==",
+            "dev": true,
+            "requires": {
+                "@types/parse-json": "^4.0.0",
+                "import-fresh": "^3.2.1",
+                "parse-json": "^5.0.0",
+                "path-type": "^4.0.0",
+                "yaml": "^1.10.0"
+            },
+            "dependencies": {
+                "yaml": {
+                    "version": "1.10.2",
+                    "resolved": "https://registry.npmjs.org/yaml/-/yaml-1.10.2.tgz",
+                    "integrity": "sha512-r3vXyErRCYJ7wg28yvBY5VSoAF8ZvlcW9/BwUzEtUsjvX/DKs24dIkuwjtuprwJJHsbyUbLApepYTR1BN4uHrg==",
+                    "dev": true
+                }
+            }
+        },
+        "create-ecdh": {
+            "version": "4.0.4",
+            "resolved": "https://registry.npmjs.org/create-ecdh/-/create-ecdh-4.0.4.tgz",
+            "integrity": "sha512-mf+TCx8wWc9VpuxfP2ht0iSISLZnt0JgWlrOKZiNqyUZWnjIaCIVNQArMHnCZKfEYRg6IM7A+NeJoN8gf/Ws0A==",
+            "dev": true,
+            "requires": {
+                "bn.js": "^4.1.0",
+                "elliptic": "^6.5.3"
+            },
+            "dependencies": {
+                "bn.js": {
+                    "version": "4.12.0",
+                    "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.0.tgz",
+                    "integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA==",
+                    "dev": true
+                }
+            }
+        },
+        "create-hash": {
+            "version": "1.2.0",
+            "resolved": "https://registry.npmjs.org/create-hash/-/create-hash-1.2.0.tgz",
+            "integrity": "sha512-z00bCGNHDG8mHAkP7CtT1qVu+bFQUPjYq/4Iv3C3kWjTFV10zIjfSoeqXo9Asws8gwSHDGj/hl2u4OGIjapeCg==",
+            "dev": true,
+            "requires": {
+                "cipher-base": "^1.0.1",
+                "inherits": "^2.0.1",
+                "md5.js": "^1.3.4",
+                "ripemd160": "^2.0.1",
+                "sha.js": "^2.4.0"
+            }
+        },
+        "create-hmac": {
+            "version": "1.1.7",
+            "resolved": "https://registry.npmjs.org/create-hmac/-/create-hmac-1.1.7.tgz",
+            "integrity": "sha512-MJG9liiZ+ogc4TzUwuvbER1JRdgvUFSB5+VR/g5h82fGaIRWMWddtKBHi7/sVhfjQZ6SehlyhvQYrcYkaUIpLg==",
+            "dev": true,
+            "requires": {
+                "cipher-base": "^1.0.3",
+                "create-hash": "^1.1.0",
+                "inherits": "^2.0.1",
+                "ripemd160": "^2.0.0",
+                "safe-buffer": "^5.0.1",
+                "sha.js": "^2.4.8"
+            }
+        },
+        "cross-env": {
+            "version": "7.0.3",
+            "resolved": "https://registry.npmjs.org/cross-env/-/cross-env-7.0.3.tgz",
+            "integrity": "sha512-+/HKd6EgcQCJGh2PSjZuUitQBQynKor4wrFbRg4DtAgS1aWO+gU52xpH7M9ScGgXSYmAVS9bIJ8EzuaGw0oNAw==",
+            "dev": true,
+            "requires": {
+                "cross-spawn": "^7.0.1"
+            }
+        },
+        "cross-spawn": {
+            "version": "7.0.3",
+            "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz",
+            "integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==",
+            "dev": true,
+            "requires": {
+                "path-key": "^3.1.0",
+                "shebang-command": "^2.0.0",
+                "which": "^2.0.1"
+            }
+        },
+        "crypt": {
+            "version": "0.0.2",
+            "resolved": "https://registry.npmjs.org/crypt/-/crypt-0.0.2.tgz",
+            "integrity": "sha512-mCxBlsHFYh9C+HVpiEacem8FEBnMXgU9gy4zmNC+SXAZNB/1idgp/aulFJ4FgCi7GPEVbfyng092GqL2k2rmow==",
+            "dev": true
+        },
+        "crypto-browserify": {
+            "version": "3.12.0",
+            "resolved": "https://registry.npmjs.org/crypto-browserify/-/crypto-browserify-3.12.0.tgz",
+            "integrity": "sha512-fz4spIh+znjO2VjL+IdhEpRJ3YN6sMzITSBijk6FK2UvTqruSQW+/cCZTSNsMiZNvUeq0CqurF+dAbyiGOY6Wg==",
+            "dev": true,
+            "requires": {
+                "browserify-cipher": "^1.0.0",
+                "browserify-sign": "^4.0.0",
+                "create-ecdh": "^4.0.0",
+                "create-hash": "^1.1.0",
+                "create-hmac": "^1.1.0",
+                "diffie-hellman": "^5.0.0",
+                "inherits": "^2.0.1",
+                "pbkdf2": "^3.0.3",
+                "public-encrypt": "^4.0.0",
+                "randombytes": "^2.0.0",
+                "randomfill": "^1.0.3"
+            }
+        },
+        "css-declaration-sorter": {
+            "version": "6.4.1",
+            "resolved": "https://registry.npmjs.org/css-declaration-sorter/-/css-declaration-sorter-6.4.1.tgz",
+            "integrity": "sha512-rtdthzxKuyq6IzqX6jEcIzQF/YqccluefyCYheovBOLhFT/drQA9zj/UbRAa9J7C0o6EG6u3E6g+vKkay7/k3g==",
+            "dev": true,
+            "requires": {}
+        },
+        "css-loader": {
+            "version": "5.2.7",
+            "resolved": "https://registry.npmjs.org/css-loader/-/css-loader-5.2.7.tgz",
+            "integrity": "sha512-Q7mOvpBNBG7YrVGMxRxcBJZFL75o+cH2abNASdibkj/fffYD8qWbInZrD0S9ccI6vZclF3DsHE7njGlLtaHbhg==",
+            "dev": true,
+            "requires": {
+                "icss-utils": "^5.1.0",
+                "loader-utils": "^2.0.0",
+                "postcss": "^8.2.15",
+                "postcss-modules-extract-imports": "^3.0.0",
+                "postcss-modules-local-by-default": "^4.0.0",
+                "postcss-modules-scope": "^3.0.0",
+                "postcss-modules-values": "^4.0.0",
+                "postcss-value-parser": "^4.1.0",
+                "schema-utils": "^3.0.0",
+                "semver": "^7.3.5"
+            },
+            "dependencies": {
+                "schema-utils": {
+                    "version": "3.3.0",
+                    "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.3.0.tgz",
+                    "integrity": "sha512-pN/yOAvcC+5rQ5nERGuwrjLlYvLTbCibnZ1I7B1LaiAz9BRBlE9GMgE/eqV30P7aJQUf7Ddimy/RsbYO/GrVGg==",
+                    "dev": true,
+                    "requires": {
+                        "@types/json-schema": "^7.0.8",
+                        "ajv": "^6.12.5",
+                        "ajv-keywords": "^3.5.2"
+                    }
+                }
+            }
+        },
+        "css-select": {
+            "version": "4.3.0",
+            "resolved": "https://registry.npmjs.org/css-select/-/css-select-4.3.0.tgz",
+            "integrity": "sha512-wPpOYtnsVontu2mODhA19JrqWxNsfdatRKd64kmpRbQgh1KtItko5sTnEpPdpSaJszTOhEMlF/RPz28qj4HqhQ==",
+            "dev": true,
+            "requires": {
+                "boolbase": "^1.0.0",
+                "css-what": "^6.0.1",
+                "domhandler": "^4.3.1",
+                "domutils": "^2.8.0",
+                "nth-check": "^2.0.1"
+            },
+            "dependencies": {
+                "domhandler": {
+                    "version": "4.3.1",
+                    "resolved": "https://registry.npmjs.org/domhandler/-/domhandler-4.3.1.tgz",
+                    "integrity": "sha512-GrwoxYN+uWlzO8uhUXRl0P+kHE4GtVPfYzVLcUxPL7KNdHKj66vvlhiweIHqYYXWlw+T8iLMp42Lm67ghw4WMQ==",
+                    "dev": true,
+                    "requires": {
+                        "domelementtype": "^2.2.0"
+                    }
+                }
+            }
+        },
+        "css-tree": {
+            "version": "1.1.3",
+            "resolved": "https://registry.npmjs.org/css-tree/-/css-tree-1.1.3.tgz",
+            "integrity": "sha512-tRpdppF7TRazZrjJ6v3stzv93qxRcSsFmW6cX0Zm2NVKpxE1WV1HblnghVv9TreireHkqI/VDEsfolRF1p6y7Q==",
+            "dev": true,
+            "requires": {
+                "mdn-data": "2.0.14",
+                "source-map": "^0.6.1"
+            }
+        },
+        "css-what": {
+            "version": "6.1.0",
+            "resolved": "https://registry.npmjs.org/css-what/-/css-what-6.1.0.tgz",
+            "integrity": "sha512-HTUrgRJ7r4dsZKU6GjmpfRK1O76h97Z8MfS1G0FozR+oF2kG6Vfe8JE6zwrkbxigziPHinCJ+gCPjA9EaBDtRw==",
+            "dev": true
+        },
+        "cssesc": {
+            "version": "3.0.0",
+            "resolved": "https://registry.npmjs.org/cssesc/-/cssesc-3.0.0.tgz",
+            "integrity": "sha512-/Tb/JcjK111nNScGob5MNtsntNM1aCNUDipB/TkwZFhyDrrE47SOx/18wF2bbjgc3ZzCSKW1T5nt5EbFoAz/Vg==",
+            "dev": true
+        },
+        "cssnano": {
+            "version": "5.1.15",
+            "resolved": "https://registry.npmjs.org/cssnano/-/cssnano-5.1.15.tgz",
+            "integrity": "sha512-j+BKgDcLDQA+eDifLx0EO4XSA56b7uut3BQFH+wbSaSTuGLuiyTa/wbRYthUXX8LC9mLg+WWKe8h+qJuwTAbHw==",
+            "dev": true,
+            "requires": {
+                "cssnano-preset-default": "^5.2.14",
+                "lilconfig": "^2.0.3",
+                "yaml": "^1.10.2"
+            },
+            "dependencies": {
+                "yaml": {
+                    "version": "1.10.2",
+                    "resolved": "https://registry.npmjs.org/yaml/-/yaml-1.10.2.tgz",
+                    "integrity": "sha512-r3vXyErRCYJ7wg28yvBY5VSoAF8ZvlcW9/BwUzEtUsjvX/DKs24dIkuwjtuprwJJHsbyUbLApepYTR1BN4uHrg==",
+                    "dev": true
+                }
+            }
+        },
+        "cssnano-preset-default": {
+            "version": "5.2.14",
+            "resolved": "https://registry.npmjs.org/cssnano-preset-default/-/cssnano-preset-default-5.2.14.tgz",
+            "integrity": "sha512-t0SFesj/ZV2OTylqQVOrFgEh5uanxbO6ZAdeCrNsUQ6fVuXwYTxJPNAGvGTxHbD68ldIJNec7PyYZDBrfDQ+6A==",
+            "dev": true,
+            "requires": {
+                "css-declaration-sorter": "^6.3.1",
+                "cssnano-utils": "^3.1.0",
+                "postcss-calc": "^8.2.3",
+                "postcss-colormin": "^5.3.1",
+                "postcss-convert-values": "^5.1.3",
+                "postcss-discard-comments": "^5.1.2",
+                "postcss-discard-duplicates": "^5.1.0",
+                "postcss-discard-empty": "^5.1.1",
+                "postcss-discard-overridden": "^5.1.0",
+                "postcss-merge-longhand": "^5.1.7",
+                "postcss-merge-rules": "^5.1.4",
+                "postcss-minify-font-values": "^5.1.0",
+                "postcss-minify-gradients": "^5.1.1",
+                "postcss-minify-params": "^5.1.4",
+                "postcss-minify-selectors": "^5.2.1",
+                "postcss-normalize-charset": "^5.1.0",
+                "postcss-normalize-display-values": "^5.1.0",
+                "postcss-normalize-positions": "^5.1.1",
+                "postcss-normalize-repeat-style": "^5.1.1",
+                "postcss-normalize-string": "^5.1.0",
+                "postcss-normalize-timing-functions": "^5.1.0",
+                "postcss-normalize-unicode": "^5.1.1",
+                "postcss-normalize-url": "^5.1.0",
+                "postcss-normalize-whitespace": "^5.1.1",
+                "postcss-ordered-values": "^5.1.3",
+                "postcss-reduce-initial": "^5.1.2",
+                "postcss-reduce-transforms": "^5.1.0",
+                "postcss-svgo": "^5.1.0",
+                "postcss-unique-selectors": "^5.1.1"
+            }
+        },
+        "cssnano-utils": {
+            "version": "3.1.0",
+            "resolved": "https://registry.npmjs.org/cssnano-utils/-/cssnano-utils-3.1.0.tgz",
+            "integrity": "sha512-JQNR19/YZhz4psLX/rQ9M83e3z2Wf/HdJbryzte4a3NSuafyp9w/I4U+hx5C2S9g41qlstH7DEWnZaaj83OuEA==",
+            "dev": true,
+            "requires": {}
+        },
+        "csso": {
+            "version": "4.2.0",
+            "resolved": "https://registry.npmjs.org/csso/-/csso-4.2.0.tgz",
+            "integrity": "sha512-wvlcdIbf6pwKEk7vHj8/Bkc0B4ylXZruLvOgs9doS5eOsOpuodOV2zJChSpkp+pRpYQLQMeF04nr3Z68Sta9jA==",
+            "dev": true,
+            "requires": {
+                "css-tree": "^1.1.2"
+            }
+        },
+        "csstype": {
+            "version": "3.1.3",
+            "resolved": "https://registry.npmjs.org/csstype/-/csstype-3.1.3.tgz",
+            "integrity": "sha512-M1uQkMl8rQK/szD0LNhtqxIPLpimGm8sOBwU7lLnCpSbTyY3yeU1Vc7l4KT5zT4s/yOxHH5O7tIuuLOCnLADRw==",
+            "dev": true
+        },
+        "debug": {
+            "version": "4.3.4",
+            "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
+            "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
+            "dev": true,
+            "requires": {
+                "ms": "2.1.2"
+            }
+        },
+        "default-gateway": {
+            "version": "6.0.3",
+            "resolved": "https://registry.npmjs.org/default-gateway/-/default-gateway-6.0.3.tgz",
+            "integrity": "sha512-fwSOJsbbNzZ/CUFpqFBqYfYNLj1NbMPm8MMCIzHjC83iSJRBEGmDUxU+WP661BaBQImeC2yHwXtz+P/O9o+XEg==",
+            "dev": true,
+            "requires": {
+                "execa": "^5.0.0"
+            }
+        },
+        "define-lazy-prop": {
+            "version": "2.0.0",
+            "resolved": "https://registry.npmjs.org/define-lazy-prop/-/define-lazy-prop-2.0.0.tgz",
+            "integrity": "sha512-Ds09qNh8yw3khSjiJjiUInaGX9xlqZDY7JVryGxdxV7NPeuqQfplOpQ66yJFZut3jLa5zOwkXw1g9EI2uKh4Og==",
+            "dev": true
+        },
+        "define-properties": {
+            "version": "1.1.4",
+            "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.4.tgz",
+            "integrity": "sha512-uckOqKcfaVvtBdsVkdPv3XjveQJsNQqmhXgRi8uhvWWuPYZCNlzT8qAyblUgNoXdHdjMTzAqeGjAoli8f+bzPA==",
+            "dev": true,
+            "requires": {
+                "has-property-descriptors": "^1.0.0",
+                "object-keys": "^1.1.1"
+            }
+        },
+        "delayed-stream": {
+            "version": "1.0.0",
+            "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz",
+            "integrity": "sha1-3zrhmayt+31ECqrgsp4icrJOxhk= sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ==",
+            "dev": true
+        },
+        "depd": {
+            "version": "2.0.0",
+            "resolved": "https://registry.npmjs.org/depd/-/depd-2.0.0.tgz",
+            "integrity": "sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw==",
+            "dev": true
+        },
+        "des.js": {
+            "version": "1.1.0",
+            "resolved": "https://registry.npmjs.org/des.js/-/des.js-1.1.0.tgz",
+            "integrity": "sha512-r17GxjhUCjSRy8aiJpr8/UadFIzMzJGexI3Nmz4ADi9LYSFx4gTBp80+NaX/YsXWWLhpZ7v/v/ubEc/bCNfKwg==",
+            "dev": true,
+            "requires": {
+                "inherits": "^2.0.1",
+                "minimalistic-assert": "^1.0.0"
+            }
+        },
+        "destroy": {
+            "version": "1.2.0",
+            "resolved": "https://registry.npmjs.org/destroy/-/destroy-1.2.0.tgz",
+            "integrity": "sha512-2sJGJTaXIIaR1w4iJSNoN0hnMY7Gpc/n8D4qSCJw8QqFWXf7cuAgnEHxBpweaVcPevC2l3KpjYCx3NypQQgaJg==",
+            "dev": true
+        },
+        "detect-indent": {
+            "version": "6.1.0",
+            "resolved": "https://registry.npmjs.org/detect-indent/-/detect-indent-6.1.0.tgz",
+            "integrity": "sha512-reYkTUJAZb9gUuZ2RvVCNhVHdg62RHnJ7WJl8ftMi4diZ6NWlciOzQN88pUhSELEwflJht4oQDv0F0BMlwaYtA==",
+            "dev": true
+        },
+        "detect-node": {
+            "version": "2.1.0",
+            "resolved": "https://registry.npmjs.org/detect-node/-/detect-node-2.1.0.tgz",
+            "integrity": "sha512-T0NIuQpnTvFDATNuHN5roPwSBG83rFsuO+MXXH9/3N1eFbn4wcPjttvjMLEPWJ0RGUYgQE7cGgS3tNxbqCGM7g==",
+            "dev": true
+        },
+        "didyoumean": {
+            "version": "1.2.2",
+            "resolved": "https://registry.npmjs.org/didyoumean/-/didyoumean-1.2.2.tgz",
+            "integrity": "sha512-gxtyfqMg7GKyhQmb056K7M3xszy/myH8w+B4RT+QXBQsvAOdc3XymqDDPHx1BgPgsdAA5SIifona89YtRATDzw==",
+            "dev": true
+        },
+        "diffie-hellman": {
+            "version": "5.0.3",
+            "resolved": "https://registry.npmjs.org/diffie-hellman/-/diffie-hellman-5.0.3.tgz",
+            "integrity": "sha512-kqag/Nl+f3GwyK25fhUMYj81BUOrZ9IuJsjIcDE5icNM9FJHAVm3VcUDxdLPoQtTuUylWm6ZIknYJwwaPxsUzg==",
+            "dev": true,
+            "requires": {
+                "bn.js": "^4.1.0",
+                "miller-rabin": "^4.0.0",
+                "randombytes": "^2.0.0"
+            },
+            "dependencies": {
+                "bn.js": {
+                    "version": "4.12.0",
+                    "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.0.tgz",
+                    "integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA==",
+                    "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"
+            }
+        },
+        "dlv": {
+            "version": "1.1.3",
+            "resolved": "https://registry.npmjs.org/dlv/-/dlv-1.1.3.tgz",
+            "integrity": "sha512-+HlytyjlPKnIG8XuRG8WvmBP8xs8P71y+SKKS6ZXWoEgLuePxtDoUEiH7WkdePWrQ5JBpE6aoVqfZfJUQkjXwA==",
+            "dev": true
+        },
+        "dns-equal": {
+            "version": "1.0.0",
+            "resolved": "https://registry.npmjs.org/dns-equal/-/dns-equal-1.0.0.tgz",
+            "integrity": "sha512-z+paD6YUQsk+AbGCEM4PrOXSss5gd66QfcVBFTKR/HpFL9jCqikS94HYwKww6fQyO7IxrIIyUu+g0Ka9tUS2Cg==",
+            "dev": true
+        },
+        "dns-packet": {
+            "version": "5.6.1",
+            "resolved": "https://registry.npmjs.org/dns-packet/-/dns-packet-5.6.1.tgz",
+            "integrity": "sha512-l4gcSouhcgIKRvyy99RNVOgxXiicE+2jZoNmaNmZ6JXiGajBOJAesk1OBlJuM5k2c+eudGdLxDqXuPCKIj6kpw==",
+            "dev": true,
+            "requires": {
+                "@leichtgewicht/ip-codec": "^2.0.1"
+            }
+        },
+        "dom-serializer": {
+            "version": "1.4.1",
+            "resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-1.4.1.tgz",
+            "integrity": "sha512-VHwB3KfrcOOkelEG2ZOfxqLZdfkil8PtJi4P8N2MMXucZq2yLp75ClViUlOVwyoHEDjYU433Aq+5zWP61+RGag==",
+            "dev": true,
+            "requires": {
+                "domelementtype": "^2.0.1",
+                "domhandler": "^4.2.0",
+                "entities": "^2.0.0"
+            },
+            "dependencies": {
+                "domhandler": {
+                    "version": "4.3.1",
+                    "resolved": "https://registry.npmjs.org/domhandler/-/domhandler-4.3.1.tgz",
+                    "integrity": "sha512-GrwoxYN+uWlzO8uhUXRl0P+kHE4GtVPfYzVLcUxPL7KNdHKj66vvlhiweIHqYYXWlw+T8iLMp42Lm67ghw4WMQ==",
+                    "dev": true,
+                    "requires": {
+                        "domelementtype": "^2.2.0"
+                    }
+                }
+            }
+        },
+        "domain-browser": {
+            "version": "1.2.0",
+            "resolved": "https://registry.npmjs.org/domain-browser/-/domain-browser-1.2.0.tgz",
+            "integrity": "sha512-jnjyiM6eRyZl2H+W8Q/zLMA481hzi0eszAaBUzIVnmYVDBbnLxVNnfu1HgEBvCbL+71FrxMl3E6lpKH7Ge3OXA==",
+            "dev": true
+        },
+        "domelementtype": {
+            "version": "2.3.0",
+            "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-2.3.0.tgz",
+            "integrity": "sha512-OLETBj6w0OsagBwdXnPdN0cnMfF9opN69co+7ZrbfPGrdpPVNBUj02spi6B1N7wChLQiPn4CSH/zJvXw56gmHw==",
+            "dev": true
+        },
+        "domhandler": {
+            "version": "3.3.0",
+            "resolved": "https://registry.npmjs.org/domhandler/-/domhandler-3.3.0.tgz",
+            "integrity": "sha512-J1C5rIANUbuYK+FuFL98650rihynUOEzRLxW+90bKZRWB6A1X1Tf82GxR1qAWLyfNPRvjqfip3Q5tdYlmAa9lA==",
+            "dev": true,
+            "requires": {
+                "domelementtype": "^2.0.1"
+            }
+        },
+        "domutils": {
+            "version": "2.8.0",
+            "resolved": "https://registry.npmjs.org/domutils/-/domutils-2.8.0.tgz",
+            "integrity": "sha512-w96Cjofp72M5IIhpjgobBimYEfoPjx1Vx0BSX9P30WBdZW2WIKU0T1Bd0kz2eNZ9ikjKgHbEyKx8BB6H1L3h3A==",
+            "dev": true,
+            "requires": {
+                "dom-serializer": "^1.0.1",
+                "domelementtype": "^2.2.0",
+                "domhandler": "^4.2.0"
+            },
+            "dependencies": {
+                "domhandler": {
+                    "version": "4.3.1",
+                    "resolved": "https://registry.npmjs.org/domhandler/-/domhandler-4.3.1.tgz",
+                    "integrity": "sha512-GrwoxYN+uWlzO8uhUXRl0P+kHE4GtVPfYzVLcUxPL7KNdHKj66vvlhiweIHqYYXWlw+T8iLMp42Lm67ghw4WMQ==",
+                    "dev": true,
+                    "requires": {
+                        "domelementtype": "^2.2.0"
+                    }
+                }
+            }
+        },
+        "dot-case": {
+            "version": "3.0.4",
+            "resolved": "https://registry.npmjs.org/dot-case/-/dot-case-3.0.4.tgz",
+            "integrity": "sha512-Kv5nKlh6yRrdrGvxeJ2e5y2eRUpkUosIW4A2AS38zwSz27zu7ufDwQPi5Jhs3XAlGNetl3bmnGhQsMtkKJnj3w==",
+            "dev": true,
+            "requires": {
+                "no-case": "^3.0.4",
+                "tslib": "^2.0.3"
+            }
+        },
+        "dotenv": {
+            "version": "10.0.0",
+            "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-10.0.0.tgz",
+            "integrity": "sha512-rlBi9d8jpv9Sf1klPjNfFAuWDjKLwTIJJ/VxtoTwIR6hnZxcEOQCZg2oIL3MWBYw5GpUDKOEnND7LXTbIpQ03Q==",
+            "dev": true
+        },
+        "dotenv-expand": {
+            "version": "5.1.0",
+            "resolved": "https://registry.npmjs.org/dotenv-expand/-/dotenv-expand-5.1.0.tgz",
+            "integrity": "sha512-YXQl1DSa4/PQyRfgrv6aoNjhasp/p4qs9FjJ4q4cQk+8m4r6k4ZSiEyytKG8f8W9gi8WsQtIObNmKd+tMzNTmA==",
+            "dev": true
+        },
+        "editorconfig": {
+            "version": "1.0.4",
+            "resolved": "https://registry.npmjs.org/editorconfig/-/editorconfig-1.0.4.tgz",
+            "integrity": "sha512-L9Qe08KWTlqYMVvMcTIvMAdl1cDUubzRNYL+WfA4bLDMHe4nemKkpmYzkznE1FwLKu0EEmy6obgQKzMJrg4x9Q==",
+            "dev": true,
+            "requires": {
+                "@one-ini/wasm": "0.1.1",
+                "commander": "^10.0.0",
+                "minimatch": "9.0.1",
+                "semver": "^7.5.3"
+            },
+            "dependencies": {
+                "brace-expansion": {
+                    "version": "2.0.1",
+                    "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz",
+                    "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==",
+                    "dev": true,
+                    "requires": {
+                        "balanced-match": "^1.0.0"
+                    }
+                },
+                "commander": {
+                    "version": "10.0.1",
+                    "resolved": "https://registry.npmjs.org/commander/-/commander-10.0.1.tgz",
+                    "integrity": "sha512-y4Mg2tXshplEbSGzx7amzPwKKOCGuoSRP/CjEdwwk0FOGlUbq6lKuoyDZTNZkmxHdJtp54hdfY/JUrdL7Xfdug==",
+                    "dev": true
+                },
+                "minimatch": {
+                    "version": "9.0.1",
+                    "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.1.tgz",
+                    "integrity": "sha512-0jWhJpD/MdhPXwPuiRkCbfYfSKp2qnn2eOc279qI7f+osl/l+prKSrvhg157zSYvx/1nmgn2NqdT6k2Z7zSH9w==",
+                    "dev": true,
+                    "requires": {
+                        "brace-expansion": "^2.0.1"
+                    }
+                }
+            }
+        },
+        "ee-first": {
+            "version": "1.1.1",
+            "resolved": "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz",
+            "integrity": "sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow==",
+            "dev": true
+        },
+        "electron-to-chromium": {
+            "version": "1.4.563",
+            "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.563.tgz",
+            "integrity": "sha512-dg5gj5qOgfZNkPNeyKBZQAQitIQ/xwfIDmEQJHCbXaD9ebTZxwJXUsDYcBlAvZGZLi+/354l35J1wkmP6CqYaw==",
+            "dev": true
+        },
+        "elliptic": {
+            "version": "6.5.4",
+            "resolved": "https://registry.npmjs.org/elliptic/-/elliptic-6.5.4.tgz",
+            "integrity": "sha512-iLhC6ULemrljPZb+QutR5TQGB+pdW6KGD5RSegS+8sorOZT+rdQFbsQFJgvN3eRqNALqJer4oQ16YvJHlU8hzQ==",
+            "dev": true,
+            "requires": {
+                "bn.js": "^4.11.9",
+                "brorand": "^1.1.0",
+                "hash.js": "^1.0.0",
+                "hmac-drbg": "^1.0.1",
+                "inherits": "^2.0.4",
+                "minimalistic-assert": "^1.0.1",
+                "minimalistic-crypto-utils": "^1.0.1"
+            },
+            "dependencies": {
+                "bn.js": {
+                    "version": "4.12.0",
+                    "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.0.tgz",
+                    "integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA==",
+                    "dev": true
+                }
+            }
+        },
+        "emoji-regex": {
+            "version": "8.0.0",
+            "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
+            "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
+            "dev": true
+        },
+        "emojis-list": {
+            "version": "3.0.0",
+            "resolved": "https://registry.npmjs.org/emojis-list/-/emojis-list-3.0.0.tgz",
+            "integrity": "sha512-/kyM18EfinwXZbno9FyUGeFh87KC8HRQBQGildHZbEuRyWFOmv1U10o9BBp8XVZDVNNuQKyIGIu5ZYAAXJ0V2Q==",
+            "dev": true
+        },
+        "encodeurl": {
+            "version": "1.0.2",
+            "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz",
+            "integrity": "sha512-TPJXq8JqFaVYm2CWmPvnP2Iyo4ZSM7/QKcSmuMLDObfpH5fi7RUGmd/rTDf+rut/saiDiQEeVTNgAmJEdAOx0w==",
+            "dev": true
+        },
+        "enhanced-resolve": {
+            "version": "5.15.0",
+            "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.15.0.tgz",
+            "integrity": "sha512-LXYT42KJ7lpIKECr2mAXIaMldcNCh/7E0KBKOu4KSfkHmP+mZmSs+8V5gBAqisWBy0OO4W5Oyys0GO1Y8KtdKg==",
+            "dev": true,
+            "requires": {
+                "graceful-fs": "^4.2.4",
+                "tapable": "^2.2.0"
+            }
+        },
+        "entities": {
+            "version": "2.2.0",
+            "resolved": "https://registry.npmjs.org/entities/-/entities-2.2.0.tgz",
+            "integrity": "sha512-p92if5Nz619I0w+akJrLZH0MX0Pb5DX39XOwQTtXSdQQOaYH03S1uIQp4mhOZtAXrxq4ViO67YTiLBo2638o9A==",
+            "dev": true
+        },
+        "envinfo": {
+            "version": "7.10.0",
+            "resolved": "https://registry.npmjs.org/envinfo/-/envinfo-7.10.0.tgz",
+            "integrity": "sha512-ZtUjZO6l5mwTHvc1L9+1q5p/R3wTopcfqMW8r5t8SJSKqeVI/LtajORwRFEKpEFuekjD0VBjwu1HMxL4UalIRw==",
+            "dev": true
+        },
+        "error-ex": {
+            "version": "1.3.2",
+            "resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.2.tgz",
+            "integrity": "sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==",
+            "dev": true,
+            "requires": {
+                "is-arrayish": "^0.2.1"
+            }
+        },
+        "es-module-lexer": {
+            "version": "1.3.1",
+            "resolved": "https://registry.npmjs.org/es-module-lexer/-/es-module-lexer-1.3.1.tgz",
+            "integrity": "sha512-JUFAyicQV9mXc3YRxPnDlrfBKpqt6hUYzz9/boprUJHs4e4KVr3XwOF70doO6gwXUor6EWZJAyWAfKki84t20Q==",
+            "dev": true
+        },
+        "escalade": {
+            "version": "3.1.1",
+            "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.1.tgz",
+            "integrity": "sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw==",
+            "dev": true
+        },
+        "escape-html": {
+            "version": "1.0.3",
+            "resolved": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.3.tgz",
+            "integrity": "sha512-NiSupZ4OeuGwr68lGIeym/ksIZMJodUGOSCZ/FSnTxcrekbvqrgdUxlJOMpijaKZVjAJrWrGs/6Jy8OMuyj9ow==",
+            "dev": true
+        },
+        "escape-string-regexp": {
+            "version": "1.0.5",
+            "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
+            "integrity": "sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg==",
+            "dev": true
+        },
+        "eslint-scope": {
+            "version": "5.1.1",
+            "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.1.1.tgz",
+            "integrity": "sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw==",
+            "dev": true,
+            "requires": {
+                "esrecurse": "^4.3.0",
+                "estraverse": "^4.1.1"
+            }
+        },
+        "esrecurse": {
+            "version": "4.3.0",
+            "resolved": "https://registry.npmjs.org/esrecurse/-/esrecurse-4.3.0.tgz",
+            "integrity": "sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag==",
+            "dev": true,
+            "requires": {
+                "estraverse": "^5.2.0"
+            },
+            "dependencies": {
+                "estraverse": {
+                    "version": "5.3.0",
+                    "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz",
+                    "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==",
+                    "dev": true
+                }
+            }
+        },
+        "estraverse": {
+            "version": "4.2.0",
+            "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.2.0.tgz",
+            "integrity": "sha512-VHvyaGnJy+FuGfcfaM7W7OZw4mQiKW73jPHwQXx2VnMSUBajYmytOT5sKEfsBvNPtGX6YDwcrGDz2eocoHg0JA==",
+            "dev": true
+        },
+        "estree-walker": {
+            "version": "2.0.2",
+            "resolved": "https://registry.npmjs.org/estree-walker/-/estree-walker-2.0.2.tgz",
+            "integrity": "sha512-Rfkk/Mp/DL7JVje3u18FxFujQlTNR2q6QfMSMB7AvCBx91NGj/ba3kCfza0f6dVDbw7YlRf/nDrn7pQrCCyQ/w==",
+            "dev": true
+        },
+        "esutils": {
+            "version": "2.0.2",
+            "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.2.tgz",
+            "integrity": "sha512-UUPPULqkyAV+M3Shodis7l8D+IyX6V8SbaBnTb449jf3fMTd8+UOZI1Q70NbZVOQkcR91yYgdHsJiMMMVmYshg==",
+            "dev": true
+        },
+        "etag": {
+            "version": "1.8.1",
+            "resolved": "https://registry.npmjs.org/etag/-/etag-1.8.1.tgz",
+            "integrity": "sha512-aIL5Fx7mawVa300al2BnEE4iNvo1qETxLrPI/o05L7z6go7fCw1J6EQmbK4FmJ2AS7kgVF/KEZWufBfdClMcPg==",
+            "dev": true
+        },
+        "eventemitter3": {
+            "version": "4.0.7",
+            "resolved": "https://registry.npmjs.org/eventemitter3/-/eventemitter3-4.0.7.tgz",
+            "integrity": "sha512-8guHBZCwKnFhYdHr2ysuRWErTwhoN2X8XELRlrRwpmfeY2jjuUN4taQMsULKUVo1K4DvZl+0pgfyoysHxvmvEw==",
+            "dev": true
+        },
+        "events": {
+            "version": "3.3.0",
+            "resolved": "https://registry.npmjs.org/events/-/events-3.3.0.tgz",
+            "integrity": "sha512-mQw+2fkQbALzQ7V0MY0IqdnXNOeTtP4r0lN9z7AAawCXgqea7bDii20AYrIBrFd/Hx0M2Ocz6S111CaFkUcb0Q==",
+            "dev": true
+        },
+        "evp_bytestokey": {
+            "version": "1.0.3",
+            "resolved": "https://registry.npmjs.org/evp_bytestokey/-/evp_bytestokey-1.0.3.tgz",
+            "integrity": "sha512-/f2Go4TognH/KvCISP7OUsHn85hT9nUkxxA9BEWxFn+Oj9o8ZNLm/40hdlgSLyuOimsrTKLUMEorQexp/aPQeA==",
+            "dev": true,
+            "requires": {
+                "md5.js": "^1.3.4",
+                "safe-buffer": "^5.1.1"
+            }
+        },
+        "execa": {
+            "version": "5.1.1",
+            "resolved": "https://registry.npmjs.org/execa/-/execa-5.1.1.tgz",
+            "integrity": "sha512-8uSpZZocAZRBAPIEINJj3Lo9HyGitllczc27Eh5YYojjMFMn8yHMDMaUHE2Jqfq05D/wucwI4JGURyXt1vchyg==",
+            "dev": true,
+            "requires": {
+                "cross-spawn": "^7.0.3",
+                "get-stream": "^6.0.0",
+                "human-signals": "^2.1.0",
+                "is-stream": "^2.0.0",
+                "merge-stream": "^2.0.0",
+                "npm-run-path": "^4.0.1",
+                "onetime": "^5.1.2",
+                "signal-exit": "^3.0.3",
+                "strip-final-newline": "^2.0.0"
+            }
+        },
+        "express": {
+            "version": "4.18.2",
+            "resolved": "https://registry.npmjs.org/express/-/express-4.18.2.tgz",
+            "integrity": "sha512-5/PsL6iGPdfQ/lKM1UuielYgv3BUoJfz1aUwU9vHZ+J7gyvwdQXFEBIEIaxeGf0GIcreATNyBExtalisDbuMqQ==",
+            "dev": true,
+            "requires": {
+                "accepts": "~1.3.8",
+                "array-flatten": "1.1.1",
+                "body-parser": "1.20.1",
+                "content-disposition": "0.5.4",
+                "content-type": "~1.0.4",
+                "cookie": "0.5.0",
+                "cookie-signature": "1.0.6",
+                "debug": "2.6.9",
+                "depd": "2.0.0",
+                "encodeurl": "~1.0.2",
+                "escape-html": "~1.0.3",
+                "etag": "~1.8.1",
+                "finalhandler": "1.2.0",
+                "fresh": "0.5.2",
+                "http-errors": "2.0.0",
+                "merge-descriptors": "1.0.1",
+                "methods": "~1.1.2",
+                "on-finished": "2.4.1",
+                "parseurl": "~1.3.3",
+                "path-to-regexp": "0.1.7",
+                "proxy-addr": "~2.0.7",
+                "qs": "6.11.0",
+                "range-parser": "~1.2.1",
+                "safe-buffer": "5.2.1",
+                "send": "0.18.0",
+                "serve-static": "1.15.0",
+                "setprototypeof": "1.2.0",
+                "statuses": "2.0.1",
+                "type-is": "~1.6.18",
+                "utils-merge": "1.0.1",
+                "vary": "~1.1.2"
+            },
+            "dependencies": {
+                "array-flatten": {
+                    "version": "1.1.1",
+                    "resolved": "https://registry.npmjs.org/array-flatten/-/array-flatten-1.1.1.tgz",
+                    "integrity": "sha512-PCVAQswWemu6UdxsDFFX/+gVeYqKAod3D3UVm91jHwynguOwAvYPhx8nNlM++NqRcK6CxxpUafjmhIdKiHibqg==",
+                    "dev": true
+                },
+                "debug": {
+                    "version": "2.6.9",
+                    "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+                    "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+                    "dev": true,
+                    "requires": {
+                        "ms": "2.0.0"
+                    }
+                },
+                "ms": {
+                    "version": "2.0.0",
+                    "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+                    "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==",
+                    "dev": true
+                },
+                "qs": {
+                    "version": "6.11.0",
+                    "resolved": "https://registry.npmjs.org/qs/-/qs-6.11.0.tgz",
+                    "integrity": "sha512-MvjoMCJwEarSbUYk5O+nmoSzSutSsTwF85zcHPQ9OrlFoZOYIjaqBAJIqIXjptyD5vThxGq52Xu/MaJzRkIk4Q==",
+                    "dev": true,
+                    "requires": {
+                        "side-channel": "^1.0.4"
+                    }
+                },
+                "safe-buffer": {
+                    "version": "5.2.1",
+                    "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz",
+                    "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==",
+                    "dev": true
+                }
+            }
+        },
+        "fast-deep-equal": {
+            "version": "3.1.3",
+            "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz",
+            "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==",
+            "dev": true
+        },
+        "fast-glob": {
+            "version": "3.3.0",
+            "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.3.0.tgz",
+            "integrity": "sha512-ChDuvbOypPuNjO8yIDf36x7BlZX1smcUMTTcyoIjycexOxd6DFsKsg21qVBzEmr3G7fUKIRy2/psii+CIUt7FA==",
+            "dev": true,
+            "requires": {
+                "@nodelib/fs.stat": "^2.0.2",
+                "@nodelib/fs.walk": "^1.2.3",
+                "glob-parent": "^5.1.2",
+                "merge2": "^1.3.0",
+                "micromatch": "^4.0.4"
+            }
+        },
+        "fast-json-stable-stringify": {
+            "version": "2.1.0",
+            "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz",
+            "integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==",
+            "dev": true
+        },
+        "fastest-levenshtein": {
+            "version": "1.0.16",
+            "resolved": "https://registry.npmjs.org/fastest-levenshtein/-/fastest-levenshtein-1.0.16.tgz",
+            "integrity": "sha512-eRnCtTTtGZFpQCwhJiUOuxPQWRXVKYDn0b2PeHfXL6/Zi53SLAzAHfVhVWK2AryC/WH05kGfxhFIPvTF0SXQzg==",
+            "dev": true
+        },
+        "fastq": {
+            "version": "1.15.0",
+            "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.15.0.tgz",
+            "integrity": "sha512-wBrocU2LCXXa+lWBt8RoIRD89Fi8OdABODa/kEnyeyjS5aZO5/GNvI5sEINADqP/h8M29UHTHUb53sUu5Ihqdw==",
+            "dev": true,
+            "requires": {
+                "reusify": "^1.0.4"
+            }
+        },
+        "faye-websocket": {
+            "version": "0.11.4",
+            "resolved": "https://registry.npmjs.org/faye-websocket/-/faye-websocket-0.11.4.tgz",
+            "integrity": "sha512-CzbClwlXAuiRQAlUyfqPgvPoNKTckTPGfwZV4ZdAhVcP2lh9KUxJg2b5GkE7XbjKQ3YJnQ9z6D9ntLAlB+tP8g==",
+            "dev": true,
+            "requires": {
+                "websocket-driver": ">=0.5.1"
+            }
+        },
+        "file-loader": {
+            "version": "6.2.0",
+            "resolved": "https://registry.npmjs.org/file-loader/-/file-loader-6.2.0.tgz",
+            "integrity": "sha512-qo3glqyTa61Ytg4u73GultjHGjdRyig3tG6lPtyX/jOEJvHif9uB0/OCI2Kif6ctF3caQTW2G5gym21oAsI4pw==",
+            "dev": true,
+            "requires": {
+                "loader-utils": "^2.0.0",
+                "schema-utils": "^3.0.0"
+            },
+            "dependencies": {
+                "schema-utils": {
+                    "version": "3.3.0",
+                    "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.3.0.tgz",
+                    "integrity": "sha512-pN/yOAvcC+5rQ5nERGuwrjLlYvLTbCibnZ1I7B1LaiAz9BRBlE9GMgE/eqV30P7aJQUf7Ddimy/RsbYO/GrVGg==",
+                    "dev": true,
+                    "requires": {
+                        "@types/json-schema": "^7.0.8",
+                        "ajv": "^6.12.5",
+                        "ajv-keywords": "^3.5.2"
+                    }
+                }
+            }
+        },
+        "file-type": {
+            "version": "12.4.2",
+            "resolved": "https://registry.npmjs.org/file-type/-/file-type-12.4.2.tgz",
+            "integrity": "sha512-UssQP5ZgIOKelfsaB5CuGAL+Y+q7EmONuiwF3N5HAH0t27rvrttgi6Ra9k/+DVaY9UF6+ybxu5pOXLUdA8N7Vg==",
+            "dev": true
+        },
+        "fill-range": {
+            "version": "7.0.1",
+            "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz",
+            "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==",
+            "dev": true,
+            "requires": {
+                "to-regex-range": "^5.0.1"
+            }
+        },
+        "finalhandler": {
+            "version": "1.2.0",
+            "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.2.0.tgz",
+            "integrity": "sha512-5uXcUVftlQMFnWC9qu/svkWv3GTd2PfUhK/3PLkYNAe7FbqJMt3515HaxE6eRL74GdsriiwujiawdaB1BpEISg==",
+            "dev": true,
+            "requires": {
+                "debug": "2.6.9",
+                "encodeurl": "~1.0.2",
+                "escape-html": "~1.0.3",
+                "on-finished": "2.4.1",
+                "parseurl": "~1.3.3",
+                "statuses": "2.0.1",
+                "unpipe": "~1.0.0"
+            },
+            "dependencies": {
+                "debug": {
+                    "version": "2.6.9",
+                    "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+                    "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+                    "dev": true,
+                    "requires": {
+                        "ms": "2.0.0"
+                    }
+                },
+                "ms": {
+                    "version": "2.0.0",
+                    "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+                    "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==",
+                    "dev": true
+                }
+            }
+        },
+        "find-cache-dir": {
+            "version": "3.3.2",
+            "resolved": "https://registry.npmjs.org/find-cache-dir/-/find-cache-dir-3.3.2.tgz",
+            "integrity": "sha512-wXZV5emFEjrridIgED11OoUKLxiYjAcqot/NJdAkOhlJ+vGzwhOAfcG5OX1jP+S0PcjEn8bdMJv+g2jwQ3Onig==",
+            "dev": true,
+            "requires": {
+                "commondir": "^1.0.1",
+                "make-dir": "^3.0.2",
+                "pkg-dir": "^4.1.0"
+            }
+        },
+        "find-config": {
+            "version": "1.0.0",
+            "resolved": "https://registry.npmjs.org/find-config/-/find-config-1.0.0.tgz",
+            "integrity": "sha512-Z+suHH+7LSE40WfUeZPIxSxypCWvrzdVc60xAjUShZeT5eMWM0/FQUduq3HjluyfAHWvC/aOBkT1pTZktyF/jg==",
+            "dev": true,
+            "requires": {
+                "user-home": "^2.0.0"
+            }
+        },
+        "find-up": {
+            "version": "4.1.0",
+            "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz",
+            "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==",
+            "dev": true,
+            "requires": {
+                "locate-path": "^5.0.0",
+                "path-exists": "^4.0.0"
+            }
+        },
+        "flat": {
+            "version": "5.0.2",
+            "resolved": "https://registry.npmjs.org/flat/-/flat-5.0.2.tgz",
+            "integrity": "sha512-b6suED+5/3rTpUBdG1gupIl8MPFCAMA0QXwmljLhvCUKcUvdE4gWky9zpuGCcXHOsz4J9wPGNWq6OKpmIzz3hQ==",
+            "dev": true
+        },
+        "follow-redirects": {
+            "version": "1.15.2",
+            "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.2.tgz",
+            "integrity": "sha512-VQLG33o04KaQ8uYi2tVNbdrWp1QWxNNea+nmIB4EVM28v0hmP17z7aG1+wAkNzVq4KeXTq3221ye5qTJP91JwA==",
+            "dev": true
+        },
+        "form-data": {
+            "version": "4.0.0",
+            "resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.0.tgz",
+            "integrity": "sha512-ETEklSGi5t0QMZuiXoA/Q6vcnxcLQP5vdugSpuAyi6SVGi2clPPp+xgEhuMaHC+zGgn31Kd235W35f7Hykkaww==",
+            "dev": true,
+            "requires": {
+                "asynckit": "^0.4.0",
+                "combined-stream": "^1.0.8",
+                "mime-types": "^2.1.12"
+            }
+        },
+        "forwarded": {
+            "version": "0.2.0",
+            "resolved": "https://registry.npmjs.org/forwarded/-/forwarded-0.2.0.tgz",
+            "integrity": "sha512-buRG0fpBtRHSTCOASe6hD258tEubFoRLb4ZNA6NxMVHNw2gOcwHo9wyablzMzOA5z9xA9L1KNjk/Nt6MT9aYow==",
+            "dev": true
+        },
+        "fraction.js": {
+            "version": "4.3.7",
+            "resolved": "https://registry.npmjs.org/fraction.js/-/fraction.js-4.3.7.tgz",
+            "integrity": "sha512-ZsDfxO51wGAXREY55a7la9LScWpwv9RxIrYABrlvOFBlH/ShPnrtsXeuUIfXKKOVicNxQ+o8JTbJvjS4M89yew==",
+            "dev": true
+        },
+        "fresh": {
+            "version": "0.5.2",
+            "resolved": "https://registry.npmjs.org/fresh/-/fresh-0.5.2.tgz",
+            "integrity": "sha512-zJ2mQYM18rEFOudeV4GShTGIQ7RbzA7ozbU9I/XBpm7kqgMywgmylMwXHxZJmkVoYkna9d2pVXVXPdYTP9ej8Q==",
+            "dev": true
+        },
+        "fs-extra": {
+            "version": "10.1.0",
+            "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-10.1.0.tgz",
+            "integrity": "sha512-oRXApq54ETRj4eMiFzGnHWGy+zo5raudjuxN0b8H7s/RU2oW0Wvsx9O0ACRN/kRq9E8Vu/ReskGB5o3ji+FzHQ==",
+            "dev": true,
+            "requires": {
+                "graceful-fs": "^4.2.0",
+                "jsonfile": "^6.0.1",
+                "universalify": "^2.0.0"
+            }
+        },
+        "fs-monkey": {
+            "version": "1.0.5",
+            "resolved": "https://registry.npmjs.org/fs-monkey/-/fs-monkey-1.0.5.tgz",
+            "integrity": "sha512-8uMbBjrhzW76TYgEV27Y5E//W2f/lTFmx78P2w19FZSxarhI/798APGQyuGCwmkNxgwGRhrLfvWyLBvNtuOmew==",
+            "dev": true
+        },
+        "fs.realpath": {
+            "version": "1.0.0",
+            "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
+            "integrity": "sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==",
+            "dev": true
+        },
+        "fsevents": {
+            "version": "2.3.2",
+            "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.2.tgz",
+            "integrity": "sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==",
+            "dev": true,
+            "optional": true
+        },
+        "function-bind": {
+            "version": "1.1.1",
+            "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz",
+            "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==",
+            "dev": true
+        },
+        "gensync": {
+            "version": "1.0.0-beta.2",
+            "resolved": "https://registry.npmjs.org/gensync/-/gensync-1.0.0-beta.2.tgz",
+            "integrity": "sha512-3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg==",
+            "dev": true
+        },
+        "get-caller-file": {
+            "version": "2.0.5",
+            "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz",
+            "integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==",
+            "dev": true
+        },
+        "get-intrinsic": {
+            "version": "1.1.2",
+            "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.1.2.tgz",
+            "integrity": "sha512-Jfm3OyCxHh9DJyc28qGk+JmfkpO41A4XkneDSujN9MDXrm4oDKdHvndhZ2dN94+ERNfkYJWDclW6k2L/ZGHjXA==",
+            "dev": true,
+            "requires": {
+                "function-bind": "^1.1.1",
+                "has": "^1.0.3",
+                "has-symbols": "^1.0.3"
+            }
+        },
+        "get-stream": {
+            "version": "6.0.1",
+            "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-6.0.1.tgz",
+            "integrity": "sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg==",
+            "dev": true
+        },
+        "glob": {
+            "version": "7.2.3",
+            "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz",
+            "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==",
+            "dev": true,
+            "requires": {
+                "fs.realpath": "^1.0.0",
+                "inflight": "^1.0.4",
+                "inherits": "2",
+                "minimatch": "^3.1.1",
+                "once": "^1.3.0",
+                "path-is-absolute": "^1.0.0"
+            }
+        },
+        "glob-parent": {
+            "version": "5.1.2",
+            "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz",
+            "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==",
+            "dev": true,
+            "requires": {
+                "is-glob": "^4.0.1"
+            }
+        },
+        "glob-to-regexp": {
+            "version": "0.4.1",
+            "resolved": "https://registry.npmjs.org/glob-to-regexp/-/glob-to-regexp-0.4.1.tgz",
+            "integrity": "sha512-lkX1HJXwyMcprw/5YUZc2s7DrpAiHB21/V+E1rHUrVNokkvB6bqMzT0VfV6/86ZNabt1k14YOIaT7nDvOX3Iiw==",
+            "dev": true
+        },
+        "globals": {
+            "version": "11.11.0",
+            "resolved": "https://registry.npmjs.org/globals/-/globals-11.11.0.tgz",
+            "integrity": "sha512-WHq43gS+6ufNOEqlrDBxVEbb8ntfXrfAUU2ZOpCxrBdGKW3gyv8mCxAfIBD0DroPKGrJ2eSsXsLtY9MPntsyTw==",
+            "dev": true
+        },
+        "globby": {
+            "version": "10.0.2",
+            "resolved": "https://registry.npmjs.org/globby/-/globby-10.0.2.tgz",
+            "integrity": "sha512-7dUi7RvCoT/xast/o/dLN53oqND4yk0nsHkhRgn9w65C4PofCLOoJ39iSOg+qVDdWQPIEj+eszMHQ+aLVwwQSg==",
+            "dev": true,
+            "requires": {
+                "@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"
+            }
+        },
+        "graceful-fs": {
+            "version": "4.2.10",
+            "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.10.tgz",
+            "integrity": "sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA==",
+            "dev": true
+        },
+        "growly": {
+            "version": "1.3.0",
+            "resolved": "https://registry.npmjs.org/growly/-/growly-1.3.0.tgz",
+            "integrity": "sha512-+xGQY0YyAWCnqy7Cd++hc2JqMYzlm0dG30Jd0beaA64sROr8C4nt8Yc9V5Ro3avlSUDTN0ulqP/VBKi1/lLygw==",
+            "dev": true
+        },
+        "handle-thing": {
+            "version": "2.0.1",
+            "resolved": "https://registry.npmjs.org/handle-thing/-/handle-thing-2.0.1.tgz",
+            "integrity": "sha512-9Qn4yBxelxoh2Ow62nP+Ka/kMnOXRi8BXnRaUwezLNhqelnN49xKz4F/dPP8OYLxLxq6JDtZb2i9XznUQbNPTg==",
+            "dev": true
+        },
+        "has": {
+            "version": "1.0.3",
+            "resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz",
+            "integrity": "sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==",
+            "dev": true,
+            "requires": {
+                "function-bind": "^1.1.1"
+            }
+        },
+        "has-flag": {
+            "version": "4.0.0",
+            "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+            "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+            "dev": true
+        },
+        "has-property-descriptors": {
+            "version": "1.0.0",
+            "resolved": "https://registry.npmjs.org/has-property-descriptors/-/has-property-descriptors-1.0.0.tgz",
+            "integrity": "sha512-62DVLZGoiEBDHQyqG4w9xCuZ7eJEwNmJRWw2VY84Oedb7WFcA27fiEVe8oUQx9hAUJ4ekurquucTGwsyO1XGdQ==",
+            "dev": true,
+            "requires": {
+                "get-intrinsic": "^1.1.1"
+            }
+        },
+        "has-symbols": {
+            "version": "1.0.3",
+            "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.3.tgz",
+            "integrity": "sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A==",
+            "dev": true
+        },
+        "hash-base": {
+            "version": "3.1.0",
+            "resolved": "https://registry.npmjs.org/hash-base/-/hash-base-3.1.0.tgz",
+            "integrity": "sha512-1nmYp/rhMDiE7AYkDw+lLwlAzz0AntGIe51F3RfFfEqyQ3feY2eI/NcwC6umIQVOASPMsWJLJScWKSSvzL9IVA==",
+            "dev": true,
+            "requires": {
+                "inherits": "^2.0.4",
+                "readable-stream": "^3.6.0",
+                "safe-buffer": "^5.2.0"
+            },
+            "dependencies": {
+                "safe-buffer": {
+                    "version": "5.2.1",
+                    "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz",
+                    "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==",
+                    "dev": true
+                }
+            }
+        },
+        "hash-sum": {
+            "version": "1.0.2",
+            "resolved": "https://registry.npmjs.org/hash-sum/-/hash-sum-1.0.2.tgz",
+            "integrity": "sha512-fUs4B4L+mlt8/XAtSOGMUO1TXmAelItBPtJG7CyHJfYTdDjwisntGO2JQz7oUsatOY9o68+57eziUVNw/mRHmA==",
+            "dev": true
+        },
+        "hash.js": {
+            "version": "1.1.7",
+            "resolved": "https://registry.npmjs.org/hash.js/-/hash.js-1.1.7.tgz",
+            "integrity": "sha512-taOaskGt4z4SOANNseOviYDvjEJinIkRgmp7LbKP2YTTmVxWBl87s/uzK9r+44BclBSp2X7K1hqeNfz9JbBeXA==",
+            "dev": true,
+            "requires": {
+                "inherits": "^2.0.3",
+                "minimalistic-assert": "^1.0.1"
+            }
+        },
+        "he": {
+            "version": "1.2.0",
+            "resolved": "https://registry.npmjs.org/he/-/he-1.2.0.tgz",
+            "integrity": "sha512-F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw==",
+            "dev": true
+        },
+        "hmac-drbg": {
+            "version": "1.0.1",
+            "resolved": "https://registry.npmjs.org/hmac-drbg/-/hmac-drbg-1.0.1.tgz",
+            "integrity": "sha512-Tti3gMqLdZfhOQY1Mzf/AanLiqh1WTiJgEj26ZuYQ9fbkLomzGchCws4FyrSd4VkpBfiNhaE1On+lOz894jvXg==",
+            "dev": true,
+            "requires": {
+                "hash.js": "^1.0.3",
+                "minimalistic-assert": "^1.0.0",
+                "minimalistic-crypto-utils": "^1.0.1"
+            }
+        },
+        "hpack.js": {
+            "version": "2.1.6",
+            "resolved": "https://registry.npmjs.org/hpack.js/-/hpack.js-2.1.6.tgz",
+            "integrity": "sha512-zJxVehUdMGIKsRaNt7apO2Gqp0BdqW5yaiGHXXmbpvxgBYVZnAql+BJb4RO5ad2MgpbZKn5G6nMnegrH1FcNYQ==",
+            "dev": true,
+            "requires": {
+                "inherits": "^2.0.1",
+                "obuf": "^1.0.0",
+                "readable-stream": "^2.0.1",
+                "wbuf": "^1.1.0"
+            },
+            "dependencies": {
+                "readable-stream": {
+                    "version": "2.3.8",
+                    "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.8.tgz",
+                    "integrity": "sha512-8p0AUk4XODgIewSi0l8Epjs+EVnWiK7NoDIEGU0HhE7+ZyY8D1IMY7odu5lRrFXGg71L15KG8QrPmum45RTtdA==",
+                    "dev": true,
+                    "requires": {
+                        "core-util-is": "~1.0.0",
+                        "inherits": "~2.0.3",
+                        "isarray": "~1.0.0",
+                        "process-nextick-args": "~2.0.0",
+                        "safe-buffer": "~5.1.1",
+                        "string_decoder": "~1.1.1",
+                        "util-deprecate": "~1.0.1"
+                    }
+                },
+                "string_decoder": {
+                    "version": "1.1.1",
+                    "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
+                    "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
+                    "dev": true,
+                    "requires": {
+                        "safe-buffer": "~5.1.0"
+                    }
+                }
+            }
+        },
+        "html-attribute-sorter": {
+            "version": "0.4.3",
+            "resolved": "https://registry.npmjs.org/html-attribute-sorter/-/html-attribute-sorter-0.4.3.tgz",
+            "integrity": "sha512-HWSvaXJki44tg0uR1t+j5pRdUVpNiZcJaoB/PFhss/YoAw9cxUDLCpIBbLWQmKjBQfWk91P6LaRnredEyabrDw==",
+            "dev": true
+        },
+        "html-entities": {
+            "version": "2.4.0",
+            "resolved": "https://registry.npmjs.org/html-entities/-/html-entities-2.4.0.tgz",
+            "integrity": "sha512-igBTJcNNNhvZFRtm8uA6xMY6xYleeDwn3PeBCkDz7tHttv4F2hsDI2aPgNERWzvRcNYHNT3ymRaQzllmXj4YsQ==",
+            "dev": true
+        },
+        "html-loader": {
+            "version": "1.3.2",
+            "resolved": "https://registry.npmjs.org/html-loader/-/html-loader-1.3.2.tgz",
+            "integrity": "sha512-DEkUwSd0sijK5PF3kRWspYi56XP7bTNkyg5YWSzBdjaSDmvCufep5c4Vpb3PBf6lUL0YPtLwBfy9fL0t5hBAGA==",
+            "dev": true,
+            "requires": {
+                "html-minifier-terser": "^5.1.1",
+                "htmlparser2": "^4.1.0",
+                "loader-utils": "^2.0.0",
+                "schema-utils": "^3.0.0"
+            },
+            "dependencies": {
+                "schema-utils": {
+                    "version": "3.3.0",
+                    "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.3.0.tgz",
+                    "integrity": "sha512-pN/yOAvcC+5rQ5nERGuwrjLlYvLTbCibnZ1I7B1LaiAz9BRBlE9GMgE/eqV30P7aJQUf7Ddimy/RsbYO/GrVGg==",
+                    "dev": true,
+                    "requires": {
+                        "@types/json-schema": "^7.0.8",
+                        "ajv": "^6.12.5",
+                        "ajv-keywords": "^3.5.2"
+                    }
+                }
+            }
+        },
+        "html-minifier-terser": {
+            "version": "5.1.1",
+            "resolved": "https://registry.npmjs.org/html-minifier-terser/-/html-minifier-terser-5.1.1.tgz",
+            "integrity": "sha512-ZPr5MNObqnV/T9akshPKbVgyOqLmy+Bxo7juKCfTfnjNniTAMdy4hz21YQqoofMBJD2kdREaqPPdThoR78Tgxg==",
+            "dev": true,
+            "requires": {
+                "camel-case": "^4.1.1",
+                "clean-css": "^4.2.3",
+                "commander": "^4.1.1",
+                "he": "^1.2.0",
+                "param-case": "^3.0.3",
+                "relateurl": "^0.2.7",
+                "terser": "^4.6.3"
+            },
+            "dependencies": {
+                "clean-css": {
+                    "version": "4.2.4",
+                    "resolved": "https://registry.npmjs.org/clean-css/-/clean-css-4.2.4.tgz",
+                    "integrity": "sha512-EJUDT7nDVFDvaQgAo2G/PJvxmp1o/c6iXLbswsBbUFXi1Nr+AjA2cKmfbKDMjMvzEe75g3P6JkaDDAKk96A85A==",
+                    "dev": true,
+                    "requires": {
+                        "source-map": "~0.6.0"
+                    }
+                },
+                "commander": {
+                    "version": "4.1.1",
+                    "resolved": "https://registry.npmjs.org/commander/-/commander-4.1.1.tgz",
+                    "integrity": "sha512-NOKm8xhkzAjzFx8B2v5OAHT+u5pRQc2UCa2Vq9jYL/31o2wi9mxBA7LIFs3sV5VSC49z6pEhfbMULvShKj26WA==",
+                    "dev": true
+                },
+                "terser": {
+                    "version": "4.8.1",
+                    "resolved": "https://registry.npmjs.org/terser/-/terser-4.8.1.tgz",
+                    "integrity": "sha512-4GnLC0x667eJG0ewJTa6z/yXrbLGv80D9Ru6HIpCQmO+Q4PfEtBFi0ObSckqwL6VyQv/7ENJieXHo2ANmdQwgw==",
+                    "dev": true,
+                    "requires": {
+                        "commander": "^2.20.0",
+                        "source-map": "~0.6.1",
+                        "source-map-support": "~0.5.12"
+                    },
+                    "dependencies": {
+                        "commander": {
+                            "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
+                        }
+                    }
+                }
+            }
+        },
+        "htmlparser2": {
+            "version": "4.1.0",
+            "resolved": "https://registry.npmjs.org/htmlparser2/-/htmlparser2-4.1.0.tgz",
+            "integrity": "sha512-4zDq1a1zhE4gQso/c5LP1OtrhYTncXNSpvJYtWJBtXAETPlMfi3IFNjGuQbYLuVY4ZR0QMqRVvo4Pdy9KLyP8Q==",
+            "dev": true,
+            "requires": {
+                "domelementtype": "^2.0.1",
+                "domhandler": "^3.0.0",
+                "domutils": "^2.0.0",
+                "entities": "^2.0.0"
+            }
+        },
+        "http-deceiver": {
+            "version": "1.2.7",
+            "resolved": "https://registry.npmjs.org/http-deceiver/-/http-deceiver-1.2.7.tgz",
+            "integrity": "sha512-LmpOGxTfbpgtGVxJrj5k7asXHCgNZp5nLfp+hWc8QQRqtb7fUy6kRY3BO1h9ddF6yIPYUARgxGOwB42DnxIaNw==",
+            "dev": true
+        },
+        "http-errors": {
+            "version": "2.0.0",
+            "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-2.0.0.tgz",
+            "integrity": "sha512-FtwrG/euBzaEjYeRqOgly7G0qviiXoJWnvEH2Z1plBdXgbyjv34pHTSb9zoeHMyDy33+DWy5Wt9Wo+TURtOYSQ==",
+            "dev": true,
+            "requires": {
+                "depd": "2.0.0",
+                "inherits": "2.0.4",
+                "setprototypeof": "1.2.0",
+                "statuses": "2.0.1",
+                "toidentifier": "1.0.1"
+            }
+        },
+        "http-parser-js": {
+            "version": "0.5.8",
+            "resolved": "https://registry.npmjs.org/http-parser-js/-/http-parser-js-0.5.8.tgz",
+            "integrity": "sha512-SGeBX54F94Wgu5RH3X5jsDtf4eHyRogWX1XGT3b4HuW3tQPM4AaBzoUji/4AAJNXCEOWZ5O0DgZmJw1947gD5Q==",
+            "dev": true
+        },
+        "http-proxy": {
+            "version": "1.18.1",
+            "resolved": "https://registry.npmjs.org/http-proxy/-/http-proxy-1.18.1.tgz",
+            "integrity": "sha512-7mz/721AbnJwIVbnaSv1Cz3Am0ZLT/UBwkC92VlxhXv/k/BBQfM2fXElQNC27BVGr0uwUpplYPQM9LnaBMR5NQ==",
+            "dev": true,
+            "requires": {
+                "eventemitter3": "^4.0.0",
+                "follow-redirects": "^1.0.0",
+                "requires-port": "^1.0.0"
+            }
+        },
+        "http-proxy-middleware": {
+            "version": "2.0.6",
+            "resolved": "https://registry.npmjs.org/http-proxy-middleware/-/http-proxy-middleware-2.0.6.tgz",
+            "integrity": "sha512-ya/UeJ6HVBYxrgYotAZo1KvPWlgB48kUJLDePFeneHsVujFaW5WNj2NgWCAE//B1Dl02BIfYlpNgBy8Kf8Rjmw==",
+            "dev": true,
+            "requires": {
+                "@types/http-proxy": "^1.17.8",
+                "http-proxy": "^1.18.1",
+                "is-glob": "^4.0.1",
+                "is-plain-obj": "^3.0.0",
+                "micromatch": "^4.0.2"
+            }
+        },
+        "https-browserify": {
+            "version": "1.0.0",
+            "resolved": "https://registry.npmjs.org/https-browserify/-/https-browserify-1.0.0.tgz",
+            "integrity": "sha512-J+FkSdyD+0mA0N+81tMotaRMfSL9SGi+xpD3T6YApKsc3bGSXJlfXri3VyFOeYkfLRQisDk1W+jIFFKBeUBbBg==",
+            "dev": true
+        },
+        "human-signals": {
+            "version": "2.1.0",
+            "resolved": "https://registry.npmjs.org/human-signals/-/human-signals-2.1.0.tgz",
+            "integrity": "sha512-B4FFZ6q/T2jhhksgkbEW3HBvWIfDW85snkQgawt07S7J5QXTk6BkNV+0yAeZrM5QpMAdYlocGoljn0sJ/WQkFw==",
+            "dev": true
+        },
+        "iconv-lite": {
+            "version": "0.4.24",
+            "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz",
+            "integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==",
+            "dev": true,
+            "requires": {
+                "safer-buffer": ">= 2.1.2 < 3"
+            }
+        },
+        "icss-utils": {
+            "version": "5.1.0",
+            "resolved": "https://registry.npmjs.org/icss-utils/-/icss-utils-5.1.0.tgz",
+            "integrity": "sha512-soFhflCVWLfRNOPU3iv5Z9VUdT44xFRbzjLsEzSr5AQmgqPMTHdU3PMT1Cf1ssx8fLNJDA1juftYl+PUcv3MqA==",
+            "dev": true,
+            "requires": {}
+        },
+        "ieee754": {
+            "version": "1.2.1",
+            "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.2.1.tgz",
+            "integrity": "sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==",
+            "dev": true
+        },
+        "ignore": {
+            "version": "5.2.0",
+            "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.2.0.tgz",
+            "integrity": "sha512-CmxgYGiEPCLhfLnpPp1MoRmifwEIOgjcHXxOBjv7mY96c+eWScsOP9c112ZyLdWHi0FxHjI+4uVhKYp/gcdRmQ==",
+            "dev": true
+        },
+        "imagemin": {
+            "version": "7.0.1",
+            "resolved": "https://registry.npmjs.org/imagemin/-/imagemin-7.0.1.tgz",
+            "integrity": "sha512-33AmZ+xjZhg2JMCe+vDf6a9mzWukE7l+wAtesjE7KyteqqKjzxv7aVQeWnul1Ve26mWvEQqyPwl0OctNBfSR9w==",
+            "dev": true,
+            "requires": {
+                "file-type": "^12.0.0",
+                "globby": "^10.0.0",
+                "graceful-fs": "^4.2.2",
+                "junk": "^3.1.0",
+                "make-dir": "^3.0.0",
+                "p-pipe": "^3.0.0",
+                "replace-ext": "^1.0.0"
+            }
+        },
+        "img-loader": {
+            "version": "4.0.0",
+            "resolved": "https://registry.npmjs.org/img-loader/-/img-loader-4.0.0.tgz",
+            "integrity": "sha512-UwRcPQdwdOyEHyCxe1V9s9YFwInwEWCpoO+kJGfIqDrBDqA8jZUsEZTxQ0JteNPGw/Gupmwesk2OhLTcnw6tnQ==",
+            "dev": true,
+            "requires": {
+                "loader-utils": "^1.1.0"
+            },
+            "dependencies": {
+                "json5": {
+                    "version": "1.0.2",
+                    "resolved": "https://registry.npmjs.org/json5/-/json5-1.0.2.tgz",
+                    "integrity": "sha512-g1MWMLBiz8FKi1e4w0UyVL3w+iJceWAFBAaBnnGKOpNa5f8TLktkbre1+s6oICydWAm+HRUGTmI+//xv2hvXYA==",
+                    "dev": true,
+                    "requires": {
+                        "minimist": "^1.2.0"
+                    }
+                },
+                "loader-utils": {
+                    "version": "1.4.2",
+                    "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-1.4.2.tgz",
+                    "integrity": "sha512-I5d00Pd/jwMD2QCduo657+YM/6L3KZu++pmX9VFncxaxvHcru9jx1lBaFft+r4Mt2jK0Yhp41XlRAihzPxHNCg==",
+                    "dev": true,
+                    "requires": {
+                        "big.js": "^5.2.2",
+                        "emojis-list": "^3.0.0",
+                        "json5": "^1.0.1"
+                    }
+                }
+            }
+        },
+        "immutable": {
+            "version": "4.0.0",
+            "resolved": "https://registry.npmjs.org/immutable/-/immutable-4.0.0.tgz",
+            "integrity": "sha512-zIE9hX70qew5qTUjSS7wi1iwj/l7+m54KWU247nhM3v806UdGj1yDndXj+IOYxxtW9zyLI+xqFNZjTuDaLUqFw==",
+            "dev": true
+        },
+        "import-fresh": {
+            "version": "3.3.0",
+            "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.3.0.tgz",
+            "integrity": "sha512-veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw==",
+            "dev": true,
+            "requires": {
+                "parent-module": "^1.0.0",
+                "resolve-from": "^4.0.0"
+            }
+        },
+        "import-local": {
+            "version": "3.1.0",
+            "resolved": "https://registry.npmjs.org/import-local/-/import-local-3.1.0.tgz",
+            "integrity": "sha512-ASB07uLtnDs1o6EHjKpX34BKYDSqnFerfTOJL2HvMqF70LnxpjkzDB8J44oT9pu4AMPkQwf8jl6szgvNd2tRIg==",
+            "dev": true,
+            "requires": {
+                "pkg-dir": "^4.2.0",
+                "resolve-cwd": "^3.0.0"
+            }
+        },
+        "inflight": {
+            "version": "1.0.6",
+            "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
+            "integrity": "sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA==",
+            "dev": true,
+            "requires": {
+                "once": "^1.3.0",
+                "wrappy": "1"
+            }
+        },
+        "inherits": {
+            "version": "2.0.4",
+            "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",
+            "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==",
+            "dev": true
+        },
+        "ini": {
+            "version": "1.3.8",
+            "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.8.tgz",
+            "integrity": "sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew==",
+            "dev": true
+        },
+        "interpret": {
+            "version": "2.2.0",
+            "resolved": "https://registry.npmjs.org/interpret/-/interpret-2.2.0.tgz",
+            "integrity": "sha512-Ju0Bz/cEia55xDwUWEa8+olFpCiQoypjnQySseKtmjNrnps3P+xfpUmGr90T7yjlVJmOtybRvPXhKMbHr+fWnw==",
+            "dev": true
+        },
+        "ipaddr.js": {
+            "version": "2.1.0",
+            "resolved": "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-2.1.0.tgz",
+            "integrity": "sha512-LlbxQ7xKzfBusov6UMi4MFpEg0m+mAm9xyNGEduwXMEDuf4WfzB/RZwMVYEd7IKGvh4IUkEXYxtAVu9T3OelJQ==",
+            "dev": true
+        },
+        "is-arrayish": {
+            "version": "0.2.1",
+            "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz",
+            "integrity": "sha512-zz06S8t0ozoDXMG+ube26zeCTNXcKIPJZJi8hBrF4idCLms4CG9QtK7qBl1boi5ODzFpjswb5JPmHCbMpjaYzg==",
+            "dev": true
+        },
+        "is-binary-path": {
+            "version": "2.1.0",
+            "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-2.1.0.tgz",
+            "integrity": "sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==",
+            "dev": true,
+            "requires": {
+                "binary-extensions": "^2.0.0"
+            }
+        },
+        "is-buffer": {
+            "version": "1.1.6",
+            "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz",
+            "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==",
+            "dev": true
+        },
+        "is-core-module": {
+            "version": "2.12.1",
+            "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.12.1.tgz",
+            "integrity": "sha512-Q4ZuBAe2FUsKtyQJoQHlvP8OvBERxO3jEmy1I7hcRXcJBGGHFh/aJBswbXuS9sgrDH2QUO8ilkwNPHvHMd8clg==",
+            "dev": true,
+            "requires": {
+                "has": "^1.0.3"
+            }
+        },
+        "is-docker": {
+            "version": "2.2.1",
+            "resolved": "https://registry.npmjs.org/is-docker/-/is-docker-2.2.1.tgz",
+            "integrity": "sha512-F+i2BKsFrH66iaUFc0woD8sLy8getkwTwtOBjvs56Cx4CgJDeKQeqfz8wAYiSb8JOprWhHH5p77PbmYCvvUuXQ==",
+            "dev": true
+        },
+        "is-extglob": {
+            "version": "2.1.1",
+            "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz",
+            "integrity": "sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==",
+            "dev": true
+        },
+        "is-fullwidth-code-point": {
+            "version": "3.0.0",
+            "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
+            "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
+            "dev": true
+        },
+        "is-glob": {
+            "version": "4.0.3",
+            "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz",
+            "integrity": "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==",
+            "dev": true,
+            "requires": {
+                "is-extglob": "^2.1.1"
+            }
+        },
+        "is-number": {
+            "version": "7.0.0",
+            "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
+            "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==",
+            "dev": true
+        },
+        "is-plain-obj": {
+            "version": "3.0.0",
+            "resolved": "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-3.0.0.tgz",
+            "integrity": "sha512-gwsOE28k+23GP1B6vFl1oVh/WOzmawBrKwo5Ev6wMKzPkaXaCDIQKzLnvsA42DRlbVTWorkgTKIviAKCWkfUwA==",
+            "dev": true
+        },
+        "is-plain-object": {
+            "version": "2.0.4",
+            "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz",
+            "integrity": "sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==",
+            "dev": true,
+            "requires": {
+                "isobject": "^3.0.1"
+            }
+        },
+        "is-stream": {
+            "version": "2.0.1",
+            "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-2.0.1.tgz",
+            "integrity": "sha512-hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg==",
+            "dev": true
+        },
+        "is-wsl": {
+            "version": "2.2.0",
+            "resolved": "https://registry.npmjs.org/is-wsl/-/is-wsl-2.2.0.tgz",
+            "integrity": "sha512-fKzAra0rGJUUBwGBgNkHZuToZcn+TtXHpeCgmkMJMMYx1sQDYaCSyjJBSCa2nH1DGm7s3n1oBnohoVTBaN7Lww==",
+            "dev": true,
+            "requires": {
+                "is-docker": "^2.0.0"
+            }
+        },
+        "isarray": {
+            "version": "1.0.0",
+            "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
+            "integrity": "sha512-VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ==",
+            "dev": true
+        },
+        "isexe": {
+            "version": "2.0.0",
+            "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz",
+            "integrity": "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==",
+            "dev": true
+        },
+        "isobject": {
+            "version": "3.0.1",
+            "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
+            "integrity": "sha512-WhB9zCku7EGTj/HQQRz5aUQEUeoQZH2bWcltRErOpymJ4boYE6wL9Tbr23krRPSZ+C5zqNSrSw+Cc7sZZ4b7vg==",
+            "dev": true
+        },
+        "jest-worker": {
+            "version": "27.5.1",
+            "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-27.5.1.tgz",
+            "integrity": "sha512-7vuh85V5cdDofPyxn58nrPjBktZo0u9x1g8WtjQol+jZDaE+fhN+cIvTj11GndBnMnyfrUOG1sZQxCdjKh+DKg==",
+            "dev": true,
+            "requires": {
+                "@types/node": "*",
+                "merge-stream": "^2.0.0",
+                "supports-color": "^8.0.0"
+            },
+            "dependencies": {
+                "supports-color": {
+                    "version": "8.1.1",
+                    "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz",
+                    "integrity": "sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==",
+                    "dev": true,
+                    "requires": {
+                        "has-flag": "^4.0.0"
+                    }
+                }
+            }
+        },
+        "jiti": {
+            "version": "1.19.1",
+            "resolved": "https://registry.npmjs.org/jiti/-/jiti-1.19.1.tgz",
+            "integrity": "sha512-oVhqoRDaBXf7sjkll95LHVS6Myyyb1zaunVwk4Z0+WPSW4gjS0pl01zYKHScTuyEhQsFxV5L4DR5r+YqSyqyyg==",
+            "dev": true
+        },
+        "jquery": {
+            "version": "3.7.1",
+            "resolved": "https://registry.npmjs.org/jquery/-/jquery-3.7.1.tgz",
+            "integrity": "sha512-m4avr8yL8kmFN8psrbFFFmB/If14iN5o9nw/NgnnM+kybDJpRsAynV2BsfpTYrTRysYUdADVD7CkUUizgkpLfg==",
+            "dev": true
+        },
+        "js-beautify": {
+            "version": "1.14.9",
+            "resolved": "https://registry.npmjs.org/js-beautify/-/js-beautify-1.14.9.tgz",
+            "integrity": "sha512-coM7xq1syLcMyuVGyToxcj2AlzhkDjmfklL8r0JgJ7A76wyGMpJ1oA35mr4APdYNO/o/4YY8H54NQIJzhMbhBg==",
+            "dev": true,
+            "requires": {
+                "config-chain": "^1.1.13",
+                "editorconfig": "^1.0.3",
+                "glob": "^8.1.0",
+                "nopt": "^6.0.0"
+            },
+            "dependencies": {
+                "brace-expansion": {
+                    "version": "2.0.1",
+                    "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz",
+                    "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==",
+                    "dev": true,
+                    "requires": {
+                        "balanced-match": "^1.0.0"
+                    }
+                },
+                "glob": {
+                    "version": "8.1.0",
+                    "resolved": "https://registry.npmjs.org/glob/-/glob-8.1.0.tgz",
+                    "integrity": "sha512-r8hpEjiQEYlF2QU0df3dS+nxxSIreXQS1qRhMJM0Q5NDdR386C7jb7Hwwod8Fgiuex+k0GFjgft18yvxm5XoCQ==",
+                    "dev": true,
+                    "requires": {
+                        "fs.realpath": "^1.0.0",
+                        "inflight": "^1.0.4",
+                        "inherits": "2",
+                        "minimatch": "^5.0.1",
+                        "once": "^1.3.0"
+                    }
+                },
+                "minimatch": {
+                    "version": "5.1.6",
+                    "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-5.1.6.tgz",
+                    "integrity": "sha512-lKwV/1brpG6mBUFHtb7NUmtABCb2WZZmm2wNiOA5hAb8VdCS4B3dtMWyvcoViccwAW/COERjXLt0zP1zXUN26g==",
+                    "dev": true,
+                    "requires": {
+                        "brace-expansion": "^2.0.1"
+                    }
+                }
+            }
+        },
+        "js-tokens": {
+            "version": "4.0.0",
+            "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz",
+            "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==",
+            "dev": true
+        },
+        "jsesc": {
+            "version": "2.5.2",
+            "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-2.5.2.tgz",
+            "integrity": "sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA==",
+            "dev": true
+        },
+        "json-parse-even-better-errors": {
+            "version": "2.3.1",
+            "resolved": "https://registry.npmjs.org/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz",
+            "integrity": "sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w==",
+            "dev": true
+        },
+        "json-schema-traverse": {
+            "version": "0.4.1",
+            "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
+            "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
+            "dev": true
+        },
+        "json5": {
+            "version": "2.2.3",
+            "resolved": "https://registry.npmjs.org/json5/-/json5-2.2.3.tgz",
+            "integrity": "sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg==",
+            "dev": true
+        },
+        "jsonfile": {
+            "version": "6.1.0",
+            "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.1.0.tgz",
+            "integrity": "sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ==",
+            "dev": true,
+            "requires": {
+                "graceful-fs": "^4.1.6",
+                "universalify": "^2.0.0"
+            }
+        },
+        "junk": {
+            "version": "3.1.0",
+            "resolved": "https://registry.npmjs.org/junk/-/junk-3.1.0.tgz",
+            "integrity": "sha512-pBxcB3LFc8QVgdggvZWyeys+hnrNWg4OcZIU/1X59k5jQdLBlCsYGRQaz234SqoRLTCgMH00fY0xRJH+F9METQ==",
+            "dev": true
+        },
+        "kind-of": {
+            "version": "6.0.3",
+            "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
+            "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==",
+            "dev": true
+        },
+        "klona": {
+            "version": "2.0.6",
+            "resolved": "https://registry.npmjs.org/klona/-/klona-2.0.6.tgz",
+            "integrity": "sha512-dhG34DXATL5hSxJbIexCft8FChFXtmskoZYnoPWjXQuebWYCNkVeV3KkGegCK9CP1oswI/vQibS2GY7Em/sJJA==",
+            "dev": true
+        },
+        "laravel-mix": {
+            "version": "6.0.49",
+            "resolved": "https://registry.npmjs.org/laravel-mix/-/laravel-mix-6.0.49.tgz",
+            "integrity": "sha512-bBMFpFjp26XfijPvY5y9zGKud7VqlyOE0OWUcPo3vTBY5asw8LTjafAbee1dhfLz6PWNqDziz69CP78ELSpfKw==",
+            "dev": true,
+            "requires": {
+                "@babel/core": "^7.15.8",
+                "@babel/plugin-proposal-object-rest-spread": "^7.15.6",
+                "@babel/plugin-syntax-dynamic-import": "^7.8.3",
+                "@babel/plugin-transform-runtime": "^7.15.8",
+                "@babel/preset-env": "^7.15.8",
+                "@babel/runtime": "^7.15.4",
+                "@types/babel__core": "^7.1.16",
+                "@types/clean-css": "^4.2.5",
+                "@types/imagemin-gifsicle": "^7.0.1",
+                "@types/imagemin-mozjpeg": "^8.0.1",
+                "@types/imagemin-optipng": "^5.2.1",
+                "@types/imagemin-svgo": "^8.0.0",
+                "autoprefixer": "^10.4.0",
+                "babel-loader": "^8.2.3",
+                "chalk": "^4.1.2",
+                "chokidar": "^3.5.2",
+                "clean-css": "^5.2.4",
+                "cli-table3": "^0.6.0",
+                "collect.js": "^4.28.5",
+                "commander": "^7.2.0",
+                "concat": "^1.0.3",
+                "css-loader": "^5.2.6",
+                "cssnano": "^5.0.8",
+                "dotenv": "^10.0.0",
+                "dotenv-expand": "^5.1.0",
+                "file-loader": "^6.2.0",
+                "fs-extra": "^10.0.0",
+                "glob": "^7.2.0",
+                "html-loader": "^1.3.2",
+                "imagemin": "^7.0.1",
+                "img-loader": "^4.0.0",
+                "lodash": "^4.17.21",
+                "md5": "^2.3.0",
+                "mini-css-extract-plugin": "^1.6.2",
+                "node-libs-browser": "^2.2.1",
+                "postcss-load-config": "^3.1.0",
+                "postcss-loader": "^6.2.0",
+                "semver": "^7.3.5",
+                "strip-ansi": "^6.0.0",
+                "style-loader": "^2.0.0",
+                "terser": "^5.9.0",
+                "terser-webpack-plugin": "^5.2.4",
+                "vue-style-loader": "^4.1.3",
+                "webpack": "^5.60.0",
+                "webpack-cli": "^4.9.1",
+                "webpack-dev-server": "^4.7.3",
+                "webpack-merge": "^5.8.0",
+                "webpack-notifier": "^1.14.1",
+                "webpackbar": "^5.0.0-3",
+                "yargs": "^17.2.1"
+            },
+            "dependencies": {
+                "postcss-load-config": {
+                    "version": "3.1.4",
+                    "resolved": "https://registry.npmjs.org/postcss-load-config/-/postcss-load-config-3.1.4.tgz",
+                    "integrity": "sha512-6DiM4E7v4coTE4uzA8U//WhtPwyhiim3eyjEMFCnUpzbrkK9wJHgKDT2mR+HbtSrd/NubVaYTOpSpjUl8NQeRg==",
+                    "dev": true,
+                    "requires": {
+                        "lilconfig": "^2.0.5",
+                        "yaml": "^1.10.2"
+                    }
+                },
+                "yaml": {
+                    "version": "1.10.2",
+                    "resolved": "https://registry.npmjs.org/yaml/-/yaml-1.10.2.tgz",
+                    "integrity": "sha512-r3vXyErRCYJ7wg28yvBY5VSoAF8ZvlcW9/BwUzEtUsjvX/DKs24dIkuwjtuprwJJHsbyUbLApepYTR1BN4uHrg==",
+                    "dev": true
+                }
+            }
+        },
+        "launch-editor": {
+            "version": "2.6.1",
+            "resolved": "https://registry.npmjs.org/launch-editor/-/launch-editor-2.6.1.tgz",
+            "integrity": "sha512-eB/uXmFVpY4zezmGp5XtU21kwo7GBbKB+EQ+UZeWtGb9yAM5xt/Evk+lYH3eRNAtId+ej4u7TYPFZ07w4s7rRw==",
+            "dev": true,
+            "requires": {
+                "picocolors": "^1.0.0",
+                "shell-quote": "^1.8.1"
+            }
+        },
+        "lilconfig": {
+            "version": "2.1.0",
+            "resolved": "https://registry.npmjs.org/lilconfig/-/lilconfig-2.1.0.tgz",
+            "integrity": "sha512-utWOt/GHzuUxnLKxB6dk81RoOeoNeHgbrXiuGk4yyF5qlRz+iIVWu56E2fqGHFrXz0QNUhLB/8nKqvRH66JKGQ==",
+            "dev": true
+        },
+        "lines-and-columns": {
+            "version": "1.2.4",
+            "resolved": "https://registry.npmjs.org/lines-and-columns/-/lines-and-columns-1.2.4.tgz",
+            "integrity": "sha512-7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg==",
+            "dev": true
+        },
+        "linguist-languages": {
+            "version": "7.26.1",
+            "resolved": "https://registry.npmjs.org/linguist-languages/-/linguist-languages-7.26.1.tgz",
+            "integrity": "sha512-B9O5pDocOkfswmA0qKrqdfeua1TxeQ5PPWdsuo5QRXFv2N0tB3plY+DVWvSWiGkjdqKNU3KBjJYHs/jRXG0adw==",
+            "dev": true
+        },
+        "loader-runner": {
+            "version": "4.3.0",
+            "resolved": "https://registry.npmjs.org/loader-runner/-/loader-runner-4.3.0.tgz",
+            "integrity": "sha512-3R/1M+yS3j5ou80Me59j7F9IMs4PXs3VqRrm0TU3AbKPxlmpoY1TNscJV/oGJXo8qCatFGTfDbY6W6ipGOYXfg==",
+            "dev": true
+        },
+        "loader-utils": {
+            "version": "2.0.4",
+            "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.4.tgz",
+            "integrity": "sha512-xXqpXoINfFhgua9xiqD8fPFHgkoq1mmmpE92WlDbm9rNRd/EbRb+Gqf908T2DMfuHjjJlksiK2RbHVOdD/MqSw==",
+            "dev": true,
+            "requires": {
+                "big.js": "^5.2.2",
+                "emojis-list": "^3.0.0",
+                "json5": "^2.1.2"
+            }
+        },
+        "locate-path": {
+            "version": "5.0.0",
+            "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz",
+            "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==",
+            "dev": true,
+            "requires": {
+                "p-locate": "^4.1.0"
+            }
+        },
+        "lodash": {
+            "version": "4.17.21",
+            "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz",
+            "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==",
+            "dev": true
+        },
+        "lodash.debounce": {
+            "version": "4.0.8",
+            "resolved": "https://registry.npmjs.org/lodash.debounce/-/lodash.debounce-4.0.8.tgz",
+            "integrity": "sha512-FT1yDzDYEoYWhnSGnpE/4Kj1fLZkDFyqRb7fNt6FdYOSxlUWAtp42Eh6Wb0rGIv/m9Bgo7x4GhQbm5Ys4SG5ow==",
+            "dev": true
+        },
+        "lodash.memoize": {
+            "version": "4.1.2",
+            "resolved": "https://registry.npmjs.org/lodash.memoize/-/lodash.memoize-4.1.2.tgz",
+            "integrity": "sha512-t7j+NzmgnQzTAYXcsHYLgimltOV1MXHtlOWf6GjL9Kj8GK5FInw5JotxvbOs+IvV1/Dzo04/fCGfLVs7aXb4Ag==",
+            "dev": true
+        },
+        "lodash.uniq": {
+            "version": "4.5.0",
+            "resolved": "https://registry.npmjs.org/lodash.uniq/-/lodash.uniq-4.5.0.tgz",
+            "integrity": "sha512-xfBaXQd9ryd9dlSDvnvI0lvxfLJlYAZzXomUYzLKtUeOQvOP5piqAWuGtrhWeqaXK9hhoM/iyJc5AV+XfsX3HQ==",
+            "dev": true
+        },
+        "lower-case": {
+            "version": "2.0.2",
+            "resolved": "https://registry.npmjs.org/lower-case/-/lower-case-2.0.2.tgz",
+            "integrity": "sha512-7fm3l3NAF9WfN6W3JOmf5drwpVqX78JtoGJ3A6W0a6ZnldM41w2fV5D490psKFTpMds8TJse/eHLFFsNHHjHgg==",
+            "dev": true,
+            "requires": {
+                "tslib": "^2.0.3"
+            }
+        },
+        "lru-cache": {
+            "version": "6.0.0",
+            "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
+            "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
+            "dev": true,
+            "requires": {
+                "yallist": "^4.0.0"
+            }
+        },
+        "magic-string": {
+            "version": "0.30.5",
+            "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.30.5.tgz",
+            "integrity": "sha512-7xlpfBaQaP/T6Vh8MO/EqXSW5En6INHEvEXQiuff7Gku0PWjU3uf6w/j9o7O+SpB5fOAkrI5HeoNgwjEO0pFsA==",
+            "dev": true,
+            "requires": {
+                "@jridgewell/sourcemap-codec": "^1.4.15"
+            }
+        },
+        "make-dir": {
+            "version": "3.1.0",
+            "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-3.1.0.tgz",
+            "integrity": "sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw==",
+            "dev": true,
+            "requires": {
+                "semver": "^6.0.0"
+            },
+            "dependencies": {
+                "semver": {
+                    "version": "6.3.1",
+                    "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
+                    "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==",
+                    "dev": true
+                }
+            }
+        },
+        "map-age-cleaner": {
+            "version": "0.1.3",
+            "resolved": "https://registry.npmjs.org/map-age-cleaner/-/map-age-cleaner-0.1.3.tgz",
+            "integrity": "sha512-bJzx6nMoP6PDLPBFmg7+xRKeFZvFboMrGlxmNj9ClvX53KrmvM5bXFXEWjbz4cz1AFn+jWJ9z/DJSz7hrs0w3w==",
+            "dev": true,
+            "requires": {
+                "p-defer": "^1.0.0"
+            }
+        },
+        "md5": {
+            "version": "2.3.0",
+            "resolved": "https://registry.npmjs.org/md5/-/md5-2.3.0.tgz",
+            "integrity": "sha512-T1GITYmFaKuO91vxyoQMFETst+O71VUPEU3ze5GNzDm0OWdP8v1ziTaAEPUr/3kLsY3Sftgz242A1SetQiDL7g==",
+            "dev": true,
+            "requires": {
+                "charenc": "0.0.2",
+                "crypt": "0.0.2",
+                "is-buffer": "~1.1.6"
+            }
+        },
+        "md5.js": {
+            "version": "1.3.5",
+            "resolved": "https://registry.npmjs.org/md5.js/-/md5.js-1.3.5.tgz",
+            "integrity": "sha512-xitP+WxNPcTTOgnTJcrhM0xvdPepipPSf3I8EIpGKeFLjt3PlJLIDG3u8EX53ZIubkb+5U2+3rELYpEhHhzdkg==",
+            "dev": true,
+            "requires": {
+                "hash-base": "^3.0.0",
+                "inherits": "^2.0.1",
+                "safe-buffer": "^5.1.2"
+            }
+        },
+        "mdn-data": {
+            "version": "2.0.14",
+            "resolved": "https://registry.npmjs.org/mdn-data/-/mdn-data-2.0.14.tgz",
+            "integrity": "sha512-dn6wd0uw5GsdswPFfsgMp5NSB0/aDe6fK94YJV/AJDYXL6HVLWBsxeq7js7Ad+mU2K9LAlwpk6kN2D5mwCPVow==",
+            "dev": true
+        },
+        "media-typer": {
+            "version": "0.3.0",
+            "resolved": "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz",
+            "integrity": "sha512-dq+qelQ9akHpcOl/gUVRTxVIOkAJ1wR3QAvb4RsVjS8oVoFjDGTc679wJYmUmknUF5HwMLOgb5O+a3KxfWapPQ==",
+            "dev": true
+        },
+        "mem": {
+            "version": "8.1.1",
+            "resolved": "https://registry.npmjs.org/mem/-/mem-8.1.1.tgz",
+            "integrity": "sha512-qFCFUDs7U3b8mBDPyz5EToEKoAkgCzqquIgi9nkkR9bixxOVOre+09lbuH7+9Kn2NFpm56M3GUWVbU2hQgdACA==",
+            "dev": true,
+            "requires": {
+                "map-age-cleaner": "^0.1.3",
+                "mimic-fn": "^3.1.0"
+            }
+        },
+        "memfs": {
+            "version": "3.5.3",
+            "resolved": "https://registry.npmjs.org/memfs/-/memfs-3.5.3.tgz",
+            "integrity": "sha512-UERzLsxzllchadvbPs5aolHh65ISpKpM+ccLbOJ8/vvpBKmAWf+la7dXFy7Mr0ySHbdHrFv5kGFCUHHe6GFEmw==",
+            "dev": true,
+            "requires": {
+                "fs-monkey": "^1.0.4"
+            }
+        },
+        "merge-descriptors": {
+            "version": "1.0.1",
+            "resolved": "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.1.tgz",
+            "integrity": "sha512-cCi6g3/Zr1iqQi6ySbseM1Xvooa98N0w31jzUYrXPX2xqObmFGHJ0tQ5u74H3mVh7wLouTseZyYIq39g8cNp1w==",
+            "dev": true
+        },
+        "merge-stream": {
+            "version": "2.0.0",
+            "resolved": "https://registry.npmjs.org/merge-stream/-/merge-stream-2.0.0.tgz",
+            "integrity": "sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w==",
+            "dev": true
+        },
+        "merge2": {
+            "version": "1.4.1",
+            "resolved": "https://registry.npmjs.org/merge2/-/merge2-1.4.1.tgz",
+            "integrity": "sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==",
+            "dev": true
+        },
+        "methods": {
+            "version": "1.1.2",
+            "resolved": "https://registry.npmjs.org/methods/-/methods-1.1.2.tgz",
+            "integrity": "sha512-iclAHeNqNm68zFtnZ0e+1L2yUIdvzNoauKU4WBA3VvH/vPFieF7qfRlwUZU+DA9P9bPXIS90ulxoUoCH23sV2w==",
+            "dev": true
+        },
+        "micromatch": {
+            "version": "4.0.5",
+            "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.5.tgz",
+            "integrity": "sha512-DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA==",
+            "dev": true,
+            "requires": {
+                "braces": "^3.0.2",
+                "picomatch": "^2.3.1"
+            }
+        },
+        "miller-rabin": {
+            "version": "4.0.1",
+            "resolved": "https://registry.npmjs.org/miller-rabin/-/miller-rabin-4.0.1.tgz",
+            "integrity": "sha512-115fLhvZVqWwHPbClyntxEVfVDfl9DLLTuJvq3g2O/Oxi8AiNouAHvDSzHS0viUJc+V5vm3eq91Xwqn9dp4jRA==",
+            "dev": true,
+            "requires": {
+                "bn.js": "^4.0.0",
+                "brorand": "^1.0.1"
+            },
+            "dependencies": {
+                "bn.js": {
+                    "version": "4.12.0",
+                    "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.0.tgz",
+                    "integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA==",
+                    "dev": true
+                }
+            }
+        },
+        "mime": {
+            "version": "1.6.0",
+            "resolved": "https://registry.npmjs.org/mime/-/mime-1.6.0.tgz",
+            "integrity": "sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==",
+            "dev": true
+        },
+        "mime-db": {
+            "version": "1.52.0",
+            "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.52.0.tgz",
+            "integrity": "sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==",
+            "dev": true
+        },
+        "mime-types": {
+            "version": "2.1.35",
+            "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.35.tgz",
+            "integrity": "sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==",
+            "dev": true,
+            "requires": {
+                "mime-db": "1.52.0"
+            }
+        },
+        "mimic-fn": {
+            "version": "3.1.0",
+            "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-3.1.0.tgz",
+            "integrity": "sha512-Ysbi9uYW9hFyfrThdDEQuykN4Ey6BuwPD2kpI5ES/nFTDn/98yxYNLZJcgUAKPT/mcrLLKaGzJR9YVxJrIdASQ==",
+            "dev": true
+        },
+        "mini-css-extract-plugin": {
+            "version": "1.6.2",
+            "resolved": "https://registry.npmjs.org/mini-css-extract-plugin/-/mini-css-extract-plugin-1.6.2.tgz",
+            "integrity": "sha512-WhDvO3SjGm40oV5y26GjMJYjd2UMqrLAGKy5YS2/3QKJy2F7jgynuHTir/tgUUOiNQu5saXHdc8reo7YuhhT4Q==",
+            "dev": true,
+            "requires": {
+                "loader-utils": "^2.0.0",
+                "schema-utils": "^3.0.0",
+                "webpack-sources": "^1.1.0"
+            },
+            "dependencies": {
+                "schema-utils": {
+                    "version": "3.3.0",
+                    "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.3.0.tgz",
+                    "integrity": "sha512-pN/yOAvcC+5rQ5nERGuwrjLlYvLTbCibnZ1I7B1LaiAz9BRBlE9GMgE/eqV30P7aJQUf7Ddimy/RsbYO/GrVGg==",
+                    "dev": true,
+                    "requires": {
+                        "@types/json-schema": "^7.0.8",
+                        "ajv": "^6.12.5",
+                        "ajv-keywords": "^3.5.2"
+                    }
+                }
+            }
+        },
+        "minimalistic-assert": {
+            "version": "1.0.1",
+            "resolved": "https://registry.npmjs.org/minimalistic-assert/-/minimalistic-assert-1.0.1.tgz",
+            "integrity": "sha512-UtJcAD4yEaGtjPezWuO9wC4nwUnVH/8/Im3yEHQP4b67cXlD/Qr9hdITCU1xDbSEXg2XKNaP8jsReV7vQd00/A==",
+            "dev": true
+        },
+        "minimalistic-crypto-utils": {
+            "version": "1.0.1",
+            "resolved": "https://registry.npmjs.org/minimalistic-crypto-utils/-/minimalistic-crypto-utils-1.0.1.tgz",
+            "integrity": "sha512-JIYlbt6g8i5jKfJ3xz7rF0LXmv2TkDxBLUkiBeZ7bAx4GnnNMr8xFpGnOxn6GhTEHx3SjRrZEoU+j04prX1ktg==",
+            "dev": true
+        },
+        "minimatch": {
+            "version": "3.1.2",
+            "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
+            "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
+            "dev": true,
+            "requires": {
+                "brace-expansion": "^1.1.7"
+            }
+        },
+        "minimist": {
+            "version": "1.2.8",
+            "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.8.tgz",
+            "integrity": "sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA==",
+            "dev": true
+        },
+        "ms": {
+            "version": "2.1.2",
+            "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
+            "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
+            "dev": true
+        },
+        "multicast-dns": {
+            "version": "7.2.5",
+            "resolved": "https://registry.npmjs.org/multicast-dns/-/multicast-dns-7.2.5.tgz",
+            "integrity": "sha512-2eznPJP8z2BFLX50tf0LuODrpINqP1RVIm/CObbTcBRITQgmC/TjcREF1NeTBzIcR5XO/ukWo+YHOjBbFwIupg==",
+            "dev": true,
+            "requires": {
+                "dns-packet": "^5.2.2",
+                "thunky": "^1.0.2"
+            }
+        },
+        "mz": {
+            "version": "2.7.0",
+            "resolved": "https://registry.npmjs.org/mz/-/mz-2.7.0.tgz",
+            "integrity": "sha512-z81GNO7nnYMEhrGh9LeymoE4+Yr0Wn5McHIZMK5cfQCl+NDX08sCZgUc9/6MHni9IWuFLm1Z3HTCXu2z9fN62Q==",
+            "dev": true,
+            "requires": {
+                "any-promise": "^1.0.0",
+                "object-assign": "^4.0.1",
+                "thenify-all": "^1.0.0"
+            }
+        },
+        "nanoid": {
+            "version": "3.3.7",
+            "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.7.tgz",
+            "integrity": "sha512-eSRppjcPIatRIMC1U6UngP8XFcz8MQWGQdt1MTBQ7NaAmvXDfvNxbvWV3x2y6CdEUciCSsDHDQZbhYaB8QEo2g==",
+            "dev": true
+        },
+        "negotiator": {
+            "version": "0.6.3",
+            "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.3.tgz",
+            "integrity": "sha512-+EUsqGPLsM+j/zdChZjsnX51g4XrHFOIXwfnCVPGlQk/k5giakcKsuxCObBRu6DSm9opw/O6slWbJdghQM4bBg==",
+            "dev": true
+        },
+        "neo-async": {
+            "version": "2.6.2",
+            "resolved": "https://registry.npmjs.org/neo-async/-/neo-async-2.6.2.tgz",
+            "integrity": "sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==",
+            "dev": true
+        },
+        "no-case": {
+            "version": "3.0.4",
+            "resolved": "https://registry.npmjs.org/no-case/-/no-case-3.0.4.tgz",
+            "integrity": "sha512-fgAN3jGAh+RoxUGZHTSOLJIqUc2wmoBwGR4tbpNAKmmovFoWq0OdRkb0VkldReO2a2iBT/OEulG9XSUc10r3zg==",
+            "dev": true,
+            "requires": {
+                "lower-case": "^2.0.2",
+                "tslib": "^2.0.3"
+            }
+        },
+        "node-forge": {
+            "version": "1.3.1",
+            "resolved": "https://registry.npmjs.org/node-forge/-/node-forge-1.3.1.tgz",
+            "integrity": "sha512-dPEtOeMvF9VMcYV/1Wb8CPoVAXtp6MKMlcbAt4ddqmGqUJ6fQZFXkNZNkNlfevtNkGtaSoXf/vNNNSvgrdXwtA==",
+            "dev": true
+        },
+        "node-libs-browser": {
+            "version": "2.2.1",
+            "resolved": "https://registry.npmjs.org/node-libs-browser/-/node-libs-browser-2.2.1.tgz",
+            "integrity": "sha512-h/zcD8H9kaDZ9ALUWwlBUDo6TKF8a7qBSCSEGfjTVIYeqsioSKaAX+BN7NgiMGp6iSIXZ3PxgCu8KS3b71YK5Q==",
+            "dev": true,
+            "requires": {
+                "assert": "^1.1.1",
+                "browserify-zlib": "^0.2.0",
+                "buffer": "^4.3.0",
+                "console-browserify": "^1.1.0",
+                "constants-browserify": "^1.0.0",
+                "crypto-browserify": "^3.11.0",
+                "domain-browser": "^1.1.1",
+                "events": "^3.0.0",
+                "https-browserify": "^1.0.0",
+                "os-browserify": "^0.3.0",
+                "path-browserify": "0.0.1",
+                "process": "^0.11.10",
+                "punycode": "^1.2.4",
+                "querystring-es3": "^0.2.0",
+                "readable-stream": "^2.3.3",
+                "stream-browserify": "^2.0.1",
+                "stream-http": "^2.7.2",
+                "string_decoder": "^1.0.0",
+                "timers-browserify": "^2.0.4",
+                "tty-browserify": "0.0.0",
+                "url": "^0.11.0",
+                "util": "^0.11.0",
+                "vm-browserify": "^1.0.1"
+            },
+            "dependencies": {
+                "readable-stream": {
+                    "version": "2.3.8",
+                    "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.8.tgz",
+                    "integrity": "sha512-8p0AUk4XODgIewSi0l8Epjs+EVnWiK7NoDIEGU0HhE7+ZyY8D1IMY7odu5lRrFXGg71L15KG8QrPmum45RTtdA==",
+                    "dev": true,
+                    "requires": {
+                        "core-util-is": "~1.0.0",
+                        "inherits": "~2.0.3",
+                        "isarray": "~1.0.0",
+                        "process-nextick-args": "~2.0.0",
+                        "safe-buffer": "~5.1.1",
+                        "string_decoder": "~1.1.1",
+                        "util-deprecate": "~1.0.1"
+                    }
+                },
+                "string_decoder": {
+                    "version": "1.1.1",
+                    "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
+                    "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
+                    "dev": true,
+                    "requires": {
+                        "safe-buffer": "~5.1.0"
+                    }
+                }
+            }
+        },
+        "node-notifier": {
+            "version": "9.0.1",
+            "resolved": "https://registry.npmjs.org/node-notifier/-/node-notifier-9.0.1.tgz",
+            "integrity": "sha512-fPNFIp2hF/Dq7qLDzSg4vZ0J4e9v60gJR+Qx7RbjbWqzPDdEqeVpEx5CFeDAELIl+A/woaaNn1fQ5nEVerMxJg==",
+            "dev": true,
+            "requires": {
+                "growly": "^1.3.0",
+                "is-wsl": "^2.2.0",
+                "semver": "^7.3.2",
+                "shellwords": "^0.1.1",
+                "uuid": "^8.3.0",
+                "which": "^2.0.2"
+            }
+        },
+        "node-releases": {
+            "version": "2.0.13",
+            "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.13.tgz",
+            "integrity": "sha512-uYr7J37ae/ORWdZeQ1xxMJe3NtdmqMC/JZK+geofDrkLUApKRHPd18/TxtBOJ4A0/+uUIliorNrfYV6s1b02eQ==",
+            "dev": true
+        },
+        "nopt": {
+            "version": "6.0.0",
+            "resolved": "https://registry.npmjs.org/nopt/-/nopt-6.0.0.tgz",
+            "integrity": "sha512-ZwLpbTgdhuZUnZzjd7nb1ZV+4DoiC6/sfiVKok72ym/4Tlf+DFdlHYmT2JPmcNNWV6Pi3SDf1kT+A4r9RTuT9g==",
+            "dev": true,
+            "requires": {
+                "abbrev": "^1.0.0"
+            }
+        },
+        "normalize-path": {
+            "version": "3.0.0",
+            "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz",
+            "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==",
+            "dev": true
+        },
+        "normalize-range": {
+            "version": "0.1.2",
+            "resolved": "https://registry.npmjs.org/normalize-range/-/normalize-range-0.1.2.tgz",
+            "integrity": "sha512-bdok/XvKII3nUpklnV6P2hxtMNrCboOjAcyBuQnWEhO665FwrSNRxU+AqpsyvO6LgGYPspN+lu5CLtw4jPRKNA==",
+            "dev": true
+        },
+        "normalize-url": {
+            "version": "6.1.0",
+            "resolved": "https://registry.npmjs.org/normalize-url/-/normalize-url-6.1.0.tgz",
+            "integrity": "sha512-DlL+XwOy3NxAQ8xuC0okPgK46iuVNAK01YN7RueYBqqFeGsBjV9XmCAzAdgt+667bCl5kPh9EqKKDwnaPG1I7A==",
+            "dev": true
+        },
+        "npm-run-path": {
+            "version": "4.0.1",
+            "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-4.0.1.tgz",
+            "integrity": "sha512-S48WzZW777zhNIrn7gxOlISNAqi9ZC/uQFnRdbeIHhZhCA6UqpkOT8T1G7BvfdgP4Er8gF4sUbaS0i7QvIfCWw==",
+            "dev": true,
+            "requires": {
+                "path-key": "^3.0.0"
+            }
+        },
+        "nth-check": {
+            "version": "2.1.1",
+            "resolved": "https://registry.npmjs.org/nth-check/-/nth-check-2.1.1.tgz",
+            "integrity": "sha512-lqjrjmaOoAnWfMmBPL+XNnynZh2+swxiX3WUE0s4yEHI6m+AwrK2UZOimIRl3X/4QctVqS8AiZjFqyOGrMXb/w==",
+            "dev": true,
+            "requires": {
+                "boolbase": "^1.0.0"
+            }
+        },
+        "object-assign": {
+            "version": "4.1.1",
+            "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
+            "integrity": "sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg==",
+            "dev": true
+        },
+        "object-hash": {
+            "version": "3.0.0",
+            "resolved": "https://registry.npmjs.org/object-hash/-/object-hash-3.0.0.tgz",
+            "integrity": "sha512-RSn9F68PjH9HqtltsSnqYC1XXoWe9Bju5+213R98cNGttag9q9yAOTzdbsqvIa7aNm5WffBZFpWYr2aWrklWAw==",
+            "dev": true
+        },
+        "object-inspect": {
+            "version": "1.13.1",
+            "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.13.1.tgz",
+            "integrity": "sha512-5qoj1RUiKOMsCCNLV1CBiPYE10sziTsnmNxkAI/rZhiD63CF7IqdFGC/XzjWjpSgLf0LxXX3bDFIh0E18f6UhQ==",
+            "dev": true
+        },
+        "object-keys": {
+            "version": "1.1.1",
+            "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.1.1.tgz",
+            "integrity": "sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==",
+            "dev": true
+        },
+        "object.assign": {
+            "version": "4.1.4",
+            "resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.4.tgz",
+            "integrity": "sha512-1mxKf0e58bvyjSCtKYY4sRe9itRk3PJpquJOjeIkz885CczcI4IvJJDLPS72oowuSh+pBxUFROpX+TU++hxhZQ==",
+            "dev": true,
+            "requires": {
+                "call-bind": "^1.0.2",
+                "define-properties": "^1.1.4",
+                "has-symbols": "^1.0.3",
+                "object-keys": "^1.1.1"
+            }
+        },
+        "obuf": {
+            "version": "1.1.2",
+            "resolved": "https://registry.npmjs.org/obuf/-/obuf-1.1.2.tgz",
+            "integrity": "sha512-PX1wu0AmAdPqOL1mWhqmlOd8kOIZQwGZw6rh7uby9fTc5lhaOWFLX3I6R1hrF9k3zUY40e6igsLGkDXK92LJNg==",
+            "dev": true
+        },
+        "on-finished": {
+            "version": "2.4.1",
+            "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.4.1.tgz",
+            "integrity": "sha512-oVlzkg3ENAhCk2zdv7IJwd/QUD4z2RxRwpkcGY8psCVcCYZNq4wYnVWALHM+brtuJjePWiYF/ClmuDr8Ch5+kg==",
+            "dev": true,
+            "requires": {
+                "ee-first": "1.1.1"
+            }
+        },
+        "on-headers": {
+            "version": "1.0.2",
+            "resolved": "https://registry.npmjs.org/on-headers/-/on-headers-1.0.2.tgz",
+            "integrity": "sha512-pZAE+FJLoyITytdqK0U5s+FIpjN0JP3OzFi/u8Rx+EV5/W+JTWGXG8xFzevE7AjBfDqHv/8vL8qQsIhHnqRkrA==",
+            "dev": true
+        },
+        "once": {
+            "version": "1.4.0",
+            "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
+            "integrity": "sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==",
+            "dev": true,
+            "requires": {
+                "wrappy": "1"
+            }
+        },
+        "onetime": {
+            "version": "5.1.2",
+            "resolved": "https://registry.npmjs.org/onetime/-/onetime-5.1.2.tgz",
+            "integrity": "sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg==",
+            "dev": true,
+            "requires": {
+                "mimic-fn": "^2.1.0"
+            },
+            "dependencies": {
+                "mimic-fn": {
+                    "version": "2.1.0",
+                    "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz",
+                    "integrity": "sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==",
+                    "dev": true
+                }
+            }
+        },
+        "open": {
+            "version": "8.4.2",
+            "resolved": "https://registry.npmjs.org/open/-/open-8.4.2.tgz",
+            "integrity": "sha512-7x81NCL719oNbsq/3mh+hVrAWmFuEYUqrq/Iw3kUzH8ReypT9QQ0BLoJS7/G9k6N81XjW4qHWtjWwe/9eLy1EQ==",
+            "dev": true,
+            "requires": {
+                "define-lazy-prop": "^2.0.0",
+                "is-docker": "^2.1.1",
+                "is-wsl": "^2.2.0"
+            }
+        },
+        "os-browserify": {
+            "version": "0.3.0",
+            "resolved": "https://registry.npmjs.org/os-browserify/-/os-browserify-0.3.0.tgz",
+            "integrity": "sha512-gjcpUc3clBf9+210TRaDWbf+rZZZEshZ+DlXMRCeAjp0xhTrnQsKHypIy1J3d5hKdUzj69t708EHtU8P6bUn0A==",
+            "dev": true
+        },
+        "os-homedir": {
+            "version": "1.0.2",
+            "resolved": "https://registry.npmjs.org/os-homedir/-/os-homedir-1.0.2.tgz",
+            "integrity": "sha512-B5JU3cabzk8c67mRRd3ECmROafjYMXbuzlwtqdM8IbS8ktlTix8aFGb2bAGKrSRIlnfKwovGUUr72JUPyOb6kQ==",
+            "dev": true
+        },
+        "p-defer": {
+            "version": "1.0.0",
+            "resolved": "https://registry.npmjs.org/p-defer/-/p-defer-1.0.0.tgz",
+            "integrity": "sha512-wB3wfAxZpk2AzOfUMJNL+d36xothRSyj8EXOa4f6GMqYDN9BJaaSISbsk+wS9abmnebVw95C2Kb5t85UmpCxuw==",
+            "dev": true
+        },
+        "p-limit": {
+            "version": "2.3.0",
+            "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
+            "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
+            "dev": true,
+            "requires": {
+                "p-try": "^2.0.0"
+            }
+        },
+        "p-locate": {
+            "version": "4.1.0",
+            "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz",
+            "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==",
+            "dev": true,
+            "requires": {
+                "p-limit": "^2.2.0"
+            }
+        },
+        "p-pipe": {
+            "version": "3.1.0",
+            "resolved": "https://registry.npmjs.org/p-pipe/-/p-pipe-3.1.0.tgz",
+            "integrity": "sha512-08pj8ATpzMR0Y80x50yJHn37NF6vjrqHutASaX5LiH5npS9XPvrUmscd9MF5R4fuYRHOxQR1FfMIlF7AzwoPqw==",
+            "dev": true
+        },
+        "p-retry": {
+            "version": "4.6.2",
+            "resolved": "https://registry.npmjs.org/p-retry/-/p-retry-4.6.2.tgz",
+            "integrity": "sha512-312Id396EbJdvRONlngUx0NydfrIQ5lsYu0znKVUzVvArzEIt08V1qhtyESbGVd1FGX7UKtiFp5uwKZdM8wIuQ==",
+            "dev": true,
+            "requires": {
+                "@types/retry": "0.12.0",
+                "retry": "^0.13.1"
+            }
+        },
+        "p-try": {
+            "version": "2.0.0",
+            "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.0.0.tgz",
+            "integrity": "sha512-hMp0onDKIajHfIkdRk3P4CdCmErkYAxxDtP3Wx/4nZ3aGlau2VKh3mZpcuFkH27WQkL/3WBCPOktzA9ZOAnMQQ==",
+            "dev": true
+        },
+        "pako": {
+            "version": "1.0.11",
+            "resolved": "https://registry.npmjs.org/pako/-/pako-1.0.11.tgz",
+            "integrity": "sha512-4hLB8Py4zZce5s4yd9XzopqwVv/yGNhV1Bl8NTmCq1763HeK2+EwVTv+leGeL13Dnh2wfbqowVPXCIO0z4taYw==",
+            "dev": true
+        },
+        "param-case": {
+            "version": "3.0.4",
+            "resolved": "https://registry.npmjs.org/param-case/-/param-case-3.0.4.tgz",
+            "integrity": "sha512-RXlj7zCYokReqWpOPH9oYivUzLYZ5vAPIfEmCTNViosC78F8F0H9y7T7gG2M39ymgutxF5gcFEsyZQSph9Bp3A==",
+            "dev": true,
+            "requires": {
+                "dot-case": "^3.0.4",
+                "tslib": "^2.0.3"
+            }
+        },
+        "parent-module": {
+            "version": "1.0.1",
+            "resolved": "https://registry.npmjs.org/parent-module/-/parent-module-1.0.1.tgz",
+            "integrity": "sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==",
+            "dev": true,
+            "requires": {
+                "callsites": "^3.0.0"
+            }
+        },
+        "parse-asn1": {
+            "version": "5.1.6",
+            "resolved": "https://registry.npmjs.org/parse-asn1/-/parse-asn1-5.1.6.tgz",
+            "integrity": "sha512-RnZRo1EPU6JBnra2vGHj0yhp6ebyjBZpmUCLHWiFhxlzvBCCpAuZ7elsBp1PVAbQN0/04VD/19rfzlBSwLstMw==",
+            "dev": true,
+            "requires": {
+                "asn1.js": "^5.2.0",
+                "browserify-aes": "^1.0.0",
+                "evp_bytestokey": "^1.0.0",
+                "pbkdf2": "^3.0.3",
+                "safe-buffer": "^5.1.1"
+            }
+        },
+        "parse-json": {
+            "version": "5.2.0",
+            "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-5.2.0.tgz",
+            "integrity": "sha512-ayCKvm/phCGxOkYRSCM82iDwct8/EonSEgCSxWxD7ve6jHggsFl4fZVQBPRNgQoKiuV/odhFrGzQXZwbifC8Rg==",
+            "dev": true,
+            "requires": {
+                "@babel/code-frame": "^7.0.0",
+                "error-ex": "^1.3.1",
+                "json-parse-even-better-errors": "^2.3.0",
+                "lines-and-columns": "^1.1.6"
+            }
+        },
+        "parseurl": {
+            "version": "1.3.3",
+            "resolved": "https://registry.npmjs.org/parseurl/-/parseurl-1.3.3.tgz",
+            "integrity": "sha512-CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ==",
+            "dev": true
+        },
+        "pascal-case": {
+            "version": "3.1.2",
+            "resolved": "https://registry.npmjs.org/pascal-case/-/pascal-case-3.1.2.tgz",
+            "integrity": "sha512-uWlGT3YSnK9x3BQJaOdcZwrnV6hPpd8jFH1/ucpiLRPh/2zCVJKS19E4GvYHvaCcACn3foXZ0cLB9Wrx1KGe5g==",
+            "dev": true,
+            "requires": {
+                "no-case": "^3.0.4",
+                "tslib": "^2.0.3"
+            }
+        },
+        "path-browserify": {
+            "version": "0.0.1",
+            "resolved": "https://registry.npmjs.org/path-browserify/-/path-browserify-0.0.1.tgz",
+            "integrity": "sha512-BapA40NHICOS+USX9SN4tyhq+A2RrN/Ws5F0Z5aMHDp98Fl86lX8Oti8B7uN93L4Ifv4fHOEA+pQw87gmMO/lQ==",
+            "dev": true
+        },
+        "path-exists": {
+            "version": "4.0.0",
+            "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz",
+            "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==",
+            "dev": true
+        },
+        "path-is-absolute": {
+            "version": "1.0.1",
+            "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
+            "integrity": "sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg==",
+            "dev": true
+        },
+        "path-key": {
+            "version": "3.1.1",
+            "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz",
+            "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==",
+            "dev": true
+        },
+        "path-parse": {
+            "version": "1.0.7",
+            "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.7.tgz",
+            "integrity": "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==",
+            "dev": true
+        },
+        "path-to-regexp": {
+            "version": "0.1.7",
+            "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.7.tgz",
+            "integrity": "sha512-5DFkuoqlv1uYQKxy8omFBeJPQcdoE07Kv2sferDCrAq1ohOU+MSDswDIbnx3YAM60qIOnYa53wBhXW0EbMonrQ==",
+            "dev": true
+        },
+        "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
+        },
+        "pbkdf2": {
+            "version": "3.1.2",
+            "resolved": "https://registry.npmjs.org/pbkdf2/-/pbkdf2-3.1.2.tgz",
+            "integrity": "sha512-iuh7L6jA7JEGu2WxDwtQP1ddOpaJNC4KlDEFfdQajSGgGPNi4OyDc2R7QnbY2bR9QjBVGwgvTdNJZoE7RaxUMA==",
+            "dev": true,
+            "requires": {
+                "create-hash": "^1.1.2",
+                "create-hmac": "^1.1.4",
+                "ripemd160": "^2.0.1",
+                "safe-buffer": "^5.0.1",
+                "sha.js": "^2.4.8"
+            }
+        },
+        "php-parser": {
+            "version": "3.1.5",
+            "resolved": "https://registry.npmjs.org/php-parser/-/php-parser-3.1.5.tgz",
+            "integrity": "sha512-jEY2DcbgCm5aclzBdfW86GM6VEIWcSlhTBSHN1qhJguVePlYe28GhwS0yoeLYXpM2K8y6wzLwrbq814n2PHSoQ==",
+            "dev": true
+        },
+        "picocolors": {
+            "version": "1.0.0",
+            "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.0.0.tgz",
+            "integrity": "sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ==",
+            "dev": true
+        },
+        "picomatch": {
+            "version": "2.3.1",
+            "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz",
+            "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==",
+            "dev": true
+        },
+        "pify": {
+            "version": "2.3.0",
+            "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
+            "integrity": "sha512-udgsAY+fTnvv7kI7aaxbqwWNb0AHiB0qBO89PZKPkoTmGOgdbrHDKD+0B2X4uTfJ/FT1R09r9gTsjUjNJotuog==",
+            "dev": true
+        },
+        "pirates": {
+            "version": "4.0.6",
+            "resolved": "https://registry.npmjs.org/pirates/-/pirates-4.0.6.tgz",
+            "integrity": "sha512-saLsH7WeYYPiD25LDuLRRY/i+6HaPYr6G1OUlN39otzkSTxKnubR9RTxS3/Kk50s1g2JTgFwWQDQyplC5/SHZg==",
+            "dev": true
+        },
+        "pkg-dir": {
+            "version": "4.2.0",
+            "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-4.2.0.tgz",
+            "integrity": "sha512-HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ==",
+            "dev": true,
+            "requires": {
+                "find-up": "^4.0.0"
+            }
+        },
+        "popper.js": {
+            "version": "1.16.1",
+            "resolved": "https://registry.npmjs.org/popper.js/-/popper.js-1.16.1.tgz",
+            "integrity": "sha512-Wb4p1J4zyFTbM+u6WuO4XstYx4Ky9Cewe4DWrel7B0w6VVICvPwdOpotjzcf6eD8TsckVnIMNONQyPIUFOUbCQ==",
+            "dev": true
+        },
+        "postcss": {
+            "version": "8.4.32",
+            "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.32.tgz",
+            "integrity": "sha512-D/kj5JNu6oo2EIy+XL/26JEDTlIbB8hw85G8StOE6L74RQAVVP5rej6wxCNqyMbR4RkPfqvezVbPw81Ngd6Kcw==",
+            "dev": true,
+            "requires": {
+                "nanoid": "^3.3.7",
+                "picocolors": "^1.0.0",
+                "source-map-js": "^1.0.2"
+            }
+        },
+        "postcss-calc": {
+            "version": "8.2.4",
+            "resolved": "https://registry.npmjs.org/postcss-calc/-/postcss-calc-8.2.4.tgz",
+            "integrity": "sha512-SmWMSJmB8MRnnULldx0lQIyhSNvuDl9HfrZkaqqE/WHAhToYsAvDq+yAsA/kIyINDszOp3Rh0GFoNuH5Ypsm3Q==",
+            "dev": true,
+            "requires": {
+                "postcss-selector-parser": "^6.0.9",
+                "postcss-value-parser": "^4.2.0"
+            }
+        },
+        "postcss-colormin": {
+            "version": "5.3.1",
+            "resolved": "https://registry.npmjs.org/postcss-colormin/-/postcss-colormin-5.3.1.tgz",
+            "integrity": "sha512-UsWQG0AqTFQmpBegeLLc1+c3jIqBNB0zlDGRWR+dQ3pRKJL1oeMzyqmH3o2PIfn9MBdNrVPWhDbT769LxCTLJQ==",
+            "dev": true,
+            "requires": {
+                "browserslist": "^4.21.4",
+                "caniuse-api": "^3.0.0",
+                "colord": "^2.9.1",
+                "postcss-value-parser": "^4.2.0"
+            }
+        },
+        "postcss-convert-values": {
+            "version": "5.1.3",
+            "resolved": "https://registry.npmjs.org/postcss-convert-values/-/postcss-convert-values-5.1.3.tgz",
+            "integrity": "sha512-82pC1xkJZtcJEfiLw6UXnXVXScgtBrjlO5CBmuDQc+dlb88ZYheFsjTn40+zBVi3DkfF7iezO0nJUPLcJK3pvA==",
+            "dev": true,
+            "requires": {
+                "browserslist": "^4.21.4",
+                "postcss-value-parser": "^4.2.0"
+            }
+        },
+        "postcss-discard-comments": {
+            "version": "5.1.2",
+            "resolved": "https://registry.npmjs.org/postcss-discard-comments/-/postcss-discard-comments-5.1.2.tgz",
+            "integrity": "sha512-+L8208OVbHVF2UQf1iDmRcbdjJkuBF6IS29yBDSiWUIzpYaAhtNl6JYnYm12FnkeCwQqF5LeklOu6rAqgfBZqQ==",
+            "dev": true,
+            "requires": {}
+        },
+        "postcss-discard-duplicates": {
+            "version": "5.1.0",
+            "resolved": "https://registry.npmjs.org/postcss-discard-duplicates/-/postcss-discard-duplicates-5.1.0.tgz",
+            "integrity": "sha512-zmX3IoSI2aoenxHV6C7plngHWWhUOV3sP1T8y2ifzxzbtnuhk1EdPwm0S1bIUNaJ2eNbWeGLEwzw8huPD67aQw==",
+            "dev": true,
+            "requires": {}
+        },
+        "postcss-discard-empty": {
+            "version": "5.1.1",
+            "resolved": "https://registry.npmjs.org/postcss-discard-empty/-/postcss-discard-empty-5.1.1.tgz",
+            "integrity": "sha512-zPz4WljiSuLWsI0ir4Mcnr4qQQ5e1Ukc3i7UfE2XcrwKK2LIPIqE5jxMRxO6GbI3cv//ztXDsXwEWT3BHOGh3A==",
+            "dev": true,
+            "requires": {}
+        },
+        "postcss-discard-overridden": {
+            "version": "5.1.0",
+            "resolved": "https://registry.npmjs.org/postcss-discard-overridden/-/postcss-discard-overridden-5.1.0.tgz",
+            "integrity": "sha512-21nOL7RqWR1kasIVdKs8HNqQJhFxLsyRfAnUDm4Fe4t4mCWL9OJiHvlHPjcd8zc5Myu89b/7wZDnOSjFgeWRtw==",
+            "dev": true,
+            "requires": {}
+        },
+        "postcss-import": {
+            "version": "15.1.0",
+            "resolved": "https://registry.npmjs.org/postcss-import/-/postcss-import-15.1.0.tgz",
+            "integrity": "sha512-hpr+J05B2FVYUAXHeK1YyI267J/dDDhMU6B6civm8hSY1jYJnBXxzKDKDswzJmtLHryrjhnDjqqp/49t8FALew==",
+            "dev": true,
+            "requires": {
+                "postcss-value-parser": "^4.0.0",
+                "read-cache": "^1.0.0",
+                "resolve": "^1.1.7"
+            }
+        },
+        "postcss-js": {
+            "version": "4.0.1",
+            "resolved": "https://registry.npmjs.org/postcss-js/-/postcss-js-4.0.1.tgz",
+            "integrity": "sha512-dDLF8pEO191hJMtlHFPRa8xsizHaM82MLfNkUHdUtVEV3tgTp5oj+8qbEqYM57SLfc74KSbw//4SeJma2LRVIw==",
+            "dev": true,
+            "requires": {
+                "camelcase-css": "^2.0.1"
+            }
+        },
+        "postcss-load-config": {
+            "version": "4.0.1",
+            "resolved": "https://registry.npmjs.org/postcss-load-config/-/postcss-load-config-4.0.1.tgz",
+            "integrity": "sha512-vEJIc8RdiBRu3oRAI0ymerOn+7rPuMvRXslTvZUKZonDHFIczxztIyJ1urxM1x9JXEikvpWWTUUqal5j/8QgvA==",
+            "dev": true,
+            "requires": {
+                "lilconfig": "^2.0.5",
+                "yaml": "^2.1.1"
+            }
+        },
+        "postcss-loader": {
+            "version": "6.2.1",
+            "resolved": "https://registry.npmjs.org/postcss-loader/-/postcss-loader-6.2.1.tgz",
+            "integrity": "sha512-WbbYpmAaKcux/P66bZ40bpWsBucjx/TTgVVzRZ9yUO8yQfVBlameJ0ZGVaPfH64hNSBh63a+ICP5nqOpBA0w+Q==",
+            "dev": true,
+            "requires": {
+                "cosmiconfig": "^7.0.0",
+                "klona": "^2.0.5",
+                "semver": "^7.3.5"
+            }
+        },
+        "postcss-merge-longhand": {
+            "version": "5.1.7",
+            "resolved": "https://registry.npmjs.org/postcss-merge-longhand/-/postcss-merge-longhand-5.1.7.tgz",
+            "integrity": "sha512-YCI9gZB+PLNskrK0BB3/2OzPnGhPkBEwmwhfYk1ilBHYVAZB7/tkTHFBAnCrvBBOmeYyMYw3DMjT55SyxMBzjQ==",
+            "dev": true,
+            "requires": {
+                "postcss-value-parser": "^4.2.0",
+                "stylehacks": "^5.1.1"
+            }
+        },
+        "postcss-merge-rules": {
+            "version": "5.1.4",
+            "resolved": "https://registry.npmjs.org/postcss-merge-rules/-/postcss-merge-rules-5.1.4.tgz",
+            "integrity": "sha512-0R2IuYpgU93y9lhVbO/OylTtKMVcHb67zjWIfCiKR9rWL3GUk1677LAqD/BcHizukdZEjT8Ru3oHRoAYoJy44g==",
+            "dev": true,
+            "requires": {
+                "browserslist": "^4.21.4",
+                "caniuse-api": "^3.0.0",
+                "cssnano-utils": "^3.1.0",
+                "postcss-selector-parser": "^6.0.5"
+            }
+        },
+        "postcss-minify-font-values": {
+            "version": "5.1.0",
+            "resolved": "https://registry.npmjs.org/postcss-minify-font-values/-/postcss-minify-font-values-5.1.0.tgz",
+            "integrity": "sha512-el3mYTgx13ZAPPirSVsHqFzl+BBBDrXvbySvPGFnQcTI4iNslrPaFq4muTkLZmKlGk4gyFAYUBMH30+HurREyA==",
+            "dev": true,
+            "requires": {
+                "postcss-value-parser": "^4.2.0"
+            }
+        },
+        "postcss-minify-gradients": {
+            "version": "5.1.1",
+            "resolved": "https://registry.npmjs.org/postcss-minify-gradients/-/postcss-minify-gradients-5.1.1.tgz",
+            "integrity": "sha512-VGvXMTpCEo4qHTNSa9A0a3D+dxGFZCYwR6Jokk+/3oB6flu2/PnPXAh2x7x52EkY5xlIHLm+Le8tJxe/7TNhzw==",
+            "dev": true,
+            "requires": {
+                "colord": "^2.9.1",
+                "cssnano-utils": "^3.1.0",
+                "postcss-value-parser": "^4.2.0"
+            }
+        },
+        "postcss-minify-params": {
+            "version": "5.1.4",
+            "resolved": "https://registry.npmjs.org/postcss-minify-params/-/postcss-minify-params-5.1.4.tgz",
+            "integrity": "sha512-+mePA3MgdmVmv6g+30rn57USjOGSAyuxUmkfiWpzalZ8aiBkdPYjXWtHuwJGm1v5Ojy0Z0LaSYhHaLJQB0P8Jw==",
+            "dev": true,
+            "requires": {
+                "browserslist": "^4.21.4",
+                "cssnano-utils": "^3.1.0",
+                "postcss-value-parser": "^4.2.0"
+            }
+        },
+        "postcss-minify-selectors": {
+            "version": "5.2.1",
+            "resolved": "https://registry.npmjs.org/postcss-minify-selectors/-/postcss-minify-selectors-5.2.1.tgz",
+            "integrity": "sha512-nPJu7OjZJTsVUmPdm2TcaiohIwxP+v8ha9NehQ2ye9szv4orirRU3SDdtUmKH+10nzn0bAyOXZ0UEr7OpvLehg==",
+            "dev": true,
+            "requires": {
+                "postcss-selector-parser": "^6.0.5"
+            }
+        },
+        "postcss-modules-extract-imports": {
+            "version": "3.0.0",
+            "resolved": "https://registry.npmjs.org/postcss-modules-extract-imports/-/postcss-modules-extract-imports-3.0.0.tgz",
+            "integrity": "sha512-bdHleFnP3kZ4NYDhuGlVK+CMrQ/pqUm8bx/oGL93K6gVwiclvX5x0n76fYMKuIGKzlABOy13zsvqjb0f92TEXw==",
+            "dev": true,
+            "requires": {}
+        },
+        "postcss-modules-local-by-default": {
+            "version": "4.0.3",
+            "resolved": "https://registry.npmjs.org/postcss-modules-local-by-default/-/postcss-modules-local-by-default-4.0.3.tgz",
+            "integrity": "sha512-2/u2zraspoACtrbFRnTijMiQtb4GW4BvatjaG/bCjYQo8kLTdevCUlwuBHx2sCnSyrI3x3qj4ZK1j5LQBgzmwA==",
+            "dev": true,
+            "requires": {
+                "icss-utils": "^5.0.0",
+                "postcss-selector-parser": "^6.0.2",
+                "postcss-value-parser": "^4.1.0"
+            }
+        },
+        "postcss-modules-scope": {
+            "version": "3.0.0",
+            "resolved": "https://registry.npmjs.org/postcss-modules-scope/-/postcss-modules-scope-3.0.0.tgz",
+            "integrity": "sha512-hncihwFA2yPath8oZ15PZqvWGkWf+XUfQgUGamS4LqoP1anQLOsOJw0vr7J7IwLpoY9fatA2qiGUGmuZL0Iqlg==",
+            "dev": true,
+            "requires": {
+                "postcss-selector-parser": "^6.0.4"
+            }
+        },
+        "postcss-modules-values": {
+            "version": "4.0.0",
+            "resolved": "https://registry.npmjs.org/postcss-modules-values/-/postcss-modules-values-4.0.0.tgz",
+            "integrity": "sha512-RDxHkAiEGI78gS2ofyvCsu7iycRv7oqw5xMWn9iMoR0N/7mf9D50ecQqUo5BZ9Zh2vH4bCUR/ktCqbB9m8vJjQ==",
+            "dev": true,
+            "requires": {
+                "icss-utils": "^5.0.0"
+            }
+        },
+        "postcss-nested": {
+            "version": "6.0.1",
+            "resolved": "https://registry.npmjs.org/postcss-nested/-/postcss-nested-6.0.1.tgz",
+            "integrity": "sha512-mEp4xPMi5bSWiMbsgoPfcP74lsWLHkQbZc3sY+jWYd65CUwXrUaTp0fmNpa01ZcETKlIgUdFN/MpS2xZtqL9dQ==",
+            "dev": true,
+            "requires": {
+                "postcss-selector-parser": "^6.0.11"
+            }
+        },
+        "postcss-normalize-charset": {
+            "version": "5.1.0",
+            "resolved": "https://registry.npmjs.org/postcss-normalize-charset/-/postcss-normalize-charset-5.1.0.tgz",
+            "integrity": "sha512-mSgUJ+pd/ldRGVx26p2wz9dNZ7ji6Pn8VWBajMXFf8jk7vUoSrZ2lt/wZR7DtlZYKesmZI680qjr2CeFF2fbUg==",
+            "dev": true,
+            "requires": {}
+        },
+        "postcss-normalize-display-values": {
+            "version": "5.1.0",
+            "resolved": "https://registry.npmjs.org/postcss-normalize-display-values/-/postcss-normalize-display-values-5.1.0.tgz",
+            "integrity": "sha512-WP4KIM4o2dazQXWmFaqMmcvsKmhdINFblgSeRgn8BJ6vxaMyaJkwAzpPpuvSIoG/rmX3M+IrRZEz2H0glrQNEA==",
+            "dev": true,
+            "requires": {
+                "postcss-value-parser": "^4.2.0"
+            }
+        },
+        "postcss-normalize-positions": {
+            "version": "5.1.1",
+            "resolved": "https://registry.npmjs.org/postcss-normalize-positions/-/postcss-normalize-positions-5.1.1.tgz",
+            "integrity": "sha512-6UpCb0G4eofTCQLFVuI3EVNZzBNPiIKcA1AKVka+31fTVySphr3VUgAIULBhxZkKgwLImhzMR2Bw1ORK+37INg==",
+            "dev": true,
+            "requires": {
+                "postcss-value-parser": "^4.2.0"
+            }
+        },
+        "postcss-normalize-repeat-style": {
+            "version": "5.1.1",
+            "resolved": "https://registry.npmjs.org/postcss-normalize-repeat-style/-/postcss-normalize-repeat-style-5.1.1.tgz",
+            "integrity": "sha512-mFpLspGWkQtBcWIRFLmewo8aC3ImN2i/J3v8YCFUwDnPu3Xz4rLohDO26lGjwNsQxB3YF0KKRwspGzE2JEuS0g==",
+            "dev": true,
+            "requires": {
+                "postcss-value-parser": "^4.2.0"
+            }
+        },
+        "postcss-normalize-string": {
+            "version": "5.1.0",
+            "resolved": "https://registry.npmjs.org/postcss-normalize-string/-/postcss-normalize-string-5.1.0.tgz",
+            "integrity": "sha512-oYiIJOf4T9T1N4i+abeIc7Vgm/xPCGih4bZz5Nm0/ARVJ7K6xrDlLwvwqOydvyL3RHNf8qZk6vo3aatiw/go3w==",
+            "dev": true,
+            "requires": {
+                "postcss-value-parser": "^4.2.0"
+            }
+        },
+        "postcss-normalize-timing-functions": {
+            "version": "5.1.0",
+            "resolved": "https://registry.npmjs.org/postcss-normalize-timing-functions/-/postcss-normalize-timing-functions-5.1.0.tgz",
+            "integrity": "sha512-DOEkzJ4SAXv5xkHl0Wa9cZLF3WCBhF3o1SKVxKQAa+0pYKlueTpCgvkFAHfk+Y64ezX9+nITGrDZeVGgITJXjg==",
+            "dev": true,
+            "requires": {
+                "postcss-value-parser": "^4.2.0"
+            }
+        },
+        "postcss-normalize-unicode": {
+            "version": "5.1.1",
+            "resolved": "https://registry.npmjs.org/postcss-normalize-unicode/-/postcss-normalize-unicode-5.1.1.tgz",
+            "integrity": "sha512-qnCL5jzkNUmKVhZoENp1mJiGNPcsJCs1aaRmURmeJGES23Z/ajaln+EPTD+rBeNkSryI+2WTdW+lwcVdOikrpA==",
+            "dev": true,
+            "requires": {
+                "browserslist": "^4.21.4",
+                "postcss-value-parser": "^4.2.0"
+            }
+        },
+        "postcss-normalize-url": {
+            "version": "5.1.0",
+            "resolved": "https://registry.npmjs.org/postcss-normalize-url/-/postcss-normalize-url-5.1.0.tgz",
+            "integrity": "sha512-5upGeDO+PVthOxSmds43ZeMeZfKH+/DKgGRD7TElkkyS46JXAUhMzIKiCa7BabPeIy3AQcTkXwVVN7DbqsiCew==",
+            "dev": true,
+            "requires": {
+                "normalize-url": "^6.0.1",
+                "postcss-value-parser": "^4.2.0"
+            }
+        },
+        "postcss-normalize-whitespace": {
+            "version": "5.1.1",
+            "resolved": "https://registry.npmjs.org/postcss-normalize-whitespace/-/postcss-normalize-whitespace-5.1.1.tgz",
+            "integrity": "sha512-83ZJ4t3NUDETIHTa3uEg6asWjSBYL5EdkVB0sDncx9ERzOKBVJIUeDO9RyA9Zwtig8El1d79HBp0JEi8wvGQnA==",
+            "dev": true,
+            "requires": {
+                "postcss-value-parser": "^4.2.0"
+            }
+        },
+        "postcss-ordered-values": {
+            "version": "5.1.3",
+            "resolved": "https://registry.npmjs.org/postcss-ordered-values/-/postcss-ordered-values-5.1.3.tgz",
+            "integrity": "sha512-9UO79VUhPwEkzbb3RNpqqghc6lcYej1aveQteWY+4POIwlqkYE21HKWaLDF6lWNuqCobEAyTovVhtI32Rbv2RQ==",
+            "dev": true,
+            "requires": {
+                "cssnano-utils": "^3.1.0",
+                "postcss-value-parser": "^4.2.0"
+            }
+        },
+        "postcss-reduce-initial": {
+            "version": "5.1.2",
+            "resolved": "https://registry.npmjs.org/postcss-reduce-initial/-/postcss-reduce-initial-5.1.2.tgz",
+            "integrity": "sha512-dE/y2XRaqAi6OvjzD22pjTUQ8eOfc6m/natGHgKFBK9DxFmIm69YmaRVQrGgFlEfc1HePIurY0TmDeROK05rIg==",
+            "dev": true,
+            "requires": {
+                "browserslist": "^4.21.4",
+                "caniuse-api": "^3.0.0"
+            }
+        },
+        "postcss-reduce-transforms": {
+            "version": "5.1.0",
+            "resolved": "https://registry.npmjs.org/postcss-reduce-transforms/-/postcss-reduce-transforms-5.1.0.tgz",
+            "integrity": "sha512-2fbdbmgir5AvpW9RLtdONx1QoYG2/EtqpNQbFASDlixBbAYuTcJ0dECwlqNqH7VbaUnEnh8SrxOe2sRIn24XyQ==",
+            "dev": true,
+            "requires": {
+                "postcss-value-parser": "^4.2.0"
+            }
+        },
+        "postcss-selector-parser": {
+            "version": "6.0.13",
+            "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.0.13.tgz",
+            "integrity": "sha512-EaV1Gl4mUEV4ddhDnv/xtj7sxwrwxdetHdWUGnT4VJQf+4d05v6lHYZr8N573k5Z0BViss7BDhfWtKS3+sfAqQ==",
+            "dev": true,
+            "requires": {
+                "cssesc": "^3.0.0",
+                "util-deprecate": "^1.0.2"
+            }
+        },
+        "postcss-svgo": {
+            "version": "5.1.0",
+            "resolved": "https://registry.npmjs.org/postcss-svgo/-/postcss-svgo-5.1.0.tgz",
+            "integrity": "sha512-D75KsH1zm5ZrHyxPakAxJWtkyXew5qwS70v56exwvw542d9CRtTo78K0WeFxZB4G7JXKKMbEZtZayTGdIky/eA==",
+            "dev": true,
+            "requires": {
+                "postcss-value-parser": "^4.2.0",
+                "svgo": "^2.7.0"
+            }
+        },
+        "postcss-unique-selectors": {
+            "version": "5.1.1",
+            "resolved": "https://registry.npmjs.org/postcss-unique-selectors/-/postcss-unique-selectors-5.1.1.tgz",
+            "integrity": "sha512-5JiODlELrz8L2HwxfPnhOWZYWDxVHWL83ufOv84NrcgipI7TaeRsatAhK4Tr2/ZiYldpK/wBvw5BD3qfaK96GA==",
+            "dev": true,
+            "requires": {
+                "postcss-selector-parser": "^6.0.5"
+            }
+        },
+        "postcss-value-parser": {
+            "version": "4.2.0",
+            "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.2.0.tgz",
+            "integrity": "sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ==",
+            "dev": true
+        },
+        "prettier": {
+            "version": "2.7.1",
+            "resolved": "https://registry.npmjs.org/prettier/-/prettier-2.7.1.tgz",
+            "integrity": "sha512-ujppO+MkdPqoVINuDFDRLClm7D78qbDt0/NR+wp5FqEZOoTNAjPHWj17QRhu7geIHJfcNhRk1XVQmF8Bp3ye+g==",
+            "dev": true
+        },
+        "pretty-time": {
+            "version": "1.1.0",
+            "resolved": "https://registry.npmjs.org/pretty-time/-/pretty-time-1.1.0.tgz",
+            "integrity": "sha512-28iF6xPQrP8Oa6uxE6a1biz+lWeTOAPKggvjB8HAs6nVMKZwf5bG++632Dx614hIWgUPkgivRfG+a8uAXGTIbA==",
+            "dev": true
+        },
+        "process": {
+            "version": "0.11.10",
+            "resolved": "https://registry.npmjs.org/process/-/process-0.11.10.tgz",
+            "integrity": "sha512-cdGef/drWFoydD1JsMzuFf8100nZl+GT+yacc2bEced5f9Rjk4z+WtFUTBu9PhOi9j/jfmBPu0mMEY4wIdAF8A==",
+            "dev": true
+        },
+        "process-nextick-args": {
+            "version": "2.0.1",
+            "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.1.tgz",
+            "integrity": "sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==",
+            "dev": true
+        },
+        "proto-list": {
+            "version": "1.2.4",
+            "resolved": "https://registry.npmjs.org/proto-list/-/proto-list-1.2.4.tgz",
+            "integrity": "sha512-vtK/94akxsTMhe0/cbfpR+syPuszcuwhqVjJq26CuNDgFGj682oRBXOP5MJpv2r7JtE8MsiepGIqvvOTBwn2vA==",
+            "dev": true
+        },
+        "proxy-addr": {
+            "version": "2.0.7",
+            "resolved": "https://registry.npmjs.org/proxy-addr/-/proxy-addr-2.0.7.tgz",
+            "integrity": "sha512-llQsMLSUDUPT44jdrU/O37qlnifitDP+ZwrmmZcoSKyLKvtZxpyV0n2/bD/N4tBAAZ/gJEdZU7KMraoK1+XYAg==",
+            "dev": true,
+            "requires": {
+                "forwarded": "0.2.0",
+                "ipaddr.js": "1.9.1"
+            },
+            "dependencies": {
+                "ipaddr.js": {
+                    "version": "1.9.1",
+                    "resolved": "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.9.1.tgz",
+                    "integrity": "sha512-0KI/607xoxSToH7GjN1FfSbLoU0+btTicjsQSWQlh/hZykN8KpmMf7uYwPW3R+akZ6R/w18ZlXSHBYXiYUPO3g==",
+                    "dev": true
+                }
+            }
+        },
+        "proxy-from-env": {
+            "version": "1.1.0",
+            "resolved": "https://registry.npmjs.org/proxy-from-env/-/proxy-from-env-1.1.0.tgz",
+            "integrity": "sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg==",
+            "dev": true
+        },
+        "public-encrypt": {
+            "version": "4.0.3",
+            "resolved": "https://registry.npmjs.org/public-encrypt/-/public-encrypt-4.0.3.tgz",
+            "integrity": "sha512-zVpa8oKZSz5bTMTFClc1fQOnyyEzpl5ozpi1B5YcvBrdohMjH2rfsBtyXcuNuwjsDIXmBYlF2N5FlJYhR29t8Q==",
+            "dev": true,
+            "requires": {
+                "bn.js": "^4.1.0",
+                "browserify-rsa": "^4.0.0",
+                "create-hash": "^1.1.0",
+                "parse-asn1": "^5.0.0",
+                "randombytes": "^2.0.1",
+                "safe-buffer": "^5.1.2"
+            },
+            "dependencies": {
+                "bn.js": {
+                    "version": "4.12.0",
+                    "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.0.tgz",
+                    "integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA==",
+                    "dev": true
+                }
+            }
+        },
+        "punycode": {
+            "version": "1.4.1",
+            "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz",
+            "integrity": "sha512-jmYNElW7yvO7TV33CjSmvSiE2yco3bV2czu/OzDKdMNVZQWfxCblURLhf+47syQRBntjfLdd/H0egrzIG+oaFQ==",
+            "dev": true
+        },
+        "qs": {
+            "version": "6.11.2",
+            "resolved": "https://registry.npmjs.org/qs/-/qs-6.11.2.tgz",
+            "integrity": "sha512-tDNIz22aBzCDxLtVH++VnTfzxlfeK5CbqohpSqpJgj1Wg/cQbStNAz3NuqCs5vV+pjBsK4x4pN9HlVh7rcYRiA==",
+            "dev": true,
+            "requires": {
+                "side-channel": "^1.0.4"
+            }
+        },
+        "querystring-es3": {
+            "version": "0.2.1",
+            "resolved": "https://registry.npmjs.org/querystring-es3/-/querystring-es3-0.2.1.tgz",
+            "integrity": "sha512-773xhDQnZBMFobEiztv8LIl70ch5MSF/jUQVlhwFyBILqq96anmoctVIYz+ZRp0qbCKATTn6ev02M3r7Ga5vqA==",
+            "dev": true
+        },
+        "queue-microtask": {
+            "version": "1.2.3",
+            "resolved": "https://registry.npmjs.org/queue-microtask/-/queue-microtask-1.2.3.tgz",
+            "integrity": "sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A==",
+            "dev": true
+        },
+        "randombytes": {
+            "version": "2.1.0",
+            "resolved": "https://registry.npmjs.org/randombytes/-/randombytes-2.1.0.tgz",
+            "integrity": "sha512-vYl3iOX+4CKUWuxGi9Ukhie6fsqXqS9FE2Zaic4tNFD2N2QQaXOMFbuKK4QmDHC0JO6B1Zp41J0LpT0oR68amQ==",
+            "dev": true,
+            "requires": {
+                "safe-buffer": "^5.1.0"
+            }
+        },
+        "randomfill": {
+            "version": "1.0.4",
+            "resolved": "https://registry.npmjs.org/randomfill/-/randomfill-1.0.4.tgz",
+            "integrity": "sha512-87lcbR8+MhcWcUiQ+9e+Rwx8MyR2P7qnt15ynUlbm3TU/fjbgz4GsvfSUDTemtCCtVCqb4ZcEFlyPNTh9bBTLw==",
+            "dev": true,
+            "requires": {
+                "randombytes": "^2.0.5",
+                "safe-buffer": "^5.1.0"
+            }
+        },
+        "range-parser": {
+            "version": "1.2.1",
+            "resolved": "https://registry.npmjs.org/range-parser/-/range-parser-1.2.1.tgz",
+            "integrity": "sha512-Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg==",
+            "dev": true
+        },
+        "raw-body": {
+            "version": "2.5.1",
+            "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.5.1.tgz",
+            "integrity": "sha512-qqJBtEyVgS0ZmPGdCFPWJ3FreoqvG4MVQln/kCgF7Olq95IbOp0/BWyMwbdtn4VTvkM8Y7khCQ2Xgk/tcrCXig==",
+            "dev": true,
+            "requires": {
+                "bytes": "3.1.2",
+                "http-errors": "2.0.0",
+                "iconv-lite": "0.4.24",
+                "unpipe": "1.0.0"
+            },
+            "dependencies": {
+                "bytes": {
+                    "version": "3.1.2",
+                    "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.1.2.tgz",
+                    "integrity": "sha512-/Nf7TyzTx6S3yRJObOAV7956r8cr2+Oj8AC5dt8wSP3BQAoeX58NoHyCU8P8zGkNXStjTSi6fzO6F0pBdcYbEg==",
+                    "dev": true
+                }
+            }
+        },
+        "read-cache": {
+            "version": "1.0.0",
+            "resolved": "https://registry.npmjs.org/read-cache/-/read-cache-1.0.0.tgz",
+            "integrity": "sha512-Owdv/Ft7IjOgm/i0xvNDZ1LrRANRfew4b2prF3OWMQLxLfu3bS8FVhCsrSCMK4lR56Y9ya+AThoTpDCTxCmpRA==",
+            "dev": true,
+            "requires": {
+                "pify": "^2.3.0"
+            }
+        },
+        "readable-stream": {
+            "version": "3.6.2",
+            "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.2.tgz",
+            "integrity": "sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA==",
+            "dev": true,
+            "requires": {
+                "inherits": "^2.0.3",
+                "string_decoder": "^1.1.1",
+                "util-deprecate": "^1.0.1"
+            }
+        },
+        "readdirp": {
+            "version": "3.6.0",
+            "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.6.0.tgz",
+            "integrity": "sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA==",
+            "dev": true,
+            "requires": {
+                "picomatch": "^2.2.1"
+            }
+        },
+        "rechoir": {
+            "version": "0.7.1",
+            "resolved": "https://registry.npmjs.org/rechoir/-/rechoir-0.7.1.tgz",
+            "integrity": "sha512-/njmZ8s1wVeR6pjTZ+0nCnv8SpZNRMT2D1RLOJQESlYFDBvwpTA4KWJpZ+sBJ4+vhjILRcK7JIFdGCdxEAAitg==",
+            "dev": true,
+            "requires": {
+                "resolve": "^1.9.0"
+            }
+        },
+        "regenerate": {
+            "version": "1.4.2",
+            "resolved": "https://registry.npmjs.org/regenerate/-/regenerate-1.4.2.tgz",
+            "integrity": "sha512-zrceR/XhGYU/d/opr2EKO7aRHUeiBI8qjtfHqADTwZd6Szfy16la6kqD0MIUs5z5hx6AaKa+PixpPrR289+I0A==",
+            "dev": true
+        },
+        "regenerate-unicode-properties": {
+            "version": "10.0.1",
+            "resolved": "https://registry.npmjs.org/regenerate-unicode-properties/-/regenerate-unicode-properties-10.0.1.tgz",
+            "integrity": "sha512-vn5DU6yg6h8hP/2OkQo3K7uVILvY4iu0oI4t3HFa81UPkhGJwkRwM10JEc3upjdhHjs/k8GJY1sRBhk5sr69Bw==",
+            "dev": true,
+            "requires": {
+                "regenerate": "^1.4.2"
+            }
+        },
+        "regenerator-runtime": {
+            "version": "0.13.9",
+            "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.9.tgz",
+            "integrity": "sha512-p3VT+cOEgxFsRRA9X4lkI1E+k2/CtnKtU4gcxyaCUreilL/vqI6CdZ3wxVUx3UOUg+gnUOQQcRI7BmSI656MYA==",
+            "dev": true
+        },
+        "regenerator-transform": {
+            "version": "0.15.0",
+            "resolved": "https://registry.npmjs.org/regenerator-transform/-/regenerator-transform-0.15.0.tgz",
+            "integrity": "sha512-LsrGtPmbYg19bcPHwdtmXwbW+TqNvtY4riE3P83foeHRroMbH6/2ddFBfab3t7kbzc7v7p4wbkIecHImqt0QNg==",
+            "dev": true,
+            "requires": {
+                "@babel/runtime": "^7.8.4"
+            }
+        },
+        "regex-parser": {
+            "version": "2.2.11",
+            "resolved": "https://registry.npmjs.org/regex-parser/-/regex-parser-2.2.11.tgz",
+            "integrity": "sha512-jbD/FT0+9MBU2XAZluI7w2OBs1RBi6p9M83nkoZayQXXU9e8Robt69FcZc7wU4eJD/YFTjn1JdCk3rbMJajz8Q==",
+            "dev": true
+        },
+        "regexpu-core": {
+            "version": "5.1.0",
+            "resolved": "https://registry.npmjs.org/regexpu-core/-/regexpu-core-5.1.0.tgz",
+            "integrity": "sha512-bb6hk+xWd2PEOkj5It46A16zFMs2mv86Iwpdu94la4S3sJ7C973h2dHpYKwIBGaWSO7cIRJ+UX0IeMaWcO4qwA==",
+            "dev": true,
+            "requires": {
+                "regenerate": "^1.4.2",
+                "regenerate-unicode-properties": "^10.0.1",
+                "regjsgen": "^0.6.0",
+                "regjsparser": "^0.8.2",
+                "unicode-match-property-ecmascript": "^2.0.0",
+                "unicode-match-property-value-ecmascript": "^2.0.0"
+            }
+        },
+        "regjsgen": {
+            "version": "0.6.0",
+            "resolved": "https://registry.npmjs.org/regjsgen/-/regjsgen-0.6.0.tgz",
+            "integrity": "sha512-ozE883Uigtqj3bx7OhL1KNbCzGyW2NQZPl6Hs09WTvCuZD5sTI4JY58bkbQWa/Y9hxIsvJ3M8Nbf7j54IqeZbA==",
+            "dev": true
+        },
+        "regjsparser": {
+            "version": "0.8.4",
+            "resolved": "https://registry.npmjs.org/regjsparser/-/regjsparser-0.8.4.tgz",
+            "integrity": "sha512-J3LABycON/VNEu3abOviqGHuB/LOtOQj8SKmfP9anY5GfAVw/SPjwzSjxGjbZXIxbGfqTHtJw58C2Li/WkStmA==",
+            "dev": true,
+            "requires": {
+                "jsesc": "~0.5.0"
+            },
+            "dependencies": {
+                "jsesc": {
+                    "version": "0.5.0",
+                    "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-0.5.0.tgz",
+                    "integrity": "sha512-uZz5UnB7u4T9LvwmFqXii7pZSouaRPorGs5who1Ip7VO0wxanFvBL7GkM6dTHlgX+jhBApRetaWpnDabOeTcnA==",
+                    "dev": true
+                }
+            }
+        },
+        "relateurl": {
+            "version": "0.2.7",
+            "resolved": "https://registry.npmjs.org/relateurl/-/relateurl-0.2.7.tgz",
+            "integrity": "sha512-G08Dxvm4iDN3MLM0EsP62EDV9IuhXPR6blNz6Utcp7zyV3tr4HVNINt6MpaRWbxoOHT3Q7YN2P+jaHX8vUbgog==",
+            "dev": true
+        },
+        "replace-ext": {
+            "version": "1.0.1",
+            "resolved": "https://registry.npmjs.org/replace-ext/-/replace-ext-1.0.1.tgz",
+            "integrity": "sha512-yD5BHCe7quCgBph4rMQ+0KkIRKwWCrHDOX1p1Gp6HwjPM5kVoCdKGNhN7ydqqsX6lJEnQDKZ/tFMiEdQ1dvPEw==",
+            "dev": true
+        },
+        "require-directory": {
+            "version": "2.1.1",
+            "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz",
+            "integrity": "sha512-fGxEI7+wsG9xrvdjsrlmL22OMTTiHRwAMroiEeMgq8gzoLC/PQr7RsRDSTLUg/bZAZtF+TVIkHc6/4RIKrui+Q==",
+            "dev": true
+        },
+        "require-from-string": {
+            "version": "2.0.2",
+            "resolved": "https://registry.npmjs.org/require-from-string/-/require-from-string-2.0.2.tgz",
+            "integrity": "sha512-Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw==",
+            "dev": true
+        },
+        "requires-port": {
+            "version": "1.0.0",
+            "resolved": "https://registry.npmjs.org/requires-port/-/requires-port-1.0.0.tgz",
+            "integrity": "sha512-KigOCHcocU3XODJxsu8i/j8T9tzT4adHiecwORRQ0ZZFcp7ahwXuRU1m+yuO90C5ZUyGeGfocHDI14M3L3yDAQ==",
+            "dev": true
+        },
+        "resolve": {
+            "version": "1.22.2",
+            "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.2.tgz",
+            "integrity": "sha512-Sb+mjNHOULsBv818T40qSPeRiuWLyaGMa5ewydRLFimneixmVy2zdivRl+AF6jaYPC8ERxGDmFSiqui6SfPd+g==",
+            "dev": true,
+            "requires": {
+                "is-core-module": "^2.11.0",
+                "path-parse": "^1.0.7",
+                "supports-preserve-symlinks-flag": "^1.0.0"
+            }
+        },
+        "resolve-cwd": {
+            "version": "3.0.0",
+            "resolved": "https://registry.npmjs.org/resolve-cwd/-/resolve-cwd-3.0.0.tgz",
+            "integrity": "sha512-OrZaX2Mb+rJCpH/6CpSqt9xFVpN++x01XnN2ie9g6P5/3xelLAkXWVADpdz1IHD/KFfEXyE6V0U01OQ3UO2rEg==",
+            "dev": true,
+            "requires": {
+                "resolve-from": "^5.0.0"
+            },
+            "dependencies": {
+                "resolve-from": {
+                    "version": "5.0.0",
+                    "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-5.0.0.tgz",
+                    "integrity": "sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw==",
+                    "dev": true
+                }
+            }
+        },
+        "resolve-from": {
+            "version": "4.0.0",
+            "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz",
+            "integrity": "sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==",
+            "dev": true
+        },
+        "resolve-url-loader": {
+            "version": "5.0.0",
+            "resolved": "https://registry.npmjs.org/resolve-url-loader/-/resolve-url-loader-5.0.0.tgz",
+            "integrity": "sha512-uZtduh8/8srhBoMx//5bwqjQ+rfYOUq8zC9NrMUGtjBiGTtFJM42s58/36+hTqeqINcnYe08Nj3LkK9lW4N8Xg==",
+            "dev": true,
+            "requires": {
+                "adjust-sourcemap-loader": "^4.0.0",
+                "convert-source-map": "^1.7.0",
+                "loader-utils": "^2.0.0",
+                "postcss": "^8.2.14",
+                "source-map": "0.6.1"
+            }
+        },
+        "retry": {
+            "version": "0.13.1",
+            "resolved": "https://registry.npmjs.org/retry/-/retry-0.13.1.tgz",
+            "integrity": "sha512-XQBQ3I8W1Cge0Seh+6gjj03LbmRFWuoszgK9ooCpwYIrhhoO80pfq4cUkU5DkknwfOfFteRwlZ56PYOGYyFWdg==",
+            "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": "3.0.2",
+            "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz",
+            "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==",
+            "dev": true,
+            "requires": {
+                "glob": "^7.1.3"
+            }
+        },
+        "ripemd160": {
+            "version": "2.0.2",
+            "resolved": "https://registry.npmjs.org/ripemd160/-/ripemd160-2.0.2.tgz",
+            "integrity": "sha512-ii4iagi25WusVoiC4B4lq7pbXfAp3D9v5CwfkY33vffw2+pkDjY1D8GaN7spsxvCSx8dkPqOZCEZyfxcmJG2IA==",
+            "dev": true,
+            "requires": {
+                "hash-base": "^3.0.0",
+                "inherits": "^2.0.1"
+            }
+        },
+        "run-parallel": {
+            "version": "1.2.0",
+            "resolved": "https://registry.npmjs.org/run-parallel/-/run-parallel-1.2.0.tgz",
+            "integrity": "sha512-5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA==",
+            "dev": true,
+            "requires": {
+                "queue-microtask": "^1.2.2"
+            }
+        },
+        "safe-buffer": {
+            "version": "5.1.2",
+            "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
+            "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==",
+            "dev": true
+        },
+        "safer-buffer": {
+            "version": "2.1.2",
+            "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz",
+            "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==",
+            "dev": true
+        },
+        "sass": {
+            "version": "1.69.5",
+            "resolved": "https://registry.npmjs.org/sass/-/sass-1.69.5.tgz",
+            "integrity": "sha512-qg2+UCJibLr2LCVOt3OlPhr/dqVHWOa9XtZf2OjbLs/T4VPSJ00udtgJxH3neXZm+QqX8B+3cU7RaLqp1iVfcQ==",
+            "dev": true,
+            "requires": {
+                "chokidar": ">=3.0.0 <4.0.0",
+                "immutable": "^4.0.0",
+                "source-map-js": ">=0.6.2 <2.0.0"
+            }
+        },
+        "sass-loader": {
+            "version": "13.3.2",
+            "resolved": "https://registry.npmjs.org/sass-loader/-/sass-loader-13.3.2.tgz",
+            "integrity": "sha512-CQbKl57kdEv+KDLquhC+gE3pXt74LEAzm+tzywcA0/aHZuub8wTErbjAoNI57rPUWRYRNC5WUnNl8eGJNbDdwg==",
+            "dev": true,
+            "requires": {
+                "neo-async": "^2.6.2"
+            }
+        },
+        "schema-utils": {
+            "version": "2.7.1",
+            "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-2.7.1.tgz",
+            "integrity": "sha512-SHiNtMOUGWBQJwzISiVYKu82GiV4QYGePp3odlY1tuKO7gPtphAT5R/py0fA6xtbgLL/RvtJZnU9b8s0F1q0Xg==",
+            "dev": true,
+            "requires": {
+                "@types/json-schema": "^7.0.5",
+                "ajv": "^6.12.4",
+                "ajv-keywords": "^3.5.2"
+            }
+        },
+        "select-hose": {
+            "version": "2.0.0",
+            "resolved": "https://registry.npmjs.org/select-hose/-/select-hose-2.0.0.tgz",
+            "integrity": "sha512-mEugaLK+YfkijB4fx0e6kImuJdCIt2LxCRcbEYPqRGCs4F2ogyfZU5IAZRdjCP8JPq2AtdNoC/Dux63d9Kiryg==",
+            "dev": true
+        },
+        "selfsigned": {
+            "version": "2.1.1",
+            "resolved": "https://registry.npmjs.org/selfsigned/-/selfsigned-2.1.1.tgz",
+            "integrity": "sha512-GSL3aowiF7wa/WtSFwnUrludWFoNhftq8bUkH9pkzjpN2XSPOAYEgg6e0sS9s0rZwgJzJiQRPU18A6clnoW5wQ==",
+            "dev": true,
+            "requires": {
+                "node-forge": "^1"
+            }
+        },
+        "semver": {
+            "version": "7.5.4",
+            "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz",
+            "integrity": "sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==",
+            "dev": true,
+            "requires": {
+                "lru-cache": "^6.0.0"
+            }
+        },
+        "send": {
+            "version": "0.18.0",
+            "resolved": "https://registry.npmjs.org/send/-/send-0.18.0.tgz",
+            "integrity": "sha512-qqWzuOjSFOuqPjFe4NOsMLafToQQwBSOEpS+FwEt3A2V3vKubTquT3vmLTQpFgMXp8AlFWFuP1qKaJZOtPpVXg==",
+            "dev": true,
+            "requires": {
+                "debug": "2.6.9",
+                "depd": "2.0.0",
+                "destroy": "1.2.0",
+                "encodeurl": "~1.0.2",
+                "escape-html": "~1.0.3",
+                "etag": "~1.8.1",
+                "fresh": "0.5.2",
+                "http-errors": "2.0.0",
+                "mime": "1.6.0",
+                "ms": "2.1.3",
+                "on-finished": "2.4.1",
+                "range-parser": "~1.2.1",
+                "statuses": "2.0.1"
+            },
+            "dependencies": {
+                "debug": {
+                    "version": "2.6.9",
+                    "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+                    "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+                    "dev": true,
+                    "requires": {
+                        "ms": "2.0.0"
+                    },
+                    "dependencies": {
+                        "ms": {
+                            "version": "2.0.0",
+                            "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+                            "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==",
+                            "dev": true
+                        }
+                    }
+                },
+                "ms": {
+                    "version": "2.1.3",
+                    "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",
+                    "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==",
+                    "dev": true
+                }
+            }
+        },
+        "serialize-javascript": {
+            "version": "6.0.1",
+            "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-6.0.1.tgz",
+            "integrity": "sha512-owoXEFjWRllis8/M1Q+Cw5k8ZH40e3zhp/ovX+Xr/vi1qj6QesbyXXViFbpNvWvPNAD62SutwEXavefrLJWj7w==",
+            "dev": true,
+            "requires": {
+                "randombytes": "^2.1.0"
+            }
+        },
+        "serve-index": {
+            "version": "1.9.1",
+            "resolved": "https://registry.npmjs.org/serve-index/-/serve-index-1.9.1.tgz",
+            "integrity": "sha512-pXHfKNP4qujrtteMrSBb0rc8HJ9Ms/GrXwcUtUtD5s4ewDJI8bT3Cz2zTVRMKtri49pLx2e0Ya8ziP5Ya2pZZw==",
+            "dev": true,
+            "requires": {
+                "accepts": "~1.3.4",
+                "batch": "0.6.1",
+                "debug": "2.6.9",
+                "escape-html": "~1.0.3",
+                "http-errors": "~1.6.2",
+                "mime-types": "~2.1.17",
+                "parseurl": "~1.3.2"
+            },
+            "dependencies": {
+                "debug": {
+                    "version": "2.6.9",
+                    "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+                    "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+                    "dev": true,
+                    "requires": {
+                        "ms": "2.0.0"
+                    }
+                },
+                "depd": {
+                    "version": "1.1.2",
+                    "resolved": "https://registry.npmjs.org/depd/-/depd-1.1.2.tgz",
+                    "integrity": "sha512-7emPTl6Dpo6JRXOXjLRxck+FlLRX5847cLKEn00PLAgc3g2hTZZgr+e4c2v6QpSmLeFP3n5yUo7ft6avBK/5jQ==",
+                    "dev": true
+                },
+                "http-errors": {
+                    "version": "1.6.3",
+                    "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.6.3.tgz",
+                    "integrity": "sha512-lks+lVC8dgGyh97jxvxeYTWQFvh4uw4yC12gVl63Cg30sjPX4wuGcdkICVXDAESr6OJGjqGA8Iz5mkeN6zlD7A==",
+                    "dev": true,
+                    "requires": {
+                        "depd": "~1.1.2",
+                        "inherits": "2.0.3",
+                        "setprototypeof": "1.1.0",
+                        "statuses": ">= 1.4.0 < 2"
+                    }
+                },
+                "inherits": {
+                    "version": "2.0.3",
+                    "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
+                    "integrity": "sha512-x00IRNXNy63jwGkJmzPigoySHbaqpNuzKbBOmzK+g2OdZpQ9w+sxCN+VSB3ja7IAge2OP2qpfxTjeNcyjmW1uw==",
+                    "dev": true
+                },
+                "ms": {
+                    "version": "2.0.0",
+                    "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+                    "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==",
+                    "dev": true
+                },
+                "setprototypeof": {
+                    "version": "1.1.0",
+                    "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.1.0.tgz",
+                    "integrity": "sha512-BvE/TwpZX4FXExxOxZyRGQQv651MSwmWKZGqvmPcRIjDqWub67kTKuIMx43cZZrS/cBBzwBcNDWoFxt2XEFIpQ==",
+                    "dev": true
+                },
+                "statuses": {
+                    "version": "1.5.0",
+                    "resolved": "https://registry.npmjs.org/statuses/-/statuses-1.5.0.tgz",
+                    "integrity": "sha512-OpZ3zP+jT1PI7I8nemJX4AKmAX070ZkYPVWV/AaKTJl+tXCTGyVdC1a4SL8RUQYEwk/f34ZX8UTykN68FwrqAA==",
+                    "dev": true
+                }
+            }
+        },
+        "serve-static": {
+            "version": "1.15.0",
+            "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.15.0.tgz",
+            "integrity": "sha512-XGuRDNjXUijsUL0vl6nSD7cwURuzEgglbOaFuZM9g3kwDXOWVTck0jLzjPzGD+TazWbboZYu52/9/XPdUgne9g==",
+            "dev": true,
+            "requires": {
+                "encodeurl": "~1.0.2",
+                "escape-html": "~1.0.3",
+                "parseurl": "~1.3.3",
+                "send": "0.18.0"
+            }
+        },
+        "setimmediate": {
+            "version": "1.0.5",
+            "resolved": "https://registry.npmjs.org/setimmediate/-/setimmediate-1.0.5.tgz",
+            "integrity": "sha512-MATJdZp8sLqDl/68LfQmbP8zKPLQNV6BIZoIgrscFDQ+RsvK/BxeDQOgyxKKoh0y/8h3BqVFnCqQ/gd+reiIXA==",
+            "dev": true
+        },
+        "setprototypeof": {
+            "version": "1.2.0",
+            "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.2.0.tgz",
+            "integrity": "sha512-E5LDX7Wrp85Kil5bhZv46j8jOeboKq5JMmYM3gVGdGH8xFpPWXUMsNrlODCrkoxMEeNi/XZIwuRvY4XNwYMJpw==",
+            "dev": true
+        },
+        "sha.js": {
+            "version": "2.4.11",
+            "resolved": "https://registry.npmjs.org/sha.js/-/sha.js-2.4.11.tgz",
+            "integrity": "sha512-QMEp5B7cftE7APOjk5Y6xgrbWu+WkLVQwk8JNjZ8nKRciZaByEW6MubieAiToS7+dwvrjGhH8jRXz3MVd0AYqQ==",
+            "dev": true,
+            "requires": {
+                "inherits": "^2.0.1",
+                "safe-buffer": "^5.0.1"
+            }
+        },
+        "shallow-clone": {
+            "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": {
+                "kind-of": "^6.0.2"
+            }
+        },
+        "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
+        },
+        "shell-quote": {
+            "version": "1.8.1",
+            "resolved": "https://registry.npmjs.org/shell-quote/-/shell-quote-1.8.1.tgz",
+            "integrity": "sha512-6j1W9l1iAs/4xYBI1SYOVZyFcCis9b4KCLQ8fgAGG07QvzaRLVVRQvAy85yNmmZSjYjg4MWh4gNvlPujU/5LpA==",
+            "dev": true
+        },
+        "shellwords": {
+            "version": "0.1.1",
+            "resolved": "https://registry.npmjs.org/shellwords/-/shellwords-0.1.1.tgz",
+            "integrity": "sha512-vFwSUfQvqybiICwZY5+DAWIPLKsWO31Q91JSKl3UYv+K5c2QRPzn0qzec6QPu1Qc9eHYItiP3NdJqNVqetYAww==",
+            "dev": true
+        },
+        "side-channel": {
+            "version": "1.0.4",
+            "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.0.4.tgz",
+            "integrity": "sha512-q5XPytqFEIKHkGdiMIrY10mvLRvnQh42/+GoBlFW3b2LXLE2xxJpZFdm94we0BaoV3RwJyGqg5wS7epxTv0Zvw==",
+            "dev": true,
+            "requires": {
+                "call-bind": "^1.0.0",
+                "get-intrinsic": "^1.0.2",
+                "object-inspect": "^1.9.0"
+            }
+        },
+        "signal-exit": {
+            "version": "3.0.7",
+            "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.7.tgz",
+            "integrity": "sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==",
+            "dev": true
+        },
+        "slash": {
+            "version": "3.0.0",
+            "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz",
+            "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==",
+            "dev": true
+        },
+        "sockjs": {
+            "version": "0.3.24",
+            "resolved": "https://registry.npmjs.org/sockjs/-/sockjs-0.3.24.tgz",
+            "integrity": "sha512-GJgLTZ7vYb/JtPSSZ10hsOYIvEYsjbNU+zPdIHcUaWVNUEPivzxku31865sSSud0Da0W4lEeOPlmw93zLQchuQ==",
+            "dev": true,
+            "requires": {
+                "faye-websocket": "^0.11.3",
+                "uuid": "^8.3.2",
+                "websocket-driver": "^0.7.4"
+            }
+        },
+        "source-list-map": {
+            "version": "2.0.1",
+            "resolved": "https://registry.npmjs.org/source-list-map/-/source-list-map-2.0.1.tgz",
+            "integrity": "sha512-qnQ7gVMxGNxsiL4lEuJwe/To8UnK7fAnmbGEEH8RpLouuKbeEm0lhbQVFIrNSuB+G7tVrAlVsZgETT5nljf+Iw==",
+            "dev": true
+        },
+        "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
+        },
+        "source-map-js": {
+            "version": "1.0.2",
+            "resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.0.2.tgz",
+            "integrity": "sha512-R0XvVJ9WusLiqTCEiGCmICCMplcCkIwwR11mOSD9CR5u+IXYdiseeEuXCVAjS54zqwkLcPNnmU4OeJ6tUrWhDw==",
+            "dev": true
+        },
+        "source-map-support": {
+            "version": "0.5.21",
+            "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.21.tgz",
+            "integrity": "sha512-uBHU3L3czsIyYXKX88fdrGovxdSCoTGDRZ6SYXtSRxLZUzHg5P/66Ht6uoUlHu9EZod+inXhKo3qQgwXUT/y1w==",
+            "dev": true,
+            "requires": {
+                "buffer-from": "^1.0.0",
+                "source-map": "^0.6.0"
+            }
+        },
+        "spdy": {
+            "version": "4.0.2",
+            "resolved": "https://registry.npmjs.org/spdy/-/spdy-4.0.2.tgz",
+            "integrity": "sha512-r46gZQZQV+Kl9oItvl1JZZqJKGr+oEkB08A6BzkiR7593/7IbtuncXHd2YoYeTsG4157ZssMu9KYvUHLcjcDoA==",
+            "dev": true,
+            "requires": {
+                "debug": "^4.1.0",
+                "handle-thing": "^2.0.0",
+                "http-deceiver": "^1.2.7",
+                "select-hose": "^2.0.0",
+                "spdy-transport": "^3.0.0"
+            }
+        },
+        "spdy-transport": {
+            "version": "3.0.0",
+            "resolved": "https://registry.npmjs.org/spdy-transport/-/spdy-transport-3.0.0.tgz",
+            "integrity": "sha512-hsLVFE5SjA6TCisWeJXFKniGGOpBgMLmerfO2aCyCU5s7nJ/rpAepqmFifv/GCbSbueEeAJJnmSQ2rKC/g8Fcw==",
+            "dev": true,
+            "requires": {
+                "debug": "^4.1.0",
+                "detect-node": "^2.0.4",
+                "hpack.js": "^2.1.6",
+                "obuf": "^1.1.2",
+                "readable-stream": "^3.0.6",
+                "wbuf": "^1.7.3"
+            }
+        },
+        "stable": {
+            "version": "0.1.8",
+            "resolved": "https://registry.npmjs.org/stable/-/stable-0.1.8.tgz",
+            "integrity": "sha512-ji9qxRnOVfcuLDySj9qzhGSEFVobyt1kIOSkj1qZzYLzq7Tos/oUUWvotUPQLlrsidqsK6tBH89Bc9kL5zHA6w==",
+            "dev": true
+        },
+        "statuses": {
+            "version": "2.0.1",
+            "resolved": "https://registry.npmjs.org/statuses/-/statuses-2.0.1.tgz",
+            "integrity": "sha512-RwNA9Z/7PrK06rYLIzFMlaF+l73iwpzsqRIFgbMLbTcLD6cOao82TaWefPXQvB2fOC4AjuYSEndS7N/mTCbkdQ==",
+            "dev": true
+        },
+        "std-env": {
+            "version": "3.4.3",
+            "resolved": "https://registry.npmjs.org/std-env/-/std-env-3.4.3.tgz",
+            "integrity": "sha512-f9aPhy8fYBuMN+sNfakZV18U39PbalgjXG3lLB9WkaYTxijru61wb57V9wxxNthXM5Sd88ETBWi29qLAsHO52Q==",
+            "dev": true
+        },
+        "stream-browserify": {
+            "version": "2.0.2",
+            "resolved": "https://registry.npmjs.org/stream-browserify/-/stream-browserify-2.0.2.tgz",
+            "integrity": "sha512-nX6hmklHs/gr2FuxYDltq8fJA1GDlxKQCz8O/IM4atRqBH8OORmBNgfvW5gG10GT/qQ9u0CzIvr2X5Pkt6ntqg==",
+            "dev": true,
+            "requires": {
+                "inherits": "~2.0.1",
+                "readable-stream": "^2.0.2"
+            },
+            "dependencies": {
+                "readable-stream": {
+                    "version": "2.3.8",
+                    "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.8.tgz",
+                    "integrity": "sha512-8p0AUk4XODgIewSi0l8Epjs+EVnWiK7NoDIEGU0HhE7+ZyY8D1IMY7odu5lRrFXGg71L15KG8QrPmum45RTtdA==",
+                    "dev": true,
+                    "requires": {
+                        "core-util-is": "~1.0.0",
+                        "inherits": "~2.0.3",
+                        "isarray": "~1.0.0",
+                        "process-nextick-args": "~2.0.0",
+                        "safe-buffer": "~5.1.1",
+                        "string_decoder": "~1.1.1",
+                        "util-deprecate": "~1.0.1"
+                    }
+                },
+                "string_decoder": {
+                    "version": "1.1.1",
+                    "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
+                    "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
+                    "dev": true,
+                    "requires": {
+                        "safe-buffer": "~5.1.0"
+                    }
+                }
+            }
+        },
+        "stream-http": {
+            "version": "2.8.3",
+            "resolved": "https://registry.npmjs.org/stream-http/-/stream-http-2.8.3.tgz",
+            "integrity": "sha512-+TSkfINHDo4J+ZobQLWiMouQYB+UVYFttRA94FpEzzJ7ZdqcL4uUUQ7WkdkI4DSozGmgBUE/a47L+38PenXhUw==",
+            "dev": true,
+            "requires": {
+                "builtin-status-codes": "^3.0.0",
+                "inherits": "^2.0.1",
+                "readable-stream": "^2.3.6",
+                "to-arraybuffer": "^1.0.0",
+                "xtend": "^4.0.0"
+            },
+            "dependencies": {
+                "readable-stream": {
+                    "version": "2.3.8",
+                    "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.8.tgz",
+                    "integrity": "sha512-8p0AUk4XODgIewSi0l8Epjs+EVnWiK7NoDIEGU0HhE7+ZyY8D1IMY7odu5lRrFXGg71L15KG8QrPmum45RTtdA==",
+                    "dev": true,
+                    "requires": {
+                        "core-util-is": "~1.0.0",
+                        "inherits": "~2.0.3",
+                        "isarray": "~1.0.0",
+                        "process-nextick-args": "~2.0.0",
+                        "safe-buffer": "~5.1.1",
+                        "string_decoder": "~1.1.1",
+                        "util-deprecate": "~1.0.1"
+                    }
+                },
+                "string_decoder": {
+                    "version": "1.1.1",
+                    "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
+                    "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
+                    "dev": true,
+                    "requires": {
+                        "safe-buffer": "~5.1.0"
+                    }
+                }
+            }
+        },
+        "string_decoder": {
+            "version": "1.2.0",
+            "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.2.0.tgz",
+            "integrity": "sha512-6YqyX6ZWEYguAxgZzHGL7SsCeGx3V2TtOTqZz1xSTSWnqsbWwbptafNyvf/ACquZUXV3DANr5BDIwNYe1mN42w==",
+            "dev": true,
+            "requires": {
+                "safe-buffer": "~5.1.0"
+            }
+        },
+        "string-width": {
+            "version": "4.2.3",
+            "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
+            "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
+            "dev": true,
+            "requires": {
+                "emoji-regex": "^8.0.0",
+                "is-fullwidth-code-point": "^3.0.0",
+                "strip-ansi": "^6.0.1"
+            }
+        },
+        "strip-ansi": {
+            "version": "6.0.1",
+            "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
+            "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
+            "dev": true,
+            "requires": {
+                "ansi-regex": "^5.0.1"
+            }
+        },
+        "strip-final-newline": {
+            "version": "2.0.0",
+            "resolved": "https://registry.npmjs.org/strip-final-newline/-/strip-final-newline-2.0.0.tgz",
+            "integrity": "sha512-BrpvfNAE3dcvq7ll3xVumzjKjZQ5tI1sEUIKr3Uoks0XUl45St3FlatVqef9prk4jRDzhW6WZg+3bk93y6pLjA==",
+            "dev": true
+        },
+        "style-loader": {
+            "version": "2.0.0",
+            "resolved": "https://registry.npmjs.org/style-loader/-/style-loader-2.0.0.tgz",
+            "integrity": "sha512-Z0gYUJmzZ6ZdRUqpg1r8GsaFKypE+3xAzuFeMuoHgjc9KZv3wMyCRjQIWEbhoFSq7+7yoHXySDJyyWQaPajeiQ==",
+            "dev": true,
+            "requires": {
+                "loader-utils": "^2.0.0",
+                "schema-utils": "^3.0.0"
+            },
+            "dependencies": {
+                "schema-utils": {
+                    "version": "3.3.0",
+                    "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.3.0.tgz",
+                    "integrity": "sha512-pN/yOAvcC+5rQ5nERGuwrjLlYvLTbCibnZ1I7B1LaiAz9BRBlE9GMgE/eqV30P7aJQUf7Ddimy/RsbYO/GrVGg==",
+                    "dev": true,
+                    "requires": {
+                        "@types/json-schema": "^7.0.8",
+                        "ajv": "^6.12.5",
+                        "ajv-keywords": "^3.5.2"
+                    }
+                }
+            }
+        },
+        "stylehacks": {
+            "version": "5.1.1",
+            "resolved": "https://registry.npmjs.org/stylehacks/-/stylehacks-5.1.1.tgz",
+            "integrity": "sha512-sBpcd5Hx7G6seo7b1LkpttvTz7ikD0LlH5RmdcBNb6fFR0Fl7LQwHDFr300q4cwUqi+IYrFGmsIHieMBfnN/Bw==",
+            "dev": true,
+            "requires": {
+                "browserslist": "^4.21.4",
+                "postcss-selector-parser": "^6.0.4"
+            }
+        },
+        "sucrase": {
+            "version": "3.32.0",
+            "resolved": "https://registry.npmjs.org/sucrase/-/sucrase-3.32.0.tgz",
+            "integrity": "sha512-ydQOU34rpSyj2TGyz4D2p8rbktIOZ8QY9s+DGLvFU1i5pWJE8vkpruCjGCMHsdXwnD7JDcS+noSwM/a7zyNFDQ==",
+            "dev": true,
+            "requires": {
+                "@jridgewell/gen-mapping": "^0.3.2",
+                "commander": "^4.0.0",
+                "glob": "7.1.6",
+                "lines-and-columns": "^1.1.6",
+                "mz": "^2.7.0",
+                "pirates": "^4.0.1",
+                "ts-interface-checker": "^0.1.9"
+            },
+            "dependencies": {
+                "@jridgewell/gen-mapping": {
+                    "version": "0.3.3",
+                    "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.3.tgz",
+                    "integrity": "sha512-HLhSWOLRi875zjjMG/r+Nv0oCW8umGb0BgEhyX3dDX3egwZtB8PqLnjz3yedt8R5StBrzcg4aBpnh8UA9D1BoQ==",
+                    "dev": true,
+                    "requires": {
+                        "@jridgewell/set-array": "^1.0.1",
+                        "@jridgewell/sourcemap-codec": "^1.4.10",
+                        "@jridgewell/trace-mapping": "^0.3.9"
+                    }
+                },
+                "commander": {
+                    "version": "4.1.1",
+                    "resolved": "https://registry.npmjs.org/commander/-/commander-4.1.1.tgz",
+                    "integrity": "sha512-NOKm8xhkzAjzFx8B2v5OAHT+u5pRQc2UCa2Vq9jYL/31o2wi9mxBA7LIFs3sV5VSC49z6pEhfbMULvShKj26WA==",
+                    "dev": true
+                },
+                "glob": {
+                    "version": "7.1.6",
+                    "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.6.tgz",
+                    "integrity": "sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA==",
+                    "dev": true,
+                    "requires": {
+                        "fs.realpath": "^1.0.0",
+                        "inflight": "^1.0.4",
+                        "inherits": "2",
+                        "minimatch": "^3.0.4",
+                        "once": "^1.3.0",
+                        "path-is-absolute": "^1.0.0"
+                    }
+                }
+            }
+        },
+        "supports-color": {
+            "version": "7.2.0",
+            "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+            "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+            "dev": true,
+            "requires": {
+                "has-flag": "^4.0.0"
+            }
+        },
+        "supports-preserve-symlinks-flag": {
+            "version": "1.0.0",
+            "resolved": "https://registry.npmjs.org/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz",
+            "integrity": "sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w==",
+            "dev": true
+        },
+        "svgo": {
+            "version": "2.8.0",
+            "resolved": "https://registry.npmjs.org/svgo/-/svgo-2.8.0.tgz",
+            "integrity": "sha512-+N/Q9kV1+F+UeWYoSiULYo4xYSDQlTgb+ayMobAXPwMnLvop7oxKMo9OzIrX5x3eS4L4f2UHhc9axXwY8DpChg==",
+            "dev": true,
+            "requires": {
+                "@trysound/sax": "0.2.0",
+                "commander": "^7.2.0",
+                "css-select": "^4.1.3",
+                "css-tree": "^1.1.3",
+                "csso": "^4.2.0",
+                "picocolors": "^1.0.0",
+                "stable": "^0.1.8"
+            }
+        },
+        "tailwindcss": {
+            "version": "3.3.2",
+            "resolved": "https://registry.npmjs.org/tailwindcss/-/tailwindcss-3.3.2.tgz",
+            "integrity": "sha512-9jPkMiIBXvPc2KywkraqsUfbfj+dHDb+JPWtSJa9MLFdrPyazI7q6WX2sUrm7R9eVR7qqv3Pas7EvQFzxKnI6w==",
+            "dev": true,
+            "requires": {
+                "@alloc/quick-lru": "^5.2.0",
+                "arg": "^5.0.2",
+                "chokidar": "^3.5.3",
+                "didyoumean": "^1.2.2",
+                "dlv": "^1.1.3",
+                "fast-glob": "^3.2.12",
+                "glob-parent": "^6.0.2",
+                "is-glob": "^4.0.3",
+                "jiti": "^1.18.2",
+                "lilconfig": "^2.1.0",
+                "micromatch": "^4.0.5",
+                "normalize-path": "^3.0.0",
+                "object-hash": "^3.0.0",
+                "picocolors": "^1.0.0",
+                "postcss": "^8.4.23",
+                "postcss-import": "^15.1.0",
+                "postcss-js": "^4.0.1",
+                "postcss-load-config": "^4.0.1",
+                "postcss-nested": "^6.0.1",
+                "postcss-selector-parser": "^6.0.11",
+                "postcss-value-parser": "^4.2.0",
+                "resolve": "^1.22.2",
+                "sucrase": "^3.32.0"
+            },
+            "dependencies": {
+                "glob-parent": {
+                    "version": "6.0.2",
+                    "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-6.0.2.tgz",
+                    "integrity": "sha512-XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A==",
+                    "dev": true,
+                    "requires": {
+                        "is-glob": "^4.0.3"
+                    }
+                }
+            }
+        },
+        "tapable": {
+            "version": "2.2.1",
+            "resolved": "https://registry.npmjs.org/tapable/-/tapable-2.2.1.tgz",
+            "integrity": "sha512-GNzQvQTOIP6RyTfE2Qxb8ZVlNmw0n88vp1szwWRimP02mnTsx3Wtn5qRdqY9w2XduFNUgvOwhNnQsjwCp+kqaQ==",
+            "dev": true
+        },
+        "terser": {
+            "version": "5.22.0",
+            "resolved": "https://registry.npmjs.org/terser/-/terser-5.22.0.tgz",
+            "integrity": "sha512-hHZVLgRA2z4NWcN6aS5rQDc+7Dcy58HOf2zbYwmFcQ+ua3h6eEFf5lIDKTzbWwlazPyOZsFQO8V80/IjVNExEw==",
+            "dev": true,
+            "requires": {
+                "@jridgewell/source-map": "^0.3.3",
+                "acorn": "^8.8.2",
+                "commander": "^2.20.0",
+                "source-map-support": "~0.5.20"
+            },
+            "dependencies": {
+                "commander": {
+                    "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
+                }
+            }
+        },
+        "terser-webpack-plugin": {
+            "version": "5.3.9",
+            "resolved": "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-5.3.9.tgz",
+            "integrity": "sha512-ZuXsqE07EcggTWQjXUj+Aot/OMcD0bMKGgF63f7UxYcu5/AJF53aIpK1YoP5xR9l6s/Hy2b+t1AM0bLNPRuhwA==",
+            "dev": true,
+            "requires": {
+                "@jridgewell/trace-mapping": "^0.3.17",
+                "jest-worker": "^27.4.5",
+                "schema-utils": "^3.1.1",
+                "serialize-javascript": "^6.0.1",
+                "terser": "^5.16.8"
+            },
+            "dependencies": {
+                "schema-utils": {
+                    "version": "3.3.0",
+                    "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.3.0.tgz",
+                    "integrity": "sha512-pN/yOAvcC+5rQ5nERGuwrjLlYvLTbCibnZ1I7B1LaiAz9BRBlE9GMgE/eqV30P7aJQUf7Ddimy/RsbYO/GrVGg==",
+                    "dev": true,
+                    "requires": {
+                        "@types/json-schema": "^7.0.8",
+                        "ajv": "^6.12.5",
+                        "ajv-keywords": "^3.5.2"
+                    }
+                }
+            }
+        },
+        "thenify": {
+            "version": "3.3.1",
+            "resolved": "https://registry.npmjs.org/thenify/-/thenify-3.3.1.tgz",
+            "integrity": "sha512-RVZSIV5IG10Hk3enotrhvz0T9em6cyHBLkH/YAZuKqd8hRkKhSfCGIcP2KUY0EPxndzANBmNllzWPwak+bheSw==",
+            "dev": true,
+            "requires": {
+                "any-promise": "^1.0.0"
+            }
+        },
+        "thenify-all": {
+            "version": "1.6.0",
+            "resolved": "https://registry.npmjs.org/thenify-all/-/thenify-all-1.6.0.tgz",
+            "integrity": "sha512-RNxQH/qI8/t3thXJDwcstUO4zeqo64+Uy/+sNVRBx4Xn2OX+OZ9oP+iJnNFqplFra2ZUVeKCSa2oVWi3T4uVmA==",
+            "dev": true,
+            "requires": {
+                "thenify": ">= 3.1.0 < 4"
+            }
+        },
+        "thunky": {
+            "version": "1.1.0",
+            "resolved": "https://registry.npmjs.org/thunky/-/thunky-1.1.0.tgz",
+            "integrity": "sha512-eHY7nBftgThBqOyHGVN+l8gF0BucP09fMo0oO/Lb0w1OF80dJv+lDVpXG60WMQvkcxAkNybKsrEIE3ZtKGmPrA==",
+            "dev": true
+        },
+        "timers-browserify": {
+            "version": "2.0.12",
+            "resolved": "https://registry.npmjs.org/timers-browserify/-/timers-browserify-2.0.12.tgz",
+            "integrity": "sha512-9phl76Cqm6FhSX9Xe1ZUAMLtm1BLkKj2Qd5ApyWkXzsMRaA7dgr81kf4wJmQf/hAvg8EEyJxDo3du/0KlhPiKQ==",
+            "dev": true,
+            "requires": {
+                "setimmediate": "^1.0.4"
+            }
+        },
+        "to-arraybuffer": {
+            "version": "1.0.1",
+            "resolved": "https://registry.npmjs.org/to-arraybuffer/-/to-arraybuffer-1.0.1.tgz",
+            "integrity": "sha512-okFlQcoGTi4LQBG/PgSYblw9VOyptsz2KJZqc6qtgGdes8VktzUQkj4BI2blit072iS8VODNcMA+tvnS9dnuMA==",
+            "dev": true
+        },
+        "to-fast-properties": {
+            "version": "2.0.0",
+            "resolved": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-2.0.0.tgz",
+            "integrity": "sha512-/OaKK0xYrs3DmxRYqL/yDc+FxFUVYhDlXMhRmv3z915w2HF1tnN1omB354j8VUGO/hbRzyD6Y3sA7v7GS/ceog==",
+            "dev": true
+        },
+        "to-regex-range": {
+            "version": "5.0.1",
+            "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz",
+            "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==",
+            "dev": true,
+            "requires": {
+                "is-number": "^7.0.0"
+            }
+        },
+        "toidentifier": {
+            "version": "1.0.1",
+            "resolved": "https://registry.npmjs.org/toidentifier/-/toidentifier-1.0.1.tgz",
+            "integrity": "sha512-o5sSPKEkg/DIQNmH43V0/uerLrpzVedkUh8tGNvaeXpfpuwjKenlSox/2O/BTlZUtEe+JG7s5YhEz608PlAHRA==",
+            "dev": true
+        },
+        "ts-interface-checker": {
+            "version": "0.1.13",
+            "resolved": "https://registry.npmjs.org/ts-interface-checker/-/ts-interface-checker-0.1.13.tgz",
+            "integrity": "sha512-Y/arvbn+rrz3JCKl9C4kVNfTfSm2/mEp5FSz5EsZSANGPSlQrpRI5M4PKF+mJnE52jOO90PnPSc3Ur3bTQw0gA==",
+            "dev": true
+        },
+        "tslib": {
+            "version": "2.6.2",
+            "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.2.tgz",
+            "integrity": "sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q==",
+            "dev": true
+        },
+        "tty-browserify": {
+            "version": "0.0.0",
+            "resolved": "https://registry.npmjs.org/tty-browserify/-/tty-browserify-0.0.0.tgz",
+            "integrity": "sha512-JVa5ijo+j/sOoHGjw0sxw734b1LhBkQ3bvUGNdxnVXDCX81Yx7TFgnZygxrIIWn23hbfTaMYLwRmAxFyDuFmIw==",
+            "dev": true
+        },
+        "type-is": {
+            "version": "1.6.18",
+            "resolved": "https://registry.npmjs.org/type-is/-/type-is-1.6.18.tgz",
+            "integrity": "sha512-TkRKr9sUTxEH8MdfuCSP7VizJyzRNMjj2J2do2Jr3Kym598JVdEksuzPQCnlFPW4ky9Q+iA+ma9BGm06XQBy8g==",
+            "dev": true,
+            "requires": {
+                "media-typer": "0.3.0",
+                "mime-types": "~2.1.24"
+            }
+        },
+        "typedarray": {
+            "version": "0.0.6",
+            "resolved": "https://registry.npmjs.org/typedarray/-/typedarray-0.0.6.tgz",
+            "integrity": "sha512-/aCDEGatGvZ2BIk+HmLf4ifCJFwvKFNb9/JeZPMulfgFracn9QFcAf5GO8B/mweUjSoblS5In0cWhqpfs/5PQA==",
+            "dev": true
+        },
+        "unicode-canonical-property-names-ecmascript": {
+            "version": "2.0.0",
+            "resolved": "https://registry.npmjs.org/unicode-canonical-property-names-ecmascript/-/unicode-canonical-property-names-ecmascript-2.0.0.tgz",
+            "integrity": "sha512-yY5PpDlfVIU5+y/BSCxAJRBIS1Zc2dDG3Ujq+sR0U+JjUevW2JhocOF+soROYDSaAezOzOKuyyixhD6mBknSmQ==",
+            "dev": true
+        },
+        "unicode-match-property-ecmascript": {
+            "version": "2.0.0",
+            "resolved": "https://registry.npmjs.org/unicode-match-property-ecmascript/-/unicode-match-property-ecmascript-2.0.0.tgz",
+            "integrity": "sha512-5kaZCrbp5mmbz5ulBkDkbY0SsPOjKqVS35VpL9ulMPfSl0J0Xsm+9Evphv9CoIZFwre7aJoa94AY6seMKGVN5Q==",
+            "dev": true,
+            "requires": {
+                "unicode-canonical-property-names-ecmascript": "^2.0.0",
+                "unicode-property-aliases-ecmascript": "^2.0.0"
+            }
+        },
+        "unicode-match-property-value-ecmascript": {
+            "version": "2.0.0",
+            "resolved": "https://registry.npmjs.org/unicode-match-property-value-ecmascript/-/unicode-match-property-value-ecmascript-2.0.0.tgz",
+            "integrity": "sha512-7Yhkc0Ye+t4PNYzOGKedDhXbYIBe1XEQYQxOPyhcXNMJ0WCABqqj6ckydd6pWRZTHV4GuCPKdBAUiMc60tsKVw==",
+            "dev": true
+        },
+        "unicode-property-aliases-ecmascript": {
+            "version": "2.0.0",
+            "resolved": "https://registry.npmjs.org/unicode-property-aliases-ecmascript/-/unicode-property-aliases-ecmascript-2.0.0.tgz",
+            "integrity": "sha512-5Zfuy9q/DFr4tfO7ZPeVXb1aPoeQSdeFMLpYuFebehDAhbuevLs5yxSZmIFN1tP5F9Wl4IpJrYojg85/zgyZHQ==",
+            "dev": true
+        },
+        "universalify": {
+            "version": "2.0.0",
+            "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.0.tgz",
+            "integrity": "sha512-hAZsKq7Yy11Zu1DE0OzWjw7nnLZmJZYTDZZyEFHZdUhV8FkH5MCfoU1XMaxXovpyW5nq5scPqq0ZDP9Zyl04oQ==",
+            "dev": true
+        },
+        "unpipe": {
+            "version": "1.0.0",
+            "resolved": "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz",
+            "integrity": "sha512-pjy2bYhSsufwWlKwPc+l3cN7+wuJlK6uz0YdJEOlQDbl6jo/YlPi4mb8agUkVC8BF7V8NuzeyPNqRksA3hztKQ==",
+            "dev": true
+        },
+        "update-browserslist-db": {
+            "version": "1.0.13",
+            "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.0.13.tgz",
+            "integrity": "sha512-xebP81SNcPuNpPP3uzeW1NYXxI3rxyJzF3pD6sH4jE7o/IX+WtSpwnVU+qIsDPyk0d3hmFQ7mjqc6AtV604hbg==",
+            "dev": true,
+            "requires": {
+                "escalade": "^3.1.1",
+                "picocolors": "^1.0.0"
+            }
+        },
+        "uri-js": {
+            "version": "4.4.1",
+            "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.4.1.tgz",
+            "integrity": "sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==",
+            "dev": true,
+            "requires": {
+                "punycode": "^2.1.0"
+            },
+            "dependencies": {
+                "punycode": {
+                    "version": "2.1.1",
+                    "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz",
+                    "integrity": "sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==",
+                    "dev": true
+                }
+            }
+        },
+        "url": {
+            "version": "0.11.3",
+            "resolved": "https://registry.npmjs.org/url/-/url-0.11.3.tgz",
+            "integrity": "sha512-6hxOLGfZASQK/cijlZnZJTq8OXAkt/3YGfQX45vvMYXpZoo8NdWZcY73K108Jf759lS1Bv/8wXnHDTSz17dSRw==",
+            "dev": true,
+            "requires": {
+                "punycode": "^1.4.1",
+                "qs": "^6.11.2"
+            }
+        },
+        "user-home": {
+            "version": "2.0.0",
+            "resolved": "https://registry.npmjs.org/user-home/-/user-home-2.0.0.tgz",
+            "integrity": "sha512-KMWqdlOcjCYdtIJpicDSFBQ8nFwS2i9sslAd6f4+CBGcU4gist2REnr2fxj2YocvJFxSF3ZOHLYLVZnUxv4BZQ==",
+            "dev": true,
+            "requires": {
+                "os-homedir": "^1.0.0"
+            }
+        },
+        "util": {
+            "version": "0.11.1",
+            "resolved": "https://registry.npmjs.org/util/-/util-0.11.1.tgz",
+            "integrity": "sha512-HShAsny+zS2TZfaXxD9tYj4HQGlBezXZMZuM/S5PKLLoZkShZiGk9o5CzukI1LVHZvjdvZ2Sj1aW/Ndn2NB/HQ==",
+            "dev": true,
+            "requires": {
+                "inherits": "2.0.3"
+            },
+            "dependencies": {
+                "inherits": {
+                    "version": "2.0.3",
+                    "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
+                    "integrity": "sha512-x00IRNXNy63jwGkJmzPigoySHbaqpNuzKbBOmzK+g2OdZpQ9w+sxCN+VSB3ja7IAge2OP2qpfxTjeNcyjmW1uw==",
+                    "dev": true
+                }
+            }
+        },
+        "util-deprecate": {
+            "version": "1.0.2",
+            "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
+            "integrity": "sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==",
+            "dev": true
+        },
+        "utils-merge": {
+            "version": "1.0.1",
+            "resolved": "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.1.tgz",
+            "integrity": "sha512-pMZTvIkT1d+TFGvDOqodOclx0QWkkgi6Tdoa8gC8ffGAAqz9pzPTZWAybbsHHoED/ztMtkv/VoYTYyShUn81hA==",
+            "dev": true
+        },
+        "uuid": {
+            "version": "8.3.2",
+            "resolved": "https://registry.npmjs.org/uuid/-/uuid-8.3.2.tgz",
+            "integrity": "sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==",
+            "dev": true
+        },
+        "vary": {
+            "version": "1.1.2",
+            "resolved": "https://registry.npmjs.org/vary/-/vary-1.1.2.tgz",
+            "integrity": "sha512-BNGbWLfd0eUPabhkXUVm0j8uuvREyTh5ovRa/dyow/BqAbZJyC+5fU+IzQOzmAKzYqYRAISoRhdQr3eIZ/PXqg==",
+            "dev": true
+        },
+        "vm-browserify": {
+            "version": "1.1.2",
+            "resolved": "https://registry.npmjs.org/vm-browserify/-/vm-browserify-1.1.2.tgz",
+            "integrity": "sha512-2ham8XPWTONajOR0ohOKOHXkm3+gaBmGut3SRuu75xLd/RRaY6vqgh8NBYYk7+RW3u5AtzPQZG8F10LHkl0lAQ==",
+            "dev": true
+        },
+        "vscode-oniguruma": {
+            "version": "1.7.0",
+            "resolved": "https://registry.npmjs.org/vscode-oniguruma/-/vscode-oniguruma-1.7.0.tgz",
+            "integrity": "sha512-L9WMGRfrjOhgHSdOYgCt/yRMsXzLDJSL7BPrOZt73gU0iWO4mpqzqQzOz5srxqTvMBaR0XZTSrVWo4j55Rc6cA==",
+            "dev": true
+        },
+        "vscode-textmate": {
+            "version": "7.0.1",
+            "resolved": "https://registry.npmjs.org/vscode-textmate/-/vscode-textmate-7.0.1.tgz",
+            "integrity": "sha512-zQ5U/nuXAAMsh691FtV0wPz89nSkHbs+IQV8FDk+wew9BlSDhf4UmWGlWJfTR2Ti6xZv87Tj5fENzKf6Qk7aLw==",
+            "dev": true
+        },
+        "vue": {
+            "version": "3.3.13",
+            "resolved": "https://registry.npmjs.org/vue/-/vue-3.3.13.tgz",
+            "integrity": "sha512-LDnUpQvDgsfc0u/YgtAgTMXJlJQqjkxW1PVcOnJA5cshPleULDjHi7U45pl2VJYazSSvLH8UKcid/kzH8I0a0Q==",
+            "dev": true,
+            "requires": {
+                "@vue/compiler-dom": "3.3.13",
+                "@vue/compiler-sfc": "3.3.13",
+                "@vue/runtime-dom": "3.3.13",
+                "@vue/server-renderer": "3.3.13",
+                "@vue/shared": "3.3.13"
+            }
+        },
+        "vue-style-loader": {
+            "version": "4.1.3",
+            "resolved": "https://registry.npmjs.org/vue-style-loader/-/vue-style-loader-4.1.3.tgz",
+            "integrity": "sha512-sFuh0xfbtpRlKfm39ss/ikqs9AbKCoXZBpHeVZ8Tx650o0k0q/YCM7FRvigtxpACezfq6af+a7JeqVTWvncqDg==",
+            "dev": true,
+            "requires": {
+                "hash-sum": "^1.0.2",
+                "loader-utils": "^1.0.2"
+            },
+            "dependencies": {
+                "json5": {
+                    "version": "1.0.2",
+                    "resolved": "https://registry.npmjs.org/json5/-/json5-1.0.2.tgz",
+                    "integrity": "sha512-g1MWMLBiz8FKi1e4w0UyVL3w+iJceWAFBAaBnnGKOpNa5f8TLktkbre1+s6oICydWAm+HRUGTmI+//xv2hvXYA==",
+                    "dev": true,
+                    "requires": {
+                        "minimist": "^1.2.0"
+                    }
+                },
+                "loader-utils": {
+                    "version": "1.4.2",
+                    "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-1.4.2.tgz",
+                    "integrity": "sha512-I5d00Pd/jwMD2QCduo657+YM/6L3KZu++pmX9VFncxaxvHcru9jx1lBaFft+r4Mt2jK0Yhp41XlRAihzPxHNCg==",
+                    "dev": true,
+                    "requires": {
+                        "big.js": "^5.2.2",
+                        "emojis-list": "^3.0.0",
+                        "json5": "^1.0.1"
+                    }
+                }
+            }
+        },
+        "watchpack": {
+            "version": "2.4.0",
+            "resolved": "https://registry.npmjs.org/watchpack/-/watchpack-2.4.0.tgz",
+            "integrity": "sha512-Lcvm7MGST/4fup+ifyKi2hjyIAwcdI4HRgtvTpIUxBRhB+RFtUh8XtDOxUfctVCnhVi+QQj49i91OyvzkJl6cg==",
+            "dev": true,
+            "requires": {
+                "glob-to-regexp": "^0.4.1",
+                "graceful-fs": "^4.1.2"
+            }
+        },
+        "wbuf": {
+            "version": "1.7.3",
+            "resolved": "https://registry.npmjs.org/wbuf/-/wbuf-1.7.3.tgz",
+            "integrity": "sha512-O84QOnr0icsbFGLS0O3bI5FswxzRr8/gHwWkDlQFskhSPryQXvrTMxjxGP4+iWYoauLoBvfDpkrOauZ+0iZpDA==",
+            "dev": true,
+            "requires": {
+                "minimalistic-assert": "^1.0.0"
+            }
+        },
+        "webpack": {
+            "version": "5.89.0",
+            "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.89.0.tgz",
+            "integrity": "sha512-qyfIC10pOr70V+jkmud8tMfajraGCZMBWJtrmuBymQKCrLTRejBI8STDp1MCyZu/QTdZSeacCQYpYNQVOzX5kw==",
+            "dev": true,
+            "requires": {
+                "@types/eslint-scope": "^3.7.3",
+                "@types/estree": "^1.0.0",
+                "@webassemblyjs/ast": "^1.11.5",
+                "@webassemblyjs/wasm-edit": "^1.11.5",
+                "@webassemblyjs/wasm-parser": "^1.11.5",
+                "acorn": "^8.7.1",
+                "acorn-import-assertions": "^1.9.0",
+                "browserslist": "^4.14.5",
+                "chrome-trace-event": "^1.0.2",
+                "enhanced-resolve": "^5.15.0",
+                "es-module-lexer": "^1.2.1",
+                "eslint-scope": "5.1.1",
+                "events": "^3.2.0",
+                "glob-to-regexp": "^0.4.1",
+                "graceful-fs": "^4.2.9",
+                "json-parse-even-better-errors": "^2.3.1",
+                "loader-runner": "^4.2.0",
+                "mime-types": "^2.1.27",
+                "neo-async": "^2.6.2",
+                "schema-utils": "^3.2.0",
+                "tapable": "^2.1.1",
+                "terser-webpack-plugin": "^5.3.7",
+                "watchpack": "^2.4.0",
+                "webpack-sources": "^3.2.3"
+            },
+            "dependencies": {
+                "schema-utils": {
+                    "version": "3.3.0",
+                    "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.3.0.tgz",
+                    "integrity": "sha512-pN/yOAvcC+5rQ5nERGuwrjLlYvLTbCibnZ1I7B1LaiAz9BRBlE9GMgE/eqV30P7aJQUf7Ddimy/RsbYO/GrVGg==",
+                    "dev": true,
+                    "requires": {
+                        "@types/json-schema": "^7.0.8",
+                        "ajv": "^6.12.5",
+                        "ajv-keywords": "^3.5.2"
+                    }
+                },
+                "webpack-sources": {
+                    "version": "3.2.3",
+                    "resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-3.2.3.tgz",
+                    "integrity": "sha512-/DyMEOrDgLKKIG0fmvtz+4dUX/3Ghozwgm6iPp8KRhvn+eQf9+Q7GWxVNMk3+uCPWfdXYC4ExGBckIXdFEfH1w==",
+                    "dev": true
+                }
+            }
+        },
+        "webpack-cli": {
+            "version": "4.10.0",
+            "resolved": "https://registry.npmjs.org/webpack-cli/-/webpack-cli-4.10.0.tgz",
+            "integrity": "sha512-NLhDfH/h4O6UOy+0LSso42xvYypClINuMNBVVzX4vX98TmTaTUxwRbXdhucbFMd2qLaCTcLq/PdYrvi8onw90w==",
+            "dev": true,
+            "requires": {
+                "@discoveryjs/json-ext": "^0.5.0",
+                "@webpack-cli/configtest": "^1.2.0",
+                "@webpack-cli/info": "^1.5.0",
+                "@webpack-cli/serve": "^1.7.0",
+                "colorette": "^2.0.14",
+                "commander": "^7.0.0",
+                "cross-spawn": "^7.0.3",
+                "fastest-levenshtein": "^1.0.12",
+                "import-local": "^3.0.2",
+                "interpret": "^2.2.0",
+                "rechoir": "^0.7.0",
+                "webpack-merge": "^5.7.3"
+            }
+        },
+        "webpack-dev-middleware": {
+            "version": "5.3.3",
+            "resolved": "https://registry.npmjs.org/webpack-dev-middleware/-/webpack-dev-middleware-5.3.3.tgz",
+            "integrity": "sha512-hj5CYrY0bZLB+eTO+x/j67Pkrquiy7kWepMHmUMoPsmcUaeEnQJqFzHJOyxgWlq746/wUuA64p9ta34Kyb01pA==",
+            "dev": true,
+            "requires": {
+                "colorette": "^2.0.10",
+                "memfs": "^3.4.3",
+                "mime-types": "^2.1.31",
+                "range-parser": "^1.2.1",
+                "schema-utils": "^4.0.0"
+            },
+            "dependencies": {
+                "ajv": {
+                    "version": "8.12.0",
+                    "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.12.0.tgz",
+                    "integrity": "sha512-sRu1kpcO9yLtYxBKvqfTeh9KzZEwO3STyX1HT+4CaDzC6HpTGYhIhPIzj9XuKU7KYDwnaeh5hcOwjy1QuJzBPA==",
+                    "dev": true,
+                    "requires": {
+                        "fast-deep-equal": "^3.1.1",
+                        "json-schema-traverse": "^1.0.0",
+                        "require-from-string": "^2.0.2",
+                        "uri-js": "^4.2.2"
+                    }
+                },
+                "ajv-keywords": {
+                    "version": "5.1.0",
+                    "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-5.1.0.tgz",
+                    "integrity": "sha512-YCS/JNFAUyr5vAuhk1DWm1CBxRHW9LbJ2ozWeemrIqpbsqKjHVxYPyi5GC0rjZIT5JxJ3virVTS8wk4i/Z+krw==",
+                    "dev": true,
+                    "requires": {
+                        "fast-deep-equal": "^3.1.3"
+                    }
+                },
+                "json-schema-traverse": {
+                    "version": "1.0.0",
+                    "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz",
+                    "integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==",
+                    "dev": true
+                },
+                "schema-utils": {
+                    "version": "4.2.0",
+                    "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-4.2.0.tgz",
+                    "integrity": "sha512-L0jRsrPpjdckP3oPug3/VxNKt2trR8TcabrM6FOAAlvC/9Phcmm+cuAgTlxBqdBR1WJx7Naj9WHw+aOmheSVbw==",
+                    "dev": true,
+                    "requires": {
+                        "@types/json-schema": "^7.0.9",
+                        "ajv": "^8.9.0",
+                        "ajv-formats": "^2.1.1",
+                        "ajv-keywords": "^5.1.0"
+                    }
+                }
+            }
+        },
+        "webpack-dev-server": {
+            "version": "4.15.1",
+            "resolved": "https://registry.npmjs.org/webpack-dev-server/-/webpack-dev-server-4.15.1.tgz",
+            "integrity": "sha512-5hbAst3h3C3L8w6W4P96L5vaV0PxSmJhxZvWKYIdgxOQm8pNZ5dEOmmSLBVpP85ReeyRt6AS1QJNyo/oFFPeVA==",
+            "dev": true,
+            "requires": {
+                "@types/bonjour": "^3.5.9",
+                "@types/connect-history-api-fallback": "^1.3.5",
+                "@types/express": "^4.17.13",
+                "@types/serve-index": "^1.9.1",
+                "@types/serve-static": "^1.13.10",
+                "@types/sockjs": "^0.3.33",
+                "@types/ws": "^8.5.5",
+                "ansi-html-community": "^0.0.8",
+                "bonjour-service": "^1.0.11",
+                "chokidar": "^3.5.3",
+                "colorette": "^2.0.10",
+                "compression": "^1.7.4",
+                "connect-history-api-fallback": "^2.0.0",
+                "default-gateway": "^6.0.3",
+                "express": "^4.17.3",
+                "graceful-fs": "^4.2.6",
+                "html-entities": "^2.3.2",
+                "http-proxy-middleware": "^2.0.3",
+                "ipaddr.js": "^2.0.1",
+                "launch-editor": "^2.6.0",
+                "open": "^8.0.9",
+                "p-retry": "^4.5.0",
+                "rimraf": "^3.0.2",
+                "schema-utils": "^4.0.0",
+                "selfsigned": "^2.1.1",
+                "serve-index": "^1.9.1",
+                "sockjs": "^0.3.24",
+                "spdy": "^4.0.2",
+                "webpack-dev-middleware": "^5.3.1",
+                "ws": "^8.13.0"
+            },
+            "dependencies": {
+                "ajv": {
+                    "version": "8.12.0",
+                    "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.12.0.tgz",
+                    "integrity": "sha512-sRu1kpcO9yLtYxBKvqfTeh9KzZEwO3STyX1HT+4CaDzC6HpTGYhIhPIzj9XuKU7KYDwnaeh5hcOwjy1QuJzBPA==",
+                    "dev": true,
+                    "requires": {
+                        "fast-deep-equal": "^3.1.1",
+                        "json-schema-traverse": "^1.0.0",
+                        "require-from-string": "^2.0.2",
+                        "uri-js": "^4.2.2"
+                    }
+                },
+                "ajv-keywords": {
+                    "version": "5.1.0",
+                    "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-5.1.0.tgz",
+                    "integrity": "sha512-YCS/JNFAUyr5vAuhk1DWm1CBxRHW9LbJ2ozWeemrIqpbsqKjHVxYPyi5GC0rjZIT5JxJ3virVTS8wk4i/Z+krw==",
+                    "dev": true,
+                    "requires": {
+                        "fast-deep-equal": "^3.1.3"
+                    }
+                },
+                "json-schema-traverse": {
+                    "version": "1.0.0",
+                    "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz",
+                    "integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==",
+                    "dev": true
+                },
+                "schema-utils": {
+                    "version": "4.2.0",
+                    "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-4.2.0.tgz",
+                    "integrity": "sha512-L0jRsrPpjdckP3oPug3/VxNKt2trR8TcabrM6FOAAlvC/9Phcmm+cuAgTlxBqdBR1WJx7Naj9WHw+aOmheSVbw==",
+                    "dev": true,
+                    "requires": {
+                        "@types/json-schema": "^7.0.9",
+                        "ajv": "^8.9.0",
+                        "ajv-formats": "^2.1.1",
+                        "ajv-keywords": "^5.1.0"
+                    }
+                }
+            }
+        },
+        "webpack-merge": {
+            "version": "5.10.0",
+            "resolved": "https://registry.npmjs.org/webpack-merge/-/webpack-merge-5.10.0.tgz",
+            "integrity": "sha512-+4zXKdx7UnO+1jaN4l2lHVD+mFvnlZQP/6ljaJVb4SZiwIKeUnrT5l0gkT8z+n4hKpC+jpOv6O9R+gLtag7pSA==",
+            "dev": true,
+            "requires": {
+                "clone-deep": "^4.0.1",
+                "flat": "^5.0.2",
+                "wildcard": "^2.0.0"
+            }
+        },
+        "webpack-notifier": {
+            "version": "1.15.0",
+            "resolved": "https://registry.npmjs.org/webpack-notifier/-/webpack-notifier-1.15.0.tgz",
+            "integrity": "sha512-N2V8UMgRB5komdXQRavBsRpw0hPhJq2/SWNOGuhrXpIgRhcMexzkGQysUyGStHLV5hkUlgpRiF7IUXoBqyMmzQ==",
+            "dev": true,
+            "requires": {
+                "node-notifier": "^9.0.0",
+                "strip-ansi": "^6.0.0"
+            }
+        },
+        "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"
+            }
+        },
+        "webpackbar": {
+            "version": "5.0.2",
+            "resolved": "https://registry.npmjs.org/webpackbar/-/webpackbar-5.0.2.tgz",
+            "integrity": "sha512-BmFJo7veBDgQzfWXl/wwYXr/VFus0614qZ8i9znqcl9fnEdiVkdbi0TedLQ6xAK92HZHDJ0QmyQ0fmuZPAgCYQ==",
+            "dev": true,
+            "requires": {
+                "chalk": "^4.1.0",
+                "consola": "^2.15.3",
+                "pretty-time": "^1.1.0",
+                "std-env": "^3.0.1"
+            }
+        },
+        "websocket-driver": {
+            "version": "0.7.4",
+            "resolved": "https://registry.npmjs.org/websocket-driver/-/websocket-driver-0.7.4.tgz",
+            "integrity": "sha512-b17KeDIQVjvb0ssuSDF2cYXSg2iztliJ4B9WdsuB6J952qCPKmnVq4DyW5motImXHDC1cBT/1UezrJVsKw5zjg==",
+            "dev": true,
+            "requires": {
+                "http-parser-js": ">=0.5.1",
+                "safe-buffer": ">=5.1.0",
+                "websocket-extensions": ">=0.1.1"
+            }
+        },
+        "websocket-extensions": {
+            "version": "0.1.4",
+            "resolved": "https://registry.npmjs.org/websocket-extensions/-/websocket-extensions-0.1.4.tgz",
+            "integrity": "sha512-OqedPIGOfsDlo31UNwYbCFMSaO9m9G/0faIHj5/dZFDMFqPTcx6UwqyOy3COEaEOg/9VsGIpdqn62W5KhoKSpg==",
+            "dev": true
+        },
+        "which": {
+            "version": "2.0.2",
+            "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
+            "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==",
+            "dev": true,
+            "requires": {
+                "isexe": "^2.0.0"
+            }
+        },
+        "wildcard": {
+            "version": "2.0.1",
+            "resolved": "https://registry.npmjs.org/wildcard/-/wildcard-2.0.1.tgz",
+            "integrity": "sha512-CC1bOL87PIWSBhDcTrdeLo6eGT7mCFtrg0uIJtqJUFyK+eJnzl8A1niH56uu7KMa5XFrtiV+AQuHO3n7DsHnLQ==",
+            "dev": true
+        },
+        "wrap-ansi": {
+            "version": "7.0.0",
+            "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz",
+            "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==",
+            "dev": true,
+            "requires": {
+                "ansi-styles": "^4.0.0",
+                "string-width": "^4.1.0",
+                "strip-ansi": "^6.0.0"
+            }
+        },
+        "wrappy": {
+            "version": "1.0.2",
+            "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
+            "integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==",
+            "dev": true
+        },
+        "ws": {
+            "version": "8.14.2",
+            "resolved": "https://registry.npmjs.org/ws/-/ws-8.14.2.tgz",
+            "integrity": "sha512-wEBG1ftX4jcglPxgFCMJmZ2PLtSbJ2Peg6TmpJFTbe9GZYOQCDPdMYu/Tm0/bGZkw8paZnJY45J4K2PZrLYq8g==",
+            "dev": true,
+            "requires": {}
+        },
+        "xregexp": {
+            "version": "5.1.1",
+            "resolved": "https://registry.npmjs.org/xregexp/-/xregexp-5.1.1.tgz",
+            "integrity": "sha512-fKXeVorD+CzWvFs7VBuKTYIW63YD1e1osxwQ8caZ6o1jg6pDAbABDG54LCIq0j5cy7PjRvGIq6sef9DYPXpncg==",
+            "dev": true,
+            "requires": {
+                "@babel/runtime-corejs3": "^7.16.5"
+            }
+        },
+        "xtend": {
+            "version": "4.0.2",
+            "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.2.tgz",
+            "integrity": "sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ==",
+            "dev": true
+        },
+        "y18n": {
+            "version": "5.0.8",
+            "resolved": "https://registry.npmjs.org/y18n/-/y18n-5.0.8.tgz",
+            "integrity": "sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==",
+            "dev": true
+        },
+        "yallist": {
+            "version": "4.0.0",
+            "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
+            "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
+            "dev": true
+        },
+        "yaml": {
+            "version": "2.3.1",
+            "resolved": "https://registry.npmjs.org/yaml/-/yaml-2.3.1.tgz",
+            "integrity": "sha512-2eHWfjaoXgTBC2jNM1LRef62VQa0umtvRiDSk6HSzW7RvS5YtkabJrwYLLEKWBc8a5U2PTSCs+dJjUTJdlHsWQ==",
+            "dev": true
+        },
+        "yargs": {
+            "version": "17.5.1",
+            "resolved": "https://registry.npmjs.org/yargs/-/yargs-17.5.1.tgz",
+            "integrity": "sha512-t6YAJcxDkNX7NFYiVtKvWUz8l+PaKTLiL63mJYWR2GnHq2gjEWISzsLp9wg3aY36dY1j+gfIEL3pIF+XlJJfbA==",
+            "dev": true,
+            "requires": {
+                "cliui": "^7.0.2",
+                "escalade": "^3.1.1",
+                "get-caller-file": "^2.0.5",
+                "require-directory": "^2.1.1",
+                "string-width": "^4.2.3",
+                "y18n": "^5.0.5",
+                "yargs-parser": "^21.0.0"
+            }
+        },
+        "yargs-parser": {
+            "version": "21.0.1",
+            "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-21.0.1.tgz",
+            "integrity": "sha512-9BK1jFpLzJROCI5TzwZL/TU4gqjK5xiHV/RfWLOahrjAko/e4DJkRDZQXfvqAsiZzzYhgAzbgz6lg48jcm4GLg==",
+            "dev": true
+        }
+    }
+}
diff --git a/package.json b/package.json
index edece6ebb7..7ef022e02f 100644
--- a/package.json
+++ b/package.json
@@ -2,24 +2,26 @@
     "private": true,
     "scripts": {
         "dev": "npm run development",
-        "development": "cross-env NODE_ENV=development node_modules/webpack/bin/webpack.js --progress --hide-modules --config=node_modules/laravel-mix/setup/webpack.config.js",
-        "watch": "npm run development -- --watch",
-        "watch-poll": "npm run watch -- --watch-poll",
-        "hot": "cross-env NODE_ENV=development node_modules/webpack-dev-server/bin/webpack-dev-server.js --inline --hot --config=node_modules/laravel-mix/setup/webpack.config.js",
+        "development": "mix",
+        "watch": "mix watch",
+        "watch-poll": "mix watch -- --watch-options-poll=1000",
+        "hot": "mix watch --hot",
         "prod": "npm run production",
-        "production": "cross-env NODE_ENV=production node_modules/webpack/bin/webpack.js --no-progress --hide-modules --config=node_modules/laravel-mix/setup/webpack.config.js"
+        "production": "mix --production",
+        "format": "./node_modules/.bin/blade-formatter --progress --write '**/*.blade.php'"
     },
     "devDependencies": {
-        "axios": "^0.21.2",
-        "bootstrap": "^4.0.0",
-        "cross-env": "^5.1",
-        "jquery": "^3.5",
-        "laravel-mix": "^4.0.7",
-        "lodash": "^4.17.19",
-        "popper.js": "^1.12",
-        "resolve-url-loader": "^2.3.1",
-        "sass": "^1.15.2",
-        "sass-loader": "^7.1.0",
-        "vue": "^2.5.17"
+        "axios": "^1.6.2",
+        "blade-formatter": "^1.38.6",
+        "bootstrap": "^4.6",
+        "cross-env": "^7.0",
+        "jquery": "^3.7",
+        "laravel-mix": "^6.0.49",
+        "lodash": "^4.17.21",
+        "popper.js": "^1.16",
+        "resolve-url-loader": "^5.0.0",
+        "sass": "^1.69.5",
+        "sass-loader": "^13.3.2",
+        "vue": "^3.3.13"
     }
 }
diff --git a/pint.json b/pint.json
new file mode 100644
index 0000000000..bec0140c73
--- /dev/null
+++ b/pint.json
@@ -0,0 +1,188 @@
+{
+    "rules": {
+        "@PHP80Migration": true,
+        "align_multiline_comment": true,
+        "array_syntax": {
+            "syntax": "short"
+        },
+        "binary_operator_spaces": {
+            "default": "single_space",
+            "operators": {
+                "=>": "align"
+            }
+        },
+        "blank_line_after_namespace": true,
+        "blank_line_after_opening_tag": true,
+        "blank_line_before_statement": {
+            "statements": [
+                "return"
+            ]
+        },
+        "braces": true,
+        "cast_spaces": true,
+        "class_attributes_separation": {
+            "elements": {
+                "method": "one"
+            }
+        },
+        "class_definition": true,
+        "class_reference_name_casing": true,
+        "concat_space": {
+            "spacing": "none"
+        },
+        "curly_braces_position": {
+            "classes_opening_brace": "same_line",
+            "functions_opening_brace": "same_line"
+        },
+        "declare_equal_normalize": true,
+        "elseif": true,
+        "encoding": true,
+        "explicit_string_variable": true,
+        "full_opening_tag": true,
+        "fully_qualified_strict_types": true,
+        "function_declaration": true,
+        "function_typehint_space": true,
+        "heredoc_to_nowdoc": true,
+        "include": true,
+        "increment_style": {
+            "style": "post"
+        },
+        "indentation_type": true,
+        "linebreak_after_opening_tag": true,
+        "line_ending": true,
+        "lowercase_cast": true,
+        "constant_case": true,
+        "lowercase_keywords": true,
+        "lowercase_static_reference": true,
+        "magic_method_casing": true,
+        "magic_constant_casing": true,
+        "method_argument_space": true,
+        "native_function_casing": true,
+        "no_alias_functions": true,
+        "no_extra_blank_lines": {
+            "tokens": ["extra", "throw", "use"]
+        },
+        "no_blank_lines_after_class_opening": true,
+        "no_blank_lines_after_phpdoc": true,
+        "no_closing_tag": true,
+        "no_empty_phpdoc": true,
+        "no_empty_statement": true,
+        "no_leading_import_slash": true,
+        "no_leading_namespace_whitespace": true,
+        "no_mixed_echo_print": {
+            "use": "echo"
+        },
+        "no_multiline_whitespace_around_double_arrow": true,
+        "multiline_whitespace_before_semicolons": {
+            "strategy": "no_multi_line"
+        },
+        "no_short_bool_cast": true,
+        "no_singleline_whitespace_before_semicolons": true,
+        "no_spaces_after_function_name": true,
+        "no_spaces_around_offset": true,
+        "no_spaces_inside_parenthesis": true,
+        "no_trailing_comma_in_list_call": true,
+        "no_trailing_comma_in_singleline_array": true,
+        "no_trailing_whitespace": true,
+        "no_trailing_whitespace_in_comment": true,
+        "no_unneeded_control_parentheses": true,
+        "no_unreachable_default_argument_value": true,
+        "no_useless_return": true,
+        "no_whitespace_before_comma_in_array": true,
+        "no_whitespace_in_blank_line": true,
+        "normalize_index_brace": true,
+        "not_operator_with_successor_space": false,
+        "object_operator_without_whitespace": true,
+        "ordered_imports": {
+            "imports_order": [
+                "class",
+                "function",
+                "const"
+            ]
+        },
+        "ordered_class_elements": {
+            "order": [
+                "use_trait",
+                "property_protected",
+                "property_private",
+                "property_public",
+                "construct",
+                "destruct",
+                "magic",
+                "phpunit",
+                "method_public",
+                "method_protected",
+                "method_private",
+                "constant_public",
+                "constant_protected",
+                "constant_private"
+            ]
+        },
+        "ordered_traits": true,
+        "no_superfluous_phpdoc_tags": {
+            "allow_mixed": true
+        },
+        "phpdoc_add_missing_param_annotation": true,
+        "phpdoc_align": true,
+        "phpdoc_annotation_without_dot": true,
+        "phpdoc_indent": true,
+        "general_phpdoc_tag_rename": true,
+        "phpdoc_order_by_value": true,
+        "phpdoc_order": true,
+        "phpdoc_inline_tag_normalizer": true,
+        "phpdoc_tag_type": true,
+        "phpdoc_no_access": true,
+        "phpdoc_no_empty_return": true,
+        "phpdoc_no_package": true,
+        "phpdoc_no_useless_inheritdoc": true,
+        "phpdoc_scalar": true,
+        "phpdoc_separation": true,
+        "phpdoc_single_line_var_spacing": true,
+        "phpdoc_summary": true,
+        "phpdoc_tag_casing": true,
+        "phpdoc_to_comment": true,
+        "phpdoc_trim": true,
+        "phpdoc_trim_consecutive_blank_line_separation": true,
+        "phpdoc_types": true,
+        "phpdoc_types_order": {
+            "null_adjustment": "always_last"
+        },
+        "phpdoc_var_annotation_correct_order": true,
+        "phpdoc_var_without_name": true,
+        "psr_autoloading": true,
+        "self_accessor": true,
+        "short_scalar_cast": true,
+        "simplified_null_return": false,
+        "single_blank_line_at_eof": true,
+        "single_class_element_per_statement": {
+            "elements": ["property"]
+        },
+        "single_import_per_statement": true,
+        "single_line_after_imports": true,
+        "single_line_comment_style": {
+            "comment_types": ["hash"]
+        },
+        "single_quote": true,
+        "space_after_semicolon": true,
+        "single_space_after_construct": true,
+        "single_trait_insert_per_statement": false,
+        "standardize_not_equals": true,
+        "switch_case_semicolon_to_colon": true,
+        "switch_case_space": true,
+        "ternary_operator_spaces": true,
+        "trailing_comma_in_multiline": true,
+        "trim_array_spaces": true,
+        "unary_operator_spaces": true,
+        "visibility_required": {
+            "elements": [
+                "method",
+                "property"
+            ]
+        },
+        "whitespace_after_comma_in_array": true,
+        "no_unused_imports": true,
+        "php_unit_method_casing": {
+            "case": "camel_case"
+        }
+    }
+}
diff --git a/public/css/lorekeeper.css b/public/css/lorekeeper.css
index dedaad0af2..69da64e317 100644
--- a/public/css/lorekeeper.css
+++ b/public/css/lorekeeper.css
@@ -1,6 +1,6 @@
 /**************************************************************************************************
-    
-    Font definitions 
+
+    Font definitions
 
 **************************************************************************************************/
 
@@ -14,15 +14,15 @@
 }
 
 /**************************************************************************************************
-    
+
     Base styles
-    
+
 **************************************************************************************************/
 
 h1, h2, h3, h4, h5,
 .h1, .h2, .h3, .h4, .h5 {
     text-transform: uppercase;
-    font-family: Roboto Condensed, serif; 
+    font-family: Roboto Condensed, serif;
     font-weight: bold;
 }
 
@@ -46,30 +46,32 @@ a:hover {
 
 body {
     background-color: transparent;
-    font-family: Lato, sans-serif; 
+    font-family: Lato, sans-serif;
     min-height: 100vh;
     font-size: 80%;
 }
 
 /**************************************************************************************************
-    
+
     Helpers
-    
+
 **************************************************************************************************/
 
 .hide {
     display: none !important;
 }
 
+.grecaptcha-badge { visibility: hidden !important; }
+
 .parsed-text img {
     max-width: 100% !important;
     height: auto !important;
 }
 
 /**************************************************************************************************
-    
+
     Layout
-    
+
 **************************************************************************************************/
 
 #app {
@@ -82,6 +84,8 @@ body {
 main {
     flex-grow: 1;
     display: flex;
+    flex-direction: column;
+    word-wrap: break-word;
 }
 
 main > .row {
@@ -105,7 +109,7 @@ main > .row {
 
 .navbar .navbar-brand, .navbar .nav-item {
     text-transform: uppercase;
-    font-family: Roboto Condensed, serif; 
+    font-family: Roboto Condensed, serif;
 }
 
 .navbar .row { width: 100%; }
@@ -129,14 +133,14 @@ main > .row {
     border-bottom-left-radius: .25rem;
     margin-bottom: 1em;
     padding: 0.4em 0;
-    
+
     box-shadow: 0px 0px 6px 3px rgba(0,0,0,0.1);
 }
 
 .sidebar .sidebar-header,
 .sidebar .sidebar-section .sidebar-section-header {
     text-transform: uppercase;
-    font-family: Roboto Condensed, serif; 
+    font-family: Roboto Condensed, serif;
     font-weight: bold;
 }
 
@@ -186,7 +190,7 @@ main > .row {
 	.site-mobile-header {
 		top: 54px !important;
     }
-    
+
     .timestamp {
 		margin-left: 1rem!important;
 		margin-right: 1rem!important;
@@ -200,7 +204,7 @@ main > .row {
     .site-mobile-header {
         display: block;
         position: fixed;
-		top: 68px;
+		top: 3.45rem;
         z-index: 4;
         width: 100%;
     }
@@ -212,7 +216,7 @@ main > .row {
     }
 
     main.container-fluid {
-        margin-top: 122px;
+        margin-top: 6.45rem;
     }
 
     main.container-fluid > .row {
@@ -234,7 +238,7 @@ main > .row {
     }
     .sidebar.active {
         left: 0%;
-    } 
+    }
 
     .sidebar > ul {
         padding-top: 0px;
@@ -252,19 +256,19 @@ main > .row {
         border-radius: 0;
         margin-bottom: 1em;
         padding: 0.4em 0;
-        
+
         box-shadow: none;
     }
-	
+
 	/*fix for screen being over-wide on mobile*/
 	.row {
 		margin:0; max-width:100%;
 	}
-    
+
 	.container-fluid {
 		padding:0px;
 	}
-    
+
 	.site-footer .navbar .navbar-nav {
 		flex-wrap: wrap; justify-content: center;
 	}
@@ -296,10 +300,14 @@ main > .row {
     padding: 20px;
 }
 
+.ui-datepicker-inline {
+    position: fixed;
+}
+
 /**************************************************************************************************
-    
+
     Content
-    
+
 **************************************************************************************************/
 .modal-header {
     border-bottom: 0px;
@@ -309,7 +317,7 @@ main > .row {
 }
 
 .tooltip-inner {
-    max-width: 350px !important; 
+    max-width: 350px !important;
 }
 
 .nav-tabs .nav-link.active {
@@ -374,6 +382,18 @@ main > .row {
     flex-wrap: wrap;
 }
 
+/* Chrome, Safari, Edge, Opera */
+.pagination-popover input::-webkit-outer-spin-button,
+.pagination-popover input::-webkit-inner-spin-button {
+  -webkit-appearance: none;
+  margin: 0;
+}
+
+/* Firefox */
+.pagination-popover input[type=number] {
+  -moz-appearance: textfield;
+}
+
 .spoiler {
     border: 1px solid rgba(0,0,0,0.1);
     border-radius: 5px;
@@ -416,6 +436,11 @@ main > .row {
     text-align: center;
 }
 
+.world-entry img {
+    max-width: 100%;
+    height: auto;
+}
+
 .world-entry-image img {
     max-width: 100%;
 }
@@ -459,6 +484,37 @@ tr.outflow {
     background-color: #fffafa;
 }
 
+/* These are not truly tables, but divs styled to look like tables */
+.logs-table .logs-table-header {
+    border-top: 1px solid #dee2e6;
+    border-bottom: 2px solid #dee2e6;
+    font-weight: bold;
+    padding: 0px;
+    flex-wrap: wrap;
+}
+.logs-table .logs-table-header .logs-table-cell,
+.logs-table .logs-table-body .logs-table-cell {
+    padding: .3rem;
+}
+.logs-table .logs-table-body > .logs-table-row:first-of-type {
+    border-top-width: 0;
+}
+.logs-table .logs-table-body > .logs-table-row,
+.logs-table-row .logs-table-row {
+    border-top: 1px solid #dee2e6;
+}
+.logs-table .logs-table-body .logs-table-cell .inflow,
+.logs-table .logs-table-body .logs-table-cell .outflow {
+    width: 33px;
+    line-height: 33px;
+    text-align: center;
+    position: relative;
+    top: -.3rem;
+    margin-bottom: -.6rem;
+    vertical-align: middle;
+    color: #fff;
+}
+
 
 /* PROFILE ***************************************************************************************/
 
@@ -506,6 +562,65 @@ tr.accountbound {
     border: 5px solid #ddd;
 }
 
+@keyframes copy-to-check {
+    from {
+        opacity: 1;
+        content: '\f0c5';
+        font-weight: 400;
+    }
+    50% {
+        opacity: 0;
+        content: '\f0c5';
+        font-weight: 400;
+    }
+    51% {
+        opacity: 0;
+        content: '\f00c';
+        font-weight: 900;
+    }
+    to {
+        opacity: 1;
+        content: '\f00c';
+        font-weight: 900;
+    }
+}
+
+@keyframes check-to-copy {
+    from {
+        opacity: 1;
+        content: '\f00c';
+        font-weight: 900;
+    }
+    50% {
+        opacity: 0;
+        content: '\f00c';
+        font-weight: 900;
+    }
+    51% {
+        opacity: 0;
+        content: '\f0c5';
+        font-weight: 400;
+    }
+    to {
+        opacity: 1;
+        content: '\f0c5';
+        font-weight: 400;
+    }
+}
+
+.toCheck::before {
+    animation-name: copy-to-check;
+    animation-iteration-count: 1;
+    animation-duration: 1s;
+    animation-fill-mode: forwards;
+}
+
+.toCopy::before {
+    animation-name: check-to-copy;
+    animation-iteration-count: 1;
+    animation-duration: 1s;
+}
+
 /* TRANSFERS *************************************************************************************/
 
 .transfer-row, .submission-character-row {
@@ -629,7 +744,12 @@ tr.accountbound {
         padding-left: 3rem;
         border-left-width: 2px!important;
     }
-    
+
+.comment>p>img {
+        max-width: 100%;
+        height: auto;
+    }
+
 @media only screen and (max-width: 600px) {
     .comment_replies { padding-left:1rem;}
 }
diff --git a/public/index.php b/public/index.php
index 4584cbcd6a..2b5641b4c1 100644
--- a/public/index.php
+++ b/public/index.php
@@ -1,12 +1,10 @@
 <?php
 
 /**
- * Laravel - A PHP Framework For Web Artisans
+ * Laravel - A PHP Framework For Web Artisans.
  *
- * @package  Laravel
  * @author   Taylor Otwell <taylor@laravel.com>
  */
-
 define('LARAVEL_START', microtime(true));
 
 /*
diff --git a/resources/lang/en/auth.php b/resources/lang/en/auth.php
index e5506df290..6ef1a73308 100644
--- a/resources/lang/en/auth.php
+++ b/resources/lang/en/auth.php
@@ -13,7 +13,7 @@
     |
     */
 
-    'failed' => 'These credentials do not match our records.',
+    'failed'   => 'These credentials do not match our records.',
     'throttle' => 'Too many login attempts. Please try again in :seconds seconds.',
 
 ];
diff --git a/resources/lang/en/pagination.php b/resources/lang/en/pagination.php
index d481411877..fcab34b253 100644
--- a/resources/lang/en/pagination.php
+++ b/resources/lang/en/pagination.php
@@ -14,6 +14,6 @@
     */
 
     'previous' => '&laquo; Previous',
-    'next' => 'Next &raquo;',
+    'next'     => 'Next &raquo;',
 
 ];
diff --git a/resources/lang/en/passwords.php b/resources/lang/en/passwords.php
index bf6caf6edc..d40b620369 100644
--- a/resources/lang/en/passwords.php
+++ b/resources/lang/en/passwords.php
@@ -14,9 +14,9 @@
     */
 
     'password' => 'Passwords must be at least eight characters and match the confirmation.',
-    'reset' => 'Your password has been reset!',
-    'sent' => 'We have e-mailed your password reset link!',
-    'token' => 'This password reset token is invalid.',
-    'user' => "We can't find a user with that e-mail address.",
+    'reset'    => 'Your password has been reset!',
+    'sent'     => 'We have e-mailed your password reset link!',
+    'token'    => 'This password reset token is invalid.',
+    'user'     => "We can't find a user with that e-mail address.",
 
 ];
diff --git a/resources/lang/en/validation.php b/resources/lang/en/validation.php
index b7311a9b3f..2d498afbc0 100644
--- a/resources/lang/en/validation.php
+++ b/resources/lang/en/validation.php
@@ -13,108 +13,108 @@
     |
     */
 
-    'accepted' => 'The :attribute must be accepted.',
-    'active_url' => 'The :attribute is not a valid URL.',
-    'after' => 'The :attribute must be a date after :date.',
-    'after_or_equal' => 'The :attribute must be a date after or equal to :date.',
-    'alpha' => 'The :attribute may only contain letters.',
-    'alpha_dash' => 'The :attribute may only contain letters, numbers, dashes and underscores.',
-    'alpha_num' => 'The :attribute may only contain letters and numbers.',
-    'array' => 'The :attribute must be an array.',
-    'before' => 'The :attribute must be a date before :date.',
-    'before_or_equal' => 'The :attribute must be a date before or equal to :date.',
-    'between' => [
+    'accepted'             => 'The :attribute must be accepted.',
+    'active_url'           => 'The :attribute is not a valid URL.',
+    'after'                => 'The :attribute must be a date after :date.',
+    'after_or_equal'       => 'The :attribute must be a date after or equal to :date.',
+    'alpha'                => 'The :attribute may only contain letters.',
+    'alpha_dash'           => 'The :attribute may only contain letters, numbers, dashes and underscores.',
+    'alpha_num'            => 'The :attribute may only contain letters and numbers.',
+    'array'                => 'The :attribute must be an array.',
+    'before'               => 'The :attribute must be a date before :date.',
+    'before_or_equal'      => 'The :attribute must be a date before or equal to :date.',
+    'between'              => [
         'numeric' => 'The :attribute must be between :min and :max.',
-        'file' => 'The :attribute must be between :min and :max kilobytes.',
-        'string' => 'The :attribute must be between :min and :max characters.',
-        'array' => 'The :attribute must have between :min and :max items.',
+        'file'    => 'The :attribute must be between :min and :max kilobytes.',
+        'string'  => 'The :attribute must be between :min and :max characters.',
+        'array'   => 'The :attribute must have between :min and :max items.',
     ],
-    'boolean' => 'The :attribute field must be true or false.',
-    'confirmed' => 'The :attribute confirmation does not match.',
-    'date' => 'The :attribute is not a valid date.',
-    'date_equals' => 'The :attribute must be a date equal to :date.',
-    'date_format' => 'The :attribute does not match the format :format.',
-    'different' => 'The :attribute and :other must be different.',
-    'digits' => 'The :attribute must be :digits digits.',
-    'digits_between' => 'The :attribute must be between :min and :max digits.',
-    'dimensions' => 'The :attribute has invalid image dimensions.',
-    'distinct' => 'The :attribute field has a duplicate value.',
-    'email' => 'The :attribute must be a valid email address.',
-    'exists' => 'The selected :attribute is invalid.',
-    'file' => 'The :attribute must be a file.',
-    'filled' => 'The :attribute field must have a value.',
-    'gt' => [
+    'boolean'              => 'The :attribute field must be true or false.',
+    'confirmed'            => 'The :attribute confirmation does not match.',
+    'date'                 => 'The :attribute is not a valid date.',
+    'date_equals'          => 'The :attribute must be a date equal to :date.',
+    'date_format'          => 'The :attribute does not match the format :format.',
+    'different'            => 'The :attribute and :other must be different.',
+    'digits'               => 'The :attribute must be :digits digits.',
+    'digits_between'       => 'The :attribute must be between :min and :max digits.',
+    'dimensions'           => 'The :attribute has invalid image dimensions.',
+    'distinct'             => 'The :attribute field has a duplicate value.',
+    'email'                => 'The :attribute must be a valid email address.',
+    'exists'               => 'The selected :attribute is invalid.',
+    'file'                 => 'The :attribute must be a file.',
+    'filled'               => 'The :attribute field must have a value.',
+    'gt'                   => [
         'numeric' => 'The :attribute must be greater than :value.',
-        'file' => 'The :attribute must be greater than :value kilobytes.',
-        'string' => 'The :attribute must be greater than :value characters.',
-        'array' => 'The :attribute must have more than :value items.',
+        'file'    => 'The :attribute must be greater than :value kilobytes.',
+        'string'  => 'The :attribute must be greater than :value characters.',
+        'array'   => 'The :attribute must have more than :value items.',
     ],
-    'gte' => [
+    'gte'                  => [
         'numeric' => 'The :attribute must be greater than or equal :value.',
-        'file' => 'The :attribute must be greater than or equal :value kilobytes.',
-        'string' => 'The :attribute must be greater than or equal :value characters.',
-        'array' => 'The :attribute must have :value items or more.',
+        'file'    => 'The :attribute must be greater than or equal :value kilobytes.',
+        'string'  => 'The :attribute must be greater than or equal :value characters.',
+        'array'   => 'The :attribute must have :value items or more.',
     ],
-    'image' => 'The :attribute must be an image.',
-    'in' => 'The selected :attribute is invalid.',
-    'in_array' => 'The :attribute field does not exist in :other.',
-    'integer' => 'The :attribute must be an integer.',
-    'ip' => 'The :attribute must be a valid IP address.',
-    'ipv4' => 'The :attribute must be a valid IPv4 address.',
-    'ipv6' => 'The :attribute must be a valid IPv6 address.',
-    'json' => 'The :attribute must be a valid JSON string.',
-    'lt' => [
+    'image'                => 'The :attribute must be an image.',
+    'in'                   => 'The selected :attribute is invalid.',
+    'in_array'             => 'The :attribute field does not exist in :other.',
+    'integer'              => 'The :attribute must be an integer.',
+    'ip'                   => 'The :attribute must be a valid IP address.',
+    'ipv4'                 => 'The :attribute must be a valid IPv4 address.',
+    'ipv6'                 => 'The :attribute must be a valid IPv6 address.',
+    'json'                 => 'The :attribute must be a valid JSON string.',
+    'lt'                   => [
         'numeric' => 'The :attribute must be less than :value.',
-        'file' => 'The :attribute must be less than :value kilobytes.',
-        'string' => 'The :attribute must be less than :value characters.',
-        'array' => 'The :attribute must have less than :value items.',
+        'file'    => 'The :attribute must be less than :value kilobytes.',
+        'string'  => 'The :attribute must be less than :value characters.',
+        'array'   => 'The :attribute must have less than :value items.',
     ],
-    'lte' => [
+    'lte'                  => [
         'numeric' => 'The :attribute must be less than or equal :value.',
-        'file' => 'The :attribute must be less than or equal :value kilobytes.',
-        'string' => 'The :attribute must be less than or equal :value characters.',
-        'array' => 'The :attribute must not have more than :value items.',
+        'file'    => 'The :attribute must be less than or equal :value kilobytes.',
+        'string'  => 'The :attribute must be less than or equal :value characters.',
+        'array'   => 'The :attribute must not have more than :value items.',
     ],
-    'max' => [
+    'max'                  => [
         'numeric' => 'The :attribute may not be greater than :max.',
-        'file' => 'The :attribute may not be greater than :max kilobytes.',
-        'string' => 'The :attribute may not be greater than :max characters.',
-        'array' => 'The :attribute may not have more than :max items.',
+        'file'    => 'The :attribute may not be greater than :max kilobytes.',
+        'string'  => 'The :attribute may not be greater than :max characters.',
+        'array'   => 'The :attribute may not have more than :max items.',
     ],
-    'mimes' => 'The :attribute must be a file of type: :values.',
-    'mimetypes' => 'The :attribute must be a file of type: :values.',
-    'min' => [
+    'mimes'                => 'The :attribute must be a file of type: :values.',
+    'mimetypes'            => 'The :attribute must be a file of type: :values.',
+    'min'                  => [
         'numeric' => 'The :attribute must be at least :min.',
-        'file' => 'The :attribute must be at least :min kilobytes.',
-        'string' => 'The :attribute must be at least :min characters.',
-        'array' => 'The :attribute must have at least :min items.',
+        'file'    => 'The :attribute must be at least :min kilobytes.',
+        'string'  => 'The :attribute must be at least :min characters.',
+        'array'   => 'The :attribute must have at least :min items.',
     ],
-    'not_in' => 'The selected :attribute is invalid.',
-    'not_regex' => 'The :attribute format is invalid.',
-    'numeric' => 'The :attribute must be a number.',
-    'present' => 'The :attribute field must be present.',
-    'regex' => 'The :attribute format is invalid.',
-    'required' => 'The :attribute field is required.',
-    'required_if' => 'The :attribute field is required when :other is :value.',
-    'required_unless' => 'The :attribute field is required unless :other is in :values.',
-    'required_with' => 'The :attribute field is required when :values is present.',
-    'required_with_all' => 'The :attribute field is required when :values are present.',
-    'required_without' => 'The :attribute field is required when :values is not present.',
+    'not_in'               => 'The selected :attribute is invalid.',
+    'not_regex'            => 'The :attribute format is invalid.',
+    'numeric'              => 'The :attribute must be a number.',
+    'present'              => 'The :attribute field must be present.',
+    'regex'                => 'The :attribute format is invalid.',
+    'required'             => 'The :attribute field is required.',
+    'required_if'          => 'The :attribute field is required when :other is :value.',
+    'required_unless'      => 'The :attribute field is required unless :other is in :values.',
+    'required_with'        => 'The :attribute field is required when :values is present.',
+    'required_with_all'    => 'The :attribute field is required when :values are present.',
+    'required_without'     => 'The :attribute field is required when :values is not present.',
     'required_without_all' => 'The :attribute field is required when none of :values are present.',
-    'same' => 'The :attribute and :other must match.',
-    'size' => [
+    'same'                 => 'The :attribute and :other must match.',
+    'size'                 => [
         'numeric' => 'The :attribute must be :size.',
-        'file' => 'The :attribute must be :size kilobytes.',
-        'string' => 'The :attribute must be :size characters.',
-        'array' => 'The :attribute must contain :size items.',
+        'file'    => 'The :attribute must be :size kilobytes.',
+        'string'  => 'The :attribute must be :size characters.',
+        'array'   => 'The :attribute must contain :size items.',
     ],
-    'starts_with' => 'The :attribute must start with one of the following: :values',
-    'string' => 'The :attribute must be a string.',
-    'timezone' => 'The :attribute must be a valid zone.',
-    'unique' => 'The :attribute has already been taken.',
-    'uploaded' => 'The :attribute failed to upload.',
-    'url' => 'The :attribute format is invalid.',
-    'uuid' => 'The :attribute must be a valid UUID.',
+    'starts_with'          => 'The :attribute must start with one of the following: :values',
+    'string'               => 'The :attribute must be a string.',
+    'timezone'             => 'The :attribute must be a valid zone.',
+    'unique'               => 'The :attribute has already been taken.',
+    'uploaded'             => 'The :attribute failed to upload.',
+    'url'                  => 'The :attribute format is invalid.',
+    'uuid'                 => 'The :attribute must be a valid UUID.',
 
     /*
     |--------------------------------------------------------------------------
@@ -127,16 +127,19 @@
     |
     */
 
-    'custom' => [
-        'attribute-name' => [
+    'custom'               => [
+        'attribute-name'       => [
             'rule-name' => 'custom-message',
         ],
-        'designer_url.*' => [
+        'g-recaptcha-response' => [
+            'recaptchav3' => 'A captcha error has occurred. If you believe this is in error, please contact the site administrator.',
+        ],
+        'designer_url.*'       => [
             'url' => 'One or more of the designer URL(s) is invalid.',
         ],
-        'artist_url.*' => [
+        'artist_url.*'         => [
             'url' => 'One or more of the artist URL(s) is invalid.',
-        ]
+        ],
     ],
 
     /*
@@ -150,6 +153,6 @@
     |
     */
 
-    'attributes' => [],
+    'attributes'           => [],
 
 ];
diff --git a/resources/views/account/_deactivate_confirmation.blade.php b/resources/views/account/_deactivate_confirmation.blade.php
new file mode 100644
index 0000000000..1a033c35e5
--- /dev/null
+++ b/resources/views/account/_deactivate_confirmation.blade.php
@@ -0,0 +1,15 @@
+@if (!Auth::user()->is_deactivated)
+    <p>
+        Are you sure you want to deactivate your account? All trades and submissions will be canceled and you will not be able to access the website when logged in.
+    </p>
+    <div class="text-right"><a href="#" class="btn btn-danger deactivate-confirm-button">Deactivate</a></div>
+
+    <script>
+        $('.deactivate-confirm-button').on('click', function(e) {
+            e.preventDefault();
+            $('#deactivateForm').submit();
+        });
+    </script>
+@else
+    <p>Your account is already deactivated.</p>
+@endif
diff --git a/resources/views/account/_hide_alias_modal.blade.php b/resources/views/account/_hide_alias_modal.blade.php
index c5df38d1e5..400f26b111 100644
--- a/resources/views/account/_hide_alias_modal.blade.php
+++ b/resources/views/account/_hide_alias_modal.blade.php
@@ -1,15 +1,15 @@
-@if(!$alias)
+@if (!$alias)
     <p>Invalid alias selected.</p>
 @elseif($alias->is_primary)
     <p>As this is your primary alias, you cannot hide it.</p>
 @else
     <p>This will {{ !$alias->is_visible ? 'un' : '' }}hide the alias <strong>{!! $alias->displayAlias !!}</strong>. </p>
-    @if($alias->is_visible)
+    @if ($alias->is_visible)
         <p>Logged-out users and logged-in users will not be able to see that this alias is associated with your account. Note that staff may be able to view your aliases regardless.</p>
     @else
         <p>Logged-out users and logged-in users will be able to view a list of your aliases from your profile page.</p>
     @endif
     {!! Form::open(['url' => 'account/hide-alias/' . $alias->id, 'class' => 'text-right']) !!}
-        {!! Form::submit((!$alias->is_visible ? 'Unhide' : 'Hide') . ' Alias', ['class' => 'btn btn-secondary']) !!}
+    {!! Form::submit((!$alias->is_visible ? 'Unhide' : 'Hide') . ' Alias', ['class' => 'btn btn-secondary']) !!}
     {!! Form::close() !!}
-@endif
\ No newline at end of file
+@endif
diff --git a/resources/views/account/_make_primary_modal.blade.php b/resources/views/account/_make_primary_modal.blade.php
index 740fede62f..dda52d5739 100644
--- a/resources/views/account/_make_primary_modal.blade.php
+++ b/resources/views/account/_make_primary_modal.blade.php
@@ -1,15 +1,15 @@
-@if(!$alias)
+@if (!$alias)
     <p>Invalid alias selected.</p>
 @elseif($alias->is_primary)
     <p>This is already your primary alias!</p>
 @elseif(!$alias->canMakePrimary)
     <p>This alias cannot be made your primary alias.</p>
-@else 
+@else
     <p>This will make <strong>{!! $alias->displayAlias !!}</strong> your primary alias. Are you sure?</p>
-    @if(!$alias->is_visible)
+    @if (!$alias->is_visible)
         <p class="text-danger">This alias is currently hidden from the public. Setting it as your primary alias will make it visible to everyone!</p>
     @endif
     {!! Form::open(['url' => 'account/make-primary/' . $alias->id, 'class' => 'text-right']) !!}
-        {!! Form::submit('Make Primary Alias', ['class' => 'btn btn-primary']) !!}
+    {!! Form::submit('Make Primary Alias', ['class' => 'btn btn-primary']) !!}
     {!! Form::close() !!}
-@endif
\ No newline at end of file
+@endif
diff --git a/resources/views/account/_reactivate_confirmation.blade.php b/resources/views/account/_reactivate_confirmation.blade.php
new file mode 100644
index 0000000000..20e1b9fff8
--- /dev/null
+++ b/resources/views/account/_reactivate_confirmation.blade.php
@@ -0,0 +1,10 @@
+@if (Auth::user()->is_deactivated)
+    <p>This will reactivate your account, allowing you to use the site features again. Are you sure you want to do this?</p>
+    {!! Form::open(['url' => 'reactivate']) !!}
+    <div class="text-right">
+        {!! Form::submit('Reactivate', ['class' => 'btn btn-success']) !!}
+    </div>
+    {!! Form::close() !!}
+@else
+    <p>Your account is not deactivated.</p>
+@endif
diff --git a/resources/views/account/_remove_alias_modal.blade.php b/resources/views/account/_remove_alias_modal.blade.php
index 48f17026e1..0f19cff73c 100644
--- a/resources/views/account/_remove_alias_modal.blade.php
+++ b/resources/views/account/_remove_alias_modal.blade.php
@@ -1,4 +1,4 @@
-@if(!$alias)
+@if (!$alias)
     <p>Invalid alias selected.</p>
 @elseif($alias->is_primary)
     <p>As this is your primary alias, you cannot remove it.</p>
@@ -6,6 +6,6 @@
     <p>This will remove the alias <strong>{!! $alias->displayAlias !!}</strong> from your account. </p>
     <p>This will not affect characters that you own, and art/design credits credited to your {{ config('lorekeeper.settings.site_name', 'Lorekeeper') }} account will remain intact. Are you sure?</p>
     {!! Form::open(['url' => 'account/remove-alias/' . $alias->id, 'class' => 'text-right']) !!}
-        {!! Form::submit('Remove Alias', ['class' => 'btn btn-danger']) !!}
+    {!! Form::submit('Remove Alias', ['class' => 'btn btn-danger']) !!}
     {!! Form::close() !!}
-@endif
\ No newline at end of file
+@endif
diff --git a/resources/views/account/_sidebar.blade.php b/resources/views/account/_sidebar.blade.php
index da80143943..13d43732a9 100644
--- a/resources/views/account/_sidebar.blade.php
+++ b/resources/views/account/_sidebar.blade.php
@@ -6,5 +6,6 @@
         <div class="sidebar-item"><a href="{{ url('account/settings') }}" class="{{ set_active('account/settings') }}">Settings</a></div>
         <div class="sidebar-item"><a href="{{ url('account/aliases') }}" class="{{ set_active('account/aliases') }}">Aliases</a></div>
         <div class="sidebar-item"><a href="{{ url('account/bookmarks') }}" class="{{ set_active('account/bookmarks') }}">Bookmarks</a></div>
+        <div class="sidebar-item"><a href="{{ url('account/deactivate') }}" class="{{ set_active('account/deactivate') }}">Deactivate</a></div>
     </li>
-</ul>
\ No newline at end of file
+</ul>
diff --git a/resources/views/account/aliases.blade.php b/resources/views/account/aliases.blade.php
index 5886bdda58..0ff5d940c2 100644
--- a/resources/views/account/aliases.blade.php
+++ b/resources/views/account/aliases.blade.php
@@ -1,75 +1,107 @@
 @extends('account.layout')
 
-@section('account-title') Links @endsection
+@section('account-title')
+    Links
+@endsection
 
 @section('account-content')
-{!! breadcrumbs(['My Account' => Auth::user()->url, 'Aliases' => 'account/aliases']) !!}
+    {!! breadcrumbs(['My Account' => Auth::user()->url, 'Aliases' => 'account/aliases']) !!}
 
-<h1>Aliases</h1>
+    <h1>Aliases</h1>
 
-<p>To verify your identity, you can authenticate any number of accounts from these social media sites that you own. Characters credited to these social media accounts will be added to your account.</p>
-<p>You must have a <strong>primary</strong> account linked. This account is displayed on your profile, and cannot be hidden and/or removed - to change it, you will need to change <strong>primary</strong> status to a different account. Non-primary linked accounts can be hidden and/or removed at any time.</p>
+    <p>To verify your identity, you can authenticate any number of accounts from these social media sites that you own. Characters credited to these social media accounts will be added to your account.</p>
+    <p>You must have a <strong>primary</strong> account linked. This account is displayed on your profile, and cannot be hidden and/or removed - to change it, you will need to change <strong>primary</strong> status to a different account. Non-primary
+        linked accounts can be hidden and/or removed at any time.</p>
 
-<h3>Linked Accounts</h3>
-<div class="row ml-md-2 mb-5">
-    <div class="d-flex row flex-wrap col-12 mt-1 pt-1 px-0 ubt-bottom">
-        <div class="col-3 font-weight-bold">Alias</div>
-        <div class="col-3 font-weight-bold">Site</div>
-        <div class="col-1 font-weight-bold"></div>
-        <div class="col-5 font-weight-bold"></div>
-    </div>
-    @foreach(Auth::user()->aliases()->orderBy('is_primary_alias', 'DESC')->orderBy('site')->get() as $alias)
-        <div class="d-flex row flex-wrap col-12 mt-1 pt-1 px-0 ubt-top">
-            <div class="col-3"><a href="{{ $alias->url }}">{{ $alias->alias }}</a></div>
-            <div class="col-3"><i class="{{ $alias->config['icon'] }} fa-fw mr-1"></i> {{ Config::get('lorekeeper.sites.'.$alias->site.'.full_name') }}</div>
-            <div class="col-1">
-                @if($alias->is_primary_alias) <span class="badge badge-success">Primary</span> @endif
-                @if(!$alias->is_visible) <i class="fas fa-eye-slash" data-toggle="tooltip" title="This alias is hidden from public view."></i> @endif
-            </div>
-            <div class="col-5 text-right">
-                @if(!$alias->is_primary_alias)
-                    @if(Config::get('lorekeeper.sites.'.$alias->site.'.primary_alias')) 
-                        <a href="#" class="btn btn-outline-primary btn-sm make-primary" data-id="{{ $alias->id }}">Make Primary</a>
-                    @endif
-                    <a href="#" class="btn btn-outline-secondary btn-sm hide-alias" data-id="{{ $alias->id }}">{{ $alias->is_visible ? 'Hide' : 'Unhide' }}</a>
-                    <a href="#" class="btn btn-outline-danger btn-sm remove-alias" data-id="{{ $alias->id }}">Remove</a>
-                @endif
+    <h3>Linked Accounts</h3>
+    <div class="mb-4 logs-table">
+        <div class="logs-table-header">
+            <div class="row">
+                <div class="col-3">
+                    <div class="logs-table-cell">Alias</div>
+                </div>
+                <div class="col-3">
+                    <div class="logs-table-cell">Site</div>
+                </div>
+                <div class="col-1">
+                    <div class="logs-table-cell"></div>
+                </div>
+                <div class="col-5">
+                    <div class="logs-table-cell"></div>
+                </div>
             </div>
         </div>
-    @endforeach
-</div>
+        <div class="logs-table-body">
+            @foreach (Auth::user()->aliases()->orderBy('is_primary_alias', 'DESC')->orderBy('site')->get() as $alias)
+                <div class="logs-table-row">
+                    <div class="row flex-wrap">
+                        <div class="col-3">
+                            <div class="logs-table-cell"><a href="{{ $alias->url }}">{{ $alias->alias }}</a></div>
+                        </div>
+                        <div class="col-3">
+                            <div class="logs-table-cell">
+                                <i class="{{ $alias->config['icon'] }} fa-fw mr-1"></i> {{ config('lorekeeper.sites.' . $alias->site . '.full_name') }}
+                            </div>
+                        </div>
+                        <div class="col-1">
+                            <div class="logs-table-cell">
+                                @if ($alias->is_primary_alias)
+                                    <span class="badge badge-success">Primary</span>
+                                @endif
+                                @if (!$alias->is_visible)
+                                    <i class="fas fa-eye-slash" data-toggle="tooltip" title="This alias is hidden from public view."></i>
+                                @endif
+                            </div>
+                        </div>
+                        <div class="col-5 text-right">
+                            <div class="logs-table-cell">
+                                @if (!$alias->is_primary_alias || !config('lorekeeper.settings.require_alias'))
+                                    @if (!$alias->is_primary_alias && config('lorekeeper.sites.' . $alias->site . '.primary_alias'))
+                                        <a href="#" class="btn btn-outline-primary btn-sm make-primary" data-id="{{ $alias->id }}">Make Primary</a>
+                                    @endif
+                                    <a href="#" class="btn btn-outline-secondary btn-sm hide-alias" data-id="{{ $alias->id }}">{{ $alias->is_visible ? 'Hide' : 'Unhide' }}</a>
+                                    <a href="#" class="btn btn-outline-danger btn-sm remove-alias" data-id="{{ $alias->id }}">Remove</a>
+                                @endif
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            @endforeach
+        </div>
+    </div>
 
-<h3>Link New Account</h3>
+    <h3>Link New Account</h3>
 
-<p>Click on a button to link a social media account to your {{ config('lorekeeper.settings.site_name', 'Lorekeeper') }} account. You must be logged into the account you want to link to be able to continue.</p>
-<p>Accounts on sites that have the <strong>Primary</strong> label can be used as a primary account, but will not automatically switch your primary account once authenticated. Added accounts are not visible on your profile by default.</p>
+    <p>Click on a button to link a social media account to your {{ config('lorekeeper.settings.site_name', 'Lorekeeper') }} account. You must be logged into the account you want to link to be able to continue.</p>
+    <p>Accounts on sites that have the <strong>Primary</strong> label can be used as a primary account, but will not automatically switch your primary account once authenticated. Added accounts are not visible on your profile by default.</p>
 
-@foreach(Config::get('lorekeeper.sites') as $provider => $site)
-    @if(isset($site['auth']) && $site['auth'])
-        <div class="d-flex mb-3">
-            <div class="d-flex justify-content-end align-items-center"><i class="{{ $site['icon'] }} fa-fw mr-3"></i></div>
-            <div class="">
-                <a href="{{ url('auth/redirect/'.$provider) }}" class="btn btn-outline-primary mr-3">Link <strong>{{ $site['full_name'] }}</strong> Account</a> 
-                @if(isset($site['primary_alias']) && $site['primary_alias'])<span class="badge badge-success">Primary</span>@endif
+    @foreach (config('lorekeeper.sites') as $provider => $site)
+        @if (isset($site['auth']) && $site['auth'])
+            <div class="d-flex mb-3">
+                <div class="d-flex justify-content-end align-items-center"><i class="{{ $site['icon'] }} fa-fw mr-3"></i></div>
+                <div class="">
+                    <a href="{{ url('auth/redirect/' . $provider) }}" class="btn btn-outline-primary mr-3">Link <strong>{{ $site['full_name'] }}</strong> Account</a>
+                    @if (isset($site['primary_alias']) && $site['primary_alias'])
+                        <span class="badge badge-success">Primary</span>
+                    @endif
+                </div>
             </div>
-        </div>
-    @endif
-@endforeach
-
+        @endif
+    @endforeach
 @endsection
 @section('scripts')
-<script>
-    $('.make-primary').on('click', function(e) {
-        e.preventDefault();
-        loadModal("{{ url('account/make-primary') }}/" + $(this).data('id'), 'Make Primary Alias');
-    });
-    $('.hide-alias').on('click', function(e) {
-        e.preventDefault();
-        loadModal("{{ url('account/hide-alias') }}/" + $(this).data('id'), 'Alias Visibility');
-    });
-    $('.remove-alias').on('click', function(e) {
-        e.preventDefault();
-        loadModal("{{ url('account/remove-alias') }}/" + $(this).data('id'), 'Remove Alias');
-    });
-</script>
-@endsection
\ No newline at end of file
+    <script>
+        $('.make-primary').on('click', function(e) {
+            e.preventDefault();
+            loadModal("{{ url('account/make-primary') }}/" + $(this).data('id'), 'Make Primary Alias');
+        });
+        $('.hide-alias').on('click', function(e) {
+            e.preventDefault();
+            loadModal("{{ url('account/hide-alias') }}/" + $(this).data('id'), 'Alias Visibility');
+        });
+        $('.remove-alias').on('click', function(e) {
+            e.preventDefault();
+            loadModal("{{ url('account/remove-alias') }}/" + $(this).data('id'), 'Remove Alias');
+        });
+    </script>
+@endsection
diff --git a/resources/views/account/banned.blade.php b/resources/views/account/banned.blade.php
index aeef4a74e3..072903523e 100644
--- a/resources/views/account/banned.blade.php
+++ b/resources/views/account/banned.blade.php
@@ -1,21 +1,23 @@
 @extends('layouts.app')
 
-@section('title') Banned @endsection
+@section('title')
+    Banned
+@endsection
 
 @section('content')
-{!! breadcrumbs(['Banned' => 'banned']) !!}
-
-<h1>Banned</h1>
+    {!! breadcrumbs(['Banned' => 'banned']) !!}
 
-<p>You are banned from site activities effective {!! format_date(Auth::user()->settings->banned_at) !!}. {{ Auth::user()->settings->ban_reason ? 'The following reason was given:' : '' }}</p>
+    <h1>Banned</h1>
 
-@if(Auth::user()->settings->ban_reason)
-    <div class="alert alert-danger">
-        {!! nl2br(htmlentities(Auth::user()->settings->ban_reason)) !!}
-    </div>
-@endif
+    <p>You are banned from site activities effective {!! format_date(Auth::user()->settings->banned_at) !!}. {{ Auth::user()->settings->ban_reason ? 'The following reason was given:' : '' }}</p>
 
-<p>As such, you may not continue to to use site features. Items, currencies, characters and any other assets attached to your account cannot be transferred to another user, nor can another user transfer any assets to your account. Any pending submissions have also been removed from the submission queue. </p>
-<p>Contact a staff member if you feel this decision has been made in error, but please respect their final judgement on the matter.</p>
+    @if (Auth::user()->settings->ban_reason)
+        <div class="alert alert-danger">
+            {!! nl2br(htmlentities(Auth::user()->settings->ban_reason)) !!}
+        </div>
+    @endif
 
+    <p>As such, you may not continue to to use site features. Items, currencies, characters and any other assets attached to your account cannot be transferred to another user, nor can another user transfer any assets to your account. Any pending
+        submissions have also been removed from the submission queue. </p>
+    <p>Contact a staff member if you feel this decision has been made in error, but please respect their final judgement on the matter.</p>
 @endsection
diff --git a/resources/views/account/bookmarks.blade.php b/resources/views/account/bookmarks.blade.php
index 16fee17e29..5d7df187b5 100644
--- a/resources/views/account/bookmarks.blade.php
+++ b/resources/views/account/bookmarks.blade.php
@@ -1,152 +1,171 @@
 @extends('account.layout')
 
-@section('account-title') Bookmarks @endsection
+@section('account-title')
+    Bookmarks
+@endsection
 
 @section('account-content')
-{!! breadcrumbs(['My Account' => Auth::user()->url, 'Character Bookmarks' => 'bookmarks']) !!}
-
-<h1>Character Bookmarks</h1>
-
-<p>Bookmarks allow you to keep track of characters that other users own without notifying them in any way. You can add new bookmarks by visiting the character's page and clicking the Bookmark button. You cannot bookmark your own characters, but characters you have bookmarked that are transferred to you will preserve the bookmarks until you delete them. Bookmarks on characters you own will not give you notifications.</p>
-
-{!! Form::open(['method' => 'GET']) !!}
-        <div class="form-inline justify-content-end mb-3">
-            <div class="form-group mr-3">
-                {!! Form::label('sort', 'Sort: ', ['class' => 'mr-2']) !!}
-                {!! Form::select('sort', ['number_desc' => 'Number Descending', 'number_asc' => 'Number Ascending', 'id_desc' => 'Newest Characters First', 'id_asc' => 'Oldest Characters First', 'sale_value_desc' => 'Highest Sale Value', 'sale_value_asc' => 'Lowest Sale Value', 'species_asc' => 'Species', 'species_desc' => 'Species (Reverse)', 'trade_asc' => 'Trade Status', 'trade_desc' => 'Trade Status (Reverse)', 'gift_art_asc' => 'Gift Art Status', 'gift_art_desc' => 'Gift Art Status (Reverse)', 'gift_write_asc' => 'Gift Writing Status', 'gift_write_desc' => 'Gift Writing Status (Reverse)'], Request::get('sort'), ['class' => 'form-control']) !!}
-            </div>
-            {!! Form::submit('Search', ['class' => 'btn btn-primary']) !!}
+    {!! breadcrumbs(['My Account' => Auth::user()->url, 'Character Bookmarks' => 'bookmarks']) !!}
+
+    <h1>Character Bookmarks</h1>
+
+    <p>Bookmarks allow you to keep track of characters that other users own without notifying them in any way. You can add new bookmarks by visiting the character's page and clicking the Bookmark button. You cannot bookmark your own characters, but
+        characters you have bookmarked that are transferred to you will preserve the bookmarks until you delete them. Bookmarks on characters you own will not give you notifications.</p>
+
+    {!! Form::open(['method' => 'GET']) !!}
+    <div class="form-inline justify-content-end mb-3">
+        <div class="form-group mr-3">
+            {!! Form::label('sort', 'Sort: ', ['class' => 'mr-2']) !!}
+            {!! Form::select(
+                'sort',
+                [
+                    'number_desc' => 'Number Descending',
+                    'number_asc' => 'Number Ascending',
+                    'id_desc' => 'Newest Characters First',
+                    'id_asc' => 'Oldest Characters First',
+                    'sale_value_desc' => 'Highest Sale Value',
+                    'sale_value_asc' => 'Lowest Sale Value',
+                    'species_asc' => 'Species',
+                    'species_desc' => 'Species (Reverse)',
+                    'trade_asc' => 'Trade Status',
+                    'trade_desc' => 'Trade Status (Reverse)',
+                    'gift_art_asc' => 'Gift Art Status',
+                    'gift_art_desc' => 'Gift Art Status (Reverse)',
+                    'gift_write_asc' => 'Gift Writing Status',
+                    'gift_write_desc' => 'Gift Writing Status (Reverse)',
+                ],
+                Request::get('sort'),
+                ['class' => 'form-control'],
+            ) !!}
         </div>
+        {!! Form::submit('Search', ['class' => 'btn btn-primary']) !!}
+    </div>
     {!! Form::close() !!}
 
-<div class="text-right mb-3">
-    <div class="btn-group">
-        <button type="button" class="btn btn-secondary active thumb-view-button" data-toggle="tooltip" title="Thumbnail View" alt="Grid View"><i class="fas fa-th-list"></i></button>
-        <button type="button" class="btn btn-secondary list-view-button" data-toggle="tooltip" title="Compact View" alt="List View"><i class="fas fa-bars"></i></button>
+    <div class="text-right mb-3">
+        <div class="btn-group">
+            <button type="button" class="btn btn-secondary active thumb-view-button" data-toggle="tooltip" title="Thumbnail View" alt="Grid View"><i class="fas fa-th-list"></i></button>
+            <button type="button" class="btn btn-secondary list-view-button" data-toggle="tooltip" title="Compact View" alt="List View"><i class="fas fa-bars"></i></button>
+        </div>
     </div>
-</div>
-
-{!! $bookmarks->render() !!}
-<div class="table-responsive mb-3">
-    <table class="table table-sm bookmark-table mb-0">
-        <thead>
-            <tr>
-                <th class="thumbnail-hide bookmark-thumbnail"></th>
-                <th class="bookmark-info">Info</th>
-                <th class="bookmark-comment">Comment</th>
-                <th class="bookmark-notifications">Notify When...</th>
-                <th class="bookmark-actions"></th>
-            </tr>
-        </thead>
-        <tbody>
-            @foreach($bookmarks as $bookmark)
+
+    {!! $bookmarks->render() !!}
+    <div class="table-responsive mb-3">
+        <table class="table table-sm bookmark-table mb-0">
+            <thead>
                 <tr>
-                    <td class="thumbnail-hide">
-                        <div>
-                            <a href="{{ $bookmark->character->url }}"><img src="{{ $bookmark->character->image->thumbnailUrl }}" class="img-thumbnail" alt="{{ $bookmark->character->fullName }}" /></a>
-                        </div>
-                    </td>
-                    <td>
-                        <h5 class="mb-0">{!! $bookmark->character->displayName !!}</h5>
-                        {!! $bookmark->character->image->species_id ? $bookmark->character->image->species->displayName : 'No Species' !!} ・ {!! $bookmark->character->image->rarity_id ? $bookmark->character->image->rarity->displayName : 'No Rarity' !!} ・ {!! $bookmark->character->displayOwner !!}
-
-                        @if($bookmark->character->is_gift_art_allowed > 0 && !$bookmark->character->is_myo_slot)
-                            <div><i class="{{$bookmark->character->is_gift_art_allowed == 1 ? 'text-success' : 'text-warning'}} far fa-circle fa-fw mr-2"></i> {{$bookmark->character->is_gift_art_allowed == 1 ? 'Gift art is allowed' : 'Ask First before gift art'}}</div>
-                        @endif
-                        @if($bookmark->character->is_gift_writing_allowed > 0 && !$bookmark->character->is_myo_slot)
-                            <div><i class="{{$bookmark->character->is_gift_writing_allowed == 1 ? 'text-success' : 'text-warning'}} far fa-circle fa-fw mr-2"></i> {{$bookmark->character->is_gift_writing_allowed == 1 ? 'Gift writing is allowed' : 'Ask First before gift writing'}}</div>
-                        @endif
-                        @if($bookmark->character->is_trading)
-                            <div><i class="text-success far fa-circle fa-fw mr-2"></i> Open for trades</div>
-                        @endif
-                    </td>
-                    <td>
-                        {!! nl2br(htmlentities($bookmark->comment)) !!}
-                    </td>
-                    <td>
-                        <i class="fas fa-exchange-alt fa-lg fa-fw mr-2 {{ $bookmark->notify_on_trade_status ? 'text-success' : 'text-danger' }}" data-toggle="tooltip" title="Open For Trade status changes"></i>
-                        <i class="fas fa-gift fa-lg fa-fw mr-2 {{ $bookmark->notify_on_gift_art_status ? 'text-success' : 'text-danger' }}" data-toggle="tooltip" title="Gift Art Allowed status changes"></i>
-                        <i class="fas fa-pen-square fa-lg fa-fw mr-2 {{ $bookmark->notify_on_gift_writing_status ? 'text-success' : 'text-danger' }}" data-toggle="tooltip" title="Gift Writing Allowed status changes"></i>
-                        <i class="fas fa-user fa-lg fa-fw mr-2 {{ $bookmark->notify_on_transfer ? 'text-success' : 'text-danger' }}" data-toggle="tooltip" title="Character's owner changes"></i>
-                        <i class="far fa-image fa-lg fa-fw mr-2 {{ $bookmark->notify_on_image ? 'text-success' : 'text-danger' }}" data-toggle="tooltip" title="A new image is uploaded"></i>
-
-                    </td>
-                    <td class="text-right">
-                        <a href="#" class="btn btn-outline-primary btn-sm edit-bookmark-button" data-id="{{ Auth::user()->bookmarks()->where('character_id', $bookmark->character_id)->first()->id }}">Edit</a>
-                        <a href="#" class="btn btn-outline-danger btn-sm delete-bookmark-button" data-id="{{ Auth::user()->bookmarks()->where('character_id', $bookmark->character_id)->first()->id }}">Delete</a>
-                    </td>
+                    <th class="thumbnail-hide bookmark-thumbnail"></th>
+                    <th class="bookmark-info">Info</th>
+                    <th class="bookmark-comment">Comment</th>
+                    <th class="bookmark-notifications">Notify When...</th>
+                    <th class="bookmark-actions"></th>
                 </tr>
-            @endforeach
-        </tbody>
-    </table>
-</div>
-
-@if(!count($bookmarks))
-    <div class="text-center">No bookmarks. You can bookmark characters from their respective pages.</div>
-@endif
+            </thead>
+            <tbody>
+                @foreach ($bookmarks as $bookmark)
+                    <tr>
+                        <td class="thumbnail-hide">
+                            <div>
+                                <a href="{{ $bookmark->character->url }}"><img src="{{ $bookmark->character->image->thumbnailUrl }}" class="img-thumbnail" alt="{{ $bookmark->character->fullName }}" /></a>
+                            </div>
+                        </td>
+                        <td>
+                            <h5 class="mb-0">{!! $bookmark->character->displayName !!}</h5>
+                            {!! $bookmark->character->image->species_id ? $bookmark->character->image->species->displayName : 'No Species' !!} ・ {!! $bookmark->character->image->rarity_id ? $bookmark->character->image->rarity->displayName : 'No Rarity' !!} ・ {!! $bookmark->character->displayOwner !!}
+
+                            @if ($bookmark->character->is_gift_art_allowed > 0 && !$bookmark->character->is_myo_slot)
+                                <div><i class="{{ $bookmark->character->is_gift_art_allowed == 1 ? 'text-success' : 'text-warning' }} far fa-circle fa-fw mr-2"></i>
+                                    {{ $bookmark->character->is_gift_art_allowed == 1 ? 'Gift art is allowed' : 'Ask First before gift art' }}</div>
+                            @endif
+                            @if ($bookmark->character->is_gift_writing_allowed > 0 && !$bookmark->character->is_myo_slot)
+                                <div><i class="{{ $bookmark->character->is_gift_writing_allowed == 1 ? 'text-success' : 'text-warning' }} far fa-circle fa-fw mr-2"></i>
+                                    {{ $bookmark->character->is_gift_writing_allowed == 1 ? 'Gift writing is allowed' : 'Ask First before gift writing' }}</div>
+                            @endif
+                            @if ($bookmark->character->is_trading)
+                                <div><i class="text-success far fa-circle fa-fw mr-2"></i> Open for trades</div>
+                            @endif
+                        </td>
+                        <td>
+                            {!! nl2br(htmlentities($bookmark->comment)) !!}
+                        </td>
+                        <td>
+                            <i class="fas fa-exchange-alt fa-lg fa-fw mr-2 {{ $bookmark->notify_on_trade_status ? 'text-success' : 'text-danger' }}" data-toggle="tooltip" title="Open For Trade status changes"></i>
+                            <i class="fas fa-gift fa-lg fa-fw mr-2 {{ $bookmark->notify_on_gift_art_status ? 'text-success' : 'text-danger' }}" data-toggle="tooltip" title="Gift Art Allowed status changes"></i>
+                            <i class="fas fa-pen-square fa-lg fa-fw mr-2 {{ $bookmark->notify_on_gift_writing_status ? 'text-success' : 'text-danger' }}" data-toggle="tooltip" title="Gift Writing Allowed status changes"></i>
+                            <i class="fas fa-user fa-lg fa-fw mr-2 {{ $bookmark->notify_on_transfer ? 'text-success' : 'text-danger' }}" data-toggle="tooltip" title="Character's owner changes"></i>
+                            <i class="far fa-image fa-lg fa-fw mr-2 {{ $bookmark->notify_on_image ? 'text-success' : 'text-danger' }}" data-toggle="tooltip" title="A new image is uploaded"></i>
+
+                        </td>
+                        <td class="text-right">
+                            <a href="#" class="btn btn-outline-primary btn-sm edit-bookmark-button" data-id="{{ Auth::user()->bookmarks()->where('character_id', $bookmark->character_id)->first()->id }}">Edit</a>
+                            <a href="#" class="btn btn-outline-danger btn-sm delete-bookmark-button" data-id="{{ Auth::user()->bookmarks()->where('character_id', $bookmark->character_id)->first()->id }}">Delete</a>
+                        </td>
+                    </tr>
+                @endforeach
+            </tbody>
+        </table>
+    </div>
 
-{!! $bookmarks->render() !!}
+    @if (!count($bookmarks))
+        <div class="text-center">No bookmarks. You can bookmark characters from their respective pages.</div>
+    @endif
 
+    {!! $bookmarks->render() !!}
 @endsection
 @section('scripts')
-@parent
-<script>
-    $( document ).ready(function(){
-        var $thumbButton = $('.thumb-view-button');
-        var $thumbnails = $('.thumbnail-hide');
-        var $listButton = $('.list-view-button');
-
-        var view = null;
-
-        initView();
-
-        $thumbButton.on('click', function(e) {
-            e.preventDefault();
-            setView('thumbs');
-        });
-        $listButton.on('click', function(e) {
-            e.preventDefault();
-            setView('list');
-        });
-
-        function initView()
-        {
-            view = window.localStorage.getItem('lorekeeper_bookmark_view');
-            if(!view) view = 'thumbs';
-            setView(view);
-        }
-
-        function setView(status)
-        {
-            view = status;
-
-            if(view == 'thumbs') {
-                $thumbnails.removeClass('hide');
-                $thumbButton.addClass('active');
-                $listButton.removeClass('active');
-                window.localStorage.setItem('lorekeeper_bookmark_view', 'thumbs');
+    @parent
+    <script>
+        $(document).ready(function() {
+            var $thumbButton = $('.thumb-view-button');
+            var $thumbnails = $('.thumbnail-hide');
+            var $listButton = $('.list-view-button');
+
+            var view = null;
+
+            initView();
+
+            $thumbButton.on('click', function(e) {
+                e.preventDefault();
+                setView('thumbs');
+            });
+            $listButton.on('click', function(e) {
+                e.preventDefault();
+                setView('list');
+            });
+
+            function initView() {
+                view = window.localStorage.getItem('lorekeeper_bookmark_view');
+                if (!view) view = 'thumbs';
+                setView(view);
             }
-            else if (view == 'list') {
-                $listButton.addClass('active');
-                $thumbnails.addClass('hide');
-                $thumbButton.removeClass('active');
-                window.localStorage.setItem('lorekeeper_bookmark_view', 'list');
-            }
-        }
 
-        $('.edit-bookmark-button').on('click', function(e) {
-            e.preventDefault();
-            var $this = $(this);
-            loadModal("{{ url('account/bookmarks/edit') }}" + '/' + $this.data('id'), 'Edit Bookmark');
-        });
+            function setView(status) {
+                view = status;
+
+                if (view == 'thumbs') {
+                    $thumbnails.removeClass('hide');
+                    $thumbButton.addClass('active');
+                    $listButton.removeClass('active');
+                    window.localStorage.setItem('lorekeeper_bookmark_view', 'thumbs');
+                } else if (view == 'list') {
+                    $listButton.addClass('active');
+                    $thumbnails.addClass('hide');
+                    $thumbButton.removeClass('active');
+                    window.localStorage.setItem('lorekeeper_bookmark_view', 'list');
+                }
+            }
 
-        $('.delete-bookmark-button').on('click', function(e) {
-            e.preventDefault();
-            var $this = $(this);
-            loadModal("{{ url('account/bookmarks/delete') }}" + '/' + $this.data('id'), 'Delete Bookmark');
+            $('.edit-bookmark-button').on('click', function(e) {
+                e.preventDefault();
+                var $this = $(this);
+                loadModal("{{ url('account/bookmarks/edit') }}" + '/' + $this.data('id'), 'Edit Bookmark');
+            });
+
+            $('.delete-bookmark-button').on('click', function(e) {
+                e.preventDefault();
+                var $this = $(this);
+                loadModal("{{ url('account/bookmarks/delete') }}" + '/' + $this.data('id'), 'Delete Bookmark');
+            });
         });
-    });
-
-
-</script>
+    </script>
 @endsection
diff --git a/resources/views/account/bookmarks/_create_edit_bookmark.blade.php b/resources/views/account/bookmarks/_create_edit_bookmark.blade.php
index 648222cc20..50eda72587 100644
--- a/resources/views/account/bookmarks/_create_edit_bookmark.blade.php
+++ b/resources/views/account/bookmarks/_create_edit_bookmark.blade.php
@@ -1,37 +1,36 @@
-
 <p>
     All information entered into a bookmark is strictly private - the owner of the bookmarked character will not be notified, and will not know who/how many users have bookmarked their character.
 </p>
-{!! Form::open(['url' => $bookmark->id ? 'account/bookmarks/edit/'.$bookmark->id : 'account/bookmarks/create']) !!}
-    {!! Form::hidden('character_id', Request::get('character_id')) !!}
-    <div class="form-group">
-        {!! Form::label('notify', 'Notify me when...') !!} {!! add_help('This will notify you whenever the respective change occurs, and is entirely optional.') !!}
-        <div class="form-check">
-            {!! Form::checkbox('notify_on_trade_status', 1, $bookmark->notify_on_trade_status, ['class' => 'form-check-input', 'id' => 'notifyTrade']) !!}
-            {!! Form::label('notifyTrade', 'Open For Trades status changes', ['class' => 'form-check-label']) !!}
-        </div>
-        <div class="form-check">
-            {!! Form::checkbox('notify_on_gift_art_status', 1, $bookmark->notify_on_gift_art_status, ['class' => 'form-check-input', 'id' => 'notifyGiftArt']) !!}
-            {!! Form::label('notifyGiftArt', 'Gift Art Allowed status changes', ['class' => 'form-check-label']) !!}
-        </div>
-        <div class="form-check">
-            {!! Form::checkbox('notify_on_gift_writing_status', 1, $bookmark->notify_on_gift_writing_status, ['class' => 'form-check-input', 'id' => 'notifyGiftArt']) !!}
-            {!! Form::label('notifyGiftWriting', 'Gift Writing Allowed status changes', ['class' => 'form-check-label']) !!}
-        </div>
-        <div class="form-check">
-            {!! Form::checkbox('notify_on_transfer', 1, $bookmark->notify_on_transfer, ['class' => 'form-check-input', 'id' => 'notifyTransfer']) !!}
-            {!! Form::label('notifyTransfer', 'Character\'s owner changes', ['class' => 'form-check-label']) !!}
-        </div>
-        <div class="form-check">
-            {!! Form::checkbox('notify_on_image', 1, $bookmark->notify_on_image, ['class' => 'form-check-input', 'id' => 'notifyImage']) !!}
-            {!! Form::label('notifyImage', 'A new image is uploaded', ['class' => 'form-check-label']) !!}
-        </div>
+{!! Form::open(['url' => $bookmark->id ? 'account/bookmarks/edit/' . $bookmark->id : 'account/bookmarks/create']) !!}
+{!! Form::hidden('character_id', Request::get('character_id')) !!}
+<div class="form-group">
+    {!! Form::label('notify', 'Notify me when...') !!} {!! add_help('This will notify you whenever the respective change occurs, and is entirely optional.') !!}
+    <div class="form-check">
+        {!! Form::checkbox('notify_on_trade_status', 1, $bookmark->notify_on_trade_status, ['class' => 'form-check-input', 'id' => 'notifyTrade']) !!}
+        {!! Form::label('notifyTrade', 'Open For Trades status changes', ['class' => 'form-check-label']) !!}
     </div>
-    <div class="form-group">
-        {!! Form::label('comment', 'Comment (Optional)') !!} {!! add_help('HTML will not be rendered. Newlines will be honoured.') !!}
-        {!! Form::textarea('comment', $bookmark->comment, ['class' => 'form-control', 'maxLength' => 500]) !!}
+    <div class="form-check">
+        {!! Form::checkbox('notify_on_gift_art_status', 1, $bookmark->notify_on_gift_art_status, ['class' => 'form-check-input', 'id' => 'notifyGiftArt']) !!}
+        {!! Form::label('notifyGiftArt', 'Gift Art Allowed status changes', ['class' => 'form-check-label']) !!}
     </div>
-    <div class="text-right">
-        {!! Form::submit('Submit', ['class' => 'btn btn-primary']) !!}
+    <div class="form-check">
+        {!! Form::checkbox('notify_on_gift_writing_status', 1, $bookmark->notify_on_gift_writing_status, ['class' => 'form-check-input', 'id' => 'notifyGiftArt']) !!}
+        {!! Form::label('notifyGiftWriting', 'Gift Writing Allowed status changes', ['class' => 'form-check-label']) !!}
     </div>
-{!! Form::close() !!}
\ No newline at end of file
+    <div class="form-check">
+        {!! Form::checkbox('notify_on_transfer', 1, $bookmark->notify_on_transfer, ['class' => 'form-check-input', 'id' => 'notifyTransfer']) !!}
+        {!! Form::label('notifyTransfer', 'Character\'s owner changes', ['class' => 'form-check-label']) !!}
+    </div>
+    <div class="form-check">
+        {!! Form::checkbox('notify_on_image', 1, $bookmark->notify_on_image, ['class' => 'form-check-input', 'id' => 'notifyImage']) !!}
+        {!! Form::label('notifyImage', 'A new image is uploaded', ['class' => 'form-check-label']) !!}
+    </div>
+</div>
+<div class="form-group">
+    {!! Form::label('comment', 'Comment (Optional)') !!} {!! add_help('HTML will not be rendered. Newlines will be honoured.') !!}
+    {!! Form::textarea('comment', $bookmark->comment, ['class' => 'form-control', 'maxLength' => 500]) !!}
+</div>
+<div class="text-right">
+    {!! Form::submit('Submit', ['class' => 'btn btn-primary']) !!}
+</div>
+{!! Form::close() !!}
diff --git a/resources/views/account/bookmarks/_delete_bookmark.blade.php b/resources/views/account/bookmarks/_delete_bookmark.blade.php
index 11c6934450..d3b816f9c9 100644
--- a/resources/views/account/bookmarks/_delete_bookmark.blade.php
+++ b/resources/views/account/bookmarks/_delete_bookmark.blade.php
@@ -1,6 +1,6 @@
 <p>You are about to delete your bookmark for {!! $bookmark->character->displayName !!}. Are you sure?</p>
 <div class="text-right">
-    {!! Form::open(['url' => 'account/bookmarks/delete/'.$bookmark->id]) !!}
-        {!! Form::submit('Delete Bookmark', ['class' => 'btn btn-danger']) !!}
+    {!! Form::open(['url' => 'account/bookmarks/delete/' . $bookmark->id]) !!}
+    {!! Form::submit('Delete Bookmark', ['class' => 'btn btn-danger']) !!}
     {!! Form::close() !!}
-</div>
\ No newline at end of file
+</div>
diff --git a/resources/views/account/deactivate.blade.php b/resources/views/account/deactivate.blade.php
new file mode 100644
index 0000000000..b1bf341257
--- /dev/null
+++ b/resources/views/account/deactivate.blade.php
@@ -0,0 +1,32 @@
+@extends('account.layout')
+
+@section('account-title')
+    Settings
+@endsection
+
+@section('account-content')
+    {!! breadcrumbs(['My Account' => Auth::user()->url, 'Deactivate Account' => 'account/deactivate']) !!}
+
+    <h1>Deactivate Account</h1>
+
+    <p>
+        If you wish to deactivate your account for whatever reason, you may do so here. This does not delete your account in totality, but it hides your information
+        from the public. Due to the way our website is set up, this is the closest we can get to account deletion. You will be able to reactivate your account at any time.
+    </p>
+    <p>
+        This will automatically cancel all pending design updates, submissions, and trades associated with your account.
+    </p>
+
+    <div class="card p-3 mb-2">
+        <h3>Deactivate your account</h3>
+        {!! Form::open(['url' => 'account/deactivate', 'id' => 'deactivateForm']) !!}
+        <div class="form-group">
+            {!! Form::label('Reason (Optional; no HTML)') !!}
+            {!! Form::textarea('deactivate_reason', Auth::user()->settings->deactivate_reason, ['class' => 'form-control']) !!}
+        </div>
+        <div class="text-right">
+            {!! Form::submit(Auth::user()->is_deactivated ? 'Edit' : 'Deactivate', ['class' => 'btn btn' . (Auth::user()->is_deactivated ? '' : '-outline') . '-danger deactivate-button']) !!}
+        </div>
+        {!! Form::close() !!}
+    </div>
+@endsection
diff --git a/resources/views/account/deactivated.blade.php b/resources/views/account/deactivated.blade.php
new file mode 100644
index 0000000000..d37e10ccca
--- /dev/null
+++ b/resources/views/account/deactivated.blade.php
@@ -0,0 +1,40 @@
+@extends('layouts.app')
+
+@section('title')
+    Deactivated
+@endsection
+
+@section('content')
+    {!! breadcrumbs(['Deactivated' => 'banned']) !!}
+
+    <h1>Deactivated</h1>
+
+    <p>Your account has been deactivated as of {!! format_date(Auth::user()->settings->deactivated_at) !!}. {{ Auth::user()->settings->deactivate_reason ? 'The following reason was given:' : '' }}</p>
+
+    @if (Auth::user()->settings->deactivate_reason)
+        <div class="alert alert-danger">
+            <div class="alert-header">{!! Auth::user()->deactivater->displayName !!}:</div>
+            {!! nl2br(htmlentities(Auth::user()->settings->deactivate_reason)) !!}
+        </div>
+    @endif
+
+    <p>As such, you may not continue to to use site features. Items, currencies, characters and any other assets attached to your account cannot be transferred to another user, nor can another user transfer any assets to your account. Any pending
+        submissions have also been removed from the submission queue. </p>
+
+    @if (Auth::user()->is_deactivated)
+        <div class="text-right">
+            <a href="#" class="btn btn-outline-danger reactivate-button">Reactivate Account</a>
+        </div>
+    @endif
+@endsection
+
+@section('scripts')
+    <script>
+        $(document).ready(function() {
+            $('.reactivate-button').on('click', function(e) {
+                e.preventDefault();
+                loadModal("{{ url('reactivate') }}", 'Reactivate Account');
+            });
+        });
+    </script>
+@endsection
diff --git a/resources/views/account/layout.blade.php b/resources/views/account/layout.blade.php
index 2346350cee..2736cd9fb2 100644
--- a/resources/views/account/layout.blade.php
+++ b/resources/views/account/layout.blade.php
@@ -1,7 +1,7 @@
 @extends('layouts.app')
 
-@section('title') 
-    Account :: 
+@section('title')
+    Account ::
     @yield('account-title')
 @endsection
 
@@ -11,4 +11,4 @@
 
 @section('content')
     @yield('account-content')
-@endsection
\ No newline at end of file
+@endsection
diff --git a/resources/views/account/notifications.blade.php b/resources/views/account/notifications.blade.php
index 34e1dc24fd..16056bb3c6 100644
--- a/resources/views/account/notifications.blade.php
+++ b/resources/views/account/notifications.blade.php
@@ -1,112 +1,113 @@
 @extends('account.layout')
 
-@section('account-title') Notifications @endsection
+@section('account-title')
+    Notifications
+@endsection
 
 @section('account-content')
-{!! breadcrumbs(['My Account' => Auth::user()->url, 'Notifications' => 'notifications']) !!}
+    {!! breadcrumbs(['My Account' => Auth::user()->url, 'Notifications' => 'notifications']) !!}
 
-<h1>Notifications</h1>
+    <h1>Notifications</h1>
 
-<div class="text-right mb-3">
-    {!! Form::open(['url' => 'notifications/clear', 'id' => 'clearForm']) !!}
+    <div class="text-right mb-3">
+        {!! Form::open(['url' => 'notifications/clear', 'id' => 'clearForm']) !!}
         <a href="#" class="btn btn-primary" id="clearButton">Clear All</a>
-    {!! Form::close() !!}
-</div>
-{!! $notifications->render() !!}
+        {!! Form::close() !!}
+    </div>
+    {!! $notifications->render() !!}
 
-@foreach($notifications->pluck('notification_type_id')->unique() as $type)
-<div class="card mb-4">
-    <ul class="list-group list-group-flush">
-        <li class="list-group-item">
-            <span class="float-right h5 mb-2">
-                {!! Form::open(['url' => 'notifications/clear/'.$type]) !!}
-                    <span class="badge badge-primary">
-                    {{ $notifications->where('notification_type_id', $type)->count() }}
+    @foreach ($notifications->pluck('notification_type_id')->unique() as $type)
+        <div class="card mb-4">
+            <ul class="list-group list-group-flush">
+                <li class="list-group-item">
+                    <span class="float-right h5 mb-2">
+                        {!! Form::open(['url' => 'notifications/clear/' . $type]) !!}
+                        <span class="badge badge-primary">
+                            {{ $notifications->where('notification_type_id', $type)->count() }}
+                        </span>
+                        {!! Form::submit('x clear', ['class' => 'badge btn-primary', 'style' => 'display:inline; border: 0;']) !!}
+                        {!! Form::close() !!}
                     </span>
-                    {!! Form::submit('x clear', ['class' => 'badge btn-primary', 'style' => 'display:inline; border: 0;']) !!}
-                {!! Form::close() !!}
-            </span>
-            <a class="card-title h5 collapse-title mb-2" href="#{{ str_replace(' ', '_', Config::get('lorekeeper.notifications.'.$type.'.name')) }}" data-toggle="collapse">{{ Config::get('lorekeeper.notifications.'.$type.'.name') }}
-            </a>
-        <div id="{{ str_replace(' ', '_', Config::get('lorekeeper.notifications.'.$type.'.name')) }}" class="collapse {{ $notifications->where('notification_type_id', $type)->count() < 5 ? 'show' : '' }} mt-2">
-            <table class="table notifications-table">
-                <thead>
-                    <tr>
-                        <th>Message</th>
-                        <th>Date</th>
-                        <th></th>
-                    </tr>
-                </thead>
-                <tbody>
-                    @foreach($notifications->where('notification_type_id', $type) as $notification)
-                        <tr class="{{ $notification->is_unread ? 'unread' : '' }}">
-                            <td>{!! $notification->message !!}</td>
-                            <td>{!! format_date($notification->created_at) !!}</td>
-                            <td class="text-right"><a href="#" data-id="{{ $notification->id }}" class="clear-notification"><i class="fas fa-times" aria-hidden="true"></i></a></td>
-                        </tr>
-                    @endforeach
-                </tbody>
-            </table>
+                    <a class="card-title h5 collapse-title mb-2" href="#{{ str_replace(' ', '_', config('lorekeeper.notifications.' . $type . '.name')) }}" data-toggle="collapse">{{ config('lorekeeper.notifications.' . $type . '.name') }}
+                    </a>
+                    <div id="{{ str_replace(' ', '_', config('lorekeeper.notifications.' . $type . '.name')) }}" class="collapse {{ $notifications->where('notification_type_id', $type)->count() < 5 ? 'show' : '' }} mt-2">
+                        <table class="table notifications-table">
+                            <thead>
+                                <tr>
+                                    <th>Message</th>
+                                    <th>Date</th>
+                                    <th></th>
+                                </tr>
+                            </thead>
+                            <tbody>
+                                @foreach ($notifications->where('notification_type_id', $type) as $notification)
+                                    <tr class="{{ $notification->is_unread ? 'unread' : '' }}">
+                                        <td>{!! $notification->message !!}</td>
+                                        <td>{!! format_date($notification->created_at) !!}</td>
+                                        <td class="text-right"><a href="#" data-id="{{ $notification->id }}" class="clear-notification"><i class="fas fa-times" aria-hidden="true"></i></a></td>
+                                    </tr>
+                                @endforeach
+                            </tbody>
+                        </table>
+                    </div>
+                </li>
+            </ul>
         </div>
-        </li>
-    </ul>
-</div>
-@endforeach
-@if(!count($notifications))
-    <div class="text-center">No notifications.</div>
-@endif
+    @endforeach
+    @if (!count($notifications))
+        <div class="text-center">No notifications.</div>
+    @endif
 
-{!! $notifications->render() !!}
+    {!! $notifications->render() !!}
 
-<div class="modal fade" id="confirmationModal" tabindex="-1" role="dialog">
-    <div class="modal-dialog" role="document">
-        <div class="modal-content">
-            <div class="modal-header">
-                <span class="modal-title h5 mb-0">Clear All Notifications</span>
-                <button type="button" class="close" data-dismiss="modal">&times;</button>
-            </div>
-            <div class="modal-body">
-                <p>This will clear <strong>all</strong> of your notifications. Are you certain you wish to do so?</p>
-                <div class="text-right">
-                    <a href="#" id="clearSubmit" class="btn btn-primary">Clear All</a>
+    <div class="modal fade" id="confirmationModal" tabindex="-1" role="dialog">
+        <div class="modal-dialog" role="document">
+            <div class="modal-content">
+                <div class="modal-header">
+                    <span class="modal-title h5 mb-0">Clear All Notifications</span>
+                    <button type="button" class="close" data-dismiss="modal">&times;</button>
+                </div>
+                <div class="modal-body">
+                    <p>This will clear <strong>all</strong> of your notifications. Are you certain you wish to do so?</p>
+                    <div class="text-right">
+                        <a href="#" id="clearSubmit" class="btn btn-primary">Clear All</a>
+                    </div>
                 </div>
             </div>
         </div>
     </div>
-</div>
-
 @endsection
 @section('scripts')
-@parent
-<script>
-    $( document ).ready(function(){
-
-        var $confirmationModal = $('#confirmationModal');
-        var $clearButton = $('#clearButton');
-        var $clearSubmit = $('#clearSubmit');
-        var $clearForm = $('#clearForm');
+    @parent
+    <script>
+        $(document).ready(function() {
 
-        $clearButton.on('click', function(e) {
-            e.preventDefault();
-            $confirmationModal.modal('show');
-        });
+            var $confirmationModal = $('#confirmationModal');
+            var $clearButton = $('#clearButton');
+            var $clearSubmit = $('#clearSubmit');
+            var $clearForm = $('#clearForm');
 
-        $clearSubmit.on('click', function(e) {
-            e.preventDefault();
-            $clearForm.submit();
-        });
-
-        $('.clear-notification').on('click', function(e) {
-            e.preventDefault();
-            var $row = $(this).parent().parent();
-            $.get("{{ url('notifications/delete') }}/" + $(this).data('id'), function( data ) {
-                console.log($(this));
-                $row.fadeOut(300, function() { $(this).remove(); });
+            $clearButton.on('click', function(e) {
+                e.preventDefault();
+                $confirmationModal.modal('show');
             });
-        });
 
-    });
+            $clearSubmit.on('click', function(e) {
+                e.preventDefault();
+                $clearForm.submit();
+            });
 
+            $('.clear-notification').on('click', function(e) {
+                e.preventDefault();
+                var $row = $(this).parent().parent();
+                $.get("{{ url('notifications/delete') }}/" + $(this).data('id'), function(data) {
+                    console.log($(this));
+                    $row.fadeOut(300, function() {
+                        $(this).remove();
+                    });
+                });
+            });
 
-</script>
+        });
+    </script>
 @endsection
diff --git a/resources/views/account/settings.blade.php b/resources/views/account/settings.blade.php
index ffc0ad00ba..f4b845ff37 100644
--- a/resources/views/account/settings.blade.php
+++ b/resources/views/account/settings.blade.php
@@ -1,32 +1,69 @@
 @extends('account.layout')
 
-@section('account-title') Settings @endsection
+@section('account-title')
+    Settings
+@endsection
 
 @section('account-content')
-{!! breadcrumbs(['My Account' => Auth::user()->url, 'Settings' => 'account/settings']) !!}
+    {!! breadcrumbs(['My Account' => Auth::user()->url, 'Settings' => 'account/settings']) !!}
 
-<h1>Settings</h1>
+    <h1>Settings</h1>
 
 
-<div class="card p-3 mb-2">
-    <h3>Avatar</h3>
-    <div class="text-left"><div class="alert alert-warning">Please note a hard refresh may be required to see your updated avatar. Also please note that uploading a .gif will display a 500 error after; the upload should still work, however.</div></div>
-    @if(Auth::user()->isStaff)
-        <div class="alert alert-danger">For admins - note that .GIF avatars leave a tmp file in the directory (e.g php2471.tmp). There is an automatic schedule to delete these files.
+    <div class="card p-3 mb-2">
+        <h3>Avatar</h3>
+        @if (Auth::user()->isStaff)
+            <div class="alert alert-info">For admins - note that .GIF avatars leave a tmp file in the directory (e.g php2471.tmp). There is an automatic schedule to delete these files.
+            </div>
+        @endif
+        {!! Form::open(['url' => 'account/avatar', 'files' => true]) !!}
+        <div class="form-group row">
+            {!! Form::label('avatar', 'Update Profile Image', ['class' => 'col-md-2 col-form-label']) !!}
+            <div class="col-md-10">
+                {!! Form::file('avatar', ['class' => 'form-control']) !!}
+            </div>
         </div>
-    @endif
-    <form enctype="multipart/form-data" action="avatar" method="POST">
-        <label>Update Profile Image</label><br>
-        <input type="file" name="avatar">
-        <input type="hidden" name="_token" value="{{ csrf_token() }}">
-        <input type="submit" class="pull-right btn btn-sm btn-primary">
-    </form>
-</div>
+        <div class="text-right">
+            {!! Form::submit('Edit', ['class' => 'btn btn-primary']) !!}
+        </div>
+        {!! Form::close() !!}
+    </div>
 
+    @if (config('lorekeeper.settings.allow_username_changes'))
+        <div class="card p-3 mb-2">
+            <h3>Change Username</h3>
+            @if (config('lorekeeper.settings.username_change_cooldown'))
+                <div class="alert alert-info">
+                    You can change your username once every {{ config('lorekeeper.settings.username_change_cooldown') }} days.
+                </div>
+                @if (Auth::user()->logs()->where('type', 'Username Change')->orderBy('created_at', 'desc')->first())
+                    <div class="alert alert-warning">
+                        You last changed your username on {{ Auth::user()->logs()->where('type', 'Username Change')->orderBy('created_at', 'desc')->first()->created_at->format('F jS, Y') }}.
+                        <br />
+                        <b>
+                            You will be able to change your username again on
+                            {{ Auth::user()->logs()->where('type', 'Username Change')->orderBy('created_at', 'desc')->first()->created_at->addDays(config('lorekeeper.settings.username_change_cooldown'))->format('F jS, Y') }}.
+                        </b>
+                    </div>
+                @endif
+            @endif
+            {!! Form::open(['url' => 'account/username']) !!}
+            <div class="form-group row">
+                <label class="col-md-2 col-form-label">Username</label>
+                <div class="col-md-10">
+                    {!! Form::text('username', Auth::user()->name, ['class' => 'form-control']) !!}
+                </div>
+            </div>
+            <div class="text-right">
+                {!! Form::submit('Edit', ['class' => 'btn btn-primary']) !!}
+            </div>
+            {!! Form::close() !!}
+        </div>
+    @endif
 
-<div class="card p-3 mb-2">
-    <h3>Profile</h3>
-    {!! Form::open(['url' => 'account/profile']) !!}
+    <div class="card p-3 mb-2">
+        <h3>Profile</h3>
+        {!! Form::open(['url' => 'account/profile']) !!}
         <div class="form-group">
             {!! Form::label('text', 'Profile Text') !!}
             {!! Form::textarea('text', Auth::user()->profile->text, ['class' => 'form-control wysiwyg']) !!}
@@ -34,28 +71,33 @@
         <div class="text-right">
             {!! Form::submit('Edit', ['class' => 'btn btn-primary']) !!}
         </div>
-    {!! Form::close() !!}
-</div>
+        {!! Form::close() !!}
+    </div>
 
-<div class="card p-3 mb-2">
-    <h3>Birthday Publicity</h3>
-    {!! Form::open(['url' => 'account/dob']) !!}
+    <div class="card p-3 mb-2">
+        <h3>Birthday Publicity</h3>
+        {!! Form::open(['url' => 'account/dob']) !!}
         <div class="form-group row">
             <label class="col-md-2 col-form-label">Setting</label>
             <div class="col-md-10">
-                {!! Form::select('birthday_setting', ['0' => '0: No one can see your birthday.', '1' => '1: Members can see your day and month.', '2' => '2: Anyone can see your day and month.', '3' => '3: Full date public.'],Auth::user()->settings->birthday_setting, ['class' => 'form-control']) !!}
+                {!! Form::select(
+                    'birthday_setting',
+                    ['0' => '0: No one can see your birthday.', '1' => '1: Members can see your day and month.', '2' => '2: Anyone can see your day and month.', '3' => '3: Full date public.'],
+                    Auth::user()->settings->birthday_setting,
+                    ['class' => 'form-control'],
+                ) !!}
             </div>
         </div>
         <div class="text-right">
             {!! Form::submit('Edit', ['class' => 'btn btn-primary']) !!}
         </div>
-    {!! Form::close() !!}
-</div>
+        {!! Form::close() !!}
+    </div>
 
-<div class="card p-3 mb-2">
-    <h3>Email Address</h3>
-    <p>Changing your email address will require you to re-verify your email address.</p>
-    {!! Form::open(['url' => 'account/email']) !!}
+    <div class="card p-3 mb-2">
+        <h3>Email Address</h3>
+        <p>Changing your email address will require you to re-verify your email address.</p>
+        {!! Form::open(['url' => 'account/email']) !!}
         <div class="form-group row">
             <label class="col-md-2 col-form-label">Email Address</label>
             <div class="col-md-10">
@@ -65,12 +107,12 @@
         <div class="text-right">
             {!! Form::submit('Edit', ['class' => 'btn btn-primary']) !!}
         </div>
-    {!! Form::close() !!}
-</div>
+        {!! Form::close() !!}
+    </div>
 
-<div class="card p-3 mb-2">
-    <h3>Change Password</h3>
-    {!! Form::open(['url' => 'account/password']) !!}
+    <div class="card p-3 mb-2">
+        <h3>Change Password</h3>
+        {!! Form::open(['url' => 'account/password']) !!}
         <div class="form-group row">
             <label class="col-md-2 col-form-label">Old Password</label>
             <div class="col-md-10">
@@ -92,7 +134,43 @@
         <div class="text-right">
             {!! Form::submit('Edit', ['class' => 'btn btn-primary']) !!}
         </div>
-    {!! Form::close() !!}
-</div>
+        {!! Form::close() !!}
+    </div>
+
+    <div class="card p-3 mb-2">
+        <h3>Two-Factor Authentication</h3>
+
+        <p>Two-factor authentication acts as a second layer of protection for your account. It uses an app on your phone-- such as Google Authenticator-- and information provided by the site to generate a random code that changes frequently.</p>
+
+        <div class="alert alert-info">
+            Please note that two-factor authentication is only used when logging in directly to the site (with an email address and password), and not when logging in via an off-site account. If you log in using an off-site account, consider enabling
+            two-factor authentication on that site instead!
+        </div>
+
+        @if (!isset(Auth::user()->two_factor_secret))
+            <p>In order to enable two-factor authentication, you will need to scan a QR code with an authenticator app on your phone. Two-factor authentication will not be enabled until you do so and confirm by entering one of the codes provided by your
+                authentication app.</p>
+            {!! Form::open(['url' => 'account/two-factor/enable']) !!}
+            <div class="text-right">
+                {!! Form::submit('Enable', ['class' => 'btn btn-primary']) !!}
+            </div>
+            {!! Form::close() !!}
+        @elseif(isset(Auth::user()->two_factor_secret))
+            <p>Two-factor authentication is currently enabled.</p>
 
+            <h4>Disable Two-Factor Authentication</h4>
+            <p>To disable two-factor authentication, you must enter a code from your authenticator app.</p>
+            {!! Form::open(['url' => 'account/two-factor/disable']) !!}
+            <div class="form-group row">
+                <label class="col-md-2 col-form-label">Code</label>
+                <div class="col-md-10">
+                    {!! Form::text('code', null, ['class' => 'form-control']) !!}
+                </div>
+            </div>
+            <div class="text-right">
+                {!! Form::submit('Disable', ['class' => 'btn btn-primary']) !!}
+            </div>
+            {!! Form::close() !!}
+        @endif
+    </div>
 @endsection
diff --git a/resources/views/admin/_sidebar.blade.php b/resources/views/admin/_sidebar.blade.php
index 79eb5a6fe2..b4822eae18 100644
--- a/resources/views/admin/_sidebar.blade.php
+++ b/resources/views/admin/_sidebar.blade.php
@@ -1,16 +1,46 @@
 <ul>
     <li class="sidebar-header"><a href="{{ url('admin') }}" class="card-link">Admin Home</a></li>
-    
-    @foreach(Config::get('lorekeeper.admin_sidebar') as $key => $section)
-        @if(Auth::user()->isAdmin || Auth::user()->hasPower($section['power']))
+
+    @foreach (config('lorekeeper.admin_sidebar') as $key => $section)
+        @if (Auth::user()->isAdmin || Auth::user()->hasPower($section['power']))
             <li class="sidebar-section">
-                <div class="sidebar-section-header">{{ str_replace(' ', '', $key) }}</div>
-                
-                @foreach($section['links'] as $item)
-                    <div class="sidebar-item"><a href="{{ url($item['url']) }}" class="{{ set_active($item['url'] . '*') }}">{{ $item['name'] }}</a></div>
-                @endforeach
+                <div class="sidebar-section-header" data-toggle="collapse" href="#collapse-{!! $key !!}" role="button" aria-expanded="false" aria-controls="collapse-{!! $key !!}">{{ str_replace(' ', '', $key) }} </div>
+
+                <div class="{{ config('lorekeeper.extensions.collapsible_admin_sidebar') ? 'collapse' : '' }} collapse-{!! $key !!}" id="collapse-{!! $key !!}">
+                    {{-- order by name --}}
+                    @php
+                        usort($section['links'], function ($a, $b) {
+                            return strcmp($a['name'], $b['name']);
+                        });
+                    @endphp
+                    @foreach ($section['links'] as $item)
+                        <div class="sidebar-item">
+                            <a href="{{ url($item['url']) }}" class="collapse-link {{ set_active($item['url'] . '*') }}">{{ $item['name'] }}</a>
+                        </div>
+                    @endforeach
+                </div>
             </li>
         @endif
     @endforeach
 
-</ul>
\ No newline at end of file
+</ul>
+
+@if (config('lorekeeper.extensions.collapsible_admin_sidebar'))
+    @section('scripts')
+        <script>
+            $(document).ready(function() {
+                let currentCollapse = $(".sidebar-section").find('.collapse');
+                [...currentCollapse].forEach(element => {
+                    let links = $(element).find('.collapse-link');
+                    [...links].forEach(link => {
+                        isActive = link.classList.contains('active');
+                        if (isActive) {
+                            let active = $(link).closest('.collapse');
+                            $(active).addClass('show');
+                        }
+                    })
+                })
+            })
+        </script>
+    @endsection
+@endif
diff --git a/resources/views/admin/characters/_delete_character_category.blade.php b/resources/views/admin/characters/_delete_character_category.blade.php
index 5952e12b6f..976d45a812 100644
--- a/resources/views/admin/characters/_delete_character_category.blade.php
+++ b/resources/views/admin/characters/_delete_character_category.blade.php
@@ -1,5 +1,5 @@
-@if($category)
-    {!! Form::open(['url' => 'admin/data/character-categories/delete/'.$category->id]) !!}
+@if ($category)
+    {!! Form::open(['url' => 'admin/data/character-categories/delete/' . $category->id]) !!}
 
     <p>You are about to delete the category <strong>{{ $category->name }}</strong>. This is not reversible. If characters in this category exist, you will not be able to delete this category.</p>
     <p>Are you sure you want to delete <strong>{{ $category->name }}</strong>?</p>
@@ -9,6 +9,6 @@
     </div>
 
     {!! Form::close() !!}
-@else 
+@else
     Invalid category selected.
-@endif
\ No newline at end of file
+@endif
diff --git a/resources/views/admin/characters/character_categories.blade.php b/resources/views/admin/characters/character_categories.blade.php
index 853233aade..8341b8d34a 100644
--- a/resources/views/admin/characters/character_categories.blade.php
+++ b/resources/views/admin/characters/character_categories.blade.php
@@ -1,79 +1,91 @@
 @extends('admin.layout')
 
-@section('admin-title') Character Categories @endsection
+@section('admin-title')
+    Character Categories
+@endsection
 
 @section('admin-content')
-{!! breadcrumbs(['Admin Panel' => 'admin', 'Character Categories' => 'admin/data/character-categories']) !!}
+    {!! breadcrumbs(['Admin Panel' => 'admin', 'Character Categories' => 'admin/data/character-categories']) !!}
 
-<h1>Character Categories</h1>
+    <h1>Character Categories</h1>
 
-<p>This is a list of character categories that will be used to classify characters. Creating character categories is entirely optional, but recommended for organisational purposes.</p> 
-<p>The sorting order reflects the order in which the character categories will be displayed on the world pages.</p>
+    <p>This is a list of character categories that will be used to classify characters. Creating character categories is entirely optional, but recommended for organisational purposes.</p>
+    <p>The sorting order reflects the order in which the character categories will be displayed on the world pages.</p>
 
-<div class="text-right mb-3"><a class="btn btn-primary" href="{{ url('admin/data/character-categories/create') }}"><i class="fas fa-plus"></i> Create New Character Category</a></div>
-@if(!count($categories))
-    <p>No character categories found.</p>
-@else 
-    <table class="table table-sm category-table">
-        <thead>
-            <tr>
-                <th>Category</th>
-                <th>Code</th>
-                <th>Sub Masterlist</th>
-                <th></th>
-            </tr>
-        </thead>
-        <tbody id="sortable" class="sortable">
-            @foreach($categories as $category)
-                <tr class="sort-item" data-id="{{ $category->id }}">
-                    <td>
-                        <a class="fas fa-arrows-alt-v handle mr-3" href="#"></a>
-                        {!! $category->displayName !!}
-                    </td>
-                    <td>
-                        {{ $category->code }}
-                    </td>
-                    <td>
-                    @if(isset($category->sublist->name)) {{ $category->sublist->name  }} @else -- @endif
-                    </td>
-                    <td class="text-right">
-                        <a href="{{ url('admin/data/character-categories/edit/'.$category->id) }}" class="btn btn-primary">Edit</a>
-                    </td>
+    <div class="text-right mb-3"><a class="btn btn-primary" href="{{ url('admin/data/character-categories/create') }}"><i class="fas fa-plus"></i> Create New Character Category</a></div>
+    @if (!count($categories))
+        <p>No character categories found.</p>
+    @else
+        <table class="table table-sm category-table">
+            <thead>
+                <tr>
+                    <th>Category</th>
+                    <th>Code</th>
+                    <th>Sub Masterlist</th>
+                    <th></th>
                 </tr>
-            @endforeach
-        </tbody>
+            </thead>
+            <tbody id="sortable" class="sortable">
+                @foreach ($categories as $category)
+                    <tr class="sort-item" data-id="{{ $category->id }}">
+                        <td>
+                            <a class="fas fa-arrows-alt-v handle mr-3" href="#"></a>
+                            @if (!$category->is_visible)
+                                <i class="fas fa-eye-slash mr-1"></i>
+                            @endif
+                            {!! $category->displayName !!}
+                        </td>
+                        <td>
+                            {{ $category->code }}
+                        </td>
+                        <td>
+                            @if (isset($category->sublist->name))
+                                {{ $category->sublist->name }}
+                            @else
+                                --
+                            @endif
+                        </td>
+                        <td class="text-right">
+                            <a href="{{ url('admin/data/character-categories/edit/' . $category->id) }}" class="btn btn-primary">Edit</a>
+                        </td>
+                    </tr>
+                @endforeach
+            </tbody>
 
-    </table>
-    <div class="mb-4">
-        {!! Form::open(['url' => 'admin/data/character-categories/sort']) !!}
-        {!! Form::hidden('sort', '', ['id' => 'sortableOrder']) !!}
-        {!! Form::submit('Save Order', ['class' => 'btn btn-primary']) !!}
-        {!! Form::close() !!}
-    </div>
-@endif
+        </table>
+        <div class="mb-4">
+            {!! Form::open(['url' => 'admin/data/character-categories/sort']) !!}
+            {!! Form::hidden('sort', '', ['id' => 'sortableOrder']) !!}
+            {!! Form::submit('Save Order', ['class' => 'btn btn-primary']) !!}
+            {!! Form::close() !!}
+        </div>
+    @endif
 
 @endsection
 
 @section('scripts')
-@parent
-<script>
-
-$( document ).ready(function() {
-    $('.handle').on('click', function(e) {
-        e.preventDefault();
-    });
-    $( "#sortable" ).sortable({
-        characters: '.sort-item',
-        handle: ".handle",
-        placeholder: "sortable-placeholder",
-        stop: function( event, ui ) {
-            $('#sortableOrder').val($(this).sortable("toArray", {attribute:"data-id"}));
-        },
-        create: function() {
-            $('#sortableOrder').val($(this).sortable("toArray", {attribute:"data-id"}));
-        }
-    });
-    $( "#sortable" ).disableSelection();
-});
-</script>
-@endsection
\ No newline at end of file
+    @parent
+    <script>
+        $(document).ready(function() {
+            $('.handle').on('click', function(e) {
+                e.preventDefault();
+            });
+            $("#sortable").sortable({
+                characters: '.sort-item',
+                handle: ".handle",
+                placeholder: "sortable-placeholder",
+                stop: function(event, ui) {
+                    $('#sortableOrder').val($(this).sortable("toArray", {
+                        attribute: "data-id"
+                    }));
+                },
+                create: function() {
+                    $('#sortableOrder').val($(this).sortable("toArray", {
+                        attribute: "data-id"
+                    }));
+                }
+            });
+            $("#sortable").disableSelection();
+        });
+    </script>
+@endsection
diff --git a/resources/views/admin/characters/create_edit_character_category.blade.php b/resources/views/admin/characters/create_edit_character_category.blade.php
index 607914a598..184c6eba9f 100644
--- a/resources/views/admin/characters/create_edit_character_category.blade.php
+++ b/resources/views/admin/characters/create_edit_character_category.blade.php
@@ -1,78 +1,93 @@
 @extends('admin.layout')
 
-@section('admin-title') Character Categories @endsection
+@section('admin-title')
+    {{ $category->id ? 'Edit' : 'Create' }} Character Category
+@endsection
 
 @section('admin-content')
-{!! breadcrumbs(['Admin Panel' => 'admin', 'Character Categories' => 'admin/data/character-categories', ($category->id ? 'Edit' : 'Create').' Category' => $category->id ? 'admin/data/character-categories/edit/'.$category->id : 'admin/data/character-categories/create']) !!}
-
-<h1>{{ $category->id ? 'Edit' : 'Create' }} Category
-    @if($category->id)
-        <a href="#" class="btn btn-danger float-right delete-category-button">Delete Category</a>
-    @endif
-</h1>
+    {!! breadcrumbs([
+        'Admin Panel' => 'admin',
+        'Character Categories' => 'admin/data/character-categories',
+        ($category->id ? 'Edit' : 'Create') . ' Category' => $category->id ? 'admin/data/character-categories/edit/' . $category->id : 'admin/data/character-categories/create',
+    ]) !!}
 
-{!! Form::open(['url' => $category->id ? 'admin/data/character-categories/edit/'.$category->id : 'admin/data/character-categories/create', 'files' => true]) !!}
+    <h1>{{ $category->id ? 'Edit' : 'Create' }} Character Category
+        @if ($category->id)
+            <a href="#" class="btn btn-danger float-right delete-category-button">Delete Category</a>
+        @endif
+    </h1>
 
-<h3>Basic Information</h3>
+    {!! Form::open(['url' => $category->id ? 'admin/data/character-categories/edit/' . $category->id : 'admin/data/character-categories/create', 'files' => true]) !!}
 
-<div class="form-group">
-    {!! Form::label('Name') !!}
-    {!! Form::text('name', $category->name, ['class' => 'form-control']) !!}
-</div>
+    <h3>Basic Information</h3>
 
-<div class="form-group">
-    {!! Form::label('Code') !!} {!! add_help('This is used in generating the codename for the character. Choose a short unique identifier, e.g. MYO, GUEST, etc.') !!}
-    {!! Form::text('code', $category->code, ['class' => 'form-control']) !!}
-</div>
+    <div class="form-group">
+        {!! Form::label('Name') !!}
+        {!! Form::text('name', $category->name, ['class' => 'form-control']) !!}
+    </div>
 
-<div class="form-group">
-    {!! Form::label('Sub Masterlist (Optional)') !!} {!! add_help('This puts it onto a sub masterlist.') !!}
-    {!! Form::select('masterlist_sub_id', $sublists, $category->masterlist_sub_id, ['class' => 'form-control']) !!}
-</div>
+    <div class="form-group">
+        {!! Form::label('Code') !!} {!! add_help('This is used in generating the codename for the character. Choose a short unique identifier, e.g. MYO, GUEST, etc.') !!}
+        {!! Form::text('code', $category->code, ['class' => 'form-control']) !!}
+    </div>
 
-<div class="form-group">
-    {!! Form::label('World Page Image (Optional)') !!} {!! add_help('This image is used only on the world information pages.') !!}
-    <div>{!! Form::file('image') !!}</div>
-    <div class="text-muted">Recommended size: 200px x 200px</div>
-    @if($category->has_image)
-        <div class="form-check">
-            {!! Form::checkbox('remove_image', 1, false, ['class' => 'form-check-input']) !!}
-            {!! Form::label('remove_image', 'Remove current image', ['class' => 'form-check-label']) !!}
-        </div>
-    @endif
-</div>
+    <div class="form-group">
+        {!! Form::label('Sub Masterlist (Optional)') !!} {!! add_help('This puts it onto a sub masterlist.') !!}
+        {!! Form::select('masterlist_sub_id', $sublists, $category->masterlist_sub_id, ['class' => 'form-control']) !!}
+    </div>
 
-<div class="form-group">
-    {!! Form::label('Description (Optional)') !!}
-    {!! Form::textarea('description', $category->description, ['class' => 'form-control wysiwyg']) !!}
-</div>
+    <div class="form-group">
+        {!! Form::label('World Page Image (Optional)') !!} {!! add_help('This image is used only on the world information pages.') !!}
+        <div>{!! Form::file('image') !!}</div>
+        <div class="text-muted">Recommended size: 200px x 200px</div>
+        @if ($category->has_image)
+            <div class="form-check">
+                {!! Form::checkbox('remove_image', 1, false, ['class' => 'form-check-input']) !!}
+                {!! Form::label('remove_image', 'Remove current image', ['class' => 'form-check-label']) !!}
+            </div>
+        @endif
+    </div>
 
-<div class="text-right">
-    {!! Form::submit($category->id ? 'Edit' : 'Create', ['class' => 'btn btn-primary']) !!}
-</div>
+    <div class="form-group">
+        {!! Form::label('Description (Optional)') !!}
+        {!! Form::textarea('description', $category->description, ['class' => 'form-control wysiwyg']) !!}
+    </div>
 
-{!! Form::close() !!}
+    <div class="form-group">
+        {!! Form::checkbox('is_visible', 1, $category->id ? $category->is_visible : 1, ['class' => 'form-check-input', 'data-toggle' => 'toggle']) !!}
+        {!! Form::label('is_visible', 'Is Visible', ['class' => 'form-check-label ml-3']) !!} {!! add_help('If turned off, the category will not be visible in the category list or available for selection in search. Permissioned staff will still be able to add characters to them, however.') !!}
+    </div>
 
-@if($category->id)
-    <h3>Preview</h3>
-    <div class="card mb-3">
-        <div class="card-body">
-            @include('world._entry', ['imageUrl' => $category->categoryImageUrl, 'name' => $category->displayName, 'description' => $category->parsed_description])
-        </div>
+    <div class="text-right">
+        {!! Form::submit($category->id ? 'Edit' : 'Create', ['class' => 'btn btn-primary']) !!}
     </div>
-@endif
 
+    {!! Form::close() !!}
+
+    @if ($category->id)
+        <h3>Preview</h3>
+        <div class="card mb-3">
+            <div class="card-body">
+                @include('world._entry', [
+                    'imageUrl' => $category->categoryImageUrl,
+                    'name' => $category->displayName,
+                    'description' => $category->parsed_description,
+                    'searchUrl' => $category->searchUrl,
+                    'visible' => $category->is_visible,
+                ])
+            </div>
+        </div>
+    @endif
 @endsection
 
 @section('scripts')
-@parent
-<script>
-$( document ).ready(function() {    
-    $('.delete-category-button').on('click', function(e) {
-        e.preventDefault();
-        loadModal("{{ url('admin/data/character-categories/delete') }}/{{ $category->id }}", 'Delete Category');
-    });
-});
-    
-</script>
-@endsection
\ No newline at end of file
+    @parent
+    <script>
+        $(document).ready(function() {
+            $('.delete-category-button').on('click', function(e) {
+                e.preventDefault();
+                loadModal("{{ url('admin/data/character-categories/delete') }}/{{ $category->id }}", 'Delete Category');
+            });
+        });
+    </script>
+@endsection
diff --git a/resources/views/admin/currencies/_delete_currency.blade.php b/resources/views/admin/currencies/_delete_currency.blade.php
index 7f49cc30a0..0d1d5634a4 100644
--- a/resources/views/admin/currencies/_delete_currency.blade.php
+++ b/resources/views/admin/currencies/_delete_currency.blade.php
@@ -1,5 +1,5 @@
-@if($currency)
-    {!! Form::open(['url' => 'admin/data/currencies/delete/'.$currency->id]) !!}
+@if ($currency)
+    {!! Form::open(['url' => 'admin/data/currencies/delete/' . $currency->id]) !!}
 
     <p>You are about to delete the currency <strong>{{ $currency->name }}</strong>. This is not reversible. If users who possess this currency exist, their owned currency will also be deleted.</p>
     <p>Are you sure you want to delete <strong>{{ $currency->name }}</strong>?</p>
@@ -9,6 +9,6 @@
     </div>
 
     {!! Form::close() !!}
-@else 
+@else
     Invalid currency selected.
-@endif
\ No newline at end of file
+@endif
diff --git a/resources/views/admin/currencies/create_edit_currency.blade.php b/resources/views/admin/currencies/create_edit_currency.blade.php
index c857b3c962..26b88dec23 100644
--- a/resources/views/admin/currencies/create_edit_currency.blade.php
+++ b/resources/views/admin/currencies/create_edit_currency.blade.php
@@ -1,177 +1,179 @@
 @extends('admin.layout')
 
-@section('admin-title') Currencies @endsection
+@section('admin-title')
+    {{ $currency->id ? 'Edit' : 'Create' }} Currency
+@endsection
 
 @section('admin-content')
-{!! breadcrumbs(['Admin Panel' => 'admin', 'Currencies' => 'admin/data/currencies', ($currency->id ? 'Edit' : 'Create').' Currency' => $currency->id ? 'admin/data/currencies/edit/'.$currency->id : 'admin/data/currencies/create']) !!}
-
-<h1>{{ $currency->id ? 'Edit' : 'Create' }} Currency
-    @if($currency->id)
-        <a href="#" class="btn btn-danger float-right delete-currency-button">Delete Currency</a>
-    @endif
-</h1>
-
-{!! Form::open(['url' => $currency->id ? 'admin/data/currencies/edit/'.$currency->id : 'admin/data/currencies/create', 'files' => true]) !!}
-
-<h3>Basic Information</h3>
-<div class="row">
-    <div class="col-md-6">
-        <div class="form-group">
-            {!! Form::label('Currency Name') !!}
-            {!! Form::text('name', $currency->name, ['class' => 'form-control']) !!}
+    {!! breadcrumbs(['Admin Panel' => 'admin', 'Currencies' => 'admin/data/currencies', ($currency->id ? 'Edit' : 'Create') . ' Currency' => $currency->id ? 'admin/data/currencies/edit/' . $currency->id : 'admin/data/currencies/create']) !!}
+
+    <h1>{{ $currency->id ? 'Edit' : 'Create' }} Currency
+        @if ($currency->id)
+            <a href="#" class="btn btn-danger float-right delete-currency-button">Delete Currency</a>
+        @endif
+    </h1>
+
+    {!! Form::open(['url' => $currency->id ? 'admin/data/currencies/edit/' . $currency->id : 'admin/data/currencies/create', 'files' => true]) !!}
+
+    <h3>Basic Information</h3>
+    <div class="row">
+        <div class="col-md-6">
+            <div class="form-group">
+                {!! Form::label('Currency Name') !!}
+                {!! Form::text('name', $currency->name, ['class' => 'form-control']) !!}
+            </div>
         </div>
-    </div>
-    <div class="col-md-6">
-        <div class="form-group">
-            {!! Form::label('Abbreviation (Optional)') !!} {!! add_help('This will be used to denote the currency if an icon is not provided. If an abbreviation is not given, the currency\'s full name will be used.') !!}
-            {!! Form::text('abbreviation', $currency->abbreviation, ['class' => 'form-control']) !!}
+        <div class="col-md-6">
+            <div class="form-group">
+                {!! Form::label('Abbreviation (Optional)') !!} {!! add_help('This will be used to denote the currency if an icon is not provided. If an abbreviation is not given, the currency\'s full name will be used.') !!}
+                {!! Form::text('abbreviation', $currency->abbreviation, ['class' => 'form-control']) !!}
+            </div>
         </div>
     </div>
-</div>
-
-<div class="row">
-    <div class="col-md-6">
-        <div class="form-group">
-            {!! Form::label('Icon Image (Optional)') !!} {!! add_help('This will be used to denote the currency. If not provided, the abbreviation will be used.') !!}
-            {!! Form::file('icon') !!}
-            <div class="text-muted">Recommended height: 16px</div>
-            @if($currency->has_icon)
-                <div class="form-check">
-                    {!! Form::checkbox('remove_icon', 1, false, ['class' => 'form-check-input']) !!}
-                    {!! Form::label('remove_icon', 'Remove current image', ['class' => 'form-check-label']) !!}
-                </div>
-            @endif
+
+    <div class="row">
+        <div class="col-md-6">
+            <div class="form-group">
+                {!! Form::label('Icon Image (Optional)') !!} {!! add_help('This will be used to denote the currency. If not provided, the abbreviation will be used.') !!}
+                {!! Form::file('icon') !!}
+                <div class="text-muted">Recommended height: 16px</div>
+                @if ($currency->has_icon)
+                    <div class="form-check">
+                        {!! Form::checkbox('remove_icon', 1, false, ['class' => 'form-check-input']) !!}
+                        {!! Form::label('remove_icon', 'Remove current image', ['class' => 'form-check-label']) !!}
+                    </div>
+                @endif
+            </div>
         </div>
-    </div>
-    <div class="col-md-6">
-        <div class="form-group">
-            {!! Form::label('World Page Image (Optional)') !!} {!! add_help('This image is used only on the world information pages.') !!}
-            {!! Form::file('image') !!}
-            <div class="text-muted">Recommended size: 200px x 200px</div>
-            @if($currency->has_image)
-                <div class="form-check">
-                    {!! Form::checkbox('remove_image', 1, false, ['class' => 'form-check-input']) !!}
-                    {!! Form::label('remove_image', 'Remove current image', ['class' => 'form-check-label']) !!}
-                </div>
-            @endif
+        <div class="col-md-6">
+            <div class="form-group">
+                {!! Form::label('World Page Image (Optional)') !!} {!! add_help('This image is used only on the world information pages.') !!}
+                {!! Form::file('image') !!}
+                <div class="text-muted">Recommended size: 200px x 200px</div>
+                @if ($currency->has_image)
+                    <div class="form-check">
+                        {!! Form::checkbox('remove_image', 1, false, ['class' => 'form-check-input']) !!}
+                        {!! Form::label('remove_image', 'Remove current image', ['class' => 'form-check-label']) !!}
+                    </div>
+                @endif
+            </div>
         </div>
     </div>
-</div>
-
-<div class="form-group">
-    {!! Form::label('Description (Optional)') !!}
-    {!! Form::textarea('description', $currency->description, ['class' => 'form-control wysiwyg']) !!}
-</div>
-
-<h3>Usage</h3>
-<p>Choose whether this currency should be attached to users and/or characters. Both can be selected at the same time, but at least one must be selected.</p>
-<div class="form-group">
-    <div class="form-check">
-        <label class="form-check-label">
-            {!! Form::checkbox('is_user_owned', 1, $currency->is_user_owned, ['class' => 'form-check-input', 'id' => 'userOwned']) !!}
-            Attach to Users
-        </label>
+
+    <div class="form-group">
+        {!! Form::label('Description (Optional)') !!}
+        {!! Form::textarea('description', $currency->description, ['class' => 'form-control wysiwyg']) !!}
     </div>
-</div>
-<div class="card mb-3" id="userOptions">
-    <div class="card-body">
-        <div class="mb-2">
-            {!! Form::checkbox('is_displayed', 1, $currency->is_displayed, ['class' => 'form-check-input', 'data-toggle' => 'toggle']) !!}
-            {!! Form::label('is_displayed', 'Profile Display', ['class' => 'form-check-label ml-3']) !!} {!! add_help('If this is on, it will be displayed on users\' main profile pages. Additionally, if the user does not own the currency, it will be displayed as 0 currency. (If this is off, currencies not owned will not be displayed at all.) All owned currencies will still be visible from the user\'s bank page.') !!}
-        </div>
-        <div>
-            {!! Form::checkbox('allow_user_to_user', 1, $currency->allow_user_to_user, ['class' => 'form-check-input', 'data-toggle' => 'toggle', 'data-on' => 'Allow', 'data-off' => 'Disallow']) !!}
-            {!! Form::label('allow_user_to_user', 'User → User Transfers', ['class' => 'form-check-label ml-3']) !!} {!! add_help('This will allow users to transfer this currency to other users from their bank.') !!}
+
+    <h3>Usage</h3>
+    <p>Choose whether this currency should be attached to users and/or characters. Both can be selected at the same time, but at least one must be selected.</p>
+    <div class="form-group">
+        <div class="form-check">
+            <label class="form-check-label">
+                {!! Form::checkbox('is_user_owned', 1, $currency->is_user_owned, ['class' => 'form-check-input', 'id' => 'userOwned']) !!}
+                Attach to Users
+            </label>
         </div>
     </div>
-</div>
-<div class="form-group">
-    <div class="form-check">
-        <label class="form-check-label">
-            {!! Form::checkbox('is_character_owned', 1, $currency->is_character_owned, ['class' => 'form-check-input', 'id' => 'characterOwned']) !!}
-            Attach to Characters
-        </label>
+    <div class="card mb-3" id="userOptions">
+        <div class="card-body">
+            <div class="mb-2">
+                {!! Form::checkbox('is_displayed', 1, $currency->is_displayed, ['class' => 'form-check-input', 'data-toggle' => 'toggle']) !!}
+                {!! Form::label('is_displayed', 'Profile Display', ['class' => 'form-check-label ml-3']) !!} {!! add_help(
+                    'If this is on, it will be displayed on users\' main profile pages. Additionally, if the user does not own the currency, it will be displayed as 0 currency. (If this is off, currencies not owned will not be displayed at all.) All owned currencies will still be visible from the user\'s bank page.',
+                ) !!}
+            </div>
+            <div>
+                {!! Form::checkbox('allow_user_to_user', 1, $currency->allow_user_to_user, ['class' => 'form-check-input', 'data-toggle' => 'toggle', 'data-on' => 'Allow', 'data-off' => 'Disallow']) !!}
+                {!! Form::label('allow_user_to_user', 'User → User Transfers', ['class' => 'form-check-label ml-3']) !!} {!! add_help('This will allow users to transfer this currency to other users from their bank.') !!}
+            </div>
+        </div>
     </div>
-</div>
-<div class="card mb-3" id="characterOptions">
-    <div class="card-body">
-        <div class="mb-2">
-            {!! Form::checkbox('allow_user_to_character', 1, $currency->allow_user_to_character, ['class' => 'form-check-input', 'data-toggle' => 'toggle', 'data-on' => 'Allow', 'data-off' => 'Disallow']) !!}
-            {!! Form::label('allow_user_to_character', 'User → Character Transfers', ['class' => 'form-check-label ml-3']) !!} {!! add_help('This will allow a user to transfer this currency to their own characters unidirectionally.') !!}
+    <div class="form-group">
+        <div class="form-check">
+            <label class="form-check-label">
+                {!! Form::checkbox('is_character_owned', 1, $currency->is_character_owned, ['class' => 'form-check-input', 'id' => 'characterOwned']) !!}
+                Attach to Characters
+            </label>
         </div>
-        <div>
-            {!! Form::checkbox('allow_character_to_user', 1, $currency->allow_character_to_user, ['class' => 'form-check-input', 'data-toggle' => 'toggle', 'data-on' => 'Allow', 'data-off' => 'Disallow']) !!}
-            {!! Form::label('allow_character_to_user', 'Character → User Transfers', ['class' => 'form-check-label ml-3']) !!} {!! add_help('This will allow a user to transfer this currency from their own characters to their bank unidirectionally.') !!}
+    </div>
+    <div class="card mb-3" id="characterOptions">
+        <div class="card-body">
+            <div class="mb-2">
+                {!! Form::checkbox('allow_user_to_character', 1, $currency->allow_user_to_character, ['class' => 'form-check-input', 'data-toggle' => 'toggle', 'data-on' => 'Allow', 'data-off' => 'Disallow']) !!}
+                {!! Form::label('allow_user_to_character', 'User → Character Transfers', ['class' => 'form-check-label ml-3']) !!} {!! add_help('This will allow a user to transfer this currency to their own characters unidirectionally.') !!}
+            </div>
+            <div>
+                {!! Form::checkbox('allow_character_to_user', 1, $currency->allow_character_to_user, ['class' => 'form-check-input', 'data-toggle' => 'toggle', 'data-on' => 'Allow', 'data-off' => 'Disallow']) !!}
+                {!! Form::label('allow_character_to_user', 'Character → User Transfers', ['class' => 'form-check-label ml-3']) !!} {!! add_help('This will allow a user to transfer this currency from their own characters to their bank unidirectionally.') !!}
+            </div>
         </div>
     </div>
-</div>
 
-<div class="text-right">
-    {!! Form::submit($currency->id ? 'Edit' : 'Create', ['class' => 'btn btn-primary']) !!}
-</div>
+    <div class="text-right">
+        {!! Form::submit($currency->id ? 'Edit' : 'Create', ['class' => 'btn btn-primary']) !!}
+    </div>
 
-{!! Form::close() !!}
+    {!! Form::close() !!}
 
-@if($currency->id)
-    <h3>Previews</h3>
+    @if ($currency->id)
+        <h3>Previews</h3>
 
-    <h5>Display</h5>
-    <div class="card mb-3">
-        <div class="card-body">
-            {!! $currency->display(100) !!}
+        <h5>Display</h5>
+        <div class="card mb-3">
+            <div class="card-body">
+                {!! $currency->display(100) !!}
+            </div>
         </div>
-    </div>
 
-    <h5>World Page Entry</h5>
-    <div class="card mb-3">
-        <div class="card-body">
-            @include('world._currency_entry', ['currency' => $currency])
+        <h5>World Page Entry</h5>
+        <div class="card mb-3">
+            <div class="card-body">
+                @include('world._currency_entry', ['currency' => $currency])
+            </div>
         </div>
-    </div>
-@endif
-
+    @endif
 @endsection
 
 @section('scripts')
-@parent
-<script>
-$( document ).ready(function() {
-    var $userOwned = $('#userOwned');
-    var $characterOwned = $('#characterOwned');
-    var $userOptions = $('#userOptions');
-    var $characterOptions = $('#characterOptions');
-
-    var userOwned = $userOwned.is(':checked');
-    var characterOwned = $characterOwned.is(':checked');
-
-    updateOptions();
-
-    $userOwned.on('change', function(e) {
-        userOwned = $userOwned.is(':checked');
-
-        updateOptions();
-    });
-    $characterOwned.on('change', function(e) {
-        characterOwned = $characterOwned.is(':checked');
-
-        updateOptions();
-    });
-
-    function updateOptions() {
-        if(userOwned) $userOptions.removeClass('hide');
-        else $userOptions.addClass('hide');
-
-        if(userOwned && characterOwned) $characterOptions.removeClass('hide');
-        else $characterOptions.addClass('hide');
-    }
-
-
-    
-    $('.delete-currency-button').on('click', function(e) {
-        e.preventDefault();
-        loadModal("{{ url('admin/data/currencies/delete') }}/{{ $currency->id }}", 'Delete Currency');
-    });
-});
-    
-</script>
-@endsection
\ No newline at end of file
+    @parent
+    <script>
+        $(document).ready(function() {
+            var $userOwned = $('#userOwned');
+            var $characterOwned = $('#characterOwned');
+            var $userOptions = $('#userOptions');
+            var $characterOptions = $('#characterOptions');
+
+            var userOwned = $userOwned.is(':checked');
+            var characterOwned = $characterOwned.is(':checked');
+
+            updateOptions();
+
+            $userOwned.on('change', function(e) {
+                userOwned = $userOwned.is(':checked');
+
+                updateOptions();
+            });
+            $characterOwned.on('change', function(e) {
+                characterOwned = $characterOwned.is(':checked');
+
+                updateOptions();
+            });
+
+            function updateOptions() {
+                if (userOwned) $userOptions.removeClass('hide');
+                else $userOptions.addClass('hide');
+
+                if (userOwned && characterOwned) $characterOptions.removeClass('hide');
+                else $characterOptions.addClass('hide');
+            }
+
+
+
+            $('.delete-currency-button').on('click', function(e) {
+                e.preventDefault();
+                loadModal("{{ url('admin/data/currencies/delete') }}/{{ $currency->id }}", 'Delete Currency');
+            });
+        });
+    </script>
+@endsection
diff --git a/resources/views/admin/currencies/currencies.blade.php b/resources/views/admin/currencies/currencies.blade.php
index 7f84682831..7644d1b0a4 100644
--- a/resources/views/admin/currencies/currencies.blade.php
+++ b/resources/views/admin/currencies/currencies.blade.php
@@ -1,33 +1,60 @@
 @extends('admin.layout')
 
-@section('admin-title') Currencies @endsection
+@section('admin-title')
+    Currencies
+@endsection
 
 @section('admin-content')
-{!! breadcrumbs(['Admin Panel' => 'admin', 'Currencies' => 'admin/data/currencies']) !!}
+    {!! breadcrumbs(['Admin Panel' => 'admin', 'Currencies' => 'admin/data/currencies']) !!}
 
-<h1>Currencies</h1>
+    <h1>
+        Currencies</h1>
 
-<p>This is a list of currencies that can be earned by users and/or characters. While they're collectively called "currencies", they can be used to track activity counts, event-only reward points, etc. and are not necessarily transferrable and/or can be spent. More information can be found on the creating/editing pages.</p>
+    <p>This is a list of currencies that can be earned by users and/or characters. While they're collectively called "currencies", they can be used to track activity counts, event-only reward points, etc. and are not necessarily transferrable and/or can
+        be spent. More information can be found on the creating/editing pages.</p>
 
-<p>The order of currencies as displayed on user and character profiles can be edited from the <strong><a href="{{ url('admin/data/currencies/sort') }}">Sort Currencies</a></strong> page.</p>
+    <p>The order of currencies as displayed on user and character profiles can be edited from the <strong><a href="{{ url('admin/data/currencies/sort') }}">Sort Currencies</a></strong> page.</p>
 
-<div class="text-right mb-3"><a class="btn btn-primary" href="{{ url('admin/data/currencies/create') }}"><i class="fas fa-plus"></i> Create New Currency</a></div>
-{!! $currencies->render() !!}
-  <div class="row ml-md-2">
-    <div class="d-flex row flex-wrap col-12 pb-1 px-0 ubt-bottom">
-      <div class="col-12 col-md-4 font-weight-bold">Name</div>
-      <div class="col-4 col-md-4 font-weight-bold">Displays As</div>
-      <div class="col-4 col-md-3 font-weight-bold">Attaches To</div>
-    </div>
-    @foreach($currencies as $currency)
-    <div class="d-flex row flex-wrap col-12 mt-1 pt-1 px-0 ubt-top">
-      <div class="col-12 col-md-4 ">{{ $currency->name }} @if($currency->abbreviation) ({{ $currency->abbreviation }}) @endif</div>
-      <div class="col-4 col-md-4">{!! $currency->display(100) !!}</div>
-      <div class="col-4 col-md-3">{{ $currency->is_user_owned ? 'User' : '' }} {{ ($currency->is_character_owned && $currency->is_user_owned) ? '+' : '' }} {{ $currency->is_character_owned ? 'Character' : '' }}</div>
-      <div class="col-4 col-md-1"><a href="{{ url('admin/data/currencies/edit/'.$currency->id) }}" class="btn btn-primary">Edit</a></div>
+    <div class="text-right mb-3"><a class="btn btn-primary" href="{{ url('admin/data/currencies/create') }}"><i class="fas fa-plus"></i> Create New Currency</a></div>
+    {!! $currencies->render() !!}
+    <div class="mb-4 logs-table">
+        <div class="logs-table-header">
+            <div class="row">
+                <div class="col-12 col-md-4">
+                    <div class="logs-table-cell">Name</div>
+                </div>
+                <div class="col-4 col-md-4">
+                    <div class="logs-table-cell">Displays As</div>
+                </div>
+                <div class="col-4 col-md-3">
+                    <div class="logs-table-cell">Attaches To</div>
+                </div>
+            </div>
+        </div>
+        <div class="logs-table-body">
+            @foreach ($currencies as $currency)
+                <div class="logs-table-row">
+                    <div class="row flex-wrap">
+                        <div class="col-12 col-md-4 ">
+                            <div class="logs-table-cell">{{ $currency->name }} @if ($currency->abbreviation)
+                                    ({{ $currency->abbreviation }})
+                                @endif
+                            </div>
+                        </div>
+                        <div class="col-4 col-md-4">
+                            <div class="logs-table-cell">{!! $currency->display(100) !!}</div>
+                        </div>
+                        <div class="col-4 col-md-3">
+                            <div class="logs-table-cell">{{ $currency->is_user_owned ? 'User' : '' }} {{ $currency->is_character_owned && $currency->is_user_owned ? '+' : '' }} {{ $currency->is_character_owned ? 'Character' : '' }}</div>
+                        </div>
+                        <div class="col-4 col-md-1">
+                            <div class="logs-table-cell"><a href="{{ url('admin/data/currencies/edit/' . $currency->id) }}" class="btn btn-primary">Edit</a></div>
+                        </div>
+                    </div>
+                </div>
+            @endforeach
+        </div>
     </div>
-    @endforeach
-  </div>
-{!! $currencies->render() !!}
-<div class="text-center mt-4 small text-muted">{{ $currencies->total() }} result{{ $currencies->total() == 1 ? '' : 's' }} found.</div>
+    {!! $currencies->render() !!}
+    <div class="text-center mt-4 small text-muted">{{ $currencies->total() }} result{{ $currencies->total() == 1 ? '' : 's' }} found.</div>
 @endsection
diff --git a/resources/views/admin/currencies/sort.blade.php b/resources/views/admin/currencies/sort.blade.php
index ab93510de1..27535de772 100644
--- a/resources/views/admin/currencies/sort.blade.php
+++ b/resources/views/admin/currencies/sort.blade.php
@@ -1,100 +1,113 @@
 @extends('admin.layout')
 
-@section('admin-title') Sort Currencies @endsection
+@section('admin-title')
+    Sort Currencies
+@endsection
 
 @section('admin-content')
-{!! breadcrumbs(['Admin Panel' => 'admin', 'Currencies' => 'admin/data/currencies', 'Sort Currencies' => 'admin/data/currencies/sort']) !!}
+    {!! breadcrumbs(['Admin Panel' => 'admin', 'Currencies' => 'admin/data/currencies', 'Sort Currencies' => 'admin/data/currencies/sort']) !!}
 
-<h1>Sort Currencies</h1>
+    <h1>Sort Currencies</h1>
 
-<p>This is the order in which currencies will appear on a user or character's page. Both types are saved separately, so remember to hit save before editing the other one.</p>
+    <p>This is the order in which currencies will appear on a user or character's page. Both types are saved separately, so remember to hit save before editing the other one.</p>
 
-<h3>User Currencies</h3>
+    <h3>User Currencies</h3>
 
-@if(!count($userCurrencies))
-    <p>No user-attached currencies found.</p>
-@else 
-    <table class="table table-sm currency-table">
-        <tbody id="userSortable" class="sortable">
-            @foreach($userCurrencies as $currency)
-                <tr class="sort-item" data-id="{{ $currency->id }}">
-                    <td>
-                        <a class="fas fa-arrows-alt-v handle mr-3" href="#"></a>
-                        {{ $currency->name }} @if($currency->abbreviation)({{ $currency->abbreviation }})@endif {!! $currency->displayIcon !!}
-                    </td>
-                </tr>
-            @endforeach
-        </tbody>
+    @if (!count($userCurrencies))
+        <p>No user-attached currencies found.</p>
+    @else
+        <table class="table table-sm currency-table">
+            <tbody id="userSortable" class="sortable">
+                @foreach ($userCurrencies as $currency)
+                    <tr class="sort-item" data-id="{{ $currency->id }}">
+                        <td>
+                            <a class="fas fa-arrows-alt-v handle mr-3" href="#"></a>
+                            {{ $currency->name }} @if ($currency->abbreviation)
+                                ({{ $currency->abbreviation }})
+                            @endif {!! $currency->displayIcon !!}
+                        </td>
+                    </tr>
+                @endforeach
+            </tbody>
 
-    </table>
-    <div class="mb-4">
-        {!! Form::open(['url' => 'admin/data/currencies/sort/user']) !!}
-        {!! Form::hidden('sort', '', ['id' => 'userSortableOrder']) !!}
-        {!! Form::submit('Save Order', ['class' => 'btn btn-primary']) !!}
-        {!! Form::close() !!}
-    </div>
-@endif
+        </table>
+        <div class="mb-4">
+            {!! Form::open(['url' => 'admin/data/currencies/sort/user']) !!}
+            {!! Form::hidden('sort', '', ['id' => 'userSortableOrder']) !!}
+            {!! Form::submit('Save Order', ['class' => 'btn btn-primary']) !!}
+            {!! Form::close() !!}
+        </div>
+    @endif
 
-<h3>Character Currencies</h3>
+    <h3>Character Currencies</h3>
 
-@if(!count($characterCurrencies))
-    <p>No character-attached currencies found.</p>
-@else
-    <table class="table table-sm currency-table">
-        <tbody id="characterSortable" class="sortable">
-            @foreach($characterCurrencies as $currency)
-                <tr class="sort-item" data-id="{{ $currency->id }}">
-                    <td>
-                        <a class="fas fa-arrows-alt-v handle mr-3" href="#"></a>
-                        {{ $currency->name }} @if($currency->abbreviation)({{ $currency->abbreviation }})@endif {!! $currency->displayIcon !!}
-                    </td>
-                </tr>
-            @endforeach
-        </tbody>
+    @if (!count($characterCurrencies))
+        <p>No character-attached currencies found.</p>
+    @else
+        <table class="table table-sm currency-table">
+            <tbody id="characterSortable" class="sortable">
+                @foreach ($characterCurrencies as $currency)
+                    <tr class="sort-item" data-id="{{ $currency->id }}">
+                        <td>
+                            <a class="fas fa-arrows-alt-v handle mr-3" href="#"></a>
+                            {{ $currency->name }} @if ($currency->abbreviation)
+                                ({{ $currency->abbreviation }})
+                            @endif {!! $currency->displayIcon !!}
+                        </td>
+                    </tr>
+                @endforeach
+            </tbody>
 
-    </table>
-    <div>
-        {!! Form::open(['url' => 'admin/data/currencies/sort/character']) !!}
-        {!! Form::hidden('sort', '', ['id' => 'characterSortableOrder']) !!}
-        {!! Form::submit('Save Order', ['class' => 'btn btn-primary']) !!}
-        {!! Form::close() !!}
-    </div>
-@endif
+        </table>
+        <div>
+            {!! Form::open(['url' => 'admin/data/currencies/sort/character']) !!}
+            {!! Form::hidden('sort', '', ['id' => 'characterSortableOrder']) !!}
+            {!! Form::submit('Save Order', ['class' => 'btn btn-primary']) !!}
+            {!! Form::close() !!}
+        </div>
+    @endif
 
 @endsection
 
 @section('scripts')
-@parent
-<script>
-
-$( document ).ready(function() {
-    $('.handle').on('click', function(e) {
-        e.preventDefault();
-    });
-    $( "#userSortable" ).sortable({
-        items: '.sort-item',
-        handle: ".handle",
-        placeholder: "sortable-placeholder",
-        stop: function( event, ui ) {
-            $('#userSortableOrder').val($(this).sortable("toArray", {attribute:"data-id"}));
-        },
-        create: function() {
-            $('#userSortableOrder').val($(this).sortable("toArray", {attribute:"data-id"}));
-        }
-    });
-    $( "#userSortable" ).disableSelection();
-    $( "#characterSortable" ).sortable({
-        items: '.sort-item',
-        handle: ".handle",
-        placeholder: "sortable-placeholder",
-        stop: function( event, ui ) {
-            $('#characterSortableOrder').val($(this).sortable("toArray", {attribute:"data-id"}));
-        },
-        create: function() {
-            $('#characterSortableOrder').val($(this).sortable("toArray", {attribute:"data-id"}));
-        }
-    });
-    $( "#characterSortable" ).disableSelection();
-});
-</script>
-@endsection
\ No newline at end of file
+    @parent
+    <script>
+        $(document).ready(function() {
+            $('.handle').on('click', function(e) {
+                e.preventDefault();
+            });
+            $("#userSortable").sortable({
+                items: '.sort-item',
+                handle: ".handle",
+                placeholder: "sortable-placeholder",
+                stop: function(event, ui) {
+                    $('#userSortableOrder').val($(this).sortable("toArray", {
+                        attribute: "data-id"
+                    }));
+                },
+                create: function() {
+                    $('#userSortableOrder').val($(this).sortable("toArray", {
+                        attribute: "data-id"
+                    }));
+                }
+            });
+            $("#userSortable").disableSelection();
+            $("#characterSortable").sortable({
+                items: '.sort-item',
+                handle: ".handle",
+                placeholder: "sortable-placeholder",
+                stop: function(event, ui) {
+                    $('#characterSortableOrder').val($(this).sortable("toArray", {
+                        attribute: "data-id"
+                    }));
+                },
+                create: function() {
+                    $('#characterSortableOrder').val($(this).sortable("toArray", {
+                        attribute: "data-id"
+                    }));
+                }
+            });
+            $("#characterSortable").disableSelection();
+        });
+    </script>
+@endsection
diff --git a/resources/views/admin/designs/_approve_request_modal.blade.php b/resources/views/admin/designs/_approve_request_modal.blade.php
index 8ad5d01299..d6535a031d 100644
--- a/resources/views/admin/designs/_approve_request_modal.blade.php
+++ b/resources/views/admin/designs/_approve_request_modal.blade.php
@@ -1,81 +1,90 @@
-<p>This will accept the approval request, creating an update for the character and consuming the items and/or currency attached to this request. You will not be able to edit the traits for the character, so if those require any corrections, please cancel the request and ask the user to make changes.</p>
-{!! Form::open(['url' => 'admin/designs/edit/'.$request->id.'/approve']) !!}
-    <h3>Basic Information</h3>
-    <div class="form-group">
-        {!! Form::label('Character Category') !!}
-        <select name="character_category_id" id="category" class="form-control" placeholder="Select Category">
-            <option value="" data-code="">Select Category</option>
-            @foreach($categories as $category)
-                <option value="{{ $category->id }}" data-code="{{ $category->code }}" {{ $request->character->character_category_id == $category->id ? 'selected' : '' }}>{{ $category->name }} ({{ $category->code }})</option>
-            @endforeach
-        </select>
-    </div>
-    <div class="form-group">
-        {!! Form::label('Number') !!} {!! add_help('This number helps to identify the character and should preferably be unique either within the category, or among all characters.') !!}
-        <div class="d-flex">
-            {!! Form::text('number', $request->character->number, ['class' => 'form-control mr-2', 'id' => 'number']) !!}
-            <a href="#" id="pull-number" class="btn btn-primary" data-toggle="tooltip" title="This will find the highest number assigned to a character currently and add 1 to it. It can be adjusted to pull the highest number in the category or the highest overall number - this setting is in the code.">Pull Next Number</a> 
-        </div>
+<p>This will accept the approval request, creating an update for the character and consuming the items and/or currency attached to this request. You will not be able to edit the traits for the character, so if those require any corrections, please
+    cancel the request and ask the user to make changes.</p>
+{!! Form::open(['url' => 'admin/designs/edit/' . $request->id . '/approve']) !!}
+<h3>Basic Information</h3>
+<div class="form-group">
+    {!! Form::label('Character Category') !!}
+    <select name="character_category_id" id="category" class="form-control" placeholder="Select Category">
+        <option value="" data-code="">Select Category</option>
+        @foreach ($categories as $category)
+            <option value="{{ $category->id }}" data-code="{{ $category->code }}" {{ $request->character->character_category_id == $category->id ? 'selected' : '' }}>{{ $category->name }} ({{ $category->code }})</option>
+        @endforeach
+    </select>
+</div>
+<div class="form-group">
+    {!! Form::label('Number') !!} {!! add_help('This number helps to identify the character and should preferably be unique either within the category, or among all characters.') !!}
+    <div class="d-flex">
+        {!! Form::text('number', $request->character->number, ['class' => 'form-control mr-2', 'id' => 'number']) !!}
+        <a href="#" id="pull-number" class="btn btn-primary" data-toggle="tooltip"
+            title="This will find the highest number assigned to a character currently and add 1 to it. It can be adjusted to pull the highest number in the category or the highest overall number - this setting is in the code.">Pull Next Number</a>
     </div>
+</div>
 
-    <div class="form-group">
-        {!! Form::label('Character Code') !!} {!! add_help('This code identifies the character itself. You don\'t have to use the automatically generated code, but this must be unique among all characters (as it\'s used to generate the character\'s page URL).') !!}
-        {!! Form::text('slug', $request->character->slug, ['class' => 'form-control', 'id' => 'code']) !!}
-    </div>
+<div class="form-group">
+    {!! Form::label('Character Code') !!} {!! add_help('This code identifies the character itself. You don\'t have to use the automatically generated code, but this must be unique among all characters (as it\'s used to generate the character\'s page URL).') !!}
+    {!! Form::text('slug', $request->character->slug, ['class' => 'form-control', 'id' => 'code']) !!}
+</div>
 
-    <div class="form-group">
-        {!! Form::label('Description (Optional)') !!} {!! add_help('This section is for making additional notes about the character and is separate from the character\'s profile (this is not editable by the user).') !!}
-        {!! Form::textarea('description', $request->character->description, ['class' => 'form-control wysiwyg']) !!}
-    </div>
+<div class="form-group">
+    {!! Form::label('Description (Optional)') !!} {!! add_help('This section is for making additional notes about the character and is separate from the character\'s profile (this is not editable by the user).') !!}
+    {!! Form::textarea('description', $request->character->description, ['class' => 'form-control wysiwyg']) !!}
+</div>
 
 
-    <h3>Transfer Information</h3>
+<h3>Transfer Information</h3>
 
-    <div class="alert alert-info">
-        These are displayed on the character's profile, but don't have any effect on site functionality except for the following: 
-        <ul>
-            <li>If all switches are off, the character cannot be transferred by the user (directly or through trades).</li>
-            <li>If a transfer cooldown is set, the character also cannot be transferred by the user (directly or through trades) until the cooldown is up.</li>
-        </ul>
-    </div>
-    <div class="form-group">
-        {!! Form::checkbox('is_giftable', 1, $request->character->is_giftable, ['class' => 'form-check-input', 'data-toggle' => 'toggle']) !!}
-        {!! Form::label('is_giftable', 'Is Giftable', ['class' => 'form-check-label ml-3']) !!}
-    </div>
-    <div class="form-group">
-        {!! Form::checkbox('is_tradeable', 1, $request->character->is_tradeable, ['class' => 'form-check-input', 'data-toggle' => 'toggle']) !!}
-        {!! Form::label('is_tradeable', 'Is Tradeable', ['class' => 'form-check-label ml-3']) !!}
-    </div>
-    <div class="form-group">
-        {!! Form::checkbox('is_sellable', 1, $request->character->is_sellable, ['class' => 'form-check-input', 'data-toggle' => 'toggle', 'id' => 'resellable']) !!}
-        {!! Form::label('is_sellable', 'Is Resellable', ['class' => 'form-check-label ml-3']) !!}
-    </div>
-    <div class="card mb-3" id="resellOptions">
-        <div class="card-body">
-            {!! Form::label('Resale Value') !!} {!! add_help('This value is publicly displayed on the character\'s page.') !!}
-            {!! Form::text('sale_value', $request->character->sale_value, ['class' => 'form-control']) !!}
-        </div>
-    </div>
-    <div class="form-group">
-        {!! Form::label('On Transfer Cooldown Until (Optional)') !!} 
-        {!! Form::text('transferrable_at', $request->character->transferrable_at, ['class' => 'form-control', 'id' => 'datepicker']) !!}
+<div class="alert alert-info">
+    These are displayed on the character's profile, but don't have any effect on site functionality except for the following:
+    <ul>
+        <li>If all switches are off, the character cannot be transferred by the user (directly or through trades).</li>
+        <li>If a transfer cooldown is set, the character also cannot be transferred by the user (directly or through trades) until the cooldown is up.</li>
+    </ul>
+</div>
+<div class="form-group">
+    {!! Form::checkbox('is_giftable', 1, $request->character->is_giftable, ['class' => 'form-check-input', 'data-toggle' => 'toggle']) !!}
+    {!! Form::label('is_giftable', 'Is Giftable', ['class' => 'form-check-label ml-3']) !!}
+</div>
+<div class="form-group">
+    {!! Form::checkbox('is_tradeable', 1, $request->character->is_tradeable, ['class' => 'form-check-input', 'data-toggle' => 'toggle']) !!}
+    {!! Form::label('is_tradeable', 'Is Tradeable', ['class' => 'form-check-label ml-3']) !!}
+</div>
+<div class="form-group">
+    {!! Form::checkbox('is_sellable', 1, $request->character->is_sellable, ['class' => 'form-check-input', 'data-toggle' => 'toggle', 'id' => 'resellable']) !!}
+    {!! Form::label('is_sellable', 'Is Resellable', ['class' => 'form-check-label ml-3']) !!}
+</div>
+<div class="card mb-3" id="resellOptions">
+    <div class="card-body">
+        {!! Form::label('Resale Value') !!} {!! add_help('This value is publicly displayed on the character\'s page.') !!}
+        {!! Form::text('sale_value', $request->character->sale_value, ['class' => 'form-control']) !!}
     </div>
-    
-    <h3>Image Settings</h3>
+</div>
+<div class="form-group">
+    {!! Form::label('On Transfer Cooldown Until (Optional)') !!}
+    {!! Form::text('transferrable_at', $request->character->transferrable_at, ['class' => 'form-control datepicker']) !!}
+</div>
 
+<h3>Image Settings</h3>
+
+<div class="form-group">
+    {!! Form::checkbox('set_active', 1, true, ['class' => 'form-check-input', 'data-toggle' => 'toggle']) !!}
+    {!! Form::label('set_active', 'Set Active Image', ['class' => 'form-check-label ml-3']) !!} {!! add_help('This will set the new approved image as the character\'s masterlist image.') !!}
+</div>
+<div class="form-group">
+    {!! Form::checkbox('invalidate_old', 1, true, ['class' => 'form-check-input', 'data-toggle' => 'toggle']) !!}
+    {!! Form::label('invalidate_old', 'Invalidate Old Image', ['class' => 'form-check-label ml-3']) !!} {!! add_help('This will mark the last image attached to the character as an invalid reference.') !!}
+</div>
+@if (config('lorekeeper.extensions.remove_myo_image') && $request->character->is_myo_slot)
     <div class="form-group">
-        {!! Form::checkbox('set_active', 1, true, ['class' => 'form-check-input', 'data-toggle' => 'toggle']) !!}
-        {!! Form::label('set_active', 'Set Active Image', ['class' => 'form-check-label ml-3']) !!}  {!! add_help('This will set the new approved image as the character\'s masterlist image.') !!}
-    </div>
-    <div class="form-group">
-        {!! Form::checkbox('invalidate_old', 1, true, ['class' => 'form-check-input', 'data-toggle' => 'toggle']) !!}
-        {!! Form::label('invalidate_old', 'Invalidate Old Image', ['class' => 'form-check-label ml-3']) !!}  {!! add_help('This will mark the last image attached to the character as an invalid reference.') !!}
+        {!! Form::label('Remove MYO Image') !!} {!! add_help('This will either hide or delete the MYO slot placeholder image if set.') !!}
+        {!! Form::select('remove_myo_image', [0 => 'Leave MYO Image', 1 => 'Hide MYO Image', 2 => 'Delete MYO Image'], null, ['class' => 'form-control']) !!}
     </div>
+@endif
 
-    <div class="text-right">
-        {!! Form::submit('Approve Request', ['class' => 'btn btn-success']) !!}
-    </div>
+<div class="text-right">
+    {!! Form::submit('Approve Request', ['class' => 'btn btn-success']) !!}
+</div>
 {!! Form::close() !!}
 
 @include('widgets._character_create_options_js')
-@include('widgets._character_code_js')
\ No newline at end of file
+@include('widgets._character_code_js')
+@include('widgets._datetimepicker_js')
diff --git a/resources/views/admin/designs/_cancel_request_modal.blade.php b/resources/views/admin/designs/_cancel_request_modal.blade.php
index c19d2c491d..40fa53a4fb 100644
--- a/resources/views/admin/designs/_cancel_request_modal.blade.php
+++ b/resources/views/admin/designs/_cancel_request_modal.blade.php
@@ -1,14 +1,14 @@
 <p>This will cancel the design approval request, returning it to draft form and allowing the user to edit it again.</p>
-{!! Form::open(['url' => 'admin/designs/edit/'.$request->id.'/cancel']) !!}
-    <div class="form-group">
-        {!! Form::label('staff_comments', 'Comment') !!} {!! add_help('Enter a comment for the user. They will see this on their request page.') !!}
-        {!! Form::textarea('staff_comments', $request->staff_comment, ['class' => 'form-control']) !!}
-    </div>
-    <div class="form-group">
-        {!! Form::checkbox('preserve_queue', 1, 1, ['class' => 'form-check-input', 'data-toggle' => 'toggle']) !!}
-        {!! Form::label('preserve_queue', 'Preserve Queue Position', ['class' => 'form-check-label ml-3']) !!} {!! add_help('Allows the user to avoid needing to wait for their request to return to the front of the queue. If this is turned off, the request will go into the back of the queue as per normal.') !!}
-    </div>
-    <div class="text-right">
-        {!! Form::submit('Cancel Request', ['class' => 'btn btn-secondary']) !!}
-    </div>
-{!! Form::close() !!}
\ No newline at end of file
+{!! Form::open(['url' => 'admin/designs/edit/' . $request->id . '/cancel']) !!}
+<div class="form-group">
+    {!! Form::label('staff_comments', 'Comment') !!} {!! add_help('Enter a comment for the user. They will see this on their request page.') !!}
+    {!! Form::textarea('staff_comments', $request->staff_comment, ['class' => 'form-control']) !!}
+</div>
+<div class="form-group">
+    {!! Form::checkbox('preserve_queue', 1, 1, ['class' => 'form-check-input', 'data-toggle' => 'toggle']) !!}
+    {!! Form::label('preserve_queue', 'Preserve Queue Position', ['class' => 'form-check-label ml-3']) !!} {!! add_help('Allows the user to avoid needing to wait for their request to return to the front of the queue. If this is turned off, the request will go into the back of the queue as per normal.') !!}
+</div>
+<div class="text-right">
+    {!! Form::submit('Cancel Request', ['class' => 'btn btn-secondary']) !!}
+</div>
+{!! Form::close() !!}
diff --git a/resources/views/admin/designs/_reject_request_modal.blade.php b/resources/views/admin/designs/_reject_request_modal.blade.php
index 56e8d25fc0..1cc1eb4773 100644
--- a/resources/views/admin/designs/_reject_request_modal.blade.php
+++ b/resources/views/admin/designs/_reject_request_modal.blade.php
@@ -1,10 +1,10 @@
 <p>This will reject the design approval request, which closes the request and disallows the user from editing it further. Any attached items and/or currency will be returned.</p>
-{!! Form::open(['url' => 'admin/designs/edit/'.$request->id.'/reject']) !!}
-    <div class="form-group">
-        {!! Form::label('staff_comments', 'Comment') !!} {!! add_help('Enter a comment for the user. They will see this on their request page.') !!}
-        {!! Form::textarea('staff_comments', $request->staff_comments, ['class' => 'form-control']) !!}
-    </div>
-    <div class="text-right">
-        {!! Form::submit('Reject Request', ['class' => 'btn btn-danger']) !!}
-    </div>
-{!! Form::close() !!}
\ No newline at end of file
+{!! Form::open(['url' => 'admin/designs/edit/' . $request->id . '/reject']) !!}
+<div class="form-group">
+    {!! Form::label('staff_comments', 'Comment') !!} {!! add_help('Enter a comment for the user. They will see this on their request page.') !!}
+    {!! Form::textarea('staff_comments', $request->staff_comments, ['class' => 'form-control']) !!}
+</div>
+<div class="text-right">
+    {!! Form::submit('Reject Request', ['class' => 'btn btn-danger']) !!}
+</div>
+{!! Form::close() !!}
diff --git a/resources/views/admin/designs/index.blade.php b/resources/views/admin/designs/index.blade.php
index ab5224b8c0..6c72ce4d98 100644
--- a/resources/views/admin/designs/index.blade.php
+++ b/resources/views/admin/designs/index.blade.php
@@ -1,65 +1,121 @@
 @extends('admin.layout')
 
-@section('admin-title') {{ $isMyo ? 'MYO Approval' : 'Design Update' }} Queue @endsection
+@section('admin-title')
+    {{ $isMyo ? 'MYO Approval' : 'Design Update' }} Queue
+@endsection
 
 @section('admin-content')
-{!! breadcrumbs(['Admin Panel' => 'admin', ($isMyo ? 'MYO Approval' : 'Design Update').' Queue' => 'admin/designs/pending']) !!}
+    {!! breadcrumbs(['Admin Panel' => 'admin', ($isMyo ? 'MYO Approval' : 'Design Update') . ' Queue' => 'admin/designs/pending']) !!}
 
-<h1>
-    {{ $isMyo ? 'MYO Approval' : 'Design Update' }} Queue
-</h1>
+    <h1>
+        {{ $isMyo ? 'MYO Approval' : 'Design Update' }} Queue
+    </h1>
 
-<ul class="nav nav-tabs mb-3">
-  <li class="nav-item">
-    <a class="nav-link {{ set_active('admin/'.($isMyo ? 'myo-approvals' : 'design-approvals').'/pending*') }}" href="{{ url('admin/'.($isMyo ? 'myo-approvals' : 'design-approvals').'/pending') }}">Pending</a>
-  </li>
-  <li class="nav-item">
-    <a class="nav-link {{ set_active('admin/'.($isMyo ? 'myo-approvals' : 'design-approvals').'/approved*') }}" href="{{ url('admin/'.($isMyo ? 'myo-approvals' : 'design-approvals').'/approved') }}">Approved</a>
-  </li>
-  <li class="nav-item">
-    <a class="nav-link {{ set_active('admin/'.($isMyo ? 'myo-approvals' : 'design-approvals').'/rejected*') }}" href="{{ url('admin/'.($isMyo ? 'myo-approvals' : 'design-approvals').'/rejected') }}">Rejected</a>
-  </li>
-</ul>
+    <ul class="nav nav-tabs mb-3">
+        <li class="nav-item">
+            <a class="nav-link {{ set_active('admin/' . ($isMyo ? 'myo-approvals' : 'design-approvals') . '/pending*') }}" href="{{ url('admin/' . ($isMyo ? 'myo-approvals' : 'design-approvals') . '/pending') }}">Pending</a>
+        </li>
+        <li class="nav-item">
+            <a class="nav-link {{ set_active('admin/' . ($isMyo ? 'myo-approvals' : 'design-approvals') . '/approved*') }}" href="{{ url('admin/' . ($isMyo ? 'myo-approvals' : 'design-approvals') . '/approved') }}">Approved</a>
+        </li>
+        <li class="nav-item">
+            <a class="nav-link {{ set_active('admin/' . ($isMyo ? 'myo-approvals' : 'design-approvals') . '/rejected*') }}" href="{{ url('admin/' . ($isMyo ? 'myo-approvals' : 'design-approvals') . '/rejected') }}">Rejected</a>
+        </li>
+    </ul>
 
-{!! $requests->render() !!}
-  <div class="row ml-md-2">
-    <div class="d-flex row flex-wrap col-12 pb-1 px-0 ubt-bottom">
-      <div class="col-md-3 font-weight-bold">{{ $isMyo ? 'MYO Slot' : 'Character' }}</div>
-      <div class="col-3 col-md-3 font-weight-bold">User</div>
-      <div class="col-2 col-md-2 font-weight-bold">Submitted</div>
-      @if(Config::get('lorekeeper.extensions.design_update_voting'))
-        <div class="col-2 col-md-2 font-weight-bold">Votes</div>
-      @endif
-      <div class="col-4 col-md-2 font-weight-bold">Status</div>
+    <div>
+        {!! Form::open(['method' => 'GET', 'class' => 'form-inline justify-content-end']) !!}
+        <div class="form-inline justify-content-end">
+            <div class="form-group ml-3 mb-3">
+                {!! Form::select(
+                    'sort',
+                    [
+                        'newest' => 'Newest First',
+                        'oldest' => 'Oldest First',
+                    ],
+                    Request::get('sort') ?: 'oldest',
+                    ['class' => 'form-control'],
+                ) !!}
+            </div>
+            <div class="form-group ml-3 mb-3">
+                {!! Form::submit('Search', ['class' => 'btn btn-primary']) !!}
+            </div>
+        </div>
+        {!! Form::close() !!}
     </div>
-    @foreach($requests as $r)
-    @if(Config::get('lorekeeper.extensions.design_update_voting'))
-        <?php
-            $rejectSum = 0;
-            $approveSum = 0;
-            foreach($r->voteData as $voter=>$vote) {
-                if($vote == 1) $rejectSum += 1;
-                if($vote == 2) $approveSum += 1;
-            }
-        ?>
-    @endif
-    <div class="d-flex row flex-wrap col-12 mt-1 pt-1 px-0 ubt-top">
-      <div class="col-md-3">{!! $r->character ? $r->character->displayName : 'Deleted Character [#'.$r->character_id.']' !!}</div>
-      <div class="col-3 col-md-3">{!! $r->user->displayName !!}</div>
-      <div class="col-2 col-md-2">{!! $r->submitted_at ? pretty_date($r->submitted_at) : '---' !!}</div>
-      @if(Config::get('lorekeeper.extensions.design_update_voting'))
-        <div class="col-2 col-md-2"><strong>
-            <span class="text-danger">{{ $rejectSum }}/{{ Settings::get('design_votes_needed') }}</span> :
-            <span class="text-success">{{ $approveSum }}/{{ Settings::get('design_votes_needed') }}</span>
-        </strong></div>
-      @endif
-      <div class="col-4 col-md-1"><span class="btn btn-{{ $r->status == 'Pending' ? 'secondary' : ($r->status == 'Approved' ? 'success' : 'danger') }} btn-sm py-0 px-1">{{ $r->status }}</span></div>
-      <div class="col-4 col-md-1"><a href="{{ $r->url }}" class="btn btn-primary btn-sm">Details</a></div>
-    </div>
-    @endforeach
-  </div>
-{!! $requests->render() !!}
 
-<div class="text-center mt-4 small text-muted">{{ $requests->total() }} result{{ $requests->total() == 1 ? '' : 's' }} found.</div>
+    {!! $requests->render() !!}
+    <div class="mb-4 logs-table">
+        <div class="logs-table-header">
+            <div class="row">
+                <div class="col-md-3">
+                    <div class="logs-table-cell">{{ $isMyo ? 'MYO Slot' : 'Character' }}</div>
+                </div>
+                <div class="col-3 col-md-3">
+                    <div class="logs-table-cell">User</div>
+                </div>
+                <div class="col-2 col-md-2">
+                    <div class="logs-table-cell">Submitted</div>
+                </div>
+                @if (config('lorekeeper.extensions.design_update_voting'))
+                    <div class="col-2 col-md-2">
+                        <div class="logs-table-cell">Votes</div>
+                    </div>
+                @endif
+                <div class="col-4 col-md-2">
+                    <div class="logs-table-cell">Status</div>
+                </div>
+            </div>
+        </div>
+        <div class="logs-table-body">
+            @foreach ($requests as $r)
+                <div class="logs-table-row">
+                    @if (config('lorekeeper.extensions.design_update_voting'))
+                        <?php
+                        $rejectSum = 0;
+                        $approveSum = 0;
+                        foreach ($r->voteData as $voter => $vote) {
+                            if ($vote == 1) {
+                                $rejectSum += 1;
+                            }
+                            if ($vote == 2) {
+                                $approveSum += 1;
+                            }
+                        }
+                        ?>
+                    @endif
+                    <div class="row flex-wrap">
+                        <div class="col-md-3">
+                            <div class="logs-table-cell">{!! $r->character ? $r->character->displayName : 'Deleted Character [#' . $r->character_id . ']' !!}</div>
+                        </div>
+                        <div class="col-3 col-md-3">
+                            <div class="logs-table-cell">{!! $r->user->displayName !!}</div>
+                        </div>
+                        <div class="col-2 col-md-2">
+                            <div class="logs-table-cell">{!! $r->submitted_at ? pretty_date($r->submitted_at) : '---' !!}</div>
+                        </div>
+                        @if (config('lorekeeper.extensions.design_update_voting'))
+                            <div class="col-2 col-md-2">
+                                <div class="logs-table-cell">
+                                    <strong>
+                                        <span class="text-danger">{{ $rejectSum }}/{{ Settings::get('design_votes_needed') }}</span> :
+                                        <span class="text-success">{{ $approveSum }}/{{ Settings::get('design_votes_needed') }}</span>
+                                    </strong>
+                                </div>
+                            </div>
+                        @endif
+                        <div class="col-4 col-md-1">
+                            <div class="logs-table-cell"><span class="btn btn-{{ $r->status == 'Pending' ? 'secondary' : ($r->status == 'Approved' ? 'success' : 'danger') }} btn-sm py-0 px-1">{{ $r->status }}</span></div>
+                        </div>
+                        <div class="col-4 col-md-1">
+                            <div class="logs-table-cell"><a href="{{ $r->url }}" class="btn btn-primary btn-sm">Details</a></div>
+                        </div>
+                    </div>
+                </div>
+            @endforeach
+        </div>
+    </div>
+    {!! $requests->render() !!}
 
+    <div class="text-center mt-4 small text-muted">{{ $requests->total() }} result{{ $requests->total() == 1 ? '' : 's' }} found.</div>
 @endsection
diff --git a/resources/views/admin/features/_create_edit_feature_subtype.blade.php b/resources/views/admin/features/_create_edit_feature_subtype.blade.php
new file mode 100644
index 0000000000..2f571e001f
--- /dev/null
+++ b/resources/views/admin/features/_create_edit_feature_subtype.blade.php
@@ -0,0 +1,2 @@
+{!! Form::label('Subtype (Optional)') !!} {!! add_help('This is cosmetic and does not limit choice of traits in selections.') !!}
+{!! Form::select('subtype_id', $subtypes, $subtype_id, ['class' => 'form-control', 'id' => 'subtype']) !!}
diff --git a/resources/views/admin/features/_delete_feature.blade.php b/resources/views/admin/features/_delete_feature.blade.php
index c8420e76d4..5591461044 100644
--- a/resources/views/admin/features/_delete_feature.blade.php
+++ b/resources/views/admin/features/_delete_feature.blade.php
@@ -1,5 +1,5 @@
-@if($feature)
-    {!! Form::open(['url' => 'admin/data/traits/delete/'.$feature->id]) !!}
+@if ($feature)
+    {!! Form::open(['url' => 'admin/data/traits/delete/' . $feature->id]) !!}
 
     <p>You are about to delete the trait <strong>{{ $feature->name }}</strong>. This is not reversible. If characters possessing this trait exist, you will not be able to delete this trait.</p>
     <p>Are you sure you want to delete <strong>{{ $feature->name }}</strong>?</p>
@@ -9,6 +9,6 @@
     </div>
 
     {!! Form::close() !!}
-@else 
+@else
     Invalid trait selected.
-@endif
\ No newline at end of file
+@endif
diff --git a/resources/views/admin/features/_delete_feature_category.blade.php b/resources/views/admin/features/_delete_feature_category.blade.php
index 74eb8208ea..1785bd364c 100644
--- a/resources/views/admin/features/_delete_feature_category.blade.php
+++ b/resources/views/admin/features/_delete_feature_category.blade.php
@@ -1,5 +1,5 @@
-@if($category)
-    {!! Form::open(['url' => 'admin/data/trait-categories/delete/'.$category->id]) !!}
+@if ($category)
+    {!! Form::open(['url' => 'admin/data/trait-categories/delete/' . $category->id]) !!}
 
     <p>You are about to delete the category <strong>{{ $category->name }}</strong>. This is not reversible. If traits in this category exist, you will not be able to delete this category.</p>
     <p>Are you sure you want to delete <strong>{{ $category->name }}</strong>?</p>
@@ -9,6 +9,6 @@
     </div>
 
     {!! Form::close() !!}
-@else 
+@else
     Invalid category selected.
-@endif
\ No newline at end of file
+@endif
diff --git a/resources/views/admin/features/create_edit_feature.blade.php b/resources/views/admin/features/create_edit_feature.blade.php
index 40d6e8945f..5164eb8f96 100644
--- a/resources/views/admin/features/create_edit_feature.blade.php
+++ b/resources/views/admin/features/create_edit_feature.blade.php
@@ -1,98 +1,122 @@
 @extends('admin.layout')
 
-@section('admin-title') Traits @endsection
+@section('admin-title')
+    {{ $feature->id ? 'Edit' : 'Create' }} Trait
+@endsection
 
 @section('admin-content')
-{!! breadcrumbs(['Admin Panel' => 'admin', 'Traits' => 'admin/data/traits', ($feature->id ? 'Edit' : 'Create').' Trait' => $feature->id ? 'admin/data/traits/edit/'.$feature->id : 'admin/data/traits/create']) !!}
+    {!! breadcrumbs(['Admin Panel' => 'admin', 'Traits' => 'admin/data/traits', ($feature->id ? 'Edit' : 'Create') . ' Trait' => $feature->id ? 'admin/data/traits/edit/' . $feature->id : 'admin/data/traits/create']) !!}
 
-<h1>{{ $feature->id ? 'Edit' : 'Create' }} Trait
-    @if($feature->id)
-        <a href="#" class="btn btn-danger float-right delete-feature-button">Delete Trait</a>
-    @endif
-</h1>
+    <h1>{{ $feature->id ? 'Edit' : 'Create' }} Trait
+        @if ($feature->id)
+            <a href="#" class="btn btn-danger float-right delete-feature-button">Delete Trait</a>
+        @endif
+    </h1>
 
-{!! Form::open(['url' => $feature->id ? 'admin/data/traits/edit/'.$feature->id : 'admin/data/traits/create', 'files' => true]) !!}
+    {!! Form::open(['url' => $feature->id ? 'admin/data/traits/edit/' . $feature->id : 'admin/data/traits/create', 'files' => true]) !!}
 
-<h3>Basic Information</h3>
+    <h3>Basic Information</h3>
 
-<div class="row">
-    <div class="col-md-6">
-        <div class="form-group">
-            {!! Form::label('Name') !!}
-            {!! Form::text('name', $feature->name, ['class' => 'form-control']) !!}
+    <div class="row">
+        <div class="col-md-6">
+            <div class="form-group">
+                {!! Form::label('Name') !!}
+                {!! Form::text('name', $feature->name, ['class' => 'form-control']) !!}
+            </div>
         </div>
-    </div>
-    <div class="col-md-6">
-        <div class="form-group">
-            {!! Form::label('Rarity') !!}
-            {!! Form::select('rarity_id', $rarities, $feature->rarity_id, ['class' => 'form-control']) !!}
+        <div class="col-md-6">
+            <div class="form-group">
+                {!! Form::label('Rarity') !!}
+                {!! Form::select('rarity_id', $rarities, $feature->rarity_id, ['class' => 'form-control']) !!}
+            </div>
         </div>
     </div>
-</div>
 
-<div class="form-group">
-    {!! Form::label('World Page Image (Optional)') !!} {!! add_help('This image is used only on the world information pages.') !!}
-    <div>{!! Form::file('image') !!}</div>
-    <div class="text-muted">Recommended size: 200px x 200px</div>
-    @if($feature->has_image)
-        <div class="form-check">
-            {!! Form::checkbox('remove_image', 1, false, ['class' => 'form-check-input']) !!}
-            {!! Form::label('remove_image', 'Remove current image', ['class' => 'form-check-label']) !!}
-        </div>
-    @endif
-</div>
+    <div class="form-group">
+        {!! Form::label('World Page Image (Optional)') !!} {!! add_help('This image is used only on the world information pages.') !!}
+        <div>{!! Form::file('image') !!}</div>
+        <div class="text-muted">Recommended size: 200px x 200px</div>
+        @if ($feature->has_image)
+            <div class="form-check">
+                {!! Form::checkbox('remove_image', 1, false, ['class' => 'form-check-input']) !!}
+                {!! Form::label('remove_image', 'Remove current image', ['class' => 'form-check-label']) !!}
+            </div>
+        @endif
+    </div>
 
-<div class="row">
-    <div class="col-md-4">
-        <div class="form-group">
-            {!! Form::label('Trait Category (Optional)') !!}
-            {!! Form::select('feature_category_id', $categories, $feature->feature_category_id, ['class' => 'form-control']) !!}
+    <div class="row">
+        <div class="col-md-4">
+            <div class="form-group">
+                {!! Form::label('Trait Category (Optional)') !!}
+                {!! Form::select('feature_category_id', $categories, $feature->feature_category_id, ['class' => 'form-control']) !!}
+            </div>
         </div>
-    </div>
-    <div class="col-md-4">
-        <div class="form-group">
-            {!! Form::label('Species Restriction (Optional)') !!}
-            {!! Form::select('species_id', $specieses, $feature->species_id, ['class' => 'form-control']) !!}
+        <div class="col-md-4">
+            <div class="form-group">
+                {!! Form::label('Species Restriction (Optional)') !!}
+                {!! Form::select('species_id', $specieses, $feature->species_id, ['class' => 'form-control', 'id' => 'species']) !!}
+            </div>
         </div>
-    </div>
-    <div class="col-md-4">
-        <div class="form-group">
-            {!! Form::label('Subtype (Optional)') !!} {!! add_help('This is cosmetic and does not limit choice of traits in selections.') !!}
-            {!! Form::select('subtype_id', $subtypes, $feature->subtype_id, ['class' => 'form-control']) !!}
+        <div class="col-md-4">
+            <div class="form-group" id="subtypes">
+                {!! Form::label('Subtype (Optional)') !!} {!! add_help('This is cosmetic and does not limit choice of traits in selections.') !!}
+                {!! Form::select('subtype_id', $subtypes, $feature->subtype_id, ['class' => 'form-control', 'id' => 'subtype']) !!}
+            </div>
         </div>
     </div>
-</div>
-<div class="form-group">
-    {!! Form::label('Description (Optional)') !!}
-    {!! Form::textarea('description', $feature->description, ['class' => 'form-control wysiwyg']) !!}
-</div>
-
-<div class="text-right">
-    {!! Form::submit($feature->id ? 'Edit' : 'Create', ['class' => 'btn btn-primary']) !!}
-</div>
+    <div class="form-group">
+        {!! Form::label('Description (Optional)') !!}
+        {!! Form::textarea('description', $feature->description, ['class' => 'form-control wysiwyg']) !!}
+    </div>
 
-{!! Form::close() !!}
+    <div class="form-group">
+        {!! Form::checkbox('is_visible', 1, $feature->id ? $feature->is_visible : 1, ['class' => 'form-check-input', 'data-toggle' => 'toggle']) !!}
+        {!! Form::label('is_visible', 'Is Visible', ['class' => 'form-check-label ml-3']) !!} {!! add_help('If turned off, the trait will not be visible in the trait list or available for selection in search and design updates. Permissioned staff will still be able to add them to characters, however.') !!}
+    </div>
 
-@if($feature->id)
-    <h3>Preview</h3>
-    <div class="card mb-3">
-        <div class="card-body">
-            @include('world._feature_entry', ['feature' => $feature])
-        </div>
+    <div class="text-right">
+        {!! Form::submit($feature->id ? 'Edit' : 'Create', ['class' => 'btn btn-primary']) !!}
     </div>
-@endif
 
+    {!! Form::close() !!}
+
+    @if ($feature->id)
+        <h3>Preview</h3>
+        <div class="card mb-3">
+            <div class="card-body">
+                @include('world._feature_entry', ['feature' => $feature])
+            </div>
+        </div>
+    @endif
 @endsection
 
 @section('scripts')
-@parent
-<script>
-$( document ).ready(function() {    
-    $('.delete-feature-button').on('click', function(e) {
-        e.preventDefault();
-        loadModal("{{ url('admin/data/traits/delete') }}/{{ $feature->id }}", 'Delete Trait');
-    });
-});
-    
-</script>
-@endsection
\ No newline at end of file
+    @parent
+    <script>
+        $(document).ready(function() {
+            $('.delete-feature-button').on('click', function(e) {
+                e.preventDefault();
+                loadModal("{{ url('admin/data/traits/delete') }}/{{ $feature->id }}", 'Delete Trait');
+            });
+            refreshSubtype();
+        });
+
+        $("#species").change(function() {
+            refreshSubtype();
+        });
+
+        function refreshSubtype() {
+            var species = $('#species').val();
+            var subtype_id = {{ $feature->subtype_id ?: 'null' }};
+            $.ajax({
+                type: "GET",
+                url: "{{ url('admin/data/traits/check-subtype') }}?species=" + species + "&subtype_id=" + subtype_id,
+                dataType: "text"
+            }).done(function(res) {
+                $("#subtypes").html(res);
+            }).fail(function(jqXHR, textStatus, errorThrown) {
+                alert("AJAX call failed: " + textStatus + ", " + errorThrown);
+            });
+        };
+    </script>
+@endsection
diff --git a/resources/views/admin/features/create_edit_feature_category.blade.php b/resources/views/admin/features/create_edit_feature_category.blade.php
index ba06950502..aa84a6fe23 100644
--- a/resources/views/admin/features/create_edit_feature_category.blade.php
+++ b/resources/views/admin/features/create_edit_feature_category.blade.php
@@ -1,68 +1,83 @@
 @extends('admin.layout')
 
-@section('admin-title') Trait Categories @endsection
+@section('admin-title')
+    {{ $category->id ? 'Edit' : 'Create' }} Trait Category
+@endsection
 
 @section('admin-content')
-{!! breadcrumbs(['Admin Panel' => 'admin', 'Trait Categories' => 'admin/data/trait-categories', ($category->id ? 'Edit' : 'Create').' Category' => $category->id ? 'admin/data/trait-categories/edit/'.$category->id : 'admin/data/trait-categories/create']) !!}
-
-<h1>{{ $category->id ? 'Edit' : 'Create' }} Category
-    @if($category->id)
-        <a href="#" class="btn btn-danger float-right delete-category-button">Delete Category</a>
-    @endif
-</h1>
+    {!! breadcrumbs([
+        'Admin Panel' => 'admin',
+        'Trait Categories' => 'admin/data/trait-categories',
+        ($category->id ? 'Edit' : 'Create') . ' Category' => $category->id ? 'admin/data/trait-categories/edit/' . $category->id : 'admin/data/trait-categories/create',
+    ]) !!}
 
-{!! Form::open(['url' => $category->id ? 'admin/data/trait-categories/edit/'.$category->id : 'admin/data/trait-categories/create', 'files' => true]) !!}
+    <h1>{{ $category->id ? 'Edit' : 'Create' }} Trait Category
+        @if ($category->id)
+            <a href="#" class="btn btn-danger float-right delete-category-button">Delete Category</a>
+        @endif
+    </h1>
 
-<h3>Basic Information</h3>
+    {!! Form::open(['url' => $category->id ? 'admin/data/trait-categories/edit/' . $category->id : 'admin/data/trait-categories/create', 'files' => true]) !!}
 
-<div class="form-group">
-    {!! Form::label('Name') !!}
-    {!! Form::text('name', $category->name, ['class' => 'form-control']) !!}
-</div>
+    <h3>Basic Information</h3>
 
-<div class="form-group">
-    {!! Form::label('World Page Image (Optional)') !!} {!! add_help('This image is used only on the world information pages.') !!}
-    <div>{!! Form::file('image') !!}</div>
-    <div class="text-muted">Recommended size: 200px x 200px</div>
-    @if($category->has_image)
-        <div class="form-check">
-            {!! Form::checkbox('remove_image', 1, false, ['class' => 'form-check-input']) !!}
-            {!! Form::label('remove_image', 'Remove current image', ['class' => 'form-check-label']) !!}
-        </div>
-    @endif
-</div>
+    <div class="form-group">
+        {!! Form::label('Name') !!}
+        {!! Form::text('name', $category->name, ['class' => 'form-control']) !!}
+    </div>
 
-<div class="form-group">
-    {!! Form::label('Description (Optional)') !!}
-    {!! Form::textarea('description', $category->description, ['class' => 'form-control wysiwyg']) !!}
-</div>
+    <div class="form-group">
+        {!! Form::label('World Page Image (Optional)') !!} {!! add_help('This image is used only on the world information pages.') !!}
+        <div>{!! Form::file('image') !!}</div>
+        <div class="text-muted">Recommended size: 200px x 200px</div>
+        @if ($category->has_image)
+            <div class="form-check">
+                {!! Form::checkbox('remove_image', 1, false, ['class' => 'form-check-input']) !!}
+                {!! Form::label('remove_image', 'Remove current image', ['class' => 'form-check-label']) !!}
+            </div>
+        @endif
+    </div>
 
-<div class="text-right">
-    {!! Form::submit($category->id ? 'Edit' : 'Create', ['class' => 'btn btn-primary']) !!}
-</div>
+    <div class="form-group">
+        {!! Form::label('Description (Optional)') !!}
+        {!! Form::textarea('description', $category->description, ['class' => 'form-control wysiwyg']) !!}
+    </div>
 
-{!! Form::close() !!}
+    <div class="form-group">
+        {!! Form::checkbox('is_visible', 1, $category->id ? $category->is_visible : 1, ['class' => 'form-check-input', 'data-toggle' => 'toggle']) !!}
+        {!! Form::label('is_visible', 'Is Visible', ['class' => 'form-check-label ml-3']) !!} {!! add_help('If turned off, the category will not be visible in the category list or available for selection in search. Permissioned staff will still be able to add traits to them, however.') !!}
+    </div>
 
-@if($category->id)
-    <h3>Preview</h3>
-    <div class="card mb-3">
-        <div class="card-body">
-            @include('world._entry', ['imageUrl' => $category->categoryImageUrl, 'name' => $category->displayName, 'description' => $category->parsed_description])
-        </div>
+    <div class="text-right">
+        {!! Form::submit($category->id ? 'Edit' : 'Create', ['class' => 'btn btn-primary']) !!}
     </div>
-@endif
 
+    {!! Form::close() !!}
+
+    @if ($category->id)
+        <h3>Preview</h3>
+        <div class="card mb-3">
+            <div class="card-body">
+                @include('world._entry', [
+                    'imageUrl' => $category->categoryImageUrl,
+                    'name' => $category->displayName,
+                    'description' => $category->parsed_description,
+                    'searchUrl' => $category->searchUrl,
+                    'visible' => $category->is_visible,
+                ])
+            </div>
+        </div>
+    @endif
 @endsection
 
 @section('scripts')
-@parent
-<script>
-$( document ).ready(function() {    
-    $('.delete-category-button').on('click', function(e) {
-        e.preventDefault();
-        loadModal("{{ url('admin/data/trait-categories/delete') }}/{{ $category->id }}", 'Delete Category');
-    });
-});
-    
-</script>
-@endsection
\ No newline at end of file
+    @parent
+    <script>
+        $(document).ready(function() {
+            $('.delete-category-button').on('click', function(e) {
+                e.preventDefault();
+                loadModal("{{ url('admin/data/trait-categories/delete') }}/{{ $category->id }}", 'Delete Category');
+            });
+        });
+    </script>
+@endsection
diff --git a/resources/views/admin/features/feature_categories.blade.php b/resources/views/admin/features/feature_categories.blade.php
index 6c7f8acb7e..b5fbeb4a22 100644
--- a/resources/views/admin/features/feature_categories.blade.php
+++ b/resources/views/admin/features/feature_categories.blade.php
@@ -1,65 +1,73 @@
 @extends('admin.layout')
 
-@section('admin-title') Trait Categories @endsection
+@section('admin-title')
+    Trait Categories
+@endsection
 
 @section('admin-content')
-{!! breadcrumbs(['Admin Panel' => 'admin', 'Trait Categories' => 'admin/data/trait-categories']) !!}
+    {!! breadcrumbs(['Admin Panel' => 'admin', 'Trait Categories' => 'admin/data/trait-categories']) !!}
 
-<h1>Trait Categories</h1>
+    <h1>Trait Categories</h1>
 
-<p>This is a list of trait categories that will be used to sort traits in the inventory. Creating trait categories is entirely optional, but recommended if you have a lot of traits in the game.</p> 
-<p>The sorting order reflects the order in which the trait categories will be displayed in the inventory, as well as on the world pages.</p>
+    <p>This is a list of trait categories that will be used to sort traits in the inventory. Creating trait categories is entirely optional, but recommended if you have a lot of traits in the game.</p>
+    <p>The sorting order reflects the order in which the trait categories will be displayed in the inventory, as well as on the world pages.</p>
 
-<div class="text-right mb-3"><a class="btn btn-primary" href="{{ url('admin/data/trait-categories/create') }}"><i class="fas fa-plus"></i> Create New Trait Category</a></div>
-@if(!count($categories))
-    <p>No trait categories found.</p>
-@else 
-    <table class="table table-sm category-table">
-        <tbody id="sortable" class="sortable">
-            @foreach($categories as $category)
-                <tr class="sort-item" data-id="{{ $category->id }}">
-                    <td>
-                        <a class="fas fa-arrows-alt-v handle mr-3" href="#"></a>
-                        {!! $category->displayName !!}
-                    </td>
-                    <td class="text-right">
-                        <a href="{{ url('admin/data/trait-categories/edit/'.$category->id) }}" class="btn btn-primary">Edit</a>
-                    </td>
-                </tr>
-            @endforeach
-        </tbody>
+    <div class="text-right mb-3"><a class="btn btn-primary" href="{{ url('admin/data/trait-categories/create') }}"><i class="fas fa-plus"></i> Create New Trait Category</a></div>
+    @if (!count($categories))
+        <p>No trait categories found.</p>
+    @else
+        <table class="table table-sm category-table">
+            <tbody id="sortable" class="sortable">
+                @foreach ($categories as $category)
+                    <tr class="sort-item" data-id="{{ $category->id }}">
+                        <td>
+                            <a class="fas fa-arrows-alt-v handle mr-3" href="#"></a>
+                            @if (!$category->is_visible)
+                                <i class="fas fa-eye-slash mr-1"></i>
+                            @endif
+                            {!! $category->displayName !!}
+                        </td>
+                        <td class="text-right">
+                            <a href="{{ url('admin/data/trait-categories/edit/' . $category->id) }}" class="btn btn-primary">Edit</a>
+                        </td>
+                    </tr>
+                @endforeach
+            </tbody>
 
-    </table>
-    <div class="mb-4">
-        {!! Form::open(['url' => 'admin/data/trait-categories/sort']) !!}
-        {!! Form::hidden('sort', '', ['id' => 'sortableOrder']) !!}
-        {!! Form::submit('Save Order', ['class' => 'btn btn-primary']) !!}
-        {!! Form::close() !!}
-    </div>
-@endif
+        </table>
+        <div class="mb-4">
+            {!! Form::open(['url' => 'admin/data/trait-categories/sort']) !!}
+            {!! Form::hidden('sort', '', ['id' => 'sortableOrder']) !!}
+            {!! Form::submit('Save Order', ['class' => 'btn btn-primary']) !!}
+            {!! Form::close() !!}
+        </div>
+    @endif
 
 @endsection
 
 @section('scripts')
-@parent
-<script>
-
-$( document ).ready(function() {
-    $('.handle').on('click', function(e) {
-        e.preventDefault();
-    });
-    $( "#sortable" ).sortable({
-        items: '.sort-item',
-        handle: ".handle",
-        placeholder: "sortable-placeholder",
-        stop: function( event, ui ) {
-            $('#sortableOrder').val($(this).sortable("toArray", {attribute:"data-id"}));
-        },
-        create: function() {
-            $('#sortableOrder').val($(this).sortable("toArray", {attribute:"data-id"}));
-        }
-    });
-    $( "#sortable" ).disableSelection();
-});
-</script>
-@endsection
\ No newline at end of file
+    @parent
+    <script>
+        $(document).ready(function() {
+            $('.handle').on('click', function(e) {
+                e.preventDefault();
+            });
+            $("#sortable").sortable({
+                items: '.sort-item',
+                handle: ".handle",
+                placeholder: "sortable-placeholder",
+                stop: function(event, ui) {
+                    $('#sortableOrder').val($(this).sortable("toArray", {
+                        attribute: "data-id"
+                    }));
+                },
+                create: function() {
+                    $('#sortableOrder').val($(this).sortable("toArray", {
+                        attribute: "data-id"
+                    }));
+                }
+            });
+            $("#sortable").disableSelection();
+        });
+    </script>
+@endsection
diff --git a/resources/views/admin/features/features.blade.php b/resources/views/admin/features/features.blade.php
index fbe196e5b3..a3db2168bf 100644
--- a/resources/views/admin/features/features.blade.php
+++ b/resources/views/admin/features/features.blade.php
@@ -1,21 +1,23 @@
 @extends('admin.layout')
 
-@section('admin-title') Traits @endsection
+@section('admin-title')
+    Traits
+@endsection
 
 @section('admin-content')
-{!! breadcrumbs(['Admin Panel' => 'admin', 'Traits' => 'admin/data/traits']) !!}
+    {!! breadcrumbs(['Admin Panel' => 'admin', 'Traits' => 'admin/data/traits']) !!}
 
-<h1>Traits</h1>
+    <h1>Traits</h1>
 
-<p>This is a list of traits that can be attached to characters. </p>
+    <p>This is a list of traits that can be attached to characters. </p>
 
-<div class="text-right mb-3">
-    <a class="btn btn-primary" href="{{ url('admin/data/trait-categories') }}"><i class="fas fa-folder"></i> Trait Categories</a>
-    <a class="btn btn-primary" href="{{ url('admin/data/traits/create') }}"><i class="fas fa-plus"></i> Create New Trait</a>
-</div>
+    <div class="text-right mb-3">
+        <a class="btn btn-primary" href="{{ url('admin/data/trait-categories') }}"><i class="fas fa-folder"></i> Trait Categories</a>
+        <a class="btn btn-primary" href="{{ url('admin/data/traits/create') }}"><i class="fas fa-plus"></i> Create New Trait</a>
+    </div>
 
-<div>
-    {!! Form::open(['method' => 'GET', 'class' => 'form-inline justify-content-end']) !!}
+    <div>
+        {!! Form::open(['method' => 'GET', 'class' => 'form-inline justify-content-end']) !!}
         <div class="form-group mr-3 mb-3">
             {!! Form::text('name', Request::get('name'), ['class' => 'form-control', 'placeholder' => 'Name']) !!}
         </div>
@@ -29,43 +31,76 @@
             {!! Form::select('rarity_id', $rarities, Request::get('rarity_id'), ['class' => 'form-control']) !!}
         </div>
         <div class="form-group mr-3 mb-3">
-            {!! Form::select('feature_category_id', $categories, Request::get('name'), ['class' => 'form-control']) !!}
+            {!! Form::select('feature_category_id', $categories, Request::get('feature_category_id'), ['class' => 'form-control']) !!}
         </div>
         <div class="form-group mb-3">
             {!! Form::submit('Search', ['class' => 'btn btn-primary']) !!}
         </div>
-    {!! Form::close() !!}
-</div>
+        {!! Form::close() !!}
+    </div>
 
-@if(!count($features))
-    <p>No traits found.</p>
-@else
-    {!! $features->render() !!}
-      <div class="row ml-md-2">
-        <div class="d-flex row flex-wrap col-12 pb-1 px-0 ubt-bottom">
-          <div class="col-12 col-md-3 font-weight-bold">Name</div>
-          <div class="col-6 col-md-2 font-weight-bold">Rarity</div>
-          <div class="col-6 col-md-2 font-weight-bold">Category</div>
-          <div class="col-6 col-md-2 font-weight-bold">Species</div>
-          <div class="col-6 col-md-2 font-weight-bold">Subtype</div>
-        </div>
-        @foreach($features as $feature)
-        <div class="d-flex row flex-wrap col-12 mt-1 pt-1 px-0 ubt-top">
-          <div class="col-12 col-md-3">{{ $feature->name }}</div>
-          <div class="col-6 col-md-2">{!! $feature->rarity->displayName !!}</div>
-          <div class="col-6 col-md-2">{{ $feature->category ? $feature->category->name : '---' }}</div>
-          <div class="col-6 col-md-2">{{ $feature->species ? $feature->species->name : '---' }}</div>
-          <div class="col-6 col-md-2">{{ $feature->subtype ? $feature->subtype->name : '---' }}</div>
-          <div class="col-12 col-md-1"><a href="{{ url('admin/data/traits/edit/'.$feature->id) }}" class="btn btn-primary py-0 px-1 w-100">Edit</a></div>
+    @if (!count($features))
+        <p>No traits found.</p>
+    @else
+        {!! $features->render() !!}
+        <div class="mb-4 logs-table">
+            <div class="logs-table-header">
+                <div class="row">
+                    <div class="col-12 col-md-3">
+                        <div class="logs-table-cell">Name</div>
+                    </div>
+                    <div class="col-6 col-md-2">
+                        <div class="logs-table-cell">Rarity</div>
+                    </div>
+                    <div class="col-6 col-md-2">
+                        <div class="logs-table-cell">Category</div>
+                    </div>
+                    <div class="col-6 col-md-2">
+                        <div class="logs-table-cell">Species</div>
+                    </div>
+                    <div class="col-6 col-md-2">
+                        <div class="logs-table-cell">Subtype</div>
+                    </div>
+                </div>
+            </div>
+            <div class="logs-table-body">
+                @foreach ($features as $feature)
+                    <div class="logs-table-row">
+                        <div class="row flex-wrap">
+                            <div class="col-12 col-md-3">
+                                <div class="logs-table-cell">
+                                    @if (!$feature->is_visible)
+                                        <i class="fas fa-eye-slash mr-1"></i>
+                                    @endif
+                                    {{ $feature->name }}
+                                </div>
+                            </div>
+                            <div class="col-6 col-md-2">
+                                <div class="logs-table-cell">{!! $feature->rarity->displayName !!}</div>
+                            </div>
+                            <div class="col-6 col-md-2">
+                                <div class="logs-table-cell">{{ $feature->category ? $feature->category->name : '---' }}</div>
+                            </div>
+                            <div class="col-6 col-md-2">
+                                <div class="logs-table-cell">{{ $feature->species ? $feature->species->name : '---' }}</div>
+                            </div>
+                            <div class="col-6 col-md-2">
+                                <div class="logs-table-cell">{{ $feature->subtype ? $feature->subtype->name : '---' }}</div>
+                            </div>
+                            <div class="col-12 col-md-1">
+                                <div class="logs-table-cell"><a href="{{ url('admin/data/traits/edit/' . $feature->id) }}" class="btn btn-primary py-0 px-1 w-100">Edit</a></div>
+                            </div>
+                        </div>
+                    </div>
+                @endforeach
+            </div>
         </div>
-        @endforeach
-      </div>
-    {!! $features->render() !!}
-    <div class="text-center mt-4 small text-muted">{{ $features->total() }} result{{ $features->total() == 1 ? '' : 's' }} found.</div>
-@endif
+        {!! $features->render() !!}
+        <div class="text-center mt-4 small text-muted">{{ $features->total() }} result{{ $features->total() == 1 ? '' : 's' }} found.</div>
+    @endif
 
 @endsection
 
 @section('scripts')
-@parent
+    @parent
 @endsection
diff --git a/resources/views/admin/files/images.blade.php b/resources/views/admin/files/images.blade.php
index 1871aa58b4..d31734fc21 100644
--- a/resources/views/admin/files/images.blade.php
+++ b/resources/views/admin/files/images.blade.php
@@ -1,50 +1,52 @@
 @extends('admin.layout')
 
-@section('admin-title') Site Images @endsection
+@section('admin-title')
+    Site Images
+@endsection
 
 @section('admin-content')
-{!! breadcrumbs(['Admin Panel' => 'admin', 'Site Images & CSS' => 'admin/images']) !!}
+    {!! breadcrumbs(['Admin Panel' => 'admin', 'Site Images & CSS' => 'admin/images']) !!}
 
-<h1>Site Images</h1>
+    <h1>Site Images</h1>
 
-<p>Upload images to replace the current site images. The specifications for each image are noted in the descriptions for each image. (Maximum size of an image is {{ min(ini_get("upload_max_filesize"), ini_get("post_max_size")) }}B.)</p>
+    <p>Upload images to replace the current site images. The specifications for each image are noted in the descriptions for each image. (Maximum size of an image is {{ min(ini_get('upload_max_filesize'), ini_get('post_max_size')) }}B.)</p>
 
-@foreach($images as $key=>$image)
-    <div class="card mb-3">
-        <div class="card-body">
-            <div class="d-flex">
-                <div class="mr-2" style="width: 200px;"><img src="{{ asset('images/'.$image['filename']) }}" class="mw-100" alt="Site image: {{ $image['name'] }}"/></div>
-                <div style="width: 100%;">
-                    <h3 class="card-heading">{{ $image['name'] }} <a href="{{ asset('images/'.$image['filename']) }}" class="btn btn-info btn-sm float-right">View Current</a></h3>
-                    <p>{{ $image['description'] }}</p>
-                    {!! Form::open(['url' => 'admin/images/upload', 'files' => true]) !!}
+    @foreach ($images as $key => $image)
+        <div class="card mb-3">
+            <div class="card-body">
+                <div class="d-flex">
+                    <div class="mr-2" style="width: 200px;"><img src="{{ asset('images/' . $image['filename']) }}" class="mw-100" alt="Site image: {{ $image['name'] }}" /></div>
+                    <div style="width: 100%;">
+                        <h3 class="card-heading">{{ $image['name'] }} <a href="{{ asset('images/' . $image['filename']) }}" class="btn btn-info btn-sm float-right">View Current</a></h3>
+                        <p>{{ $image['description'] }}</p>
+                        {!! Form::open(['url' => 'admin/images/upload', 'files' => true]) !!}
                         <div class="d-flex">
                             {!! Form::file('file', ['class' => 'form-control mr-2']) !!}
                             {!! Form::submit('Upload', ['class' => 'btn btn-primary']) !!}
                         </div>
                         {!! Form::hidden('key', $key) !!}
-                    {!! Form::close() !!}
+                        {!! Form::close() !!}
+                    </div>
                 </div>
             </div>
         </div>
-    </div>
-@endforeach
+    @endforeach
 
-<h1>Site CSS</h1>
+    <h1>Site CSS</h1>
 
-<p>A custom CSS file can be uploaded here. This will be added to the page after the inclusion of other CSS files, and reuploading the file will replace the original. Making changes to the site code is recommended for large changes to the layout, but this upload can be used for simple updates.</p>
-<div class="card mb-3">
-    <div class="card-body">
-        <div>
-            <h3 class="card-heading">CSS <a href="{{ asset('css/custom.css') }}" class="btn btn-info btn-sm float-right">View Current</a></h3>
-            {!! Form::open(['url' => 'admin/images/upload/css', 'files' => true]) !!}
+    <p>A custom CSS file can be uploaded here. This will be added to the page after the inclusion of other CSS files, and reuploading the file will replace the original. Making changes to the site code is recommended for large changes to the layout, but
+        this upload can be used for simple updates.</p>
+    <div class="card mb-3">
+        <div class="card-body">
+            <div>
+                <h3 class="card-heading">CSS <a href="{{ asset('css/custom.css') }}" class="btn btn-info btn-sm float-right">View Current</a></h3>
+                {!! Form::open(['url' => 'admin/images/upload/css', 'files' => true]) !!}
                 <div class="d-flex">
                     {!! Form::file('file', ['class' => 'form-control mr-2']) !!}
                     {!! Form::submit('Upload', ['class' => 'btn btn-primary']) !!}
                 </div>
-            {!! Form::close() !!}
+                {!! Form::close() !!}
+            </div>
         </div>
     </div>
-</div>
-
 @endsection
diff --git a/resources/views/admin/files/index.blade.php b/resources/views/admin/files/index.blade.php
index 69d46a6d01..0c83b15966 100644
--- a/resources/views/admin/files/index.blade.php
+++ b/resources/views/admin/files/index.blade.php
@@ -1,69 +1,79 @@
 @extends('admin.layout')
 
-@section('admin-title') File Manager @endsection
+@section('admin-title')
+    File Manager
+@endsection
 
 @section('admin-content')
-{!! breadcrumbs(['Admin Panel' => 'admin', 'Files' => 'admin/files'] + ($folder ? [$folder => 'admin/files/'.$folder] : [])) !!}
+    {!! breadcrumbs(['Admin Panel' => 'admin', 'Files' => 'admin/files'] + ($folder ? [$folder => 'admin/files/' . $folder] : [])) !!}
 
-<h1>File Manager / {!! $folder ? $folder.' <a href="'.url('admin/files/').'" class="btn btn-success float-right">Back to Root</a>' : 'Root' !!}</h1>
+    <h1>File Manager / {!! $folder ? $folder . ' <a href="' . url('admin/files/') . '" class="btn btn-success float-right">Back to Root</a>' : 'Root' !!}</h1>
 
-<p>This manager allows you to upload files onto your server and create folders up to one level deep. Note that a folder containing files cannot be renamed or deleted.</p>
+    <p>This manager allows you to upload files onto your server and create folders up to one level deep. Note that a folder containing files cannot be renamed or deleted.</p>
 
 
-@if(!$folder)
-    <div class="text-right mb-3"><a class="btn btn-outline-primary" id="createFolder" href="#"><i class="fas fa-plus"></i> Create New Folder</a></div>
-    <div class="row mb-3">
-        @foreach($folders as $f)
-            <div class="col-md-4 col-xs-4 col-6 mb-3">
-                <div class="card">
-                    <div class="card-body">
-                        <a href="{{ url('admin/files/'.basename($f)) }}"><i class="fas fa-folder"></i> {{ basename($f) }}</a>
+    @if (!$folder)
+        <div class="text-right mb-3"><a class="btn btn-outline-primary" id="createFolder" href="#"><i class="fas fa-plus"></i> Create New Folder</a></div>
+        <div class="row mb-3">
+            @foreach ($folders as $f)
+                <div class="col-md-4 col-xs-4 col-6 mb-3">
+                    <div class="card">
+                        <div class="card-body">
+                            <a href="{{ url('admin/files/' . basename($f)) }}"><i class="fas fa-folder"></i> {{ basename($f) }}</a>
+                        </div>
                     </div>
                 </div>
+            @endforeach
+        </div>
+    @elseif(!count($files))
+        <div class="text-right mb-3">
+            <a class="btn btn-outline-primary" id="renameFolder" href="#">Rename Folder</a>
+            <a class="btn btn-outline-danger" id="deleteFolder" href="#">Delete Folder</a>
+        </div>
+    @endif
+
+    <div class="text-right mb-3"><a href="#" class="btn btn-outline-primary" id="uploadButton"><i class="fas fa-plus"></i> Upload File</a></div>
+    <div class="mb-4 logs-table">
+        <div class="logs-table-header">
+            <div class="row">
+                <div class="col-6 col-md-7">
+                    <div class="logs-table-cell">Files</div>
+                </div>
+                <div class="col-6 col-md-5">
+                    <div class="logs-table-cell"></div>
+                </div>
             </div>
-        @endforeach
-    </div>
-@elseif(!count($files))
-    <div class="text-right mb-3">
-        <a class="btn btn-outline-primary" id="renameFolder" href="#">Rename Folder</a>
-        <a class="btn btn-outline-danger" id="deleteFolder" href="#">Delete Folder</a>
-    </div>
-@endif
-
-<div class="text-right mb-3"><a href="#" class="btn btn-outline-primary" id="uploadButton"><i class="fas fa-plus"></i> Upload File</a></div>
-<table class="table table-sm">
-    <thead>
-        <tr>
-            <th>Files</th>
-            <th></th>
-        </tr>
-    </thead>
-    <tbody>
-        @foreach($files as $file)
-            <tr>
-                <td>
-                    <a href="{{ asset('files/'.($folder ? $folder.'/' : '').$file) }}">{{ $file }}</a>
-                </td>
-                <td class="text-right">
-                    <a href="#" class="btn btn-outline-primary btn-sm move-file" data-name="{{ $file }}" data-folder="{{ $folder }}">Move</a>
-                    <a href="#" class="btn btn-outline-primary btn-sm rename-file" data-name="{{ $file }}" data-folder="{{ $folder }}">Rename</a>
-                    <a href="#" class="btn btn-outline-danger btn-sm delete-file" data-name="{{ $file }}" data-folder="{{ $folder }}">Delete</a>
-                </td>
-            </tr>
-        @endforeach
-    </tbody>
-</table>
-
-@if($folder && !count($files))
-    <div class="modal fade" id="editFolderModal" tabindex="-1" role="dialog">
-        <div class="modal-dialog" role="document">
-            <div class="modal-content">
-                <div class="modal-header">
-                    <span class="modal-title h5 mb-0" id="editFolderModalTitle"></span>
-                    <button type="button" class="close" data-dismiss="modal">&times;</button>
+        </div>
+        <div class="logs-table-body">
+            @foreach ($files as $file)
+                <div class="logs-table-row">
+                    <div class="row flex-wrap">
+                        <div class="col-6 col-md-7">
+                            <div class="logs-table-cell"><a href="{{ asset('files/' . ($folder ? $folder . '/' : '') . $file) }}">{{ $file }}</a></div>
+                        </div>
+                        <div class="col-6 col-md-5">
+                            <div class="logs-table-cell text-right">
+                                <a href="#" class="btn btn-outline-primary btn-sm move-file" data-name="{{ $file }}" data-folder="{{ $folder }}">Move</a>
+                                <a href="#" class="btn btn-outline-primary btn-sm rename-file" data-name="{{ $file }}" data-folder="{{ $folder }}">Rename</a>
+                                <a href="#" class="btn btn-outline-danger btn-sm delete-file" data-name="{{ $file }}" data-folder="{{ $folder }}">Delete</a>
+                            </div>
+                        </div>
+                    </div>
                 </div>
-                <div class="modal-body">
-                    {!! Form::open(['url' => 'admin/files/folder/rename', 'id' => 'renameFolderForm', 'class' => 'folder-form']) !!}
+            @endforeach
+        </div>
+    </div>
+
+    @if ($folder && !count($files))
+        <div class="modal fade" id="editFolderModal" tabindex="-1" role="dialog">
+            <div class="modal-dialog" role="document">
+                <div class="modal-content">
+                    <div class="modal-header">
+                        <span class="modal-title h5 mb-0" id="editFolderModalTitle"></span>
+                        <button type="button" class="close" data-dismiss="modal">&times;</button>
+                    </div>
+                    <div class="modal-body">
+                        {!! Form::open(['url' => 'admin/files/folder/rename', 'id' => 'renameFolderForm', 'class' => 'folder-form']) !!}
                         <p>This will rename the folder. Folders containing files cannot be renamed. Use alphanumeric characters and dashes/underscores only.</p>
                         <div class="form-group">
                             {!! Form::label('name', 'New Name') !!}
@@ -73,28 +83,28 @@
                             {!! Form::submit('Rename', ['class' => 'btn btn-primary']) !!}
                         </div>
                         {!! Form::hidden('folder', $folder, ['class' => 'edit-folder']) !!}
-                    {!! Form::close() !!}
-                    {!! Form::open(['url' => 'admin/files/folder/delete', 'id' => 'deleteFolderForm', 'class' => 'folder-form']) !!}
+                        {!! Form::close() !!}
+                        {!! Form::open(['url' => 'admin/files/folder/delete', 'id' => 'deleteFolderForm', 'class' => 'folder-form']) !!}
                         <p>This will permanently delete <strong>{{ $folder }}</strong>. Are you sure?</p>
                         <div class="text-right">
                             {!! Form::submit('Delete', ['class' => 'btn btn-danger']) !!}
                         </div>
                         {!! Form::hidden('folder', $folder, ['class' => 'edit-folder']) !!}
-                    {!! Form::close() !!}
+                        {!! Form::close() !!}
+                    </div>
                 </div>
             </div>
         </div>
-    </div>
-@elseif(!$folder)
-    <div class="modal fade" id="createModal" tabindex="-1" role="dialog">
-        <div class="modal-dialog" role="document">
-            <div class="modal-content">
-                <div class="modal-header">
-                    <span class="modal-title h5 mb-0">Create Folder</span>
-                    <button type="button" class="close" data-dismiss="modal">&times;</button>
-                </div>
-                <div class="modal-body">
-                    {!! Form::open(['url' => 'admin/files/folder/create']) !!}
+    @elseif(!$folder)
+        <div class="modal fade" id="createModal" tabindex="-1" role="dialog">
+            <div class="modal-dialog" role="document">
+                <div class="modal-content">
+                    <div class="modal-header">
+                        <span class="modal-title h5 mb-0">Create Folder</span>
+                        <button type="button" class="close" data-dismiss="modal">&times;</button>
+                    </div>
+                    <div class="modal-body">
+                        {!! Form::open(['url' => 'admin/files/folder/create']) !!}
                         <p>This will create a new folder in the root folder. Use alphanumeric characters and dashes/underscores only.</p>
                         <div class="form-group">
                             {!! Form::label('name', 'Folder Name') !!}
@@ -103,31 +113,31 @@
                         <div class="text-right">
                             {!! Form::submit('Create', ['class' => 'btn btn-primary']) !!}
                         </div>
-                    {!! Form::close() !!}
+                        {!! Form::close() !!}
+                    </div>
                 </div>
             </div>
         </div>
-    </div>
-@endif
-
-<div class="modal fade" id="editModal" tabindex="-1" role="dialog">
-    <div class="modal-dialog" role="document">
-        <div class="modal-content">
-            <div class="modal-header">
-                <span class="modal-title h5 mb-0" id="editModalTitle"></span>
-                <button type="button" class="close" data-dismiss="modal">&times;</button>
-            </div>
-            <div class="modal-body">
-                {{-- Move a file --}}
-                {!! Form::open(['url' => 'admin/files/move', 'id' => 'moveForm', 'class' => 'file-form']) !!}
+    @endif
+
+    <div class="modal fade" id="editModal" tabindex="-1" role="dialog">
+        <div class="modal-dialog" role="document">
+            <div class="modal-content">
+                <div class="modal-header">
+                    <span class="modal-title h5 mb-0" id="editModalTitle"></span>
+                    <button type="button" class="close" data-dismiss="modal">&times;</button>
+                </div>
+                <div class="modal-body">
+                    {{-- Move a file --}}
+                    {!! Form::open(['url' => 'admin/files/move', 'id' => 'moveForm', 'class' => 'file-form']) !!}
                     <p>This will move the file. If a file exists in the destination folder with the same name, it will be overwritten.</p>
                     <div class="form-group">
                         {!! Form::label('folder', 'Destination Folder') !!}
-                        <?php 
-                            $folderSelection = ['root' => 'Root'];
-                            foreach($folders as $f) {
-                                $folderSelection[basename($f)] = basename($f);
-                            }
+                        <?php
+                        $folderSelection = ['root' => 'Root'];
+                        foreach ($folders as $f) {
+                            $folderSelection[basename($f)] = basename($f);
+                        }
                         ?>
                         {!! Form::select('destination', $folderSelection, null, ['class' => 'form-control']) !!}
                     </div>
@@ -136,10 +146,10 @@
                     </div>
                     {!! Form::hidden('filename', '', ['class' => 'edit-filename']) !!}
                     {!! Form::hidden('folder', $folder, ['class' => 'edit-folder']) !!}
-                {!! Form::close() !!}
-                
-                {{-- Rename a file --}}
-                {!! Form::open(['url' => 'admin/files/rename', 'id' => 'renameForm', 'class' => 'file-form']) !!}
+                    {!! Form::close() !!}
+
+                    {{-- Rename a file --}}
+                    {!! Form::open(['url' => 'admin/files/rename', 'id' => 'renameForm', 'class' => 'file-form']) !!}
                     <p>This will rename the file. If a file exists in the same folder with the same name, it will be overwritten.</p>
                     <p>Use alphanumeric characters and dashes/underscores only. Include the file extension as well - you can change the file extension, but this is not recommended.</p>
                     <div class="form-group">
@@ -151,99 +161,121 @@
                     </div>
                     {!! Form::hidden('filename', '', ['class' => 'edit-filename']) !!}
                     {!! Form::hidden('folder', $folder, ['class' => 'edit-folder']) !!}
-                {!! Form::close() !!}
-                
-                {{-- Delete a file --}}
-                {!! Form::open(['url' => 'admin/files/delete', 'id' => 'deleteForm', 'class' => 'file-form']) !!}
+                    {!! Form::close() !!}
+
+                    {{-- Delete a file --}}
+                    {!! Form::open(['url' => 'admin/files/delete', 'id' => 'deleteForm', 'class' => 'file-form']) !!}
                     <p>This will permanently delete <strong id="deleteFilename"></strong>. Are you sure?</p>
                     <div class="text-right">
                         {!! Form::submit('Delete', ['class' => 'btn btn-danger']) !!}
                     </div>
                     {!! Form::hidden('filename', '', ['class' => 'edit-filename']) !!}
                     {!! Form::hidden('folder', $folder, ['class' => 'edit-folder']) !!}
-                {!! Form::close() !!}
-                
-                {{-- Upload a file --}}
-                {!! Form::open(['url' => 'admin/files/upload', 'id' => 'uploadForm', 'class' => 'file-form', 'files' => true]) !!}
-                    <p>Select a file to upload. (Maximum size {{ min(ini_get("upload_max_filesize"), ini_get("post_max_size")) }}B.)</p>
-                    <div class="form-group">
-                        {!! Form::file('file', ['class' => 'form-control']) !!}
+                    {!! Form::close() !!}
+
+                    {{-- Upload a file --}}
+                    {!! Form::open(['url' => 'admin/files/upload', 'id' => 'uploadForm', 'class' => 'file-form', 'files' => true]) !!}
+                    <p>Select a file to upload. (Maximum size {{ min(ini_get('upload_max_filesize'), ini_get('post_max_size')) }}B.)</p>
+                    <div id="fileList">
+                        <div class="d-flex mb-2">
+                            {!! Form::file('files[]', ['class' => 'form-control']) !!}
+                        </div>
                     </div>
                     <div class="text-right">
                         {!! Form::submit('Upload', ['class' => 'btn btn-primary']) !!}
                     </div>
                     {!! Form::hidden('folder', $folder, ['class' => 'edit-folder']) !!}
-                {!! Form::close() !!}
+                    <div class="btn btn-primary" id="add-file">
+                        Add File
+                    </div>
+                    {!! Form::close() !!}
+                    <div class="file-row hide mb-2">
+                        {!! Form::file('files[]', ['class' => 'form-control']) !!}
+                    </div>
+                </div>
             </div>
         </div>
     </div>
-</div>
 
 @endsection
 
 @section('scripts')
-<script>
-    $(document).ready(function() {
-        $('#createFolder').on('click', function(e) {
-            e.preventDefault();
-            $('#createModal').modal('show');
-        });
-        $('.move-file').on('click', function(e) {
-            e.preventDefault();
-            $('#editFileName').val($(this).data('name'));
-            
-            $('#moveForm').find('.edit-filename').val($(this).data('name'));
-            $('#editModalTitle').html('Move File');
-            $('.file-form').addClass('hide');
-            $('#moveForm').removeClass('hide');
-
-            $('#editModal').modal('show');
-        });
-        $('.rename-file').on('click', function(e) {
-            e.preventDefault();
-            $('#editFileName').val($(this).data('name'));
-            
-            $('#renameForm').find('.edit-filename').val($(this).data('name'));
-            $('#editModalTitle').html('Rename File');
-            $('.file-form').addClass('hide');
-            $('#renameForm').removeClass('hide');
-
-            $('#editModal').modal('show');
-        });
-        $('.delete-file').on('click', function(e) {
-            e.preventDefault();
-            $('#deleteForm').find('.edit-filename').val($(this).data('name'));
-            $('#deleteFilename').html($(this).data('name'));
-            $('#editModalTitle').html('Delete File');
-            $('.file-form').addClass('hide');
-            $('#deleteForm').removeClass('hide');
-
-            $('#editModal').modal('show');
-        });
-        $('#uploadButton').on('click', function(e) {
-            e.preventDefault();
-            $('#editModalTitle').html('Upload File');
-            $('.file-form').addClass('hide');
-            $('#uploadForm').removeClass('hide');
+    <script>
+        $(document).ready(function() {
+            //////////
+            $('#add-file').on('click', function(e) {
+                e.preventDefault();
+                addFileRow();
+            });
 
-            $('#editModal').modal('show');
-        });
-        $('#renameFolder').on('click', function(e) {
-            e.preventDefault();
-            $('#editFolderModalTitle').html('Rename Folder');
-            $('.folder-form').addClass('hide');
-            $('#renameFolderForm').removeClass('hide');
+            function addFileRow() {
+                var $clone = $('.file-row').clone();
+                $('#fileList').append($clone);
+                $clone.removeClass('hide file-row');
+                $clone.addClass('d-flex');
+            }
 
-            $('#editFolderModal').modal('show');
-        });
-        $('#deleteFolder').on('click', function(e) {
-            e.preventDefault();
-            $('#editFolderModalTitle').html('Delete Folder');
-            $('.folder-form').addClass('hide');
-            $('#deleteFolderForm').removeClass('hide');
+            /////////
+            $('#createFolder').on('click', function(e) {
+                e.preventDefault();
+                $('#createModal').modal('show');
+            });
+            $('.move-file').on('click', function(e) {
+                e.preventDefault();
+                $('#editFileName').val($(this).data('name'));
 
-            $('#editFolderModal').modal('show');
+                $('#moveForm').find('.edit-filename').val($(this).data('name'));
+                $('#editModalTitle').html('Move File');
+                $('.file-form').addClass('hide');
+                $('#moveForm').removeClass('hide');
+
+                $('#editModal').modal('show');
+            });
+            $('.rename-file').on('click', function(e) {
+                e.preventDefault();
+                $('#editFileName').val($(this).data('name'));
+
+                $('#renameForm').find('.edit-filename').val($(this).data('name'));
+                $('#editModalTitle').html('Rename File');
+                $('.file-form').addClass('hide');
+                $('#renameForm').removeClass('hide');
+
+                $('#editModal').modal('show');
+            });
+            $('.delete-file').on('click', function(e) {
+                e.preventDefault();
+                $('#deleteForm').find('.edit-filename').val($(this).data('name'));
+                $('#deleteFilename').html($(this).data('name'));
+                $('#editModalTitle').html('Delete File');
+                $('.file-form').addClass('hide');
+                $('#deleteForm').removeClass('hide');
+
+                $('#editModal').modal('show');
+            });
+            $('#uploadButton').on('click', function(e) {
+                e.preventDefault();
+                $('#editModalTitle').html('Upload File');
+                $('.file-form').addClass('hide');
+                $('#uploadForm').removeClass('hide');
+
+                $('#editModal').modal('show');
+            });
+            $('#renameFolder').on('click', function(e) {
+                e.preventDefault();
+                $('#editFolderModalTitle').html('Rename Folder');
+                $('.folder-form').addClass('hide');
+                $('#renameFolderForm').removeClass('hide');
+
+                $('#editFolderModal').modal('show');
+            });
+            $('#deleteFolder').on('click', function(e) {
+                e.preventDefault();
+                $('#editFolderModalTitle').html('Delete Folder');
+                $('.folder-form').addClass('hide');
+                $('#deleteFolderForm').removeClass('hide');
+
+                $('#editFolderModal').modal('show');
+            });
         });
-    });
-</script>
-@endsection
\ No newline at end of file
+    </script>
+@endsection
diff --git a/resources/views/admin/galleries/_delete_gallery.blade.php b/resources/views/admin/galleries/_delete_gallery.blade.php
index 3a33083fe7..0add83e3c5 100644
--- a/resources/views/admin/galleries/_delete_gallery.blade.php
+++ b/resources/views/admin/galleries/_delete_gallery.blade.php
@@ -1,5 +1,5 @@
-@if($gallery)
-    {!! Form::open(['url' => 'admin/data/galleries/delete/'.$gallery->id]) !!}
+@if ($gallery)
+    {!! Form::open(['url' => 'admin/data/galleries/delete/' . $gallery->id]) !!}
 
     <p>You are about to delete the gallery <strong>{{ $gallery->name }}</strong>. This is not reversible. If submissions in this gallery exist, or this gallery has sub-galleries, you will not be able to delete this gallery.</p>
     <p>Are you sure you want to delete <strong>{{ $gallery->name }}</strong>?</p>
@@ -9,6 +9,6 @@
     </div>
 
     {!! Form::close() !!}
-@else 
+@else
     Invalid gallery selected.
-@endif
\ No newline at end of file
+@endif
diff --git a/resources/views/admin/galleries/_galleries.blade.php b/resources/views/admin/galleries/_galleries.blade.php
index e0a13d215a..75e6f527e4 100644
--- a/resources/views/admin/galleries/_galleries.blade.php
+++ b/resources/views/admin/galleries/_galleries.blade.php
@@ -1,32 +1,53 @@
-@if(isset($gallery->parent_id) && $gallery->parent)
-  <div class="col-12 column mw-100 pr-0 pt-4" style="flex-basis: 100%;">
-@else
-  <div class="pt-4" style="flex-basis: 100%;">
-@endif
+<div class="{{ isset($gallery->parent_id) && $gallery->parent ? 'col-12 column mw-100 pr-0' : '' }} pt-2" style="flex-basis: 100%;">
+    <div class="row flex-wrap">
+        <div class="col-6 col-md-1">
+            <div class="logs-table-cell">
+                {!! $gallery->submissions_open ? '<i class="text-success fas fa-check"></i>' : '-' !!}
+            </div>
+        </div>
+        <div class="col-6 col-md-2">
+            <div class="logs-table-cell">
+                <h6>
+                    @if (isset($gallery->parent_id) && $gallery->parent)
+                        <i class="fas fa-caret-right"></i>
+                    @endif
+                    {!! $gallery->displayName !!}
+                </h6>
+            </div>
+        </div>
+        <div class="col-6 col-md-1">
+            <div class="logs-table-cell">
+                {!! Settings::get('gallery_submissions_reward_currency') ? ($gallery->currency_enabled ? '<i class="text-success fas fa-check"></i>' : '-') : '' !!}
+            </div>
+        </div>
+        <div class="col-6 col-md-2">
+            <div class="logs-table-cell">
+                {!! Settings::get('gallery_submissions_require_approval') ? ($gallery->votes_required ? $gallery->votes_required : '-') : '' !!}
+            </div>
+        </div>
+        <div class="col-4 col-md-2">
+            <div class="logs-table-cell">
+                {!! $gallery->start_at ? pretty_date($gallery->start_at) : '-' !!}
+            </div>
+        </div>
+        <div class="col-4 col-md-2">
+            <div class="logs-table-cell">
+                {!! $gallery->end_at ? pretty_date($gallery->end_at) : '-' !!}
+            </div>
+        </div>
+        <div class="col-6 col-md-2 text-right">
+            <div class="logs-table-cell">
+                <a href="{{ url('admin/data/galleries/edit/' . $gallery->id) }}" class="btn btn-primary">Edit</a>
+            </div>
+        </div>
+    </div>
 
-<div class="d-flex row flex-wrap col-12 mt-1 pt-1 px-0 ubt-top">
-  <div class="col-6 col-md-1">{!! $gallery->submissions_open ? '<i class="text-success fas fa-check"></i>' : '-' !!}</div>
-  <div class="col-6 col-md-2">
-        <h6>
-            @if(isset($gallery->parent_id) && $gallery->parent) <i class="fas fa-caret-right"></i> @endif
-            {!! $gallery->displayName !!}
-        </h6>
-  </div>
-  <div class="col-6 col-md-1">{!! Settings::get('gallery_submissions_reward_currency') ? ($gallery->currency_enabled ? '<i class="text-success fas fa-check"></i>' : '-') : '' !!}</div>
-  <div class="col-6 col-md-2">{!! Settings::get('gallery_submissions_require_approval') ? ($gallery->votes_required ? $gallery->votes_required : '-') : '' !!}</div>
-  <div class="col-4 col-md-2">
-    {!! $gallery->start_at ? pretty_date($gallery->start_at) : '-' !!}
-  </div>
-  <div class="col-4 col-md-2">
-    {!! $gallery->end_at ? pretty_date($gallery->end_at) : '-' !!}
-  </div>
-  <div class="col-6 col-md-2 text-right"><a href="{{ url('admin/data/galleries/edit/'.$gallery->id) }}" class="btn btn-primary">Edit</a></div>
-</div>
-
-@if($gallery->children->count() > 0)
-    @foreach($gallery->children as $child)
-            @include('admin.galleries._galleries', ['gallery' => $child])
-    @endforeach
-@endif
+    @if ($gallery->children->count() > 0)
+        @foreach ($gallery->children as $child)
+            <div class="logs-table-row">
+                @include('admin.galleries._galleries', ['gallery' => $child])
+            </div>
+        @endforeach
+    @endif
 
 </div>
diff --git a/resources/views/admin/galleries/create_edit_gallery.blade.php b/resources/views/admin/galleries/create_edit_gallery.blade.php
index 68dc199893..4896f96af0 100644
--- a/resources/views/admin/galleries/create_edit_gallery.blade.php
+++ b/resources/views/admin/galleries/create_edit_gallery.blade.php
@@ -1,117 +1,118 @@
 @extends('admin.layout')
 
-@section('admin-title') Galleries @endsection
+@section('admin-title')
+    {{ $gallery->id ? 'Edit' : 'Create' }} Gallery
+@endsection
 
 @section('admin-content')
-{!! breadcrumbs(['Admin Panel' => 'admin', 'Galleries' => 'admin/data/galleries', ($gallery->id ? 'Edit' : 'Create').' Gallery' => $gallery->id ? 'admin/data/galleries/edit/'.$gallery->id : 'admin/data/galleries/create']) !!}
+    {!! breadcrumbs(['Admin Panel' => 'admin', 'Galleries' => 'admin/data/galleries', ($gallery->id ? 'Edit' : 'Create') . ' Gallery' => $gallery->id ? 'admin/data/galleries/edit/' . $gallery->id : 'admin/data/galleries/create']) !!}
 
-<h1>{{ $gallery->id ? 'Edit' : 'Create' }} Gallery
-    @if($gallery->id)
-        <a href="#" class="btn btn-danger float-right delete-gallery-button">Delete Gallery</a>
-    @endif
-</h1>
+    <h1>{{ $gallery->id ? 'Edit' : 'Create' }} Gallery
+        @if ($gallery->id)
+            <a href="#" class="btn btn-danger float-right delete-gallery-button">Delete Gallery</a>
+        @endif
+    </h1>
 
-{!! Form::open(['url' => $gallery->id ? 'admin/data/galleries/edit/'.$gallery->id : 'admin/data/galleries/create']) !!}
+    {!! Form::open(['url' => $gallery->id ? 'admin/data/galleries/edit/' . $gallery->id : 'admin/data/galleries/create']) !!}
 
-<h3>Basic Information</h3>
+    <h3>Basic Information</h3>
 
-<div class="row">
-    <div class="col-md">
-        <div class="form-group">
-            {!! Form::label('Name') !!}
-            {!! Form::text('name', $gallery->name, ['class' => 'form-control']) !!}
+    <div class="row">
+        <div class="col-md">
+            <div class="form-group">
+                {!! Form::label('Name') !!}
+                {!! Form::text('name', $gallery->name, ['class' => 'form-control']) !!}
+            </div>
         </div>
-    </div>
-    <div class="col-md-2">
-        <div class="form-group">
-            {!! Form::label('Sort (Optional)') !!} {!! add_help('Galleries are ordered first by sort number, then by name-- so galleries without a sort number are sorted only by name.') !!}
-            {!! Form::number('sort', $gallery->sort, ['class' => 'form-control']) !!}
+        <div class="col-md-2">
+            <div class="form-group">
+                {!! Form::label('Sort (Optional)') !!} {!! add_help('Galleries are ordered first by sort number, then by name-- so galleries without a sort number are sorted only by name.') !!}
+                {!! Form::number('sort', $gallery->sort, ['class' => 'form-control']) !!}
+            </div>
         </div>
     </div>
-</div>
 
-<div class="form-group">
-    {!! Form::label('Parent Gallery (Optional)') !!}
-    {!! Form::select('parent_id', $galleries, $gallery->parent_id, ['class' => 'form-control', 'placeholder' => 'Select a gallery']) !!}
-</div>
+    <div class="form-group">
+        {!! Form::label('Parent Gallery (Optional)') !!}
+        {!! Form::select('parent_id', $galleries, $gallery->parent_id, ['class' => 'form-control', 'placeholder' => 'Select a gallery']) !!}
+    </div>
 
-<div class="form-group">
-    {!! Form::label('Description (Optional)') !!}
-    {!! Form::textarea('description', $gallery->description, ['class' => 'form-control']) !!}
-</div>
+    <div class="form-group">
+        {!! Form::label('Description (Optional)') !!}
+        {!! Form::textarea('description', $gallery->description, ['class' => 'form-control']) !!}
+    </div>
 
-<div class="row">
-    <div class="col-md">
-        <div class="form-group">
-            {!! Form::checkbox('submissions_open', 1, $gallery->submissions_open, ['class' => 'form-check-input', 'data-toggle' => 'toggle']) !!}
-            {!! Form::label('submissions_open', 'Submissions Open', ['class' => 'form-check-label ml-3']) !!} {!! add_help('Whether or not users can submit to this gallery. Admins can submit regardless of this setting. Does not override global setting. Leave this on for time-limited galleries; users wll not be able to submit outside of the start and end times regardless of this setting, but will not be able to submit at all if this is off.') !!}
+    <div class="row">
+        <div class="col-md">
+            <div class="form-group">
+                {!! Form::checkbox('submissions_open', 1, $gallery->submissions_open, ['class' => 'form-check-input', 'data-toggle' => 'toggle']) !!}
+                {!! Form::label('submissions_open', 'Submissions Open', ['class' => 'form-check-label ml-3']) !!} {!! add_help(
+                    'Whether or not users can submit to this gallery. Admins can submit regardless of this setting. Does not override global setting. Leave this on for time-limited galleries; users wll not be able to submit outside of the start and end times regardless of this setting, but will not be able to submit at all if this is off.',
+                ) !!}
+            </div>
         </div>
-    </div>
-    @if(Settings::get('gallery_submissions_reward_currency'))
-    <div class="col-md">
-        <div class="form-group">
-            {!! Form::checkbox('currency_enabled', 1, $gallery->currency_enabled, ['class' => 'form-check-input', 'data-toggle' => 'toggle']) !!}
-            {!! Form::label('currency_enabled', 'Enable Currency Rewards', ['class' => 'form-check-label ml-3']) !!} {!! add_help('Whether or not submissions to this gallery are eligible for rewards of group currency.') !!}
+        @if (Settings::get('gallery_submissions_reward_currency'))
+            <div class="col-md">
+                <div class="form-group">
+                    {!! Form::checkbox('currency_enabled', 1, $gallery->currency_enabled, ['class' => 'form-check-input', 'data-toggle' => 'toggle']) !!}
+                    {!! Form::label('currency_enabled', 'Enable Currency Rewards', ['class' => 'form-check-label ml-3']) !!} {!! add_help('Whether or not submissions to this gallery are eligible for rewards of group currency.') !!}
+                </div>
+            </div>
+        @endif
+        <div class="col-md">
+            <div class="form-group">
+                {!! Form::checkbox('prompt_selection', 1, $gallery->prompt_selection, ['class' => 'form-check-input', 'data-toggle' => 'toggle']) !!}
+                {!! Form::label('prompt_selection', 'Prompt Selection', ['class' => 'form-check-label ml-3']) !!} {!! add_help(
+                    'Whether or not users can select a prompt to associate a gallery submission with when creating it. Gallery submissions will still auto-associate, prefix, etc. themselves with prompts if approved prompt submissions using the gallery submission exist.',
+                ) !!}
+            </div>
         </div>
     </div>
-    @endif
-    <div class="col-md">
+    @if (Settings::get('gallery_submissions_require_approval'))
         <div class="form-group">
-            {!! Form::checkbox('prompt_selection', 1, $gallery->prompt_selection, ['class' => 'form-check-input', 'data-toggle' => 'toggle']) !!}
-            {!! Form::label('prompt_selection', 'Prompt Selection', ['class' => 'form-check-label ml-3']) !!} {!! add_help('Whether or not users can select a prompt to associate a gallery submission with when creating it. Gallery submissions will still auto-associate, prefix, etc. themselves with prompts if approved prompt submissions using the gallery submission exist.') !!}
+            {!! Form::label('Votes Required') !!} {!! add_help('How many votes are required for submissions to this gallery to be accepted. Set to 0 to automatically accept submissions.') !!}
+            {!! Form::number('votes_required', $gallery->votes_required, ['class' => 'form-control']) !!}
         </div>
-    </div>
-</div>
-@if(Settings::get('gallery_submissions_require_approval'))
-    <div class="form-group">
-        {!! Form::label('Votes Required') !!} {!! add_help('How many votes are required for submissions to this gallery to be accepted. Set to 0 to automatically accept submissions.') !!}
-        {!! Form::number('votes_required', $gallery->votes_required, ['class' => 'form-control']) !!}
-    </div>
-@endif
+    @endif
 
-<div class="row">
-    <div class="col-md">
-        <div class="form-group">
-            {!! Form::label('hide_before_start', 'Hide Before Start Time', ['class' => 'form-check-label ml-3']) !!} {!! add_help('If hidden, the gallery will not be shown on the gallery list before the starting time is reached. A starting time needs to be set. Galleries are always visible after the end time.') !!}<br/>
-            {!! Form::checkbox('hide_before_start', 1, $gallery->id ? $gallery->hide_before_start : 0, ['class' => 'form-check-input', 'data-toggle' => 'toggle']) !!}
+    <div class="row">
+        <div class="col-md">
+            <div class="form-group">
+                {!! Form::label('hide_before_start', 'Hide Before Start Time', ['class' => 'form-check-label ml-3']) !!} {!! add_help('If hidden, the gallery will not be shown on the gallery list before the starting time is reached. A starting time needs to be set. Galleries are always visible after the end time.') !!}<br />
+                {!! Form::checkbox('hide_before_start', 1, $gallery->id ? $gallery->hide_before_start : 0, ['class' => 'form-check-input', 'data-toggle' => 'toggle']) !!}
+            </div>
         </div>
-    </div>
-    <div class="col-md">
-        <div class="form-group">
-            {!! Form::label('start_at', 'Start Time (Optional)') !!} {!! add_help('Pieces cannot be submitted to the gallery before the starting time.') !!}
-            {!! Form::text('start_at', $gallery->start_at, ['class' => 'form-control datepicker']) !!}
+        <div class="col-md">
+            <div class="form-group">
+                {!! Form::label('start_at', 'Start Time (Optional)') !!} {!! add_help('Pieces cannot be submitted to the gallery before the starting time.') !!}
+                {!! Form::text('start_at', $gallery->start_at, ['class' => 'form-control datepicker']) !!}
+            </div>
         </div>
-    </div>
-    <div class="col-md">
-        <div class="form-group">
-            {!! Form::label('end_at', 'End Time (Optional)') !!} {!! add_help('Pieces cannot be submitted to the gallery after the ending time.') !!}
-            {!! Form::text('end_at', $gallery->end_at, ['class' => 'form-control datepicker']) !!}
+        <div class="col-md">
+            <div class="form-group">
+                {!! Form::label('end_at', 'End Time (Optional)') !!} {!! add_help('Pieces cannot be submitted to the gallery after the ending time.') !!}
+                {!! Form::text('end_at', $gallery->end_at, ['class' => 'form-control datepicker']) !!}
+            </div>
         </div>
     </div>
-</div>
-
-<div class="text-right">
-    {!! Form::submit($gallery->id ? 'Edit' : 'Create', ['class' => 'btn btn-primary']) !!}
-</div>
 
-{!! Form::close() !!}
+    <div class="text-right">
+        {!! Form::submit($gallery->id ? 'Edit' : 'Create', ['class' => 'btn btn-primary']) !!}
+    </div>
 
+    {!! Form::close() !!}
 @endsection
 
 @section('scripts')
-@parent
-<script>
-$( document ).ready(function() {
-    $('.delete-gallery-button').on('click', function(e) {
-        e.preventDefault();
-        loadModal("{{ url('admin/data/galleries/delete') }}/{{ $gallery->id }}", 'Delete Gallery');
-    });
-
-    $( ".datepicker" ).datetimepicker({
-        dateFormat: "yy-mm-dd",
-        timeFormat: 'HH:mm:ss',
-    });
-});
-
-</script>
+    @parent
+    @include('widgets._datetimepicker_js')
+    <script>
+        $(document).ready(function() {
+            $('.delete-gallery-button').on('click', function(e) {
+                e.preventDefault();
+                loadModal("{{ url('admin/data/galleries/delete') }}/{{ $gallery->id }}", 'Delete Gallery');
+            });
+
+        });
+    </script>
 @endsection
diff --git a/resources/views/admin/galleries/galleries.blade.php b/resources/views/admin/galleries/galleries.blade.php
index 2379026f65..e4ff528694 100644
--- a/resources/views/admin/galleries/galleries.blade.php
+++ b/resources/views/admin/galleries/galleries.blade.php
@@ -1,34 +1,56 @@
 @extends('admin.layout')
 
-@section('admin-title') Galleries @endsection
+@section('admin-title')
+    Galleries
+@endsection
 
 @section('admin-content')
-{!! breadcrumbs(['Admin Panel' => 'admin', 'Galleries' => 'admin/data/galleries']) !!}
-
-<h1>Galleries</h1>
-
-<p>This is a list of galleries that art and literature can be submitted to.</p>
-
-<div class="text-right mb-3"><a class="btn btn-primary" href="{{ url('admin/data/galleries/create') }}"><i class="fas fa-plus"></i> Create New Gallery</a></div>
-@if(!count($galleries))
-    <p>No galleries found.</p>
-@else
-    {!! $galleries->render() !!}
-
-    <div class="d-flex row flex-wrap col-12 mt-1 pt-1 px-0 ubt-bottom">
-        <div class="col-6 col-md-1 font-weight-bold">Open</div>
-        <div class="col-6 col-md-2 font-weight-bold">Name</div>
-        <div class="col-6 col-md-1 font-weight-bold">{{ Settings::get('gallery_submissions_reward_currency') ? 'Rewards' : '' }}</div>
-        <div class="col-6 col-md-2 font-weight-bold">{{ Settings::get('gallery_submissions_require_approval') ? 'Votes Needed' : '' }}</div>
-        <div class="col-4 col-md-2 font-weight-bold">Start</div>
-        <div class="col-4 col-md-2 font-weight-bold">End</div>
-    </div>
-    @foreach($galleries as $gallery)
-        @include('admin.galleries._galleries', ['gallery' => $gallery])
-    @endforeach
-
-    {!! $galleries->render() !!}
-
-@endif
+    {!! breadcrumbs(['Admin Panel' => 'admin', 'Galleries' => 'admin/data/galleries']) !!}
+
+    <h1>Galleries</h1>
+
+    <p>This is a list of galleries that art and literature can be submitted to.</p>
+
+    <div class="text-right mb-3"><a class="btn btn-primary" href="{{ url('admin/data/galleries/create') }}"><i class="fas fa-plus"></i> Create New Gallery</a></div>
+
+    @if (!count($galleries))
+        <p>No galleries found.</p>
+    @else
+        {!! $galleries->render() !!}
+
+        <div class="mb-4 logs-table">
+            <div class="logs-table-header">
+                <div class="row">
+                    <div class="col-6 col-md-1">
+                        <div class="logs-table-cell">Open</div>
+                    </div>
+                    <div class="col-6 col-md-2">
+                        <div class="logs-table-cell">Name</div>
+                    </div>
+                    <div class="col-6 col-md-1">
+                        <div class="logs-table-cell">{{ Settings::get('gallery_submissions_reward_currency') ? 'Rewards' : '' }}</div>
+                    </div>
+                    <div class="col-6 col-md-2">
+                        <div class="logs-table-cell">{{ Settings::get('gallery_submissions_require_approval') ? 'Votes Needed' : '' }}</div>
+                    </div>
+                    <div class="col-4 col-md-2">
+                        <div class="logs-table-cell">Start</div>
+                    </div>
+                    <div class="col-4 col-md-2">
+                        <div class="logs-table-cell">End</div>
+                    </div>
+                </div>
+            </div>
+            <div class="logs-table-body">
+                @foreach ($galleries as $gallery)
+                    <div class="logs-table-row">
+                        @include('admin.galleries._galleries', ['gallery' => $gallery])
+                    </div>
+                @endforeach
+            </div>
+        </div>
+
+        {!! $galleries->render() !!}
+    @endif
 
 @endsection
diff --git a/resources/views/admin/galleries/submissions_currency_index.blade.php b/resources/views/admin/galleries/submissions_currency_index.blade.php
index bb2bcbc0c6..cc6dc7d5f1 100644
--- a/resources/views/admin/galleries/submissions_currency_index.blade.php
+++ b/resources/views/admin/galleries/submissions_currency_index.blade.php
@@ -1,41 +1,55 @@
 @extends('admin.layout')
 
-@section('admin-title') Gallery Currency Queue @endsection
+@section('admin-title')
+    Gallery Currency Queue
+@endsection
 
 @section('admin-content')
-{!! breadcrumbs(['Admin Panel' => 'admin', ($currency ? $currency->name : 'Gallery Currency').' Queue' => 'admin/gallery/currency/pending']) !!}
-
-<h1>
-    {!! $currency ? $currency->name : 'Gallery Currency' !!} Queue
-</h1>
-
-<ul class="nav nav-tabs mb-3">
-    <li class="nav-item">
-        <a class="nav-link {{ set_active('admin/gallery/currency/pending*') }} {{ set_active('admin/gallery/currency') }}" href="{{ url('admin/gallery/currency/pending') }}">Pending</a>
-    </li>
-    <li class="nav-item">
-        <a class="nav-link {{ set_active('admin/gallery/currency/valued*') }}" href="{{ url('admin/gallery/currency/valued') }}">Processed</a>
-    </li>
-</ul>
-
-<div>
-    {!! Form::open(['method' => 'GET', 'class' => 'form-inline justify-content-end']) !!}
+    {!! breadcrumbs(['Admin Panel' => 'admin', ($currency ? $currency->name : 'Gallery Currency') . ' Queue' => 'admin/gallery/currency/pending']) !!}
+
+    <h1>
+        {!! $currency ? $currency->name : 'Gallery Currency' !!} Queue
+    </h1>
+
+    <ul class="nav nav-tabs mb-3">
+        <li class="nav-item">
+            <a class="nav-link {{ set_active('admin/gallery/currency/pending*') }} {{ set_active('admin/gallery/currency') }}" href="{{ url('admin/gallery/currency/pending') }}">Pending</a>
+        </li>
+        <li class="nav-item">
+            <a class="nav-link {{ set_active('admin/gallery/currency/valued*') }}" href="{{ url('admin/gallery/currency/valued') }}">Processed</a>
+        </li>
+    </ul>
+
+    <div>
+        {!! Form::open(['method' => 'GET', 'class' => 'form-inline justify-content-end']) !!}
         <div class="form-group mr-sm-3 mb-3">
             {!! Form::select('gallery_id', $galleries, Request::get('gallery_id'), ['class' => 'form-control']) !!}
         </div>
-        <div class="form-group mb-3">
-            {!! Form::submit('Search', ['class' => 'btn btn-primary']) !!}
+        <div class="form-inline justify-content-end">
+            <div class="form-group ml-3 mb-3">
+                {!! Form::select(
+                    'sort',
+                    [
+                        'newest' => 'Newest First',
+                        'oldest' => 'Oldest First',
+                    ],
+                    Request::get('sort') ?: 'oldest',
+                    ['class' => 'form-control'],
+                ) !!}
+            </div>
+            <div class="form-group ml-3 mb-3">
+                {!! Form::submit('Search', ['class' => 'btn btn-primary']) !!}
+            </div>
         </div>
-    {!! Form::close() !!}
-</div>
-
-{!! $submissions->render() !!}
+        {!! Form::close() !!}
+    </div>
 
-@foreach($submissions as $key=>$submission)
-    @include('galleries._queue_submission', ['queue' => true])
-@endforeach
+    {!! $submissions->render() !!}
 
-{!! $submissions->render() !!}
-<div class="text-center mt-4 small text-muted">{{ $submissions->total() }} result{{ $submissions->total() == 1 ? '' : 's' }} found.</div>
+    @foreach ($submissions as $key => $submission)
+        @include('galleries._queue_submission', ['queue' => true])
+    @endforeach
 
+    {!! $submissions->render() !!}
+    <div class="text-center mt-4 small text-muted">{{ $submissions->total() }} result{{ $submissions->total() == 1 ? '' : 's' }} found.</div>
 @endsection
diff --git a/resources/views/admin/galleries/submissions_index.blade.php b/resources/views/admin/galleries/submissions_index.blade.php
index f8d7f496ac..d4f923cd4e 100644
--- a/resources/views/admin/galleries/submissions_index.blade.php
+++ b/resources/views/admin/galleries/submissions_index.blade.php
@@ -1,44 +1,58 @@
 @extends('admin.layout')
 
-@section('admin-title') Gallery Queue @endsection
+@section('admin-title')
+    Gallery Queue
+@endsection
 
 @section('admin-content')
-{!! breadcrumbs(['Admin Panel' => 'admin', 'Gallery Submissions Queue' => 'admin/gallery/submissions/pending']) !!}
-
-<h1>
-    Gallery Submission Queue
-</h1>
-
-<ul class="nav nav-tabs mb-3">
-    <li class="nav-item">
-        <a class="nav-link {{ set_active('admin/gallery/submissions/pending*') }} {{ set_active('admin/gallery/submissions') }}" href="{{ url('admin/gallery/submissions/pending') }}">Pending</a>
-    </li>
-    <li class="nav-item">
-        <a class="nav-link {{ set_active('admin/gallery/submissions/accepted*') }}" href="{{ url('admin/gallery/submissions/accepted') }}">Accepted</a>
-    </li>
-    <li class="nav-item">
-        <a class="nav-link {{ set_active('admin/gallery/submissions/rejected*') }}" href="{{ url('admin/gallery/submissions/rejected') }}">Rejected</a>
-    </li>
-</ul>
-
-<div>
-    {!! Form::open(['method' => 'GET', 'class' => 'form-inline justify-content-end']) !!}
+    {!! breadcrumbs(['Admin Panel' => 'admin', 'Gallery Submissions Queue' => 'admin/gallery/submissions/pending']) !!}
+
+    <h1>
+        Gallery Submission Queue
+    </h1>
+
+    <ul class="nav nav-tabs mb-3">
+        <li class="nav-item">
+            <a class="nav-link {{ set_active('admin/gallery/submissions/pending*') }} {{ set_active('admin/gallery/submissions') }}" href="{{ url('admin/gallery/submissions/pending') }}">Pending</a>
+        </li>
+        <li class="nav-item">
+            <a class="nav-link {{ set_active('admin/gallery/submissions/accepted*') }}" href="{{ url('admin/gallery/submissions/accepted') }}">Accepted</a>
+        </li>
+        <li class="nav-item">
+            <a class="nav-link {{ set_active('admin/gallery/submissions/rejected*') }}" href="{{ url('admin/gallery/submissions/rejected') }}">Rejected</a>
+        </li>
+    </ul>
+
+    <div>
+        {!! Form::open(['method' => 'GET', 'class' => 'form-inline justify-content-end']) !!}
         <div class="form-group mr-sm-3 mb-3">
             {!! Form::select('gallery_id', $galleries, Request::get('gallery_id'), ['class' => 'form-control']) !!}
         </div>
-        <div class="form-group mb-3">
-            {!! Form::submit('Search', ['class' => 'btn btn-primary']) !!}
+        <div class="form-inline justify-content-end">
+            <div class="form-group ml-3 mb-3">
+                {!! Form::select(
+                    'sort',
+                    [
+                        'newest' => 'Newest First',
+                        'oldest' => 'Oldest First',
+                    ],
+                    Request::get('sort') ?: 'oldest',
+                    ['class' => 'form-control'],
+                ) !!}
+            </div>
+            <div class="form-group ml-3 mb-3">
+                {!! Form::submit('Search', ['class' => 'btn btn-primary']) !!}
+            </div>
         </div>
-    {!! Form::close() !!}
-</div>
-
-{!! $submissions->render() !!}
+        {!! Form::close() !!}
+    </div>
 
-@foreach($submissions as $key=>$submission)
-    @include('galleries._queue_submission', ['queue' => true])
-@endforeach
+    {!! $submissions->render() !!}
 
-{!! $submissions->render() !!}
-<div class="text-center mt-4 small text-muted">{{ $submissions->total() }} result{{ $submissions->total() == 1 ? '' : 's' }} found.</div>
+    @foreach ($submissions as $key => $submission)
+        @include('galleries._queue_submission', ['queue' => true])
+    @endforeach
 
+    {!! $submissions->render() !!}
+    <div class="text-center mt-4 small text-muted">{{ $submissions->total() }} result{{ $submissions->total() == 1 ? '' : 's' }} found.</div>
 @endsection
diff --git a/resources/views/admin/grants/item_search.blade.php b/resources/views/admin/grants/item_search.blade.php
index be4478efb7..31201d3794 100644
--- a/resources/views/admin/grants/item_search.blade.php
+++ b/resources/views/admin/grants/item_search.blade.php
@@ -1,92 +1,119 @@
 @extends('admin.layout')
 
-@section('admin-title') Item Search @endsection
+@section('admin-title')
+    Item Search
+@endsection
 
 @section('admin-content')
-{!! breadcrumbs(['Admin Panel' => 'admin', 'Item Search' => 'admin']) !!}
+    {!! breadcrumbs(['Admin Panel' => 'admin', 'Item Search' => 'admin']) !!}
 
-<h1>Item Search</h1>
+    <h1>Item Search</h1>
 
-<p>Select an item to search for all occurrences of it in user and character inventories. It will only display currently extant stacks (where the count is more than zero). If a stack is currently "held" in a trade, design update, or submission, this will be stated and all held locations will be linked.</p>
+    <p>Select an item to search for all occurrences of it in user and character inventories. It will only display currently extant stacks (where the count is more than zero). If a stack is currently "held" in a trade, design update, or submission, this
+        will be stated and all held locations will be linked.</p>
 
-{!! Form::open(['method' => 'GET', 'class' => '']) !!}
-<div class="form-inline justify-content-end">
-    <div class="form-group ml-3 mb-3">
-        {!! Form::select('item_id', $items, Request::get('item_id'), ['class' => 'form-control selectize', 'placeholder' => 'Select an Item', 'style' => 'width: 25em; max-width: 100%;']) !!}
-    </div>
-    <div class="form-group ml-3 mb-3">
-        {!! Form::submit('Search', ['class' => 'btn btn-primary']) !!}
+    {!! Form::open(['method' => 'GET', 'class' => '']) !!}
+    <div class="form-inline justify-content-end">
+        <div class="form-group ml-3 mb-3">
+            {!! Form::select('item_id', $items, Request::get('item_id'), ['class' => 'form-control selectize', 'placeholder' => 'Select an Item', 'style' => 'width: 25em; max-width: 100%;']) !!}
+        </div>
+        <div class="form-group ml-3 mb-3">
+            {!! Form::submit('Search', ['class' => 'btn btn-primary']) !!}
+        </div>
     </div>
-</div>
-{!! Form::close() !!}
+    {!! Form::close() !!}
 
-@if($item)
-    <h3>{{ $item->name }}</h3>
+    @if ($item)
+        <h3>{{ $item->name }}</h3>
 
-    <p>There are currently {{ $userItems->pluck('count')->sum()+$characterItems->pluck('count')->sum() }} of this item owned by users and characters.</p>
+        <p>There are currently {{ $userItems->pluck('count')->sum() + $characterItems->pluck('count')->sum() }} of this item owned by users and characters.</p>
 
-    <ul>
-        @foreach($users as $user)
-            <li>
-                {!! $user->displayName !!} has {{ $userItems->where('user_id', $user->id)->pluck('count')->sum() }}
-                @if($userItems->where('user_id', $user->id)->pluck('count')->sum() > $userItems->where('user_id', $user->id)->pluck('availableQuantity')->sum())
-                 ({{ $userItems->where('user_id', $user->id)->pluck('availableQuantity')->sum() }} Available)
-                    <ul>
-                        @foreach($userItems->where('user_id', $user->id) as $item)
-                            @if($item->count > $item->availableQuantity)
-                                <?php
+        <ul>
+            @foreach ($users as $user)
+                <li>
+                    {!! $user->displayName !!} has {{ $userItems->where('user_id', $user->id)->pluck('count')->sum() }}
+                    @if (
+                        $userItems->where('user_id', $user->id)->pluck('count')->sum() >
+                            $userItems->where('user_id', $user->id)->pluck('availableQuantity')->sum())
+                        ({{ $userItems->where('user_id', $user->id)->pluck('availableQuantity')->sum() }} Available)
+                        <ul>
+                            @foreach ($userItems->where('user_id', $user->id) as $item)
+                                @if ($item->count > $item->availableQuantity)
+                                    <?php
                                     $userTradesSent = $trades->where('sender_id', $user->id);
                                     $userTradesReceived = $trades->where('recipient_id', $user->id);
                                     $userUpdates = $designUpdates->where('user_id', $user->id);
                                     $userSubmissions = $submissions->where('user_id', $user->id);
-
+                                    
                                     // Collect hold location IDs and quantities
                                     $holdLocations = [];
-                                    if(isset($item->trade_count) && $item->trade_count > 0) {
-                                        foreach($userTradesSent as $trade)
-                                            if(isset($trade->data['sender']) && $trade->data['sender'] != [] && isset($trade->data['sender']['user_items']) && isset($trade->data['sender']['user_items'][$item->id])) $holdLocations['trade'][$trade->id] = $trade->data['sender']['user_items'][$item->id];
-                                        foreach($userTradesReceived as $trade)
-                                            if(isset($trade->data['recipient']) && $trade->data['recipient'] != [] && isset($trade->data['recipient']['user_items']) && isset($trade->data['recipient']['user_items'][$item->id])) $holdLocations['trade'][$trade->id] = $trade->data['recipient']['user_items'][$item->id];
+                                    if (isset($item->trade_count) && $item->trade_count > 0) {
+                                        foreach ($userTradesSent as $trade) {
+                                            if (isset($trade->data['sender']) && $trade->data['sender'] != [] && isset($trade->data['sender']['user_items']) && isset($trade->data['sender']['user_items'][$item->id])) {
+                                                $holdLocations['trade'][$trade->id] = $trade->data['sender']['user_items'][$item->id];
+                                            }
+                                        }
+                                        foreach ($userTradesReceived as $trade) {
+                                            if (isset($trade->data['recipient']) && $trade->data['recipient'] != [] && isset($trade->data['recipient']['user_items']) && isset($trade->data['recipient']['user_items'][$item->id])) {
+                                                $holdLocations['trade'][$trade->id] = $trade->data['recipient']['user_items'][$item->id];
+                                            }
+                                        }
                                     }
-                                    if(isset($item->update_count) && $item->update_count > 0)
-                                        foreach($userUpdates as $update)
-                                            if(isset($update->data['user']) && $update->data['user'] != [] && isset($update->data['user']['user_items']) && isset($update->data['user']['user_items'][$item->id])) $holdLocations['update'][$update->id] = $update->data['user']['user_items'][$item->id];
-                                    if(isset($item->submission_count) && $item->submission_count > 0)
-                                        foreach($userSubmissions as $submission)
-                                            if(isset($update->data['user']) && $submission->data['user'] != [] && isset($submission->data['user']['user_items']) && isset($submission->data['user']['user_items'][$item->id])) $holdLocations['submission'][$submission->id] = $submission->data['user']['user_items'][$item->id];
-
+                                    if (isset($item->update_count) && $item->update_count > 0) {
+                                        foreach ($userUpdates as $update) {
+                                            if (isset($update->data['user']) && $update->data['user'] != [] && isset($update->data['user']['user_items']) && isset($update->data['user']['user_items'][$item->id])) {
+                                                $holdLocations['update'][$update->id] = $update->data['user']['user_items'][$item->id];
+                                            }
+                                        }
+                                    }
+                                    if (isset($item->submission_count) && $item->submission_count > 0) {
+                                        foreach ($userSubmissions as $submission) {
+                                            if (isset($update->data['user']) && $submission->data['user'] != [] && isset($submission->data['user']['user_items']) && isset($submission->data['user']['user_items'][$item->id])) {
+                                                $holdLocations['submission'][$submission->id] = $submission->data['user']['user_items'][$item->id];
+                                            }
+                                        }
+                                    }
+                                    
                                     // Format a string with all the places a stack is held
                                     $held = [];
-                                    if(isset($holdLocations['trade']))
-                                        foreach($holdLocations['trade'] as $trade=>$quantity) array_push($held, '<a href="'.App\Models\Trade::find($trade)->url.'">Trade #'.App\Models\Trade::find($trade)->id.'</a>'.' ('.$quantity.')');
-                                    if(isset($holdLocations['update']))
-                                        foreach($holdLocations['update'] as $update=>$quantity) array_push($held, (Auth::user()->hasPower('manage_characters') ? '<a href="'.App\Models\Character\CharacterDesignUpdate::find($update)->url.'">Design Update #'.App\Models\Character\CharacterDesignUpdate::find($update)->id.'</a>' : 'Design Update #'.App\Models\Character\CharacterDesignUpdate::find($update)->id).' ('.$quantity.')');
-                                    if(isset($holdLocations['submission']))
-                                        foreach($holdLocations['submission'] as $submission=>$quantity) array_push($held, (Auth::user()->hasPower('manage_submissions') ? '<a href="'.App\Models\Submission\Submission::find($submission)->viewUrl.'">Submission #'.App\Models\Submission\Submission::find($submission)->id.'</a>' : 'Submission #'.App\Models\Submission\Submission::find($submission)->id).' ('.$quantity.')');
-                                    $heldString = implode(', ',$held);
-                                ?>
-                                <li>
-                                    {{ $item->getOthers() }} : {!! $heldString !!}
-                                </li>
-                            @endif
-                        @endforeach
-                    </ul>
-                @endif
-            </li>
-        @endforeach
-        @foreach($characters as $character)
-            <li>
-                <a href="{{ $character->url }}">{{ $character->fullName }}</a> has {{ $characterItems->where('character_id', $character->id)->pluck('count')->sum() }}
-            </li>
-        @endforeach
-    </ul>
-@endif
-
-<script>
-    $(document).ready(function() {
-        $('.selectize').selectize();
-    });
+                                    if (isset($holdLocations['trade'])) {
+                                        foreach ($holdLocations['trade'] as $trade => $quantity) {
+                                            array_push($held, '<a href="' . App\Models\Trade::find($trade)->url . '">Trade #' . App\Models\Trade::find($trade)->id . '</a>' . ' (' . $quantity . ')');
+                                        }
+                                    }
+                                    if (isset($holdLocations['update'])) {
+                                        foreach ($holdLocations['update'] as $update => $quantity) {
+                                            array_push($held, (Auth::user()->hasPower('manage_characters') ? '<a href="' . App\Models\Character\CharacterDesignUpdate::find($update)->url . '">Design Update #' . App\Models\Character\CharacterDesignUpdate::find($update)->id . '</a>' : 'Design Update #' . App\Models\Character\CharacterDesignUpdate::find($update)->id) . ' (' . $quantity . ')');
+                                        }
+                                    }
+                                    if (isset($holdLocations['submission'])) {
+                                        foreach ($holdLocations['submission'] as $submission => $quantity) {
+                                            array_push($held, (Auth::user()->hasPower('manage_submissions') ? '<a href="' . App\Models\Submission\Submission::find($submission)->viewUrl . '">Submission #' . App\Models\Submission\Submission::find($submission)->id . '</a>' : 'Submission #' . App\Models\Submission\Submission::find($submission)->id) . ' (' . $quantity . ')');
+                                        }
+                                    }
+                                    $heldString = implode(', ', $held);
+                                    ?>
+                                    <li>
+                                        {{ $item->getOthers() }} : {!! $heldString !!}
+                                    </li>
+                                @endif
+                            @endforeach
+                        </ul>
+                    @endif
+                </li>
+            @endforeach
+            @foreach ($characters as $character)
+                <li>
+                    <a href="{{ $character->url }}">{{ $character->fullName }}</a> has {{ $characterItems->where('character_id', $character->id)->pluck('count')->sum() }}
+                </li>
+            @endforeach
+        </ul>
+    @endif
 
-</script>
+    <script>
+        $(document).ready(function() {
+            $('.selectize').selectize();
+        });
+    </script>
 
 @endsection
diff --git a/resources/views/admin/grants/items.blade.php b/resources/views/admin/grants/items.blade.php
index b3eed33926..359f594fb8 100644
--- a/resources/views/admin/grants/items.blade.php
+++ b/resources/views/admin/grants/items.blade.php
@@ -1,99 +1,101 @@
 @extends('admin.layout')
 
-@section('admin-title') Grant Items @endsection
+@section('admin-title')
+    Grant Items
+@endsection
 
 @section('admin-content')
-{!! breadcrumbs(['Admin Panel' => 'admin', 'Grant Items' => 'admin/grants/items']) !!}
+    {!! breadcrumbs(['Admin Panel' => 'admin', 'Grant Items' => 'admin/grants/items']) !!}
 
-<h1>Grant Items</h1>
+    <h1>Grant Items</h1>
 
-{!! Form::open(['url' => 'admin/grants/items']) !!}
+    {!! Form::open(['url' => 'admin/grants/items']) !!}
 
-<h3>Basic Information</h3>
+    <h3>Basic Information</h3>
 
-<div class="form-group">
-    {!! Form::label('names[]', 'Username(s)') !!} {!! add_help('You can select up to 10 users at once.') !!}
-    {!! Form::select('names[]', $users, null, ['id' => 'usernameList', 'class' => 'form-control', 'multiple']) !!}
-</div>
+    <div class="form-group">
+        {!! Form::label('names[]', 'Username(s)') !!} {!! add_help('You can select up to 10 users at once.') !!}
+        {!! Form::select('names[]', $users, null, ['id' => 'usernameList', 'class' => 'form-control', 'multiple']) !!}
+    </div>
 
-<div class="form-group">
-    {!! Form::label('Item(s)') !!} {!! add_help('Must have at least 1 item and Quantity must be at least 1.') !!}
-    <div id="itemList">
-        <div class="d-flex mb-2">
-            {!! Form::select('item_ids[]', $items, null, ['class' => 'form-control mr-2 default item-select', 'placeholder' => 'Select Item']) !!}
+    <div class="form-group">
+        {!! Form::label('Item(s)') !!} {!! add_help('Must have at least 1 item and Quantity must be at least 1.') !!}
+        <div id="itemList">
+            <div class="d-flex mb-2">
+                {!! Form::select('item_ids[]', $items, null, ['class' => 'form-control mr-2 default item-select', 'placeholder' => 'Select Item']) !!}
+                {!! Form::text('quantities[]', 1, ['class' => 'form-control mr-2', 'placeholder' => 'Quantity']) !!}
+                <a href="#" class="remove-item btn btn-danger mb-2 disabled">×</a>
+            </div>
+        </div>
+        <div><a href="#" class="btn btn-primary" id="add-item">Add Item</a></div>
+        <div class="item-row hide mb-2">
+            {!! Form::select('item_ids[]', $items, null, ['class' => 'form-control mr-2 item-select', 'placeholder' => 'Select Item']) !!}
             {!! Form::text('quantities[]', 1, ['class' => 'form-control mr-2', 'placeholder' => 'Quantity']) !!}
-            <a href="#" class="remove-item btn btn-danger mb-2 disabled">×</a>
+            <a href="#" class="remove-item btn btn-danger mb-2">×</a>
         </div>
     </div>
-    <div><a href="#" class="btn btn-primary" id="add-item">Add Item</a></div>
-    <div class="item-row hide mb-2">
-        {!! Form::select('item_ids[]', $items, null, ['class' => 'form-control mr-2 item-select', 'placeholder' => 'Select Item']) !!}
-        {!! Form::text('quantities[]', 1, ['class' => 'form-control mr-2', 'placeholder' => 'Quantity']) !!}
-        <a href="#" class="remove-item btn btn-danger mb-2">×</a>
-    </div>
-</div>
 
-<div class="form-group">
-    {!! Form::label('data', 'Reason (Optional)') !!} {!! add_help('A reason for the grant. This will be noted in the logs and in the inventory description.') !!}
-    {!! Form::text('data', null, ['class' => 'form-control', 'maxlength' => 400]) !!}
-</div>
+    <div class="form-group">
+        {!! Form::label('data', 'Reason (Optional)') !!} {!! add_help('A reason for the grant. This will be noted in the logs and in the inventory description.') !!}
+        {!! Form::text('data', null, ['class' => 'form-control', 'maxlength' => 400]) !!}
+    </div>
 
-<h3>Additional Data</h3>
+    <h3>Additional Data</h3>
 
-<div class="form-group">
-    {!! Form::label('notes', 'Notes (Optional)') !!} {!! add_help('Additional notes for the item. This will appear in the item\'s description, but not in the logs.') !!}
-    {!! Form::text('notes', null, ['class' => 'form-control', 'maxlength' => 400]) !!}
-</div>
+    <div class="form-group">
+        {!! Form::label('notes', 'Notes (Optional)') !!} {!! add_help('Additional notes for the item. This will appear in the item\'s description, but not in the logs.') !!}
+        {!! Form::text('notes', null, ['class' => 'form-control', 'maxlength' => 400]) !!}
+    </div>
 
-<div class="form-group">
-    {!! Form::checkbox('disallow_transfer', 1, 0, ['class' => 'form-check-input', 'data-toggle' => 'toggle']) !!}
-    {!! Form::label('disallow_transfer', 'Account-bound', ['class' => 'form-check-label ml-3']) !!} {!! add_help('If this is on, the recipient(s) will not be able to transfer this item to other users. Items that disallow transfers by default will still not be transferrable.') !!}
-</div>
+    <div class="form-group">
+        {!! Form::checkbox('disallow_transfer', 1, 0, ['class' => 'form-check-input', 'data-toggle' => 'toggle']) !!}
+        {!! Form::label('disallow_transfer', 'Account-bound', ['class' => 'form-check-label ml-3']) !!} {!! add_help('If this is on, the recipient(s) will not be able to transfer this item to other users. Items that disallow transfers by default will still not be transferrable.') !!}
+    </div>
 
-<div class="text-right">
-    {!! Form::submit('Submit', ['class' => 'btn btn-primary']) !!}
-</div>
+    <div class="text-right">
+        {!! Form::submit('Submit', ['class' => 'btn btn-primary']) !!}
+    </div>
 
-{!! Form::close() !!}
+    {!! Form::close() !!}
 
-<script>
-    $(document).ready(function() {
-        $('#usernameList').selectize({
-            maxItems: 10
-        });
-        $('.default.item-select').selectize();
-        $('#add-item').on('click', function(e) {
-            e.preventDefault();
-            addItemRow();
-        });
-        $('.remove-item').on('click', function(e) {
-            e.preventDefault();
-            removeItemRow($(this));
-        })
-        function addItemRow() {
-            var $rows = $("#itemList > div")
-            if($rows.length === 1) {
-                $rows.find('.remove-item').removeClass('disabled')
-            }
-            var $clone = $('.item-row').clone();
-            $('#itemList').append($clone);
-            $clone.removeClass('hide item-row');
-            $clone.addClass('d-flex');
-            $clone.find('.remove-item').on('click', function(e) {
+    <script>
+        $(document).ready(function() {
+            $('#usernameList').selectize({
+                maxItems: 10
+            });
+            $('.default.item-select').selectize();
+            $('#add-item').on('click', function(e) {
+                e.preventDefault();
+                addItemRow();
+            });
+            $('.remove-item').on('click', function(e) {
                 e.preventDefault();
                 removeItemRow($(this));
             })
-            $clone.find('.item-select').selectize();
-        }
-        function removeItemRow($trigger) {
-            $trigger.parent().remove();
-            var $rows = $("#itemList > div")
-            if($rows.length === 1) {
-                $rows.find('.remove-item').addClass('disabled')
-            }
-        }
-    });
 
-</script>
+            function addItemRow() {
+                var $rows = $("#itemList > div")
+                if ($rows.length === 1) {
+                    $rows.find('.remove-item').removeClass('disabled')
+                }
+                var $clone = $('.item-row').clone();
+                $('#itemList').append($clone);
+                $clone.removeClass('hide item-row');
+                $clone.addClass('d-flex');
+                $clone.find('.remove-item').on('click', function(e) {
+                    e.preventDefault();
+                    removeItemRow($(this));
+                })
+                $clone.find('.item-select').selectize();
+            }
 
-@endsection
\ No newline at end of file
+            function removeItemRow($trigger) {
+                $trigger.parent().remove();
+                var $rows = $("#itemList > div")
+                if ($rows.length === 1) {
+                    $rows.find('.remove-item').addClass('disabled')
+                }
+            }
+        });
+    </script>
+@endsection
diff --git a/resources/views/admin/grants/user_currency.blade.php b/resources/views/admin/grants/user_currency.blade.php
index 2eea3df909..8981adee90 100644
--- a/resources/views/admin/grants/user_currency.blade.php
+++ b/resources/views/admin/grants/user_currency.blade.php
@@ -1,53 +1,54 @@
 @extends('admin.layout')
 
-@section('admin-title') Grant User Currency @endsection
+@section('admin-title')
+    Grant User Currency
+@endsection
 
 @section('admin-content')
-{!! breadcrumbs(['Admin Panel' => 'admin', 'Grant Currency' => 'admin/grants/user-currency']) !!}
+    {!! breadcrumbs(['Admin Panel' => 'admin', 'Grant Currency' => 'admin/grants/user-currency']) !!}
 
-<h1>Grant User Currency</h1>
+    <h1>Grant User Currency</h1>
 
-{!! Form::open(['url' => 'admin/grants/user-currency']) !!}
+    {!! Form::open(['url' => 'admin/grants/user-currency']) !!}
 
-<h3>Basic Information</h3>
+    <h3>Basic Information</h3>
 
-<div class="form-group">
-    {!! Form::label('names[]', 'Username(s)') !!} {!! add_help('You can select up to 10 users at once.') !!}
-    {!! Form::select('names[]', $users, null, ['id' => 'usernameList', 'class' => 'form-control', 'multiple']) !!}
-</div>
+    <div class="form-group">
+        {!! Form::label('names[]', 'Username(s)') !!} {!! add_help('You can select up to 10 users at once.') !!}
+        {!! Form::select('names[]', $users, null, ['id' => 'usernameList', 'class' => 'form-control', 'multiple']) !!}
+    </div>
 
-<div class="row">
-    <div class="col-md-6">
-        <div class="form-group">
-            {!! Form::label('currency_id', 'Currency') !!} 
-            {!! Form::select('currency_id', $userCurrencies, null, ['class' => 'form-control']) !!}
+    <div class="row">
+        <div class="col-md-6">
+            <div class="form-group">
+                {!! Form::label('currency_id', 'Currency') !!}
+                {!! Form::select('currency_id', $userCurrencies, null, ['class' => 'form-control']) !!}
+            </div>
         </div>
-    </div>
-    <div class="col-md-6">
-        <div class="form-group">
-            {!! Form::label('quantity', 'Quantity') !!} {!! add_help('If the value given is less than 0, this will be deducted from the user(s).') !!}
-            {!! Form::text('quantity', null, ['class' => 'form-control']) !!}
+        <div class="col-md-6">
+            <div class="form-group">
+                {!! Form::label('quantity', 'Quantity') !!} {!! add_help('If the value given is less than 0, this will be deducted from the user(s).') !!}
+                {!! Form::text('quantity', null, ['class' => 'form-control']) !!}
+            </div>
         </div>
     </div>
-</div>
 
-<div class="form-group">
-    {!! Form::label('data', 'Reason (Optional)') !!} {!! add_help('A reason for the grant. This will be noted in the logs.') !!}
-    {!! Form::text('data', null, ['class' => 'form-control']) !!}
-</div>
+    <div class="form-group">
+        {!! Form::label('data', 'Reason (Optional)') !!} {!! add_help('A reason for the grant. This will be noted in the logs.') !!}
+        {!! Form::text('data', null, ['class' => 'form-control']) !!}
+    </div>
 
-<div class="text-right">
-    {!! Form::submit('Submit', ['class' => 'btn btn-primary']) !!}
-</div>
+    <div class="text-right">
+        {!! Form::submit('Submit', ['class' => 'btn btn-primary']) !!}
+    </div>
 
-{!! Form::close() !!}
+    {!! Form::close() !!}
 
-<script>
-    $(document).ready(function() {
-        $('#usernameList').selectize({
-            maxItems: 10
+    <script>
+        $(document).ready(function() {
+            $('#usernameList').selectize({
+                maxItems: 10
+            });
         });
-    });
-</script>
-
-@endsection
\ No newline at end of file
+    </script>
+@endsection
diff --git a/resources/views/admin/index.blade.php b/resources/views/admin/index.blade.php
index 509157c7ba..1c97258e19 100644
--- a/resources/views/admin/index.blade.php
+++ b/resources/views/admin/index.blade.php
@@ -1,176 +1,205 @@
 @extends('admin.layout')
 
-@section('admin-title') Dashboard @endsection
+@section('admin-title')
+    Dashboard
+@endsection
 
 @section('admin-content')
-{!! breadcrumbs(['Admin Panel' => 'admin', 'Home' => 'admin']) !!}
+    {!! breadcrumbs(['Admin Panel' => 'admin', 'Home' => 'admin']) !!}
 
-<h1>Admin Dashboard</h1>
-<div class="row">
-    @if (Auth::user()->hasPower('manage_submissions'))
-      <div class="col-sm-6">
-          <div class="card mb-3">
-              <div class="card-body">
-                  <h5 class="card-title">Prompt Submissions @if($submissionCount)<span class="badge badge-primary">{{ $submissionCount }}</span>@endif</h5>
-                  <p class="card-text">
-                      @if($submissionCount)
-                          {{ $submissionCount }} submission{{ $submissionCount == 1 ? '' : 's' }} awaiting processing.
-                      @else
-                          The submission queue is clear. Hooray!
-                      @endif
-                  </p>
-                  <div class="text-right">
-                      <a href="{{ url('admin/submissions/pending') }}" class="card-link">View Queue <span class="fas fa-caret-right ml-1"></span></a>
-                  </div>
-              </div>
-          </div>
-      </div>
-      <div class="col-sm-6">
-          <div class="card mb-3">
-              <div class="card-body">
-                  <h5 class="card-title">Claims @if($claimCount)<span class="badge badge-primary">{{ $claimCount }}</span>@endif</h5>
-                  <p class="card-text">
-                      @if($claimCount)
-                          {{ $claimCount }} claim{{ $claimCount == 1 ? '' : 's' }} awaiting processing.
-                      @else
-                          The claim queue is clear. Hooray!
-                      @endif
-                  </p>
-                  <div class="text-right">
-                      <a href="{{ url('admin/claims/pending') }}" class="card-link">View Queue <span class="fas fa-caret-right ml-1"></span></a>
-                  </div>
-              </div>
-          </div>
-      </div>
-    @endif
-    @if (Auth::user()->hasPower('manage_characters'))
-      <div class="col-sm-6">
-          <div class="card mb-3">
-              <div class="card-body">
-                  <h5 class="card-title">Design Updates @if($designCount)<span class="badge badge-primary">{{ $designCount }}</span>@endif</h5>
-                  <p class="card-text">
-                      @if($designCount)
-                          {{ $designCount }} design update{{ $designCount == 1 ? '' : 's' }} awaiting processing.
-                      @else
-                          The design update approval queue is clear. Hooray!
-                      @endif
-                  </p>
-                  <div class="text-right">
-                      <a href="{{ url('admin/design-approvals/pending') }}" class="card-link">View Queue <span class="fas fa-caret-right ml-1"></span></a>
-                  </div>
-              </div>
-          </div>
-      </div>
-      <div class="col-sm-6">
-          <div class="card mb-3">
-              <div class="card-body">
-                  <h5 class="card-title">MYO Approvals @if($myoCount)<span class="badge badge-primary">{{ $myoCount }}</span>@endif</h5>
-                  <p class="card-text">
-                      @if($myoCount)
-                          {{ $myoCount }} MYO slot{{ $myoCount == 1 ? '' : 's' }} awaiting processing.
-                      @else
-                          The MYO slot approval queue is clear. Hooray!
-                      @endif
-                  </p>
-                  <div class="text-right">
-                      <a href="{{ url('admin/myo-approvals/pending') }}" class="card-link">View Queue <span class="fas fa-caret-right ml-1"></span></a>
-                  </div>
-              </div>
-          </div>
-      </div>
-      @if($openTransfersQueue)
-          <div class="col-sm-6">
-              <div class="card mb-3">
-                  <div class="card-body">
-                      <h5 class="card-title">Character Transfers @if($transferCount + $tradeCount)<span class="badge badge-primary">{{ $transferCount + $tradeCount }}</span>@endif</h5>
-                      <p class="card-text">
-                          @if($transferCount + $tradeCount)
-                              {{ $transferCount + $tradeCount }} character transfer{{$transferCount + $tradeCount == 1 ? '' : 's' }} and/or trade{{$transferCount + $tradeCount == 1 ? '' : 's' }} awaiting processing.
-                          @else
-                              The character transfer/trade queue is clear. Hooray!
-                          @endif
-                      </p>
-                      <div class="text-right">
-                          <a href="{{ url('admin/masterlist/transfers/incoming') }}" class="card-link">View Queue <span class="fas fa-caret-right ml-1"></span></a>
-                      </div>
-                  </div>
-              </div>
-          </div>
-      @endif
-    @endif
-    @if (Auth::user()->hasPower('manage_reports'))
-      <div class="col-sm-6">
-        <div class="card mb-3">
-            <div class="card-body">
-                <h5 class="card-title">Reports @if($reportCount||$assignedReportCount)<span class="badge badge-primary">{{ $reportCount + $assignedReportCount }}</span>@endif</h5>
-                <p class="card-text">
-                    @if($reportCount||$assignedReportCount)
-                        @if($reportCount)
-                            {{ $reportCount }} report{{ $reportCount == 1 ? '' : 's' }} awaiting assignment.
-                        @endif
-                        {!! $reportCount && $assignedReportCount ? '<br/>' : '' !!}
-                        @if($assignedReportCount)
-                            {{ $assignedReportCount }} report{{ $assignedReportCount == 1 ? '' : 's' }} awaiting processing.
-                        @endif
-                    @else
-                        The report queue is clear. Hooray!
-                    @endif
-                </p>
-                <div class="text-right">
-                    <a href="{{ url('admin/reports/pending') }}" class="card-link">View Queue <span class="fas fa-caret-right ml-1"></span></a>
+    <h1>
+        Admin Dashboard</h1>
+    <div class="row">
+        @if (Auth::user()->hasPower('manage_submissions'))
+            <div class="col-sm-6">
+                <div class="card mb-3">
+                    <div class="card-body">
+                        <h5 class="card-title">Prompt Submissions @if ($submissionCount)
+                                <span class="badge badge-primary">{{ $submissionCount }}</span>
+                            @endif
+                        </h5>
+                        <p class="card-text">
+                            @if ($submissionCount)
+                                {{ $submissionCount }} submission{{ $submissionCount == 1 ? '' : 's' }} awaiting processing.
+                            @else
+                                The submission queue is clear. Hooray!
+                            @endif
+                        </p>
+                        <div class="text-right">
+                            <a href="{{ url('admin/submissions/pending') }}" class="card-link">View Queue <span class="fas fa-caret-right ml-1"></span></a>
+                        </div>
+                    </div>
                 </div>
             </div>
-        </div>
-    </div>
-    @endif
-    @if(!Auth::user()->hasPower('manage_submissions') && !Auth::user()->hasPower('manage_characters') && !Auth::user()->hasPower('manage_reports'))
-      <div class="card p-4 col-12">
-        <h5 class="card-title">You do not have a rank that allows you to access any queues.</h5>
-        <p class="mb-1">
-           Refer to the sidebar for what you can access as a staff member.
-        </p>
-        <p class="mb-0">
-          If you believe this to be in error, contact your site administrator.
-        </p>
-      </div>
-    @endif
-    @if($galleryRequireApproval)
-        <div class="col-sm-6">        
-            <div class="card mb-3">
-                <div class="card-body">
-                    <h5 class="card-title">Gallery Submissions @if($gallerySubmissionCount)<span class="badge badge-primary">{{ $gallerySubmissionCount }}</span>@endif</h5>
-                    <p class="card-text">
-                        @if($gallerySubmissionCount)
-                            {{ $gallerySubmissionCount }} gallery submission{{$gallerySubmissionCount == 1 ? '' : 's' }} awaiting processing.
-                        @else 
-                            The gallery submission queue is clear. Hooray!
-                        @endif
-                    </p>
-                    <div class="text-right">
-                        <a href="{{ url('admin/gallery/submissions/pending') }}" class="card-link">View Queue <span class="fas fa-caret-right ml-1"></span></a>
+            <div class="col-sm-6">
+                <div class="card mb-3">
+                    <div class="card-body">
+                        <h5 class="card-title">Claims @if ($claimCount)
+                                <span class="badge badge-primary">{{ $claimCount }}</span>
+                            @endif
+                        </h5>
+                        <p class="card-text">
+                            @if ($claimCount)
+                                {{ $claimCount }} claim{{ $claimCount == 1 ? '' : 's' }} awaiting processing.
+                            @else
+                                The claim queue is clear. Hooray!
+                            @endif
+                        </p>
+                        <div class="text-right">
+                            <a href="{{ url('admin/claims/pending') }}" class="card-link">View Queue <span class="fas fa-caret-right ml-1"></span></a>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        @endif
+        @if (Auth::user()->hasPower('manage_characters'))
+            <div class="col-sm-6">
+                <div class="card mb-3">
+                    <div class="card-body">
+                        <h5 class="card-title">Design Updates @if ($designCount)
+                                <span class="badge badge-primary">{{ $designCount }}</span>
+                            @endif
+                        </h5>
+                        <p class="card-text">
+                            @if ($designCount)
+                                {{ $designCount }} design update{{ $designCount == 1 ? '' : 's' }} awaiting processing.
+                            @else
+                                The design update approval queue is clear. Hooray!
+                            @endif
+                        </p>
+                        <div class="text-right">
+                            <a href="{{ url('admin/design-approvals/pending') }}" class="card-link">View Queue <span class="fas fa-caret-right ml-1"></span></a>
+                        </div>
+                    </div>
+                </div>
+            </div>
+            <div class="col-sm-6">
+                <div class="card mb-3">
+                    <div class="card-body">
+                        <h5 class="card-title">MYO Approvals @if ($myoCount)
+                                <span class="badge badge-primary">{{ $myoCount }}</span>
+                            @endif
+                        </h5>
+                        <p class="card-text">
+                            @if ($myoCount)
+                                {{ $myoCount }} MYO slot{{ $myoCount == 1 ? '' : 's' }} awaiting processing.
+                            @else
+                                The MYO slot approval queue is clear. Hooray!
+                            @endif
+                        </p>
+                        <div class="text-right">
+                            <a href="{{ url('admin/myo-approvals/pending') }}" class="card-link">View Queue <span class="fas fa-caret-right ml-1"></span></a>
+                        </div>
                     </div>
                 </div>
             </div>
-        </div>
-    @endif
-    @if($galleryCurrencyAwards)
-        <div class="col-sm-6">        
-            <div class="card mb-3">
-                <div class="card-body">
-                    <h5 class="card-title">Gallery Currency Awards @if($galleryAwardCount)<span class="badge badge-primary">{{ $galleryAwardCount }}</span>@endif</h5>
-                    <p class="card-text">
-                        @if($galleryAwardCount)
-                            {{ $galleryAwardCount }} gallery submission{{$galleryAwardCount == 1 ? '' : 's' }} awaiting currency rewards.
-                        @else 
-                            The gallery currency award queue is clear. Hooray!
-                        @endif
-                    </p>
-                    <div class="text-right">
-                        <a href="{{ url('admin/gallery/currency/pending') }}" class="card-link">View Queue <span class="fas fa-caret-right ml-1"></span></a>
+            @if ($openTransfersQueue)
+                <div class="col-sm-6">
+                    <div class="card mb-3">
+                        <div class="card-body">
+                            <h5 class="card-title">Character Transfers @if ($transferCount + $tradeCount)
+                                    <span class="badge badge-primary">{{ $transferCount + $tradeCount }}</span>
+                                @endif
+                            </h5>
+                            <p class="card-text">
+                                @if ($transferCount + $tradeCount)
+                                    {{ $transferCount + $tradeCount }} character transfer{{ $transferCount + $tradeCount == 1 ? '' : 's' }} and/or trade{{ $transferCount + $tradeCount == 1 ? '' : 's' }} awaiting processing.
+                                @else
+                                    The character transfer/trade queue is clear. Hooray!
+                                @endif
+                            </p>
+                            <div class="text-right">
+                                <a href="{{ url('admin/masterlist/transfers/incoming') }}" class="card-link">View Queue <span class="fas fa-caret-right ml-1"></span></a>
+                            </div>
+                        </div>
                     </div>
                 </div>
+            @endif
+        @endif
+        @if (Auth::user()->hasPower('manage_reports'))
+            <div class="col-sm-6">
+                <div class="card mb-3">
+                    <div class="card-body">
+                        <h5 class="card-title">Reports @if ($reportCount || $assignedReportCount)
+                                <span class="badge badge-primary">{{ $reportCount + $assignedReportCount }}</span>
+                            @endif
+                        </h5>
+                        <p class="card-text">
+                            @if ($reportCount || $assignedReportCount)
+                                @if ($reportCount)
+                                    {{ $reportCount }} report{{ $reportCount == 1 ? '' : 's' }} awaiting assignment.
+                                @endif
+                                {!! $reportCount && $assignedReportCount ? '<br/>' : '' !!}
+                                @if ($assignedReportCount)
+                                    {{ $assignedReportCount }} report{{ $assignedReportCount == 1 ? '' : 's' }} awaiting processing.
+                                @endif
+                            @else
+                                The report queue is clear. Hooray!
+                            @endif
+                        </p>
+                        <div class="text-right">
+                            <a href="{{ url('admin/reports/pending') }}" class="card-link">View Queue <span class="fas fa-caret-right ml-1"></span></a>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        @endif
+        @if (!Auth::user()->hasPower('manage_submissions') && !Auth::user()->hasPower('manage_characters') && !Auth::user()->hasPower('manage_reports'))
+            <div class="card p-4 col-12">
+                <h5 class="card-title">You do not have a rank that allows you to access any queues.</h5>
+                <p class="mb-1">
+                    Refer to the sidebar for what you can access as a staff member.
+                </p>
+                <p class="mb-0">
+                    If you believe this to be in error, contact your site administrator.
+                </p>
             </div>
-        </div>
-    @endif
-</div>
+        @endif
+        @if (Auth::user()->hasPower('manage_submissions'))
+            @if ($galleryRequireApproval)
+                <div class="col-sm-6">
+                    <div class="card mb-3">
+                        <div class="card-body">
+                            <h5 class="card-title">Gallery Submissions @if ($gallerySubmissionCount)
+                                    <span class="badge badge-primary">{{ $gallerySubmissionCount }}</span>
+                                @endif
+                            </h5>
+                            <p class="card-text">
+                                @if ($gallerySubmissionCount)
+                                    {{ $gallerySubmissionCount }} gallery submission{{ $gallerySubmissionCount == 1 ? '' : 's' }} awaiting processing.
+                                @else
+                                    The gallery submission queue is clear. Hooray!
+                                @endif
+                            </p>
+                            <div class="text-right">
+                                <a href="{{ url('admin/gallery/submissions/pending') }}" class="card-link">View Queue <span class="fas fa-caret-right ml-1"></span></a>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            @endif
+            @if ($galleryCurrencyAwards)
+                <div class="col-sm-6">
+                    <div class="card mb-3">
+                        <div class="card-body">
+                            <h5 class="card-title">Gallery Currency Awards @if ($galleryAwardCount)
+                                    <span class="badge badge-primary">{{ $galleryAwardCount }}</span>
+                                @endif
+                            </h5>
+                            <p class="card-text">
+                                @if ($galleryAwardCount)
+                                    {{ $galleryAwardCount }} gallery submission{{ $galleryAwardCount == 1 ? '' : 's' }} awaiting currency rewards.
+                                @else
+                                    The gallery currency award queue is clear. Hooray!
+                                @endif
+                            </p>
+                            <div class="text-right">
+                                <a href="{{ url('admin/gallery/currency/pending') }}" class="card-link">View Queue <span class="fas fa-caret-right ml-1"></span></a>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            @endif
+        @endif
+    </div>
 @endsection
diff --git a/resources/views/admin/invitations/invitations.blade.php b/resources/views/admin/invitations/invitations.blade.php
index e959b5ed25..f396c09b4f 100644
--- a/resources/views/admin/invitations/invitations.blade.php
+++ b/resources/views/admin/invitations/invitations.blade.php
@@ -1,49 +1,91 @@
 @extends('admin.layout')
 
-@section('admin-title') Invitation Keys @endsection
+@section('admin-title')
+    Invitation Keys
+@endsection
 
 @section('admin-content')
-{!! breadcrumbs(['Admin Panel' => 'admin', 'Invitation Keys' => 'admin/invitations']) !!}
+    {!! breadcrumbs(['Admin Panel' => 'admin', 'Invitation Keys' => 'admin/invitations']) !!}
 
-<h1>Invitation Keys</h1>
+    <h1>Invitation Keys</h1>
 
-<p>Invitation keys can be used to register an account when the site is closed for registration (see the setting "is_registration_open" in <a href="{{ url('admin/settings') }}">Site Settings</a>). Users will be able to register by entering the code that is generated with the key. Generated invitations can be deleted only if they have not been used.</p>
+    <p>Invitation keys can be used to register an account when the site is closed for registration (see the setting "is_registration_open" in <a href="{{ url('admin/settings') }}">Site Settings</a>). Users will be able to register by entering the code
+        that is generated with the key. Generated invitations can be deleted only if they have not been used.</p>
 
-{!! Form::open(['url' => 'admin/invitations/create', 'class' => 'text-right mb-3']) !!}
+    {!! Form::open(['url' => 'admin/invitations/create', 'class' => 'text-right mb-3']) !!}
     {!! Form::submit('Generate New Invitation', ['class' => 'btn btn-primary']) !!}
-{!! Form::close() !!}
-@if(!count($invitations))
-    <p>No invitations found.</p>
-@else
-    {!! $invitations->render() !!}
-      <div class="row ml-md-2">
-        <div class="d-flex row flex-wrap col-12 pb-1 px-0 ubt-bottom">
-          <div class="col-6 col-md-2 font-weight-bold">Code</div>
-          <div class="col-6 col-md-2 font-weight-bold">Generated by</div>
-          <div class="col-6 col-md-2 font-weight-bold">Used by</div>
-          <div class="col-6 col-md-2 font-weight-bold">Used on</div>
-          <div class="col-6 col-md-3 font-weight-bold">Created</div>
-        </div>
-        @foreach($invitations as $invitation)
-        <div class="d-flex row flex-wrap col-12 mt-1 pt-1 px-0 ubt-top">
-          <div class="col-6 col-md-2">{{ $invitation->code }}</div>
-          <div class="col-6 col-md-2">{!! $invitation->user->displayName !!}</div>
-          <div class="col-6 col-md-2">@if($invitation->recipient_id) {!! $invitation->recipient->displayName !!} @else --- @endif</div>
-          <div class="col-6 col-md-2">@if($invitation->created_at != $invitation->updated_at) {!! pretty_date($invitation->updated_at) !!} @else --- @endif</div>
-          <div class="col-6 col-md-3">{!! pretty_date($invitation->created_at,false) !!}</div>
-          <div class="col-6 col-md-1">
-            @if(!$invitation->recipient_id)
-              {!! Form::open(['url' => 'admin/invitations/delete/'.$invitation->id]) !!}
-                  {!! Form::submit('Delete', ['class' => 'btn btn-danger  py-0 px-1']) !!}
-              {!! Form::close() !!}
-            @endif
-          </div>
+    {!! Form::close() !!}
+    @if (!count($invitations))
+        <p>No invitations found.</p>
+    @else
+        {!! $invitations->render() !!}
+        <div class="mb-4 logs-table">
+            <div class="logs-table-header">
+                <div class="row">
+                    <div class="col-6 col-md-2">
+                        <div class="logs-table-cell">Code</div>
+                    </div>
+                    <div class="col-6 col-md-2">
+                        <div class="logs-table-cell">Generated by</div>
+                    </div>
+                    <div class="col-6 col-md-2">
+                        <div class="logs-table-cell">Used by</div>
+                    </div>
+                    <div class="col-6 col-md-2">
+                        <div class="logs-table-cell">Used on</div>
+                    </div>
+                    <div class="col-6 col-md-3">
+                        <div class="logs-table-cell">Created</div>
+                    </div>
+                </div>
+            </div>
+            <div class="logs-table-body">
+                @foreach ($invitations as $invitation)
+                    <div class="logs-table-row">
+                        <div class="row flex-wrap">
+                            <div class="col-6 col-md-2">
+                                <div class="logs-table-cell">{{ $invitation->code }}</div>
+                            </div>
+                            <div class="col-6 col-md-2">
+                                <div class="logs-table-cell">{!! $invitation->user->displayName !!}</div>
+                            </div>
+                            <div class="col-6 col-md-2">
+                                <div class="logs-table-cell">
+                                    @if ($invitation->recipient_id)
+                                        {!! $invitation->recipient->displayName !!}
+                                    @else
+                                        ---
+                                    @endif
+                                </div>
+                            </div>
+                            <div class="col-6 col-md-2">
+                                <div class="logs-table-cell">
+                                    @if ($invitation->created_at != $invitation->updated_at)
+                                        {!! pretty_date($invitation->updated_at) !!}
+                                    @else
+                                        ---
+                                    @endif
+                                </div>
+                            </div>
+                            <div class="col-6 col-md-3">
+                                <div class="logs-table-cell">{!! pretty_date($invitation->created_at, false) !!}</div>
+                            </div>
+                            <div class="col-6 col-md-1">
+                                <div class="logs-table-cell">
+                                    @if (!$invitation->recipient_id)
+                                        {!! Form::open(['url' => 'admin/invitations/delete/' . $invitation->id]) !!}
+                                        {!! Form::submit('Delete', ['class' => 'btn btn-danger  py-0 px-1']) !!}
+                                        {!! Form::close() !!}
+                                    @endif
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                @endforeach
+            </div>
         </div>
-        @endforeach
-      </div>
-
-    {!! $invitations->render() !!}
-    <div class="text-center mt-4 small text-muted">{{ $invitations->total() }} result{{ $invitations->total() == 1 ? '' : 's' }} found.</div>
-@endif
+        {!! $invitations->render() !!}
+        <div class="text-center mt-4 small text-muted">{{ $invitations->total() }} result{{ $invitations->total() == 1 ? '' : 's' }} found.</div>
+    @endif
 
 @endsection
diff --git a/resources/views/admin/items/_delete_item.blade.php b/resources/views/admin/items/_delete_item.blade.php
index 67c4d270e1..bc0c77e648 100644
--- a/resources/views/admin/items/_delete_item.blade.php
+++ b/resources/views/admin/items/_delete_item.blade.php
@@ -1,5 +1,5 @@
-@if($item)
-    {!! Form::open(['url' => 'admin/data/items/delete/'.$item->id]) !!}
+@if ($item)
+    {!! Form::open(['url' => 'admin/data/items/delete/' . $item->id]) !!}
 
     <p>You are about to delete the item <strong>{{ $item->name }}</strong>. This is not reversible. If this item exists in at least one user's possession, you will not be able to delete this item.</p>
     <p>Are you sure you want to delete <strong>{{ $item->name }}</strong>?</p>
@@ -9,6 +9,6 @@
     </div>
 
     {!! Form::close() !!}
-@else 
+@else
     Invalid item selected.
-@endif
\ No newline at end of file
+@endif
diff --git a/resources/views/admin/items/_delete_item_category.blade.php b/resources/views/admin/items/_delete_item_category.blade.php
index 09baf850ee..a900b7f1a7 100644
--- a/resources/views/admin/items/_delete_item_category.blade.php
+++ b/resources/views/admin/items/_delete_item_category.blade.php
@@ -1,5 +1,5 @@
-@if($category)
-    {!! Form::open(['url' => 'admin/data/item-categories/delete/'.$category->id]) !!}
+@if ($category)
+    {!! Form::open(['url' => 'admin/data/item-categories/delete/' . $category->id]) !!}
 
     <p>You are about to delete the category <strong>{{ $category->name }}</strong>. This is not reversible. If items in this category exist, you will not be able to delete this category.</p>
     <p>Are you sure you want to delete <strong>{{ $category->name }}</strong>?</p>
@@ -9,6 +9,6 @@
     </div>
 
     {!! Form::close() !!}
-@else 
+@else
     Invalid category selected.
-@endif
\ No newline at end of file
+@endif
diff --git a/resources/views/admin/items/_delete_item_tag.blade.php b/resources/views/admin/items/_delete_item_tag.blade.php
index 88f82cc440..f22192d981 100644
--- a/resources/views/admin/items/_delete_item_tag.blade.php
+++ b/resources/views/admin/items/_delete_item_tag.blade.php
@@ -1,7 +1,8 @@
-@if($tag)
-    {!! Form::open(['url' => 'admin/data/items/delete-tag/'.$item->id.'/'.$tag->tag]) !!}
+@if ($tag)
+    {!! Form::open(['url' => 'admin/data/items/delete-tag/' . $item->id . '/' . $tag->tag]) !!}
 
-    <p>You are about to delete the tag <strong>{{ $tag->getName() }}</strong> from {{ $item->name }}. This is not reversible. If you would like to preserve the tag data without deleting the tag, you may want to set the Active toggle to Off instead.</p>
+    <p>You are about to delete the tag <strong>{{ $tag->getName() }}</strong> from {{ $item->name }}. This is not reversible. If you would like to preserve the tag data without deleting the tag, you may want to set the Active toggle to Off
+        instead.</p>
     <p>Are you sure you want to delete <strong>{{ $tag->getName() }}</strong>?</p>
 
     <div class="text-right">
@@ -9,6 +10,6 @@
     </div>
 
     {!! Form::close() !!}
-@else 
+@else
     Invalid tag selected.
-@endif
\ No newline at end of file
+@endif
diff --git a/resources/views/admin/items/add_tag.blade.php b/resources/views/admin/items/add_tag.blade.php
index 2977ef83bd..83263e2344 100644
--- a/resources/views/admin/items/add_tag.blade.php
+++ b/resources/views/admin/items/add_tag.blade.php
@@ -1,25 +1,26 @@
 @extends('admin.layout')
 
-@section('admin-title') Add Item Tag @endsection
+@section('admin-title')
+    Add Item Tag
+@endsection
 
 @section('admin-content')
-{!! breadcrumbs(['Admin Panel' => 'admin', 'Items' => 'admin/data/items', 'Edit Item' => 'admin/data/items/edit/'.$item->id, 'Add Item Tag' => 'admin/data/items/tag/'.$item->id]) !!}
+    {!! breadcrumbs(['Admin Panel' => 'admin', 'Items' => 'admin/data/items', 'Edit Item' => 'admin/data/items/edit/' . $item->id, 'Add Item Tag' => 'admin/data/items/tag/' . $item->id]) !!}
 
-<h1>Add Item Tag</h1>
+    <h1>Add Item Tag</h1>
 
-<p>Select an item tag to add to the item. You cannot add duplicate tags to the same item (they are removed from the selection). You will be taken to the parameter editing page after adding the tag. </p> 
+    <p>Select an item tag to add to the item. You cannot add duplicate tags to the same item (they are removed from the selection). You will be taken to the parameter editing page after adding the tag. </p>
 
-{!! Form::open(['url' => 'admin/data/items/tag/'.$item->id]) !!}
+    {!! Form::open(['url' => 'admin/data/items/tag/' . $item->id]) !!}
 
-<div class="form-group">
-    {!! Form::label('tag', 'Tag') !!}
-    {!! Form::select('tag', [0 => 'Select a Tag'] + $tags, null, ['class' => 'form-control']) !!}
-</div>
+    <div class="form-group">
+        {!! Form::label('tag', 'Tag') !!}
+        {!! Form::select('tag', [0 => 'Select a Tag'] + $tags, null, ['class' => 'form-control']) !!}
+    </div>
 
-<div class="text-right">
-    {!! Form::submit('Add Tag', ['class' => 'btn btn-primary']) !!}
-</div>
+    <div class="text-right">
+        {!! Form::submit('Add Tag', ['class' => 'btn btn-primary']) !!}
+    </div>
 
-{!! Form::close() !!}
-
-@endsection
\ No newline at end of file
+    {!! Form::close() !!}
+@endsection
diff --git a/resources/views/admin/items/create_edit_item.blade.php b/resources/views/admin/items/create_edit_item.blade.php
index 475479da50..40ce3b8c6a 100644
--- a/resources/views/admin/items/create_edit_item.blade.php
+++ b/resources/views/admin/items/create_edit_item.blade.php
@@ -1,200 +1,201 @@
 @extends('admin.layout')
 
-@section('admin-title') Items @endsection
+@section('admin-title')
+    {{ $item->id ? 'Edit' : 'Create' }} Item
+@endsection
 
 @section('admin-content')
-{!! breadcrumbs(['Admin Panel' => 'admin', 'Items' => 'admin/data/items', ($item->id ? 'Edit' : 'Create').' Item' => $item->id ? 'admin/data/items/edit/'.$item->id : 'admin/data/items/create']) !!}
-
-<h1>{{ $item->id ? 'Edit' : 'Create' }} Item
-    @if($item->id)
-        <a href="#" class="btn btn-outline-danger float-right delete-item-button">Delete Item</a>
-    @endif
-</h1>
-
-{!! Form::open(['url' => $item->id ? 'admin/data/items/edit/'.$item->id : 'admin/data/items/create', 'files' => true]) !!}
+    {!! breadcrumbs(['Admin Panel' => 'admin', 'Items' => 'admin/data/items', ($item->id ? 'Edit' : 'Create') . ' Item' => $item->id ? 'admin/data/items/edit/' . $item->id : 'admin/data/items/create']) !!}
 
-<h3>Basic Information</h3>
+    <h1>{{ $item->id ? 'Edit' : 'Create' }} Item
+        @if ($item->id)
+            <a href="#" class="btn btn-outline-danger float-right delete-item-button">Delete Item</a>
+        @endif
+    </h1>
 
-<div class="form-group">
-    {!! Form::label('Name') !!}
-    {!! Form::text('name', $item->name, ['class' => 'form-control']) !!}
-</div>
+    {!! Form::open(['url' => $item->id ? 'admin/data/items/edit/' . $item->id : 'admin/data/items/create', 'files' => true]) !!}
 
-<div class="form-group">
-    {!! Form::label('World Page Image (Optional)') !!} {!! add_help('This image is used only on the world information pages.') !!}
-    <div>{!! Form::file('image') !!}</div>
-    <div class="text-muted">Recommended size: 100px x 100px</div>
-    @if($item->has_image)
-        <div class="form-check">
-            {!! Form::checkbox('remove_image', 1, false, ['class' => 'form-check-input']) !!}
-            {!! Form::label('remove_image', 'Remove current image', ['class' => 'form-check-label']) !!}
-        </div>
-    @endif
-</div>
+    <h3>Basic Information</h3>
 
-<div class="row">
-    <div class="col-md">
-        <div class="form-group">
-            {!! Form::label('Item Category (Optional)') !!}
-            {!! Form::select('item_category_id', $categories, $item->item_category_id, ['class' => 'form-control']) !!}
-        </div>
+    <div class="form-group">
+        {!! Form::label('Name') !!}
+        {!! Form::text('name', $item->name, ['class' => 'form-control']) !!}
     </div>
-    @if(Config::get('lorekeeper.extensions.item_entry_expansion.extra_fields'))
-        <div class="col-md">
-            <div class="form-group">
-                {!! Form::label('Item Rarity (Optional)') !!} {!! add_help('This should be a number.') !!}
-                {!! Form::number('rarity', $item && $item->rarity ? $item->rarity : '', ['class' => 'form-control']) !!}
+
+    <div class="form-group">
+        {!! Form::label('World Page Image (Optional)') !!} {!! add_help('This image is used only on the world information pages.') !!}
+        <div>{!! Form::file('image') !!}</div>
+        <div class="text-muted">Recommended size: 100px x 100px</div>
+        @if ($item->has_image)
+            <div class="form-check">
+                {!! Form::checkbox('remove_image', 1, false, ['class' => 'form-check-input']) !!}
+                {!! Form::label('remove_image', 'Remove current image', ['class' => 'form-check-label']) !!}
             </div>
-        </div>
-    @endif
-</div>
+        @endif
+    </div>
 
-@if(Config::get('lorekeeper.extensions.item_entry_expansion.extra_fields'))
     <div class="row">
         <div class="col-md">
             <div class="form-group">
-                {!! Form::label('Reference Link (Optional)') !!} {!! add_help('An optional link to an additional reference') !!}
-                {!! Form::text('reference_url', $item->reference_url, ['class' => 'form-control']) !!}
+                {!! Form::label('Item Category (Optional)') !!}
+                {!! Form::select('item_category_id', $categories, $item->item_category_id, ['class' => 'form-control']) !!}
             </div>
         </div>
-        <div class="col-md">
-        {!! Form::label('Item Artist (Optional)') !!} {!! add_help('Provide the artist\'s username if they are on site or, failing that, a link.') !!}
-            <div class="row">
-                <div class="col-md">
-                    <div class="form-group">
-                        {!! Form::select('artist_id', $userOptions, $item && $item->artist_id ? $item->artist_id : null, ['class'=> 'form-control mr-2 selectize', 'placeholder' => 'Select a User']) !!}
-                    </div>
+        @if (config('lorekeeper.extensions.item_entry_expansion.extra_fields'))
+            <div class="col-md">
+                <div class="form-group">
+                    {!! Form::label('Item Rarity (Optional)') !!} {!! add_help('This should be a number.') !!}
+                    {!! Form::number('rarity', $item && $item->rarity ? $item->rarity : '', ['class' => 'form-control']) !!}
+                </div>
+            </div>
+        @endif
+    </div>
+
+    @if (config('lorekeeper.extensions.item_entry_expansion.extra_fields'))
+        <div class="row">
+            <div class="col-md">
+                <div class="form-group">
+                    {!! Form::label('Reference Link (Optional)') !!} {!! add_help('An optional link to an additional reference') !!}
+                    {!! Form::text('reference_url', $item->reference_url, ['class' => 'form-control']) !!}
                 </div>
-                <div class="col-md">
-                    <div class="form-group">
-                        {!! Form::text('artist_url', $item && $item->artist_url ? $item->artist_url : '', ['class' => 'form-control mr-2', 'placeholder' => 'Artist URL']) !!}
+            </div>
+            <div class="col-md">
+                {!! Form::label('Item Artist (Optional)') !!} {!! add_help('Provide the artist\'s username if they are on site or, failing that, a link.') !!}
+                <div class="row">
+                    <div class="col-md">
+                        <div class="form-group">
+                            {!! Form::select('artist_id', $userOptions, $item && $item->artist_id ? $item->artist_id : null, ['class' => 'form-control mr-2 selectize', 'placeholder' => 'Select a User']) !!}
+                        </div>
+                    </div>
+                    <div class="col-md">
+                        <div class="form-group">
+                            {!! Form::text('artist_url', $item && $item->artist_url ? $item->artist_url : '', ['class' => 'form-control mr-2', 'placeholder' => 'Artist URL']) !!}
+                        </div>
                     </div>
                 </div>
             </div>
         </div>
-    </div>
-@endif
-
-<div class="form-group">
-    {!! Form::label('Description (Optional)') !!}
-    {!! Form::textarea('description', $item->description, ['class' => 'form-control wysiwyg']) !!}
-</div>
+    @endif
 
-@if(Config::get('lorekeeper.extensions.item_entry_expansion.extra_fields'))
     <div class="form-group">
-        {!! Form::label('Uses (Optional)') !!} {!! add_help('A short description of the item\'s use(s). Supports raw HTML if need be, but keep it brief.') !!}
-        {!! Form::text('uses', $item && $item->uses ? $item->uses : '', ['class' => 'form-control']) !!}
+        {!! Form::label('Description (Optional)') !!}
+        {!! Form::textarea('description', $item->description, ['class' => 'form-control wysiwyg']) !!}
     </div>
-@endif
 
-<div class="row">
-    <div class="col-md form-group">
-        {!! Form::checkbox('allow_transfer', 1, $item->id ? $item->allow_transfer : 1, ['class' => 'form-check-input', 'data-toggle' => 'toggle']) !!}
-        {!! Form::label('allow_transfer', 'Allow User → User Transfer', ['class' => 'form-check-label ml-3']) !!} {!! add_help('If this is off, users will not be able to transfer this item to other users. Non-account-bound items can be account-bound when granted to users directly.') !!}
-    </div>
-    @if(Config::get('lorekeeper.extensions.item_entry_expansion.extra_fields'))
-        <div class="col-md form-group">
-            {!! Form::checkbox('is_released', 1, $item->id ? $item->is_released : 1, ['class' => 'form-check-input', 'data-toggle' => 'toggle']) !!}
-            {!! Form::label('is_released', 'Is Released', ['class' => 'form-check-label ml-3']) !!} {!! add_help('If this is off, users will not be able to view information for the item/it will be hidden from view. This is overridden by the item being owned at any point by anyone on the site.') !!}
+    @if (config('lorekeeper.extensions.item_entry_expansion.extra_fields'))
+        <div class="form-group">
+            {!! Form::label('Uses (Optional)') !!} {!! add_help('A short description of the item\'s use(s). Supports raw HTML if need be, but keep it brief.') !!}
+            {!! Form::text('uses', $item && $item->uses ? $item->uses : '', ['class' => 'form-control']) !!}
         </div>
     @endif
-</div>
 
-@if(Config::get('lorekeeper.extensions.item_entry_expansion.extra_fields'))
-    <h3>Availability Information</h3>
     <div class="row">
-        <div class="col-md">
-            <div class="form-group">
-                {!! Form::label('release', 'Source (Optional)') !!} {!! add_help('The original and/or general source of the item. Should be brief.') !!}
-                {!! Form::text('release', $item && $item->source ? $item->source : '', ['class' => 'form-control']) !!}
-            </div>
+        <div class="col-md form-group">
+            {!! Form::checkbox('allow_transfer', 1, $item->id ? $item->allow_transfer : 1, ['class' => 'form-check-input', 'data-toggle' => 'toggle']) !!}
+            {!! Form::label('allow_transfer', 'Allow User → User Transfer', ['class' => 'form-check-label ml-3']) !!} {!! add_help('If this is off, users will not be able to transfer this item to other users. Non-account-bound items can be account-bound when granted to users directly.') !!}
         </div>
-        <div class="col-md">
-            <div class="form-group">
-                {!! Form::label('prompts[]', 'Drop Location(s) (Optional)') !!} {!! add_help('You can select up to 10 prompts at once.') !!}
-                {!! Form::select('prompts[]', $prompts, $item && isset($item->data['prompts']) ? $item->data['prompts'] : '', ['id' => 'promptsList', 'class' => 'form-control', 'multiple']) !!}
+        @if (config('lorekeeper.extensions.item_entry_expansion.extra_fields'))
+            <div class="col-md form-group">
+                {!! Form::checkbox('is_released', 1, $item->id ? $item->is_released : 1, ['class' => 'form-check-input', 'data-toggle' => 'toggle']) !!}
+                {!! Form::label('is_released', 'Is Released', ['class' => 'form-check-label ml-3']) !!} {!! add_help('If this is off, users will not be able to view information for the item/it will be hidden from view. This is overridden by the item being owned at any point by anyone on the site.') !!}
             </div>
-        </div>
+        @endif
     </div>
-@endif
 
-@if(Config::get('lorekeeper.extensions.item_entry_expansion.resale_function'))
-    <h3>Resale Information</h3>
-    <p>The currency and amount users will be able to sell this item from their inventory for. If quantity is not set, the item will be unable to be sold.</p>
-    <div class="row">
-        <div class="col-md">
-            <div class="form-group">
-                {!! Form::label('currency_id', 'Currency') !!}
-                {!! Form::select('currency_id', $userCurrencies, isset($item->data['resell']) && App\Models\Currency\Currency::where('id', $item->resell->flip()->pop())->first() ? $item->resell->flip()->pop() : null, ['class' => 'form-control']) !!}
+    @if (config('lorekeeper.extensions.item_entry_expansion.extra_fields'))
+        <h3>Availability Information</h3>
+        <div class="row">
+            <div class="col-md">
+                <div class="form-group">
+                    {!! Form::label('release', 'Source (Optional)') !!} {!! add_help('The original and/or general source of the item. Should be brief.') !!}
+                    {!! Form::text('release', $item && $item->source ? $item->source : '', ['class' => 'form-control']) !!}
+                </div>
+            </div>
+            <div class="col-md">
+                <div class="form-group">
+                    {!! Form::label('prompts[]', 'Drop Location(s) (Optional)') !!} {!! add_help('You can select up to 10 prompts at once.') !!}
+                    {!! Form::select('prompts[]', $prompts, $item && isset($item->data['prompts']) ? $item->data['prompts'] : '', ['id' => 'promptsList', 'class' => 'form-control', 'multiple']) !!}
+                </div>
             </div>
         </div>
-        <div class="col-md">
-            <div class="form-group">
-                {!! Form::label('currency_quantity', 'Quantity') !!}
-                {!! Form::text('currency_quantity', isset($item->data['resell']) ? $item->resell->pop() : null, ['class' => 'form-control']) !!}
+    @endif
+
+    @if (config('lorekeeper.extensions.item_entry_expansion.resale_function'))
+        <h3>Resale Information</h3>
+        <p>The currency and amount users will be able to sell this item from their inventory for. If quantity is not set, the item will be unable to be sold.</p>
+        <div class="row">
+            <div class="col-md">
+                <div class="form-group">
+                    {!! Form::label('currency_id', 'Currency') !!}
+                    {!! Form::select('currency_id', $userCurrencies, isset($item->data['resell']) && App\Models\Currency\Currency::where('id', $item->resell->flip()->pop())->first() ? $item->resell->flip()->pop() : null, ['class' => 'form-control']) !!}
+                </div>
+            </div>
+            <div class="col-md">
+                <div class="form-group">
+                    {!! Form::label('currency_quantity', 'Quantity') !!}
+                    {!! Form::text('currency_quantity', isset($item->data['resell']) ? $item->resell->pop() : null, ['class' => 'form-control']) !!}
+                </div>
             </div>
         </div>
-    </div>
-@endif
-
-<div class="text-right">
-    {!! Form::submit($item->id ? 'Edit' : 'Create', ['class' => 'btn btn-primary']) !!}
-</div>
-
-{!! Form::close() !!}
-
-@if($item->id)
-    <h3>Item Tags</h3>
-    <p>Item tags indicate extra functionality for the item. Click on the edit button to edit the specific item tag's data.</p>
-    @if(count($item->tags))
-        <table class="table">
-            <thead>
-                <tr>
-                    <th>Tag</th>
-                    <th>Active?</th>
-                    <th></th>
-                </tr>
-            </thead>
-            @foreach($item->tags as $tag)
-                <tr>
-                    <td>{!! $tag->displayTag !!}</td>
-                    <td class="{{ $tag->is_active ? 'text-success' : 'text-danger' }}">{{ $tag->is_active ? 'Yes' : 'No' }}</td>
-                    <td class="text-right"><a href="{{ url('admin/data/items/tag/'.$item->id.'/'.$tag->tag) }}" class="btn btn-outline-primary">Edit</a></td>
-                </tr>
-            @endforeach
-        </table>
-    @else
-        <p>No item tags attached to this item.</p>
     @endif
+
     <div class="text-right">
-        <a href="{{ url('admin/data/items/tag/'.$item->id) }}" class="btn btn-outline-primary">Add a Tag</a>
+        {!! Form::submit($item->id ? 'Edit' : 'Create', ['class' => 'btn btn-primary']) !!}
     </div>
 
-    <h3>Preview</h3>
-    <div class="card mb-3">
-        <div class="card-body">
-            @include('world._item_entry', ['imageUrl' => $item->imageUrl, 'name' => $item->displayName, 'description' => $item->parsed_description, 'searchUrl' => $item->searchUrl])
+    {!! Form::close() !!}
+
+    @if ($item->id)
+        <h3>Item Tags</h3>
+        <p>Item tags indicate extra functionality for the item. Click on the edit button to edit the specific item tag's data.</p>
+        @if (count($item->tags))
+            <table class="table">
+                <thead>
+                    <tr>
+                        <th>Tag</th>
+                        <th>Active?</th>
+                        <th></th>
+                    </tr>
+                </thead>
+                @foreach ($item->tags as $tag)
+                    <tr>
+                        <td>{!! $tag->displayTag !!}</td>
+                        <td class="{{ $tag->is_active ? 'text-success' : 'text-danger' }}">{{ $tag->is_active ? 'Yes' : 'No' }}</td>
+                        <td class="text-right"><a href="{{ url('admin/data/items/tag/' . $item->id . '/' . $tag->tag) }}" class="btn btn-outline-primary">Edit</a></td>
+                    </tr>
+                @endforeach
+            </table>
+        @else
+            <p>No item tags attached to this item.</p>
+        @endif
+        <div class="text-right">
+            <a href="{{ url('admin/data/items/tag/' . $item->id) }}" class="btn btn-outline-primary">Add a Tag</a>
         </div>
-    </div>
-@endif
+
+        <h3>Preview</h3>
+        <div class="card mb-3">
+            <div class="card-body">
+                @include('world._item_entry', ['imageUrl' => $item->imageUrl, 'name' => $item->displayName, 'description' => $item->parsed_description, 'searchUrl' => $item->searchUrl])
+            </div>
+        </div>
+    @endif
 
 @endsection
 
 @section('scripts')
-@parent
-<script>
-$( document ).ready(function() {
-    $('.selectize').selectize();
-
-    $('#promptsList').selectize({
-        maxItems: 10
-    });
-
-    $('.delete-item-button').on('click', function(e) {
-        e.preventDefault();
-        loadModal("{{ url('admin/data/items/delete') }}/{{ $item->id }}", 'Delete Item');
-    });
-});
-
-</script>
+    @parent
+    <script>
+        $(document).ready(function() {
+            $('.selectize').selectize();
+
+            $('#promptsList').selectize({
+                maxItems: 10
+            });
+
+            $('.delete-item-button').on('click', function(e) {
+                e.preventDefault();
+                loadModal("{{ url('admin/data/items/delete') }}/{{ $item->id }}", 'Delete Item');
+            });
+        });
+    </script>
 @endsection
diff --git a/resources/views/admin/items/create_edit_item_category.blade.php b/resources/views/admin/items/create_edit_item_category.blade.php
index b869a4c77f..6e85d589d6 100644
--- a/resources/views/admin/items/create_edit_item_category.blade.php
+++ b/resources/views/admin/items/create_edit_item_category.blade.php
@@ -1,87 +1,96 @@
 @extends('admin.layout')
 
-@section('admin-title') Item Categories @endsection
+@section('admin-title')
+    {{ $category->id ? 'Edit' : 'Create' }} Item Category
+@endsection
 
 @section('admin-content')
-{!! breadcrumbs(['Admin Panel' => 'admin', 'Item Categories' => 'admin/data/item-categories', ($category->id ? 'Edit' : 'Create').' Category' => $category->id ? 'admin/data/item-categories/edit/'.$category->id : 'admin/data/item-categories/create']) !!}
-
-<h1>{{ $category->id ? 'Edit' : 'Create' }} Category
-    @if($category->id)
-        <a href="#" class="btn btn-danger float-right delete-category-button">Delete Category</a>
-    @endif
-</h1>
+    {!! breadcrumbs([
+        'Admin Panel' => 'admin',
+        'Item Categories' => 'admin/data/item-categories',
+        ($category->id ? 'Edit' : 'Create') . ' Category' => $category->id ? 'admin/data/item-categories/edit/' . $category->id : 'admin/data/item-categories/create',
+    ]) !!}
 
-{!! Form::open(['url' => $category->id ? 'admin/data/item-categories/edit/'.$category->id : 'admin/data/item-categories/create', 'files' => true]) !!}
+    <h1>{{ $category->id ? 'Edit' : 'Create' }} Item Category
+        @if ($category->id)
+            <a href="#" class="btn btn-danger float-right delete-category-button">Delete Category</a>
+        @endif
+    </h1>
 
-<h3>Basic Information</h3>
+    {!! Form::open(['url' => $category->id ? 'admin/data/item-categories/edit/' . $category->id : 'admin/data/item-categories/create', 'files' => true]) !!}
 
-<div class="form-group">
-    {!! Form::label('Name') !!}
-    {!! Form::text('name', $category->name, ['class' => 'form-control']) !!}
-</div>
-
-<div class="form-group">
-    {!! Form::label('World Page Image (Optional)') !!} {!! add_help('This image is used only on the world information pages.') !!}
-    <div>{!! Form::file('image') !!}</div>
-    <div class="text-muted">Recommended size: 200px x 200px</div>
-    @if($category->has_image)
-        <div class="form-check">
-            {!! Form::checkbox('remove_image', 1, false, ['class' => 'form-check-input']) !!}
-            {!! Form::label('remove_image', 'Remove current image', ['class' => 'form-check-label']) !!}
-        </div>
-    @endif
-</div>
+    <h3>Basic Information</h3>
 
-<div class="form-group">
-    {!! Form::label('Description (Optional)') !!}
-    {!! Form::textarea('description', $category->description, ['class' => 'form-control wysiwyg']) !!}
-</div>
+    <div class="form-group">
+        {!! Form::label('Name') !!}
+        {!! Form::text('name', $category->name, ['class' => 'form-control']) !!}
+    </div>
 
-<div class="card mb-3" id="characterOptions">
-    <div class="card-body">
-        <div class="mb-2">
-            <div class="form-group">
-                {!! Form::checkbox('is_character_owned', 1, $category->is_character_owned, ['class' => 'form-check-input', 'data-toggle' => 'toggle', 'data-on' => 'Allow', 'data-off' => 'Disallow']) !!}
-                {!! Form::label('is_character_owned', 'Can Be Owned by Characters', ['class' => 'form-check-label ml-3']) !!} {!! add_help('This will allow items in this category to be owned by characters.') !!}
-            </div>
-            <div class="form-group">
-                {!! Form::label('character_limit', 'Character Hold Limit') !!} {!! add_help('This is the maximum amount of items from this category a character can possess. Set to 0 to allow infinite.') !!}
-                {!! Form::text('character_limit', $category ? $category->character_limit : 0, ['class' => 'form-control stock-field', 'data-name' => 'character_limit']) !!}
+    <div class="form-group">
+        {!! Form::label('World Page Image (Optional)') !!} {!! add_help('This image is used only on the world information pages.') !!}
+        <div>{!! Form::file('image') !!}</div>
+        <div class="text-muted">Recommended size: 200px x 200px</div>
+        @if ($category->has_image)
+            <div class="form-check">
+                {!! Form::checkbox('remove_image', 1, false, ['class' => 'form-check-input']) !!}
+                {!! Form::label('remove_image', 'Remove current image', ['class' => 'form-check-label']) !!}
             </div>
-            <div class="form-group">
-                {!! Form::checkbox('can_name', 1, $category->can_name, ['class' => 'form-check-input', 'data-toggle' => 'toggle', 'data-on' => 'Allow', 'data-off' => 'Disallow']) !!}
-                {!! Form::label('can_name', 'Can be Named', ['class' => 'form-check-label ml-3']) !!} {!! add_help('This will set items in this category to be able to be named when in character inventories-- for instance, for pets. Works best in conjunction with a hold limit on the category.') !!}
-            </div>
-        </div>
+        @endif
     </div>
-</div>
 
-<div class="text-right">
-    {!! Form::submit($category->id ? 'Edit' : 'Create', ['class' => 'btn btn-primary']) !!}
-</div>
+    <div class="form-group">
+        {!! Form::label('Description (Optional)') !!}
+        {!! Form::textarea('description', $category->description, ['class' => 'form-control wysiwyg']) !!}
+    </div>
 
-{!! Form::close() !!}
+    <div class="form-group">
+        {!! Form::checkbox('is_visible', 1, $category->id ? $category->is_visible : 1, ['class' => 'form-check-input', 'data-toggle' => 'toggle']) !!}
+        {!! Form::label('is_visible', 'Is Visible', ['class' => 'form-check-label ml-3']) !!} {!! add_help('If turned off, the category will not be visible in the category list or available for selection in search. Permissioned staff will still be able to add items to them, however.') !!}
+    </div>
 
-@if($category->id)
-    <h3>Preview</h3>
-    <div class="card mb-3">
+    <div class="card mb-3" id="characterOptions">
         <div class="card-body">
-            @include('world._item_category_entry', ['imageUrl' => $category->categoryImageUrl, 'name' => $category->displayName, 'description' => $category->parsed_description, 'category'=>$category])
+            <div class="mb-2">
+                <div class="form-group">
+                    {!! Form::checkbox('is_character_owned', 1, $category->is_character_owned, ['class' => 'form-check-input', 'data-toggle' => 'toggle', 'data-on' => 'Allow', 'data-off' => 'Disallow']) !!}
+                    {!! Form::label('is_character_owned', 'Can Be Owned by Characters', ['class' => 'form-check-label ml-3']) !!} {!! add_help('This will allow items in this category to be owned by characters.') !!}
+                </div>
+                <div class="form-group">
+                    {!! Form::label('character_limit', 'Character Hold Limit') !!} {!! add_help('This is the maximum amount of items from this category a character can possess. Set to 0 to allow infinite.') !!}
+                    {!! Form::text('character_limit', $category ? $category->character_limit : 0, ['class' => 'form-control stock-field', 'data-name' => 'character_limit']) !!}
+                </div>
+                <div class="form-group">
+                    {!! Form::checkbox('can_name', 1, $category->can_name, ['class' => 'form-check-input', 'data-toggle' => 'toggle', 'data-on' => 'Allow', 'data-off' => 'Disallow']) !!}
+                    {!! Form::label('can_name', 'Can be Named', ['class' => 'form-check-label ml-3']) !!} {!! add_help('This will set items in this category to be able to be named when in character inventories-- for instance, for pets. Works best in conjunction with a hold limit on the category.') !!}
+                </div>
+            </div>
         </div>
     </div>
-@endif
 
+    <div class="text-right">
+        {!! Form::submit($category->id ? 'Edit' : 'Create', ['class' => 'btn btn-primary']) !!}
+    </div>
+
+    {!! Form::close() !!}
+
+    @if ($category->id)
+        <h3>Preview</h3>
+        <div class="card mb-3">
+            <div class="card-body">
+                @include('world._item_category_entry', ['imageUrl' => $category->categoryImageUrl, 'name' => $category->displayName, 'description' => $category->parsed_description, 'category' => $category])
+            </div>
+        </div>
+    @endif
 @endsection
 
 @section('scripts')
-@parent
-<script>
-$( document ).ready(function() {    
-    $('.delete-category-button').on('click', function(e) {
-        e.preventDefault();
-        loadModal("{{ url('admin/data/item-categories/delete') }}/{{ $category->id }}", 'Delete Category');
-    });
-});
-    
-</script>
-@endsection
\ No newline at end of file
+    @parent
+    <script>
+        $(document).ready(function() {
+            $('.delete-category-button').on('click', function(e) {
+                e.preventDefault();
+                loadModal("{{ url('admin/data/item-categories/delete') }}/{{ $category->id }}", 'Delete Category');
+            });
+        });
+    </script>
+@endsection
diff --git a/resources/views/admin/items/edit_tag.blade.php b/resources/views/admin/items/edit_tag.blade.php
index 442e35719e..cc2f945524 100644
--- a/resources/views/admin/items/edit_tag.blade.php
+++ b/resources/views/admin/items/edit_tag.blade.php
@@ -1,24 +1,27 @@
 @extends('admin.layout')
 
-@section('admin-title') Edit Item Tag @endsection
+@section('admin-title')
+    Edit Item Tag
+@endsection
 
 @section('admin-content')
-{!! breadcrumbs(['Admin Panel' => 'admin', 'Items' => 'admin/data/items', 'Edit Item' => 'admin/data/items/edit/'.$item->id, 'Edit Tag Settings - ' . $tag->tag => 'admin/data/items/tag/'.$item->id.'/'.$tag->tag]) !!}
+    {!! breadcrumbs(['Admin Panel' => 'admin', 'Items' => 'admin/data/items', 'Edit Item' => 'admin/data/items/edit/' . $item->id, 'Edit Tag Settings - ' . $tag->tag => 'admin/data/items/tag/' . $item->id . '/' . $tag->tag]) !!}
 
-<h1>
-    Edit Tag Settings - {!! $tag->displayTag !!}
-    <a href="#" class="btn btn-outline-danger float-right delete-tag-button">Delete Tag</a>
-</h1>
+    <h1>
+        Edit Tag Settings - {!! $tag->displayTag !!}
+        <a href="#" class="btn btn-outline-danger float-right delete-tag-button">Delete Tag</a>
+    </h1>
 
-<p>Edit the parameters for this item tag on this item. Note that for the item tag to take effect (e.g. become a usable item), you will need to turn on the Active toggle. (Conversely, you can turn it off to prevent users from using it while preserving the old settings for future use.)</p> 
+    <p>Edit the parameters for this item tag on this item. Note that for the item tag to take effect (e.g. become a usable item), you will need to turn on the Active toggle. (Conversely, you can turn it off to prevent users from using it while preserving
+        the old settings for future use.)</p>
 
-@if(View::exists('admin.items.tags.'.$tag->tag.'_pre'))
-    @include('admin.items.tags.'.$tag->tag.'_pre', ['item' => $item, 'tag' => $tag])
-@endif
-{!! Form::open(['url' => 'admin/data/items/tag/'.$item->id.'/'.$tag->tag]) !!}
+    @if (View::exists('admin.items.tags.' . $tag->tag . '_pre'))
+        @include('admin.items.tags.' . $tag->tag . '_pre', ['item' => $item, 'tag' => $tag])
+    @endif
+    {!! Form::open(['url' => 'admin/data/items/tag/' . $item->id . '/' . $tag->tag]) !!}
 
-    @if(View::exists('admin.items.tags.'.$tag->tag))
-        @include('admin.items.tags.'.$tag->tag, ['item' => $item, 'tag' => $tag])
+    @if (View::exists('admin.items.tags.' . $tag->tag))
+        @include('admin.items.tags.' . $tag->tag, ['item' => $item, 'tag' => $tag])
     @endif
 
     {!! Form::checkbox('is_active', 1, $tag->is_active, ['class' => 'form-check-input', 'data-toggle' => 'toggle']) !!}
@@ -28,25 +31,23 @@
         {!! Form::submit('Edit Tag Settings', ['class' => 'btn btn-primary']) !!}
     </div>
 
-{!! Form::close() !!}
-@if(View::exists('admin.items.tags.'.$tag->tag.'_post'))
-    @include('admin.items.tags.'.$tag->tag.'_post', ['item' => $item, 'tag' => $tag])
-@endif
-
+    {!! Form::close() !!}
+    @if (View::exists('admin.items.tags.' . $tag->tag . '_post'))
+        @include('admin.items.tags.' . $tag->tag . '_post', ['item' => $item, 'tag' => $tag])
+    @endif
 @endsection
 
 @section('scripts')
-@parent
-@if(View::exists('js.admin_items.'.$tag->tag))
-    @include('js.admin_items.'.$tag->tag, ['item' => $item, 'tag' => $tag])
-@endif
-<script>
-$( document ).ready(function() {    
-    $('.delete-tag-button').on('click', function(e) {
-        e.preventDefault();
-        loadModal("{{ url('admin/data/items/delete-tag') }}/{{ $item->id }}/{{ $tag->tag }}", 'Delete Tag');
-    });
-});
-    
-</script>
-@endsection
\ No newline at end of file
+    @parent
+    @if (View::exists('js.admin_items.' . $tag->tag))
+        @include('js.admin_items.' . $tag->tag, ['item' => $item, 'tag' => $tag])
+    @endif
+    <script>
+        $(document).ready(function() {
+            $('.delete-tag-button').on('click', function(e) {
+                e.preventDefault();
+                loadModal("{{ url('admin/data/items/delete-tag') }}/{{ $item->id }}/{{ $tag->tag }}", 'Delete Tag');
+            });
+        });
+    </script>
+@endsection
diff --git a/resources/views/admin/items/item_categories.blade.php b/resources/views/admin/items/item_categories.blade.php
index 0d80c62ec9..a441c74cbc 100644
--- a/resources/views/admin/items/item_categories.blade.php
+++ b/resources/views/admin/items/item_categories.blade.php
@@ -1,65 +1,73 @@
 @extends('admin.layout')
 
-@section('admin-title') Item Categories @endsection
+@section('admin-title')
+    Item Categories
+@endsection
 
 @section('admin-content')
-{!! breadcrumbs(['Admin Panel' => 'admin', 'Item Categories' => 'admin/data/item-categories']) !!}
+    {!! breadcrumbs(['Admin Panel' => 'admin', 'Item Categories' => 'admin/data/item-categories']) !!}
 
-<h1>Item Categories</h1>
+    <h1>Item Categories</h1>
 
-<p>This is a list of item categories that will be used to sort items in the inventory. Creating item categories is entirely optional, but recommended if you have a lot of items in the game.</p> 
-<p>The sorting order reflects the order in which the item categories will be displayed in the inventory, as well as on the world pages.</p>
+    <p>This is a list of item categories that will be used to sort items in the inventory. Creating item categories is entirely optional, but recommended if you have a lot of items in the game.</p>
+    <p>The sorting order reflects the order in which the item categories will be displayed in the inventory, as well as on the world pages.</p>
 
-<div class="text-right mb-3"><a class="btn btn-primary" href="{{ url('admin/data/item-categories/create') }}"><i class="fas fa-plus"></i> Create New Item Category</a></div>
-@if(!count($categories))
-    <p>No item categories found.</p>
-@else 
-    <table class="table table-sm category-table">
-        <tbody id="sortable" class="sortable">
-            @foreach($categories as $category)
-                <tr class="sort-item" data-id="{{ $category->id }}">
-                    <td>
-                        <a class="fas fa-arrows-alt-v handle mr-3" href="#"></a>
-                        {!! $category->displayName !!}
-                    </td>
-                    <td class="text-right">
-                        <a href="{{ url('admin/data/item-categories/edit/'.$category->id) }}" class="btn btn-primary">Edit</a>
-                    </td>
-                </tr>
-            @endforeach
-        </tbody>
+    <div class="text-right mb-3"><a class="btn btn-primary" href="{{ url('admin/data/item-categories/create') }}"><i class="fas fa-plus"></i> Create New Item Category</a></div>
+    @if (!count($categories))
+        <p>No item categories found.</p>
+    @else
+        <table class="table table-sm category-table">
+            <tbody id="sortable" class="sortable">
+                @foreach ($categories as $category)
+                    <tr class="sort-item" data-id="{{ $category->id }}">
+                        <td>
+                            <a class="fas fa-arrows-alt-v handle mr-3" href="#"></a>
+                            @if (!$category->is_visible)
+                                <i class="fas fa-eye-slash mr-1"></i>
+                            @endif
+                            {!! $category->displayName !!}
+                        </td>
+                        <td class="text-right">
+                            <a href="{{ url('admin/data/item-categories/edit/' . $category->id) }}" class="btn btn-primary">Edit</a>
+                        </td>
+                    </tr>
+                @endforeach
+            </tbody>
 
-    </table>
-    <div class="mb-4">
-        {!! Form::open(['url' => 'admin/data/item-categories/sort']) !!}
-        {!! Form::hidden('sort', '', ['id' => 'sortableOrder']) !!}
-        {!! Form::submit('Save Order', ['class' => 'btn btn-primary']) !!}
-        {!! Form::close() !!}
-    </div>
-@endif
+        </table>
+        <div class="mb-4">
+            {!! Form::open(['url' => 'admin/data/item-categories/sort']) !!}
+            {!! Form::hidden('sort', '', ['id' => 'sortableOrder']) !!}
+            {!! Form::submit('Save Order', ['class' => 'btn btn-primary']) !!}
+            {!! Form::close() !!}
+        </div>
+    @endif
 
 @endsection
 
 @section('scripts')
-@parent
-<script>
-
-$( document ).ready(function() {
-    $('.handle').on('click', function(e) {
-        e.preventDefault();
-    });
-    $( "#sortable" ).sortable({
-        items: '.sort-item',
-        handle: ".handle",
-        placeholder: "sortable-placeholder",
-        stop: function( event, ui ) {
-            $('#sortableOrder').val($(this).sortable("toArray", {attribute:"data-id"}));
-        },
-        create: function() {
-            $('#sortableOrder').val($(this).sortable("toArray", {attribute:"data-id"}));
-        }
-    });
-    $( "#sortable" ).disableSelection();
-});
-</script>
-@endsection
\ No newline at end of file
+    @parent
+    <script>
+        $(document).ready(function() {
+            $('.handle').on('click', function(e) {
+                e.preventDefault();
+            });
+            $("#sortable").sortable({
+                items: '.sort-item',
+                handle: ".handle",
+                placeholder: "sortable-placeholder",
+                stop: function(event, ui) {
+                    $('#sortableOrder').val($(this).sortable("toArray", {
+                        attribute: "data-id"
+                    }));
+                },
+                create: function() {
+                    $('#sortableOrder').val($(this).sortable("toArray", {
+                        attribute: "data-id"
+                    }));
+                }
+            });
+            $("#sortable").disableSelection();
+        });
+    </script>
+@endsection
diff --git a/resources/views/admin/items/items.blade.php b/resources/views/admin/items/items.blade.php
index 436ca9826b..73e0da2c18 100644
--- a/resources/views/admin/items/items.blade.php
+++ b/resources/views/admin/items/items.blade.php
@@ -1,62 +1,79 @@
 @extends('admin.layout')
 
-@section('admin-title') Items @endsection
+@section('admin-title')
+    Items
+@endsection
 
 @section('admin-content')
-{!! breadcrumbs(['Admin Panel' => 'admin', 'Items' => 'admin/data/items']) !!}
+    {!! breadcrumbs(['Admin Panel' => 'admin', 'Items' => 'admin/data/items']) !!}
 
-<h1>Items</h1>
+    <h1>Items</h1>
 
-<p>This is a list of items in the game. Specific details about items can be added when they are granted to users (e.g. reason for grant). By default, items are merely collectibles and any additional functionality must be manually processed, or custom coded in for the specific item.</p>
+    <p>This is a list of items in the game. Specific details about items can be added when they are granted to users (e.g. reason for grant). By default, items are merely collectibles and any additional functionality must be manually processed, or custom
+        coded in for the specific item.</p>
 
-<div class="text-right mb-3">
-    @if(Auth::user()->hasPower('edit_inventories'))
-        <a class="btn btn-primary" href="{{ url('admin/grants/item-search') }}"><i class="fas fa-search"></i> Item Search</a>
-    @endif
-    <a class="btn btn-primary" href="{{ url('admin/data/item-categories') }}"><i class="fas fa-folder"></i> Item Categories</a>
-    <a class="btn btn-primary" href="{{ url('admin/data/items/create') }}"><i class="fas fa-plus"></i> Create New Item</a>
-</div>
+    <div class="text-right mb-3">
+        @if (Auth::user()->hasPower('edit_inventories'))
+            <a class="btn btn-primary" href="{{ url('admin/grants/item-search') }}"><i class="fas fa-search"></i> Item Search</a>
+        @endif
+        <a class="btn btn-primary" href="{{ url('admin/data/item-categories') }}"><i class="fas fa-folder"></i> Item Categories</a>
+        <a class="btn btn-primary" href="{{ url('admin/data/items/create') }}"><i class="fas fa-plus"></i> Create New Item</a>
+    </div>
 
-<div>
-    {!! Form::open(['method' => 'GET', 'class' => 'form-inline justify-content-end']) !!}
+    <div>
+        {!! Form::open(['method' => 'GET', 'class' => 'form-inline justify-content-end']) !!}
         <div class="form-group mr-3 mb-3">
             {!! Form::text('name', Request::get('name'), ['class' => 'form-control', 'placeholder' => 'Name']) !!}
         </div>
         <div class="form-group mr-3 mb-3">
-            {!! Form::select('item_category_id', $categories, Request::get('name'), ['class' => 'form-control']) !!}
+            {!! Form::select('item_category_id', $categories, Request::get('item_category_id'), ['class' => 'form-control']) !!}
         </div>
         <div class="form-group mb-3">
             {!! Form::submit('Search', ['class' => 'btn btn-primary']) !!}
         </div>
-    {!! Form::close() !!}
-</div>
-
-@if(!count($items))
-    <p>No items found.</p>
-@else
-    {!! $items->render() !!}
+        {!! Form::close() !!}
+    </div>
 
-        <div class="row ml-md-2 mb-4">
-          <div class="d-flex row flex-wrap col-12 pb-1 px-0 ubt-bottom">
-            <div class="col-5 col-md-6 font-weight-bold">Name</div>
-            <div class="col-5 col-md-5 font-weight-bold">Category</div>
-          </div>
-          @foreach($items as $item)
-          <div class="d-flex row flex-wrap col-12 mt-1 pt-2 px-0 ubt-top">
-            <div class="col-5 col-md-6"> {{ $item->name }} </div>
-            <div class="col-4 col-md-5"> {{ $item->category ? $item->category->name : '' }} </div>
-            <div class="col-3 col-md-1 text-right">
-              <a href="{{ url('admin/data/items/edit/'.$item->id) }}"  class="btn btn-primary py-0 px-2">Edit</a>
+    @if (!count($items))
+        <p>No items found.</p>
+    @else
+        {!! $items->render() !!}
+        <div class="mb-4 logs-table">
+            <div class="logs-table-header">
+                <div class="row">
+                    <div class="col-5 col-md-6">
+                        <div class="logs-table-cell">Name</div>
+                    </div>
+                    <div class="col-5 col-md-5">
+                        <div class="logs-table-cell">Category</div>
+                    </div>
+                </div>
+            </div>
+            <div class="logs-table-body">
+                @foreach ($items as $item)
+                    <div class="logs-table-row">
+                        <div class="row flex-wrap">
+                            <div class="col-5 col-md-6">
+                                <div class="logs-table-cell">
+                                    @if (!$item->is_released)
+                                        <i class="fas fa-eye-slash mr-1"></i>
+                                    @endif
+                                    {{ $item->name }}
+                                </div>
+                            </div>
+                            <div class="col-4 col-md-5">
+                                <div class="logs-table-cell">{{ $item->category ? $item->category->name : '' }}</div>
+                            </div>
+                            <div class="col-3 col-md-1 text-right">
+                                <div class="logs-table-cell">
+                                    <a href="{{ url('admin/data/items/edit/' . $item->id) }}" class="btn btn-primary py-0 px-2">Edit</a>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                @endforeach
             </div>
-          </div>
-          @endforeach
         </div>
-
-    {!! $items->render() !!}
-@endif
-
-@endsection
-
-@section('scripts')
-@parent
+        {!! $items->render() !!}
+    @endif
 @endsection
diff --git a/resources/views/admin/items/tags/box.blade.php b/resources/views/admin/items/tags/box.blade.php
index 7bd55ff7ce..8f304b534b 100644
--- a/resources/views/admin/items/tags/box.blade.php
+++ b/resources/views/admin/items/tags/box.blade.php
@@ -2,4 +2,4 @@
 
 <p>These are the rewards that will be distributed to the user when they use the box from their inventory. The box will only distribute rewards to the user themselves - character-only currencies should not be added.</p>
 
-@include('widgets._loot_select', ['loots' => $tag->getData(), 'showLootTables' => true, 'showRaffles' => true])
\ No newline at end of file
+@include('widgets._loot_select', ['loots' => $tag->getData(), 'showLootTables' => true, 'showRaffles' => true])
diff --git a/resources/views/admin/items/tags/box_post.blade.php b/resources/views/admin/items/tags/box_post.blade.php
index 676f95f2bc..9429df5490 100644
--- a/resources/views/admin/items/tags/box_post.blade.php
+++ b/resources/views/admin/items/tags/box_post.blade.php
@@ -1 +1 @@
-@include('widgets._loot_select_row', ['items' => $items, 'currencies' => $currencies, 'showLootTables' => true, 'showRaffles' => true])
\ No newline at end of file
+@include('widgets._loot_select_row', ['showLootTables' => true, 'showRaffles' => true])
diff --git a/resources/views/admin/items/tags/slot.blade.php b/resources/views/admin/items/tags/slot.blade.php
index c3df575e20..08d2f0fc60 100644
--- a/resources/views/admin/items/tags/slot.blade.php
+++ b/resources/views/admin/items/tags/slot.blade.php
@@ -1,14 +1,14 @@
 <h1>MYO Slot Settings</h1>
 
 <h3>Basic Information</h3>
-    <div class="form-group">
-        {!! Form::label('Name') !!} {!! add_help('Enter a descriptive name for the type of character this slot can create, e.g. Rare MYO Slot. This will be listed on the MYO slot masterlist.') !!}
-        {!! Form::text('name', $tag->getData()['name'], ['class' => 'form-control']) !!}
-    </div>
+<div class="form-group">
+    {!! Form::label('Name') !!} {!! add_help('Enter a descriptive name for the type of character this slot can create, e.g. Rare MYO Slot. This will be listed on the MYO slot masterlist.') !!}
+    {!! Form::text('name', $tag->getData()['name'], ['class' => 'form-control']) !!}
+</div>
 
 <div class="form-group">
-    {!! Form::label('Description (Optional)') !!} 
-    @if($isMyo)
+    {!! Form::label('Description (Optional)') !!}
+    @if ($isMyo)
         {!! add_help('This section is for making additional notes about the MYO slot. If there are restrictions for the character that can be created by this slot that cannot be expressed with the options below, use this section to describe them.') !!}
     @else
         {!! add_help('This section is for making additional notes about the character and is separate from the character\'s profile (this is not editable by the user).') !!}
@@ -18,13 +18,15 @@
 
 <div class="form-group">
     {!! Form::checkbox('is_visible', 1, $tag->getData()['is_visible'], ['class' => 'form-check-input', 'data-toggle' => 'toggle']) !!}
-    {!! Form::label('is_visible', 'Is Visible', ['class' => 'form-check-label ml-3']) !!} {!! add_help('Turn this off to hide the '.($isMyo ? 'MYO slot' : 'character').'. Only mods with the Manage Masterlist power (that\'s you!) can view it - the owner will also not be able to see the '.($isMyo ? 'MYO slot' : 'character').'\'s page.') !!}
+    {!! Form::label('is_visible', 'Is Visible', ['class' => 'form-check-label ml-3']) !!} {!! add_help(
+        'Turn this off to hide the ' . ($isMyo ? 'MYO slot' : 'character') . '. Only mods with the Manage Masterlist power (that\'s you!) can view it - the owner will also not be able to see the ' . ($isMyo ? 'MYO slot' : 'character') . '\'s page.',
+    ) !!}
 </div>
 
 <h3>Transfer Information</h3>
 
 <div class="alert alert-info">
-    These are displayed on the MYO slot's profile, but don't have any effect on site functionality except for the following: 
+    These are displayed on the MYO slot's profile, but don't have any effect on site functionality except for the following:
     <ul>
         <li>If all switches are off, the MYO slot cannot be transferred by the user (directly or through trades).</li>
         <li>If a transfer cooldown is set, the MYO slot also cannot be transferred by the user (directly or through trades) until the cooldown is up.</li>
@@ -57,7 +59,9 @@
 </div>
 
 <div class="form-group">
-    {!! Form::label('Subtype (Optional)') !!} {!! add_help('This will lock the slot into a particular subtype. Leave it blank if you would like to give the user a choice, or not select a subtype. The subtype must match the species selected above, and if no species is specified, the subtype will not be applied.') !!}
+    {!! Form::label('Subtype (Optional)') !!} {!! add_help(
+        'This will lock the slot into a particular subtype. Leave it blank if you would like to give the user a choice, or not select a subtype. The subtype must match the species selected above, and if no species is specified, the subtype will not be applied.',
+    ) !!}
     {!! Form::select('subtype_id', $subtypes, $tag->getData()['subtype_id'], ['class' => 'form-control', 'id' => 'subtype']) !!}
 </div>
 
@@ -67,6 +71,6 @@
 </div>
 
 @section('scripts')
-@parent
-@include('widgets._character_create_options_js')
-@endsection
\ No newline at end of file
+    @parent
+    @include('widgets._character_create_options_js')
+@endsection
diff --git a/resources/views/admin/layout.blade.php b/resources/views/admin/layout.blade.php
index baf54a356a..df42903da1 100644
--- a/resources/views/admin/layout.blade.php
+++ b/resources/views/admin/layout.blade.php
@@ -1,7 +1,7 @@
 @extends('layouts.app')
 
-@section('title') 
-    Admin :: 
+@section('title')
+    Admin ::
     @yield('admin-title')
 @endsection
 
@@ -14,5 +14,5 @@
 @endsection
 
 @section('scripts')
-@parent
-@endsection
\ No newline at end of file
+    @parent
+@endsection
diff --git a/resources/views/admin/logs.blade.php b/resources/views/admin/logs.blade.php
new file mode 100644
index 0000000000..babdd352d6
--- /dev/null
+++ b/resources/views/admin/logs.blade.php
@@ -0,0 +1,66 @@
+@extends('admin.layout')
+
+@section('admin-title')
+    Logs
+@endsection
+
+@section('admin-content')
+    {!! breadcrumbs(['Admin Panel' => 'admin', 'Logs' => 'admin/logs']) !!}
+
+    <h1>Admin Logs</h1>
+
+    <div>
+        {!! Form::open(['method' => 'GET', 'class' => 'form-inline justify-content-end']) !!}
+        <div class="form-group mr-3 mb-3">
+            {!! Form::select('action', $actions, Request::get('action'), ['class' => 'form-control', 'placeholder' => 'Select Action']) !!}
+        </div>
+        <div class="form-group mr-3 mb-3">
+            {!! Form::select('user_id', $staff, Request::get('user_id'), ['class' => 'form-control', 'placeholder' => 'Select Staff']) !!}
+        </div>
+        <div class="form-group mb-3">
+            {!! Form::submit('Search', ['class' => 'btn btn-primary']) !!}
+        </div>
+        {!! Form::close() !!}
+    </div>
+
+    {!! $logs->render() !!}
+    <div class="mb-4 logs-table">
+        <div class="logs-table-header">
+            <div class="row">
+                <div class="col-6 col-md-3">
+                    <div class="logs-table-cell">Staff</div>
+                </div>
+                <div class="col-6 col-md-3">
+                    <div class="logs-table-cell">Action</div>
+                </div>
+                <div class="col-6 col-md-3">
+                    <div class="logs-table-cell">Action Details</div>
+                </div>
+                <div class="col-6 col-md-3">
+                    <div class="logs-table-cell">Date</div>
+                </div>
+            </div>
+        </div>
+        <div class="logs-table-body">
+            @foreach ($logs as $log)
+                <div class="logs-table-row">
+                    <div class="row flex-wrap">
+                        <div class="col-6 col-md-3">
+                            <div class="logs-table-cell">{!! $log->user->displayName !!}</div>
+                        </div>
+                        <div class="col-6 col-md-3">
+                            <div class="logs-table-cell">{!! $log->action !!}</div>
+                        </div>
+                        <div class="col-6 col-md-3">
+                            <div class="logs-table-cell">{!! $log->action_details !!}</div>
+                        </div>
+                        <div class="col-6 col-md-3">
+                            <div class="logs-table-cell">{!! format_date($log->created_at) !!} ({!! pretty_date($log->created_at) !!})</div>
+                        </div>
+                    </div>
+                </div>
+            @endforeach
+        </div>
+    </div>
+    {!! $logs->render() !!}
+@endsection
diff --git a/resources/views/admin/loot_tables/_delete_loot_table.blade.php b/resources/views/admin/loot_tables/_delete_loot_table.blade.php
index b483f7b715..faed60eec9 100644
--- a/resources/views/admin/loot_tables/_delete_loot_table.blade.php
+++ b/resources/views/admin/loot_tables/_delete_loot_table.blade.php
@@ -1,5 +1,5 @@
-@if($table)
-    {!! Form::open(['url' => 'admin/data/loot-tables/delete/'.$table->id]) !!}
+@if ($table)
+    {!! Form::open(['url' => 'admin/data/loot-tables/delete/' . $table->id]) !!}
 
     <p>You are about to delete the loot table <strong>{{ $table->name }}</strong>. This is not reversible. If prompts that use this loot table exist, you will not be able to delete this table.</p>
     <p>Are you sure you want to delete <strong>{{ $table->name }}</strong>?</p>
@@ -9,6 +9,6 @@
     </div>
 
     {!! Form::close() !!}
-@else 
+@else
     Invalid loot table selected.
-@endif
\ No newline at end of file
+@endif
diff --git a/resources/views/admin/loot_tables/_roll_loot_table.blade.php b/resources/views/admin/loot_tables/_roll_loot_table.blade.php
index 6cb92e375c..9940e7d43a 100644
--- a/resources/views/admin/loot_tables/_roll_loot_table.blade.php
+++ b/resources/views/admin/loot_tables/_roll_loot_table.blade.php
@@ -1,25 +1,41 @@
 <p>You rolled {{ $quantity }} time{{ $quantity != 1 ? 's' : '' }} for the following:</p>
-<table class="table table-sm table-striped">
-    <thead>
-        <th>#</th>
-        <th>Reward</th>
-        <th>Quantity</th>
-    </thead>
-    <tbody>
+<div class="mb-4 logs-table table-striped">
+    <div class="logs-table-header">
+        <div class="row">
+            <div class="col-1">
+                <div class="logs-table-cell text-center">#</div>
+            </div>
+            <div class="col-6 col-md-3">
+                <div class="logs-table-cell">Reward</div>
+            </div>
+            <div class="col-5 col-md-3">
+                <div class="logs-table-cell">Quantity</div>
+            </div>
+        </div>
+    </div>
+    <div class="logs-table-body">
         <?php $count = 1; ?>
-        @foreach($results as $result)
-            @foreach($result as $type)
-                @if(count($type))
-                    @foreach($type as $t)
-                        <tr>
-                            <td>{{ $count++ }}</td>
-                            <td>{!! $t['asset']->displayName !!}</td>
-                            <td>{{ $t['quantity'] }}</td>
-                        </tr>
+        @foreach ($results as $result)
+            @foreach ($result as $type)
+                @if (count($type))
+                    @foreach ($type as $t)
+                        <div class="logs-table-row">
+                            <div class="row flex-wrap">
+                                <div class="col-1">
+                                    <div class="logs-table-cell text-center">{{ $count++ }}</div>
+                                </div>
+                                <div class="col-6 col-md-3">
+                                    <div class="logs-table-cell">{!! $t['asset']->displayName !!}</div>
+                                </div>
+                                <div class="col-5 col-md-3">
+                                    <div class="logs-table-cell">{{ $t['quantity'] }}</div>
+                                </div>
+                            </div>
+                        </div>
                     @endforeach
                 @endif
             @endforeach
         @endforeach
-    </tbody>
-</table>
-<p>Note: "None" results are not shown in this table.</p>
\ No newline at end of file
+    </div>
+</div>
+<p>Note: "None" results are not shown in this table.</p>
diff --git a/resources/views/admin/loot_tables/create_edit_loot_table.blade.php b/resources/views/admin/loot_tables/create_edit_loot_table.blade.php
index 03b014570b..02f1e18b50 100644
--- a/resources/views/admin/loot_tables/create_edit_loot_table.blade.php
+++ b/resources/views/admin/loot_tables/create_edit_loot_table.blade.php
@@ -1,243 +1,274 @@
 @extends('admin.layout')
 
-@section('admin-title') Loot Tables @endsection
+@section('admin-title')
+    {{ $table->id ? 'Edit' : 'Create' }} Loot Table
+@endsection
 
 @section('admin-content')
-{!! breadcrumbs(['Admin Panel' => 'admin', 'Loot Tables' => 'admin/data/loot-tables', ($table->id ? 'Edit' : 'Create').' Loot Table' => $table->id ? 'admin/data/loot-tables/edit/'.$table->id : 'admin/data/loot-tables/create']) !!}
+    {!! breadcrumbs(['Admin Panel' => 'admin', 'Loot Tables' => 'admin/data/loot-tables', ($table->id ? 'Edit' : 'Create') . ' Loot Table' => $table->id ? 'admin/data/loot-tables/edit/' . $table->id : 'admin/data/loot-tables/create']) !!}
 
-<h1>{{ $table->id ? 'Edit' : 'Create' }} Loot Table
-    @if($table->id)
-        <a href="#" class="btn btn-danger float-right delete-table-button">Delete Loot Table</a>
-    @endif
-</h1>
-
-{!! Form::open(['url' => $table->id ? 'admin/data/loot-tables/edit/'.$table->id : 'admin/data/loot-tables/create']) !!}
-
-<h3>Basic Information</h3>
-
-<div class="form-group">
-    {!! Form::label('Name') !!} {!! add_help('This is the name you will use to identify this table internally. This name will not be shown to users and does not have to be unique, but a name that can be easily identified is recommended.') !!}
-    {!! Form::text('name', $table->name, ['class' => 'form-control']) !!}
-</div>
-
-<div class="form-group">
-    {!! Form::label('Display Name') !!} {!! add_help('This is the name that will be shown to users, for example when displaying the rewards for doing a prompt. This is for display purposes and can be something more vague than the above, e.g. "A Random Rare Item"') !!}
-    {!! Form::text('display_name', $table->getRawOriginal('display_name'), ['class' => 'form-control']) !!}
-</div>
-
-<h3>Loot</h3>
-
-<p>These are the potential rewards from rolling on this loot table. You can add items, currencies or even another loot table. Chaining multiple loot tables is not recommended, however, and may run the risk of creating an infinite loop. @if(!$table->id) You can test loot rolling after the loot table is created. @endif</p>
-<p>You can add any kind of currencies (both user- and character-attached), but be sure to keep track of which are being distributed! Character-only currencies cannot be given to users.</p>
-
-<div class="text-right mb-3">
-    <a href="#" class="btn btn-info" id="addLoot">Add Loot</a>
-</div>
-<table class="table table-sm" id="lootTable">
-    <thead>
-        <tr>
-            <th width="25%">Loot Type</th>
-            <th width="35%">Reward</th>
-            <th width="10%">Quantity</th>
-            <th width="10%">Weight {!! add_help('A higher weight means a reward is more likely to be rolled. Weights have to be integers above 0 (round positive number, no decimals) and do not have to add up to be a particular number.') !!}</th>
-            <th width="10%">Chance</th>
-            <th width="10%"></th>
-        </tr>
-    </thead>
-    <tbody id="lootTableBody">
-        @if($table->id)
-            @foreach($table->loot as $loot)
-                <tr class="loot-row">
-                    <td>{!! Form::select('rewardable_type[]', Config::get('lorekeeper.extensions.item_entry_expansion.loot_tables.enable') ? ['Item' => 'Item', 'ItemRarity' => 'Item Rarity', 'Currency' => 'Currency', 'LootTable' => 'Loot Table', 'ItemCategory' => 'Item Category', 'ItemCategoryRarity' => 'Item Category (Conditional)', 'None' => 'None'] : ['Item' => 'Item', 'Currency' => 'Currency', 'LootTable' => 'Loot Table', 'ItemCategory' => 'Item Category', 'None' => 'None'], $loot->rewardable_type, ['class' => 'form-control reward-type', 'placeholder' => 'Select Reward Type']) !!}</td>
-                    <td class="loot-row-select">
-                        @if($loot->rewardable_type == 'Item')
-                            {!! Form::select('rewardable_id[]', $items, $loot->rewardable_id, ['class' => 'form-control item-select selectize', 'placeholder' => 'Select Item']) !!}
-                        @elseif($loot->rewardable_type == 'ItemRarity')
-                            <div class="item-rarity-select d-flex">
-                                {!! Form::select('criteria[]', ['=' => '=', '<' => '<', '>' => '>', '<=' => '<=', '>=' => '>='], isset($loot->data['criteria']) ? $loot->data['criteria'] : null, ['class' => 'form-control', 'placeholder' => 'Criteria']) !!}
-                                {!! Form::select('rarity[]', $rarities, isset($loot->data['rarity']) ? $loot->data['rarity'] : null, ['class' => 'form-control', 'placeholder' => 'Rarity']) !!}
-                            </div>
-                        @elseif($loot->rewardable_type == 'Currency')
-                            {!! Form::select('rewardable_id[]', $currencies, $loot->rewardable_id, ['class' => 'form-control currency-select selectize', 'placeholder' => 'Select Currency']) !!}
-                        @elseif($loot->rewardable_type == 'LootTable')
-                            {!! Form::select('rewardable_id[]', $tables, $loot->rewardable_id, ['class' => 'form-control table-select selectize', 'placeholder' => 'Select Loot Table']) !!}
-                        @elseif($loot->rewardable_type == 'ItemCategoryRarity')
-                            <div class="category-rarity-select d-flex">
-                                {!! Form::select('rewardable_id[]', $categories, $loot->rewardable_id, ['class' => 'form-control selectize', 'placeholder' => 'Category']) !!}
-                                {!! Form::select('criteria[]', ['=' => '=', '<' => '<', '>' => '>', '<=' => '<=', '>=' => '>='], isset($loot->data['criteria']) ? $loot->data['criteria'] : null, ['class' => 'form-control', 'placeholder' => 'Criteria']) !!}
-                                {!! Form::select('rarity[]', $rarities, isset($loot->data['rarity']) ? $loot->data['rarity'] : null, ['class' => 'form-control', 'placeholder' => 'Rarity']) !!}
-                            </div>
-                        @elseif($loot->rewardable_type == 'ItemCategory')
-                            {!! Form::select('rewardable_id[]', $categories, $loot->rewardable_id, ['class' => 'form-control item-select selectize', 'placeholder' => 'Select Item']) !!}
-                        @elseif($loot->rewardable_type == 'None')
-                            {!! Form::select('rewardable_id[]', [1 => 'No reward given.'], $loot->rewardable_id, ['class' => 'form-control']) !!}
-                        @endif
-                    </td>
-                    <td>{!! Form::text('quantity[]', $loot->quantity, ['class' => 'form-control']) !!}</td>
-                    <td class="loot-row-weight">{!! Form::text('weight[]', $loot->weight, ['class' => 'form-control loot-weight']) !!}</td>
-                    <td class="loot-row-chance"></td>
-                    <td class="text-right"><a href="#" class="btn btn-danger remove-loot-button">Remove</a></td>
-                </tr>
-            @endforeach
+    <h1>
+        {{ $table->id ? 'Edit' : 'Create' }} Loot Table
+        @if ($table->id)
+            <a href="#" class="btn btn-danger float-right delete-table-button">Delete Loot Table</a>
         @endif
-    </tbody>
-</table>
-
-<div class="text-right">
-    {!! Form::submit($table->id ? 'Edit' : 'Create', ['class' => 'btn btn-primary']) !!}
-</div>
-
-{!! Form::close() !!}
-
-<div id="lootRowData" class="hide">
-    <table class="table table-sm">
-        <tbody id="lootRow">
-            <tr class="loot-row">
-                <td>{!! Form::select('rewardable_type[]', Config::get('lorekeeper.extensions.item_entry_expansion.loot_tables.enable') ? ['Item' => 'Item', 'ItemRarity' => 'Item Rarity', 'Currency' => 'Currency', 'LootTable' => 'Loot Table', 'ItemCategory' => 'Item Category', 'ItemCategoryRarity' => 'Item Category (Conditional)', 'None' => 'None'] : ['Item' => 'Item', 'Currency' => 'Currency', 'LootTable' => 'Loot Table', 'ItemCategory' => 'Item Category', 'None' => 'None'], null, ['class' => 'form-control reward-type', 'placeholder' => 'Select Reward Type']) !!}</td>
-                <td class="loot-row-select"></td>
-                <td>{!! Form::text('quantity[]', 1, ['class' => 'form-control']) !!}</td>
-                <td class="loot-row-weight">{!! Form::text('weight[]', 1, ['class' => 'form-control loot-weight']) !!}</td>
-                <td class="loot-row-chance"></td>
-                <td class="text-right"><a href="#" class="btn btn-danger remove-loot-button">Remove</a></td>
-            </tr>
-        </tbody>
-    </table>
-    {!! Form::select('rewardable_id[]', $items, null, ['class' => 'form-control item-select', 'placeholder' => 'Select Item']) !!}
-    <div class="item-rarity-select d-flex">
-        {!! Form::select('criteria[]', ['=' => '=', '<' => '<', '>' => '>', '<=' => '<=', '>=' => '>='], null, ['class' => 'form-control criteria-select', 'placeholder' => 'Criteria']) !!}
-        {!! Form::select('rarity[]', $rarities, null, ['class' => 'form-control criteria-select', 'placeholder' => 'Rarity']) !!}
-    </div>
-    {!! Form::select('rewardable_id[]', $currencies, null, ['class' => 'form-control currency-select', 'placeholder' => 'Select Currency']) !!}
-    {!! Form::select('rewardable_id[]', $tables, null, ['class' => 'form-control table-select', 'placeholder' => 'Select Loot Table']) !!}
-    {!! Form::select('rewardable_id[]', $categories, null, ['class' => 'form-control category-select', 'placeholder' => 'Select Item Category']) !!}
-    <div class="category-rarity-select d-flex">
-        {!! Form::select('rewardable_id[]', $categories, null, ['class' => 'form-control', 'placeholder' => 'Category']) !!}
-        {!! Form::select('criteria[]', ['=' => '=', '<' => '<', '>' => '>', '<=' => '<=', '>=' => '>='], null, ['class' => 'form-control criteria-select', 'placeholder' => 'Criteria']) !!}
-        {!! Form::select('rarity[]', $rarities, null, ['class' => 'form-control criteria-select', 'placeholder' => 'Rarity']) !!}
+    </h1>
+
+    {!! Form::open(['url' => $table->id ? 'admin/data/loot-tables/edit/' . $table->id : 'admin/data/loot-tables/create']) !!}
+
+    <h3>Basic Information</h3>
+
+    <div class="form-group">
+        {!! Form::label('Name') !!} {!! add_help('This is the name you will use to identify this table internally. This name will not be shown to users and does not have to be unique, but a name that can be easily identified is recommended.') !!}
+        {!! Form::text('name', $table->name, ['class' => 'form-control']) !!}
     </div>
-    {!! Form::select('rewardable_id[]', [1 => 'No reward given.'], null, ['class' => 'form-control none-select']) !!}
-</div>
 
-@if($table->id)
-    <h3>Test Roll</h3>
-    <p>If you have made any modifications to the loot table contents above, be sure to save it (click the Edit button) before testing.</p>
-    <p>Please note that due to the nature of probability, as long as there is a chance, there will always be the possibility of rolling improbably good or bad results. <i>This is not indicative of the code being buggy or poor game balance.</i> Be cautious when adjusting values based on a small sample size, including but not limited to test rolls and a small amount of user reports.</p>
     <div class="form-group">
-        {!! Form::label('quantity', 'Number of Rolls') !!}
-        {!! Form::text('quantity', 1, ['class' => 'form-control', 'id' => 'rollQuantity']) !!}
+        {!! Form::label('Display Name') !!} {!! add_help('This is the name that will be shown to users, for example when displaying the rewards for doing a prompt. This is for display purposes and can be something more vague than the above, e.g. "A Random Rare Item"') !!}
+        {!! Form::text('display_name', $table->getRawOriginal('display_name'), ['class' => 'form-control']) !!}
+    </div>
+
+    <h3>Loot</h3>
+
+    <p>These are the potential rewards from rolling on this loot table. You can add items, currencies or even another loot table. Chaining multiple loot tables is not recommended, however, and may run the risk of creating an infinite loop. @if (!$table->id)
+            You can test loot rolling after the loot table is created.
+        @endif
+    </p>
+    <p>You can add any kind of currencies (both user- and character-attached), but be sure to keep track of which are being distributed! Character-only currencies cannot be given to users.</p>
+
+    <div class="text-right mb-3">
+        <a href="#" class="btn btn-info" id="addLoot">Add Loot</a>
     </div>
+    <table class="table table-sm" id="lootTable">
+        <thead>
+            <tr>
+                <th width="25%">Loot Type</th>
+                <th width="35%">Reward</th>
+                <th width="10%">Quantity</th>
+                <th width="10%">Weight {!! add_help('A higher weight means a reward is more likely to be rolled. Weights have to be integers above 0 (round positive number, no decimals) and do not have to add up to be a particular number.') !!}</th>
+                <th width="10%">Chance</th>
+                <th width="10%"></th>
+            </tr>
+        </thead>
+        <tbody id="lootTableBody">
+            @if ($table->id)
+                @foreach ($table->loot as $loot)
+                    <tr class="loot-row">
+                        <td>{!! Form::select(
+                            'rewardable_type[]',
+                            config('lorekeeper.extensions.item_entry_expansion.loot_tables.enable')
+                                ? ['Item' => 'Item', 'ItemRarity' => 'Item Rarity', 'Currency' => 'Currency', 'LootTable' => 'Loot Table', 'ItemCategory' => 'Item Category', 'ItemCategoryRarity' => 'Item Category (Conditional)', 'None' => 'None']
+                                : ['Item' => 'Item', 'Currency' => 'Currency', 'LootTable' => 'Loot Table', 'ItemCategory' => 'Item Category', 'None' => 'None'],
+                            $loot->rewardable_type,
+                            ['class' => 'form-control reward-type', 'placeholder' => 'Select Reward Type'],
+                        ) !!}</td>
+                        <td class="loot-row-select">
+                            @if ($loot->rewardable_type == 'Item')
+                                {!! Form::select('rewardable_id[]', $items, $loot->rewardable_id, ['class' => 'form-control item-select selectize', 'placeholder' => 'Select Item']) !!}
+                            @elseif($loot->rewardable_type == 'ItemRarity')
+                                <div class="item-rarity-select d-flex">
+                                    {!! Form::select('criteria[]', ['=' => '=', '<' => '<', '>' => '>', '<=' => '<=', '>=' => '>='], isset($loot->data['criteria']) ? $loot->data['criteria'] : null, ['class' => 'form-control', 'placeholder' => 'Criteria']) !!}
+                                    {!! Form::select('rarity[]', $rarities, isset($loot->data['rarity']) ? $loot->data['rarity'] : null, ['class' => 'form-control', 'placeholder' => 'Rarity']) !!}
+                                </div>
+                            @elseif($loot->rewardable_type == 'Currency')
+                                {!! Form::select('rewardable_id[]', $currencies, $loot->rewardable_id, ['class' => 'form-control currency-select selectize', 'placeholder' => 'Select Currency']) !!}
+                            @elseif($loot->rewardable_type == 'LootTable')
+                                {!! Form::select('rewardable_id[]', $tables, $loot->rewardable_id, ['class' => 'form-control table-select selectize', 'placeholder' => 'Select Loot Table']) !!}
+                            @elseif($loot->rewardable_type == 'ItemCategoryRarity')
+                                <div class="category-rarity-select d-flex">
+                                    {!! Form::select('rewardable_id[]', $categories, $loot->rewardable_id, ['class' => 'form-control selectize', 'placeholder' => 'Category']) !!}
+                                    {!! Form::select('criteria[' . $loop->index . ']', ['=' => '=', '<' => '<', '>' => '>', '<=' => '<=', '>=' => '>='], isset($loot->data['criteria']) ? $loot->data['criteria'] : null, ['class' => 'form-control', 'placeholder' => 'Criteria']) !!}
+                                    {!! Form::select('rarity[' . $loop->index . ']', $rarities, isset($loot->data['rarity']) ? $loot->data['rarity'] : null, ['class' => 'form-control', 'placeholder' => 'Rarity']) !!}
+                                </div>
+                            @elseif($loot->rewardable_type == 'ItemCategory')
+                                {!! Form::select('rewardable_id[]', $categories, $loot->rewardable_id, ['class' => 'form-control item-select selectize', 'placeholder' => 'Select Item']) !!}
+                            @elseif($loot->rewardable_type == 'None')
+                                {!! Form::select('rewardable_id[]', [1 => 'No reward given.'], $loot->rewardable_id, ['class' => 'form-control']) !!}
+                            @endif
+                        </td>
+                        <td>{!! Form::text('quantity[]', $loot->quantity, ['class' => 'form-control']) !!}</td>
+                        <td class="loot-row-weight">{!! Form::text('weight[]', $loot->weight, ['class' => 'form-control loot-weight']) !!}</td>
+                        <td class="loot-row-chance"></td>
+                        <td class="text-right"><a href="#" class="btn btn-danger remove-loot-button">Remove</a></td>
+                    </tr>
+                @endforeach
+            @endif
+        </tbody>
+    </table>
+
     <div class="text-right">
-        <a href="#" class="btn btn-primary" id="testRoll">Test Roll</a>
+        {!! Form::submit($table->id ? 'Edit' : 'Create', ['class' => 'btn btn-primary']) !!}
     </div>
-@endif
 
-@endsection
+    {!! Form::close() !!}
 
-@section('scripts')
-@parent
-<script>
-$( document ).ready(function() {
-    var $lootTable  = $('#lootTableBody');
-    var $lootRow = $('#lootRow').find('.loot-row');
-    var $itemSelect = $('#lootRowData').find('.item-select');
-    var $itemRaritySelect = $('#lootRowData').find('.item-rarity-select');
-    var $currencySelect = $('#lootRowData').find('.currency-select');
-    var $tableSelect = $('#lootRowData').find('.table-select');
-    var $categorySelect = $('#lootRowData').find('.category-select');
-    var $categoryRaritySelect = $('#lootRowData').find('.category-rarity-select');
-    var $noneSelect = $('#lootRowData').find('.none-select');
-
-    refreshChances();
-    $('#lootTableBody .selectize').selectize();
-    attachRemoveListener($('#lootTableBody .remove-loot-button'));
-
-    $('.delete-table-button').on('click', function(e) {
-        e.preventDefault();
-        loadModal("{{ url('admin/data/loot-tables/delete') }}/{{ $table->id }}", 'Delete Loot Table');
-    });
-
-    $('#testRoll').on('click', function(e) {
-        e.preventDefault();
-        loadModal("{{ url('admin/data/loot-tables/roll') }}/{{ $table->id }}?quantity=" + $('#rollQuantity').val(), 'Rolling Loot Table');
-    });
-
-    $('#addLoot').on('click', function(e) {
-        e.preventDefault();
-        var $clone = $lootRow.clone();
-        $lootTable.append($clone);
-        attachRewardTypeListener($clone.find('.reward-type'));
-        attachRemoveListener($clone.find('.remove-loot-button'));
-        attachWeightListener($clone.find('.loot-weight'));
-        refreshChances();
-    });
-
-    $('.reward-type').on('change', function(e) {
-        var val = $(this).val();
-        var $cell = $(this).parent().find('.loot-row-select');
-
-        var $clone = null;
-        if(val == 'Item') $clone = $itemSelect.clone();
-        else if (val == 'ItemRarity') $clone = $itemRaritySelect.clone();
-        else if (val == 'Currency') $clone = $currencySelect.clone();
-        else if (val == 'ItemCategory') $clone = $categorySelect.clone();
-        else if (val == 'ItemCategoryRarity') $clone = $categoryRaritySelect.clone();
-        else if (val == 'LootTable') $clone = $tableSelect.clone();
-        else if (val == 'None') $clone = $noneSelect.clone();
-
-        $cell.html('');
-        $cell.append($clone);
-    });
-
-    function attachRewardTypeListener(node) {
-        node.on('change', function(e) {
-            var val = $(this).val();
-            var $cell = $(this).parent().parent().find('.loot-row-select');
-
-            var $clone = null;
-            if(val == 'Item') $clone = $itemSelect.clone();
-            else if (val == 'ItemRarity') $clone = $itemRaritySelect.clone();
-            else if (val == 'ItemCategory') $clone = $categorySelect.clone();
-            else if (val == 'ItemCategoryRarity') $clone = $categoryRaritySelect.clone();
-            else if (val == 'Currency') $clone = $currencySelect.clone();
-            else if (val == 'LootTable') $clone = $tableSelect.clone();
-            else if (val == 'None') $clone = $noneSelect.clone();
-
-            $cell.html('');
-            $cell.append($clone);
-            if (val != 'ItemCategoryRarity' && val != 'ItemRarity') $clone.selectize();
-        });
-    }
+    <div id="lootRowData" class="hide">
+        <table class="table table-sm">
+            <tbody id="lootRow">
+                <tr class="loot-row">
+                    <td>{!! Form::select(
+                        'rewardable_type[]',
+                        config('lorekeeper.extensions.item_entry_expansion.loot_tables.enable')
+                            ? ['Item' => 'Item', 'ItemRarity' => 'Item Rarity', 'Currency' => 'Currency', 'LootTable' => 'Loot Table', 'ItemCategory' => 'Item Category', 'ItemCategoryRarity' => 'Item Category (Conditional)', 'None' => 'None']
+                            : ['Item' => 'Item', 'Currency' => 'Currency', 'LootTable' => 'Loot Table', 'ItemCategory' => 'Item Category', 'None' => 'None'],
+                        null,
+                        ['class' => 'form-control reward-type', 'placeholder' => 'Select Reward Type'],
+                    ) !!}</td>
+                    <td class="loot-row-select"></td>
+                    <td>{!! Form::text('quantity[]', 1, ['class' => 'form-control']) !!}</td>
+                    <td class="loot-row-weight">{!! Form::text('weight[]', 1, ['class' => 'form-control loot-weight']) !!}</td>
+                    <td class="loot-row-chance"></td>
+                    <td class="text-right"><a href="#" class="btn btn-danger remove-loot-button">Remove</a></td>
+                </tr>
+            </tbody>
+        </table>
+        {!! Form::select('rewardable_id[]', $items, null, ['class' => 'form-control item-select', 'placeholder' => 'Select Item']) !!}
+        <div class="item-rarity-select d-flex">
+            {!! Form::select('criteria[]', ['=' => '=', '<' => '<', '>' => '>', '<=' => '<=', '>=' => '>='], null, ['class' => 'form-control criteria-select', 'placeholder' => 'Criteria']) !!}
+            {!! Form::select('rarity[]', $rarities, null, ['class' => 'form-control criteria-select', 'placeholder' => 'Rarity']) !!}
+        </div>
+        {!! Form::select('rewardable_id[]', $currencies, null, ['class' => 'form-control currency-select', 'placeholder' => 'Select Currency']) !!}
+        {!! Form::select('rewardable_id[]', $tables, null, ['class' => 'form-control table-select', 'placeholder' => 'Select Loot Table']) !!}
+        {!! Form::select('rewardable_id[]', $categories, null, ['class' => 'form-control category-select', 'placeholder' => 'Select Item Category']) !!}
+        <div class="category-rarity-select d-flex">
+            {!! Form::select('rewardable_id[]', $categories, null, ['class' => 'form-control', 'placeholder' => 'Category']) !!}
+            {!! Form::select('criteria[]', ['=' => '=', '<' => '<', '>' => '>', '<=' => '<=', '>=' => '>='], null, ['class' => 'form-control criteria-select', 'placeholder' => 'Criteria']) !!}
+            {!! Form::select('rarity[]', $rarities, null, ['class' => 'form-control criteria-select', 'placeholder' => 'Rarity']) !!}
+        </div>
+        {!! Form::select('rewardable_id[]', [1 => 'No reward given.'], null, ['class' => 'form-control none-select']) !!}
+    </div>
 
-    function attachRemoveListener(node) {
-        node.on('click', function(e) {
-            e.preventDefault();
-            $(this).parent().parent().remove();
-            refreshChances();
-        });
-    }
+    @if ($table->id)
+        <h3>Test Roll</h3>
+        <p>If you have made any modifications to the loot table contents above, be sure to save it (click the Edit button) before testing.</p>
+        <p>Please note that due to the nature of probability, as long as there is a chance, there will always be the possibility of rolling improbably good or bad results. <i>This is not indicative of the code being buggy or poor game balance.</i> Be
+            cautious when adjusting values based on a small sample size, including but not limited to test rolls and a small amount of user reports.</p>
+        <div class="form-group">
+            {!! Form::label('quantity', 'Number of Rolls') !!}
+            {!! Form::text('quantity', 1, ['class' => 'form-control', 'id' => 'rollQuantity']) !!}
+        </div>
+        <div class="text-right">
+            <a href="#" class="btn btn-primary" id="testRoll">Test Roll</a>
+        </div>
+    @endif
 
-    function attachWeightListener(node) {
-        node.on('change', function(e) {
-            refreshChances();
-        });
-    }
-
-    function refreshChances() {
-        var total = 0;
-        var weights = [];
-        $('#lootTableBody .loot-weight').each(function( index ) {
-            var current = parseInt($(this).val());
-            total += current;
-            weights.push(current);
-        });
+@endsection
 
+@section('scripts')
+    @parent
+    <script>
+        $(document).ready(function() {
+            var $lootTable = $('#lootTableBody');
+            var $lootRow = $('#lootRow').find('.loot-row');
+            var $itemSelect = $('#lootRowData').find('.item-select');
+            var $itemRaritySelect = $('#lootRowData').find('.item-rarity-select');
+            var $currencySelect = $('#lootRowData').find('.currency-select');
+            var $tableSelect = $('#lootRowData').find('.table-select');
+            var $categorySelect = $('#lootRowData').find('.category-select');
+            var $categoryRaritySelect = $('#lootRowData').find('.category-rarity-select');
+            var $noneSelect = $('#lootRowData').find('.none-select');
 
-        $('#lootTableBody .loot-row-chance').each(function( index ) {
-            var current = (weights[index] / total) * 100;
-            $(this).html(current.toString() + '%');
+            refreshChances();
+            $('#lootTableBody .selectize').selectize();
+            attachRemoveListener($('#lootTableBody .remove-loot-button'));
+
+            $('.delete-table-button').on('click', function(e) {
+                e.preventDefault();
+                loadModal("{{ url('admin/data/loot-tables/delete') }}/{{ $table->id }}", 'Delete Loot Table');
+            });
+
+            $('#testRoll').on('click', function(e) {
+                e.preventDefault();
+                loadModal("{{ url('admin/data/loot-tables/roll') }}/{{ $table->id }}?quantity=" + $('#rollQuantity').val(), 'Rolling Loot Table');
+            });
+
+            $('#addLoot').on('click', function(e) {
+                e.preventDefault();
+                var $clone = $lootRow.clone();
+                $lootTable.append($clone);
+                attachRewardTypeListener($clone.find('.reward-type'));
+                attachRemoveListener($clone.find('.remove-loot-button'));
+                attachWeightListener($clone.find('.loot-weight'));
+                refreshChances();
+            });
+
+            $('.reward-type').on('change', function(e) {
+                var val = $(this).val();
+                var $cell = $(this).parent().parent().find('.loot-row-select');
+
+                var $clone = null;
+                if (val == 'Item') $clone = $itemSelect.clone();
+                else if (val == 'ItemRarity') $clone = $itemRaritySelect.clone();
+                else if (val == 'Currency') $clone = $currencySelect.clone();
+                else if (val == 'ItemCategory') $clone = $categorySelect.clone();
+                else if (val == 'ItemCategoryRarity') $clone = $categoryRaritySelect.clone();
+                else if (val == 'LootTable') $clone = $tableSelect.clone();
+                else if (val == 'None') $clone = $noneSelect.clone();
+
+                $cell.html('');
+                $cell.append($clone);
+                if (val != 'ItemCategoryRarity' && val != 'ItemRarity') $clone.selectize();
+                else {
+                    var row_num = $(this).parent().parent().index();
+                    $clone.find('[name="rarity[]"]').attr('name', `rarity[${row_num}]`);
+                    $clone.find('[name="criteria[]"]').attr('name', `criteria[${row_num}]`);
+                }
+            });
+
+            function attachRewardTypeListener(node) {
+                node.on('change', function(e) {
+                    var val = $(this).val();
+                    var $cell = $(this).parent().parent().find('.loot-row-select');
+
+                    var $clone = null;
+                    if (val == 'Item') $clone = $itemSelect.clone();
+                    else if (val == 'ItemRarity') $clone = $itemRaritySelect.clone();
+                    else if (val == 'ItemCategory') $clone = $categorySelect.clone();
+                    else if (val == 'ItemCategoryRarity') $clone = $categoryRaritySelect.clone();
+                    else if (val == 'Currency') $clone = $currencySelect.clone();
+                    else if (val == 'LootTable') $clone = $tableSelect.clone();
+                    else if (val == 'None') $clone = $noneSelect.clone();
+
+                    $cell.html('');
+                    $cell.append($clone);
+                    if (val != 'ItemCategoryRarity' && val != 'ItemRarity') $clone.selectize();
+                    else {
+                        var row_num = $(this).parent().parent().index();
+                        $clone.find('[name="rarity[]"]').attr('name', `rarity[${row_num}]`);
+                        $clone.find('[name="criteria[]"]').attr('name', `criteria[${row_num}]`);
+                    }
+                });
+            }
+
+            function attachRemoveListener(node) {
+                node.on('click', function(e) {
+                    e.preventDefault();
+                    $(this).parent().parent().remove();
+                    refreshChances();
+                });
+            }
+
+            function attachWeightListener(node) {
+                node.on('change', function(e) {
+                    refreshChances();
+                });
+            }
+
+            function refreshChances() {
+                var total = 0;
+                var weights = [];
+                $('#lootTableBody .loot-weight').each(function(index) {
+                    var current = parseInt($(this).val());
+                    total += current;
+                    weights.push(current);
+                });
+
+
+                $('#lootTableBody .loot-row-chance').each(function(index) {
+                    var current = (weights[index] / total) * 100;
+                    $(this).html(current.toString() + '%');
+                });
+            }
         });
-    }
-});
-
-</script>
+    </script>
 @endsection
diff --git a/resources/views/admin/loot_tables/loot_tables.blade.php b/resources/views/admin/loot_tables/loot_tables.blade.php
index 9d9eece471..cc07c20d75 100644
--- a/resources/views/admin/loot_tables/loot_tables.blade.php
+++ b/resources/views/admin/loot_tables/loot_tables.blade.php
@@ -1,36 +1,58 @@
 @extends('admin.layout')
 
-@section('admin-title') Loot Tables @endsection
+@section('admin-title')
+    Loot Tables
+@endsection
 
 @section('admin-content')
-{!! breadcrumbs(['Admin Panel' => 'admin', 'Loot Tables' => 'admin/data/loot-tables']) !!}
+    {!! breadcrumbs(['Admin Panel' => 'admin', 'Loot Tables' => 'admin/data/loot-tables']) !!}
 
-<h1>Loot Tables</h1>
+    <h1>Loot Tables</h1>
 
-<p>Loot tables can be attached to prompts as a reward for doing the prompt. This will roll a random reward from the contents of the table. Tables can be chained as well.</p>
+    <p>Loot tables can be attached to prompts as a reward for doing the prompt. This will roll a random reward from the contents of the table. Tables can be chained as well.</p>
 
-<div class="text-right mb-3"><a class="btn btn-primary" href="{{ url('admin/data/loot-tables/create') }}"><i class="fas fa-plus"></i> Create New Loot Table</a></div>
-@if(!count($tables))
-    <p>No loot tables found.</p>
-@else
-    {!! $tables->render() !!}
-      <div class="row ml-md-2">
-        <div class="d-flex row flex-wrap col-12 pb-1 px-0 ubt-bottom">
-          <div class="col-3 col-md-2 font-weight-bold">ID</div>
-          <div class="col-3 col-md-4 font-weight-bold">Name</div>
-          <div class="col-6 col-md-5 font-weight-bold">Display Name</div>
-        </div>
-        @foreach($tables as $table)
-        <div class="d-flex row flex-wrap col-12 mt-1 pt-1 px-0 ubt-top">
-          <div class="col-3 col-md-2 ">#{{ $table->id }}</div>
-          <div class="col-3 col-md-4">{{ $table->name }}</div>
-          <div class="col-3 col-md-5">{!! $table->display_name !!}</div>
-          <div class="col-3 col-md-1 text-right"><a href="{{ url('admin/data/loot-tables/edit/'.$table->id) }}" class="btn btn-primary py-0 px-2">Edit</a></div>
+    <div class="text-right mb-3"><a class="btn btn-primary" href="{{ url('admin/data/loot-tables/create') }}"><i class="fas fa-plus"></i> Create New Loot Table</a></div>
+    @if (!count($tables))
+        <p>No loot tables found.</p>
+    @else
+        {!! $tables->render() !!}
+        <div class="mb-4 logs-table">
+            <div class="logs-table-header">
+                <div class="row">
+                    <div class="col-3 col-md-2">
+                        <div class="logs-table-cell">ID</div>
+                    </div>
+                    <div class="col-3 col-md-4">
+                        <div class="logs-table-cell">Name</div>
+                    </div>
+                    <div class="col-6 col-md-5">
+                        <div class="logs-table-cell">Display Name</div>
+                    </div>
+                </div>
+            </div>
+            <div class="logs-table-body">
+                @foreach ($tables as $table)
+                    <div class="logs-table-row">
+                        <div class="row flex-wrap">
+                            <div class="col-3 col-md-2">
+                                <div class="logs-table-cell">#{{ $table->id }}</div>
+                            </div>
+                            <div class="col-3 col-md-4">
+                                <div class="logs-table-cell">{{ $table->name }}</div>
+                            </div>
+                            <div class="col-3 col-md-5">
+                                <div class="logs-table-cell">{!! $table->display_name !!}</div>
+                            </div>
+                            <div class="col-3 col-md-1 text-right">
+                                <div class="logs-table-cell"><a href="{{ url('admin/data/loot-tables/edit/' . $table->id) }}" class="btn btn-primary py-0 px-2">Edit</a></div>
+                            </div>
+                        </div>
+                    </div>
+                @endforeach
+            </div>
         </div>
-        @endforeach
-      </div>
-    {!! $tables->render() !!}
-    <div class="text-center mt-4 small text-muted">{{ $tables->total() }} result{{ $tables->total() == 1 ? '' : 's' }} found.</div>
-@endif
+        {!! $tables->render() !!}
+        <div class="text-center mt-4 small text-muted">{{ $tables->total() }} result{{ $tables->total() == 1 ? '' : 's' }} found.</div>
+    @endif
 
 @endsection
diff --git a/resources/views/admin/masterlist/_approve_modal.blade.php b/resources/views/admin/masterlist/_approve_modal.blade.php
index 68c8596303..aa59e7e27e 100644
--- a/resources/views/admin/masterlist/_approve_modal.blade.php
+++ b/resources/views/admin/masterlist/_approve_modal.blade.php
@@ -1,14 +1,14 @@
-{!! Form::open(['url' => 'admin/masterlist/transfer/'.$transfer->id]) !!}
-    @if($transfer->status == 'Accepted')
-        <p>This will process the transfer of {!! $transfer->character->displayName !!} from {!! $transfer->sender->displayName !!} to {!! $transfer->recipient->displayName !!} immediately.</p>
-    @else 
-        <p>This will approve the transfer of {!! $transfer->character->displayName !!} from {!! $transfer->sender->displayName !!} to {!! $transfer->recipient->displayName !!}, and it will be processed once the recipient accepts it.</p>
-    @endif
-    <div class="form-group">
-        {!! Form::label('cooldown', 'Cooldown (days)') !!}
-        {!! Form::text('cooldown', $cooldown, ['class' => 'form-control']) !!}
-    </div>
-    <div class="text-right">
-        {!! Form::submit('Approve', ['class' => 'btn btn-success', 'name' => 'action']) !!}
-    </div>
-{!! Form::close() !!}
\ No newline at end of file
+{!! Form::open(['url' => 'admin/masterlist/transfer/' . $transfer->id]) !!}
+@if ($transfer->status == 'Accepted')
+    <p>This will process the transfer of {!! $transfer->character->displayName !!} from {!! $transfer->sender->displayName !!} to {!! $transfer->recipient->displayName !!} immediately.</p>
+@else
+    <p>This will approve the transfer of {!! $transfer->character->displayName !!} from {!! $transfer->sender->displayName !!} to {!! $transfer->recipient->displayName !!}, and it will be processed once the recipient accepts it.</p>
+@endif
+<div class="form-group">
+    {!! Form::label('cooldown', 'Cooldown (days)') !!}
+    {!! Form::text('cooldown', $cooldown, ['class' => 'form-control']) !!}
+</div>
+<div class="text-right">
+    {!! Form::submit('Approve', ['class' => 'btn btn-success', 'name' => 'action']) !!}
+</div>
+{!! Form::close() !!}
diff --git a/resources/views/admin/masterlist/_approve_trade_modal.blade.php b/resources/views/admin/masterlist/_approve_trade_modal.blade.php
index 41877b45da..f36b52f4c6 100644
--- a/resources/views/admin/masterlist/_approve_trade_modal.blade.php
+++ b/resources/views/admin/masterlist/_approve_trade_modal.blade.php
@@ -1,12 +1,12 @@
-{!! Form::open(['url' => 'admin/masterlist/trade/'.$trade->id]) !!}
-    <p>This will process the trade between {!! $trade->sender->displayName !!} and {!! $trade->recipient->displayName !!} immediately. Please enter the transfer cooldown period for each character in days (the fields have been pre-filled with the default cooldown value).</p>
-    @foreach($trade->getCharacterData() as $character)
-        <div class="form-group">
-            <label for="cooldowns[{{ $character->id }}]">Cooldown for {!! $character->displayName !!} (Number of Days)</label>
-            {!! Form::text('cooldowns['.$character->id.']', $cooldown, ['class' => 'form-control']) !!}
-        </div>
-    @endforeach
-    <div class="text-right">
-        {!! Form::submit('Approve', ['class' => 'btn btn-success', 'name' => 'action']) !!}
+{!! Form::open(['url' => 'admin/masterlist/trade/' . $trade->id]) !!}
+<p>This will process the trade between {!! $trade->sender->displayName !!} and {!! $trade->recipient->displayName !!} immediately. Please enter the transfer cooldown period for each character in days (the fields have been pre-filled with the default cooldown value).</p>
+@foreach ($trade->getCharacterData() as $character)
+    <div class="form-group">
+        <label for="cooldowns[{{ $character->id }}]">Cooldown for {!! $character->displayName !!} (Number of Days)</label>
+        {!! Form::text('cooldowns[' . $character->id . ']', $cooldown, ['class' => 'form-control']) !!}
     </div>
-{!! Form::close() !!}
\ No newline at end of file
+@endforeach
+<div class="text-right">
+    {!! Form::submit('Approve', ['class' => 'btn btn-success', 'name' => 'action']) !!}
+</div>
+{!! Form::close() !!}
diff --git a/resources/views/admin/masterlist/_create_character_subtype.blade.php b/resources/views/admin/masterlist/_create_character_subtype.blade.php
index c8f51b9184..6e74037484 100644
--- a/resources/views/admin/masterlist/_create_character_subtype.blade.php
+++ b/resources/views/admin/masterlist/_create_character_subtype.blade.php
@@ -1,2 +1,6 @@
-{!! Form::label('Subtype (Optional)') !!} @if($isMyo) {!! add_help('This will lock the slot into a particular subtype. Leave it blank if you would like to give the user a choice, or not select a subtype. The subtype must match the species selected above, and if no species is specified, the subtype will not be applied.') !!} @endif
+{!! Form::label('Subtype (Optional)') !!} @if ($isMyo)
+    {!! add_help(
+        'This will lock the slot into a particular subtype. Leave it blank if you would like to give the user a choice, or not select a subtype. The subtype must match the species selected above, and if no species is specified, the subtype will not be applied.',
+    ) !!}
+@endif
 {!! Form::select('subtype_id', $subtypes, old('subtype_id'), ['class' => 'form-control', 'id' => 'subtype']) !!}
diff --git a/resources/views/admin/masterlist/_header.blade.php b/resources/views/admin/masterlist/_header.blade.php
index e3249c3587..77188e1868 100644
--- a/resources/views/admin/masterlist/_header.blade.php
+++ b/resources/views/admin/masterlist/_header.blade.php
@@ -1,14 +1,20 @@
 <ul class="nav nav-tabs mb-3">
-  <li class="nav-item">
-    <a class="nav-link {{ set_active('admin/masterlist/transfers/incoming*') }}" href="{{ url('admin/masterlist/transfers/incoming') }}">Incoming Transfers @if($transferCount)<span class="badge badge-primary">{{ $transferCount }}</span>@endif</a>
-  </li>
-  <li class="nav-item">
-    <a class="nav-link {{ set_active('admin/masterlist/trades/incoming*') }}" href="{{ url('admin/masterlist/trades/incoming') }}">Incoming Trades @if($tradeCount)<span class="badge badge-primary">{{ $tradeCount }}</span>@endif</a>
-  </li>
-  <li class="nav-item">
-    <a class="nav-link {{ set_active('admin/masterlist/transfers/completed*') }}" href="{{ url('admin/masterlist/transfers/completed') }}">Completed Transfers</a>
-  </li>
-  <li class="nav-item">
-    <a class="nav-link {{ set_active('admin/masterlist/trades/completed*') }}" href="{{ url('admin/masterlist/trades/completed') }}">Completed Trades</a>
-  </li>
-</ul>
\ No newline at end of file
+    <li class="nav-item">
+        <a class="nav-link {{ set_active('admin/masterlist/transfers/incoming*') }}" href="{{ url('admin/masterlist/transfers/incoming') }}">Incoming Transfers @if ($transferCount)
+                <span class="badge badge-primary">{{ $transferCount }}</span>
+            @endif
+        </a>
+    </li>
+    <li class="nav-item">
+        <a class="nav-link {{ set_active('admin/masterlist/trades/incoming*') }}" href="{{ url('admin/masterlist/trades/incoming') }}">Incoming Trades @if ($tradeCount)
+                <span class="badge badge-primary">{{ $tradeCount }}</span>
+            @endif
+        </a>
+    </li>
+    <li class="nav-item">
+        <a class="nav-link {{ set_active('admin/masterlist/transfers/completed*') }}" href="{{ url('admin/masterlist/transfers/completed') }}">Completed Transfers</a>
+    </li>
+    <li class="nav-item">
+        <a class="nav-link {{ set_active('admin/masterlist/trades/completed*') }}" href="{{ url('admin/masterlist/trades/completed') }}">Completed Trades</a>
+    </li>
+</ul>
diff --git a/resources/views/admin/masterlist/_reject_modal.blade.php b/resources/views/admin/masterlist/_reject_modal.blade.php
index a49eeceb97..8641496acf 100644
--- a/resources/views/admin/masterlist/_reject_modal.blade.php
+++ b/resources/views/admin/masterlist/_reject_modal.blade.php
@@ -1,10 +1,10 @@
-{!! Form::open(['url' => 'admin/masterlist/transfer/'.$transfer->id]) !!}
-    <p>This will reject the transfer of {!! $transfer->character->displayName !!} from {!! $transfer->sender->displayName !!} to {!! $transfer->recipient->displayName !!} automatically. The transfer cooldown will not be applied. Are you sure?</p>
-    <div class="form-group">
-        {!! Form::label('reason', 'Reason for Rejection (optional)') !!}
-        {!! Form::textarea('reason', '', ['class' => 'form-control']) !!}
-    </div>
-    <div class="text-right">
-        {!! Form::submit('Reject', ['class' => 'btn btn-danger', 'name' => 'action']) !!}
-    </div>
-{!! Form::close() !!}
\ No newline at end of file
+{!! Form::open(['url' => 'admin/masterlist/transfer/' . $transfer->id]) !!}
+<p>This will reject the transfer of {!! $transfer->character->displayName !!} from {!! $transfer->sender->displayName !!} to {!! $transfer->recipient->displayName !!} automatically. The transfer cooldown will not be applied. Are you sure?</p>
+<div class="form-group">
+    {!! Form::label('reason', 'Reason for Rejection (optional)') !!}
+    {!! Form::textarea('reason', '', ['class' => 'form-control']) !!}
+</div>
+<div class="text-right">
+    {!! Form::submit('Reject', ['class' => 'btn btn-danger', 'name' => 'action']) !!}
+</div>
+{!! Form::close() !!}
diff --git a/resources/views/admin/masterlist/_reject_trade_modal.blade.php b/resources/views/admin/masterlist/_reject_trade_modal.blade.php
index 57430c84e1..9c381ebb6a 100644
--- a/resources/views/admin/masterlist/_reject_trade_modal.blade.php
+++ b/resources/views/admin/masterlist/_reject_trade_modal.blade.php
@@ -1,10 +1,10 @@
-{!! Form::open(['url' => 'admin/masterlist/trade/'.$trade->id]) !!}
-    <p>This will reject the trade between {!! $trade->sender->displayName !!} and {!! $trade->recipient->displayName !!} automatically, returning all items/currency/characters to their owners. The character transfer cooldown will not be applied. Are you sure?</p>
-    <div class="form-group">
-        {!! Form::label('reason', 'Reason for Rejection (optional)') !!}
-        {!! Form::textarea('reason', '', ['class' => 'form-control']) !!}
-    </div>
-    <div class="text-right">
-        {!! Form::submit('Reject', ['class' => 'btn btn-danger', 'name' => 'action']) !!}
-    </div>
-{!! Form::close() !!}
\ No newline at end of file
+{!! Form::open(['url' => 'admin/masterlist/trade/' . $trade->id]) !!}
+<p>This will reject the trade between {!! $trade->sender->displayName !!} and {!! $trade->recipient->displayName !!} automatically, returning all items/currency/characters to their owners. The character transfer cooldown will not be applied. Are you sure?</p>
+<div class="form-group">
+    {!! Form::label('reason', 'Reason for Rejection (optional)') !!}
+    {!! Form::textarea('reason', '', ['class' => 'form-control']) !!}
+</div>
+<div class="text-right">
+    {!! Form::submit('Reject', ['class' => 'btn btn-danger', 'name' => 'action']) !!}
+</div>
+{!! Form::close() !!}
diff --git a/resources/views/admin/masterlist/_trade.blade.php b/resources/views/admin/masterlist/_trade.blade.php
index 813ebb868b..b09c058b97 100644
--- a/resources/views/admin/masterlist/_trade.blade.php
+++ b/resources/views/admin/masterlist/_trade.blade.php
@@ -1,10 +1,12 @@
 <div class="card mb-3">
     <div class="card-header">
-        <h2 class="mb-0"><span class="float-right badge badge-{{ ($trade->status == 'Pending' || $trade->status == 'Open' || $trade->status == 'Canceled') ? 'secondary' : ($trade->status == 'Completed' ? 'success' : 'danger') }}">{{ $trade->status }}</span><a href="{{$trade->url}} ">Trade (#{{ $trade->id }})</a></h2>
+        <h2 class="mb-0"><span
+                class="float-right badge badge-{{ $trade->status == 'Pending' || $trade->status == 'Open' || $trade->status == 'Canceled' ? 'secondary' : ($trade->status == 'Completed' ? 'success' : 'danger') }}">{{ $trade->status }}</span><a
+                href="{{ $trade->url }} ">Trade (#{{ $trade->id }})</a></h2>
     </div>
     <div class="card-body">
-        @if($trade->comment)
-        <div>{!! nl2br(htmlentities($trade->comment)) !!}</div>
+        @if ($trade->comment)
+            <div>{!! nl2br(htmlentities($trade->comment)) !!}</div>
         @endif
         <div class="row">
             <div class="col-md-6">
@@ -19,16 +21,16 @@
         <hr />
         <div class="text-right">
             <a href="{{ $trade->url }}" class="btn btn-outline-primary">View Details</a>
-            @if($trade->status == 'Pending')
-                @if(!$trade->is_approved)
+            @if ($trade->status == 'Pending')
+                @if (!$trade->is_approved)
                     <div class="text-right">
                         <a href="#" class="btn btn-outline-success trade-action-button" data-id="{{ $trade->id }}" data-action="approve">Approve</a>
                         <a href="#" class="btn btn-outline-danger trade-action-button" data-id="{{ $trade->id }}" data-action="reject">Reject</a>
                     </div>
-                @else 
+                @else
                     Currently awaiting staff approval
                 @endif
             @endif
         </div>
     </div>
-</div>
\ No newline at end of file
+</div>
diff --git a/resources/views/admin/masterlist/_transfer.blade.php b/resources/views/admin/masterlist/_transfer.blade.php
index 60f0d6dd0c..3ae0a7fffe 100644
--- a/resources/views/admin/masterlist/_transfer.blade.php
+++ b/resources/views/admin/masterlist/_transfer.blade.php
@@ -1,27 +1,33 @@
 <div class="transfer-row mb-2">
-    <div class="transfer-thumbnail"><a href="{{ $transfer->character->url }}"><img src="{{ $transfer->character->image->thumbnailUrl }}" class="img-thumbnail" alt="Thumbnail for {{ $transfer->character->fullName }}" /></a></div>
+    @if ($transfer->character)
+        <div class="transfer-thumbnail"><a href="{{ $transfer->character->url }}"><img src="{{ $transfer->character->image->thumbnailUrl }}" class="img-thumbnail" alt="Thumbnail for {{ $transfer->character->fullName }}" /></a></div>
+    @endif
     <div class="transfer-info card ml-2">
         <div class="card-body">
             <div class="transfer-info-content">
-                <h3 class="mb-0 transfer-info-header"><a href="{{ $transfer->character->url }}">{{ $transfer->character->fullName }}</a></h3>
+                @if ($transfer->character)
+                    <h3 class="mb-0 transfer-info-header"><a href="{{ $transfer->character->url }}">{{ $transfer->character->fullName }}</a></h3>
+                @else
+                    <h3 class="mb-0 transfer-info-header">Character Deleted</h3>
+                @endif
                 <div class="transfer-info-body mb-3">
                     <p>Transfer from {!! $transfer->sender->displayName !!} to {!! $transfer->recipient->displayName !!}, {!! format_date($transfer->created_at) !!}</p>
                     <p>Reason stated: {!! $transfer->user_reason !!}</p>
-                    @if($transfer->isActive && $transfersQueue)
-                        @if($transfer->is_approved)
+                    @if ($transfer->isActive && $transfersQueue)
+                        @if ($transfer->is_approved)
                             <h5 class="mb-0"><i class="text-success far fa-circle fa-fw mr-2"></i> Transfer approved {!! add_help('This transfer has been approved by a mod and will be processed once accepted.') !!}</h5>
                         @else
                             <h5 class="mb-0"><i class="text-danger fas fa-times fa-fw mr-2"></i> Transfer awaiting approval {!! add_help('This transfer has not been approved by a mod yet. Once approved and accepted by the recipient, it will be processed.') !!}</h5>
                         @endif
                     @elseif(!$transfer->isActive)
-                        @if($transfer->reason)
+                        @if ($transfer->reason)
                             <div class="alert alert-danger mb-0">{{ $transfer->reason }}</div>
                         @endif
                     @endif
                 </div>
                 <div class="transfer-info-footer">
-                    @if($transfer->isActive)
-                        @if(!$transfer->is_approved)
+                    @if ($transfer->isActive)
+                        @if (!$transfer->is_approved)
                             <div class="text-right">
                                 <a href="#" class="btn btn-outline-success transfer-action-button" data-id="{{ $transfer->id }}" data-action="approve">Approve</a>
                                 <a href="#" class="btn btn-outline-danger transfer-action-button" data-id="{{ $transfer->id }}" data-action="reject">Reject</a>
@@ -31,7 +37,7 @@
                         @endif
                     @else
                         <h2 class="text-right mb-0">
-                            @if($transfer->status == 'Accepted')
+                            @if ($transfer->status == 'Accepted')
                                 <span class="badge badge-success">Accepted</span>
                             @elseif($transfer->status == 'Rejected')
                                 <span class="badge badge-danger">Rejected</span>
diff --git a/resources/views/admin/masterlist/character_trades.blade.php b/resources/views/admin/masterlist/character_trades.blade.php
index ba3b99317f..fe4df3082c 100644
--- a/resources/views/admin/masterlist/character_trades.blade.php
+++ b/resources/views/admin/masterlist/character_trades.blade.php
@@ -1,36 +1,35 @@
 @extends('admin.layout')
 
-@section('admin-title') Character Trades @endsection
-
-@section('admin-content')
-{!! breadcrumbs(['Admin Panel' => 'admin', 'Character Trade Queue' => 'admin/masterlist/trades/incoming']) !!}
-
-<h1>
+@section('admin-title')
     Character Trades
-</h1>
+@endsection
 
-@include('admin.masterlist._header', ['tradeCount' => $tradeCount, 'transferCount' => $transferCount])
+@section('admin-content')
+    {!! breadcrumbs(['Admin Panel' => 'admin', 'Character Trade Queue' => 'admin/masterlist/trades/incoming']) !!}
 
-{!! $trades->render() !!}
-@foreach($trades as $trade)
-    @include('home.trades._trade', ['trade' => $trade, 'queueView' => true])
-@endforeach
-{!! $trades->render() !!}
+    <h1>
+        Character Trades
+    </h1>
 
+    @include('admin.masterlist._header', ['tradeCount' => $tradeCount, 'transferCount' => $transferCount])
 
+    {!! $trades->render() !!}
+    @foreach ($trades as $trade)
+        @include('home.trades._trade', ['trade' => $trade, 'queueView' => true])
+    @endforeach
+    {!! $trades->render() !!}
 @endsection
 
 
 @section('scripts')
-@parent
-<script>
-$( document ).ready(function() {    
-    $('.trade-action-button').on('click', function(e) {
-        e.preventDefault();
-        console.log("{{ url('admin/masterlist/trade/act') }}/" + $(this).data('id') + "/" + $(this).data('action'));
-        loadModal("{{ url('admin/masterlist/trade/act') }}/" + $(this).data('id') + "/" + $(this).data('action') , 'Process Trade');
-    });
-});
-    
-</script>
-@endsection
\ No newline at end of file
+    @parent
+    <script>
+        $(document).ready(function() {
+            $('.trade-action-button').on('click', function(e) {
+                e.preventDefault();
+                console.log("{{ url('admin/masterlist/trade/act') }}/" + $(this).data('id') + "/" + $(this).data('action'));
+                loadModal("{{ url('admin/masterlist/trade/act') }}/" + $(this).data('id') + "/" + $(this).data('action'), 'Process Trade');
+            });
+        });
+    </script>
+@endsection
diff --git a/resources/views/admin/masterlist/character_transfers.blade.php b/resources/views/admin/masterlist/character_transfers.blade.php
index 71728cd8df..cfeacd8f28 100644
--- a/resources/views/admin/masterlist/character_transfers.blade.php
+++ b/resources/views/admin/masterlist/character_transfers.blade.php
@@ -1,36 +1,56 @@
 @extends('admin.layout')
 
-@section('admin-title') Character Transfers @endsection
-
-@section('admin-content')
-{!! breadcrumbs(['Admin Panel' => 'admin', 'Character Transfer Queue' => 'admin/masterlist/transfers/incoming']) !!}
-
-<h1>
+@section('admin-title')
     Character Transfers
-</h1>
-
-@include('admin.masterlist._header', ['tradeCount' => $tradeCount, 'transferCount' => $transferCount])
-
-{!! $transfers->render() !!}
-@foreach($transfers as $transfer)
-    @include('admin.masterlist._transfer', ['transfer' => $transfer])
-@endforeach
-{!! $transfers->render() !!}
-
+@endsection
 
+@section('admin-content')
+    {!! breadcrumbs(['Admin Panel' => 'admin', 'Character Transfer Queue' => 'admin/masterlist/transfers/incoming']) !!}
+
+    <h1>
+        Character Transfers
+    </h1>
+
+    @include('admin.masterlist._header', ['tradeCount' => $tradeCount, 'transferCount' => $transferCount])
+
+    <div>
+        {!! Form::open(['method' => 'GET', 'class' => 'form-inline justify-content-end']) !!}
+        <div class="form-inline justify-content-end">
+            <div class="form-group ml-3 mb-3">
+                {!! Form::select(
+                    'sort',
+                    [
+                        'newest' => 'Newest First',
+                        'oldest' => 'Oldest First',
+                    ],
+                    Request::get('sort') ?: 'oldest',
+                    ['class' => 'form-control'],
+                ) !!}
+            </div>
+            <div class="form-group ml-3 mb-3">
+                {!! Form::submit('Search', ['class' => 'btn btn-primary']) !!}
+            </div>
+        </div>
+        {!! Form::close() !!}
+    </div>
+
+    {!! $transfers->render() !!}
+    @foreach ($transfers as $transfer)
+        @include('admin.masterlist._transfer', ['transfer' => $transfer])
+    @endforeach
+    {!! $transfers->render() !!}
 @endsection
 
 
 @section('scripts')
-@parent
-<script>
-$( document ).ready(function() {    
-    $('.transfer-action-button').on('click', function(e) {
-        e.preventDefault();
-        console.log("{{ url('admin/masterlist/transfer/act') }}/" + $(this).data('id') + "/" + $(this).data('action'));
-        loadModal("{{ url('admin/masterlist/transfer/act') }}/" + $(this).data('id') + "/" + $(this).data('action') , 'Process Transfer');
-    });
-});
-    
-</script>
-@endsection
\ No newline at end of file
+    @parent
+    <script>
+        $(document).ready(function() {
+            $('.transfer-action-button').on('click', function(e) {
+                e.preventDefault();
+                console.log("{{ url('admin/masterlist/transfer/act') }}/" + $(this).data('id') + "/" + $(this).data('action'));
+                loadModal("{{ url('admin/masterlist/transfer/act') }}/" + $(this).data('id') + "/" + $(this).data('action'), 'Process Transfer');
+            });
+        });
+    </script>
+@endsection
diff --git a/resources/views/admin/masterlist/create_character.blade.php b/resources/views/admin/masterlist/create_character.blade.php
index e3bd37e411..6a801778c4 100644
--- a/resources/views/admin/masterlist/create_character.blade.php
+++ b/resources/views/admin/masterlist/create_character.blade.php
@@ -1,288 +1,311 @@
 @extends('admin.layout')
 
-@section('admin-title') Create {{ $isMyo ? 'MYO Slot' : 'Character' }} @endsection
+@section('admin-title')
+    Create {{ $isMyo ? 'MYO Slot' : 'Character' }}
+@endsection
 
 @section('admin-content')
-{!! breadcrumbs(['Admin Panel' => 'admin', 'Create '.($isMyo ? 'MYO Slot' : 'Character') => 'admin/masterlist/create-'.($isMyo ? 'myo' : 'character')]) !!}
-
-<h1>Create {{ $isMyo ? 'MYO Slot' : 'Character' }}</h1>
-
-@if(!$isMyo && !count($categories))
+    {!! breadcrumbs(['Admin Panel' => 'admin', 'Create ' . ($isMyo ? 'MYO Slot' : 'Character') => 'admin/masterlist/create-' . ($isMyo ? 'myo' : 'character')]) !!}
 
-    <div class="alert alert-danger">Creating characters requires at least one <a href="{{ url('admin/data/character-categories') }}">character category</a> to be created first, as character categories are used to generate the character code.</div>
+    <h1>Create {{ $isMyo ? 'MYO Slot' : 'Character' }}</h1>
 
-@else
+    @if (!$isMyo && !count($categories))
 
-    {!! Form::open(['url' => 'admin/masterlist/create-'.($isMyo ? 'myo' : 'character'), 'files' => true]) !!}
+        <div class="alert alert-danger">Creating characters requires at least one <a href="{{ url('admin/data/character-categories') }}">character category</a> to be created first, as character categories are used to generate the character code.</div>
+    @else
+        {!! Form::open(['url' => 'admin/masterlist/create-' . ($isMyo ? 'myo' : 'character'), 'files' => true]) !!}
 
-    <h3>Basic Information</h3>
+        <h3>Basic Information</h3>
 
-    @if($isMyo)
-        <div class="form-group">
-            {!! Form::label('Name') !!} {!! add_help('Enter a descriptive name for the type of character this slot can create, e.g. Rare MYO Slot. This will be listed on the MYO slot masterlist.') !!}
-            {!! Form::text('name', old('name'), ['class' => 'form-control']) !!}
-        </div>
-    @endif
-
-    <div class="alert alert-info">
-        Fill in either of the owner fields - you can select a user from the list if they have registered for the site, or enter the URL of their off-site profile, such as their deviantArt profile, if they don't have an account. If the owner registers an account later and links their account, {{ $isMyo ? 'MYO slot' : 'character' }}s linked to that account's profile will automatically be credited to their site account. If both fields are filled, the URL field will be ignored.
-    </div>
-
-    <div class="row">
-        <div class="col-md-6">
-            <div class="form-group">
-                {!! Form::label('Owner') !!}
-                {!! Form::select('user_id', $userOptions, old('user_id'), ['class' => 'form-control', 'placeholder' => 'Select User', 'id' => 'userSelect']) !!}
-            </div>
-        </div>
-        <div class="col-md-6">
+        @if ($isMyo)
             <div class="form-group">
-                {!! Form::label('Owner URL (Optional)') !!}
-                {!! Form::text('owner_url', old('owner_url'), ['class' => 'form-control']) !!}
+                {!! Form::label('Name') !!} {!! add_help('Enter a descriptive name for the type of character this slot can create, e.g. Rare MYO Slot. This will be listed on the MYO slot masterlist.') !!}
+                {!! Form::text('name', old('name'), ['class' => 'form-control']) !!}
             </div>
+        @endif
+
+        <div class="alert alert-info">
+            Fill in either of the owner fields - you can select a user from the list if they have registered for the site, or enter the URL of their off-site profile, such as their deviantArt profile, if they don't have an account. If the owner registers
+            an account later and links their account, {{ $isMyo ? 'MYO slot' : 'character' }}s linked to that account's profile will automatically be credited to their site account. If both fields are filled, the URL field will be ignored.
         </div>
-    </div>
 
-    @if(!$isMyo)
         <div class="row">
             <div class="col-md-6">
                 <div class="form-group">
-                    {!! Form::label('Character Category') !!}
-                    <select name="character_category_id" id="category" class="form-control" placeholder="Select Category">
-                        <option value="" data-code="">Select Category</option>
-                        @foreach($categories as $category)
-                            <option value="{{ $category->id }}" data-code="{{ $category->code }}" {{ old('character_category_id') == $category->id ? 'selected' : '' }}>{{ $category->name }} ({{ $category->code }})</option>
-                        @endforeach
-                    </select>
+                    {!! Form::label('Owner') !!}
+                    {!! Form::select('user_id', $userOptions, old('user_id'), ['class' => 'form-control', 'placeholder' => 'Select User', 'id' => 'userSelect']) !!}
                 </div>
             </div>
             <div class="col-md-6">
                 <div class="form-group">
-                    {!! Form::label('Number') !!} {!! add_help('This number helps to identify the character and should preferably be unique either within the category, or among all characters.') !!}
-                    <div class="d-flex">
-                        {!! Form::text('number', old('number'), ['class' => 'form-control mr-2', 'id' => 'number']) !!}
-                        <a href="#" id="pull-number" class="btn btn-primary" data-toggle="tooltip" title="This will find the highest number assigned to a character currently and add 1 to it. It can be adjusted to pull the highest number in the category or the highest overall number - this setting is in the code.">Pull Next Number</a>
-                    </div>
+                    {!! Form::label('Owner URL (Optional)') !!}
+                    {!! Form::text('owner_url', old('owner_url'), ['class' => 'form-control']) !!}
                 </div>
             </div>
         </div>
 
-        <div class="form-group">
-            {!! Form::label('Character Code') !!} {!! add_help('This code identifies the character itself. You don\'t have to use the automatically generated code, but this must be unique among all characters (as it\'s used to generate the character\'s page URL).') !!}
-            {!! Form::text('slug', old('slug'), ['class' => 'form-control', 'id' => 'code']) !!}
-        </div>
-    @endif
+        @if (!$isMyo)
+            <div class="row">
+                <div class="col-md-6">
+                    <div class="form-group">
+                        {!! Form::label('Character Category') !!}
+                        <select name="character_category_id" id="category" class="form-control" placeholder="Select Category">
+                            <option value="" data-code="">Select Category</option>
+                            @foreach ($categories as $category)
+                                <option value="{{ $category->id }}" data-code="{{ $category->code }}" {{ old('character_category_id') == $category->id ? 'selected' : '' }}>{{ $category->name }} ({{ $category->code }})</option>
+                            @endforeach
+                        </select>
+                    </div>
+                </div>
+                <div class="col-md-6">
+                    <div class="form-group">
+                        {!! Form::label('Number') !!} {!! add_help('This number helps to identify the character and should preferably be unique either within the category, or among all characters.') !!}
+                        <div class="d-flex">
+                            {!! Form::text('number', old('number'), ['class' => 'form-control mr-2', 'id' => 'number']) !!}
+                            <a href="#" id="pull-number" class="btn btn-primary" data-toggle="tooltip"
+                                title="This will find the highest number assigned to a character currently and add 1 to it. It can be adjusted to pull the highest number in the category or the highest overall number - this setting is in the code.">Pull
+                                Next Number</a>
+                        </div>
+                    </div>
+                </div>
+            </div>
 
-    <div class="form-group">
-        {!! Form::label('Description (Optional)') !!}
-        @if($isMyo)
-            {!! add_help('This section is for making additional notes about the MYO slot. If there are restrictions for the character that can be created by this slot that cannot be expressed with the options below, use this section to describe them.') !!}
-        @else
-            {!! add_help('This section is for making additional notes about the character and is separate from the character\'s profile (this is not editable by the user).') !!}
+            <div class="form-group">
+                {!! Form::label('Character Code') !!} {!! add_help('This code identifies the character itself. You don\'t have to use the automatically generated code, but this must be unique among all characters (as it\'s used to generate the character\'s page URL).') !!}
+                {!! Form::text('slug', old('slug'), ['class' => 'form-control', 'id' => 'code']) !!}
+            </div>
         @endif
-        {!! Form::textarea('description', old('description'), ['class' => 'form-control wysiwyg']) !!}
-    </div>
 
-    <div class="form-group">
-        {!! Form::checkbox('is_visible', 1, old('is_visible'), ['class' => 'form-check-input', 'data-toggle' => 'toggle']) !!}
-        {!! Form::label('is_visible', 'Is Visible', ['class' => 'form-check-label ml-3']) !!} {!! add_help('Turn this off to hide the '.($isMyo ? 'MYO slot' : 'character').'. Only mods with the Manage Masterlist power (that\'s you!) can view it - the owner will also not be able to see the '.($isMyo ? 'MYO slot' : 'character').'\'s page.') !!}
-    </div>
+        <div class="form-group">
+            {!! Form::label('Description (Optional)') !!}
+            @if ($isMyo)
+                {!! add_help('This section is for making additional notes about the MYO slot. If there are restrictions for the character that can be created by this slot that cannot be expressed with the options below, use this section to describe them.') !!}
+            @else
+                {!! add_help('This section is for making additional notes about the character and is separate from the character\'s profile (this is not editable by the user).') !!}
+            @endif
+            {!! Form::textarea('description', old('description'), ['class' => 'form-control wysiwyg']) !!}
+        </div>
 
-    <h3>Transfer Information</h3>
+        <div class="form-group">
+            {!! Form::checkbox('is_visible', 1, old('is_visible'), ['class' => 'form-check-input', 'data-toggle' => 'toggle']) !!}
+            {!! Form::label('is_visible', 'Is Visible', ['class' => 'form-check-label ml-3']) !!} {!! add_help(
+                'Turn this off to hide the ' . ($isMyo ? 'MYO slot' : 'character') . '. Only mods with the Manage Masterlist power (that\'s you!) can view it - the owner will also not be able to see the ' . ($isMyo ? 'MYO slot' : 'character') . '\'s page.',
+            ) !!}
+        </div>
+
+        <h3>Transfer Information</h3>
 
-    <div class="alert alert-info">
-        These are displayed on the {{ $isMyo ? 'MYO slot' : 'character' }}'s profile, but don't have any effect on site functionality except for the following:
-        <ul>
-            <li>If all switches are off, the {{ $isMyo ? 'MYO slot' : 'character' }} cannot be transferred by the user (directly or through trades).</li>
-            <li>If a transfer cooldown is set, the {{ $isMyo ? 'MYO slot' : 'character' }} also cannot be transferred by the user (directly or through trades) until the cooldown is up.</li>
-        </ul>
-    </div>
-    <div class="form-group">
-        {!! Form::checkbox('is_giftable', 1, old('is_giftable'), ['class' => 'form-check-input', 'data-toggle' => 'toggle']) !!}
-        {!! Form::label('is_giftable', 'Is Giftable', ['class' => 'form-check-label ml-3']) !!}
-    </div>
-    <div class="form-group">
-        {!! Form::checkbox('is_tradeable', 1, old('is_tradeable'), ['class' => 'form-check-input', 'data-toggle' => 'toggle']) !!}
-        {!! Form::label('is_tradeable', 'Is Tradeable', ['class' => 'form-check-label ml-3']) !!}
-    </div>
-    <div class="form-group">
-        {!! Form::checkbox('is_sellable', 1, old('is_sellable'), ['class' => 'form-check-input', 'data-toggle' => 'toggle', 'id' => 'resellable']) !!}
-        {!! Form::label('is_sellable', 'Is Resellable', ['class' => 'form-check-label ml-3']) !!}
-    </div>
-    <div class="card mb-3" id="resellOptions">
-        <div class="card-body">
-            {!! Form::label('Resale Value') !!} {!! add_help('This value is publicly displayed on the '.($isMyo ? 'MYO slot' : 'character').'\'s page.') !!}
-            {!! Form::text('sale_value', old('sale_value'), ['class' => 'form-control']) !!}
+        <div class="alert alert-info">
+            These are displayed on the {{ $isMyo ? 'MYO slot' : 'character' }}'s profile, but don't have any effect on site functionality except for the following:
+            <ul>
+                <li>If all switches are off, the {{ $isMyo ? 'MYO slot' : 'character' }} cannot be transferred by the user (directly or through trades).</li>
+                <li>If a transfer cooldown is set, the {{ $isMyo ? 'MYO slot' : 'character' }} also cannot be transferred by the user (directly or through trades) until the cooldown is up.</li>
+            </ul>
+        </div>
+        <div class="form-group">
+            {!! Form::checkbox('is_giftable', 1, old('is_giftable'), ['class' => 'form-check-input', 'data-toggle' => 'toggle']) !!}
+            {!! Form::label('is_giftable', 'Is Giftable', ['class' => 'form-check-label ml-3']) !!}
+        </div>
+        <div class="form-group">
+            {!! Form::checkbox('is_tradeable', 1, old('is_tradeable'), ['class' => 'form-check-input', 'data-toggle' => 'toggle']) !!}
+            {!! Form::label('is_tradeable', 'Is Tradeable', ['class' => 'form-check-label ml-3']) !!}
+        </div>
+        <div class="form-group">
+            {!! Form::checkbox('is_sellable', 1, old('is_sellable'), ['class' => 'form-check-input', 'data-toggle' => 'toggle', 'id' => 'resellable']) !!}
+            {!! Form::label('is_sellable', 'Is Resellable', ['class' => 'form-check-label ml-3']) !!}
+        </div>
+        <div class="card mb-3" id="resellOptions">
+            <div class="card-body">
+                {!! Form::label('Resale Value') !!} {!! add_help('This value is publicly displayed on the ' . ($isMyo ? 'MYO slot' : 'character') . '\'s page.') !!}
+                {!! Form::text('sale_value', old('sale_value'), ['class' => 'form-control']) !!}
+            </div>
+        </div>
+        <div class="form-group">
+            {!! Form::label('On Transfer Cooldown Until (Optional)') !!}
+            {!! Form::text('transferrable_at', old('transferrable_at'), ['class' => 'form-control datepicker']) !!}
         </div>
-    </div>
-    <div class="form-group">
-        {!! Form::label('On Transfer Cooldown Until (Optional)') !!}
-        {!! Form::text('transferrable_at', old('transferrable_at'), ['class' => 'form-control', 'id' => 'datepicker']) !!}
-    </div>
 
-    <h3>Image Upload</h3>
+        <h3>Image Upload</h3>
 
-    <div class="form-group">
-        {!! Form::label('Image') !!}
-        @if($isMyo)
-            {!! add_help('This is a cover image for the MYO slot. If left blank, a default image will be used.') !!}
+        <div class="form-group">
+            {!! Form::label('Image') !!}
+            @if ($isMyo)
+                {!! add_help('This is a cover image for the MYO slot. If left blank, a default image will be used.') !!}
+            @else
+                {!! add_help('This is the full masterlist image. Note that the image is not protected in any way, so take precautions to avoid art/design theft.') !!}
+            @endif
+            <div>{!! Form::file('image', ['id' => 'mainImage']) !!}</div>
+        </div>
+        @if (config('lorekeeper.settings.masterlist_image_automation') === 1)
+            <div class="form-group">
+                {!! Form::checkbox('use_cropper', 1, 1, ['class' => 'form-check-input', 'data-toggle' => 'toggle', 'id' => 'useCropper']) !!}
+                {!! Form::label('use_cropper', 'Use Thumbnail Automation', ['class' => 'form-check-label ml-3']) !!} {!! add_help('A thumbnail is required for the upload (used for the masterlist). You can use the Thumbnail Automation, or upload a custom thumbnail.') !!}
+            </div>
+            <div class="card mb-3" id="thumbnailCrop">
+                <div class="card-body">
+                    <div id="cropSelect">By using this function, the thumbnail will be automatically generated from the full image.</div>
+                    {!! Form::hidden('x0', 1) !!}
+                    {!! Form::hidden('x1', 1) !!}
+                    {!! Form::hidden('y0', 1) !!}
+                    {!! Form::hidden('y1', 1) !!}
+                </div>
+            </div>
         @else
-            {!! add_help('This is the full masterlist image. Note that the image is not protected in any way, so take precautions to avoid art/design theft.') !!}
+            <div class="form-group">
+                {!! Form::checkbox('use_cropper', 1, 1, ['class' => 'form-check-input', 'data-toggle' => 'toggle', 'id' => 'useCropper']) !!}
+                {!! Form::label('use_cropper', 'Use Image Cropper', ['class' => 'form-check-label ml-3']) !!} {!! add_help('A thumbnail is required for the upload (used for the masterlist). You can use the image cropper (crop dimensions can be adjusted in the site code), or upload a custom thumbnail.') !!}
+            </div>
+            <div class="card mb-3" id="thumbnailCrop">
+                <div class="card-body">
+                    <div id="cropSelect">Select an image to use the thumbnail cropper.</div>
+                    <img src="#" id="cropper" class="hide" alt="" />
+                    {!! Form::hidden('x0', null, ['id' => 'cropX0']) !!}
+                    {!! Form::hidden('x1', null, ['id' => 'cropX1']) !!}
+                    {!! Form::hidden('y0', null, ['id' => 'cropY0']) !!}
+                    {!! Form::hidden('y1', null, ['id' => 'cropY1']) !!}
+                </div>
+            </div>
         @endif
-        <div>{!! Form::file('image', ['id' => 'mainImage']) !!}</div>
-    </div>
-@if (Config::get('lorekeeper.settings.masterlist_image_automation') === 1)
-    <div class="form-group">
-        {!! Form::checkbox('use_cropper', 1, 1, ['class' => 'form-check-input', 'data-toggle' => 'toggle', 'id' => 'useCropper']) !!}
-        {!! Form::label('use_cropper', 'Use Thumbnail Automation', ['class' => 'form-check-label ml-3']) !!} {!! add_help('A thumbnail is required for the upload (used for the masterlist). You can use the Thumbnail Automation, or upload a custom thumbnail.') !!}
-    </div>
-    <div class="card mb-3" id="thumbnailCrop">
-        <div class="card-body">
-            <div id="cropSelect">By using this function, the thumbnail will be automatically generated from the full image.</div>
-            {!! Form::hidden('x0', 1) !!}
-            {!! Form::hidden('x1', 1) !!}
-            {!! Form::hidden('y0', 1) !!}
-            {!! Form::hidden('y1', 1) !!}
-        </div>
-    </div>
-@else
-    <div class="form-group">
-        {!! Form::checkbox('use_cropper', 1, 1, ['class' => 'form-check-input', 'data-toggle' => 'toggle', 'id' => 'useCropper']) !!}
-        {!! Form::label('use_cropper', 'Use Image Cropper', ['class' => 'form-check-label ml-3']) !!} {!! add_help('A thumbnail is required for the upload (used for the masterlist). You can use the image cropper (crop dimensions can be adjusted in the site code), or upload a custom thumbnail.') !!}
-    </div>
-    <div class="card mb-3" id="thumbnailCrop">
-        <div class="card-body">
-            <div id="cropSelect">Select an image to use the thumbnail cropper.</div>
-            <img src="#" id="cropper" class="hide" alt="" />
-            {!! Form::hidden('x0', null, ['id' => 'cropX0']) !!}
-            {!! Form::hidden('x1', null, ['id' => 'cropX1']) !!}
-            {!! Form::hidden('y0', null, ['id' => 'cropY0']) !!}
-            {!! Form::hidden('y1', null, ['id' => 'cropY1']) !!}
-        </div>
-    </div>
-@endif
-    <div class="card mb-3" id="thumbnailUpload">
-        <div class="card-body">
-            {!! Form::label('Thumbnail Image') !!} {!! add_help('This image is shown on the masterlist page.') !!}
-            <div>{!! Form::file('thumbnail') !!}</div>
-            <div class="text-muted">Recommended size: {{ Config::get('lorekeeper.settings.masterlist_thumbnails.width') }}px x {{ Config::get('lorekeeper.settings.masterlist_thumbnails.height') }}px</div>
+        <div class="card mb-3" id="thumbnailUpload">
+            <div class="card-body">
+                {!! Form::label('Thumbnail Image') !!} {!! add_help('This image is shown on the masterlist page.') !!}
+                <div>{!! Form::file('thumbnail') !!}</div>
+                <div class="text-muted">Recommended size: {{ config('lorekeeper.settings.masterlist_thumbnails.width') }}px x {{ config('lorekeeper.settings.masterlist_thumbnails.height') }}px</div>
+            </div>
         </div>
-    </div>
-    <p class="alert alert-info">
-        This section is for crediting the image creators. The first box is for the designer or artist's on-site username (if any). The second is for a link to the designer or artist if they don't have an account on the site.
-    </p>
-    <div class="form-group">
-        {!! Form::label('Designer(s)') !!}
-        <div id="designerList">
-            <div class="mb-2 d-flex">
-                {!! Form::select('designer_id[]', $userOptions, null, ['class'=> 'form-control mr-2 selectize', 'placeholder' => 'Select a Designer']) !!}
+        <p class="alert alert-info">
+            This section is for crediting the image creators. The first box is for the designer or artist's on-site username (if any). The second is for a link to the designer or artist if they don't have an account on the site.
+        </p>
+        <div class="form-group">
+            {!! Form::label('Designer(s)') !!}
+            <div id="designerList">
+                <div class="mb-2 d-flex">
+                    {!! Form::select('designer_id[]', $userOptions, null, ['class' => 'form-control mr-2 selectize', 'placeholder' => 'Select a Designer']) !!}
+                    {!! Form::text('designer_url[]', null, ['class' => 'form-control mr-2', 'placeholder' => 'Designer URL']) !!}
+                    <a href="#" class="add-designer btn btn-link" data-toggle="tooltip" title="Add another designer">+</a>
+                </div>
+            </div>
+            <div class="designer-row hide mb-2">
+                {!! Form::select('designer_id[]', $userOptions, null, ['class' => 'form-control mr-2 designer-select', 'placeholder' => 'Select a Designer']) !!}
                 {!! Form::text('designer_url[]', null, ['class' => 'form-control mr-2', 'placeholder' => 'Designer URL']) !!}
                 <a href="#" class="add-designer btn btn-link" data-toggle="tooltip" title="Add another designer">+</a>
             </div>
         </div>
-        <div class="designer-row hide mb-2">
-            {!! Form::select('designer_id[]', $userOptions, null, ['class'=> 'form-control mr-2 designer-select', 'placeholder' => 'Select a Designer']) !!}
-            {!! Form::text('designer_url[]', null, ['class' => 'form-control mr-2', 'placeholder' => 'Designer URL']) !!}
-            <a href="#" class="add-designer btn btn-link" data-toggle="tooltip" title="Add another designer">+</a>
-        </div>
-    </div>
-    <div class="form-group">
-        {!! Form::label('Artist(s)') !!}
-        <div id="artistList">
-            <div class="mb-2 d-flex">
-                {!! Form::select('artist_id[]', $userOptions, null, ['class'=> 'form-control mr-2 selectize', 'placeholder' => 'Select an Artist']) !!}
+        <div class="form-group">
+            {!! Form::label('Artist(s)') !!}
+            <div id="artistList">
+                <div class="mb-2 d-flex">
+                    {!! Form::select('artist_id[]', $userOptions, null, ['class' => 'form-control mr-2 selectize', 'placeholder' => 'Select an Artist']) !!}
+                    {!! Form::text('artist_url[]', null, ['class' => 'form-control mr-2', 'placeholder' => 'Artist URL']) !!}
+                    <a href="#" class="add-artist btn btn-link" data-toggle="tooltip" title="Add another artist">+</a>
+                </div>
+            </div>
+            <div class="artist-row hide mb-2">
+                {!! Form::select('artist_id[]', $userOptions, null, ['class' => 'form-control mr-2 artist-select', 'placeholder' => 'Select an Artist']) !!}
                 {!! Form::text('artist_url[]', null, ['class' => 'form-control mr-2', 'placeholder' => 'Artist URL']) !!}
-                <a href="#" class="add-artist btn btn-link" data-toggle="tooltip" title="Add another artist">+</a>
+                <a href="#" class="add-artist btn btn-link mb-2" data-toggle="tooltip" title="Add another artist">+</a>
             </div>
         </div>
-        <div class="artist-row hide mb-2">
-            {!! Form::select('artist_id[]', $userOptions, null, ['class'=> 'form-control mr-2 artist-select', 'placeholder' => 'Select an Artist']) !!}
-            {!! Form::text('artist_url[]', null, ['class' => 'form-control mr-2', 'placeholder' => 'Artist URL']) !!}
-            <a href="#" class="add-artist btn btn-link mb-2" data-toggle="tooltip" title="Add another artist">+</a>
-        </div>
-    </div>
-    @if(!$isMyo)
+        @if (!$isMyo)
+            <div class="form-group">
+                {!! Form::label('Image Notes (Optional)') !!} {!! add_help('This section is for making additional notes about the image.') !!}
+                {!! Form::textarea('image_description', old('image_description'), ['class' => 'form-control wysiwyg']) !!}
+            </div>
+        @endif
+
+        <h3>Traits</h3>
+
         <div class="form-group">
-            {!! Form::label('Image Notes (Optional)') !!} {!! add_help('This section is for making additional notes about the image.') !!}
-            {!! Form::textarea('image_description', old('image_description'), ['class' => 'form-control wysiwyg']) !!}
+            {!! Form::label('Species') !!} @if ($isMyo)
+                {!! add_help('This will lock the slot into a particular species. Leave it blank if you would like to give the user a choice.') !!}
+            @endif
+            {!! Form::select('species_id', $specieses, old('species_id'), ['class' => 'form-control', 'id' => 'species']) !!}
         </div>
-    @endif
-
-    <h3>Traits</h3>
 
-    <div class="form-group">
-        {!! Form::label('Species') !!} @if($isMyo) {!! add_help('This will lock the slot into a particular species. Leave it blank if you would like to give the user a choice.') !!} @endif
-        {!! Form::select('species_id', $specieses, old('species_id'), ['class' => 'form-control', 'id' => 'species']) !!}
-    </div>
+        <div class="form-group" id="subtypes">
+            {!! Form::label('Subtype (Optional)') !!} @if ($isMyo)
+                {!! add_help(
+                    'This will lock the slot into a particular subtype. Leave it blank if you would like to give the user a choice, or not select a subtype. The subtype must match the species selected above, and if no species is specified, the subtype will not be applied.',
+                ) !!}
+            @endif
+            {!! Form::select('subtype_id', $subtypes, old('subtype_id'), ['class' => 'form-control disabled', 'id' => 'subtype']) !!}
+        </div>
 
-    <div class="form-group" id="subtypes">
-        {!! Form::label('Subtype (Optional)') !!} @if($isMyo) {!! add_help('This will lock the slot into a particular subtype. Leave it blank if you would like to give the user a choice, or not select a subtype. The subtype must match the species selected above, and if no species is specified, the subtype will not be applied.') !!} @endif
-        {!! Form::select('subtype_id', $subtypes, old('subtype_id'), ['class' => 'form-control disabled', 'id' => 'subtype']) !!}
-    </div>
+        <div class="form-group">
+            {!! Form::label('Character Rarity') !!} @if ($isMyo)
+                {!! add_help('This will lock the slot into a particular rarity. Leave it blank if you would like to give the user more choices.') !!}
+            @endif
+            {!! Form::select('rarity_id', $rarities, old('rarity_id'), ['class' => 'form-control']) !!}
+        </div>
 
-    <div class="form-group">
-        {!! Form::label('Character Rarity') !!} @if($isMyo) {!! add_help('This will lock the slot into a particular rarity. Leave it blank if you would like to give the user more choices.') !!} @endif
-        {!! Form::select('rarity_id', $rarities, old('rarity_id'), ['class' => 'form-control']) !!}
-    </div>
+        @if(!$isMyo)
+            <div class="row no-gutters">
+                <div class="col-md-6 pr-2">
+                    <div class="form-group">
+                        {!! Form::label('Character Title') !!}
+                        {!! Form::select('title_id', $titles, old('title_id'), ['class' => 'form-control', 'id' => 'charTitle']) !!}
+                    </div>
+                </div>
+                <div class="col-md-6">
+                    <div class="form-group" id="titleOptions">
+                        {!! Form::label('Extra Info/Custom Title (Optional)') !!} {!! add_help('If \'custom title\' is selected, this will be displayed as the title. If a preexisting title is selected, it will be displayed in addition to it. The short version is only used in the case of a custom title.') !!}
+                        <div class="d-flex">
+                            {!! Form::text('title_data[full]', null, ['class' => 'form-control mr-2', 'placeholder' => 'Full Title']) !!}
+                            @if(Settings::get('character_title_display'))
+                                {!! Form::text('title_data[short]', null, ['class' => 'form-control mr-2', 'placeholder' => 'Short Title (Optional)']) !!}
+                            @endif
+                        </div>
+                    </div>
+                </div>
+            </div>
+        @endif
 
-    @if(!$isMyo)
-    <div class="row no-gutters">
-        <div class="col-md-6 pr-2">
-            <div class="form-group">
-                {!! Form::label('Character Title') !!}
-                {!! Form::select('title_id', $titles, old('title_id'), ['class' => 'form-control', 'id' => 'charTitle']) !!}
+        <div class="form-group">
+            {!! Form::label('Traits') !!} @if ($isMyo)
+                {!! add_help(
+                    'These traits will be listed as required traits for the slot. The user will still be able to add on more traits, but not be able to remove these. This is allowed to conflict with the rarity above; you may add traits above the character\'s specified rarity.',
+                ) !!}
+            @endif
+            <div><a href="#" class="btn btn-primary mb-2" id="add-feature">Add Trait</a></div>
+            <div id="featureList">
             </div>
-        </div>
-        <div class="col-md-6">
-            <div class="form-group" id="titleOptions">
-                {!! Form::label('Extra Info/Custom Title (Optional)') !!} {!! add_help('If \'custom title\' is selected, this will be displayed as the title. If a preexisting title is selected, it will be displayed in addition to it. The short version is only used in the case of a custom title.') !!}
-                <div class="d-flex">
-                    {!! Form::text('title_data[full]', null, ['class' => 'form-control mr-2', 'placeholder' => 'Full Title']) !!}
-                    @if(Settings::get('character_title_display'))
-                        {!! Form::text('title_data[short]', null, ['class' => 'form-control mr-2', 'placeholder' => 'Short Title (Optional)']) !!}
-                    @endif
-                </div>
+            <div class="feature-row hide mb-2">
+                {!! Form::select('feature_id[]', $features, null, ['class' => 'form-control mr-2 feature-select', 'placeholder' => 'Select Trait']) !!}
+                {!! Form::text('feature_data[]', null, ['class' => 'form-control mr-2', 'placeholder' => 'Extra Info (Optional)']) !!}
+                <a href="#" class="remove-feature btn btn-danger mb-2">×</a>
             </div>
         </div>
-    </div>
-    @endif
 
-    <div class="form-group">
-        {!! Form::label('Traits') !!} @if($isMyo) {!! add_help('These traits will be listed as required traits for the slot. The user will still be able to add on more traits, but not be able to remove these. This is allowed to conflict with the rarity above; you may add traits above the character\'s specified rarity.') !!} @endif
-        <div id="featureList">
+        <div class="text-right">
+            {!! Form::submit('Create Character', ['class' => 'btn btn-primary']) !!}
         </div>
-        <div><a href="#" class="btn btn-primary" id="add-feature">Add Trait</a></div>
-        <div class="feature-row hide mb-2">
-            {!! Form::select('feature_id[]', $features, null, ['class' => 'form-control mr-2 feature-select', 'placeholder' => 'Select Trait']) !!}
-            {!! Form::text('feature_data[]', null, ['class' => 'form-control mr-2', 'placeholder' => 'Extra Info (Optional)']) !!}
-            <a href="#" class="remove-feature btn btn-danger mb-2">×</a>
-        </div>
-    </div>
-
-    <div class="text-right">
-        {!! Form::submit('Create Character', ['class' => 'btn btn-primary']) !!}
-    </div>
-    {!! Form::close() !!}
-@endif
+        {!! Form::close() !!}
+    @endif
 
 @endsection
 
 @section('scripts')
-@parent
-@include('widgets._character_create_options_js')
-@include('widgets._image_upload_js')
-@if(!$isMyo)
-    @include('widgets._character_code_js')
-@endif
-
-<script>
-    $( "#species" ).change(function() {
-      var species = $('#species').val();
-      var myo = '<?php echo($isMyo); ?>';
-      $.ajax({
-        type: "GET", url: "{{ url('admin/masterlist/check-subtype') }}?species="+species+"&myo="+myo, dataType: "text"
-      }).done(function (res) { $("#subtypes").html(res); }).fail(function (jqXHR, textStatus, errorThrown) { alert("AJAX call failed: " + textStatus + ", " + errorThrown); });
-    });
-</script>
+    @parent
+    @include('widgets._character_create_options_js')
+    @include('widgets._image_upload_js')
+    @include('widgets._datetimepicker_js')
+    @if (!$isMyo)
+        @include('widgets._character_code_js')
+    @endif
 
+    <script>
+        $("#species").change(function() {
+            var species = $('#species').val();
+            var myo = '<?php echo $isMyo; ?>';
+            $.ajax({
+                type: "GET",
+                url: "{{ url('admin/masterlist/check-subtype') }}?species=" + species + "&myo=" + myo,
+                dataType: "text"
+            }).done(function(res) {
+                $("#subtypes").html(res);
+            }).fail(function(jqXHR, textStatus, errorThrown) {
+                alert("AJAX call failed: " + textStatus + ", " + errorThrown);
+            });
+        });
+    </script>
 @endsection
diff --git a/resources/views/admin/news/_delete_news.blade.php b/resources/views/admin/news/_delete_news.blade.php
index b53f2e74fe..287c367932 100644
--- a/resources/views/admin/news/_delete_news.blade.php
+++ b/resources/views/admin/news/_delete_news.blade.php
@@ -1,7 +1,8 @@
-@if($news)
-    {!! Form::open(['url' => 'admin/news/delete/'.$news->id]) !!}
+@if ($news)
+    {!! Form::open(['url' => 'admin/news/delete/' . $news->id]) !!}
 
-    <p>You are about to delete the news post <strong>{{ $news->title }}</strong>. This is not reversible. If you would like to preserve the content while preventing users from accessing the post, you can use the viewable setting instead to hide the post.</p>
+    <p>You are about to delete the news post <strong>{{ $news->title }}</strong>. This is not reversible. If you would like to preserve the content while preventing users from accessing the post, you can use the viewable setting instead to hide the
+        post.</p>
     <p>Are you sure you want to delete <strong>{{ $news->title }}</strong>?</p>
 
     <div class="text-right">
@@ -9,6 +10,6 @@
     </div>
 
     {!! Form::close() !!}
-@else 
+@else
     Invalid post selected.
-@endif
\ No newline at end of file
+@endif
diff --git a/resources/views/admin/news/create_edit_news.blade.php b/resources/views/admin/news/create_edit_news.blade.php
index f5b4c51ba3..a7fdab1db1 100644
--- a/resources/views/admin/news/create_edit_news.blade.php
+++ b/resources/views/admin/news/create_edit_news.blade.php
@@ -1,79 +1,76 @@
 @extends('admin.layout')
 
-@section('admin-title') News @endsection
+@section('admin-title')
+    {{ $news->id ? 'Edit' : 'Create' }} News Post
+@endsection
 
 @section('admin-content')
-{!! breadcrumbs(['Admin Panel' => 'admin', 'News' => 'admin/news', ($news->id ? 'Edit' : 'Create').' Post' => $news->id ? 'admin/news/edit/'.$news->id : 'admin/news/create']) !!}
+    {!! breadcrumbs(['Admin Panel' => 'admin', 'News' => 'admin/news', ($news->id ? 'Edit' : 'Create') . ' Post' => $news->id ? 'admin/news/edit/' . $news->id : 'admin/news/create']) !!}
 
-<h1>{{ $news->id ? 'Edit' : 'Create' }} Post
-    @if($news->id)
-        <a href="#" class="btn btn-danger float-right delete-news-button">Delete Post</a>
-    @endif
-</h1>
+    <h1>{{ $news->id ? 'Edit' : 'Create' }} News Post
+        @if ($news->id)
+            <a href="#" class="btn btn-danger float-right delete-news-button">Delete Post</a>
+        @endif
+    </h1>
 
-{!! Form::open(['url' => $news->id ? 'admin/news/edit/'.$news->id : 'admin/news/create', 'files' => true]) !!}
+    {!! Form::open(['url' => $news->id ? 'admin/news/edit/' . $news->id : 'admin/news/create', 'files' => true]) !!}
 
-<h3>Basic Information</h3>
+    <h3>Basic Information</h3>
 
-<div class="row">
-    <div class="col-md-6">
-        <div class="form-group">
-            {!! Form::label('Title') !!}
-            {!! Form::text('title', $news->title, ['class' => 'form-control']) !!}
+    <div class="row">
+        <div class="col-md-6">
+            <div class="form-group">
+                {!! Form::label('Title') !!}
+                {!! Form::text('title', $news->title, ['class' => 'form-control']) !!}
+            </div>
         </div>
-    </div>
 
-    <div class="col-md-6">
-        <div class="form-group">
-            {!! Form::label('Post Time (Optional)') !!} {!! add_help('This is the time that the news post should be posted. Make sure the Is Viewable switch is off.') !!}
-            {!! Form::text('post_at', $news->post_at, ['class' => 'form-control', 'id' => 'datepicker']) !!}
+        <div class="col-md-6">
+            <div class="form-group">
+                {!! Form::label('Post Time (Optional)') !!} {!! add_help('This is the time that the news post should be posted. Make sure the Is Viewable switch is off.') !!}
+                {!! Form::text('post_at', $news->post_at, ['class' => 'form-control datepicker']) !!}
+            </div>
         </div>
     </div>
-</div>
-
-<div class="form-group">
-    {!! Form::label('Post Content') !!}
-    {!! Form::textarea('text', $news->text, ['class' => 'form-control wysiwyg']) !!}
-</div>
 
-<div class="row">
-    <div class="col-md">
-        <div class="form-group">
-            {!! Form::checkbox('is_visible', 1, $news->id ? $news->is_visible : 1, ['class' => 'form-check-input', 'data-toggle' => 'toggle']) !!}
-            {!! Form::label('is_visible', 'Is Viewable', ['class' => 'form-check-label ml-3']) !!} {!! add_help('If this is turned off, the post will not be visible. If the post time is set, it will automatically become visible at/after the given post time, so make sure the post time is empty if you want it to be completely hidden.') !!}
-        </div>
+    <div class="form-group">
+        {!! Form::label('Post Content') !!}
+        {!! Form::textarea('text', $news->text, ['class' => 'form-control wysiwyg']) !!}
     </div>
-    @if($news->id && $news->is_visible)
+
+    <div class="row">
         <div class="col-md">
             <div class="form-group">
-                {!! Form::checkbox('bump', 1, null, ['class' => 'form-check-input', 'data-toggle' => 'toggle']) !!}
-                {!! Form::label('bump', 'Bump News', ['class' => 'form-check-label ml-3']) !!} {!! add_help('If toggled on, this will alert users that there is new news. Best in conjunction with a clear notification of changes!') !!}
+                {!! Form::checkbox('is_visible', 1, $news->id ? $news->is_visible : 1, ['class' => 'form-check-input', 'data-toggle' => 'toggle']) !!}
+                {!! Form::label('is_visible', 'Is Viewable', ['class' => 'form-check-label ml-3']) !!} {!! add_help('If this is turned off, the post will not be visible. If the post time is set, it will automatically become visible at/after the given post time, so make sure the post time is empty if you want it to be completely hidden.') !!}
             </div>
         </div>
-    @endif
-</div>
-
-<div class="text-right">
-    {!! Form::submit($news->id ? 'Edit' : 'Create', ['class' => 'btn btn-primary']) !!}
-</div>
+        @if ($news->id && $news->is_visible)
+            <div class="col-md">
+                <div class="form-group">
+                    {!! Form::checkbox('bump', 1, null, ['class' => 'form-check-input', 'data-toggle' => 'toggle']) !!}
+                    {!! Form::label('bump', 'Bump News', ['class' => 'form-check-label ml-3']) !!} {!! add_help('If toggled on, this will alert users that there is new news. Best in conjunction with a clear notification of changes!') !!}
+                </div>
+            </div>
+        @endif
+    </div>
 
-{!! Form::close() !!}
+    <div class="text-right">
+        {!! Form::submit($news->id ? 'Edit' : 'Create', ['class' => 'btn btn-primary']) !!}
+    </div>
 
+    {!! Form::close() !!}
 @endsection
 
 @section('scripts')
-@parent
-<script>
-$( document ).ready(function() {    
-    $('.delete-news-button').on('click', function(e) {
-        e.preventDefault();
-        loadModal("{{ url('admin/news/delete') }}/{{ $news->id }}", 'Delete Post');
-    });
-    $( "#datepicker" ).datetimepicker({
-        dateFormat: "yy-mm-dd",
-        timeFormat: 'HH:mm:ss',
-    });
-});
-    
-</script>
-@endsection
\ No newline at end of file
+    @parent
+    @include('widgets._datetimepicker_js')
+    <script>
+        $(document).ready(function() {
+            $('.delete-news-button').on('click', function(e) {
+                e.preventDefault();
+                loadModal("{{ url('admin/news/delete') }}/{{ $news->id }}", 'Delete Post');
+            });
+        });
+    </script>
+@endsection
diff --git a/resources/views/admin/news/news.blade.php b/resources/views/admin/news/news.blade.php
index ac9e2c6597..b21f2d8d55 100644
--- a/resources/views/admin/news/news.blade.php
+++ b/resources/views/admin/news/news.blade.php
@@ -1,47 +1,68 @@
 @extends('admin.layout')
 
-@section('admin-title') News @endsection
+@section('admin-title')
+    News
+@endsection
 
 @section('admin-content')
-{!! breadcrumbs(['Admin Panel' => 'admin', 'News' => 'admin/news']) !!}
+    {!! breadcrumbs(['Admin Panel' => 'admin', 'News' => 'admin/news']) !!}
 
-<h1>News</h1>
+    <h1>News</h1>
 
-<p>You can create new news posts here. Creating a news post alerts every user that there is a new post, unless the post is marked as not viewable (see the post creation page for details).</p>
+    <p>You can create new news posts here. Creating a news post alerts every user that there is a new post, unless the post is marked as not viewable (see the post creation page for details).</p>
 
-<div class="text-right mb-3"><a class="btn btn-primary" href="{{ url('admin/news/create') }}"><i class="fas fa-plus"></i> Create New Post</a></div>
-@if(!count($newses))
-    <p>No news found.</p>
-@else
-    {!! $newses->render() !!}
-      <div class="row ml-md-2">
-        <div class="d-flex row flex-wrap col-12 pb-1 px-0 ubt-bottom">
-          <div class="col-12 col-md-5 font-weight-bold">Title</div>
-          <div class="col-6 col-md-3 font-weight-bold">Posted At</div>
-          <div class="col-6 col-md-3 font-weight-bold">Last Edited</div>
-        </div>
-        @foreach($newses as $news)
-        <div class="d-flex row flex-wrap col-12 mt-1 pt-2 px-0 ubt-top">
-          <div class="col-12 col-md-5">
-              @if(!$news->is_visible)
-                  @if($news->post_at)
-                      <i class="fas fa-clock mr-1" data-toggle="tooltip" title="This post is scheduled to be posted in the future."></i>
-                  @else
-                      <i class="fas fa-eye-slash mr-1" data-toggle="tooltip" title="This post is hidden."></i>
-                  @endif
-              @endif
-              <a href="{{ $news->url }}">{{ $news->title }}</a>
-          </div>
-          <div class="col-6 col-md-3">{!! pretty_date($news->post_at ? : $news->created_at) !!}</div>
-          <div class="col-6 col-md-3">{!! pretty_date($news->updated_at) !!}</div>
-          <div class="col-12 col-md-1 text-right"><a href="{{ url('admin/news/edit/'.$news->id) }}" class="btn btn-primary py-0 px-2 w-100">Edit</a></div>
+    <div class="text-right mb-3"><a class="btn btn-primary" href="{{ url('admin/news/create') }}"><i class="fas fa-plus"></i> Create New Post</a></div>
+    @if (!count($newses))
+        <p>No news found.</p>
+    @else
+        {!! $newses->render() !!}
+        <div class="mb-4 logs-table">
+            <div class="logs-table-header">
+                <div class="row">
+                    <div class="col-12 col-md-5">
+                        <div class="logs-table-cell">Title</div>
+                    </div>
+                    <div class="col-6 col-md-3">
+                        <div class="logs-table-cell">Posted At</div>
+                    </div>
+                    <div class="col-6 col-md-3">
+                        <div class="logs-table-cell">Last Edited</div>
+                    </div>
+                </div>
+            </div>
+            <div class="logs-table-body">
+                @foreach ($newses as $news)
+                    <div class="logs-table-row">
+                        <div class="row flex-wrap">
+                            <div class="col-12 col-md-5">
+                                <div class="logs-table-cell">
+                                    @if (!$news->is_visible)
+                                        @if ($news->post_at)
+                                            <i class="fas fa-clock mr-1" data-toggle="tooltip" title="This post is scheduled to be posted in the future."></i>
+                                        @else
+                                            <i class="fas fa-eye-slash mr-1" data-toggle="tooltip" title="This post is hidden."></i>
+                                        @endif
+                                    @endif
+                                    <a href="{{ $news->url }}">{{ $news->title }}</a>
+                                </div>
+                            </div>
+                            <div class="col-6 col-md-3">
+                                <div class="logs-table-cell">{!! pretty_date($news->post_at ?: $news->created_at) !!}</div>
+                            </div>
+                            <div class="col-6 col-md-3">
+                                <div class="logs-table-cell">{!! pretty_date($news->updated_at) !!}</div>
+                            </div>
+                            <div class="col-12 col-md-1 text-right">
+                                <div class="logs-table-cell"><a href="{{ url('admin/news/edit/' . $news->id) }}" class="btn btn-primary py-0 px-2 w-100">Edit</a></div>
+                            </div>
+                        </div>
+                    </div>
+                @endforeach
+            </div>
         </div>
-        @endforeach
-      </div>
-    {!! $newses->render() !!}
-
-    <div class="text-center mt-4 small text-muted">{{ $newses->total() }} result{{ $newses->total() == 1 ? '' : 's' }} found.</div>
+        {!! $newses->render() !!}
 
-@endif
+        <div class="text-center mt-4 small text-muted">{{ $newses->total() }} result{{ $newses->total() == 1 ? '' : 's' }} found.</div>
+    @endif
 
 @endsection
diff --git a/resources/views/admin/pages/_delete_page.blade.php b/resources/views/admin/pages/_delete_page.blade.php
index 3ddce205fd..cae9f75d1b 100644
--- a/resources/views/admin/pages/_delete_page.blade.php
+++ b/resources/views/admin/pages/_delete_page.blade.php
@@ -1,7 +1,8 @@
-@if($page)
-    {!! Form::open(['url' => 'admin/pages/delete/'.$page->id]) !!}
+@if ($page)
+    {!! Form::open(['url' => 'admin/pages/delete/' . $page->id]) !!}
 
-    <p>You are about to delete the page <strong>{{ $page->name }}</strong>. This is not reversible. If you would like to preserve the content while preventing users from accessing the page, you can use the viewable setting instead to hide the page.</p>
+    <p>You are about to delete the page <strong>{{ $page->name }}</strong>. This is not reversible. If you would like to preserve the content while preventing users from accessing the page, you can use the viewable setting instead to hide the page.
+    </p>
     <p>Are you sure you want to delete <strong>{{ $page->name }}</strong>?</p>
 
     <div class="text-right">
@@ -9,6 +10,6 @@
     </div>
 
     {!! Form::close() !!}
-@else 
+@else
     Invalid page selected.
-@endif
\ No newline at end of file
+@endif
diff --git a/resources/views/admin/pages/create_edit_page.blade.php b/resources/views/admin/pages/create_edit_page.blade.php
index e897d7016e..bad3d4e3b8 100644
--- a/resources/views/admin/pages/create_edit_page.blade.php
+++ b/resources/views/admin/pages/create_edit_page.blade.php
@@ -1,77 +1,83 @@
 @extends('admin.layout')
 
-@section('admin-title') Pages @endsection
+@section('admin-title')
+    {{ $page->id ? 'Edit' : 'Create' }} Page
+@endsection
 
 @section('admin-content')
-{!! breadcrumbs(['Admin Panel' => 'admin', 'Pages' => 'admin/pages', ($page->id ? 'Edit' : 'Create').' Page' => $page->id ? 'admin/pages/edit/'.$page->id : 'admin/pages/create']) !!}
+    {!! breadcrumbs(['Admin Panel' => 'admin', 'Pages' => 'admin/pages', ($page->id ? 'Edit' : 'Create') . ' Page' => $page->id ? 'admin/pages/edit/' . $page->id : 'admin/pages/create']) !!}
 
-<h1>{{ $page->id ? 'Edit' : 'Create' }} Page
-    @if($page->id && !Config::get('lorekeeper.text_pages.'.$page->key))
-        <a href="#" class="btn btn-danger float-right delete-page-button">Delete Page</a>
-    @endif
-    @if($page->id)
-        <a href="{{ $page->url }}" class="btn btn-info float-right mr-md-2">View Page</a>
-    @endif
-</h1>
+    <h1>{{ $page->id ? 'Edit' : 'Create' }} Page
+        @if ($page->id && !config('lorekeeper.text_pages.' . $page->key))
+            <a href="#" class="btn btn-danger float-right delete-page-button">Delete Page</a>
+        @endif
+        @if ($page->id)
+            <a href="{{ $page->url }}" class="btn btn-info float-right mr-md-2">View Page</a>
+        @endif
+    </h1>
 
-{!! Form::open(['url' => $page->id ? 'admin/pages/edit/'.$page->id : 'admin/pages/create', 'files' => true]) !!}
+    {!! Form::open(['url' => $page->id ? 'admin/pages/edit/' . $page->id : 'admin/pages/create', 'files' => true]) !!}
 
-<h3>Basic Information</h3>
+    <h3>Basic Information</h3>
 
-<div class="row">
-    <div class="col-md-6">
-        <div class="form-group">
-            {!! Form::label('Title') !!}
-            {!! Form::text('title', $page->title, ['class' => 'form-control']) !!}
+    <div class="row">
+        <div class="col-md-6">
+            <div class="form-group">
+                {!! Form::label('Title') !!}
+                {!! Form::text('title', $page->title, ['class' => 'form-control']) !!}
+            </div>
         </div>
-    </div>
 
-    <div class="col-md-6">
-        <div class="form-group">
-            {!! Form::label('Key') !!} {!! add_help('This is a unique name used to form the URL of the page. Only alphanumeric characters, dash and underscore (no spaces) can be used.') !!}
-            {!! Form::text('key', $page->key, ['class' => 'form-control']) !!}
+        <div class="col-md-6">
+            <div class="form-group">
+                {!! Form::label('Key') !!} {!! add_help('This is a unique name used to form the URL of the page. Only alphanumeric characters, dash and underscore (no spaces) can be used.') !!}
+                {!! Form::text('key', $page->key, ['class' => 'form-control']) !!}
+            </div>
         </div>
     </div>
-</div>
 
-<div class="form-group">
-    {!! Form::label('Page Content') !!}
-    {!! Form::textarea('text', $page->text, ['class' => 'form-control wysiwyg']) !!}
-</div>
+    <div class="form-group">
+        {!! Form::label('Page Content') !!}
+        {!! Form::textarea('text', $page->text, ['class' => 'form-control wysiwyg']) !!}
+    </div>
 
-<div class="row">
-    <div class="col-md-4">
-        <div class="form-group">
-            {!! Form::checkbox('is_visible', 1, $page->id ? $page->is_visible : 1, ['class' => 'form-check-input', 'data-toggle' => 'toggle']) !!}
-            {!! Form::label('is_visible', 'Is Viewable', ['class' => 'form-check-label ml-3']) !!} {!! add_help('If this is turned off, users will not be able to view the page even if they have the link to it.') !!}
+    <div class="row">
+        <div class="col-md-4">
+            <div class="form-group">
+                {!! Form::checkbox('is_visible', 1, $page->id ? $page->is_visible : 1, ['class' => 'form-check-input', 'data-toggle' => 'toggle']) !!}
+                {!! Form::label('is_visible', 'Is Viewable', ['class' => 'form-check-label ml-3']) !!} {!! add_help('If this is turned off, users will not be able to view the page even if they have the link to it.') !!}
+            </div>
         </div>
-    </div>
 
-    <div class="col-md-4">
-        <div class="form-group">
-            {!! Form::checkbox('can_comment', 1, $page->id ? $page->can_comment : 0, ['class' => 'form-check-input', 'data-toggle' => 'toggle']) !!}
-            {!! Form::label('can_comment', 'Commentable', ['class' => 'form-check-label ml-3']) !!} {!! add_help('If this is turned on, users will be able to comment on the page.') !!}
+        <div class="col-md-4">
+            <div class="form-group">
+                {!! Form::checkbox('can_comment', 1, $page->id ? $page->can_comment : 0, ['class' => 'form-check-input', 'data-toggle' => 'toggle']) !!}
+                {!! Form::label('can_comment', 'Commentable', ['class' => 'form-check-label ml-3']) !!} {!! add_help('If this is turned on, users will be able to comment on the page.') !!}
+            </div>
+            @if (!Settings::get('comment_dislikes_enabled'))
+                <div class="form-group">
+                    {!! Form::checkbox('allow_dislikes', 1, $page->id ? $page->allow_dislikes : 0, ['class' => 'form-check-input', 'data-toggle' => 'toggle']) !!}
+                    {!! Form::label('allow_dislikes', 'Allow Dislikes On Comments?', ['class' => 'form-check-label ml-3']) !!} {!! add_help('If this is turned off, users cannot dislike comments.') !!}
+                </div>
+            @endif
         </div>
     </div>
-</div>
-
-<div class="text-right">
-    {!! Form::submit($page->id ? 'Edit' : 'Create', ['class' => 'btn btn-primary']) !!}
-</div>
 
-{!! Form::close() !!}
+    <div class="text-right">
+        {!! Form::submit($page->id ? 'Edit' : 'Create', ['class' => 'btn btn-primary']) !!}
+    </div>
 
+    {!! Form::close() !!}
 @endsection
 
 @section('scripts')
-@parent
-<script>
-$( document ).ready(function() {    
-    $('.delete-page-button').on('click', function(e) {
-        e.preventDefault();
-        loadModal("{{ url('admin/pages/delete') }}/{{ $page->id }}", 'Delete Page');
-    });
-});
-    
-</script>
+    @parent
+    <script>
+        $(document).ready(function() {
+            $('.delete-page-button').on('click', function(e) {
+                e.preventDefault();
+                loadModal("{{ url('admin/pages/delete') }}/{{ $page->id }}", 'Delete Page');
+            });
+        });
+    </script>
 @endsection
diff --git a/resources/views/admin/pages/pages.blade.php b/resources/views/admin/pages/pages.blade.php
index eb535a85ad..aa3e2fa4b5 100644
--- a/resources/views/admin/pages/pages.blade.php
+++ b/resources/views/admin/pages/pages.blade.php
@@ -1,38 +1,60 @@
 @extends('admin.layout')
 
-@section('admin-title') Pages @endsection
+@section('admin-title')
+    Pages
+@endsection
 
 @section('admin-content')
-{!! breadcrumbs(['Admin Panel' => 'admin', 'Pages' => 'admin/pages']) !!}
-
-<h1>Pages</h1>
-
-<p>Here you can create pages with custom HTML content. By default, these pages are not linked to by any other page - if you would like users to look at the pages, you will need to link them manually (e.g. in the top navigation, footer, etc.). Certain important pages such as the terms of service and privacy policy cannot be deleted. You can, however, edit their names and visibility.</p>
-
-<div class="text-right mb-3"><a class="btn btn-primary" href="{{ url('admin/pages/create') }}"><i class="fas fa-plus"></i> Create New Page</a></div>
-@if(!count($pages))
-    <p>No pages found.</p>
-@else
-    {!! $pages->render() !!}
-      <div class="row ml-md-2">
-        <div class="d-flex row flex-wrap col-12 pb-1 px-0 ubt-bottom">
-          <div class="col-12 col-md-5 font-weight-bold">Title</div>
-          <div class="col-3 col-md-3 font-weight-bold">Key</div>
-          <div class="col-6 col-md-3 font-weight-bold">Last Edited</div>
-        </div>
-        @foreach($pages as $page)
-        <div class="d-flex row flex-wrap col-12 mt-1 pt-2 px-0 ubt-top">
-          <div class="col-12 col-md-5"><a href="{{ $page->url }}">{{ $page->title }}</a></div>
-          <div class="col-3 col-md-3">{{ $page->key }}</div>
-          <div class="col-6 col-md-3">{!! pretty_date($page->updated_at) !!}</div>
-          <div class="col-3 col-md-1 text-right"><a href="{{ url('admin/pages/edit/'.$page->id) }}" class="btn btn-primary py-0 px-2">Edit</a></div>
+    {!! breadcrumbs(['Admin Panel' => 'admin', 'Pages' => 'admin/pages']) !!}
+
+    <h1>Pages</h1>
+
+    <p>Here you can create pages with custom HTML content. By default, these pages are not linked to by any other page - if you would like users to look at the pages, you will need to link them manually (e.g. in the top navigation, footer, etc.). Certain
+        important pages such as the terms of service and privacy policy cannot be deleted. You can, however, edit their names and visibility.</p>
+
+    <div class="text-right mb-3"><a class="btn btn-primary" href="{{ url('admin/pages/create') }}"><i class="fas fa-plus"></i> Create New Page</a></div>
+    @if (!count($pages))
+        <p>No pages found.</p>
+    @else
+        {!! $pages->render() !!}
+        <div class="mb-4 logs-table">
+            <div class="logs-table-header">
+                <div class="row">
+                    <div class="col-12 col-md-5">
+                        <div class="logs-table-cell">Title</div>
+                    </div>
+                    <div class="col-3 col-md-3">
+                        <div class="logs-table-cell">Key</div>
+                    </div>
+                    <div class="col-6 col-md-3">
+                        <div class="logs-table-cell">Last Edited</div>
+                    </div>
+                </div>
+            </div>
+            <div class="logs-table-body">
+                @foreach ($pages as $page)
+                    <div class="logs-table-row">
+                        <div class="row flex-wrap">
+                            <div class="col-12 col-md-5">
+                                <div class="logs-table-cell"><a href="{{ $page->url }}">{{ $page->title }}</a></div>
+                            </div>
+                            <div class="col-3 col-md-3">
+                                <div class="logs-table-cell">{{ $page->key }}</div>
+                            </div>
+                            <div class="col-6 col-md-3">
+                                <div class="logs-table-cell">{!! pretty_date($page->updated_at) !!}</div>
+                            </div>
+                            <div class="col-3 col-md-1 text-right">
+                                <div class="logs-table-cell"><a href="{{ url('admin/pages/edit/' . $page->id) }}" class="btn btn-primary py-0 px-2">Edit</a></div>
+                            </div>
+                        </div>
+                    </div>
+                @endforeach
+            </div>
         </div>
-        @endforeach
-      </div>
-    {!! $pages->render() !!}
-
-    <div class="text-center mt-4 small text-muted">{{ $pages->total() }} result{{ $pages->total() == 1 ? '' : 's' }} found.</div>
+        {!! $pages->render() !!}
 
-@endif
+        <div class="text-center mt-4 small text-muted">{{ $pages->total() }} result{{ $pages->total() == 1 ? '' : 's' }} found.</div>
+    @endif
 
 @endsection
diff --git a/resources/views/admin/prompts/_delete_prompt.blade.php b/resources/views/admin/prompts/_delete_prompt.blade.php
index 5f97141022..c21b5a96de 100644
--- a/resources/views/admin/prompts/_delete_prompt.blade.php
+++ b/resources/views/admin/prompts/_delete_prompt.blade.php
@@ -1,5 +1,5 @@
-@if($prompt)
-    {!! Form::open(['url' => 'admin/data/prompts/delete/'.$prompt->id]) !!}
+@if ($prompt)
+    {!! Form::open(['url' => 'admin/data/prompts/delete/' . $prompt->id]) !!}
 
     <p>You are about to delete the prompt <strong>{{ $prompt->name }}</strong>. This is not reversible. If submissions exist under this prompt, you will not be able to delete it.</p>
     <p>Are you sure you want to delete <strong>{{ $prompt->name }}</strong>?</p>
@@ -9,6 +9,6 @@
     </div>
 
     {!! Form::close() !!}
-@else 
+@else
     Invalid prompt selected.
-@endif
\ No newline at end of file
+@endif
diff --git a/resources/views/admin/prompts/_delete_prompt_category.blade.php b/resources/views/admin/prompts/_delete_prompt_category.blade.php
index 7b83e67a94..ff7e558d25 100644
--- a/resources/views/admin/prompts/_delete_prompt_category.blade.php
+++ b/resources/views/admin/prompts/_delete_prompt_category.blade.php
@@ -1,5 +1,5 @@
-@if($category)
-    {!! Form::open(['url' => 'admin/data/prompt-categories/delete/'.$category->id]) !!}
+@if ($category)
+    {!! Form::open(['url' => 'admin/data/prompt-categories/delete/' . $category->id]) !!}
 
     <p>You are about to delete the category <strong>{{ $category->name }}</strong>. This is not reversible. If prompts in this category exist, you will not be able to delete this category.</p>
     <p>Are you sure you want to delete <strong>{{ $category->name }}</strong>?</p>
@@ -9,6 +9,6 @@
     </div>
 
     {!! Form::close() !!}
-@else 
+@else
     Invalid category selected.
-@endif
\ No newline at end of file
+@endif
diff --git a/resources/views/admin/prompts/create_edit_prompt.blade.php b/resources/views/admin/prompts/create_edit_prompt.blade.php
index 70f26df83e..c02c43672f 100644
--- a/resources/views/admin/prompts/create_edit_prompt.blade.php
+++ b/resources/views/admin/prompts/create_edit_prompt.blade.php
@@ -1,141 +1,144 @@
 @extends('admin.layout')
 
-@section('admin-title') Prompts @endsection
+@section('admin-title')
+    {{ $prompt->id ? 'Edit' : 'Create' }} Prompts
+@endsection
 
 @section('admin-content')
-{!! breadcrumbs(['Admin Panel' => 'admin', 'Prompts' => 'admin/data/prompts', ($prompt->id ? 'Edit' : 'Create').' Prompt' => $prompt->id ? 'admin/data/prompts/edit/'.$prompt->id : 'admin/data/prompts/create']) !!}
+    {!! breadcrumbs(['Admin Panel' => 'admin', 'Prompts' => 'admin/data/prompts', ($prompt->id ? 'Edit' : 'Create') . ' Prompt' => $prompt->id ? 'admin/data/prompts/edit/' . $prompt->id : 'admin/data/prompts/create']) !!}
 
-<h1>{{ $prompt->id ? 'Edit' : 'Create' }} Prompt
-    @if($prompt->id)
-        <a href="#" class="btn btn-danger float-right delete-prompt-button">Delete Prompt</a>
-    @endif
-</h1>
+    <h1>{{ $prompt->id ? 'Edit' : 'Create' }} Prompt
+        @if ($prompt->id)
+            <a href="#" class="btn btn-danger float-right delete-prompt-button">Delete Prompt</a>
+        @endif
+    </h1>
 
-{!! Form::open(['url' => $prompt->id ? 'admin/data/prompts/edit/'.$prompt->id : 'admin/data/prompts/create', 'files' => true]) !!}
+    {!! Form::open(['url' => $prompt->id ? 'admin/data/prompts/edit/' . $prompt->id : 'admin/data/prompts/create', 'files' => true]) !!}
 
-<h3>Basic Information</h3>
+    <h3>Basic Information</h3>
 
-<div class="row">
-    <div class="col-md-8">
-        <div class="form-group">
-            {!! Form::label('Name') !!}
-            {!! Form::text('name', $prompt->name, ['class' => 'form-control']) !!}
+    <div class="row">
+        <div class="col-md-8">
+            <div class="form-group">
+                {!! Form::label('Name') !!}
+                {!! Form::text('name', $prompt->name, ['class' => 'form-control']) !!}
+            </div>
         </div>
-    </div>
-    <div class="col-md">
-        <div class="form-group">
-            {!! Form::label('Prefix (Optional)') !!} {!! add_help('This is used to label submissions associated with this prompt in the gallery.') !!}
-            {!! Form::text('prefix', $prompt->prefix, ['class' => 'form-control']) !!}
+        <div class="col-md">
+            <div class="form-group">
+                {!! Form::label('Prefix (Optional)') !!} {!! add_help('This is used to label submissions associated with this prompt in the gallery.') !!}
+                {!! Form::text('prefix', $prompt->prefix, ['class' => 'form-control']) !!}
+            </div>
         </div>
     </div>
-</div>
-
-<div class="form-group">
-    {!! Form::label('World Page Image (Optional)') !!} {!! add_help('This image is used only on the world information pages.') !!}
-    <div>{!! Form::file('image') !!}</div>
-    <div class="text-muted">Recommended size: 100px x 100px</div>
-    @if($prompt->has_image)
-        <div class="form-check">
-            {!! Form::checkbox('remove_image', 1, false, ['class' => 'form-check-input']) !!}
-            {!! Form::label('remove_image', 'Remove current image', ['class' => 'form-check-label']) !!}
-        </div>
-    @endif
-</div>
-
-<div class="form-group">
-    {!! Form::label('Prompt Category (Optional)') !!}
-    {!! Form::select('prompt_category_id', $categories, $prompt->prompt_category_id, ['class' => 'form-control']) !!}
-</div>
-
-<div class="form-group">
-    {!! Form::label('Summary (Optional)') !!} {!! add_help('This is a short blurb that shows up on the consolidated prompts page. HTML cannot be used here.') !!}
-    {!! Form::text('summary', $prompt->summary, ['class' => 'form-control', 'maxLength' => 250]) !!}
-</div>
-
-<div class="form-group">
-    {!! Form::label('Description (Optional)') !!} {!! add_help('This is a full description of the prompt that shows up on the full prompt page.') !!}
-    {!! Form::textarea('description', $prompt->description, ['class' => 'form-control wysiwyg']) !!}
-</div>
-
-<div class="row">
-    <div class="col-md-6">
-        <div class="form-group">
-            {!! Form::label('start_at', 'Start Time (Optional)') !!} {!! add_help('Prompts cannot be submitted to the queue before the starting time.') !!}
-            {!! Form::text('start_at', $prompt->start_at, ['class' => 'form-control datepicker']) !!}
-        </div>
+
+    <div class="form-group">
+        {!! Form::label('World Page Image (Optional)') !!} {!! add_help('This image is used only on the world information pages.') !!}
+        <div>{!! Form::file('image') !!}</div>
+        <div class="text-muted">Recommended size: 100px x 100px</div>
+        @if ($prompt->has_image)
+            <div class="form-check">
+                {!! Form::checkbox('remove_image', 1, false, ['class' => 'form-check-input']) !!}
+                {!! Form::label('remove_image', 'Remove current image', ['class' => 'form-check-label']) !!}
+            </div>
+        @endif
     </div>
-    <div class="col-md-6">
-        <div class="form-group">
-            {!! Form::label('end_at', 'End Time (Optional)') !!} {!! add_help('Prompts cannot be submitted to the queue after the ending time.') !!}
-            {!! Form::text('end_at', $prompt->end_at, ['class' => 'form-control datepicker']) !!}
-        </div>
+
+    <div class="form-group">
+        {!! Form::label('Prompt Category (Optional)') !!}
+        {!! Form::select('prompt_category_id', $categories, $prompt->prompt_category_id, ['class' => 'form-control']) !!}
     </div>
-</div>
 
-<div class="row">
-    <div class="col-md-6">
-        <div class="form-group">
-            {!! Form::checkbox('hide_before_start', 1, $prompt->id ? $prompt->hide_before_start : 0, ['class' => 'form-check-input', 'data-toggle' => 'toggle']) !!}
-            {!! Form::label('hide_before_start', 'Hide Before Start Time', ['class' => 'form-check-label ml-3']) !!} {!! add_help('If hidden, the prompt will not be shown on the prompt list before the starting time is reached. A starting time needs to be set.') !!}
-        </div>
+    <div class="form-group">
+        {!! Form::label('Summary (Optional)') !!} {!! add_help('This is a short blurb that shows up on the consolidated prompts page. HTML cannot be used here.') !!}
+        {!! Form::text('summary', $prompt->summary, ['class' => 'form-control', 'maxLength' => 250]) !!}
     </div>
-    <div class="col-md-6">
-        <div class="form-group">
-            {!! Form::checkbox('hide_after_end', 1, $prompt->id ? $prompt->hide_after_end : 0, ['class' => 'form-check-input', 'data-toggle' => 'toggle']) !!}
-            {!! Form::label('hide_after_end', 'Hide After End Time', ['class' => 'form-check-label ml-3']) !!} {!! add_help('If hidden, the prompt will not be shown on the prompt list after the ending time is reached. An end time needs to be set.') !!}
+
+    <div class="form-group">
+        {!! Form::label('Description (Optional)') !!} {!! add_help('This is a full description of the prompt that shows up on the full prompt page.') !!}
+        {!! Form::textarea('description', $prompt->description, ['class' => 'form-control wysiwyg']) !!}
+    </div>
+
+    <div class="row">
+        <div class="col-md-6">
+            <div class="form-group">
+                {!! Form::label('start_at', 'Start Time (Optional)') !!} {!! add_help('Prompts cannot be submitted to the queue before the starting time.') !!}
+                {!! Form::text('start_at', $prompt->start_at, ['class' => 'form-control datepicker']) !!}
+            </div>
+        </div>
+        <div class="col-md-6">
+            <div class="form-group">
+                {!! Form::label('end_at', 'End Time (Optional)') !!} {!! add_help('Prompts cannot be submitted to the queue after the ending time.') !!}
+                {!! Form::text('end_at', $prompt->end_at, ['class' => 'form-control datepicker']) !!}
+            </div>
         </div>
     </div>
-</div>
 
-<div class="form-group">
-    {!! Form::checkbox('is_active', 1, $prompt->id ? $prompt->is_active : 1, ['class' => 'form-check-input', 'data-toggle' => 'toggle']) !!}
-    {!! Form::label('is_active', 'Is Active', ['class' => 'form-check-label ml-3']) !!} {!! add_help('Prompts that are not active will be hidden from the prompt list. The start/end time hide settings override this setting, i.e. if this is set to active, it will still be hidden outside of the start/end times.') !!}
-</div>
+    <div class="row">
+        <div class="col-md-6">
+            <div class="form-group">
+                {!! Form::checkbox('hide_before_start', 1, $prompt->id ? $prompt->hide_before_start : 0, ['class' => 'form-check-input', 'data-toggle' => 'toggle']) !!}
+                {!! Form::label('hide_before_start', 'Hide Before Start Time', ['class' => 'form-check-label ml-3']) !!} {!! add_help('If hidden, the prompt will not be shown on the prompt list before the starting time is reached. A starting time needs to be set.') !!}
+            </div>
+        </div>
+        <div class="col-md-6">
+            <div class="form-group">
+                {!! Form::checkbox('hide_after_end', 1, $prompt->id ? $prompt->hide_after_end : 0, ['class' => 'form-check-input', 'data-toggle' => 'toggle']) !!}
+                {!! Form::label('hide_after_end', 'Hide After End Time', ['class' => 'form-check-label ml-3']) !!} {!! add_help('If hidden, the prompt will not be shown on the prompt list after the ending time is reached. An end time needs to be set.') !!}
+            </div>
+        </div>
+        <div class="col-md-6">
+            <div class="form-group">
+                {!! Form::checkbox('is_active', 1, $prompt->id ? $prompt->is_active : 1, ['class' => 'form-check-input', 'data-toggle' => 'toggle']) !!}
+                {!! Form::label('is_active', 'Is Active', ['class' => 'form-check-label ml-3']) !!} {!! add_help('Prompts that are not active will be hidden from the prompt list. The start/end time hide settings override this setting, i.e. if this is set to active, it will still be hidden outside of the start/end times.') !!}
+            </div>
+        </div>
+        <div class="col-md-6">
+            <div class="form-group">
+                {!! Form::checkbox('staff_only', 1, $prompt->id ? $prompt->staff_only : 0, ['class' => 'form-check-input', 'data-toggle' => 'toggle']) !!}
+                {!! Form::label('staff_only', 'Staff Only', ['class' => 'form-check-label ml-3']) !!} {!! add_help('If this is set, the prompt will only be visible to staff, and only they will be able to submit to it.') !!}
+            </div>
+        </div>
+    </div>
 
-<div class="form-group">
-    {!! Form::label('Hide Submissions (Optional)') !!} {!! add_help('Hide submissions to this prompt until the prompt ends, or forever. <strong>Hiding until the prompt ends requires a set end time.</strong>') !!}
-    {!! Form::select('hide_submissions', [0 => 'Submissions Visible After Approval', 1 => 'Hide Submissions Until Prompt Ends', 2 => 'Hide Submissions Always'], $prompt->hide_submissions, ['class' => 'form-control']) !!}
-</div>
+    <div class="form-group">
+        {!! Form::label('Hide Submissions (Optional)') !!} {!! add_help('Hide submissions to this prompt until the prompt ends, or forever. <strong>Hiding until the prompt ends requires a set end time.</strong>') !!}
+        {!! Form::select('hide_submissions', [0 => 'Submissions Visible After Approval', 1 => 'Hide Submissions Until Prompt Ends', 2 => 'Hide Submissions Always'], $prompt->hide_submissions, ['class' => 'form-control']) !!}
+    </div>
 
-<h3>Rewards</h3>
-<p>Rewards are credited on a per-user basis. Mods are able to modify the specific rewards granted at approval time.</p>
-<p>You can add loot tables containing any kind of currencies (both user- and character-attached), but be sure to keep track of which are being distributed! Character-only currencies cannot be given to users.</p>
-@include('widgets._loot_select', ['loots' => $prompt->rewards, 'showLootTables' => true, 'showRaffles' => true])
+    <h3>Rewards</h3>
+    <p>Rewards are credited on a per-user basis. Mods are able to modify the specific rewards granted at approval time.</p>
+    <p>You can add loot tables containing any kind of currencies (both user- and character-attached), but be sure to keep track of which are being distributed! Character-only currencies cannot be given to users.</p>
+    @include('widgets._loot_select', ['loots' => $prompt->rewards, 'showLootTables' => true, 'showRaffles' => true])
 
-<div class="text-right">
-    {!! Form::submit($prompt->id ? 'Edit' : 'Create', ['class' => 'btn btn-primary']) !!}
-</div>
+    <div class="text-right">
+        {!! Form::submit($prompt->id ? 'Edit' : 'Create', ['class' => 'btn btn-primary']) !!}
+    </div>
 
-{!! Form::close() !!}
+    {!! Form::close() !!}
 
-@include('widgets._loot_select_row', ['items' => $items, 'currencies' => $currencies, 'tables' => $tables, 'raffles' => $raffles, 'showLootTables' => true, 'showRaffles' => true])
+    @include('widgets._loot_select_row', ['showLootTables' => true, 'showRaffles' => true])
 
-@if($prompt->id)
-    <h3>Preview</h3>
-    <div class="card mb-3">
-        <div class="card-body">
-            @include('prompts._prompt_entry', ['prompt' => $prompt])
+    @if ($prompt->id)
+        <h3>Preview</h3>
+        <div class="card mb-3">
+            <div class="card-body">
+                @include('prompts._prompt_entry', ['prompt' => $prompt])
+            </div>
         </div>
-    </div>
-@endif
-
+    @endif
 @endsection
 
 @section('scripts')
-@parent
-@include('js._loot_js', ['showLootTables' => true, 'showRaffles' => true])
-<script>
-$( document ).ready(function() {    
-    $('.delete-prompt-button').on('click', function(e) {
-        e.preventDefault();
-        loadModal("{{ url('admin/data/prompts/delete') }}/{{ $prompt->id }}", 'Delete Prompt');
-    });
-    
-    $( ".datepicker" ).datetimepicker({
-        dateFormat: "yy-mm-dd",
-        timeFormat: 'HH:mm:ss',
-    });
-});
-    
-</script>
-@endsection
\ No newline at end of file
+    @parent
+    @include('js._loot_js', ['showLootTables' => true, 'showRaffles' => true])
+    @include('widgets._datetimepicker_js')
+    <script>
+        $(document).ready(function() {
+            $('.delete-prompt-button').on('click', function(e) {
+                e.preventDefault();
+                loadModal("{{ url('admin/data/prompts/delete') }}/{{ $prompt->id }}", 'Delete Prompt');
+            });
+        });
+    </script>
+@endsection
diff --git a/resources/views/admin/prompts/create_edit_prompt_category.blade.php b/resources/views/admin/prompts/create_edit_prompt_category.blade.php
index 171cb01489..f13c417bfb 100644
--- a/resources/views/admin/prompts/create_edit_prompt_category.blade.php
+++ b/resources/views/admin/prompts/create_edit_prompt_category.blade.php
@@ -1,68 +1,72 @@
 @extends('admin.layout')
 
-@section('admin-title') Prompt Categories @endsection
+@section('admin-title')
+    {{ $category->id ? 'Edit' : 'Create' }} Prompt Category
+@endsection
 
 @section('admin-content')
-{!! breadcrumbs(['Admin Panel' => 'admin', 'Prompt Categories' => 'admin/data/prompt-categories', ($category->id ? 'Edit' : 'Create').' Category' => $category->id ? 'admin/data/prompt-categories/edit/'.$category->id : 'admin/data/prompt-categories/create']) !!}
+    {!! breadcrumbs([
+        'Admin Panel' => 'admin',
+        'Prompt Categories' => 'admin/data/prompt-categories',
+        ($category->id ? 'Edit' : 'Create') . ' Category' => $category->id ? 'admin/data/prompt-categories/edit/' . $category->id : 'admin/data/prompt-categories/create',
+    ]) !!}
 
-<h1>{{ $category->id ? 'Edit' : 'Create' }} Category
-    @if($category->id)
-        <a href="#" class="btn btn-danger float-right delete-category-button">Delete Category</a>
-    @endif
-</h1>
+    <h1>{{ $category->id ? 'Edit' : 'Create' }} Prompt Category
+        @if ($category->id)
+            <a href="#" class="btn btn-danger float-right delete-category-button">Delete Category</a>
+        @endif
+    </h1>
 
-{!! Form::open(['url' => $category->id ? 'admin/data/prompt-categories/edit/'.$category->id : 'admin/data/prompt-categories/create', 'files' => true]) !!}
+    {!! Form::open(['url' => $category->id ? 'admin/data/prompt-categories/edit/' . $category->id : 'admin/data/prompt-categories/create', 'files' => true]) !!}
 
-<h3>Basic Information</h3>
+    <h3>Basic Information</h3>
 
-<div class="form-group">
-    {!! Form::label('Name') !!}
-    {!! Form::text('name', $category->name, ['class' => 'form-control']) !!}
-</div>
+    <div class="form-group">
+        {!! Form::label('Name') !!}
+        {!! Form::text('name', $category->name, ['class' => 'form-control']) !!}
+    </div>
 
-<div class="form-group">
-    {!! Form::label('World Page Image (Optional)') !!} {!! add_help('This image is used only on the world information pages.') !!}
-    <div>{!! Form::file('image') !!}</div>
-    <div class="text-muted">Recommended size: 200px x 200px</div>
-    @if($category->has_image)
-        <div class="form-check">
-            {!! Form::checkbox('remove_image', 1, false, ['class' => 'form-check-input']) !!}
-            {!! Form::label('remove_image', 'Remove current image', ['class' => 'form-check-label']) !!}
-        </div>
-    @endif
-</div>
+    <div class="form-group">
+        {!! Form::label('World Page Image (Optional)') !!} {!! add_help('This image is used only on the world information pages.') !!}
+        <div>{!! Form::file('image') !!}</div>
+        <div class="text-muted">Recommended size: 200px x 200px</div>
+        @if ($category->has_image)
+            <div class="form-check">
+                {!! Form::checkbox('remove_image', 1, false, ['class' => 'form-check-input']) !!}
+                {!! Form::label('remove_image', 'Remove current image', ['class' => 'form-check-label']) !!}
+            </div>
+        @endif
+    </div>
 
-<div class="form-group">
-    {!! Form::label('Description (Optional)') !!}
-    {!! Form::textarea('description', $category->description, ['class' => 'form-control wysiwyg']) !!}
-</div>
+    <div class="form-group">
+        {!! Form::label('Description (Optional)') !!}
+        {!! Form::textarea('description', $category->description, ['class' => 'form-control wysiwyg']) !!}
+    </div>
 
-<div class="text-right">
-    {!! Form::submit($category->id ? 'Edit' : 'Create', ['class' => 'btn btn-primary']) !!}
-</div>
+    <div class="text-right">
+        {!! Form::submit($category->id ? 'Edit' : 'Create', ['class' => 'btn btn-primary']) !!}
+    </div>
 
-{!! Form::close() !!}
+    {!! Form::close() !!}
 
-@if($category->id)
-    <h3>Preview</h3>
-    <div class="card mb-3">
-        <div class="card-body">
-            @include('prompts._entry', ['imageUrl' => $category->categoryImageUrl, 'name' => $category->displayName, 'description' => $category->parsed_description])
+    @if ($category->id)
+        <h3>Preview</h3>
+        <div class="card mb-3">
+            <div class="card-body">
+                @include('prompts._entry', ['imageUrl' => $category->categoryImageUrl, 'name' => $category->displayName, 'description' => $category->parsed_description])
+            </div>
         </div>
-    </div>
-@endif
-
+    @endif
 @endsection
 
 @section('scripts')
-@parent
-<script>
-$( document ).ready(function() {    
-    $('.delete-category-button').on('click', function(e) {
-        e.preventDefault();
-        loadModal("{{ url('admin/data/prompt-categories/delete') }}/{{ $category->id }}", 'Delete Category');
-    });
-});
-    
-</script>
-@endsection
\ No newline at end of file
+    @parent
+    <script>
+        $(document).ready(function() {
+            $('.delete-category-button').on('click', function(e) {
+                e.preventDefault();
+                loadModal("{{ url('admin/data/prompt-categories/delete') }}/{{ $category->id }}", 'Delete Category');
+            });
+        });
+    </script>
+@endsection
diff --git a/resources/views/admin/prompts/prompt_categories.blade.php b/resources/views/admin/prompts/prompt_categories.blade.php
index 7fd87ee8b3..563bf39470 100644
--- a/resources/views/admin/prompts/prompt_categories.blade.php
+++ b/resources/views/admin/prompts/prompt_categories.blade.php
@@ -1,65 +1,71 @@
 @extends('admin.layout')
 
-@section('admin-title') Prompt Categories @endsection
+@section('admin-title')
+    Prompt Categories
+@endsection
 
 @section('admin-content')
-{!! breadcrumbs(['Admin Panel' => 'admin', 'Prompt Categories' => 'admin/data/prompt-categories']) !!}
+    {!! breadcrumbs(['Admin Panel' => 'admin', 'Prompt Categories' => 'admin/data/prompt-categories']) !!}
 
-<h1>Prompt Categories</h1>
+    <h1>Prompt Categories</h1>
 
-<p>This is a list of prompt categories that will be used to classify prompts on the prompts page. Creating prompt categories is entirely optional, but recommended if you need to sort prompts for mod work division, for example. The submission approval queue page can be sorted by prompt category.</p> 
-<p>The sorting order reflects the order in which the prompt categories will be displayed on the prompts page.</p>
+    <p>This is a list of prompt categories that will be used to classify prompts on the prompts page. Creating prompt categories is entirely optional, but recommended if you need to sort prompts for mod work division, for example. The submission approval
+        queue page can be sorted by prompt category.</p>
+    <p>The sorting order reflects the order in which the prompt categories will be displayed on the prompts page.</p>
 
-<div class="text-right mb-3"><a class="btn btn-primary" href="{{ url('admin/data/prompt-categories/create') }}"><i class="fas fa-plus"></i> Create New Prompt Category</a></div>
-@if(!count($categories))
-    <p>No prompt categories found.</p>
-@else 
-    <table class="table table-sm category-table">
-        <tbody id="sortable" class="sortable">
-            @foreach($categories as $category)
-                <tr class="sort-prompt" data-id="{{ $category->id }}">
-                    <td>
-                        <a class="fas fa-arrows-alt-v handle mr-3" href="#"></a>
-                        {!! $category->displayName !!}
-                    </td>
-                    <td class="text-right">
-                        <a href="{{ url('admin/data/prompt-categories/edit/'.$category->id) }}" class="btn btn-primary">Edit</a>
-                    </td>
-                </tr>
-            @endforeach
-        </tbody>
+    <div class="text-right mb-3"><a class="btn btn-primary" href="{{ url('admin/data/prompt-categories/create') }}"><i class="fas fa-plus"></i> Create New Prompt Category</a></div>
+    @if (!count($categories))
+        <p>No prompt categories found.</p>
+    @else
+        <table class="table table-sm category-table">
+            <tbody id="sortable" class="sortable">
+                @foreach ($categories as $category)
+                    <tr class="sort-prompt" data-id="{{ $category->id }}">
+                        <td>
+                            <a class="fas fa-arrows-alt-v handle mr-3" href="#"></a>
+                            {!! $category->displayName !!}
+                        </td>
+                        <td class="text-right">
+                            <a href="{{ url('admin/data/prompt-categories/edit/' . $category->id) }}" class="btn btn-primary">Edit</a>
+                        </td>
+                    </tr>
+                @endforeach
+            </tbody>
 
-    </table>
-    <div class="mb-4">
-        {!! Form::open(['url' => 'admin/data/prompt-categories/sort']) !!}
-        {!! Form::hidden('sort', '', ['id' => 'sortableOrder']) !!}
-        {!! Form::submit('Save Order', ['class' => 'btn btn-primary']) !!}
-        {!! Form::close() !!}
-    </div>
-@endif
+        </table>
+        <div class="mb-4">
+            {!! Form::open(['url' => 'admin/data/prompt-categories/sort']) !!}
+            {!! Form::hidden('sort', '', ['id' => 'sortableOrder']) !!}
+            {!! Form::submit('Save Order', ['class' => 'btn btn-primary']) !!}
+            {!! Form::close() !!}
+        </div>
+    @endif
 
 @endsection
 
 @section('scripts')
-@parent
-<script>
-
-$( document ).ready(function() {
-    $('.handle').on('click', function(e) {
-        e.preventDefault();
-    });
-    $( "#sortable" ).sortable({
-        prompts: '.sort-prompt',
-        handle: ".handle",
-        placeholder: "sortable-placeholder",
-        stop: function( event, ui ) {
-            $('#sortableOrder').val($(this).sortable("toArray", {attribute:"data-id"}));
-        },
-        create: function() {
-            $('#sortableOrder').val($(this).sortable("toArray", {attribute:"data-id"}));
-        }
-    });
-    $( "#sortable" ).disableSelection();
-});
-</script>
-@endsection
\ No newline at end of file
+    @parent
+    <script>
+        $(document).ready(function() {
+            $('.handle').on('click', function(e) {
+                e.preventDefault();
+            });
+            $("#sortable").sortable({
+                prompts: '.sort-prompt',
+                handle: ".handle",
+                placeholder: "sortable-placeholder",
+                stop: function(event, ui) {
+                    $('#sortableOrder').val($(this).sortable("toArray", {
+                        attribute: "data-id"
+                    }));
+                },
+                create: function() {
+                    $('#sortableOrder').val($(this).sortable("toArray", {
+                        attribute: "data-id"
+                    }));
+                }
+            });
+            $("#sortable").disableSelection();
+        });
+    </script>
+@endsection
diff --git a/resources/views/admin/prompts/prompts.blade.php b/resources/views/admin/prompts/prompts.blade.php
index 94af0e229d..988ed3eccf 100644
--- a/resources/views/admin/prompts/prompts.blade.php
+++ b/resources/views/admin/prompts/prompts.blade.php
@@ -1,75 +1,104 @@
 @extends('admin.layout')
 
-@section('admin-title') Prompts @endsection
+@section('admin-title')
+    Prompts
+@endsection
 
 @section('admin-content')
-{!! breadcrumbs(['Admin Panel' => 'admin', 'Prompts' => 'admin/data/prompts']) !!}
+    {!! breadcrumbs(['Admin Panel' => 'admin', 'Prompts' => 'admin/data/prompts']) !!}
 
-<h1>Prompts</h1>
+    <h1>Prompts</h1>
 
-<p>This is a list of prompts users can submit to.</p>
+    <p>This is a list of prompts users can submit to.</p>
 
-<div class="text-right mb-3">
-    <a class="btn btn-primary" href="{{ url('admin/data/prompt-categories') }}"><i class="fas fa-folder"></i> Prompt Categories</a>
-    <a class="btn btn-primary" href="{{ url('admin/data/prompts/create') }}"><i class="fas fa-plus"></i> Create New Prompt</a>
-</div>
+    <div class="text-right mb-3">
+        <a class="btn btn-primary" href="{{ url('admin/data/prompt-categories') }}"><i class="fas fa-folder"></i> Prompt Categories</a>
+        <a class="btn btn-primary" href="{{ url('admin/data/prompts/create') }}"><i class="fas fa-plus"></i> Create New Prompt</a>
+    </div>
 
-<div>
-    {!! Form::open(['method' => 'GET', 'class' => 'form-inline justify-content-end']) !!}
+    <div>
+        {!! Form::open(['method' => 'GET', 'class' => 'form-inline justify-content-end']) !!}
         <div class="form-group mr-3 mb-3">
             {!! Form::text('name', Request::get('name'), ['class' => 'form-control', 'placeholder' => 'Name']) !!}
         </div>
         <div class="form-group mr-3 mb-3">
-            {!! Form::select('prompt_category_id', $categories, Request::get('name'), ['class' => 'form-control']) !!}
+            {!! Form::select('prompt_category_id', $categories, Request::get('prompt_category_id'), ['class' => 'form-control']) !!}
         </div>
         <div class="form-group mb-3">{!! Form::submit('Search', ['class' => 'btn btn-primary']) !!}</div>
-    {!! Form::close() !!}
-</div>
-
-@if(!count($prompts))
-    <p>No prompts found.</p>
-@else
-    {!! $prompts->render() !!}
+        {!! Form::close() !!}
+    </div>
 
-    <div class="row ml-md-2">
-      <div class="d-flex row flex-wrap col-12 pb-1 px-0 ubt-bottom">
-        <div class="col-4 col-md-1 font-weight-bold">Active</div>
-        <div class="col-4 col-md-3 font-weight-bold">Name</div>
-        <div class="col-4 col-md-3 font-weight-bold">Category</div>
-        <div class="col-4 col-md-2 font-weight-bold">Starts</div>
-        <div class="col-4 col-md-2 font-weight-bold">Ends</div>
-      </div>
-      @foreach($prompts as $prompt)
-      <div class="d-flex row flex-wrap col-12 mt-1 pt-2 px-0 ubt-top">
-        <div class="col-2 col-md-1">
-          {!! $prompt->is_active ? '<i class="text-success fas fa-check"></i>' : '' !!}
-        </div>
-        <div class="col-5 col-md-3 text-truncate">
-          {{ $prompt->name }}
+    @if (!count($prompts))
+        <p>No prompts found.</p>
+    @else
+        {!! $prompts->render() !!}
+        <div class="mb-4 logs-table">
+            <div class="logs-table-header">
+                <div class="row">
+                    <div class="col-4 col-md-1">
+                        <div class="logs-table-cell">Active</div>
+                    </div>
+                    <div class="col-4 col-md-3">
+                        <div class="logs-table-cell">Name</div>
+                    </div>
+                    <div class="col-4 col-md-3">
+                        <div class="logs-table-cell">Category</div>
+                    </div>
+                    <div class="col-4 col-md-2">
+                        <div class="logs-table-cell">Starts</div>
+                    </div>
+                    <div class="col-4 col-md-2">
+                        <div class="logs-table-cell">Ends</div>
+                    </div>
+                </div>
+            </div>
+            <div class="logs-table-body">
+                @foreach ($prompts as $prompt)
+                    <div class="logs-table-row">
+                        <div class="row flex-wrap">
+                            <div class="col-2 col-md-1">
+                                <div class="logs-table-cell">
+                                    {!! $prompt->is_active ? '<i class="text-success fas fa-check"></i>' : '' !!}
+                                </div>
+                            </div>
+                            <div class="col-5 col-md-3 text-truncate">
+                                <div class="logs-table-cell">
+                                    {{ $prompt->name }}
+                                </div>
+                            </div>
+                            <div class="col-5 col-md-3">
+                                <div class="logs-table-cell">
+                                    {{ $prompt->category ? $prompt->category->name : '-' }}
+                                </div>
+                            </div>
+                            <div class="col-4 col-md-2">
+                                <div class="logs-table-cell">
+                                    {!! $prompt->start_at ? pretty_date($prompt->start_at) : '-' !!}
+                                </div>
+                            </div>
+                            <div class="col-4 col-md-2">
+                                <div class="logs-table-cell">
+                                    {!! $prompt->end_at ? pretty_date($prompt->end_at) : '-' !!}
+                                </div>
+                            </div>
+                            <div class="col-3 col-md-1 text-right">
+                                <div class="logs-table-cell">
+                                    <a href="{{ url('admin/data/prompts/edit/' . $prompt->id) }}" class="btn btn-primary py-0 px-2">Edit</a>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                @endforeach
+            </div>
         </div>
-        <div class="col-5 col-md-3">
-          {{ $prompt->category ? $prompt->category->name : '-' }}
-        </div>
-        <div class="col-4 col-md-2">
-          {!! $prompt->start_at ? pretty_date($prompt->start_at) : '-' !!}
-        </div>
-        <div class="col-4 col-md-2">
-          {!! $prompt->end_at ? pretty_date($prompt->end_at) : '-' !!}
-        </div>
-        <div class="col-3 col-md-1 text-right">
-          <a href="{{ url('admin/data/prompts/edit/'.$prompt->id) }}"  class="btn btn-primary py-0 px-2">Edit</a>
-        </div>
-      </div>
-      @endforeach
-    </div>
 
-    {!! $prompts->render() !!}
+        {!! $prompts->render() !!}
 
-    <div class="text-center mt-4 small text-muted">{{ $prompts->total() }} result{{ $prompts->total() == 1 ? '' : 's' }} found.</div>
-@endif
+        <div class="text-center mt-4 small text-muted">{{ $prompts->total() }} result{{ $prompts->total() == 1 ? '' : 's' }} found.</div>
+    @endif
 
 @endsection
 
 @section('scripts')
-@parent
+    @parent
 @endsection
diff --git a/resources/views/admin/raffle/_group_create_edit.blade.php b/resources/views/admin/raffle/_group_create_edit.blade.php
index b9f79aa1d2..b19ba224df 100644
--- a/resources/views/admin/raffle/_group_create_edit.blade.php
+++ b/resources/views/admin/raffle/_group_create_edit.blade.php
@@ -1,20 +1,20 @@
-@if(!$group->id)
+@if (!$group->id)
     <p>
         Raffle groups allow you to create sets of raffles that can be rolled in sequence. Users that have won something in a previous raffle will be removed from later raffles (so users will not be able to win more than once in a group).
     </p>
 @endif
-{!! Form::open(['url' => 'admin/raffles/edit/group/'.($group->id ? : '')]) !!}
-    <div class="form-group">
-        {!! Form::label('name', 'Group Name') !!} {!! add_help('This is the name of the raffle group (does not have to be unique), e.g. July Monthly Raffles, Event Guest Sales') !!}
-        {!! Form::text('name', $group->name, ['class' => 'form-control']) !!}
-    </div>
-    <div class="form-group">
-        <label class="control-label">
-            {!! Form::checkbox('is_active', 1, $group->is_active, ['class' => 'form-check-input mr-2', 'data-toggle' => 'toggle']) !!}
-            {!! Form::label('is_active', 'Active (visible to users)', ['class' => 'form-check-label ml-3']) !!} {!! add_help('This setting will cascade to any raffles in this group (setting the group to active will set the raffles within it to active and vice versa). Not retroactive.') !!}
-        </label>
-    </div>
-    <div class="text-right">
-        {!! Form::submit('Confirm', ['class' => 'btn btn-primary']) !!}
-    </div>
-{!! Form::close() !!}
\ No newline at end of file
+{!! Form::open(['url' => 'admin/raffles/edit/group/' . ($group->id ?: '')]) !!}
+<div class="form-group">
+    {!! Form::label('name', 'Group Name') !!} {!! add_help('This is the name of the raffle group (does not have to be unique), e.g. July Monthly Raffles, Event Guest Sales') !!}
+    {!! Form::text('name', $group->name, ['class' => 'form-control']) !!}
+</div>
+<div class="form-group">
+    <label class="control-label">
+        {!! Form::checkbox('is_active', 1, $group->is_active, ['class' => 'form-check-input mr-2', 'data-toggle' => 'toggle']) !!}
+        {!! Form::label('is_active', 'Active (visible to users)', ['class' => 'form-check-label ml-3']) !!} {!! add_help('This setting will cascade to any raffles in this group (setting the group to active will set the raffles within it to active and vice versa). Not retroactive.') !!}
+    </label>
+</div>
+<div class="text-right">
+    {!! Form::submit('Confirm', ['class' => 'btn btn-primary']) !!}
+</div>
+{!! Form::close() !!}
diff --git a/resources/views/admin/raffle/_group_roll.blade.php b/resources/views/admin/raffle/_group_roll.blade.php
index 984f08ff45..6a8275a998 100644
--- a/resources/views/admin/raffle/_group_roll.blade.php
+++ b/resources/views/admin/raffle/_group_roll.blade.php
@@ -1,10 +1,10 @@
 @if ($group->is_active < 2)
     <div class="text-center">
         <p>This will roll all the raffles in the group <strong>{{ $group->name }}</strong>. Winners of raffles that come first will be excluded from later raffles.</p>
-        {!! Form::open(['url' => 'admin/raffles/roll/group/'.$group->id]) !!}
+        {!! Form::open(['url' => 'admin/raffles/roll/group/' . $group->id]) !!}
         {!! Form::submit('Roll!', ['class' => 'btn btn-primary']) !!}
         {!! Form::close() !!}
     </div>
 @else
     <div class="text-center">This set of raffles has already been completed.</div>
-@endif
\ No newline at end of file
+@endif
diff --git a/resources/views/admin/raffle/_raffle_create_edit.blade.php b/resources/views/admin/raffle/_raffle_create_edit.blade.php
index 50ceb5145f..2921484570 100644
--- a/resources/views/admin/raffle/_raffle_create_edit.blade.php
+++ b/resources/views/admin/raffle/_raffle_create_edit.blade.php
@@ -1,32 +1,36 @@
-@if(!$raffle->id)
+@if (!$raffle->id)
     <p>
         Enter basic information about this raffle. Tickets can be added after the raffle is created.
     </p>
 @endif
-{!! Form::open(['url' => 'admin/raffles/edit/raffle/'.($raffle->id ? : '')]) !!}
-    <div class="form-group">
-        {!! Form::label('name', 'Raffle Name') !!} {!! add_help('This is the name of the raffle. Naming it something after what is being raffled is suggested (does not have to be unique).') !!}
-        {!! Form::text('name', $raffle->name, ['class' => 'form-control']) !!}
-    </div>
-    <div class="form-group">
-        {!! Form::label('winner_count', 'Number of Winners to Draw') !!}
-        {!! Form::text('winner_count', $raffle->winner_count, ['class' => 'form-control']) !!}
-    </div>
-    <div class="form-group">
-        {!! Form::label('group_id', 'Raffle Group') !!} {!! add_help('Raffle groups must be created before you can select them here.') !!}
-        {!! Form::select('group_id', $groups, $raffle->group_id, ['class' => 'form-control']) !!}
-    </div>
-    <div class="form-group">
-        {!! Form::label('order', 'Raffle Order') !!} {!! add_help('Enter a number. If a group of raffles is rolled, raffles will be drawn in ascending order.') !!}
-        {!! Form::text('order', $raffle->order ? : 0, ['class' => 'form-control']) !!}
-    </div>
-    <div class="form-group">
-        <label class="control-label">
-            {!! Form::checkbox('is_active', 1, $raffle->is_active, ['class' => 'form-check-input mr-2', 'data-toggle' => 'toggle']) !!}
-            {!! Form::label('is_displayed', 'Active (visible to users)', ['class' => 'form-check-label ml-3']) !!}
-        </label>
-    </div>
-    <div class="text-right">
-        {!! Form::submit('Confirm', ['class' => 'btn btn-primary']) !!}
-    </div>
-{!! Form::close() !!}
\ No newline at end of file
+{!! Form::open(['url' => 'admin/raffles/edit/raffle/' . ($raffle->id ?: '')]) !!}
+<div class="form-group">
+    {!! Form::label('name', 'Raffle Name') !!} {!! add_help('This is the name of the raffle. Naming it something after what is being raffled is suggested (does not have to be unique).') !!}
+    {!! Form::text('name', $raffle->name, ['class' => 'form-control']) !!}
+</div>
+<div class="form-group">
+    {!! Form::label('winner_count', 'Number of Winners to Draw') !!}
+    {!! Form::text('winner_count', $raffle->winner_count, ['class' => 'form-control']) !!}
+</div>
+<div class="form-group">
+    {!! Form::label('group_id', 'Raffle Group') !!} {!! add_help('Raffle groups must be created before you can select them here.') !!}
+    {!! Form::select('group_id', $groups, $raffle->group_id, ['class' => 'form-control']) !!}
+</div>
+<div class="form-group">
+    {!! Form::label('order', 'Raffle Order') !!} {!! add_help('Enter a number. If a group of raffles is rolled, raffles will be drawn in ascending order.') !!}
+    {!! Form::text('order', $raffle->order ?: 0, ['class' => 'form-control']) !!}
+</div>
+<div class="form-group">
+    {!! Form::label('ticket_cap', 'Ticket Cap (Optional)') !!} {!! add_help('A number of tickets per individual to cap at. Leave empty or unset to have no cap.') !!}
+    {!! Form::text('ticket_cap', $raffle->ticket_cap ?: null, ['class' => 'form-control']) !!}
+</div>
+<div class="form-group">
+    <label class="control-label">
+        {!! Form::checkbox('is_active', 1, $raffle->is_active, ['class' => 'form-check-input mr-2', 'data-toggle' => 'toggle']) !!}
+        {!! Form::label('is_displayed', 'Active (visible to users)', ['class' => 'form-check-label ml-3']) !!}
+    </label>
+</div>
+<div class="text-right">
+    {!! Form::submit('Confirm', ['class' => 'btn btn-primary']) !!}
+</div>
+{!! Form::close() !!}
diff --git a/resources/views/admin/raffle/_raffle_roll.blade.php b/resources/views/admin/raffle/_raffle_roll.blade.php
index be337bfb20..6c628d1a05 100644
--- a/resources/views/admin/raffle/_raffle_roll.blade.php
+++ b/resources/views/admin/raffle/_raffle_roll.blade.php
@@ -1,10 +1,10 @@
 @if ($raffle->is_active < 2)
     <div class="text-center">
         <p>This will roll {{ $raffle->winner_count }} winner(s) for the raffle <b>{{ $raffle->name }}</b>.</p>
-        {!! Form::open(['url' => 'admin/raffles/roll/raffle/'.$raffle->id]) !!}
+        {!! Form::open(['url' => 'admin/raffles/roll/raffle/' . $raffle->id]) !!}
         {!! Form::submit('Roll!', ['class' => 'btn btn-primary']) !!}
         {!! Form::close() !!}
     </div>
 @else
     <div class="text-center">This raffle has already been completed.</div>
-@endif
\ No newline at end of file
+@endif
diff --git a/resources/views/admin/raffle/index.blade.php b/resources/views/admin/raffle/index.blade.php
index f91a00814d..dad479d82e 100644
--- a/resources/views/admin/raffle/index.blade.php
+++ b/resources/views/admin/raffle/index.blade.php
@@ -1,92 +1,94 @@
 @extends('admin.layout')
 
-@section('admin-title') Raffle Index @endsection
+@section('admin-title')
+    Raffle Index
+@endsection
 
 @section('admin-content')
-{!! breadcrumbs(['Admin Panel' => 'admin', 'Raffle Index' => 'admin/raffles']) !!}
+    {!! breadcrumbs(['Admin Panel' => 'admin', 'Raffle Index' => 'admin/raffles']) !!}
 
-<h1>Raffle Index</h1>
-<div class="text-right form-group">
-    <a class="btn btn-success edit-group" href="#" data-id="">Create Raffle Group</a>
-    <a class="btn btn-success edit-raffle" href="#" data-id="">Create Raffle</a>
-</div>
-<ul class="nav nav-tabs mb-3">
-    <li class="nav-item"><a href="{{ url()->current() }}" class="nav-link {{ Request::get('is_active') ? '' : 'active' }}">Current Raffles</a></li>
-    <li class="nav-item"><a href="{{ url()->current() }}?is_active=1" class="nav-link {{ Request::get('is_active') == 1 ? 'active' : '' }}">Open Raffles</a></li>
-    <li class="nav-item"><a href="{{ url()->current() }}?is_active=2" class="nav-link {{ Request::get('is_active') == 2 ? 'active' : '' }}">Completed Raffles</a></li>
-</ul>
-@if(Request::get('is_active') == 1)
-<p>
-    This is the list of raffles that are visible to users and have not been rolled.
-</p>
-@elseif(Request::get('is_active') == 2)
-<p>
-    This is the list of raffles that are complete (have been rolled). These will always be visible to users.
-</p>
-@elseif(!Request::get('is_active'))
-<p>
-    This is the list of raffles that have not been rolled, including hidden raffles.
-</p>
-@endif
+    <h1>Raffle Index</h1>
+    <div class="text-right form-group">
+        <a class="btn btn-success edit-group" href="#" data-id="">Create Raffle Group</a>
+        <a class="btn btn-success edit-raffle" href="#" data-id="">Create Raffle</a>
+    </div>
+    <ul class="nav nav-tabs mb-3">
+        <li class="nav-item"><a href="{{ url()->current() }}" class="nav-link {{ Request::get('is_active') ? '' : 'active' }}">Current Raffles</a></li>
+        <li class="nav-item"><a href="{{ url()->current() }}?is_active=1" class="nav-link {{ Request::get('is_active') == 1 ? 'active' : '' }}">Open Raffles</a></li>
+        <li class="nav-item"><a href="{{ url()->current() }}?is_active=2" class="nav-link {{ Request::get('is_active') == 2 ? 'active' : '' }}">Completed Raffles</a></li>
+    </ul>
+    @if (Request::get('is_active') == 1)
+        <p>
+            This is the list of raffles that are visible to users and have not been rolled.
+        </p>
+    @elseif(Request::get('is_active') == 2)
+        <p>
+            This is the list of raffles that are complete (have been rolled). These will always be visible to users.
+        </p>
+    @elseif(!Request::get('is_active'))
+        <p>
+            This is the list of raffles that have not been rolled, including hidden raffles.
+        </p>
+    @endif
 
-<?php $prevGroup = null; ?>
-<ul class="list-group mb-3">
-@foreach($raffles as $raffle)
+    <?php $prevGroup = null; ?>
+    <ul class="list-group mb-3">
+        @foreach ($raffles as $raffle)
+            @if ($prevGroup != $raffle->group_id)
+    </ul>
+    @if ($prevGroup)
+        </div>
+    @endif
+    <div class="card mb-3">
+        <div class="card-header">
+            <h3 class="d-inline">{{ $groups[$raffle->group_id]->name }} <span class="badge badge-xs {{ $groups[$raffle->group_id]->is_active ? 'badge-success' : 'badge-danger' }}">{{ $groups[$raffle->group_id]->is_active ? 'Visible' : 'Hidden' }}</span>
+            </h3>
 
-    @if($prevGroup != $raffle->group_id)
-        </ul>
-        @if($prevGroup)
-            </div>
-        @endif
-        <div class="card mb-3">
-            <div class="card-header"><h3 class="d-inline">{{ $groups[$raffle->group_id]->name }} <span class="badge badge-xs {{ $groups[$raffle->group_id]->is_active ? 'badge-success' : 'badge-danger' }}">{{ $groups[$raffle->group_id]->is_active ? 'Visible' : 'Hidden' }}</span></h3>
+            @if ($raffle->is_active < 2)
+                <div class="float-right">
+                    <a href="#" class="roll-group btn btn-outline-danger btn-sm" data-id="{{ $groups[$raffle->group_id]->id }}">Roll Group</a>
+                    <a href="#" class="edit-group btn btn-outline-primary btn-sm" data-id="{{ $groups[$raffle->group_id]->id }}">Edit Group</a>
+                </div>
+            @endif
+        </div>
+        <ul class="list-group list-group-flush">
+            @endif
 
-                @if($raffle->is_active < 2)
+            <li class="list-group-item">
+                <i class="fas {{ $raffle->is_active ? 'fa-eye' : 'fa-eye-slash' }} mr-2"></i>
+                <a href="{{ url('admin/raffles/view/' . $raffle->id) }}">{{ $raffle->name }}</a>
+                @if ($raffle->is_active < 2)
                     <div class="float-right">
-                        <a href="#" class="roll-group btn btn-outline-danger btn-sm" data-id="{{ $groups[$raffle->group_id]->id }}">Roll Group</a>
-                        <a href="#" class="edit-group btn btn-outline-primary btn-sm" data-id="{{ $groups[$raffle->group_id]->id }}">Edit Group</a>
+                        @if (!$raffle->group_id)
+                            <a href="#" class="roll-raffle btn btn-outline-danger btn-xs p-2" data-id="{{ $raffle->id }}">Roll Raffle</a>
+                        @endif
+                        <a href="#" class="edit-raffle btn btn-xs btn-outline-primary p-2" data-id="{{ $raffle->id }}">
+                            Edit Raffle
+                        </a>
                     </div>
                 @endif
-            </div>
-            <ul class="list-group list-group-flush">
-    @endif
-
-    <li class="list-group-item">
-        <i class="fas {{ $raffle->is_active ? 'fa-eye' : 'fa-eye-slash' }} mr-2"></i>
-        <a href="{{ url('admin/raffles/view/'.$raffle->id) }}">{{ $raffle->name }}</a>
-        @if($raffle->is_active < 2)
-            <div class="float-right">
-                @if(!$raffle->group_id)
-                    <a href="#" class="roll-raffle btn btn-outline-danger btn-xs p-2" data-id="{{ $raffle->id }}">Roll Raffle</a>
-                @endif
-                <a href="#" class="edit-raffle btn btn-xs btn-outline-primary p-2" data-id="{{ $raffle->id }}">
-                    Edit Raffle
-                </a>
-            </div>
-        @endif
-    </li>
-    <?php $prevGroup = $raffle->group_id; ?>
-@endforeach
-
-@endsection
-@section('scripts')
-@parent
-<script>
-    $('.edit-group').on('click', function(e) {
-        e.preventDefault();
-        loadModal("{{ url('/admin/raffles/edit/group/') }}/" + $(this).data('id'), 'Edit Raffle Group');
-    });
-    $('.edit-raffle').on('click', function(e) {
-        e.preventDefault();
-        loadModal("{{ url('/admin/raffles/edit/raffle/') }}/" + $(this).data('id'), 'Edit Raffle');
-    });
-    $('.roll-raffle').on('click', function(e) {
-        e.preventDefault();
-        loadModal("{{ url('/admin/raffles/roll/raffle/') }}/" + $(this).data('id'), 'Roll Raffle');
-    });
-    $('.roll-group').on('click', function(e) {
-        e.preventDefault();
-        loadModal("{{ url('/admin/raffles/roll/group/') }}/" + $(this).data('id'), 'Roll Raffle Group');
-    });
-</script>
-@endsection
+            </li>
+            <?php $prevGroup = $raffle->group_id; ?>
+            @endforeach
+        @endsection
+        @section('scripts')
+            @parent
+            <script>
+                $('.edit-group').on('click', function(e) {
+                    e.preventDefault();
+                    loadModal("{{ url('/admin/raffles/edit/group/') }}/" + $(this).data('id'), 'Edit Raffle Group');
+                });
+                $('.edit-raffle').on('click', function(e) {
+                    e.preventDefault();
+                    loadModal("{{ url('/admin/raffles/edit/raffle/') }}/" + $(this).data('id'), 'Edit Raffle');
+                });
+                $('.roll-raffle').on('click', function(e) {
+                    e.preventDefault();
+                    loadModal("{{ url('/admin/raffles/roll/raffle/') }}/" + $(this).data('id'), 'Roll Raffle');
+                });
+                $('.roll-group').on('click', function(e) {
+                    e.preventDefault();
+                    loadModal("{{ url('/admin/raffles/roll/group/') }}/" + $(this).data('id'), 'Roll Raffle Group');
+                });
+            </script>
+        @endsection
diff --git a/resources/views/admin/raffle/ticket_index.blade.php b/resources/views/admin/raffle/ticket_index.blade.php
index 8dd1d19d6d..4b7057355b 100644
--- a/resources/views/admin/raffle/ticket_index.blade.php
+++ b/resources/views/admin/raffle/ticket_index.blade.php
@@ -1,91 +1,174 @@
 @extends('admin.layout')
 
-@section('admin-title') Raffle Tickets for {{ $raffle->name }} @endsection
+@section('admin-title')
+    Raffle Tickets for {{ $raffle->name }}
+@endsection
 
 @section('admin-content')
-{!! breadcrumbs(['Admin Panel' => 'admin', 'Raffle Index' => 'admin/raffles', 'Raffle Tickets for ' . $raffle->name => 'admin/raffles/view/'.$raffle->id]) !!}
+    {!! breadcrumbs(['Admin Panel' => 'admin', 'Raffle Index' => 'admin/raffles', 'Raffle Tickets for ' . $raffle->name => 'admin/raffles/view/' . $raffle->id]) !!}
 
-<h1>Raffle Tickets: {{ $raffle->name }}</h1>
+    <h1>
+        Raffle Tickets: {{ $raffle->name }}</h1>
 
-@if($raffle->is_active == 0)
-    <p>This raffle is currently hidden. (Number of winners to be drawn: {{ $raffle->winner_count }})</p>
-    <div class="text-right form-group">
-        <a class="btn btn-success edit-tickets" href="#" data-id="">Add Tickets</a>
-    </div>
-@elseif($raffle->is_active == 1)
-    <p>This raffle is currently open. (Number of winners to be drawn: {{ $raffle->winner_count }})</p>
-    <div class="text-right form-group">
-        <a class="btn btn-success edit-tickets" href="#" data-id="">Add Tickets</a>
-    </div>
-@elseif($raffle->is_active == 2)
-    <p>This raffle is closed. Rolled: {!! format_date($raffle->rolled_at) !!}</p>
-    <div class="card mb-3">
-        <div class="card-header h3">Winner(s)</div>
-        <div class="table-responsive">
-            <table class="table table-sm mb-0">
-                <thead><th class="col-xs-1 text-center" style="width:100px;">#</th><th>User</th></thead>
-                <tbody>
-                    @foreach($raffle->tickets()->winners()->get() as $winner)
-                        <tr>
-                            <td class="text-center">{{ $winner->position }}</td>
-                            <td class="text-left">{!! $winner->displayHolderName !!}</td>
-                        </tr>
-                    @endforeach
-                </tbody>
-            </table>
+    @if ($raffle->is_active == 0)
+        <p>
+            This raffle is currently hidden. (Number of winners to be drawn: {{ $raffle->winner_count }})<br />
+            @if ($raffle->ticket_cap)
+                This raffle has a cap of {{ $raffle->ticket_cap }} tickets per individual.
+            @endif
+        </p>
+        <div class="text-right form-group">
+            <a class="btn btn-success edit-tickets" href="#" data-id="">Add Tickets</a>
         </div>
-    </div>
-@endif
+    @elseif($raffle->is_active == 1)
+        <p>
+            This raffle is currently open. (Number of winners to be drawn: {{ $raffle->winner_count }})<br />
+            @if ($raffle->ticket_cap)
+                This raffle has a cap of {{ $raffle->ticket_cap }} tickets per individual.
+            @endif
+        </p>
+        <div class="text-right form-group">
+            <a class="btn btn-success edit-tickets" href="#" data-id="">Add Tickets</a>
+        </div>
+    @elseif($raffle->is_active == 2)
+        <p>This raffle is closed. Rolled: {!! format_date($raffle->rolled_at) !!}</p>
+        <div class="card mb-3">
+            <div class="card-header h3">Winner(s)</div>
+            <div class="table-responsive">
+                <div class="mb-4 logs-table mb-0">
+                    <div class="logs-table-header">
+                        <div class="row">
+                            <div class="col-1">
+                                <div class="logs-table-cell text-center">#</div>
+                            </div>
+                            <div class="col-11">
+                                <div class="logs-table-cell text-left">User</div>
+                            </div>
+                        </div>
+                    </div>
+                    <div class="logs-table-body">
+                        @foreach ($raffle->tickets()->winners()->get() as $winner)
+                            <div class="logs-table-row">
+                                <div class="row flex-wrap">
+                                    <div class="col-1">
+                                        <div class="logs-table-cell text-center">{{ $winner->position }}</div>
+                                    </div>
+                                    <div class="col-11">
+                                        <div class="logs-table-cell text-left">{!! $winner->displayHolderName !!}</div>
+                                    </div>
+                                </div>
+                            </div>
+                        @endforeach
+                    </div>
+                </div>
+            </div>
+        </div>
+    @endif
 
-<h3>Tickets</h3>
+    <h3>Tickets</h3>
 
-<div class="text-right">{!! $tickets->render() !!}</div>
-<div class="table-responsive">
-    <table class="table table-sm">
-        <thead><th class="col-xs-1 text-center" style="width:100px;">#</th><th>User</th>@if($raffle->is_active < 2)<th></th>@endif</thead>
-        <tbody>
-            @foreach($tickets as $count=>$ticket)
-                <tr>
-                    <td class="text-center">{{ $page * 200 + $count + 1 }}</td>
-                    <td>{!! $ticket->displayHolderName !!}</td>
-                    @if($raffle->is_active < 2)
-                        <td class="text-right">{!! Form::open(['url' => 'admin/raffles/view/ticket/delete/'.$ticket->id]) !!}{!! Form::submit('Delete', ['class' => 'btn btn-danger btn-sm']) !!}{!! Form::close() !!}</td>
+    <div class="text-right">{!! $tickets->render() !!}</div>
+    <div class="table-responsive">
+        <div class="mb-4 logs-table">
+            <div class="logs-table-header">
+                <div class="row">
+                    <div class="col-1">
+                        <div class="logs-table-cell text-center">#</div>
+                    </div>
+                    <div class="col-8 col-md-3">
+                        <div class="logs-table-cell text-left">User</div>
+                    </div>
+                    @if ($raffle->is_active < 2)
+                        <div class="col-3">
+                            <div class="logs-table-cell"></div>
+                        </div>
                     @endif
-                </tr>
-            @endforeach
-        </tbody>
-    </table>
-</div>
-<div class="text-right">{!! $tickets->render() !!}</div>
-
-<div class="modal fade" id="raffle-modal" tabindex="-1" role="dialog">
-    <div class="modal-dialog" role="document">
-        <div class="modal-content">
-            <div class="modal-header">
-                <span class="modal-title h5 mb-0">Add Tickets</span>
-                <button type="button" class="close" data-dismiss="modal">&times;</button>
+                </div>
+            </div>
+            <div class="logs-table-body">
+                @foreach ($tickets as $count => $ticket)
+                    <div class="logs-table-row">
+                        <div class="row flex-wrap">
+                            <div class="col-1">
+                                <div class="logs-table-cell text-center">{{ $page * 200 + $count + 1 }}</div>
+                            </div>
+                            <div class="col-8 col-md-3">
+                                <div class="logs-table-cell text-left">{!! $ticket->displayHolderName !!}</div>
+                            </div>
+                            @if ($raffle->is_active < 2)
+                                <div class="col-3">
+                                    <div class="logs-table-cell text-right">{!! Form::open(['url' => 'admin/raffles/view/ticket/delete/' . $ticket->id]) !!}{!! Form::submit('Delete', ['class' => 'btn btn-danger btn-sm']) !!}{!! Form::close() !!}</div>
+                                </div>
+                            @endif
+                        </div>
+                    </div>
+                @endforeach
             </div>
-            <div class="modal-body">
-                {!! Form::open(['url' => 'admin/raffles/view/ticket/'.$raffle->id]) !!}
-                    <div class="form-group">
-                    {!! Form::label('names', 'Names (comma-separated, one name per ticket)') !!} {!! add_help('Names will be matched to usernames on the site. If a matching username is not found, it will add a ticket as a deviantART username instead.') !!}
-                        {!! Form::textarea('names', '', ['class' => 'form-control']) !!}
+        </div>
+    </div>
+    <div class="text-right">{!! $tickets->render() !!}</div>
+
+    <div class="modal fade" id="raffle-modal" tabindex="-1" role="dialog">
+        <div class="modal-dialog" role="document">
+            <div class="modal-content">
+                <div class="modal-header">
+                    <span class="modal-title h5 mb-0">Add Tickets</span>
+                    <button type="button" class="close" data-dismiss="modal">&times;</button>
+                </div>
+                <div class="modal-body">
+                    <p>Select an on-site user or enter an off-site username, as well as the number of tickets to create for them. Any created tickets are in addition to any pre-existing tickets for the user(s).</p>
+                    {!! Form::open(['url' => 'admin/raffles/view/ticket/' . $raffle->id]) !!}
+                    <div id="ticketList">
                     </div>
+                    <div><a href="#" class="btn btn-primary" id="add-ticket">Add Ticket</a></div>
                     <div class="text-right">
                         {!! Form::submit('Add', ['class' => 'btn btn-primary']) !!}
                     </div>
-                {!! Form::close() !!}
+                    {!! Form::close() !!}
+                    <div class="ticket-row hide mb-2">
+                        {!! Form::select('user_id[]', $users, null, ['class' => 'form-control mr-2 user-select', 'placeholder' => 'Select User']) !!}
+                        {!! Form::text('alias[]', null, ['class' => 'form-control mr-2', 'placeholder' => 'OR Enter Alias']) !!}
+                        {!! Form::number('ticket_count[]', null, ['class' => 'form-control mr-2', 'placeholder' => 'Ticket Count']) !!}
+                        <a href="#" class="remove-ticket btn btn-danger mb-2">×</a>
+                    </div>
+                </div>
             </div>
         </div>
     </div>
-</div>
 @endsection
 @section('scripts')
-@parent
-<script>
-    $('.edit-tickets').on('click', function(e) {
-        e.preventDefault();
-        $('#raffle-modal').modal('show');
-    });
-</script>
-@endsection
\ No newline at end of file
+    @parent
+    <script>
+        $('.edit-tickets').on('click', function(e) {
+            e.preventDefault();
+            $('#raffle-modal').modal('show');
+        });
+
+        $(document).ready(function() {
+            $('#add-ticket').on('click', function(e) {
+                e.preventDefault();
+                addTicketRow();
+            });
+            $('.remove-ticket').on('click', function(e) {
+                e.preventDefault();
+                removeTicketRow($(this));
+            })
+
+            function addTicketRow() {
+                var $clone = $('.ticket-row').clone();
+                $('#ticketList').append($clone);
+                $clone.removeClass('hide ticket-row');
+                $clone.addClass('d-flex');
+                $clone.find('.remove-ticket').on('click', function(e) {
+                    e.preventDefault();
+                    removeTicketRow($(this));
+                })
+                $clone.find('.user-select').selectize();
+            }
+
+            function removeTicketRow($trigger) {
+                $trigger.parent().remove();
+            }
+        });
+    </script>
+@endsection
diff --git a/resources/views/admin/rarities/_delete_rarity.blade.php b/resources/views/admin/rarities/_delete_rarity.blade.php
index e9dbb74c2d..9c822ad81a 100644
--- a/resources/views/admin/rarities/_delete_rarity.blade.php
+++ b/resources/views/admin/rarities/_delete_rarity.blade.php
@@ -1,5 +1,5 @@
-@if($rarity)
-    {!! Form::open(['url' => 'admin/data/rarities/delete/'.$rarity->id]) !!}
+@if ($rarity)
+    {!! Form::open(['url' => 'admin/data/rarities/delete/' . $rarity->id]) !!}
 
     <p>You are about to delete the rarity <strong>{{ $rarity->name }}</strong>. This is not reversible. If traits and/or characters that have this rarity exist, you will not be able to delete this rarity.</p>
     <p>Are you sure you want to delete <strong>{{ $rarity->name }}</strong>?</p>
@@ -9,6 +9,6 @@
     </div>
 
     {!! Form::close() !!}
-@else 
+@else
     Invalid rarity selected.
-@endif
\ No newline at end of file
+@endif
diff --git a/resources/views/admin/rarities/create_edit_rarity.blade.php b/resources/views/admin/rarities/create_edit_rarity.blade.php
index b6c81823ac..c7bde4b474 100644
--- a/resources/views/admin/rarities/create_edit_rarity.blade.php
+++ b/resources/views/admin/rarities/create_edit_rarity.blade.php
@@ -1,78 +1,84 @@
 @extends('admin.layout')
 
-@section('admin-title') Rarities @endsection
+@section('admin-title')
+    {{ $rarity->id ? 'Edit' : 'Create' }} Rarity
+@endsection
 
 @section('admin-content')
-{!! breadcrumbs(['Admin Panel' => 'admin', 'Rarities' => 'admin/data/rarities', ($rarity->id ? 'Edit' : 'Create').' Rarity' => $rarity->id ? 'admin/data/rarities/edit/'.$rarity->id : 'admin/data/rarities/create']) !!}
-
-<h1>{{ $rarity->id ? 'Edit' : 'Create' }} Rarity
-    @if($rarity->id)
-        <a href="#" class="btn btn-danger float-right delete-rarity-button">Delete Rarity</a>
-    @endif
-</h1>
+    {!! breadcrumbs(['Admin Panel' => 'admin', 'Rarities' => 'admin/data/rarities', ($rarity->id ? 'Edit' : 'Create') . ' Rarity' => $rarity->id ? 'admin/data/rarities/edit/' . $rarity->id : 'admin/data/rarities/create']) !!}
 
-{!! Form::open(['url' => $rarity->id ? 'admin/data/rarities/edit/'.$rarity->id : 'admin/data/rarities/create', 'files' => true]) !!}
+    <h1>{{ $rarity->id ? 'Edit' : 'Create' }} Rarity
+        @if ($rarity->id)
+            <a href="#" class="btn btn-danger float-right delete-rarity-button">Delete Rarity</a>
+        @endif
+    </h1>
 
-<h3>Basic Information</h3>
+    {!! Form::open(['url' => $rarity->id ? 'admin/data/rarities/edit/' . $rarity->id : 'admin/data/rarities/create', 'files' => true]) !!}
 
-<div class="form-group">
-    {!! Form::label('Name') !!}
-    {!! Form::text('name', $rarity->name, ['class' => 'form-control']) !!}
-</div>
+    <h3>Basic Information</h3>
 
-<div class="form-group">
-    {!! Form::label('Colour (Hex code; optional)') !!}
-    <div class="input-group cp">
-        {!! Form::text('color', $rarity->color, ['class' => 'form-control']) !!}
-        <span class="input-group-append">
-            <span class="input-group-text colorpicker-input-addon"><i></i></span>
-        </span>
+    <div class="form-group">
+        {!! Form::label('Name') !!}
+        {!! Form::text('name', $rarity->name, ['class' => 'form-control']) !!}
     </div>
-</div>
 
-<div class="form-group">
-    {!! Form::label('World Page Image (Optional)') !!} {!! add_help('This image is used only on the world information pages.') !!}
-    <div>{!! Form::file('image') !!}</div>
-    <div class="text-muted">Recommended size: 200px x 200px</div>
-    @if($rarity->has_image)
-        <div class="form-check">
-            {!! Form::checkbox('remove_image', 1, false, ['class' => 'form-check-input']) !!}
-            {!! Form::label('remove_image', 'Remove current image', ['class' => 'form-check-label']) !!}
+    <div class="form-group">
+        {!! Form::label('Colour (Hex code; optional)') !!}
+        <div class="input-group cp">
+            {!! Form::text('color', $rarity->color, ['class' => 'form-control']) !!}
+            <span class="input-group-append">
+                <span class="input-group-text colorpicker-input-addon"><i></i></span>
+            </span>
         </div>
-    @endif
-</div>
-
-<div class="form-group">
-    {!! Form::label('Description (Optional)') !!}
-    {!! Form::textarea('description', $rarity->description, ['class' => 'form-control wysiwyg']) !!}
-</div>
+    </div>
 
-<div class="text-right">
-    {!! Form::submit($rarity->id ? 'Edit' : 'Create', ['class' => 'btn btn-primary']) !!}
-</div>
+    <div class="form-group">
+        {!! Form::label('World Page Image (Optional)') !!} {!! add_help('This image is used only on the world information pages.') !!}
+        <div>{!! Form::file('image') !!}</div>
+        <div class="text-muted">Recommended size: 200px x 200px</div>
+        @if ($rarity->has_image)
+            <div class="form-check">
+                {!! Form::checkbox('remove_image', 1, false, ['class' => 'form-check-input']) !!}
+                {!! Form::label('remove_image', 'Remove current image', ['class' => 'form-check-label']) !!}
+            </div>
+        @endif
+    </div>
 
-{!! Form::close() !!}
+    <div class="form-group">
+        {!! Form::label('Description (Optional)') !!}
+        {!! Form::textarea('description', $rarity->description, ['class' => 'form-control wysiwyg']) !!}
+    </div>
 
-@if($rarity->id)
-    <h3>Preview</h3>
-    <div class="card mb-3">
-        <div class="card-body">
-            @include('world._entry', ['imageUrl' => $rarity->rarityImageUrl, 'name' => $rarity->displayName, 'description' => $rarity->parsed_description])
-        </div>
+    <div class="text-right">
+        {!! Form::submit($rarity->id ? 'Edit' : 'Create', ['class' => 'btn btn-primary']) !!}
     </div>
-@endif
 
+    {!! Form::close() !!}
+
+    @if ($rarity->id)
+        <h3>Preview</h3>
+        <div class="card mb-3">
+            <div class="card-body">
+                @include('world._rarity_entry', [
+                    'imageUrl' => $rarity->rarityImageUrl,
+                    'name' => $rarity->displayName,
+                    'description' => $rarity->parsed_description,
+                    'searchFeaturesUrl' => $rarity->searchFeaturesUrl,
+                    'searchCharactersUrl' => $rarity->searchCharactersUrl,
+                ])
+            </div>
+        </div>
+    @endif
 @endsection
 
 @section('scripts')
-@parent
-<script>
-$( document ).ready(function() {    
-    $('.delete-rarity-button').on('click', function(e) {
-        e.preventDefault();
-        loadModal("{{ url('admin/data/rarities/delete') }}/{{ $rarity->id }}", 'Delete Rarity');
-    });
-});
-    
-</script>
-@endsection
\ No newline at end of file
+    @parent
+    <script>
+        $(document).ready(function() {
+            $('.delete-rarity-button').on('click', function(e) {
+                e.preventDefault();
+                loadModal("{{ url('admin/data/rarities/delete') }}/{{ $rarity->id }}", 'Delete Rarity');
+            });
+        });
+    </script>
+@endsection
diff --git a/resources/views/admin/rarities/rarities.blade.php b/resources/views/admin/rarities/rarities.blade.php
index 82c417b51d..6c9d3df71e 100644
--- a/resources/views/admin/rarities/rarities.blade.php
+++ b/resources/views/admin/rarities/rarities.blade.php
@@ -1,65 +1,71 @@
 @extends('admin.layout')
 
-@section('admin-title') Rarities @endsection
+@section('admin-title')
+    Rarities
+@endsection
 
 @section('admin-content')
-{!! breadcrumbs(['Admin Panel' => 'admin', 'Rarities' => 'admin/data/rarities']) !!}
+    {!! breadcrumbs(['Admin Panel' => 'admin', 'Rarities' => 'admin/data/rarities']) !!}
 
-<h1>Rarities</h1>
+    <h1>Rarities</h1>
 
-<p>This is a list of rarities that will be used across the site, primarily assigned to characters and traits. At least one rarity is required to create characters and traits.</p> 
-<p>The sorting order reflects the order in which rarities will be displayed on the world pages (e.g. rarity-sorted traits will appear in this order), as well as in select dropdown fields. <strong>Please note that the highest rarity should be at the <u>top</u> of the list.</strong></p>
+    <p>This is a list of rarities that will be used across the site, primarily assigned to characters and traits. At least one rarity is required to create characters and traits.</p>
+    <p>The sorting order reflects the order in which rarities will be displayed on the world pages (e.g. rarity-sorted traits will appear in this order), as well as in select dropdown fields. <strong>Please note that the highest rarity should be at the
+            <u>top</u> of the list.</strong></p>
 
-<div class="text-right mb-3"><a class="btn btn-primary" href="{{ url('admin/data/rarities/create') }}"><i class="fas fa-plus"></i> Create New Rarity</a></div>
-@if(!count($rarities))
-    <p>No rarities found.</p>
-@else 
-    <table class="table table-sm rarity-table">
-        <tbody id="sortable" class="sortable">
-            @foreach($rarities as $rarity)
-                <tr class="sort-item" data-id="{{ $rarity->id }}">
-                    <td>
-                        <a class="fas fa-arrows-alt-v handle mr-3" href="#"></a>
-                        {!! $rarity->displayName !!}
-                    </td>
-                    <td class="text-right">
-                        <a href="{{ url('admin/data/rarities/edit/'.$rarity->id) }}" class="btn btn-primary">Edit</a>
-                    </td>
-                </tr>
-            @endforeach
-        </tbody>
+    <div class="text-right mb-3"><a class="btn btn-primary" href="{{ url('admin/data/rarities/create') }}"><i class="fas fa-plus"></i> Create New Rarity</a></div>
+    @if (!count($rarities))
+        <p>No rarities found.</p>
+    @else
+        <table class="table table-sm rarity-table">
+            <tbody id="sortable" class="sortable">
+                @foreach ($rarities as $rarity)
+                    <tr class="sort-item" data-id="{{ $rarity->id }}">
+                        <td>
+                            <a class="fas fa-arrows-alt-v handle mr-3" href="#"></a>
+                            {!! $rarity->displayName !!}
+                        </td>
+                        <td class="text-right">
+                            <a href="{{ url('admin/data/rarities/edit/' . $rarity->id) }}" class="btn btn-primary">Edit</a>
+                        </td>
+                    </tr>
+                @endforeach
+            </tbody>
 
-    </table>
-    <div class="mb-4">
-        {!! Form::open(['url' => 'admin/data/rarities/sort']) !!}
-        {!! Form::hidden('sort', '', ['id' => 'sortableOrder']) !!}
-        {!! Form::submit('Save Order', ['class' => 'btn btn-primary']) !!}
-        {!! Form::close() !!}
-    </div>
-@endif
+        </table>
+        <div class="mb-4">
+            {!! Form::open(['url' => 'admin/data/rarities/sort']) !!}
+            {!! Form::hidden('sort', '', ['id' => 'sortableOrder']) !!}
+            {!! Form::submit('Save Order', ['class' => 'btn btn-primary']) !!}
+            {!! Form::close() !!}
+        </div>
+    @endif
 
 @endsection
 
 @section('scripts')
-@parent
-<script>
-
-$( document ).ready(function() {
-    $('.handle').on('click', function(e) {
-        e.preventDefault();
-    });
-    $( "#sortable" ).sortable({
-        items: '.sort-item',
-        handle: ".handle",
-        placeholder: "sortable-placeholder",
-        stop: function( event, ui ) {
-            $('#sortableOrder').val($(this).sortable("toArray", {attribute:"data-id"}));
-        },
-        create: function() {
-            $('#sortableOrder').val($(this).sortable("toArray", {attribute:"data-id"}));
-        }
-    });
-    $( "#sortable" ).disableSelection();
-});
-</script>
-@endsection
\ No newline at end of file
+    @parent
+    <script>
+        $(document).ready(function() {
+            $('.handle').on('click', function(e) {
+                e.preventDefault();
+            });
+            $("#sortable").sortable({
+                items: '.sort-item',
+                handle: ".handle",
+                placeholder: "sortable-placeholder",
+                stop: function(event, ui) {
+                    $('#sortableOrder').val($(this).sortable("toArray", {
+                        attribute: "data-id"
+                    }));
+                },
+                create: function() {
+                    $('#sortableOrder').val($(this).sortable("toArray", {
+                        attribute: "data-id"
+                    }));
+                }
+            });
+            $("#sortable").disableSelection();
+        });
+    </script>
+@endsection
diff --git a/resources/views/admin/reports/index.blade.php b/resources/views/admin/reports/index.blade.php
index 5cf7da729a..10a3c12bc9 100644
--- a/resources/views/admin/reports/index.blade.php
+++ b/resources/views/admin/reports/index.blade.php
@@ -1,55 +1,109 @@
 @extends('admin.layout')
 
-@section('admin-title') Report Queue @endsection
+@section('admin-title')
+    Report Queue
+@endsection
 
 @section('admin-content')
     {!! breadcrumbs(['Admin Panel' => 'admin', 'Report Queue' => 'admin/reports/pending']) !!}
 
-<h1>
-    Report Queue
-</h1>
-
-<ul class="nav nav-tabs mb-3">
-  <li class="nav-item">
-    <a class="nav-link {{ set_active('admin/reports/pending*') }} {{ set_active('admin/reports') }}" href="{{ url('admin/reports/pending') }}">Pending</a>
-  </li>
-  <li class="nav-item">
-    <a class="nav-link {{ set_active('admin/reports/assigned-to-me*') }} {{ set_active('admin/reports') }}" href="{{ url('admin/reports/assigned-to-me') }}">Assigned To Me</a>
-  </li>
-  <li class="nav-item">
-    <a class="nav-link {{ set_active('admin/reports/assigned') }} {{ set_active('admin/reports') }}" href="{{ url('admin/reports/assigned') }}">Assigned</a>
-  </li>
-  <li class="nav-item">
-    <a class="nav-link {{ set_active('admin/reports/closed*') }} {{ set_active('admin/reports') }}" href="{{ url('admin/reports/closed') }}">Closed</a>
-  </li>
-</ul>
+    <h1>
+        Report Queue
+    </h1>
 
-{!! $reports->render() !!}
+    <ul class="nav nav-tabs mb-3">
+        <li class="nav-item">
+            <a class="nav-link {{ set_active('admin/reports/pending*') }} {{ set_active('admin/reports') }}" href="{{ url('admin/reports/pending') }}">Pending</a>
+        </li>
+        <li class="nav-item">
+            <a class="nav-link {{ set_active('admin/reports/assigned-to-me*') }}" href="{{ url('admin/reports/assigned-to-me') }}">Assigned To Me</a>
+        </li>
+        <li class="nav-item">
+            <a class="nav-link {{ set_active('admin/reports/assigned') }}" href="{{ url('admin/reports/assigned') }}">Assigned</a>
+        </li>
+        <li class="nav-item">
+            <a class="nav-link {{ set_active('admin/reports/closed*') }}" href="{{ url('admin/reports/closed') }}">Closed</a>
+        </li>
+    </ul>
 
-<div class="row ml-md-2">
-  <div class="d-flex row flex-wrap col-12 mt-1 pt-1 px-0 ubt-bottom">
-    <div class="col-6 col-md-3 font-weight-bold">User</div>
-    <div class="col-6 col-md-4 font-weight-bold">Url/Title</div>
-    <div class="col-6 col-md-2 font-weight-bold">Submitted</div>
-    <div class="col-6 col-md-2 font-weight-bold">Status</div>
-  </div>
-
-  @foreach($reports as $report)
-    <div class="d-flex row flex-wrap col-12 mt-1 pt-1 px-0 ubt-top">
-      <div class="col-6 col-md-3">{!! $report->user->displayName !!}</div>
-      <div class="col-6 col-md-4">
-        <span class="ubt-texthide">@if(!$report->is_br)<a href="{{ $report->url }}">@endif {{ $report->url }} @if(!$report->is_br)</a>@endif</span>
-      </div>
-      <div class="col-6 col-md-2">{!! pretty_date($report->created_at) !!}</div>
-      <div class="col-3 col-md-2">
-        <span class="badge badge-{{ $report->status == 'Pending' ? 'secondary' : ($report->status == 'Closed' ? 'success' : 'danger') }}">{{ $report->status }}</span>{!! $report->status == 'Assigned' ? ' (to '.$report->staff->displayName.')' : '' !!}
-      </div>
-      <div class="col-3 col-md-1"><a href="{{ $report->adminUrl }}" class="btn btn-primary btn-sm py-0 px-1">Details</a></div>
+    <div>
+        {!! Form::open(['method' => 'GET', 'class' => 'form-inline justify-content-end']) !!}
+        <div class="form-inline justify-content-end">
+            <div class="form-group ml-3 mb-3">
+                {!! Form::select(
+                    'sort',
+                    [
+                        'newest' => 'Newest First',
+                        'oldest' => 'Oldest First',
+                        'bug' => 'Bug Reports',
+                    ],
+                    Request::get('sort') ?: 'oldest',
+                    ['class' => 'form-control'],
+                ) !!}
+            </div>
+            <div class="form-group ml-3 mb-3">
+                {!! Form::submit('Search', ['class' => 'btn btn-primary']) !!}
+            </div>
+        </div>
+        {!! Form::close() !!}
     </div>
-  @endforeach
-</div>
 
-{!! $reports->render() !!}
-<div class="text-center mt-4 small text-muted">{{ $reports->total() }} result{{ $reports->total() == 1 ? '' : 's' }} found.</div>
+    {!! $reports->render() !!}
+    <div class="mb-4 logs-table">
+        <div class="logs-table-header">
+            <div class="row">
+                <div class="col-6 col-md-3">
+                    <div class="logs-table-cell">User</div>
+                </div>
+                <div class="col-6 col-md-4">
+                    <div class="logs-table-cell">Url/Title</div>
+                </div>
+                <div class="col-6 col-md-2">
+                    <div class="logs-table-cell">Submitted</div>
+                </div>
+                <div class="col-6 col-md-2">
+                    <div class="logs-table-cell">Status</div>
+                </div>
+            </div>
+        </div>
+        <div class="logs-table-body">
+            @foreach ($reports as $report)
+                <div class="logs-table-row">
+                    <div class="row flex-wrap">
+                        <div class="col-6 col-md-3">
+                            <div class="logs-table-cell">{!! $report->user->displayName !!}</div>
+                        </div>
+                        <div class="col-6 col-md-4">
+                            <div class="logs-table-cell">
+                                <span class="ubt-texthide">
+                                    {{-- check if $report->url is url --}}
+                                    @if (filter_var($report->url, FILTER_VALIDATE_URL))
+                                        <a href="{{ $report->url }}">
+                                    @endif
+                                    {{ $report->url }}
+                                    @if (filter_var($report->url, FILTER_VALIDATE_URL))
+                                        </a>
+                                    @endif
+                                </span>
+                            </div>
+                        </div>
+                        <div class="col-6 col-md-2">
+                            <div class="logs-table-cell">{!! pretty_date($report->created_at) !!}</div>
+                        </div>
+                        <div class="col-3 col-md-2">
+                            <div class="logs-table-cell">
+                                <span class="badge badge-{{ $report->status == 'Pending' ? 'secondary' : ($report->status == 'Closed' ? 'success' : 'danger') }}">{{ $report->status }}</span>{!! $report->status == 'Assigned' ? ' (to ' . $report->staff->displayName . ')' : '' !!}
+                            </div>
+                        </div>
+                        <div class="col-3 col-md-1">
+                            <div class="logs-table-cell"><a href="{{ $report->adminUrl }}" class="btn btn-primary btn-sm py-0 px-1">Details</a></div>
+                        </div>
+                    </div>
+                </div>
+            @endforeach
+        </div>
+    </div>
 
-@endsection
\ No newline at end of file
+    {!! $reports->render() !!}
+    <div class="text-center mt-4 small text-muted">{{ $reports->total() }} result{{ $reports->total() == 1 ? '' : 's' }} found.</div>
+@endsection
diff --git a/resources/views/admin/reports/report.blade.php b/resources/views/admin/reports/report.blade.php
index d2523d0653..43d80a21e9 100644
--- a/resources/views/admin/reports/report.blade.php
+++ b/resources/views/admin/reports/report.blade.php
@@ -1,159 +1,169 @@
 @extends('admin.layout')
 
-@section('admin-title') Report (#{{ $report->id }}) @endsection
+@section('admin-title')
+    Report (#{{ $report->id }})
+@endsection
 
 @section('admin-content')
     {!! breadcrumbs(['Admin Panel' => 'admin', 'Report Queue' => 'admin/reports/pending', 'Report (#' . $report->id . ')' => $report->viewUrl]) !!}
 
-@if($report->status !== 'Closed')
-    @if($report->status == 'Assigned' && Auth::user()->id !== $report->staff_id)
-    <div class="alert alert-danger">This report is not assigned to you</div>
-    @elseif($report->status == 'Pending')
-    <div class="alert alert-warning">This report needs assigning</div>
-    @endif
-    <h1>
-        Report (#{{ $report->id }})
-        <span class="float-right badge badge-{{ $report->status == 'Pending' ? 'secondary' : ($report->status == 'Closed' ? 'success' : 'danger') }}">{{ $report->status }}</span>
-    </h1>
+    @if ($report->status !== 'Closed')
+        @if ($report->status == 'Assigned' && Auth::user()->id !== $report->staff_id)
+            <div class="alert alert-danger">This report is not assigned to you.</div>
+        @elseif($report->status == 'Pending')
+            <div class="alert alert-warning">This report needs assigning.</div>
+        @endif
 
-    <div class="mb-1">
-        <div class="row">
-            <div class="col-md-2 col-4"><h5>User</h5></div>
-            <div class="col-md-10 col-8">{!! $report->user->displayName !!}</div>
-        </div>
-        <div class="row">
-            <div class="col-md-2 col-4"><h5>URL / Title</h5></div>
-            <div class="col-md-10 col-8"><a href="{{ $report->url }}">{{ $report->url }}</a></div>
-        </div>
-        @if($report->is_br == 1)
+        <h1>
+            Report (#{{ $report->id }})
+            <span class="float-right badge badge-{{ $report->status == 'Pending' ? 'secondary' : ($report->status == 'Closed' ? 'success' : 'danger') }}">{{ $report->status }}</span>
+        </h1>
+        <div class="mb-1">
             <div class="row">
-                <div class="col-md-2 col-4"><h5>Bug Type</h5></div>
-                <div class="col-md-10 col-8">{{ ucfirst($report->error_type).($report->error_type != 'exploit' ? ' Error' : '') }}</div>
+                <div class="col-md-2 col-4">
+                    <h5>User</h5>
+                </div>
+                <div class="col-md-10 col-8">{!! $report->user->displayName !!}</div>
+            </div>
+            <div class="row">
+                <div class="col-md-2 col-4">
+                    <h5>URL / Title</h5>
+                </div>
+                <div class="col-md-10 col-8"><a href="{{ $report->url }}">{{ $report->url }}</a></div>
+            </div>
+            @if ($report->is_br == 1)
+                <div class="row">
+                    <div class="col-md-2 col-4">
+                        <h5>Bug Type</h5>
+                    </div>
+                    <div class="col-md-10 col-8">{{ ucfirst($report->error_type) . ($report->error_type != 'exploit' ? ' Error' : '') }}</div>
+                </div>
+            @endif
+            <div class="row">
+                <div class="col-md-2 col-4">
+                    <h5>Submitted</h5>
+                </div>
+                <div class="col-md-10 col-8">{!! format_date($report->created_at) !!} ({{ $report->created_at->diffForHumans() }})</div>
+            </div>
+            <div class="row">
+                <div class="col-md-2 col-4">
+                    <h5>Assigned to</h5>
+                </div>
+                <div class="col-md-10 col-8">
+                    @if ($report->staff != null)
+                        {!! $report->staff->displayName !!}
+                    @endif
+                </div>
             </div>
-        @endif
-        <div class="row">
-            <div class="col-md-2 col-4"><h5>Submitted</h5></div>
-            <div class="col-md-10 col-8">{!! format_date($report->created_at) !!} ({{ $report->created_at->diffForHumans() }})</div>
         </div>
-        <div class="row">
-            <div class="col-md-2 col-4"><h5>Assigned to</h5></div>
-            <div class="col-md-10 col-8">@if($report->staff != NULL) {!! $report->staff->displayName !!} @endif</div>
+
+        <h2>Report Details</h2>
+        <div class="card mb-3">
+            <div class="card-body">{!! nl2br(htmlentities($report->comments)) !!}</div>
         </div>
-    </div>
-    <h2>Report Details</h2>
-    <div class="card mb-3"><div class="card-body">{!! nl2br(htmlentities($report->comments)) !!}</div></div>
-    @if(Auth::check() && $report->staff_comments && ($report->user_id == Auth::user()->id || Auth::user()->hasPower('manage_reports')))
-        <h2>Staff Comments ({!! $report->staff->displayName !!})</h2>
-        <div class="card mb-3"><div class="card-body">
-		    @if(isset($report->parsed_staff_comments))
-                {!! $report->parsed_staff_comments !!}
-            @else
-                {!! $report->staff_comments !!}
-            @endif
-		</div></div>
-    @endif
+        @if (Auth::check() && $report->staff_comments && ($report->user_id == Auth::user()->id || Auth::user()->hasPower('manage_reports')))
+            <h2>Staff Comments ({!! $report->staff->displayName !!})</h2>
+            <div class="card mb-3">
+                <div class="card-body">
+                    @if (isset($report->parsed_staff_comments))
+                        {!! $report->parsed_staff_comments !!}
+                    @else
+                        {!! $report->staff_comments !!}
+                    @endif
+                </div>
+            </div>
+        @endif
 
-    @if($report->status == 'Assigned' && $report->user_id == Auth::user()->id || Auth::user()->hasPower('manage_reports'))
-    @comments([ 'type' => 'Staff-User', 'model' => $report, 'perPage' => 5 ])
-    @endif
+        @if (($report->status == 'Assigned' && $report->user_id == Auth::user()->id) || Auth::user()->hasPower('manage_reports'))
+            @comments(['type' => 'Staff-User', 'model' => $report, 'perPage' => 5])
+        @endif
 
-    {!! Form::open(['url' => url()->current(), 'id' => 'reportForm']) !!}
-    @if($report->status == 'Assigned' && Auth::user()->id == $report->staff_id)
-    @if(Auth::user()->hasPower('manage_reports'))<div class="alert alert-warning">Please include a small paragraph on the solution and as many important details as you deem necessary, as the user will no longer be able to view the comments after the report is closed</div>@endif
-		<div class="form-group">
-            {!! Form::label('staff_comments', 'Staff Comments (Optional)') !!}
-			{!! Form::textarea('staff_comments', $report->staffComments, ['class' => 'form-control wysiwyg']) !!}
-        </div>
-    @endif
+        {!! Form::open(['url' => url()->current(), 'id' => 'reportForm']) !!}
+        @if ($report->status == 'Assigned' && Auth::user()->id == $report->staff_id)
+            @if (Auth::user()->hasPower('manage_reports'))
+                <div class="alert alert-warning">Please include a small paragraph on the solution and as many important details as you deem necessary, as the user will no longer be able to view the comments after the report is closed.</div>
+            @endif
+            <div class="form-group">
+                {!! Form::label('staff_comments', 'Staff Comments (Optional)') !!}
+                {!! Form::textarea('staff_comments', $report->staffComments, ['class' => 'form-control wysiwyg']) !!}
+            </div>
+        @endif
         <div class="text-right">
-    @if($report->staff_id == NULL)
-            <a href="#" class="btn btn-danger mr-2" id="assignButton">Assign</a>
-    @endif
-    @if($report->status == 'Assigned' && Auth::user()->id == $report->staff_id)
-            <a href="#" class="btn btn-success" id="closalButton">Close</a>
+            @if ($report->staff_id == null)
+                <a href="#" class="btn btn-danger mr-2" id="assignButton">Assign</a>
+            @endif
+            @if ($report->status == 'Assigned' && Auth::user()->id == $report->staff_id)
+                <a href="#" class="btn btn-success" id="closalButton">Close</a>
+            @endif
         </div>
-    @endif
-    {!! Form::close() !!}
-
-    <div class="modal fade" id="confirmationModal" tabindex="-1" role="dialog">
-        <div class="modal-dialog" role="document">
-            <div class="modal-content hide" id="closalContent">
-                <div class="modal-header">
-                    <span class="modal-title h5 mb-0">Confirm Closal</span>
-                    <button type="button" class="close" data-dismiss="modal">&times;</button>
-                </div>
-                <div class="modal-body">
-                    <p>This will close the report.</p>
-                    <div class="text-right">
-                        <a href="#" id="closalSubmit" class="btn btn-success">Close</a>
+        {!! Form::close() !!}
+
+        <div class="modal fade" id="confirmationModal" tabindex="-1" role="dialog">
+            <div class="modal-dialog" role="document">
+                <div class="modal-content hide" id="closalContent">
+                    <div class="modal-header">
+                        <span class="modal-title h5 mb-0">Confirm Closal</span>
+                        <button type="button" class="close" data-dismiss="modal">&times;</button>
+                    </div>
+                    <div class="modal-body">
+                        <p>This will close the report.</p>
+                        <div class="text-right">
+                            <a href="#" id="closalSubmit" class="btn btn-success">Close</a>
+                        </div>
                     </div>
                 </div>
-            </div>
-            <div class="modal-content hide" id="assignContent">
-                <div class="modal-header">
-                    <span class="modal-title h5 mb-0">Confirm Assignment</span>
-                    <button type="button" class="close" data-dismiss="modal">&times;</button>
-                </div>
-                <div class="modal-body">
-                    <p class="text-left">This will assign yourself to the report.</p>
-                    <div class="text-right">
-                        <a href="#" id="assignSubmit" class="btn btn-danger">Assign</a>
+                <div class="modal-content hide" id="assignContent">
+                    <div class="modal-header">
+                        <span class="modal-title h5 mb-0">Confirm Assignment</span>
+                        <button type="button" class="close" data-dismiss="modal">&times;</button>
+                    </div>
+                    <div class="modal-body">
+                        <p class="text-left">This will assign yourself to the report.</p>
+                        <div class="text-right">
+                            <a href="#" id="assignSubmit" class="btn btn-danger">Assign</a>
+                        </div>
                     </div>
                 </div>
             </div>
         </div>
-    </div>
-@else
-    <div class="alert alert-danger">This report has already been closed.</div>
-    @include('home._report_content', ['report' => $report])
-@endif
+    @else
+        <div class="alert alert-danger">This report has already been closed.</div>
+        @include('home._report_content', ['report' => $report])
+    @endif
 
 @endsection
 
-@section('scripts')
-@parent
-@if($report->status !== 'Closed')
-    <script>
-
-        $(document).ready(function() {
-            var $confirmationModal = $('#confirmationModal');
-            var $reportForm = $('#reportForm');
-
-            var $closalButton = $('#closalButton');
-            var $closalContent = $('#closalContent');
-            var $closalSubmit = $('#closalSubmit');
-
-            var $assignButton = $('#assignButton');
-            var $assignContent = $('#assignContent');
-            var $assignSubmit = $('#assignSubmit');
-
-            $closalButton.on('click', function(e) {
-                e.preventDefault();
-                $closalContent.removeClass('hide');
-                $assignContent.addClass('hide');
-                $confirmationModal.modal('show');
-            });
-
-            $assignButton.on('click', function(e) {
-                e.preventDefault();
-                $assignContent.removeClass('hide');
-                $closalContent.addClass('hide');
-                $confirmationModal.modal('show');
-            });
-
-            $closalSubmit.on('click', function(e) {
-                e.preventDefault();
-                $reportForm.attr('action', '{{ url()->current() }}/close');
-                $reportForm.submit();
+@if ($report->status !== 'Closed')
+    @section('scripts')
+        @parent
+        <script>
+            $(document).ready(function() {
+                $('#closalButton').on('click', function(e) {
+                    e.preventDefault();
+                    $('#closalContent').removeClass('hide');
+                    $('#assignContent').addClass('hide');
+                    $('#confirmationModal').modal('show');
+                });
+
+                $('#assignButton').on('click', function(e) {
+                    e.preventDefault();
+                    $('#assignContent').removeClass('hide');
+                    $('#closalContent').addClass('hide');
+                    $('#confirmationModal').modal('show');
+                });
+
+                $('#closalSubmit').on('click', function(e) {
+                    e.preventDefault();
+                    $('#reportForm').attr('action', '{{ url()->current() }}/close');
+                    $('#reportForm').submit();
+                });
+
+                $('#assignSubmit').on('click', function(e) {
+                    e.preventDefault();
+                    $('#reportForm').attr('action', '{{ url()->current() }}/assign');
+                    $('#reportForm').submit();
+                });
             });
-
-            $assignSubmit.on('click', function(e) {
-                e.preventDefault();
-                $reportForm.attr('action', '{{ url()->current() }}/assign');
-                $reportForm.submit();
-            });
-        });
-
-    </script>
+        </script>
+    @endsection
 @endif
-@endsection
diff --git a/resources/views/admin/sales/_character_select.blade.php b/resources/views/admin/sales/_character_select.blade.php
index ae77db463a..e48fb9d22d 100644
--- a/resources/views/admin/sales/_character_select.blade.php
+++ b/resources/views/admin/sales/_character_select.blade.php
@@ -1,3 +1,12 @@
+@php
+    $characters = \App\Models\Character\Character::visible(Auth::check() ? Auth::user() : null)
+        ->myo(0)
+        ->orderBy('slug', 'DESC')
+        ->get()
+        ->pluck('fullName', 'slug')
+        ->toArray();
+@endphp
+
 <div id="characterComponents" class="hide">
     <div class="sales-character mb-3 card">
         <div class="card-body">
@@ -10,17 +19,19 @@
                     </div>
                 </div>
                 <div class="col-md-10">
-                    <a href="#" class="float-right fas fa-close"></a>
                     <div class="form-group">
-                        {!! Form::label('slug[]', 'Character Code') !!}
-                        {!! Form::text('slug[]', null, ['class' => 'form-control character-code']) !!}
+                        {!! Form::label('slug', 'Character Code') !!}
+                        {!! Form::select('slug[]', $characters, null, ['class' => 'form-control character-code', 'placeholder' => 'Select Character', 'placeholder' => 'Select Character']) !!}
                     </div>
                     <div class="character-details hide">
                         <h4>Sale Details</h4>
 
                         <div class="form-group mb-2">
                             {!! Form::label('Type') !!}
-                            {!! Form::select('sale_type[]', ['flatsale' => 'Flatsale', 'auction' => 'Auction', 'ota' => 'OTA', 'xta' => 'XTA', 'raffle' => 'Raffle', 'flaffle' => 'Flatsale Raffle', 'pwyw' => 'Pay What You Want'], null, ['class' => 'form-control character-sale-type', 'placeholder' => 'Select Sale Type']) !!}
+                            {!! Form::select('sale_type[]', ['flatsale' => 'Flatsale', 'auction' => 'Auction', 'ota' => 'OTA', 'xta' => 'XTA', 'raffle' => 'Raffle', 'flaffle' => 'Flatsale Raffle', 'pwyw' => 'Pay What You Want'], null, [
+                                'class' => 'form-control character-sale-type',
+                                'placeholder' => 'Select Sale Type',
+                            ]) !!}
                         </div>
 
                         <div class="saleType">
diff --git a/resources/views/admin/sales/_character_select_entry.blade.php b/resources/views/admin/sales/_character_select_entry.blade.php
index 8129f6c7c3..374807e3dc 100644
--- a/resources/views/admin/sales/_character_select_entry.blade.php
+++ b/resources/views/admin/sales/_character_select_entry.blade.php
@@ -1,3 +1,12 @@
+@php
+    $characters = \App\Models\Character\Character::visible(Auth::check() ? Auth::user() : null)
+        ->myo(0)
+        ->orderBy('slug', 'DESC')
+        ->get()
+        ->pluck('fullName', 'slug')
+        ->toArray();
+@endphp
+
 <div class="sales-character-entry mb-3 card">
     <div class="card-body">
         <div class="text-right"><a href="#" class="remove-character text-muted"><i class="fas fa-times"></i></a></div>
@@ -7,21 +16,24 @@
                     <div class="character-image-blank hide">Enter character code.</div>
                     <div class="character-image-loaded">
                         @include('home._character', ['character' => $character->character])
+                        {!! Form::hidden('image_id[]', $character->image_id) !!}
                     </div>
                 </div>
             </div>
             <div class="col-md-10">
-                <a href="#" class="float-right fas fa-close"></a>
                 <div class="form-group">
                     {!! Form::label('slug[]', 'Character Code') !!}
-                    {!! Form::text('slug[]', $character->character->slug, ['class' => 'form-control character-code']) !!}
+                    {!! Form::select('slug[]', $characters, $character->character->slug, ['class' => 'form-control character-code', 'placeholder' => 'Select Character']) !!}
                 </div>
                 <div class="character-details">
                     <h4>Sale Details</h4>
 
                     <div class="form-group mb-2">
                         {!! Form::label('Type') !!}
-                        {!! Form::select('sale_type[]', ['flatsale' => 'Flatsale', 'auction' => 'Auction', 'ota' => 'OTA', 'xta' => 'XTA', 'raffle' => 'Raffle', 'flaffle' => 'Flatsale Raffle', 'pwyw' => 'Pay What You Want'], $character->type, ['class' => 'form-control character-sale-type', 'placeholder' => 'Select Sale Type']) !!}
+                        {!! Form::select('sale_type[]', ['flatsale' => 'Flatsale', 'auction' => 'Auction', 'ota' => 'OTA', 'xta' => 'XTA', 'raffle' => 'Raffle', 'flaffle' => 'Flatsale Raffle', 'pwyw' => 'Pay What You Want'], $character->type, [
+                            'class' => 'form-control character-sale-type',
+                            'placeholder' => 'Select Sale Type',
+                        ]) !!}
                     </div>
 
                     <div class="saleType">
@@ -72,13 +84,13 @@
                         {!! Form::text('link[]', $character->link, ['class' => 'form-control', 'placeholder' => 'URL']) !!}
                     </div>
 
-                    @if($sales->characters->count() > 1)
+                    @if ($sales->characters->count() > 1)
                         <div class="form-group text-right">
-                            {!! Form::checkbox('character_is_open['.$character->character->slug.']', 1, $character->is_open, ['class' => 'form-check-input', 'data-toggle' => 'toggle']) !!}
+                            {!! Form::checkbox('character_is_open[' . $character->character->slug . ']', 1, $character->is_open, ['class' => 'form-check-input', 'data-toggle' => 'toggle']) !!}
                             {!! Form::label('character_is_open', 'Is Open', ['class' => 'form-check-label ml-3']) !!} {!! add_help('Whether or not this particular character is open or available. If the sale post itself is closed, all character sales attached will also be displayed as closed.') !!}
                         </div>
                     @else
-                        {!! Form::hidden('character_is_open['.$character->character->slug.']', 1) !!}
+                        {!! Form::hidden('character_is_open[' . $character->character->slug . ']', 1) !!}
                     @endif
 
                     {!! Form::hidden('new_entry[]', 0) !!}
@@ -87,4 +99,3 @@
         </div>
     </div>
 </div>
-
diff --git a/resources/views/admin/sales/_character_select_js.blade.php b/resources/views/admin/sales/_character_select_js.blade.php
index c1c7fa8696..f6dee691e1 100644
--- a/resources/views/admin/sales/_character_select_js.blade.php
+++ b/resources/views/admin/sales/_character_select_js.blade.php
@@ -14,13 +14,14 @@
             $clone = $components.find('.sales-character').clone();
             attachListeners($clone);
             $characters.append($clone);
+            $clone.find('.character-code').selectize();
             count++;
         });
 
         function attachListeners(node) {
             node.find('.character-code').on('change', function(e) {
                 var $parent = $(this).parent().parent().parent().parent();
-                $parent.find('.character-image-loaded').load('{{ url('admin/sales/character') }}/'+$(this).val(), function(response, status, xhr) {
+                $parent.find('.character-image-loaded').load('{{ url('admin/sales/character') }}/' + $(this).val(), function(response, status, xhr) {
                     $parent.find('.character-image-blank').addClass('hide');
                     $parent.find('.character-image-loaded').removeClass('hide');
                     $parent.find('.character-details').removeClass('hide');
@@ -41,23 +42,20 @@ function attachSaleTypeListener(node) {
                 $cell.children().addClass('hide');
                 $cell.children().children().val(null);
 
-                if(val == 'auction') {
+                if (val == 'auction') {
                     $cell.children('.auctionOptions').addClass('show');
                     $cell.children('.auctionOptions').removeClass('hide');
                     $cell.children('.xtaOptions').addClass('show');
                     $cell.children('.xtaOptions').removeClass('hide');
-                }
-                else if (val == 'flatsale' || val == 'flaffle'){
+                } else if (val == 'flatsale' || val == 'flaffle') {
                     $cell.children('.flatOptions').addClass('show');
                     $cell.children('.flatOptions').removeClass('hide');
-                }
-                else if (val == 'ota' || val == 'xta'){
+                } else if (val == 'ota' || val == 'xta') {
                     $cell.children('.xtaOptions').addClass('show');
                     $cell.children('.xtaOptions').removeClass('hide');
                     $cell.children('.pwywOptions').addClass('show');
                     $cell.children('.pwywOptions').removeClass('hide');
-                }
-                else if (val == 'pwyw'){
+                } else if (val == 'pwyw') {
                     $cell.children('.pwywOptions').addClass('show');
                     $cell.children('.pwywOptions').removeClass('hide');
                 }
@@ -66,4 +64,3 @@ function attachSaleTypeListener(node) {
 
     });
 </script>
-
diff --git a/resources/views/admin/sales/_delete_sales.blade.php b/resources/views/admin/sales/_delete_sales.blade.php
index e05387f9fc..99ae79d6f7 100644
--- a/resources/views/admin/sales/_delete_sales.blade.php
+++ b/resources/views/admin/sales/_delete_sales.blade.php
@@ -1,7 +1,8 @@
-@if($sales)
-    {!! Form::open(['url' => 'admin/sales/delete/'.$sales->id]) !!}
+@if ($sales)
+    {!! Form::open(['url' => 'admin/sales/delete/' . $sales->id]) !!}
 
-    <p>You are about to delete the sales post <strong>{{ $sales->title }}</strong>. This is not reversible. If you would like to preserve the content while preventing users from accessing the post, you can use the viewable setting instead to hide the post.</p>
+    <p>You are about to delete the sales post <strong>{{ $sales->title }}</strong>. This is not reversible. If you would like to preserve the content while preventing users from accessing the post, you can use the viewable setting instead to hide
+        the post.</p>
     <p>Are you sure you want to delete <strong>{{ $sales->title }}</strong>?</p>
 
     <div class="text-right">
@@ -9,6 +10,6 @@
     </div>
 
     {!! Form::close() !!}
-@else 
+@else
     Invalid post selected.
-@endif
\ No newline at end of file
+@endif
diff --git a/resources/views/admin/sales/create_edit_sales.blade.php b/resources/views/admin/sales/create_edit_sales.blade.php
index 386f590bdf..51158a0395 100644
--- a/resources/views/admin/sales/create_edit_sales.blade.php
+++ b/resources/views/admin/sales/create_edit_sales.blade.php
@@ -1,112 +1,117 @@
 @extends('admin.layout')
 
-@section('admin-title') Sales @endsection
+@section('admin-title')
+    {{ $sales->id ? 'Edit' : 'Create' }} Sales Post
+@endsection
 
 @section('admin-content')
-{!! breadcrumbs(['Admin Panel' => 'admin', 'Sales' => 'admin/sales', ($sales->id ? 'Edit' : 'Create').' Post' => $sales->id ? 'admin/sales/edit/'.$sales->id : 'admin/sales/create']) !!}
+    {!! breadcrumbs(['Admin Panel' => 'admin', 'Sales' => 'admin/sales', ($sales->id ? 'Edit' : 'Create') . ' Post' => $sales->id ? 'admin/sales/edit/' . $sales->id : 'admin/sales/create']) !!}
 
-<h1>{{ $sales->id ? 'Edit' : 'Create' }} Post
-    @if($sales->id)
-        <a href="#" class="btn btn-danger float-right delete-sales-button">Delete Post</a>
-    @endif
-</h1>
+    <h1>{{ $sales->id ? 'Edit' : 'Create' }} Sales Post
+        @if ($sales->id)
+            <a href="#" class="btn btn-danger float-right delete-sales-button">Delete Post</a>
+        @endif
+    </h1>
 
-{!! Form::open(['url' => $sales->id ? 'admin/sales/edit/'.$sales->id : 'admin/sales/create', 'files' => true]) !!}
+    {!! Form::open(['url' => $sales->id ? 'admin/sales/edit/' . $sales->id : 'admin/sales/create', 'files' => true]) !!}
 
-<h3>Basic Information</h3>
+    <h3>Basic Information</h3>
 
-<div class="row">
-    <div class="col-md-6">
-        <div class="form-group">
-            {!! Form::label('Title') !!}
-            {!! Form::text('title', $sales->title, ['class' => 'form-control']) !!}
+    <div class="row">
+        <div class="col-md-6">
+            <div class="form-group">
+                {!! Form::label('Title') !!}
+                {!! Form::text('title', $sales->title, ['class' => 'form-control']) !!}
+            </div>
         </div>
-    </div>
 
-    <div class="col-md-6">
-        <div class="form-group">
-            {!! Form::label('Post Time (Optional)') !!} {!! add_help('This is the time that the sales post should be posted. Make sure the Is Viewable switch is off.') !!}
-            {!! Form::text('post_at', $sales->post_at, ['class' => 'form-control datepicker']) !!}
+        <div class="col-md-6">
+            <div class="form-group">
+                {!! Form::label('Post Time (Optional)') !!} {!! add_help('This is the time that the sales post should be posted. Make sure the Is Viewable switch is off.') !!}
+                {!! Form::text('post_at', $sales->post_at, ['class' => 'form-control datepicker']) !!}
+            </div>
         </div>
     </div>
-</div>
-
-<div class="form-group">
-    {!! Form::label('Post Content') !!}
-    {!! Form::textarea('text', $sales->text, ['class' => 'form-control wysiwyg']) !!}
-</div>
-
-<div class="row">
-    <div class="col-md">
-        <div class="form-group">
-            {!! Form::checkbox('is_visible', 1, $sales->id ? $sales->is_visible : 1, ['class' => 'form-check-input', 'data-toggle' => 'toggle']) !!}
-            {!! Form::label('is_visible', 'Is Viewable', ['class' => 'form-check-label ml-3']) !!} {!! add_help('If this is turned off, the post will not be visible. If the post time is set, it will automatically become visible at/after the given post time, so make sure the post time is empty if you want it to be completely hidden.') !!}
-        </div>
+
+    <div class="form-group">
+        {!! Form::label('Post Content') !!}
+        {!! Form::textarea('text', $sales->text, ['class' => 'form-control wysiwyg']) !!}
     </div>
-    @if($sales->id && $sales->is_visible)
+
+    <div class="row">
         <div class="col-md">
             <div class="form-group">
-                {!! Form::checkbox('bump', 1, null, ['class' => 'form-check-input', 'data-toggle' => 'toggle']) !!}
-                {!! Form::label('bump', 'Bump Sale', ['class' => 'form-check-label ml-3']) !!} {!! add_help('If toggled on, this will alert users that there is a new sale. Best in conjunction with a clear notification of changes!') !!}
+                {!! Form::checkbox('is_visible', 1, $sales->id ? $sales->is_visible : 1, ['class' => 'form-check-input', 'data-toggle' => 'toggle']) !!}
+                {!! Form::label('is_visible', 'Is Viewable', ['class' => 'form-check-label ml-3']) !!} {!! add_help('If this is turned off, the post will not be visible. If the post time is set, it will automatically become visible at/after the given post time, so make sure the post time is empty if you want it to be completely hidden.') !!}
             </div>
         </div>
-    @endif
-    <div class="col-md">
-        <div class="form-group">
-            {!! Form::checkbox('is_open', 1, $sales->id ? $sales->is_open : 1, ['class' => 'form-check-input', 'data-toggle' => 'toggle']) !!}
-            {!! Form::label('is_open', 'Is Open', ['class' => 'form-check-label ml-3']) !!} {!! add_help('Whether or not the sale is open; used to label the post in the title. This should be on unless the sale is finished; if a time is set for comments to open, the sale will be labeled as \'Preview\' instead.') !!}
+        @if ($sales->id && $sales->is_visible)
+            <div class="col-md">
+                <div class="form-group">
+                    {!! Form::checkbox('bump', 1, null, ['class' => 'form-check-input', 'data-toggle' => 'toggle']) !!}
+                    {!! Form::label('bump', 'Bump Sale', ['class' => 'form-check-label ml-3']) !!} {!! add_help('If toggled on, this will alert users that there is a new sale. Best in conjunction with a clear notification of changes!') !!}
+                </div>
+            </div>
+        @endif
+        <div class="col-md">
+            <div class="form-group">
+                {!! Form::checkbox('is_open', 1, $sales->id ? $sales->is_open : 1, ['class' => 'form-check-input', 'data-toggle' => 'toggle']) !!}
+                {!! Form::label('is_open', 'Is Open', ['class' => 'form-check-label ml-3']) !!} {!! add_help('Whether or not the sale is open; used to label the post in the title. This should be on unless the sale is finished; if a time is set for comments to open, the sale will be labeled as \'Preview\' instead.') !!}
+            </div>
         </div>
-    </div>
-    <div class="col-md">
-        <div class="form-group">
-            {!! Form::label('comments_open_at', 'Comments Open At (Optional)') !!} {!! add_help('The time at which comments open to members. Staff can post comments before this time.') !!}
-            {!! Form::text('comments_open_at', $sales->comments_open_at, ['class' => 'form-control datepicker']) !!}
+        <div class="col-md">
+            <div class="form-group">
+                {!! Form::label('comments_open_at', 'Comments Open At (Optional)') !!} {!! add_help('The time at which comments open to members. Staff can post comments before this time.') !!}
+                {!! Form::text('comments_open_at', $sales->comments_open_at, ['class' => 'form-control datepicker']) !!}
+            </div>
         </div>
     </div>
-</div>
-
-<h3>Characters</h3>
-<p>
-    Add characters to be featured in this sales post.
-</p>
 
-<div id="characters" class="mb-3">
-    @if($sales->id)
-        @foreach($sales->characters as $character)
-            @include('admin.sales._character_select_entry', ['character' => $character])
-        @endforeach
-    @endif
-</div>
-<div class="text-right mb-3">
-    <a href="#" class="btn btn-outline-info" id="addCharacter">Add Character</a>
-</div>
+    <h3>Characters</h3>
+    <p>
+        Add characters to be featured in this sales post.
+    </p>
+
+    <div id="characters" class="mb-3">
+        @if ($sales->id)
+            @if (count(
+                    $sales->characters()->whereRelation('character', 'deleted_at', null)->get()) != count($sales->characters))
+                <div class="alert alert-warning">
+                    <strong>Warning!</strong> Some characters have been deleted since they were added to this post. Editing this post will remove those characters permanently from the post.
+                </div>
+            @endif
+            @foreach ($sales->characters()->whereRelation('character', 'deleted_at', null)->get() as $character)
+                @include('admin.sales._character_select_entry', ['character' => $character])
+            @endforeach
+        @endif
+    </div>
+    <div class="text-right mb-3">
+        <a href="#" class="btn btn-outline-info" id="addCharacter">Add Character</a>
+    </div>
 
-<div class="text-right">
-    {!! Form::submit($sales->id ? 'Edit' : 'Create', ['class' => 'btn btn-primary']) !!}
-</div>
+    <div class="text-right">
+        {!! Form::submit($sales->id ? 'Edit' : 'Create', ['class' => 'btn btn-primary']) !!}
+    </div>
 
-{!! Form::close() !!}
+    {!! Form::close() !!}
 
-@include('admin.sales._character_select')
+    @include('admin.sales._character_select')
 
 @endsection
 
 @section('scripts')
-@parent
-
-@include('admin.sales._character_select_js')
-
-<script>
-$( document ).ready(function() {
-    $('.delete-sales-button').on('click', function(e) {
-        e.preventDefault();
-        loadModal("{{ url('admin/sales/delete') }}/{{ $sales->id }}", 'Delete Post');
-    });
-
-    $( ".datepicker" ).datetimepicker({
-        dateFormat: "yy-mm-dd",
-        timeFormat: 'HH:mm:ss',
-    });
-});
-</script>
+    @parent
+
+    @include('admin.sales._character_select_js')
+    @include('widgets._datetimepicker_js')
+
+    <script>
+        $(document).ready(function() {
+            $('.delete-sales-button').on('click', function(e) {
+                e.preventDefault();
+                loadModal("{{ url('admin/sales/delete') }}/{{ $sales->id }}", 'Delete Post');
+            });
+
+        });
+    </script>
 @endsection
diff --git a/resources/views/admin/sales/sales.blade.php b/resources/views/admin/sales/sales.blade.php
index d2efb35199..c076c49d52 100644
--- a/resources/views/admin/sales/sales.blade.php
+++ b/resources/views/admin/sales/sales.blade.php
@@ -1,52 +1,68 @@
 @extends('admin.layout')
 
-@section('admin-title') Sales @endsection
+@section('admin-title')
+    Sales
+@endsection
 
 @section('admin-content')
-{!! breadcrumbs(['Admin Panel' => 'admin', 'Sales' => 'admin/sales']) !!}
+    {!! breadcrumbs(['Admin Panel' => 'admin', 'Sales' => 'admin/sales']) !!}
 
-<h1>Sales</h1>
+    <h1>Sales</h1>
 
-<p>You can create new sales posts here. Creating a sales post alerts every user that there is a new post, unless the post is marked as not viewable (see the post creation page for details).</p>
+    <p>You can create new sales posts here. Creating a sales post alerts every user that there is a new post, unless the post is marked as not viewable (see the post creation page for details).</p>
 
-<div class="text-right mb-3"><a class="btn btn-primary" href="{{ url('admin/sales/create') }}"><i class="fas fa-plus"></i> Create New Sales Post</a></div>
-@if(!count($saleses))
-    <p>No sales found.</p>
-@else 
-    {!! $saleses->render() !!}
-    <table class="table table-sm page-table">
-        <thead>
-            <tr>
-                <th>Title</th>
-                <th>Posted At</th>
-                <th>Last Edited</th>
-                <th></th>
-            </tr>
-        </thead>
-        <tbody>
-            @foreach($saleses as $sales)
-                <tr>
-                    <td>
-                        @if(!$sales->is_visible)
-                            @if($sales->post_at)
-                                <i class="fas fa-clock" data-toggle="tooltip" title="This post is scheduled to be posted in the future."></i>
-                            @else 
-                                <i class="fas fa-eye-slash" data-toggle="tooltip" title="This post is hidden."></i>
-                            @endif
-                        @endif
-                        <a href="{{ $sales->url }}">{{ $sales->title }}</a>
-                    </td>
-                    <td>{!! format_date($sales->post_at ? : $sales->created_at) !!}</td>
-                    <td>{!! format_date($sales->updated_at) !!}</td>
-                    <td class="text-right">
-                        <a href="{{ url('admin/sales/edit/'.$sales->id) }}" class="btn btn-primary">Edit</a>
-                    </td>
-                </tr>
-            @endforeach
-        </tbody>
+    <div class="text-right mb-3"><a class="btn btn-primary" href="{{ url('admin/sales/create') }}"><i class="fas fa-plus"></i> Create New Sales Post</a></div>
+    @if (!count($saleses))
+        <p>No sales found.</p>
+    @else
+        {!! $saleses->render() !!}
+        <div class="mb-4 logs-table">
+            <div class="logs-table-header">
+                <div class="row">
+                    <div class="col-12 col-md-5">
+                        <div class="logs-table-cell">Title</div>
+                    </div>
+                    <div class="col-6 col-md-3">
+                        <div class="logs-table-cell">Posted At</div>
+                    </div>
+                    <div class="col-6 col-md-3">
+                        <div class="logs-table-cell">Last Edited</div>
+                    </div>
+                </div>
+            </div>
+            <div class="logs-table-body">
+                @foreach ($saleses as $sales)
+                    <div class="logs-table-row">
+                        <div class="row flex-wrap">
+                            <div class="col-12 col-md-5">
+                                <div class="logs-table-cell">
+                                    @if (!$sales->is_visible)
+                                        @if ($sales->post_at)
+                                            <i class="fas fa-clock mr-1" data-toggle="tooltip" title="This post is scheduled to be posted in the future."></i>
+                                        @else
+                                            <i class="fas fa-eye-slash mr-1" data-toggle="tooltip" title="This post is hidden."></i>
+                                        @endif
+                                    @endif
+                                    <a href="{{ $sales->url }}">{{ $sales->title }}</a>
+                                </div>
+                            </div>
+                            <div class="col-6 col-md-3">
+                                <div class="logs-table-cell">{!! pretty_date($sales->post_at ?: $sales->created_at) !!}</div>
+                            </div>
+                            <div class="col-6 col-md-3">
+                                <div class="logs-table-cell">{!! pretty_date($sales->updated_at) !!}</div>
+                            </div>
+                            <div class="col-12 col-md-1 text-right">
+                                <div class="logs-table-cell"><a href="{{ url('admin/sales/edit/' . $sales->id) }}" class="btn btn-primary py-0 px-2 w-100">Edit</a></div>
+                            </div>
+                        </div>
+                    </div>
+                @endforeach
+            </div>
+        </div>
+        {!! $saleses->render() !!}
 
-    </table>
-    {!! $saleses->render() !!}
-@endif
+        <div class="text-center mt-4 small text-muted">{{ $saleses->total() }} result{{ $saleses->total() == 1 ? '' : 's' }} found.</div>
+    @endif
 
-@endsection
\ No newline at end of file
+@endsection
diff --git a/resources/views/admin/settings/settings.blade.php b/resources/views/admin/settings/settings.blade.php
index fbb973a8b6..ccc3f4b982 100644
--- a/resources/views/admin/settings/settings.blade.php
+++ b/resources/views/admin/settings/settings.blade.php
@@ -1,48 +1,64 @@
 @extends('admin.layout')
 
-@section('admin-title') Site Settings @endsection
+@section('admin-title')
+    Site Settings
+@endsection
 
 @section('admin-content')
-{!! breadcrumbs(['Admin Panel' => 'admin', 'Site Settings' => 'admin/settings']) !!}
+    {!! breadcrumbs(['Admin Panel' => 'admin', 'Site Settings' => 'admin/settings']) !!}
 
-<h1>Site Settings</h1>
+    <h1>Site Settings</h1>
 
-<p>This is a list of settings that can be quickly modified to alter the site behaviour. Please make sure that the values correspond to the possible options as stated in the descriptions! Incorrect values can cause the site to stop working. Additional settings can be found in the code config files.</p>
+    <p>This is a list of settings that can be quickly modified to alter the site behaviour. Please make sure that the values correspond to the possible options as stated in the descriptions! Incorrect values can cause the site to stop working. Additional
+        settings can be found in the code config files.</p>
 
-@if(!count($settings))
-    <p>No settings found.</p>
-@else 
-    {!! $settings->render() !!}
-    <table class="table table-sm setting-table">
-        <thead>
-            <tr>
-                <th>Key</th>
-                <th>Description</th>
-                <th>Value</th>
-                <th></th>
-            </tr>
-        </thead>
-        <tbody>
-            @foreach($settings as $setting)
-                <tr>
-                    <td>{{ $setting->key }}</td>
-                    <td>{{ $setting->description }}</td>
-                    <td>
-                        {!! Form::open(['url' => 'admin/settings/'.$setting->key, 'class' => 'd-flex justify-content-end']) !!}
-                            <div class="form-group mr-3 mb-3">
-                                {!! Form::text('value', $setting->value, ['class' => 'form-control']) !!}
+    @if (!count($settings))
+        <p>No settings found.</p>
+    @else
+        {!! $settings->render() !!}
+        <div class="mb-4 logs-table setting-table">
+            <div class="logs-table-header">
+                <div class="row">
+                    <div class="col-6 col-md-3">
+                        <div class="logs-table-cell">Key</div>
+                    </div>
+                    <div class="col-6 col-md-3">
+                        <div class="logs-table-cell">Description</div>
+                    </div>
+                    <div class="col-md-6">
+                        <div class="logs-table-cell">Value</div>
+                    </div>
+                </div>
+            </div>
+            <div class="logs-table-body">
+                @foreach ($settings as $setting)
+                    <div class="logs-table-row">
+                        <div class="row flex-wrap">
+                            <div class="col-6 col-md-3">
+                                <div class="logs-table-cell">{{ $setting->key }}</div>
                             </div>
-                            <div class="form-group mb-3">
-                                {!! Form::submit('Edit', ['class' => 'btn btn-primary']) !!}
+                            <div class="col-6 col-md-3">
+                                <div class="logs-table-cell">{{ $setting->description }}</div>
                             </div>
-                        {!! Form::close() !!}
-                    </td>
-                </tr>
-            @endforeach
-        </tbody>
+                            <div class="col-6 col-md-3">
+                                <div class="logs-table-cell">
+                                    {!! Form::open(['url' => 'admin/settings/' . $setting->key, 'class' => 'd-flex justify-content-end']) !!}
+                                    <div class="form-group mr-3 mb-3">
+                                        {!! Form::text('value', $setting->value, ['class' => 'form-control']) !!}
+                                    </div>
+                                    <div class="form-group mb-3">
+                                        {!! Form::submit('Edit', ['class' => 'btn btn-primary']) !!}
+                                    </div>
+                                    {!! Form::close() !!}
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                @endforeach
+            </div>
 
-    </table>
-    {!! $settings->render() !!}
-@endif
+        </div>
+        {!! $settings->render() !!}
+    @endif
 
-@endsection
\ No newline at end of file
+@endsection
diff --git a/resources/views/admin/shops/_delete_shop.blade.php b/resources/views/admin/shops/_delete_shop.blade.php
index 39fbe7d6be..900e3cd87e 100644
--- a/resources/views/admin/shops/_delete_shop.blade.php
+++ b/resources/views/admin/shops/_delete_shop.blade.php
@@ -1,5 +1,5 @@
-@if($shop)
-    {!! Form::open(['url' => 'admin/data/shops/delete/'.$shop->id]) !!}
+@if ($shop)
+    {!! Form::open(['url' => 'admin/data/shops/delete/' . $shop->id]) !!}
 
     <p>You are about to delete the shop <strong>{{ $shop->name }}</strong>. This is not reversible. If you would like to hide the shop from users, you can set it as inactive from the shop settings page.</p>
     <p>Are you sure you want to delete <strong>{{ $shop->name }}</strong>?</p>
@@ -9,6 +9,6 @@
     </div>
 
     {!! Form::close() !!}
-@else 
+@else
     Invalid shop selected.
-@endif
\ No newline at end of file
+@endif
diff --git a/resources/views/admin/shops/_stock.blade.php b/resources/views/admin/shops/_stock.blade.php
index 2776534f4e..533d81780a 100644
--- a/resources/views/admin/shops/_stock.blade.php
+++ b/resources/views/admin/shops/_stock.blade.php
@@ -2,50 +2,50 @@
     <div class="card-body">
         <div class="text-right mb-3"><a href="#" class="remove-stock-button btn btn-danger">Remove</a></div>
         <div class="form-group">
-            {!! Form::label('item_id['.$key.']', 'Item') !!}
-            {!! Form::select('item_id['.$key.']', $items, $stock ? $stock->item_id : null, ['class' => 'form-control stock-field', 'data-name' => 'item_id']) !!}
+            {!! Form::label('item_id[' . $key . ']', 'Item') !!}
+            {!! Form::select('item_id[' . $key . ']', $items, $stock ? $stock->item_id : null, ['class' => 'form-control stock-field', 'data-name' => 'item_id']) !!}
         </div>
         <div class="form-group">
-            {!! Form::label('cost['.$key.']', 'Cost') !!}
+            {!! Form::label('cost[' . $key . ']', 'Cost') !!}
             <div class="row">
                 <div class="col-4">
-                    {!! Form::text('cost['.$key.']', $stock ? $stock->cost : null, ['class' => 'form-control stock-field', 'data-name' => 'cost']) !!}
+                    {!! Form::text('cost[' . $key . ']', $stock ? $stock->cost : null, ['class' => 'form-control stock-field', 'data-name' => 'cost']) !!}
                 </div>
                 <div class="col-8">
-                    {!! Form::select('currency_id['.$key.']', $currencies, $stock ? $stock->currency_id : null, ['class' => 'form-control stock-field', 'data-name' => 'currency_id']) !!}
+                    {!! Form::select('currency_id[' . $key . ']', $currencies, $stock ? $stock->currency_id : null, ['class' => 'form-control stock-field', 'data-name' => 'currency_id']) !!}
                 </div>
             </div>
         </div>
-        
+
         <div class="row">
             <div class="col-md-6">
                 <div class="form-group">
-                    {!! Form::checkbox('use_user_bank['.$key.']', 1, $stock ? $stock->use_user_bank : 1, ['class' => 'form-check-input stock-toggle stock-field', 'data-name' => 'use_user_bank']) !!}
-                    {!! Form::label('use_user_bank['.$key.']', 'Use User Bank', ['class' => 'form-check-label ml-3']) !!} {!! add_help('This will allow users to purchase the item using the currency in their accounts, provided that users can own that currency.') !!}
+                    {!! Form::checkbox('use_user_bank[' . $key . ']', 1, $stock ? $stock->use_user_bank : 1, ['class' => 'form-check-input stock-toggle stock-field', 'data-name' => 'use_user_bank']) !!}
+                    {!! Form::label('use_user_bank[' . $key . ']', 'Use User Bank', ['class' => 'form-check-label ml-3']) !!} {!! add_help('This will allow users to purchase the item using the currency in their accounts, provided that users can own that currency.') !!}
                 </div>
             </div>
             <div class="col-md-6">
                 <div class="form-group mb-0">
-                    {!! Form::checkbox('use_character_bank['.$key.']', 1, $stock ? $stock->use_character_bank : 1, ['class' => 'form-check-input stock-toggle stock-field', 'data-name' => 'use_character_bank']) !!}
-                    {!! Form::label('use_character_bank['.$key.']', 'Use Character Bank', ['class' => 'form-check-label ml-3']) !!} {!! add_help('This will allow users to purchase the item using the currency belonging to characters they own, provided that characters can own that currency.') !!}
+                    {!! Form::checkbox('use_character_bank[' . $key . ']', 1, $stock ? $stock->use_character_bank : 1, ['class' => 'form-check-input stock-toggle stock-field', 'data-name' => 'use_character_bank']) !!}
+                    {!! Form::label('use_character_bank[' . $key . ']', 'Use Character Bank', ['class' => 'form-check-label ml-3']) !!} {!! add_help('This will allow users to purchase the item using the currency belonging to characters they own, provided that characters can own that currency.') !!}
                 </div>
             </div>
         </div>
         <div class="form-group">
-            {!! Form::checkbox('is_limited_stock['.$key.']', 1, $stock ? $stock->is_limited_stock : false, ['class' => 'form-check-input stock-limited stock-toggle stock-field', 'data-name' => 'is_limited_stock']) !!}
-            {!! Form::label('is_limited_stock['.$key.']', 'Set Limited Stock', ['class' => 'form-check-label ml-3']) !!} {!! add_help('If turned on, will limit the amount purchaseable to the quantity set below.') !!}
+            {!! Form::checkbox('is_limited_stock[' . $key . ']', 1, $stock ? $stock->is_limited_stock : false, ['class' => 'form-check-input stock-limited stock-toggle stock-field', 'data-name' => 'is_limited_stock']) !!}
+            {!! Form::label('is_limited_stock[' . $key . ']', 'Set Limited Stock', ['class' => 'form-check-label ml-3']) !!} {!! add_help('If turned on, will limit the amount purchaseable to the quantity set below.') !!}
         </div>
         <div class="card mb-3 stock-limited-quantity {{ $stock && $stock->is_limited_stock ? '' : 'hide' }}">
             <div class="card-body">
                 <div>
-                    {!! Form::label('quantity['.$key.']', 'Quantity') !!} {!! add_help('If left blank, will be set to 0 (sold out).') !!}
-                    {!! Form::text('quantity['.$key.']', $stock ? $stock->quantity : 0, ['class' => 'form-control stock-field', 'data-name' => 'quantity']) !!}
+                    {!! Form::label('quantity[' . $key . ']', 'Quantity') !!} {!! add_help('If left blank, will be set to 0 (sold out).') !!}
+                    {!! Form::text('quantity[' . $key . ']', $stock ? $stock->quantity : 0, ['class' => 'form-control stock-field', 'data-name' => 'quantity']) !!}
                 </div>
             </div>
         </div>
         <div>
-            {!! Form::label('purchase_limit['.$key.']', 'User Purchase Limit') !!} {!! add_help('This is the maximum amount of this item a user can purchase from this shop. Set to 0 to allow infinite purchases.') !!}
-            {!! Form::text('purchase_limit['.$key.']', $stock ? $stock->purchase_limit : 0, ['class' => 'form-control stock-field', 'data-name' => 'purchase_limit']) !!}
+            {!! Form::label('purchase_limit[' . $key . ']', 'User Purchase Limit') !!} {!! add_help('This is the maximum amount of this item a user can purchase from this shop. Set to 0 to allow infinite purchases.') !!}
+            {!! Form::text('purchase_limit[' . $key . ']', $stock ? $stock->purchase_limit : 0, ['class' => 'form-control stock-field', 'data-name' => 'purchase_limit']) !!}
         </div>
     </div>
-</div>
\ No newline at end of file
+</div>
diff --git a/resources/views/admin/shops/create_edit_shop.blade.php b/resources/views/admin/shops/create_edit_shop.blade.php
index 6392058534..5bcd734eaa 100644
--- a/resources/views/admin/shops/create_edit_shop.blade.php
+++ b/resources/views/admin/shops/create_edit_shop.blade.php
@@ -1,127 +1,130 @@
 @extends('admin.layout')
 
-@section('admin-title') Shops @endsection
+@section('admin-title')
+    {{ $shop->id ? 'Edit' : 'Create' }} Shop
+@endsection
 
 @section('admin-content')
-{!! breadcrumbs(['Admin Panel' => 'admin', 'Shops' => 'admin/data/shops', ($shop->id ? 'Edit' : 'Create').' Shop' => $shop->id ? 'admin/data/shops/edit/'.$shop->id : 'admin/data/shops/create']) !!}
+    {!! breadcrumbs(['Admin Panel' => 'admin', 'Shops' => 'admin/data/shops', ($shop->id ? 'Edit' : 'Create') . ' Shop' => $shop->id ? 'admin/data/shops/edit/' . $shop->id : 'admin/data/shops/create']) !!}
 
-<h1>{{ $shop->id ? 'Edit' : 'Create' }} Shop
-    @if($shop->id)
-        ({!! $shop->displayName !!})
-        <a href="#" class="btn btn-danger float-right delete-shop-button">Delete Shop</a>
-    @endif
-</h1>
+    <h1>{{ $shop->id ? 'Edit' : 'Create' }} Shop
+        @if ($shop->id)
+            ({!! $shop->displayName !!})
+            <a href="#" class="btn btn-danger float-right delete-shop-button">Delete Shop</a>
+        @endif
+    </h1>
 
-{!! Form::open(['url' => $shop->id ? 'admin/data/shops/edit/'.$shop->id : 'admin/data/shops/create', 'files' => true]) !!}
+    {!! Form::open(['url' => $shop->id ? 'admin/data/shops/edit/' . $shop->id : 'admin/data/shops/create', 'files' => true]) !!}
 
-<h3>Basic Information</h3>
+    <h3>Basic Information</h3>
 
-<div class="form-group">
-    {!! Form::label('Name') !!}
-    {!! Form::text('name', $shop->name, ['class' => 'form-control']) !!}
-</div>
+    <div class="form-group">
+        {!! Form::label('Name') !!}
+        {!! Form::text('name', $shop->name, ['class' => 'form-control']) !!}
+    </div>
 
-<div class="form-group">
-    {!! Form::label('Shop Image (Optional)') !!} {!! add_help('This image is used on the shop index and on the shop page as a header.') !!}
-    <div>{!! Form::file('image') !!}</div>
-    <div class="text-muted">Recommended size: None (Choose a standard size for all shop images)</div>
-    @if($shop->has_image)
-        <div class="form-check">
-            {!! Form::checkbox('remove_image', 1, false, ['class' => 'form-check-input']) !!}
-            {!! Form::label('remove_image', 'Remove current image', ['class' => 'form-check-label']) !!}
-        </div>
-    @endif
-</div>
+    <div class="form-group">
+        {!! Form::label('Shop Image (Optional)') !!} {!! add_help('This image is used on the shop index and on the shop page as a header.') !!}
+        <div>{!! Form::file('image') !!}</div>
+        <div class="text-muted">Recommended size: None (Choose a standard size for all shop images)</div>
+        @if ($shop->has_image)
+            <div class="form-check">
+                {!! Form::checkbox('remove_image', 1, false, ['class' => 'form-check-input']) !!}
+                {!! Form::label('remove_image', 'Remove current image', ['class' => 'form-check-label']) !!}
+            </div>
+        @endif
+    </div>
 
-<div class="form-group">
-    {!! Form::label('Description (Optional)') !!}
-    {!! Form::textarea('description', $shop->description, ['class' => 'form-control wysiwyg']) !!}
-</div>
+    <div class="form-group">
+        {!! Form::label('Description (Optional)') !!}
+        {!! Form::textarea('description', $shop->description, ['class' => 'form-control wysiwyg']) !!}
+    </div>
 
-<div class="form-group">
-    {!! Form::checkbox('is_active', 1, $shop->id ? $shop->is_active : 1, ['class' => 'form-check-input', 'data-toggle' => 'toggle']) !!}
-    {!! Form::label('is_active', 'Set Active', ['class' => 'form-check-label ml-3']) !!} {!! add_help('If turned off, the shop will not be visible to regular users.') !!}
-</div>
+    <div class="form-group">
+        {!! Form::checkbox('is_active', 1, $shop->id ? $shop->is_active : 1, ['class' => 'form-check-input', 'data-toggle' => 'toggle']) !!}
+        {!! Form::label('is_active', 'Set Active', ['class' => 'form-check-label ml-3']) !!} {!! add_help('If turned off, the shop will not be visible to regular users.') !!}
+    </div>
 
-<div class="text-right">
-    {!! Form::submit($shop->id ? 'Edit' : 'Create', ['class' => 'btn btn-primary']) !!}
-</div>
+    <div class="text-right">
+        {!! Form::submit($shop->id ? 'Edit' : 'Create', ['class' => 'btn btn-primary']) !!}
+    </div>
 
-{!! Form::close() !!}
+    {!! Form::close() !!}
 
-@if($shop->id)
-    <h3>Shop Stock</h3>
-    {!! Form::open(['url' => 'admin/data/shops/stock/'.$shop->id]) !!}
+    @if ($shop->id)
+        <h3>Shop Stock</h3>
+        {!! Form::open(['url' => 'admin/data/shops/stock/' . $shop->id]) !!}
         <div class="text-right mb-3">
             <a href="#" class="add-stock-button btn btn-outline-primary">Add Stock</a>
         </div>
         <div id="shopStock">
-            @foreach($shop->stock as $key=>$stock)
+            @foreach ($shop->stock as $key => $stock)
                 @include('admin.shops._stock', ['stock' => $stock, 'key' => $key])
             @endforeach
         </div>
         <div class="text-right">
             {!! Form::submit('Edit', ['class' => 'btn btn-primary']) !!}
         </div>
-    {!! Form::close() !!}
-    <div class="" id="shopStockData">
-        @include('admin.shops._stock', ['stock' => null, 'key' => 0])
-    </div>
-@endif
+        {!! Form::close() !!}
+        <div class="" id="shopStockData">
+            @include('admin.shops._stock', ['stock' => null, 'key' => 0])
+        </div>
+    @endif
 
 @endsection
 
 @section('scripts')
-@parent
-<script>
-$( document ).ready(function() {
-    var $shopStock = $('#shopStock');
-    var $stock = $('#shopStockData').find('.stock');
-
-    $('.delete-shop-button').on('click', function(e) {
-        e.preventDefault();
-        loadModal("{{ url('admin/data/shops/delete') }}/{{ $shop->id }}", 'Delete Shop');
-    });
-    $('.add-stock-button').on('click', function(e) {
-        e.preventDefault();
-
-        var clone = $stock.clone();
-        $shopStock.append(clone);
-        clone.removeClass('hide');
-        attachStockListeners(clone);
-        refreshStockFieldNames();
-    });
-
-    attachStockListeners($('#shopStock .stock'));
-    function attachStockListeners(stock) {
-        stock.find('.stock-toggle').bootstrapToggle();
-        stock.find('.stock-limited').on('change', function(e) {
-            var $this = $(this);
-            if($this.is(':checked')) {
-                $this.parent().parent().parent().parent().find('.stock-limited-quantity').removeClass('hide');
+    @parent
+    <script>
+        $(document).ready(function() {
+            var $shopStock = $('#shopStock');
+            var $stock = $('#shopStockData').find('.stock');
+
+            $('.delete-shop-button').on('click', function(e) {
+                e.preventDefault();
+                loadModal("{{ url('admin/data/shops/delete') }}/{{ $shop->id }}", 'Delete Shop');
+            });
+            $('.add-stock-button').on('click', function(e) {
+                e.preventDefault();
+
+                var clone = $stock.clone();
+                $shopStock.append(clone);
+                clone.removeClass('hide');
+                attachStockListeners(clone);
+                refreshStockFieldNames();
+            });
+
+            attachStockListeners($('#shopStock .stock'));
+
+            function attachStockListeners(stock) {
+                stock.find('.stock-toggle').bootstrapToggle();
+                stock.find('.stock-limited').on('change', function(e) {
+                    var $this = $(this);
+                    if ($this.is(':checked')) {
+                        $this.parent().parent().parent().parent().find('.stock-limited-quantity').removeClass('hide');
+                    } else {
+                        $this.parent().parent().parent().parent().find('.stock-limited-quantity').addClass('hide');
+                    }
+                });
+                stock.find('.remove-stock-button').on('click', function(e) {
+                    e.preventDefault();
+                    $(this).parent().parent().parent().remove();
+                    refreshStockFieldNames();
+                });
+                stock.find('.card-body [data-toggle=tooltip]').tooltip({
+                    html: true
+                });
             }
-            else {
-                $this.parent().parent().parent().parent().find('.stock-limited-quantity').addClass('hide');
+
+            function refreshStockFieldNames() {
+                $('.stock').each(function(index) {
+                    var $this = $(this);
+                    var key = index;
+                    $this.find('.stock-field').each(function() {
+                        $(this).attr('name', $(this).data('name') + '[' + key + ']');
+                    });
+                });
             }
         });
-        stock.find('.remove-stock-button').on('click', function(e) {
-            e.preventDefault();
-            $(this).parent().parent().parent().remove();
-            refreshStockFieldNames();
-        });
-        stock.find('.card-body [data-toggle=tooltip]').tooltip({html: true});
-    }
-    function refreshStockFieldNames()
-    {
-        $('.stock').each(function(index) {
-            var $this = $(this);
-            var key = index;
-            $this.find('.stock-field').each(function() {
-                $(this).attr('name', $(this).data('name') + '[' + key + ']');
-            });
-        });
-    }
-});
-    
-</script>
-@endsection
\ No newline at end of file
+    </script>
+@endsection
diff --git a/resources/views/admin/shops/shops.blade.php b/resources/views/admin/shops/shops.blade.php
index 1a2d1dcf81..a4a1f06817 100644
--- a/resources/views/admin/shops/shops.blade.php
+++ b/resources/views/admin/shops/shops.blade.php
@@ -1,65 +1,70 @@
 @extends('admin.layout')
 
-@section('admin-title') Shops @endsection
+@section('admin-title')
+    Shops
+@endsection
 
 @section('admin-content')
-{!! breadcrumbs(['Admin Panel' => 'admin', 'Shops' => 'admin/data/shops']) !!}
+    {!! breadcrumbs(['Admin Panel' => 'admin', 'Shops' => 'admin/data/shops']) !!}
 
-<h1>Shops</h1>
+    <h1>Shops</h1>
 
-<p>This is a list of shops that users can use currency to purchase from.</p> 
-<p>The sorting order reflects the order in which the shops will be listed on the shop index.</p>
+    <p>This is a list of shops that users can use currency to purchase from.</p>
+    <p>The sorting order reflects the order in which the shops will be listed on the shop index.</p>
 
-<div class="text-right mb-3"><a class="btn btn-primary" href="{{ url('admin/data/shops/create') }}"><i class="fas fa-plus"></i> Create New Shop</a></div>
-@if(!count($shops))
-    <p>No item shops found.</p>
-@else 
-    <table class="table table-sm shop-table">
-        <tbody id="sortable" class="sortable">
-            @foreach($shops as $shop)
-                <tr class="sort-item" data-id="{{ $shop->id }}">
-                    <td>
-                        <a class="fas fa-arrows-alt-v handle mr-3" href="#"></a>
-                        {!! $shop->displayName !!}
-                    </td>
-                    <td class="text-right">
-                        <a href="{{ url('admin/data/shops/edit/'.$shop->id) }}" class="btn btn-primary">Edit</a>
-                    </td>
-                </tr>
-            @endforeach
-        </tbody>
+    <div class="text-right mb-3"><a class="btn btn-primary" href="{{ url('admin/data/shops/create') }}"><i class="fas fa-plus"></i> Create New Shop</a></div>
+    @if (!count($shops))
+        <p>No item shops found.</p>
+    @else
+        <table class="table table-sm shop-table">
+            <tbody id="sortable" class="sortable">
+                @foreach ($shops as $shop)
+                    <tr class="sort-item" data-id="{{ $shop->id }}">
+                        <td>
+                            <a class="fas fa-arrows-alt-v handle mr-3" href="#"></a>
+                            {!! $shop->displayName !!}
+                        </td>
+                        <td class="text-right">
+                            <a href="{{ url('admin/data/shops/edit/' . $shop->id) }}" class="btn btn-primary">Edit</a>
+                        </td>
+                    </tr>
+                @endforeach
+            </tbody>
 
-    </table>
-    <div class="mb-4">
-        {!! Form::open(['url' => 'admin/data/shops/sort']) !!}
-        {!! Form::hidden('sort', '', ['id' => 'sortableOrder']) !!}
-        {!! Form::submit('Save Order', ['class' => 'btn btn-primary']) !!}
-        {!! Form::close() !!}
-    </div>
-@endif
+        </table>
+        <div class="mb-4">
+            {!! Form::open(['url' => 'admin/data/shops/sort']) !!}
+            {!! Form::hidden('sort', '', ['id' => 'sortableOrder']) !!}
+            {!! Form::submit('Save Order', ['class' => 'btn btn-primary']) !!}
+            {!! Form::close() !!}
+        </div>
+    @endif
 
 @endsection
 
 @section('scripts')
-@parent
-<script>
-
-$( document ).ready(function() {
-    $('.handle').on('click', function(e) {
-        e.preventDefault();
-    });
-    $( "#sortable" ).sortable({
-        items: '.sort-item',
-        handle: ".handle",
-        placeholder: "sortable-placeholder",
-        stop: function( event, ui ) {
-            $('#sortableOrder').val($(this).sortable("toArray", {attribute:"data-id"}));
-        },
-        create: function() {
-            $('#sortableOrder').val($(this).sortable("toArray", {attribute:"data-id"}));
-        }
-    });
-    $( "#sortable" ).disableSelection();
-});
-</script>
-@endsection
\ No newline at end of file
+    @parent
+    <script>
+        $(document).ready(function() {
+            $('.handle').on('click', function(e) {
+                e.preventDefault();
+            });
+            $("#sortable").sortable({
+                items: '.sort-item',
+                handle: ".handle",
+                placeholder: "sortable-placeholder",
+                stop: function(event, ui) {
+                    $('#sortableOrder').val($(this).sortable("toArray", {
+                        attribute: "data-id"
+                    }));
+                },
+                create: function() {
+                    $('#sortableOrder').val($(this).sortable("toArray", {
+                        attribute: "data-id"
+                    }));
+                }
+            });
+            $("#sortable").disableSelection();
+        });
+    </script>
+@endsection
diff --git a/resources/views/admin/specieses/_delete_species.blade.php b/resources/views/admin/specieses/_delete_species.blade.php
index 103b890236..13179dc7c8 100644
--- a/resources/views/admin/specieses/_delete_species.blade.php
+++ b/resources/views/admin/specieses/_delete_species.blade.php
@@ -1,5 +1,5 @@
-@if($species)
-    {!! Form::open(['url' => 'admin/data/species/delete/'.$species->id]) !!}
+@if ($species)
+    {!! Form::open(['url' => 'admin/data/species/delete/' . $species->id]) !!}
 
     <p>You are about to delete the species <strong>{{ $species->name }}</strong>. This is not reversible. If traits and/or characters that have this species exist, you will not be able to delete this species.</p>
     <p>Are you sure you want to delete <strong>{{ $species->name }}</strong>?</p>
@@ -9,6 +9,6 @@
     </div>
 
     {!! Form::close() !!}
-@else 
+@else
     Invalid species selected.
-@endif
\ No newline at end of file
+@endif
diff --git a/resources/views/admin/specieses/_delete_subtype.blade.php b/resources/views/admin/specieses/_delete_subtype.blade.php
index 4b1fc27b1e..1b43141882 100644
--- a/resources/views/admin/specieses/_delete_subtype.blade.php
+++ b/resources/views/admin/specieses/_delete_subtype.blade.php
@@ -1,5 +1,5 @@
-@if($subtype)
-    {!! Form::open(['url' => 'admin/data/subtypes/delete/'.$subtype->id]) !!}
+@if ($subtype)
+    {!! Form::open(['url' => 'admin/data/subtypes/delete/' . $subtype->id]) !!}
 
     <p>You are about to delete the subtype <strong>{{ $subtype->name }}</strong>. This is not reversible. If traits and/or characters that have this subtype exist, you will not be able to delete this subtype.</p>
     <p>Are you sure you want to delete <strong>{{ $subtype->name }}</strong>?</p>
@@ -9,6 +9,6 @@
     </div>
 
     {!! Form::close() !!}
-@else 
+@else
     Invalid subtype selected.
-@endif
\ No newline at end of file
+@endif
diff --git a/resources/views/admin/specieses/create_edit_species.blade.php b/resources/views/admin/specieses/create_edit_species.blade.php
index 441ec3c096..a6af130942 100644
--- a/resources/views/admin/specieses/create_edit_species.blade.php
+++ b/resources/views/admin/specieses/create_edit_species.blade.php
@@ -1,73 +1,78 @@
 @extends('admin.layout')
 
-@section('admin-title') Species @endsection
+@section('admin-title')
+    {{ $species->id ? 'Edit' : 'Create' }} Species
+@endsection
 
 @section('admin-content')
-{!! breadcrumbs(['Admin Panel' => 'admin', 'Species' => 'admin/data/species', ($species->id ? 'Edit' : 'Create').' Species' => $species->id ? 'admin/data/species/edit/'.$species->id : 'admin/data/species/create']) !!}
-
-<h1>{{ $species->id ? 'Edit' : 'Create' }} Species
-    @if($species->id)
-        <a href="#" class="btn btn-danger float-right delete-species-button">Delete Species</a>
-    @endif
-</h1>
+    {!! breadcrumbs(['Admin Panel' => 'admin', 'Species' => 'admin/data/species', ($species->id ? 'Edit' : 'Create') . ' Species' => $species->id ? 'admin/data/species/edit/' . $species->id : 'admin/data/species/create']) !!}
 
-{!! Form::open(['url' => $species->id ? 'admin/data/species/edit/'.$species->id : 'admin/data/species/create', 'files' => true]) !!}
+    <h1>{{ $species->id ? 'Edit' : 'Create' }} Species
+        @if ($species->id)
+            <a href="#" class="btn btn-danger float-right delete-species-button">Delete Species</a>
+        @endif
+    </h1>
 
-<h3>Basic Information</h3>
+    {!! Form::open(['url' => $species->id ? 'admin/data/species/edit/' . $species->id : 'admin/data/species/create', 'files' => true]) !!}
 
-<div class="form-group">
-    {!! Form::label('Name') !!}
-    {!! Form::text('name', $species->name, ['class' => 'form-control']) !!}
-</div>
+    <h3>Basic Information</h3>
 
-<div class="form-group">
-    {!! Form::label('Sub Masterlist (Optional)') !!} {!! add_help('This puts it onto a sub masterlist.') !!}
-    {!! Form::select('masterlist_sub_id', $sublists, $species->masterlist_sub_id, ['class' => 'form-control']) !!}
-</div>
+    <div class="form-group">
+        {!! Form::label('Name') !!}
+        {!! Form::text('name', $species->name, ['class' => 'form-control']) !!}
+    </div>
 
-<div class="form-group">
-    {!! Form::label('World Page Image (Optional)') !!} {!! add_help('This image is used only on the world information pages.') !!}
-    <div>{!! Form::file('image') !!}</div>
-    <div class="text-muted">Recommended size: 200px x 200px</div>
-    @if($species->has_image)
-        <div class="form-check">
-            {!! Form::checkbox('remove_image', 1, false, ['class' => 'form-check-input']) !!}
-            {!! Form::label('remove_image', 'Remove current image', ['class' => 'form-check-label']) !!}
-        </div>
-    @endif
-</div>
+    <div class="form-group">
+        {!! Form::label('Sub Masterlist (Optional)') !!} {!! add_help('This puts it onto a sub masterlist.') !!}
+        {!! Form::select('masterlist_sub_id', $sublists, $species->masterlist_sub_id, ['class' => 'form-control']) !!}
+    </div>
 
-<div class="form-group">
-    {!! Form::label('Description (Optional)') !!}
-    {!! Form::textarea('description', $species->description, ['class' => 'form-control wysiwyg']) !!}
-</div>
+    <div class="form-group">
+        {!! Form::label('World Page Image (Optional)') !!} {!! add_help('This image is used only on the world information pages.') !!}
+        <div>{!! Form::file('image') !!}</div>
+        <div class="text-muted">Recommended size: 200px x 200px</div>
+        @if ($species->has_image)
+            <div class="form-check">
+                {!! Form::checkbox('remove_image', 1, false, ['class' => 'form-check-input']) !!}
+                {!! Form::label('remove_image', 'Remove current image', ['class' => 'form-check-label']) !!}
+            </div>
+        @endif
+    </div>
 
-<div class="text-right">
-    {!! Form::submit($species->id ? 'Edit' : 'Create', ['class' => 'btn btn-primary']) !!}
-</div>
+    <div class="form-group">
+        {!! Form::label('Description (Optional)') !!}
+        {!! Form::textarea('description', $species->description, ['class' => 'form-control wysiwyg']) !!}
+    </div>
 
-{!! Form::close() !!}
+    <div class="form-group">
+        {!! Form::checkbox('is_visible', 1, $species->id ? $species->is_visible : 1, ['class' => 'form-check-input', 'data-toggle' => 'toggle']) !!}
+        {!! Form::label('is_visible', 'Is Visible', ['class' => 'form-check-label ml-3']) !!} {!! add_help('If turned off, the species will not be visible in the species list or available for selection in search and design updates. Permissioned staff will still be able to add them to characters, however.') !!}
+    </div>
 
-@if($species->id)
-    <h3>Preview</h3>
-    <div class="card mb-3">
-        <div class="card-body">
-            @include('world._species_entry', ['species' => $species])
-        </div>
+    <div class="text-right">
+        {!! Form::submit($species->id ? 'Edit' : 'Create', ['class' => 'btn btn-primary']) !!}
     </div>
-@endif
 
+    {!! Form::close() !!}
+
+    @if ($species->id)
+        <h3>Preview</h3>
+        <div class="card mb-3">
+            <div class="card-body">
+                @include('world._species_entry', ['species' => $species])
+            </div>
+        </div>
+    @endif
 @endsection
 
 @section('scripts')
-@parent
-<script>
-$( document ).ready(function() {    
-    $('.delete-species-button').on('click', function(e) {
-        e.preventDefault();
-        loadModal("{{ url('admin/data/species/delete') }}/{{ $species->id }}", 'Delete Species');
-    });
-});
-    
-</script>
-@endsection
\ No newline at end of file
+    @parent
+    <script>
+        $(document).ready(function() {
+            $('.delete-species-button').on('click', function(e) {
+                e.preventDefault();
+                loadModal("{{ url('admin/data/species/delete') }}/{{ $species->id }}", 'Delete Species');
+            });
+        });
+    </script>
+@endsection
diff --git a/resources/views/admin/specieses/create_edit_subtype.blade.php b/resources/views/admin/specieses/create_edit_subtype.blade.php
index 80ec698bf2..fabbe3308d 100644
--- a/resources/views/admin/specieses/create_edit_subtype.blade.php
+++ b/resources/views/admin/specieses/create_edit_subtype.blade.php
@@ -1,73 +1,77 @@
 @extends('admin.layout')
 
-@section('admin-title') Species @endsection
+@section('admin-title')
+    {{ $subtype->id ? 'Edit' : 'Create' }} Subtype
+@endsection
 
 @section('admin-content')
-{!! breadcrumbs(['Admin Panel' => 'admin', 'Subtypes' => 'admin/data/subtypes', ($subtype->id ? 'Edit' : 'Create').' Subtype' => $subtype->id ? 'admin/data/subtypes/edit/'.$subtype->id : 'admin/data/subtypes/create']) !!}
+    {!! breadcrumbs(['Admin Panel' => 'admin', 'Subtypes' => 'admin/data/subtypes', ($subtype->id ? 'Edit' : 'Create') . ' Subtype' => $subtype->id ? 'admin/data/subtypes/edit/' . $subtype->id : 'admin/data/subtypes/create']) !!}
 
-<h1>{{ $subtype->id ? 'Edit' : 'Create' }} Subtype
-    @if($subtype->id)
-        <a href="#" class="btn btn-danger float-right delete-subtype-button">Delete Subtype</a>
-    @endif
-</h1>
+    <h1>{{ $subtype->id ? 'Edit' : 'Create' }} Subtype
+        @if ($subtype->id)
+            <a href="#" class="btn btn-danger float-right delete-subtype-button">Delete Subtype</a>
+        @endif
+    </h1>
 
-{!! Form::open(['url' => $subtype->id ? 'admin/data/subtypes/edit/'.$subtype->id : 'admin/data/subtypes/create', 'files' => true]) !!}
+    {!! Form::open(['url' => $subtype->id ? 'admin/data/subtypes/edit/' . $subtype->id : 'admin/data/subtypes/create', 'files' => true]) !!}
 
-<h3>Basic Information</h3>
+    <h3>Basic Information</h3>
 
-<div class="form-group">
-    {!! Form::label('Name') !!}
-    {!! Form::text('name', $subtype->name, ['class' => 'form-control']) !!}
-</div>
+    <div class="form-group">
+        {!! Form::label('Name') !!}
+        {!! Form::text('name', $subtype->name, ['class' => 'form-control']) !!}
+    </div>
 
-<div class="form-group">
-    {!! Form::label('Species') !!}
-    {!! Form::select('species_id', $specieses, $subtype->species_id, ['class' => 'form-control']) !!}
-</div>
+    <div class="form-group">
+        {!! Form::label('Species') !!}
+        {!! Form::select('species_id', $specieses, $subtype->species_id, ['class' => 'form-control']) !!}
+    </div>
 
-<div class="form-group">
-    {!! Form::label('World Page Image (Optional)') !!} {!! add_help('This image is used only on the world information pages.') !!}
-    <div>{!! Form::file('image') !!}</div>
-    <div class="text-muted">Recommended size: 200px x 200px</div>
-    @if($subtype->has_image)
-        <div class="form-check">
-            {!! Form::checkbox('remove_image', 1, false, ['class' => 'form-check-input']) !!}
-            {!! Form::label('remove_image', 'Remove current image', ['class' => 'form-check-label']) !!}
-        </div>
-    @endif
-</div>
+    <div class="form-group">
+        {!! Form::label('World Page Image (Optional)') !!} {!! add_help('This image is used only on the world information pages.') !!}
+        <div>{!! Form::file('image') !!}</div>
+        <div class="text-muted">Recommended size: 200px x 200px</div>
+        @if ($subtype->has_image)
+            <div class="form-check">
+                {!! Form::checkbox('remove_image', 1, false, ['class' => 'form-check-input']) !!}
+                {!! Form::label('remove_image', 'Remove current image', ['class' => 'form-check-label']) !!}
+            </div>
+        @endif
+    </div>
 
-<div class="form-group">
-    {!! Form::label('Description (Optional)') !!}
-    {!! Form::textarea('description', $subtype->description, ['class' => 'form-control wysiwyg']) !!}
-</div>
+    <div class="form-group">
+        {!! Form::label('Description (Optional)') !!}
+        {!! Form::textarea('description', $subtype->description, ['class' => 'form-control wysiwyg']) !!}
+    </div>
 
-<div class="text-right">
-    {!! Form::submit($subtype->id ? 'Edit' : 'Create', ['class' => 'btn btn-primary']) !!}
-</div>
+    <div class="form-group">
+        {!! Form::checkbox('is_visible', 1, $subtype->id ? $subtype->is_visible : 1, ['class' => 'form-check-input', 'data-toggle' => 'toggle']) !!}
+        {!! Form::label('is_visible', 'Is Visible', ['class' => 'form-check-label ml-3']) !!} {!! add_help('If turned off, the subtype will not be visible in the subtypes list or available for selection in search and design updates. Permissioned staff will still be able to add them to characters, however.') !!}
+    </div>
+    <div class="text-right">
+        {!! Form::submit($subtype->id ? 'Edit' : 'Create', ['class' => 'btn btn-primary']) !!}
+    </div>
 
-{!! Form::close() !!}
+    {!! Form::close() !!}
 
-@if($subtype->id)
-    <h3>Preview</h3>
-    <div class="card mb-3">
-        <div class="card-body">
-            @include('world._subtype_entry', ['subtype' => $subtype])
+    @if ($subtype->id)
+        <h3>Preview</h3>
+        <div class="card mb-3">
+            <div class="card-body">
+                @include('world._subtype_entry', ['subtype' => $subtype])
+            </div>
         </div>
-    </div>
-@endif
-
+    @endif
 @endsection
 
 @section('scripts')
-@parent
-<script>
-$( document ).ready(function() {    
-    $('.delete-subtype-button').on('click', function(e) {
-        e.preventDefault();
-        loadModal("{{ url('admin/data/subtypes/delete') }}/{{ $subtype->id }}", 'Delete Subtype');
-    });
-});
-    
-</script>
-@endsection
\ No newline at end of file
+    @parent
+    <script>
+        $(document).ready(function() {
+            $('.delete-subtype-button').on('click', function(e) {
+                e.preventDefault();
+                loadModal("{{ url('admin/data/subtypes/delete') }}/{{ $subtype->id }}", 'Delete Subtype');
+            });
+        });
+    </script>
+@endsection
diff --git a/resources/views/admin/specieses/specieses.blade.php b/resources/views/admin/specieses/specieses.blade.php
index 6c0f79f16a..a455419875 100644
--- a/resources/views/admin/specieses/specieses.blade.php
+++ b/resources/views/admin/specieses/specieses.blade.php
@@ -1,72 +1,84 @@
 @extends('admin.layout')
 
-@section('admin-title') Species @endsection
+@section('admin-title')
+    Species
+@endsection
 
 @section('admin-content')
-{!! breadcrumbs(['Admin Panel' => 'admin', 'Species' => 'admin/data/species']) !!}
+    {!! breadcrumbs(['Admin Panel' => 'admin', 'Species' => 'admin/data/species']) !!}
 
-<h1>Species</h1>
+    <h1>Species</h1>
 
-<div class="text-right mb-3"><a class="btn btn-primary" href="{{ url('admin/data/species/create') }}"><i class="fas fa-plus"></i> Create New Species</a></div>
-@if(!count($specieses))
-    <p>No species found.</p>
-@else 
-    <table class="table table-sm species-table">
-    <thead>
-            <tr>
-                <th>Species</th>
-                <th>Sub Masterlist</th>
-                <th></th>
-            </tr>
-        </thead>
-        <tbody id="sortable" class="sortable">
-            @foreach($specieses as $species)
-                <tr class="sort-item" data-id="{{ $species->id }}">
-                    <td>
-                        <a class="fas fa-arrows-alt-v handle mr-3" href="#"></a>
-                        {!! $species->displayName !!}
-                    </td>
-                    <td>
-                    @if(isset($species->sublist->name)) {{ $species->sublist->name  }} @else -- @endif
-                    </td>
-                    <td class="text-right">
-                        <a href="{{ url('admin/data/species/edit/'.$species->id) }}" class="btn btn-primary">Edit</a>
-                    </td>
+    <div class="text-right mb-3"><a class="btn btn-primary" href="{{ url('admin/data/species/create') }}"><i class="fas fa-plus"></i> Create New Species</a></div>
+    @if (!count($specieses))
+        <p>No species found.</p>
+    @else
+        <table class="table table-sm species-table">
+            <thead>
+                <tr>
+                    <th>Species</th>
+                    <th>Sub Masterlist</th>
+                    <th></th>
                 </tr>
-            @endforeach
-        </tbody>
+            </thead>
+            <tbody id="sortable" class="sortable">
+                @foreach ($specieses as $species)
+                    <tr class="sort-item" data-id="{{ $species->id }}">
+                        <td>
+                            <a class="fas fa-arrows-alt-v handle mr-3" href="#"></a>
+                            @if (!$species->is_visible)
+                                <i class="fas fa-eye-slash mr-1"></i>
+                            @endif
+                            {!! $species->displayName !!}
+                        </td>
+                        <td>
+                            @if (isset($species->sublist->name))
+                                {{ $species->sublist->name }}
+                            @else
+                                --
+                            @endif
+                        </td>
+                        <td class="text-right">
+                            <a href="{{ url('admin/data/species/edit/' . $species->id) }}" class="btn btn-primary">Edit</a>
+                        </td>
+                    </tr>
+                @endforeach
+            </tbody>
 
-    </table>
-    <div class="mb-4">
-        {!! Form::open(['url' => 'admin/data/species/sort']) !!}
-        {!! Form::hidden('sort', '', ['id' => 'sortableOrder']) !!}
-        {!! Form::submit('Save Order', ['class' => 'btn btn-primary']) !!}
-        {!! Form::close() !!}
-    </div>
-@endif
+        </table>
+        <div class="mb-4">
+            {!! Form::open(['url' => 'admin/data/species/sort']) !!}
+            {!! Form::hidden('sort', '', ['id' => 'sortableOrder']) !!}
+            {!! Form::submit('Save Order', ['class' => 'btn btn-primary']) !!}
+            {!! Form::close() !!}
+        </div>
+    @endif
 
 @endsection
 
 @section('scripts')
-@parent
-<script>
-
-$( document ).ready(function() {
-    $('.handle').on('click', function(e) {
-        e.preventDefault();
-    });
-    $( "#sortable" ).sortable({
-        items: '.sort-item',
-        handle: ".handle",
-        placeholder: "sortable-placeholder",
-        stop: function( event, ui ) {
-            $('#sortableOrder').val($(this).sortable("toArray", {attribute:"data-id"}));
-        },
-        create: function() {
-            $('#sortableOrder').val($(this).sortable("toArray", {attribute:"data-id"}));
-        }
-    });
-    $( "#sortable" ).disableSelection();
-});
-</script>
-@endsection
\ No newline at end of file
+    @parent
+    <script>
+        $(document).ready(function() {
+            $('.handle').on('click', function(e) {
+                e.preventDefault();
+            });
+            $("#sortable").sortable({
+                items: '.sort-item',
+                handle: ".handle",
+                placeholder: "sortable-placeholder",
+                stop: function(event, ui) {
+                    $('#sortableOrder').val($(this).sortable("toArray", {
+                        attribute: "data-id"
+                    }));
+                },
+                create: function() {
+                    $('#sortableOrder').val($(this).sortable("toArray", {
+                        attribute: "data-id"
+                    }));
+                }
+            });
+            $("#sortable").disableSelection();
+        });
+    </script>
+@endsection
diff --git a/resources/views/admin/specieses/subtypes.blade.php b/resources/views/admin/specieses/subtypes.blade.php
index 40e256f06f..c0f7833d39 100644
--- a/resources/views/admin/specieses/subtypes.blade.php
+++ b/resources/views/admin/specieses/subtypes.blade.php
@@ -1,67 +1,75 @@
 @extends('admin.layout')
 
-@section('admin-title') Species @endsection
+@section('admin-title')
+    Subtypes
+@endsection
 
 @section('admin-content')
-{!! breadcrumbs(['Admin Panel' => 'admin', 'Subtypes' => 'admin/data/subtypes']) !!}
+    {!! breadcrumbs(['Admin Panel' => 'admin', 'Subtypes' => 'admin/data/subtypes']) !!}
 
-<h1>Subtypes</h1>
+    <h1>Subtypes</h1>
 
-<p>Subtypes are optional categories that can be added to species. Characters require a species, but do not require a subtype. Note that the sort order here reflects the sort order under the species name as well.</p>
+    <p>Subtypes are optional categories that can be added to species. Characters require a species, but do not require a subtype. Note that the sort order here reflects the sort order under the species name as well.</p>
 
-<div class="text-right mb-3"><a class="btn btn-primary" href="{{ url('admin/data/subtypes/create') }}"><i class="fas fa-plus"></i> Create New Subtype</a></div>
-@if(!count($subtypes))
-    <p>No subtypes found.</p>
-@else 
-    <table class="table table-sm subtypes-table">
-        <tbody id="sortable" class="sortable">
-            @foreach($subtypes as $subtype)
-                <tr class="sort-item" data-id="{{ $subtype->id }}">
-                    <td>
-                        <a class="fas fa-arrows-alt-v handle mr-3" href="#"></a>
-                        {!! $subtype->displayName !!}
-                    </td>
-                    <td>
-                        {!! $subtype->species->displayName !!}
-                    </td>
-                    <td class="text-right">
-                        <a href="{{ url('admin/data/subtypes/edit/'.$subtype->id) }}" class="btn btn-primary">Edit</a>
-                    </td>
-                </tr>
-            @endforeach
-        </tbody>
+    <div class="text-right mb-3"><a class="btn btn-primary" href="{{ url('admin/data/subtypes/create') }}"><i class="fas fa-plus"></i> Create New Subtype</a></div>
+    @if (!count($subtypes))
+        <p>No subtypes found.</p>
+    @else
+        <table class="table table-sm subtypes-table">
+            <tbody id="sortable" class="sortable">
+                @foreach ($subtypes as $subtype)
+                    <tr class="sort-item" data-id="{{ $subtype->id }}">
+                        <td>
+                            <a class="fas fa-arrows-alt-v handle mr-3" href="#"></a>
+                            @if (!$subtype->is_visible)
+                                <i class="fas fa-eye-slash mr-1"></i>
+                            @endif
+                            {!! $subtype->displayName !!}
+                        </td>
+                        <td>
+                            {!! $subtype->species->displayName !!}
+                        </td>
+                        <td class="text-right">
+                            <a href="{{ url('admin/data/subtypes/edit/' . $subtype->id) }}" class="btn btn-primary">Edit</a>
+                        </td>
+                    </tr>
+                @endforeach
+            </tbody>
 
-    </table>
-    <div class="mb-4">
-        {!! Form::open(['url' => 'admin/data/subtypes/sort']) !!}
-        {!! Form::hidden('sort', '', ['id' => 'sortableOrder']) !!}
-        {!! Form::submit('Save Order', ['class' => 'btn btn-primary']) !!}
-        {!! Form::close() !!}
-    </div>
-@endif
+        </table>
+        <div class="mb-4">
+            {!! Form::open(['url' => 'admin/data/subtypes/sort']) !!}
+            {!! Form::hidden('sort', '', ['id' => 'sortableOrder']) !!}
+            {!! Form::submit('Save Order', ['class' => 'btn btn-primary']) !!}
+            {!! Form::close() !!}
+        </div>
+    @endif
 
 @endsection
 
 @section('scripts')
-@parent
-<script>
-
-$( document ).ready(function() {
-    $('.handle').on('click', function(e) {
-        e.preventDefault();
-    });
-    $( "#sortable" ).sortable({
-        items: '.sort-item',
-        handle: ".handle",
-        placeholder: "sortable-placeholder",
-        stop: function( event, ui ) {
-            $('#sortableOrder').val($(this).sortable("toArray", {attribute:"data-id"}));
-        },
-        create: function() {
-            $('#sortableOrder').val($(this).sortable("toArray", {attribute:"data-id"}));
-        }
-    });
-    $( "#sortable" ).disableSelection();
-});
-</script>
-@endsection
\ No newline at end of file
+    @parent
+    <script>
+        $(document).ready(function() {
+            $('.handle').on('click', function(e) {
+                e.preventDefault();
+            });
+            $("#sortable").sortable({
+                items: '.sort-item',
+                handle: ".handle",
+                placeholder: "sortable-placeholder",
+                stop: function(event, ui) {
+                    $('#sortableOrder').val($(this).sortable("toArray", {
+                        attribute: "data-id"
+                    }));
+                },
+                create: function() {
+                    $('#sortableOrder').val($(this).sortable("toArray", {
+                        attribute: "data-id"
+                    }));
+                }
+            });
+            $("#sortable").disableSelection();
+        });
+    </script>
+@endsection
diff --git a/resources/views/admin/staff_reward_settings.blade.php b/resources/views/admin/staff_reward_settings.blade.php
new file mode 100644
index 0000000000..8558a31fce
--- /dev/null
+++ b/resources/views/admin/staff_reward_settings.blade.php
@@ -0,0 +1,68 @@
+@extends('admin.layout')
+
+@section('admin-title')
+    Staff Reward Settings
+@endsection
+
+@section('admin-content')
+    {!! breadcrumbs(['Admin Panel' => 'admin', 'Staff Reward Settings' => 'admin/staff-reward-settings']) !!}
+
+    @if (!config('lorekeeper.extensions.staff_rewards.enabled'))
+        <div class="alert alert-danger">
+            Staff rewards are currently disabled. Enable them in the Lorekeeper configuration files to use this feature.
+        </div>
+    @endif
+
+    <h1>Staff Reward Settings</h1>
+
+    <p>This is a list of staff actions that are configured to receive rewards. Staff members will be granted the value configured in {!! isset($currency) && $currency ? $currency->displayName : '(Invalid Currency - Configure ID in config/lorekeeper/extensions.php)' !!} when they perform the relevant action(s). Set an action's value to 0 to disable rewards for it.
+    </p>
+
+    @if (!count($settings))
+        <p>No settings found.</p>
+    @else
+        {!! $settings->render() !!}
+        <div class="mb-4 logs-table setting-table">
+            <div class="logs-table-header">
+                <div class="row">
+                    <div class="col-6 col-md-3">
+                        <div class="logs-table-cell">Name</div>
+                    </div>
+                    <div class="col-6 col-md-3">
+                        <div class="logs-table-cell">Description</div>
+                    </div>
+                    <div class="col-md-6">
+                        <div class="logs-table-cell">Value</div>
+                    </div>
+                </div>
+            </div>
+            <div class="logs-table-body">
+                @foreach ($settings as $setting)
+                    <div class="row">
+                        <div class="col-6 col-md-3">
+                            <div class="logs-table-cell">{{ $setting->name }}</div>
+                        </div>
+                        <div class="col-6 col-md-3">
+                            <div class="logs-table-cell">{{ $setting->description }}</div>
+                        </div>
+                        <div class="col-6 col-md-3">
+                            <div class="logs-table-cell">
+                                {!! Form::open(['url' => 'admin/staff-reward-settings/' . $setting->key, 'class' => 'd-flex justify-content-end']) !!}
+                                <div class="form-group mr-3 mb-3">
+                                    {!! Form::text('value', $setting->value, ['class' => 'form-control']) !!}
+                                </div>
+                                <div class="form-group mb-3">
+                                    {!! Form::submit('Edit', ['class' => 'btn btn-primary']) !!}
+                                </div>
+                                {!! Form::close() !!}
+                            </div>
+                        </div>
+                    </div>
+                @endforeach
+            </div>
+
+        </div>
+        {!! $settings->render() !!}
+    @endif
+
+@endsection
diff --git a/resources/views/admin/sublist/_delete_sublist.blade.php b/resources/views/admin/sublist/_delete_sublist.blade.php
index c87959ec19..98402ef59b 100644
--- a/resources/views/admin/sublist/_delete_sublist.blade.php
+++ b/resources/views/admin/sublist/_delete_sublist.blade.php
@@ -1,5 +1,5 @@
-@if($sublist)
-    {!! Form::open(['url' => 'admin/data/sublists/delete/'.$sublist->id]) !!}
+@if ($sublist)
+    {!! Form::open(['url' => 'admin/data/sublists/delete/' . $sublist->id]) !!}
 
     <p>You are about to delete the sublist <strong>{{ $sublist->name }}</strong>. This is not reversible.</p>
     <p>Are you sure you want to delete <strong>{{ $sublist->name }}</strong>?</p>
@@ -9,6 +9,6 @@
     </div>
 
     {!! Form::close() !!}
-@else 
+@else
     Invalid sublist selected.
-@endif
\ No newline at end of file
+@endif
diff --git a/resources/views/admin/sublist/create_edit_sublist.blade.php b/resources/views/admin/sublist/create_edit_sublist.blade.php
index a72364261c..08698e3732 100644
--- a/resources/views/admin/sublist/create_edit_sublist.blade.php
+++ b/resources/views/admin/sublist/create_edit_sublist.blade.php
@@ -1,142 +1,145 @@
 @extends('admin.layout')
 
-@section('admin-title') Sub Masterlists @endsection
+@section('admin-title')
+    Sub Masterlists
+@endsection
 
 @section('admin-content')
-{!! breadcrumbs(['Admin Panel' => 'admin', 'Sub Masterlists' => 'admin/data/sublists', ($sublist->id ? 'Edit' : 'Create').' Sub Masterlist' => $sublist->id ? 'admin/data/sublists/edit/'.$sublist->id : 'admin/data/sublists/create']) !!}
+    {!! breadcrumbs(['Admin Panel' => 'admin', 'Sub Masterlists' => 'admin/data/sublists', ($sublist->id ? 'Edit' : 'Create') . ' Sub Masterlist' => $sublist->id ? 'admin/data/sublists/edit/' . $sublist->id : 'admin/data/sublists/create']) !!}
 
-<h1>{{ $sublist->id ? 'Edit' : 'Create' }} Sub Masterlist
-    @if($sublist->id)
-        <a href="#" class="btn btn-danger float-right delete-sublist-button">Delete Sub Masterlist</a>
-    @endif
-</h1>
+    <h1>{{ $sublist->id ? 'Edit' : 'Create' }} Sub Masterlist
+        @if ($sublist->id)
+            <a href="#" class="btn btn-danger float-right delete-sublist-button">Delete Sub Masterlist</a>
+        @endif
+    </h1>
 
-{!! Form::open(['url' => $sublist->id ? 'admin/data/sublists/edit/'.$sublist->id : 'admin/data/sublists/create', 'files' => true]) !!}
+    {!! Form::open(['url' => $sublist->id ? 'admin/data/sublists/edit/' . $sublist->id : 'admin/data/sublists/create', 'files' => true]) !!}
 
-<h3>Basic Information</h3>
+    <h3>Basic Information</h3>
 
-<div class="row">
-    <div class="col-md-6">
-        <div class="form-group">
-            {!! Form::label('Name') !!}
-            {!! Form::text('name', $sublist->name, ['class' => 'form-control']) !!}
+    <div class="row">
+        <div class="col-md-6">
+            <div class="form-group">
+                {!! Form::label('Name') !!}
+                {!! Form::text('name', $sublist->name, ['class' => 'form-control']) !!}
+            </div>
         </div>
-    </div>
-    <div class="col-md-6">
-        <div class="form-group">
-            {!! Form::label('Key') !!}
-            {!! Form::text('key', $sublist->key, ['class' => 'form-control']) !!}
+        <div class="col-md-6">
+            <div class="form-group">
+                {!! Form::label('Key') !!}
+                {!! Form::text('key', $sublist->key, ['class' => 'form-control']) !!}
+            </div>
         </div>
     </div>
-</div>
-
-<h3>Contents</h3>
-<p>Each category and species can only have ONE sublist. If you assign a sublist here, it will be removed from any other sublists. If you want a species shared across multiple lists, it is suggested you only use character categories. Likewise, if you want a category shared across multiple lists, it is suggested you only use species.</p>
 
-<div class="form-group">
-    {!! Form::label('categories[]', 'Categories') !!}
-    {!! Form::select('categories[]', $categories, $subCategories, ['id' => 'categoryList', 'class' => 'form-control', 'multiple']) !!}
-</div>
+    <h3>Contents</h3>
+    <p>Each category and species can only have ONE sublist. If you assign a sublist here, it will be removed from any other sublists. If you want a species shared across multiple lists, it is suggested you only use character categories. Likewise, if you
+        want a category shared across multiple lists, it is suggested you only use species.</p>
 
-<div class="form-group">
-    {!! Form::label('species[]', 'Species') !!}
-    {!! Form::select('species[]', $species, $subSpecies, ['id' => 'speciesList', 'class' => 'form-control', 'multiple']) !!}
-</div>
+    <div class="form-group">
+        {!! Form::label('categories[]', 'Categories') !!}
+        {!! Form::select('categories[]', $categories, $subCategories, ['id' => 'categoryList', 'class' => 'form-control', 'multiple']) !!}
+    </div>
 
-<div class="form-group">
-    {!! Form::checkbox('show_main', 1, $sublist->id ? $sublist->show_main : 1, ['class' => 'form-check-input', 'data-toggle' => 'toggle']) !!}
-    {!! Form::label('show_main', 'Show on Main', ['class' => 'form-check-label ml-3']) !!} {!! add_help('Turn on to include these characters in the main masterlist as well. Turn off to entirely seperate them into the sub masterlist.') !!}
-</div>
+    <div class="form-group">
+        {!! Form::label('species[]', 'Species') !!}
+        {!! Form::select('species[]', $species, $subSpecies, ['id' => 'speciesList', 'class' => 'form-control', 'multiple']) !!}
+    </div>
 
-<div class="text-right">
-    {!! Form::submit($sublist->id ? 'Edit' : 'Create', ['class' => 'btn btn-primary']) !!}
-</div>
+    <div class="form-group">
+        {!! Form::checkbox('show_main', 1, $sublist->id ? $sublist->show_main : 1, ['class' => 'form-check-input', 'data-toggle' => 'toggle']) !!}
+        {!! Form::label('show_main', 'Show on Main', ['class' => 'form-check-label ml-3']) !!} {!! add_help('Turn on to include these characters in the main masterlist as well. Turn off to entirely seperate them into the sub masterlist.') !!}
+    </div>
 
-{!! Form::close() !!}
+    <div class="text-right">
+        {!! Form::submit($sublist->id ? 'Edit' : 'Create', ['class' => 'btn btn-primary']) !!}
+    </div>
 
+    {!! Form::close() !!}
 @endsection
 
 @section('scripts')
-@parent
-<script>
-    $( document ).ready(function() {    
-        $('.delete-sublist-button').on('click', function(e) {
-            e.preventDefault();
-            loadModal("{{ url('admin/data/sublists/delete') }}/{{ $sublist->id }}", 'Delete Sub Masterlist');
+    @parent
+    <script>
+        $(document).ready(function() {
+            $('.delete-sublist-button').on('click', function(e) {
+                e.preventDefault();
+                loadModal("{{ url('admin/data/sublists/delete') }}/{{ $sublist->id }}", 'Delete Sub Masterlist');
+            });
         });
-    });
 
-    $(document).ready(function() {
-        $('#categoryList').selectize({
-        });
-        $('.default.item-select').selectize();
-        $('#add-item').on('click', function(e) {
-            e.preventDefault();
-            addItemRow();
-        });
-        $('.remove-item').on('click', function(e) {
-            e.preventDefault();
-            removeItemRow($(this));
-        })
-        function addItemRow() {
-            var $rows = $("#itemList > div")
-            if($rows.length === 1) {
-                $rows.find('.remove-item').removeClass('disabled')
-            }
-            var $clone = $('.item-row').clone();
-            $('#itemList').append($clone);
-            $clone.removeClass('hide item-row');
-            $clone.addClass('d-flex');
-            $clone.find('.remove-item').on('click', function(e) {
+        $(document).ready(function() {
+            $('#categoryList').selectize({});
+            $('.default.item-select').selectize();
+            $('#add-item').on('click', function(e) {
+                e.preventDefault();
+                addItemRow();
+            });
+            $('.remove-item').on('click', function(e) {
                 e.preventDefault();
                 removeItemRow($(this));
             })
-            $clone.find('.item-select').selectize();
-        }
-        function removeItemRow($trigger) {
-            $trigger.parent().remove();
-            var $rows = $("#itemList > div")
-            if($rows.length === 1) {
-                $rows.find('.remove-item').addClass('disabled')
+
+            function addItemRow() {
+                var $rows = $("#itemList > div")
+                if ($rows.length === 1) {
+                    $rows.find('.remove-item').removeClass('disabled')
+                }
+                var $clone = $('.item-row').clone();
+                $('#itemList').append($clone);
+                $clone.removeClass('hide item-row');
+                $clone.addClass('d-flex');
+                $clone.find('.remove-item').on('click', function(e) {
+                    e.preventDefault();
+                    removeItemRow($(this));
+                })
+                $clone.find('.item-select').selectize();
             }
-        }
-    });
 
-    $(document).ready(function() {
-        $('#speciesList').selectize({
-        });
-        $('.default.item-select').selectize();
-        $('#add-item').on('click', function(e) {
-            e.preventDefault();
-            addItemRow();
-        });
-        $('.remove-item').on('click', function(e) {
-            e.preventDefault();
-            removeItemRow($(this));
-        })
-        function addItemRow() {
-            var $rows = $("#itemList > div")
-            if($rows.length === 1) {
-                $rows.find('.remove-item').removeClass('disabled')
+            function removeItemRow($trigger) {
+                $trigger.parent().remove();
+                var $rows = $("#itemList > div")
+                if ($rows.length === 1) {
+                    $rows.find('.remove-item').addClass('disabled')
+                }
             }
-            var $clone = $('.item-row').clone();
-            $('#itemList').append($clone);
-            $clone.removeClass('hide item-row');
-            $clone.addClass('d-flex');
-            $clone.find('.remove-item').on('click', function(e) {
+        });
+
+        $(document).ready(function() {
+            $('#speciesList').selectize({});
+            $('.default.item-select').selectize();
+            $('#add-item').on('click', function(e) {
+                e.preventDefault();
+                addItemRow();
+            });
+            $('.remove-item').on('click', function(e) {
                 e.preventDefault();
                 removeItemRow($(this));
             })
-            $clone.find('.item-select').selectize();
-        }
-        function removeItemRow($trigger) {
-            $trigger.parent().remove();
-            var $rows = $("#itemList > div")
-            if($rows.length === 1) {
-                $rows.find('.remove-item').addClass('disabled')
+
+            function addItemRow() {
+                var $rows = $("#itemList > div")
+                if ($rows.length === 1) {
+                    $rows.find('.remove-item').removeClass('disabled')
+                }
+                var $clone = $('.item-row').clone();
+                $('#itemList').append($clone);
+                $clone.removeClass('hide item-row');
+                $clone.addClass('d-flex');
+                $clone.find('.remove-item').on('click', function(e) {
+                    e.preventDefault();
+                    removeItemRow($(this));
+                })
+                $clone.find('.item-select').selectize();
             }
-        }
-    });
 
-</script>
-@endsection
\ No newline at end of file
+            function removeItemRow($trigger) {
+                $trigger.parent().remove();
+                var $rows = $("#itemList > div")
+                if ($rows.length === 1) {
+                    $rows.find('.remove-item').addClass('disabled')
+                }
+            }
+        });
+    </script>
+@endsection
diff --git a/resources/views/admin/sublist/sublist.blade.php b/resources/views/admin/sublist/sublist.blade.php
index 349e891e06..183211b3a6 100644
--- a/resources/views/admin/sublist/sublist.blade.php
+++ b/resources/views/admin/sublist/sublist.blade.php
@@ -1,75 +1,80 @@
 @extends('admin.layout')
 
-@section('admin-title') Sub Masterlists @endsection
+@section('admin-title')
+    Sub Masterlists
+@endsection
 
 @section('admin-content')
-{!! breadcrumbs(['Admin Panel' => 'admin', 'Sub Masterlists' => 'admin/data/sublists']) !!}
+    {!! breadcrumbs(['Admin Panel' => 'admin', 'Sub Masterlists' => 'admin/data/sublists']) !!}
 
-<h1>Sub Masterlists</h1>
+    <h1>Sub Masterlists</h1>
 
-<p>Sub masterlists are additional masterlists which can be separate or alternative to the main masterlist. This can be used to divide a masterlist up between species, player versus non-player-character, characters vs pets/mounts, etc.</p>
-<p>Both categories and species can be assigned to sublists, but each can only be assigned to ONE sublist.</p> 
+    <p>Sub masterlists are additional masterlists which can be separate or alternative to the main masterlist. This can be used to divide a masterlist up between species, player versus non-player-character, characters vs pets/mounts, etc.</p>
+    <p>Both categories and species can be assigned to sublists, but each can only be assigned to ONE sublist.</p>
 
-<div class="text-right mb-3"><a class="btn btn-primary" href="{{ url('admin/data/sublists/create') }}"><i class="fas fa-plus"></i> Create New Sub Masterlist</a></div>
+    <div class="text-right mb-3"><a class="btn btn-primary" href="{{ url('admin/data/sublists/create') }}"><i class="fas fa-plus"></i> Create New Sub Masterlist</a></div>
 
-@if(!count($sublists))
-    <p>No sub masterlists found.</p>
-@else 
-    <table class="table table-sm category-table">
-        <thead>
-            <tr>
-                <th>Name</th>
-                <th>Show on Main</th>
-                <th>Key</th>
-                <th></th>
-            </tr>
-        </thead>
-        <tbody id="sortable" class="sortable">
-            @foreach($sublists as $sublist)
-                <tr class="sort-item" data-id="{{ $sublist->id }}">
-                    <td>
-                        <a class="fas fa-arrows-alt-v handle mr-3" href="#"></a>
-                        {{ $sublist->name }}
-                    </td>
-                    <td>{!! $sublist->show_main ? '<i class="text-success fas fa-check"></i>' : '' !!}</td>
-                    <td>{!! $sublist->key !!}</td>
-                    <td class="text-right">
-                        <a href="{{ url('admin/data/sublists/edit/'.$sublist->id) }}" class="btn btn-primary">Edit</a>
-                    </td>
+    @if (!count($sublists))
+        <p>No sub masterlists found.</p>
+    @else
+        <table class="table table-sm category-table">
+            <thead>
+                <tr>
+                    <th>Name</th>
+                    <th>Show on Main</th>
+                    <th>Key</th>
+                    <th></th>
                 </tr>
-            @endforeach
-        </tbody>
-    </table>
-    <div class="mb-4">
-        {!! Form::open(['url' => 'admin/data/sublists/sort']) !!}
-        {!! Form::hidden('sort', '', ['id' => 'sortableOrder']) !!}
-        {!! Form::submit('Save Order', ['class' => 'btn btn-primary']) !!}
-        {!! Form::close() !!}
-    </div>
-@endif
+            </thead>
+            <tbody id="sortable" class="sortable">
+                @foreach ($sublists as $sublist)
+                    <tr class="sort-item" data-id="{{ $sublist->id }}">
+                        <td>
+                            <a class="fas fa-arrows-alt-v handle mr-3" href="#"></a>
+                            {{ $sublist->name }}
+                        </td>
+                        <td>{!! $sublist->show_main ? '<i class="text-success fas fa-check"></i>' : '' !!}</td>
+                        <td>{!! $sublist->key !!}</td>
+                        <td class="text-right">
+                            <a href="{{ url('admin/data/sublists/edit/' . $sublist->id) }}" class="btn btn-primary">Edit</a>
+                        </td>
+                    </tr>
+                @endforeach
+            </tbody>
+        </table>
+        <div class="mb-4">
+            {!! Form::open(['url' => 'admin/data/sublists/sort']) !!}
+            {!! Form::hidden('sort', '', ['id' => 'sortableOrder']) !!}
+            {!! Form::submit('Save Order', ['class' => 'btn btn-primary']) !!}
+            {!! Form::close() !!}
+        </div>
+    @endif
 
 @endsection
 
 @section('scripts')
-@parent
-<script>
-
-$( document ).ready(function() {
-    $('.handle').on('click', function(e) {
-        e.preventDefault();
-    });
-    $( "#sortable" ).sortable({
-        items: '.sort-item',
-        handle: ".handle",
-        placeholder: "sortable-placeholder",
-        stop: function( event, ui ) {
-            $('#sortableOrder').val($(this).sortable("toArray", {attribute:"data-id"}));
-        },
-        create: function() {
-            $('#sortableOrder').val($(this).sortable("toArray", {attribute:"data-id"}));
-        }
-    });
-    $( "#sortable" ).disableSelection();
-});
-</script>
-@endsection
\ No newline at end of file
+    @parent
+    <script>
+        $(document).ready(function() {
+            $('.handle').on('click', function(e) {
+                e.preventDefault();
+            });
+            $("#sortable").sortable({
+                items: '.sort-item',
+                handle: ".handle",
+                placeholder: "sortable-placeholder",
+                stop: function(event, ui) {
+                    $('#sortableOrder').val($(this).sortable("toArray", {
+                        attribute: "data-id"
+                    }));
+                },
+                create: function() {
+                    $('#sortableOrder').val($(this).sortable("toArray", {
+                        attribute: "data-id"
+                    }));
+                }
+            });
+            $("#sortable").disableSelection();
+        });
+    </script>
+@endsection
diff --git a/resources/views/admin/submissions/index.blade.php b/resources/views/admin/submissions/index.blade.php
index 22ed1d5d57..224564cdf5 100644
--- a/resources/views/admin/submissions/index.blade.php
+++ b/resources/views/admin/submissions/index.blade.php
@@ -1,33 +1,36 @@
 @extends('admin.layout')
 
-@section('admin-title') {{ $isClaims ? 'Claim' : 'Prompt' }} Queue @endsection
+@section('admin-title')
+    {{ $isClaims ? 'Claim' : 'Prompt' }} Queue
+@endsection
 
 @section('admin-content')
-@if($isClaims)
-    {!! breadcrumbs(['Admin Panel' => 'admin', 'Claim Queue' => 'admin/claims/pending']) !!}
-@else
-    {!! breadcrumbs(['Admin Panel' => 'admin', 'Prompt Queue' => 'admin/submissions/pending']) !!}
-@endif
+    @if ($isClaims)
+        {!! breadcrumbs(['Admin Panel' => 'admin', 'Claim Queue' => 'admin/claims/pending']) !!}
+    @else
+        {!! breadcrumbs(['Admin Panel' => 'admin', 'Prompt Queue' => 'admin/submissions/pending']) !!}
+    @endif
 
-<h1>
-    {{ $isClaims ? 'Claim' : 'Prompt' }} Queue
-</h1>
+    <h1>
+        {{ $isClaims ? 'Claim' : 'Prompt' }} Queue
+    </h1>
 
-<ul class="nav nav-tabs mb-3">
-  <li class="nav-item">
-    <a class="nav-link {{ set_active('admin/'.($isClaims ? 'claims' : 'submissions').'/pending*') }} {{ set_active('admin/'.($isClaims ? 'claims' : 'submissions')) }}" href="{{ url('admin/'.($isClaims ? 'claims' : 'submissions').'/pending') }}">Pending</a>
-  </li>
-  <li class="nav-item">
-    <a class="nav-link {{ set_active('admin/'.($isClaims ? 'claims' : 'submissions').'/approved*') }}" href="{{ url('admin/'.($isClaims ? 'claims' : 'submissions').'/approved') }}">Approved</a>
-  </li>
-  <li class="nav-item">
-    <a class="nav-link {{ set_active('admin/'.($isClaims ? 'claims' : 'submissions').'/rejected*') }}" href="{{ url('admin/'.($isClaims ? 'claims' : 'submissions').'/rejected') }}">Rejected</a>
-  </li>
-</ul>
+    <ul class="nav nav-tabs mb-3">
+        <li class="nav-item">
+            <a class="nav-link {{ set_active('admin/' . ($isClaims ? 'claims' : 'submissions') . '/pending*') }} {{ set_active('admin/' . ($isClaims ? 'claims' : 'submissions')) }}"
+                href="{{ url('admin/' . ($isClaims ? 'claims' : 'submissions') . '/pending') }}">Pending</a>
+        </li>
+        <li class="nav-item">
+            <a class="nav-link {{ set_active('admin/' . ($isClaims ? 'claims' : 'submissions') . '/approved*') }}" href="{{ url('admin/' . ($isClaims ? 'claims' : 'submissions') . '/approved') }}">Approved</a>
+        </li>
+        <li class="nav-item">
+            <a class="nav-link {{ set_active('admin/' . ($isClaims ? 'claims' : 'submissions') . '/rejected*') }}" href="{{ url('admin/' . ($isClaims ? 'claims' : 'submissions') . '/rejected') }}">Rejected</a>
+        </li>
+    </ul>
 
-{!! Form::open(['method' => 'GET', 'class' => 'form-inline justify-content-end']) !!}
+    {!! Form::open(['method' => 'GET', 'class' => 'form-inline justify-content-end']) !!}
     <div class="form-inline justify-content-end">
-        @if(!$isClaims)
+        @if (!$isClaims)
             <div class="form-group ml-3 mb-3">
                 {!! Form::select('prompt_category_id', $categories, Request::get('prompt_category_id'), ['class' => 'form-control']) !!}
             </div>
@@ -35,51 +38,78 @@
     </div>
     <div class="form-inline justify-content-end">
         <div class="form-group ml-3 mb-3">
-            {!! Form::select('sort', [
-                'newest'         => 'Newest First',
-                'oldest'         => 'Oldest First',
-            ], Request::get('sort') ? : 'oldest', ['class' => 'form-control']) !!}
+            {!! Form::select(
+                'sort',
+                [
+                    'newest' => 'Newest First',
+                    'oldest' => 'Oldest First',
+                ],
+                Request::get('sort') ?: 'oldest',
+                ['class' => 'form-control'],
+            ) !!}
         </div>
         <div class="form-group ml-3 mb-3">
             {!! Form::submit('Search', ['class' => 'btn btn-primary']) !!}
         </div>
     </div>
-{!! Form::close() !!}
-
-{!! $submissions->render() !!}
-
-<div class="row ml-md-2">
-  <div class="d-flex row flex-wrap col-12 mt-1 pt-1 px-0 ubt-bottom">
-    @if(!$isClaims)
-      <div class="col-12 col-md-2 font-weight-bold">Prompt</div>
-    @endif
-    <div class="col-6 {{ !$isClaims ? 'col-md-2' : 'col-md-3' }} font-weight-bold">User</div>
-    <div class="col-6 {{ !$isClaims ? 'col-md-3' : 'col-md-4' }} font-weight-bold">Link</div>
-    <div class="col-6 col-md-3 font-weight-bold">Submitted</div>
-    <div class="col-6 col-md-1 font-weight-bold">Status</div>
-  </div>
+    {!! Form::close() !!}
 
-  @foreach($submissions as $submission)
-    <div class="d-flex row flex-wrap col-12 mt-1 pt-1 px-0 ubt-top">
-      @if(!$isClaims)
-        <div class="col-12 col-md-2">{!! $submission->prompt->displayName !!}</div>
-      @endif
-      <div class="col-6 {{ !$isClaims ? 'col-md-2' : 'col-md-3' }}">{!! $submission->user->displayName !!}</div>
-      <div class="col-6 {{ !$isClaims ? 'col-md-3' : 'col-md-4' }}">
-        <span class="ubt-texthide"><a href="{{ $submission->url }}">{{ $submission->url }}</a></span>
-      </div>
-      <div class="col-6 col-md-3">{!! pretty_date($submission->created_at) !!}</div>
-      <div class="col-3 col-md-1">
-        <span class="btn btn-{{ $submission->status == 'Pending' ? 'secondary' : ($submission->status == 'Approved' ? 'success' : 'danger') }} btn-sm py-0 px-1">{{ $submission->status }}</span>
-      </div>
-      <div class="col-3 col-md-1"><a href="{{ $submission->adminUrl }}" class="btn btn-primary btn-sm py-0 px-1">Details</a></div>
+    {!! $submissions->render() !!}
+    <div class="mb-4 logs-table">
+        <div class="logs-table-header">
+            <div class="row">
+                @if (!$isClaims)
+                    <div class="col-12 col-md-2">
+                        <div class="logs-table-cell">Prompt</div>
+                    </div>
+                @endif
+                <div class="col-6 {{ !$isClaims ? 'col-md-2' : 'col-md-3' }}">
+                    <div class="logs-table-cell">User</div>
+                </div>
+                <div class="col-6 {{ !$isClaims ? 'col-md-3' : 'col-md-4' }}">
+                    <div class="logs-table-cell">Link</div>
+                </div>
+                <div class="col-6 col-md-3">
+                    <div class="logs-table-cell">Submitted</div>
+                </div>
+                <div class="col-6 col-md-1">
+                    <div class="logs-table-cell">Status</div>
+                </div>
+            </div>
+        </div>
+        <div class="logs-table-body">
+            @foreach ($submissions as $submission)
+                <div class="logs-table-row">
+                    <div class="row flex-wrap">
+                        @if (!$isClaims)
+                            <div class="col-12 col-md-2">
+                                <div class="logs-table-cell">{!! $submission->prompt->displayName !!}</div>
+                            </div>
+                        @endif
+                        <div class="col-6 {{ !$isClaims ? 'col-md-2' : 'col-md-3' }}">
+                            <div class="logs-table-cell">{!! $submission->user->displayName !!}</div>
+                        </div>
+                        <div class="col-6 {{ !$isClaims ? 'col-md-3' : 'col-md-4' }}">
+                            <div class="logs-table-cell">
+                                <span class="ubt-texthide"><a href="{{ $submission->url }}">{{ $submission->url }}</a></span>
+                            </div>
+                        </div>
+                        <div class="col-6 col-md-3">
+                            <div class="logs-table-cell">{!! pretty_date($submission->created_at) !!}</div>
+                        </div>
+                        <div class="col-3 col-md-1">
+                            <div class="logs-table-cell">
+                                <span class="btn btn-{{ $submission->status == 'Pending' ? 'secondary' : ($submission->status == 'Approved' ? 'success' : 'danger') }} btn-sm py-0 px-1">{{ $submission->status }}</span>
+                            </div>
+                        </div>
+                        <div class="col-3 col-md-1">
+                            <div class="logs-table-cell"><a href="{{ $submission->adminUrl }}" class="btn btn-primary btn-sm py-0 px-1">Details</a></div>
+                        </div>
+                    </div>
+                </div>
+            @endforeach
+        </div>
     </div>
-  @endforeach
-
-</div>
-
-{!! $submissions->render() !!}
-<div class="text-center mt-4 small text-muted">{{ $submissions->total() }} result{{ $submissions->total() == 1 ? '' : 's' }} found.</div>
-
-
+    {!! $submissions->render() !!}
+    <div class="text-center mt-4 small text-muted">{{ $submissions->total() }} result{{ $submissions->total() == 1 ? '' : 's' }} found.</div>
 @endsection
diff --git a/resources/views/admin/submissions/submission.blade.php b/resources/views/admin/submissions/submission.blade.php
index 0e2a2622ac..1da8863b3e 100644
--- a/resources/views/admin/submissions/submission.blade.php
+++ b/resources/views/admin/submissions/submission.blade.php
@@ -1,63 +1,81 @@
-@extends('home.layout')
+@extends('admin.layout')
 
-@section('home-title') {{ $submission->prompt_id ? 'Submission' : 'Claim' }} (#{{ $submission->id }}) @endsection
+@section('admin-title')
+    {{ $submission->prompt_id ? 'Submission' : 'Claim' }} (#{{ $submission->id }})
+@endsection
 
-@section('home-content')
-@if($submission->prompt_id)
-    {!! breadcrumbs(['Admin Panel' => 'admin', 'Prompt Queue' => 'admin/submissions/pending', 'Submission (#' . $submission->id . ')' => $submission->viewUrl]) !!}
-@else
-    {!! breadcrumbs(['Admin Panel' => 'admin', 'Claim Queue' => 'admin/claims/pending', 'Claim (#' . $submission->id . ')' => $submission->viewUrl]) !!}
-@endif
+@section('admin-content')
+    @if ($submission->prompt_id)
+        {!! breadcrumbs(['Admin Panel' => 'admin', 'Prompt Queue' => 'admin/submissions/pending', 'Submission (#' . $submission->id . ')' => $submission->viewUrl]) !!}
+    @else
+        {!! breadcrumbs(['Admin Panel' => 'admin', 'Claim Queue' => 'admin/claims/pending', 'Claim (#' . $submission->id . ')' => $submission->viewUrl]) !!}
+    @endif
 
-@if($submission->status == 'Pending')
+    @if ($submission->status == 'Pending')
 
-    <h1>
-        {{ $submission->prompt_id ? 'Submission' : 'Claim' }} (#{{ $submission->id }})
-        <span class="float-right badge badge-{{ $submission->status == 'Pending' ? 'secondary' : ($submission->status == 'Approved' ? 'success' : 'danger') }}">{{ $submission->status }}</span>
-    </h1>
+        <h1>
+            {{ $submission->prompt_id ? 'Submission' : 'Claim' }} (#{{ $submission->id }})
+            <span class="float-right badge badge-{{ $submission->status == 'Pending' || $submission->status == 'Draft' ? 'secondary' : ($submission->status == 'Approved' ? 'success' : 'danger') }}">
+                {{ $submission->status }}
+            </span>
+        </h1>
 
-    <div class="mb-1">
-        <div class="row">
-            <div class="col-md-2 col-4"><h5>User</h5></div>
-            <div class="col-md-10 col-8">{!! $submission->user->displayName !!}</div>
-        </div>
-        @if($submission->prompt_id)
+        <div class="mb-1">
             <div class="row">
-                <div class="col-md-2 col-4"><h5>Prompt</h5></div>
-                <div class="col-md-10 col-8">{!! $submission->prompt->displayName !!}</div>
+                <div class="col-md-2 col-4">
+                    <h5>User</h5>
+                </div>
+                <div class="col-md-10 col-8">{!! $submission->user->displayName !!}</div>
             </div>
+            @if ($submission->prompt_id)
+                <div class="row">
+                    <div class="col-md-2 col-4">
+                        <h5>Prompt</h5>
+                    </div>
+                    <div class="col-md-10 col-8">{!! $submission->prompt->displayName !!}</div>
+                </div>
+                <div class="row">
+                    <div class="col-md-2 col-4">
+                        <h5>Previous Submissions</h5>
+                    </div>
+                    <div class="col-md-10 col-8">{{ $count }} {!! add_help('This is the number of times the user has submitted this prompt before and had their submission approved.') !!}</div>
+                </div>
+            @endif
             <div class="row">
-                <div class="col-md-2 col-4"><h5>Previous Submissions</h5></div>
-                <div class="col-md-10 col-8">{{ $count }} {!! add_help('This is the number of times the user has submitted this prompt before and had their submission approved.') !!}</div>
+                <div class="col-md-2 col-4">
+                    <h5>URL</h5>
+                </div>
+                <div class="col-md-10 col-8"><a href="{{ $submission->url }}">{{ $submission->url }}</a></div>
+            </div>
+            <div class="row">
+                <div class="col-md-2 col-4">
+                    <h5>Submitted</h5>
+                </div>
+                <div class="col-md-10 col-8">{!! format_date($submission->created_at) !!} ({{ $submission->created_at->diffForHumans() }})</div>
             </div>
-        @endif
-        <div class="row">
-            <div class="col-md-2 col-4"><h5>URL</h5></div>
-            <div class="col-md-10 col-8"><a href="{{ $submission->url }}">{{ $submission->url }}</a></div>
         </div>
-        <div class="row">
-            <div class="col-md-2 col-4"><h5>Submitted</h5></div>
-            <div class="col-md-10 col-8">{!! format_date($submission->created_at) !!} ({{ $submission->created_at->diffForHumans() }})</div>
+        <h2>Comments</h2>
+        <div class="card mb-3">
+            <div class="card-body">{!! nl2br(htmlentities($submission->comments)) !!}</div>
         </div>
-    </div>
-    <h2>Comments</h2>
-    <div class="card mb-3"><div class="card-body">{!! nl2br(htmlentities($submission->comments)) !!}</div></div>
-    @if(Auth::check() && $submission->staff_comments && ($submission->user_id == Auth::user()->id || Auth::user()->hasPower('manage_submissions')))
-        <h2>Staff Comments ({!! $submission->staff->displayName !!})</h2>
-        <div class="card mb-3"><div class="card-body">
-		    @if(isset($submission->parsed_staff_comments))
-                {!! $submission->parsed_staff_comments !!}
-            @else
-                {!! $submission->staff_comments !!}
-            @endif
-		</div></div>
-    @endif
+        @if (Auth::check() && $submission->staff_comments && ($submission->user_id == Auth::user()->id || Auth::user()->hasPower('manage_submissions')))
+            <h2>Staff Comments ({!! $submission->staff->displayName !!})</h2>
+            <div class="card mb-3">
+                <div class="card-body">
+                    @if (isset($submission->parsed_staff_comments))
+                        {!! $submission->parsed_staff_comments !!}
+                    @else
+                        {!! $submission->staff_comments !!}
+                    @endif
+                </div>
+            </div>
+        @endif
 
-    {!! Form::open(['url' => url()->current(), 'id' => 'submissionForm']) !!}
+        {!! Form::open(['url' => url()->current(), 'id' => 'submissionForm']) !!}
 
         <h2>Rewards</h2>
         @include('widgets._loot_select', ['loots' => $submission->rewards, 'showLootTables' => true, 'showRaffles' => true])
-        @if($submission->prompt_id)
+        @if ($submission->prompt_id)
             <div class="mb-3">
                 @include('home._prompt', ['prompt' => $submission->prompt, 'staffView' => true])
             </div>
@@ -65,7 +83,13 @@
 
         <h2>Characters</h2>
         <div id="characters" class="mb-3">
-            @foreach($submission->characters as $character)
+            @if (count(
+                    $submission->characters()->whereRelation('character', 'deleted_at', null)->get()) != count($submission->characters()->get()))
+                <div class="alert alert-warning">
+                    Some characters have been deleted since this submission was created.
+                </div>
+            @endif
+            @foreach ($submission->characters()->whereRelation('character', 'deleted_at', null)->get() as $character)
                 @include('widgets._character_select_entry', ['characterCurrencies' => $characterCurrencies, 'items' => $items, 'tables' => $tables, 'character' => $character, 'expanded_rewards' => $expanded_rewards])
             @endforeach
         </div>
@@ -73,22 +97,25 @@
             <a href="#" class="btn btn-outline-info" id="addCharacter">Add Character</a>
         </div>
 
-        @if(isset($inventory['user_items']))
-        <h2>Add-Ons</h2>
-        <p>These items have been removed from the {{ $submission->prompt_id ? 'submitter' : 'claimant' }}'s inventory and will be refunded if the request is rejected or consumed if it is approved.</p>
+        @if (isset($inventory['user_items']))
+            <h2>Add-Ons</h2>
+            <p>These items have been removed from the {{ $submission->prompt_id ? 'submitter' : 'claimant' }}'s inventory and will be refunded if the request is rejected or consumed if it is approved.</p>
             <table class="table table-sm">
                 <thead class="thead-light">
-                        <tr class="d-flex">
-                            <th class="col-2">Item</th>
-                            <th class="col-4">Source</th>
-                            <th class="col-4">Notes</th>
-                            <th class="col-2">Quantity</th>
-                        </tr>
+                    <tr class="d-flex">
+                        <th class="col-2">Item</th>
+                        <th class="col-4">Source</th>
+                        <th class="col-4">Notes</th>
+                        <th class="col-2">Quantity</th>
+                    </tr>
                 </thead>
                 <tbody>
-                    @foreach($inventory['user_items'] as $itemRow)
+                    @foreach ($inventory['user_items'] as $itemRow)
                         <tr class="d-flex">
-                            <td class="col-2">@if(isset($itemsrow[$itemRow['asset']->item_id]->image_url)) <img class="small-icon" src="{{ $itemsrow[$itemRow['asset']->item_id]->image_url }}" alt="{{ $itemsrow[$itemRow['asset']->item_id]->name }}"> @endif {!! $itemsrow[$itemRow['asset']->item_id]->name !!}
+                            <td class="col-2">
+                                @if (isset($itemsrow[$itemRow['asset']->item_id]->image_url))
+                                    <img class="small-icon" src="{{ $itemsrow[$itemRow['asset']->item_id]->image_url }}" alt="{{ $itemsrow[$itemRow['asset']->item_id]->name }}">
+                                @endif {!! $itemsrow[$itemRow['asset']->item_id]->name !!}
                             <td class="col-4">{!! array_key_exists('data', $itemRow['asset']->data) ? ($itemRow['asset']->data['data'] ? $itemRow['asset']->data['data'] : 'N/A') : 'N/A' !!}</td>
                             <td class="col-4">{!! array_key_exists('notes', $itemRow['asset']->data) ? ($itemRow['asset']->data['notes'] ? $itemRow['asset']->data['notes'] : 'N/A') : 'N/A' !!}</td>
                             <td class="col-2">{!! $itemRow['quantity'] !!}
@@ -98,7 +125,7 @@
             </table>
         @endif
 
-        @if(isset($inventory['currencies']))
+        @if (isset($inventory['currencies']))
             <h3>{!! $submission->user->displayName !!}'s Bank</h3>
             <table class="table table-sm mb-3">
                 <thead>
@@ -108,7 +135,7 @@
                     </tr>
                 </thead>
                 <tbody>
-                    @foreach($inventory['currencies'] as $currency)
+                    @foreach ($inventory['currencies'] as $currency)
                         <tr>
                             <td>{!! $currency['asset']->name !!}</td>
                             <td>{{ $currency['quantity'] }}</td>
@@ -118,72 +145,72 @@
             </table>
         @endif
 
-		<div class="form-group">
+        <div class="form-group">
             {!! Form::label('staff_comments', 'Staff Comments (Optional)') !!}
-			{!! Form::textarea('staff_comments', $submission->staffComments, ['class' => 'form-control wysiwyg']) !!}
+            {!! Form::textarea('staff_comments', $submission->staffComments, ['class' => 'form-control wysiwyg']) !!}
         </div>
 
         <div class="text-right">
             <a href="#" class="btn btn-danger mr-2" id="rejectionButton">Reject</a>
+            <a href="#" class="btn btn-secondary mr-2" id="cancelButton">Cancel</a>
             <a href="#" class="btn btn-success" id="approvalButton">Approve</a>
         </div>
 
-    {!! Form::close() !!}
+        {!! Form::close() !!}
 
-    <div id="characterComponents" class="hide">
-        <div class="submission-character mb-3 card">
-            <div class="card-body">
-                <div class="text-right"><a href="#" class="remove-character text-muted"><i class="fas fa-times"></i></a></div>
-                <div class="row">
-                    <div class="col-md-2 align-items-stretch d-flex">
-                        <div class="d-flex text-center align-items-center">
-                            <div class="character-image-blank">Enter character code.</div>
-                            <div class="character-image-loaded hide"></div>
-                        </div>
-                    </div>
-                    <div class="col-md-10">
-                        <a href="#" class="float-right fas fa-close"></a>
-                        <div class="form-group">
-                            {!! Form::label('slug[]', 'Character Code') !!}
-                            {!! Form::text('slug[]', null, ['class' => 'form-control character-code']) !!}
+        <div id="characterComponents" class="hide">
+            <div class="submission-character mb-3 card">
+                <div class="card-body">
+                    <div class="text-right"><a href="#" class="remove-character text-muted"><i class="fas fa-times"></i></a></div>
+                    <div class="row">
+                        <div class="col-md-2 align-items-stretch d-flex">
+                            <div class="d-flex text-center align-items-center">
+                                <div class="character-image-blank">Enter character code.</div>
+                                <div class="character-image-loaded hide"></div>
+                            </div>
                         </div>
-                        <div class="character-rewards hide">
-                            <h4>Character Rewards</h4>
-                            <table class="table table-sm">
-                                <thead>
-                                    <tr>
-                                        @if($expanded_rewards)
-                                        <th width="35%">Reward Type</th>
-                                        <th width="35%">Reward</th>
-                                        @else
-                                        <th width="70%">Reward</th>
-                                        @endif
-                                        <th width="30%">Amount</th>
-                                    </tr>
-                                </thead>
-                                <tbody class="character-rewards">
-                                </tbody>
-                            </table>
-                            <div class="text-right">
-                                <a href="#" class="btn btn-outline-primary btn-sm add-reward">Add Reward</a>
+                        <div class="col-md-10">
+                            <div class="form-group">
+                                {!! Form::label('slug', 'Character Code') !!}
+                                {!! Form::select('slug[]', $characters, null, ['class' => 'form-control character-code', 'placeholder' => 'Select Character']) !!}
+                            </div>
+                            <div class="character-rewards hide">
+                                <h4>Character Rewards</h4>
+                                <table class="table table-sm">
+                                    <thead>
+                                        <tr>
+                                            @if ($expanded_rewards)
+                                                <th width="35%">Reward Type</th>
+                                                <th width="35%">Reward</th>
+                                            @else
+                                                <th width="70%">Reward</th>
+                                            @endif
+                                            <th width="30%">Amount</th>
+                                        </tr>
+                                    </thead>
+                                    <tbody class="character-rewards">
+                                    </tbody>
+                                </table>
+                                <div class="text-right">
+                                    <a href="#" class="btn btn-outline-primary btn-sm add-reward">Add Reward</a>
+                                </div>
                             </div>
                         </div>
                     </div>
                 </div>
             </div>
-        </div>
-        <table>
-            <tr class="character-reward-row">
+            <table>
+                <tr class="character-reward-row">
 
-                    @if($expanded_rewards)
-                    <td>
-                        {!! Form::select('character_rewardable_type[]', ['Item' => 'Item', 'Currency' => 'Currency', 'LootTable' => 'Loot Table'], null, ['class' => 'form-control character-rewardable-type', 'placeholder' => 'Select Reward Type']) !!}
-                    </td>
-                    <td class="lootDivs">
-                        <div class="character-currencies hide">{!! Form::select('character_rewardable_id[]', $characterCurrencies, 0, ['class' => 'form-control character-currency-id', 'placeholder' => 'Select Currency']) !!}</div>
-                        <div class="character-items hide">{!! Form::select('character_rewardable_id[]', $items, 0, ['class' => 'form-control character-item-id', 'placeholder' => 'Select Item']) !!}</div>
-                        <div class="character-tables hide">{!! Form::select('character_rewardable_id[]', $tables, 0, ['class' => 'form-control character-table-id', 'placeholder' => 'Select Loot Table']) !!}</div>
-                    </td>
+                    @if ($expanded_rewards)
+                        <td>
+                            {!! Form::select('character_rewardable_type[]', ['Item' => 'Item', 'Currency' => 'Currency', 'LootTable' => 'Loot Table'], null, ['class' => 'form-control character-rewardable-type', 'placeholder' => 'Select Reward Type']) !!}
+                        </td>
+                        <td class="lootDivs">
+                            <div class="character-currencies hide">{!! Form::select('character_rewardable_id[]', $characterCurrencies, 0, ['class' => 'form-control character-currency-id', 'placeholder' => 'Select Currency']) !!}</div>
+                            <div class="character-items hide">{!! Form::select('character_rewardable_id[]', $items, 0, ['class' => 'form-control character-item-id', 'placeholder' => 'Select Item']) !!}</div>
+                            <div class="character-tables hide">{!! Form::select('character_rewardable_id[]', $tables, 0, ['class' => 'form-control character-table-id', 'placeholder' => 'Select Loot Table']) !!}</div>
+                        </td>
                     @else
                         <td class="lootDivs">
                             {!! Form::hidden('character_rewardable_type[]', 'Currency', ['class' => 'character-rewardable-type']) !!}
@@ -191,97 +218,127 @@
                         </td>
                     @endif
 
-                <td class="d-flex align-items-center">
-                    {!! Form::text('character_quantity[]', 0, ['class' => 'form-control mr-2  character-rewardable-quantity']) !!}
-                    <a href="#" class="remove-reward d-block"><i class="fas fa-times text-muted"></i></a>
-                </td>
-            </tr>
-        </table>
-    </div>
-    @include('widgets._loot_select_row', ['items' => $items, 'currencies' => $currencies, 'showLootTables' => true, 'showRaffles' => true])
+                    <td class="d-flex align-items-center">
+                        {!! Form::text('character_quantity[]', 0, ['class' => 'form-control mr-2  character-rewardable-quantity']) !!}
+                        <a href="#" class="remove-reward d-block"><i class="fas fa-times text-muted"></i></a>
+                    </td>
+                </tr>
+            </table>
+        </div>
+        @include('widgets._loot_select_row', ['showLootTables' => true, 'showRaffles' => true])
 
-    <div class="modal fade" id="confirmationModal" tabindex="-1" role="dialog">
-        <div class="modal-dialog" role="document">
-            <div class="modal-content hide" id="approvalContent">
-                <div class="modal-header">
-                    <span class="modal-title h5 mb-0">Confirm Approval</span>
-                    <button type="button" class="close" data-dismiss="modal">&times;</button>
-                </div>
-                <div class="modal-body">
-                    <p>This will approve the {{ $submission->prompt_id ? 'submission' : 'claim' }} and distribute the above rewards to the user.</p>
-                    <div class="text-right">
-                        <a href="#" id="approvalSubmit" class="btn btn-success">Approve</a>
+        <div class="modal fade" id="confirmationModal" tabindex="-1" role="dialog">
+            <div class="modal-dialog" role="document">
+                <div class="modal-content hide" id="approvalContent">
+                    <div class="modal-header">
+                        <span class="modal-title h5 mb-0">Confirm Approval</span>
+                        <button type="button" class="close" data-dismiss="modal">&times;</button>
+                    </div>
+                    <div class="modal-body">
+                        <p>This will approve the {{ $submission->prompt_id ? 'submission' : 'claim' }} and distribute the above rewards to the user.</p>
+                        <div class="text-right">
+                            <a href="#" id="approvalSubmit" class="btn btn-success">Approve</a>
+                        </div>
                     </div>
                 </div>
-            </div>
-            <div class="modal-content hide" id="rejectionContent">
-                <div class="modal-header">
-                    <span class="modal-title h5 mb-0">Confirm Rejection</span>
-                    <button type="button" class="close" data-dismiss="modal">&times;</button>
+                <div class="modal-content hide" id="cancelContent">
+                    <div class="modal-header">
+                        <span class="modal-title h5 mb-0">Confirm Cancellation</span>
+                        <button type="button" class="close" data-dismiss="modal">&times;</button>
+                    </div>
+                    <div class="modal-body">
+                        <p>This will cancel the {{ $submission->prompt_id ? 'submission' : 'claim' }} and send it back to drafts. Make sure to include a staff comment if you do this!</p>
+                        <div class="text-right">
+                            <a href="#" id="cancelSubmit" class="btn btn-secondary">Cancel</a>
+                        </div>
+                    </div>
                 </div>
-                <div class="modal-body">
-                    <p>This will reject the {{ $submission->prompt_id ? 'submission' : 'claim' }}.</p>
-                    <div class="text-right">
-                        <a href="#" id="rejectionSubmit" class="btn btn-danger">Reject</a>
+                <div class="modal-content hide" id="rejectionContent">
+                    <div class="modal-header">
+                        <span class="modal-title h5 mb-0">Confirm Rejection</span>
+                        <button type="button" class="close" data-dismiss="modal">&times;</button>
+                    </div>
+                    <div class="modal-body">
+                        <p>This will reject the {{ $submission->prompt_id ? 'submission' : 'claim' }}.</p>
+                        <div class="text-right">
+                            <a href="#" id="rejectionSubmit" class="btn btn-danger">Reject</a>
+                        </div>
                     </div>
                 </div>
             </div>
         </div>
-    </div>
-@else
-    <div class="alert alert-danger">This {{ $submission->prompt_id ? 'submission' : 'claim' }} has already been processed.</div>
-    @include('home._submission_content', ['submission' => $submission])
-@endif
+    @else
+        <div class="alert alert-danger">This {{ $submission->prompt_id ? 'submission' : 'claim' }} has already been processed.</div>
+        @include('home._submission_content', ['submission' => $submission])
+    @endif
 
 @endsection
 
 @section('scripts')
-@parent
-@if($submission->status == 'Pending')
-    @include('js._loot_js', ['showLootTables' => true, 'showRaffles' => true])
-    @include('js._character_select_js')
+    @parent
+    @if ($submission->status == 'Pending')
+        @include('js._loot_js', ['showLootTables' => true, 'showRaffles' => true])
+        @include('js._character_select_js')
 
-    <script>
+        <script>
+            $(document).ready(function() {
+                var $confirmationModal = $('#confirmationModal');
+                var $submissionForm = $('#submissionForm');
 
-        $(document).ready(function() {
-            var $confirmationModal = $('#confirmationModal');
-            var $submissionForm = $('#submissionForm');
+                var $approvalButton = $('#approvalButton');
+                var $approvalContent = $('#approvalContent');
+                var $approvalSubmit = $('#approvalSubmit');
 
-            var $approvalButton = $('#approvalButton');
-            var $approvalContent = $('#approvalContent');
-            var $approvalSubmit = $('#approvalSubmit');
+                var $rejectionButton = $('#rejectionButton');
+                var $rejectionContent = $('#rejectionContent');
+                var $rejectionSubmit = $('#rejectionSubmit');
 
-            var $rejectionButton = $('#rejectionButton');
-            var $rejectionContent = $('#rejectionContent');
-            var $rejectionSubmit = $('#rejectionSubmit');
+                var $cancelButton = $('#cancelButton');
+                var $cancelContent = $('#cancelContent');
+                var $cancelSubmit = $('#cancelSubmit');
 
-            $approvalButton.on('click', function(e) {
-                e.preventDefault();
-                $approvalContent.removeClass('hide');
-                $rejectionContent.addClass('hide');
-                $confirmationModal.modal('show');
-            });
+                $approvalButton.on('click', function(e) {
+                    e.preventDefault();
+                    $approvalContent.removeClass('hide');
+                    $rejectionContent.addClass('hide');
+                    $cancelContent.addClass('hide');
+                    $confirmationModal.modal('show');
+                });
 
-            $rejectionButton.on('click', function(e) {
-                e.preventDefault();
-                $rejectionContent.removeClass('hide');
-                $approvalContent.addClass('hide');
-                $confirmationModal.modal('show');
-            });
+                $rejectionButton.on('click', function(e) {
+                    e.preventDefault();
+                    $rejectionContent.removeClass('hide');
+                    $approvalContent.addClass('hide');
+                    $cancelContent.addClass('hide');
+                    $confirmationModal.modal('show');
+                });
 
-            $approvalSubmit.on('click', function(e) {
-                e.preventDefault();
-                $submissionForm.attr('action', '{{ url()->current() }}/approve');
-                $submissionForm.submit();
-            });
+                $cancelButton.on('click', function(e) {
+                    e.preventDefault();
+                    $cancelContent.removeClass('hide');
+                    $rejectionContent.addClass('hide');
+                    $approvalContent.addClass('hide');
+                    $confirmationModal.modal('show');
+                });
 
-            $rejectionSubmit.on('click', function(e) {
-                e.preventDefault();
-                $submissionForm.attr('action', '{{ url()->current() }}/reject');
-                $submissionForm.submit();
-            });
-        });
+                $approvalSubmit.on('click', function(e) {
+                    e.preventDefault();
+                    $submissionForm.attr('action', '{{ url()->current() }}/approve');
+                    $submissionForm.submit();
+                });
 
-    </script>
-@endif
+                $rejectionSubmit.on('click', function(e) {
+                    e.preventDefault();
+                    $submissionForm.attr('action', '{{ url()->current() }}/reject');
+                    $submissionForm.submit();
+                });
+
+                $cancelSubmit.on('click', function(e) {
+                    e.preventDefault();
+                    $submissionForm.attr('action', '{{ url()->current() }}/cancel');
+                    $submissionForm.submit();
+                });
+            });
+        </script>
+    @endif
 @endsection
diff --git a/resources/views/admin/users/_create_edit_rank.blade.php b/resources/views/admin/users/_create_edit_rank.blade.php
index 6a02881703..be1ace6ff0 100644
--- a/resources/views/admin/users/_create_edit_rank.blade.php
+++ b/resources/views/admin/users/_create_edit_rank.blade.php
@@ -1,5 +1,5 @@
-@if($rank)
-    {!! Form::open(['url' => $rank->id ? 'admin/users/ranks/edit/'.$rank->id : 'admin/users/ranks/create']) !!}
+@if ($rank)
+    {!! Form::open(['url' => $rank->id ? 'admin/users/ranks/edit/' . $rank->id : 'admin/users/ranks/create']) !!}
 
     <div class="form-group">
         {!! Form::label('Rank Name') !!}
@@ -23,32 +23,32 @@
 
     <div class="form-group row px-0 mx-0">
         <div class="col-5 align-self-center">
-          {!! Form::label('Icon (Font-awesome code; optional)') !!}
+            {!! Form::label('Icon (Font-awesome code; optional)') !!}
         </div>
         <div class="col-1 align-self-center text-right p-0">
-          <i id="rankitem" class="{{ $rank->icon }}"></i>
+            <i id="rankitem" class="{{ $rank->icon }}"></i>
         </div>
         <div class="input-group col-6">
             {!! Form::text('icon', $rank->icon, ['class' => 'form-control', 'id' => 'icon']) !!}
         </div>
     </div>
 
-    @if($editable != 2)
+    @if ($editable != 2)
         {{-- Powers --}}
         <div class="form-group">
             <div class="row">
-                @foreach($powers as $key => $power)
+                @foreach ($powers as $key => $power)
                     <div class="col-md-6">
                         <div class="form-check">
-                            {!! Form::checkbox('powers[]', $key, $rankPowers ? isset($rankPowers[$key]) : false, ['class' => 'form-check-input']) !!}
-                            {!! Form::label('powers[]', $power['name'] , ['class' => 'form-check-label']) !!}
+                            {!! Form::checkbox('powers[' . $key . ']', $key, $rankPowers ? isset($rankPowers[$key]) : false, ['class' => 'form-check-input', 'id' => 'powers[' . $key . ']']) !!}
+                            {!! Form::label('powers[' . $key . ']', $power['name'], ['class' => 'form-check-label']) !!}
                             {!! add_help($power['description']) !!}
                         </div>
                     </div>
                 @endforeach
             </div>
         </div>
-    @else 
+    @else
         <div class="card bg-light mb-3">
             <div class="card-body">Powers for the admin rank cannot be edited. {!! add_help('The admin rank has the ability to edit any editable information on the site, and is always highest-ranked (cannot be edited by any other user).') !!}</div>
         </div>
@@ -62,13 +62,13 @@
 
     <script>
         $(document).ready(function() {
-          $("#icon").change(function(){
-             var text = $('#icon').val();
-            $("#rankitem").removeClass();
-            $("#rankitem").addClass(text);
-          });
+            $("#icon").change(function() {
+                var text = $('#icon').val();
+                $("#rankitem").removeClass();
+                $("#rankitem").addClass(text);
+            });
         });
-     </script>
-@else 
+    </script>
+@else
     Invalid rank selected.
-@endif
\ No newline at end of file
+@endif
diff --git a/resources/views/admin/users/_delete_rank.blade.php b/resources/views/admin/users/_delete_rank.blade.php
index bd2ed4dc0a..16ecb02b0b 100644
--- a/resources/views/admin/users/_delete_rank.blade.php
+++ b/resources/views/admin/users/_delete_rank.blade.php
@@ -1,5 +1,5 @@
-@if($rank)
-    {!! Form::open(['url' => 'admin/users/ranks/delete/'.$rank->id]) !!}
+@if ($rank)
+    {!! Form::open(['url' => 'admin/users/ranks/delete/' . $rank->id]) !!}
 
     <p>You are about to delete the rank <strong>{{ $rank->name }}</strong>. This is not reversible and you will only be able to delete it if there are no users with this rank.</p>
     <p>Are you sure you want to delete <strong>{{ $rank->name }}</strong>?</p>
@@ -9,6 +9,6 @@
     </div>
 
     {!! Form::close() !!}
-@else 
+@else
     Invalid rank selected.
-@endif
\ No newline at end of file
+@endif
diff --git a/resources/views/admin/users/_user_ban_confirmation.blade.php b/resources/views/admin/users/_user_ban_confirmation.blade.php
index 49134c910c..235fc18c5c 100644
--- a/resources/views/admin/users/_user_ban_confirmation.blade.php
+++ b/resources/views/admin/users/_user_ban_confirmation.blade.php
@@ -1,4 +1,4 @@
-@if(!$user->is_banned)
+@if (!$user->is_banned)
     <p>Are you sure you want to ban {!! $user->displayName !!}?</p>
     <div class="text-right"><a href="#" class="btn btn-danger ban-confirm-button">Ban</a></div>
 
@@ -8,6 +8,6 @@
             $('#banForm').submit();
         });
     </script>
-@else 
+@else
     <p>This user is already banned.</p>
-@endif
\ No newline at end of file
+@endif
diff --git a/resources/views/admin/users/_user_deactivate_confirmation.blade.php b/resources/views/admin/users/_user_deactivate_confirmation.blade.php
new file mode 100644
index 0000000000..1b5478e1a2
--- /dev/null
+++ b/resources/views/admin/users/_user_deactivate_confirmation.blade.php
@@ -0,0 +1,13 @@
+@if (!$user->is_deactivated)
+    <p>Are you sure you want to deactivate {!! $user->displayName !!}?</p>
+    <div class="text-right"><a href="#" class="btn btn-danger deactivate-confirm-button">Deactivate</a></div>
+
+    <script>
+        $('.deactivate-confirm-button').on('click', function(e) {
+            e.preventDefault();
+            $('#deactivateForm').submit();
+        });
+    </script>
+@else
+    <p>This user is already deactivated.</p>
+@endif
diff --git a/resources/views/admin/users/_user_reactivate_confirmation.blade.php b/resources/views/admin/users/_user_reactivate_confirmation.blade.php
new file mode 100644
index 0000000000..099f085392
--- /dev/null
+++ b/resources/views/admin/users/_user_reactivate_confirmation.blade.php
@@ -0,0 +1,10 @@
+@if ($user->is_deactivated)
+    <p>This will reactivate the user, allowing them to use the site features again. Are you sure you want to do this?</p>
+    {!! Form::open(['url' => 'admin/users/' . $user->name . '/reactivate']) !!}
+    <div class="text-right">
+        {!! Form::submit('Reactivate', ['class' => 'btn btn-danger']) !!}
+    </div>
+    {!! Form::close() !!}
+@else
+    <p>This user is not deactivated.</p>
+@endif
diff --git a/resources/views/admin/users/_user_unban_confirmation.blade.php b/resources/views/admin/users/_user_unban_confirmation.blade.php
index 28935c7e20..4a41b8fed2 100644
--- a/resources/views/admin/users/_user_unban_confirmation.blade.php
+++ b/resources/views/admin/users/_user_unban_confirmation.blade.php
@@ -1,10 +1,10 @@
-@if($user->is_banned)
+@if ($user->is_banned)
     <p>This will unban the user, removing them from the site blacklist and allowing them to use the site features again. Are you sure you want to do this?</p>
-    {!! Form::open(['url' => 'admin/users/'.$user->name.'/unban']) !!}
-        <div class="text-right">
-            {!! Form::submit('Unban', ['class' => 'btn btn-danger']) !!}
-        </div>
+    {!! Form::open(['url' => 'admin/users/' . $user->name . '/unban']) !!}
+    <div class="text-right">
+        {!! Form::submit('Unban', ['class' => 'btn btn-danger']) !!}
+    </div>
     {!! Form::close() !!}
-@else 
+@else
     <p>This user is not banned.</p>
-@endif
\ No newline at end of file
+@endif
diff --git a/resources/views/admin/users/index.blade.php b/resources/views/admin/users/index.blade.php
index c107697e6e..9190cfcf02 100644
--- a/resources/views/admin/users/index.blade.php
+++ b/resources/views/admin/users/index.blade.php
@@ -1,16 +1,18 @@
 @extends('admin.layout')
 
-@section('admin-title') User Index @stop
+@section('admin-title')
+    User Index
+@endsection
 
 @section('admin-content')
-{!! breadcrumbs(['Admin Panel' => 'admin', 'User Index' => 'admin/users']) !!}
+    {!! breadcrumbs(['Admin Panel' => 'admin', 'User Index' => 'admin/users']) !!}
 
-<h1>User Index</h1>
+    <h1>User Index</h1>
 
-<p>Click on a user's name to view/edit their information.</p>
+    <p>Click on a user's name to view/edit their information.</p>
 
-<div>
-    {!! Form::open(['method' => 'GET', 'class' => 'form-inline justify-content-end']) !!}
+    <div>
+        {!! Form::open(['method' => 'GET', 'class' => 'form-inline justify-content-end']) !!}
         <div class="form-group mr-sm-3 mb-3">
             {!! Form::text('name', Request::get('name'), ['class' => 'form-control']) !!}
         </div>
@@ -18,41 +20,67 @@
             {!! Form::select('rank_id', $ranks, Request::get('rank_id'), ['class' => 'form-control']) !!}
         </div>
         <div class="form-group mr-3 mb-3">
-            {!! Form::select('sort', [
-                'alpha'          => 'Sort Alphabetically (A-Z)',
-                'alpha-reverse'  => 'Sort Alphabetically (Z-A)',
-                'alias'          => 'Sort by Alias (A-Z)',
-                'alias-reverse'  => 'Sort by Alias (Z-A)',
-                'rank'           => 'Sort by Rank (Default)',
-                'newest'         => 'Newest First',
-                'oldest'         => 'Oldest First'
-            ], Request::get('sort') ? : 'category', ['class' => 'form-control']) !!}
+            {!! Form::select(
+                'sort',
+                [
+                    'alpha' => 'Sort Alphabetically (A-Z)',
+                    'alpha-reverse' => 'Sort Alphabetically (Z-A)',
+                    'alias' => 'Sort by Alias (A-Z)',
+                    'alias-reverse' => 'Sort by Alias (Z-A)',
+                    'rank' => 'Sort by Rank (Default)',
+                    'newest' => 'Newest First',
+                    'oldest' => 'Oldest First',
+                ],
+                Request::get('sort') ?: 'category',
+                ['class' => 'form-control'],
+            ) !!}
         </div>
         <div class="form-group mb-3">
             {!! Form::submit('Search', ['class' => 'btn btn-primary']) !!}
         </div>
-    {!! Form::close() !!}
-</div>
-
-{!! $users->render() !!}
-  <div class="row ml-md-2">
-    <div class="d-flex row flex-wrap col-12 pb-1 px-0 ubt-bottom">
-      <div class="col-12 col-md-4 font-weight-bold">Username</div>
-      <div class="col-4 col-md-3 font-weight-bold">Alias</div>
-      <div class="col-4 col-md-2 font-weight-bold">Rank</div>
-      <div class="col-4 col-md-3 font-weight-bold">Joined</div>
-    </div>
-    @foreach($users as $user)
-    <div class="d-flex row flex-wrap col-12 mt-1 pt-1 px-0 ubt-top">
-      <div class="col-12 col-md-4 "><a href="{{ $user->adminUrl }}">{!! $user->is_banned ? '<strike>' : '' !!}{{ $user->name }}{!! $user->is_banned ? '</strike>' : '' !!}</a></div>
-      <div class="col-4 col-md-3">{!! $user->displayAlias !!}</div>
-      <div class="col-4 col-md-2">{!! $user->rank->displayName !!}</div>
-      <div class="col-4 col-md-3">{!! pretty_date($user->created_at) !!}</div>
+        {!! Form::close() !!}
     </div>
-    @endforeach
-  </div>
-{!! $users->render() !!}
 
-<div class="text-center mt-4 small text-muted">{{ $count }} user{{ $count == 1 ? '' : 's' }} found.</div>
+    {!! $users->render() !!}
+    <div class="mb-4 logs-table">
+        <div class="logs-table-header">
+            <div class="row">
+                <div class="col-12 col-md-4">
+                    <div class="logs-table-cell">Username</div>
+                </div>
+                <div class="col-4 col-md-3">
+                    <div class="logs-table-cell">Alias</div>
+                </div>
+                <div class="col-4 col-md-2">
+                    <div class="logs-table-cell">Rank</div>
+                </div>
+                <div class="col-4 col-md-3">
+                    <div class="logs-table-cell">Joined</div>
+                </div>
+            </div>
+        </div>
+        <div class="logs-table-body">
+            @foreach ($users as $user)
+                <div class="logs-table-row">
+                    <div class="row flex-wrap">
+                        <div class="col-12 col-md-4 ">
+                            <div class="logs-table-cell"><a href="{{ $user->adminUrl }}">{!! $user->is_banned ? '<strike>' : '' !!}{{ $user->name }}{!! $user->is_banned ? '</strike>' : '' !!}</a></div>
+                        </div>
+                        <div class="col-4 col-md-3">
+                            <div class="logs-table-cell">{!! $user->displayAlias !!}</div>
+                        </div>
+                        <div class="col-4 col-md-2">
+                            <div class="logs-table-cell">{!! $user->rank->displayName !!}</div>
+                        </div>
+                        <div class="col-4 col-md-3">
+                            <div class="logs-table-cell">{!! pretty_date($user->created_at) !!}</div>
+                        </div>
+                    </div>
+                </div>
+            @endforeach
+        </div>
+    </div>
+    {!! $users->render() !!}
 
+    <div class="text-center mt-4 small text-muted">{{ $count }} user{{ $count == 1 ? '' : 's' }} found.</div>
 @endsection
diff --git a/resources/views/admin/users/ranks.blade.php b/resources/views/admin/users/ranks.blade.php
index 874bd6dbad..56bcee4198 100644
--- a/resources/views/admin/users/ranks.blade.php
+++ b/resources/views/admin/users/ranks.blade.php
@@ -1,85 +1,99 @@
 @extends('admin.layout')
 
-@section('admin-title') User Ranks @endsection
+@section('admin-title')
+    User Ranks
+@endsection
 
 @section('admin-content')
-{!! breadcrumbs(['Admin Panel' => 'admin', 'User Ranks' => 'admin/users/ranks']) !!}
+    {!! breadcrumbs(['Admin Panel' => 'admin', 'User Ranks' => 'admin/users/ranks']) !!}
 
-<h1>User Ranks</h1>
+    <h1>
+        User Ranks</h1>
 
-<p>You can create and edit ranks to assign to users here. Ranks can have powers attached, which allows users with the rank to view and edit data on certain parts of the site. To assign a rank to a user, find their admin page from the <a href="{{ url('admin/users') }}">User Index</a> and change their rank there.</p>
+    <p>You can create and edit ranks to assign to users here. Ranks can have powers attached, which allows users with the rank to view and edit data on certain parts of the site. To assign a rank to a user, find their admin page from the <a
+            href="{{ url('admin/users') }}">User Index</a> and change their rank there.</p>
 
-<div class="text-right mb-3"><a class="btn btn-primary create-rank-button" href="#"><i class="fas fa-plus"></i> Add New Rank</a></div>
-<table class="table table-sm ranks-table">
-    <thead>
-        <tr>
-            <th></th><th>Rank</th><th>Description</th><th>Powers</th><th></th>
-        </tr>
-    </thead>
-    <tbody id="sortable" class="sortable">
-        @foreach($ranks as $rank)
-            <tr {{ !$rank->isAdmin ? 'class=sort-item' : '' }} data-id="{{ $rank->id }}">
-                <td>@if(!$rank->isAdmin)<a class="fas fa-arrows-alt-v handle" href="#"></a>@endif</td>
-                <td><i class="{!! $rank->icon ? $rank->icon .' mr-2' : '' !!} "></i>{!! $rank->displayName !!}</td>
-                <td>{!! $rank->parsed_description !!}</td>
-                <td>
-                    @foreach($rank->getPowers() as $power)
-                        <div>{{ $power['name'] }}</div>
-                    @endforeach
-                </td>
-                <td>
-                    <a href="#" class="btn btn-primary edit-rank-button" data-id="{{ $rank->id }}" >Edit</a>
-                    @if(!$rank->isAdmin)
-                        <a href="#" class="btn btn-danger delete-rank-button" data-id="{{ $rank->id }}" >Delete</a>
-                    @endif
-                </td>
+    <div class="text-right mb-3"><a class="btn btn-primary create-rank-button" href="#"><i class="fas fa-plus"></i> Add New Rank</a></div>
+    <table class="table table-sm ranks-table">
+        <thead>
+            <tr>
+                <th></th>
+                <th>Rank</th>
+                <th>Description</th>
+                <th>Powers</th>
+                <th></th>
             </tr>
-        @endforeach
-    </tbody>
-
-</table>
-<div>
-    {!! Form::open(['url' => 'admin/users/ranks/sort']) !!}
-    {!! Form::hidden('sort', '', ['id' => 'sortableOrder']) !!}
-    {!! Form::submit('Save Order', ['class' => 'btn btn-primary']) !!}
-    {!! add_help('This order is reflected in the sort order on the users list. Additionally, users with the Edit User Info power cannot edit users with a rank higher than their own.') !!}
-    {!! Form::close() !!}
-</div>
+        </thead>
+        <tbody id="sortable" class="sortable">
+            @foreach ($ranks as $rank)
+                <tr {{ !$rank->isAdmin ? 'class=sort-item' : '' }} data-id="{{ $rank->id }}">
+                    <td>
+                        @if (!$rank->isAdmin)
+                            <a class="fas fa-arrows-alt-v handle" href="#"></a>
+                        @endif
+                    </td>
+                    <td><i class="{!! $rank->icon ? $rank->icon . ' mr-2' : '' !!} "></i>{!! $rank->displayName !!}</td>
+                    <td>{!! $rank->parsed_description !!}</td>
+                    <td>
+                        @foreach ($rank->getPowers() as $power)
+                            <div>{{ $power['name'] }}</div>
+                        @endforeach
+                    </td>
+                    <td>
+                        <a href="#" class="btn btn-primary edit-rank-button" data-id="{{ $rank->id }}">Edit</a>
+                        @if (!$rank->isAdmin)
+                            <a href="#" class="btn btn-danger delete-rank-button" data-id="{{ $rank->id }}">Delete</a>
+                        @endif
+                    </td>
+                </tr>
+            @endforeach
+        </tbody>
 
+    </table>
+    <div>
+        {!! Form::open(['url' => 'admin/users/ranks/sort']) !!}
+        {!! Form::hidden('sort', '', ['id' => 'sortableOrder']) !!}
+        {!! Form::submit('Save Order', ['class' => 'btn btn-primary']) !!}
+        {!! add_help('This order is reflected in the sort order on the users list. Additionally, users with the Edit User Info power cannot edit users with a rank higher than their own.') !!}
+        {!! Form::close() !!}
+    </div>
 @endsection
 
 @section('scripts')
-@parent
-<script>
-
-$( document ).ready(function() {
-    $('.create-rank-button').on('click', function(e) {
-        e.preventDefault();
-        loadModal("{{ url('admin/users/ranks/create') }}", 'Create Rank');
-    });
-    $('.edit-rank-button').on('click', function(e) {
-        e.preventDefault();
-        loadModal("{{ url('admin/users/ranks/edit') }}" + '/' + $(this).data('id'), 'Edit Rank');
-    });
-    $('.delete-rank-button').on('click', function(e) {
-        e.preventDefault();
-        loadModal("{{ url('admin/users/ranks/delete') }}" + '/' + $(this).data('id'), 'Delete Rank');
-    });
-    $('.handle').on('click', function(e) {
-        e.preventDefault();
-    });
-    $( "#sortable" ).sortable({
-        items: '.sort-item',
-        handle: ".handle",
-        placeholder: "sortable-placeholder",
-        stop: function( event, ui ) {
-            $('#sortableOrder').val($(this).sortable("toArray", {attribute:"data-id"}));
-        },
-        create: function() {
-            $('#sortableOrder').val($(this).sortable("toArray", {attribute:"data-id"}));
-        }
-    });
-    $( "#sortable" ).disableSelection();
-});
-</script>
-@endsection
\ No newline at end of file
+    @parent
+    <script>
+        $(document).ready(function() {
+            $('.create-rank-button').on('click', function(e) {
+                e.preventDefault();
+                loadModal("{{ url('admin/users/ranks/create') }}", 'Create Rank');
+            });
+            $('.edit-rank-button').on('click', function(e) {
+                e.preventDefault();
+                loadModal("{{ url('admin/users/ranks/edit') }}" + '/' + $(this).data('id'), 'Edit Rank');
+            });
+            $('.delete-rank-button').on('click', function(e) {
+                e.preventDefault();
+                loadModal("{{ url('admin/users/ranks/delete') }}" + '/' + $(this).data('id'), 'Delete Rank');
+            });
+            $('.handle').on('click', function(e) {
+                e.preventDefault();
+            });
+            $("#sortable").sortable({
+                items: '.sort-item',
+                handle: ".handle",
+                placeholder: "sortable-placeholder",
+                stop: function(event, ui) {
+                    $('#sortableOrder').val($(this).sortable("toArray", {
+                        attribute: "data-id"
+                    }));
+                },
+                create: function() {
+                    $('#sortableOrder').val($(this).sortable("toArray", {
+                        attribute: "data-id"
+                    }));
+                }
+            });
+            $("#sortable").disableSelection();
+        });
+    </script>
+@endsection
diff --git a/resources/views/admin/users/user.blade.php b/resources/views/admin/users/user.blade.php
index dd0f150905..957d405985 100644
--- a/resources/views/admin/users/user.blade.php
+++ b/resources/views/admin/users/user.blade.php
@@ -1,26 +1,31 @@
 @extends('admin.layout')
 
-@section('admin-title') User Index @stop
+@section('admin-title')
+    User Index
+@endsection
 
 @section('admin-content')
-{!! breadcrumbs(['Admin Panel' => 'admin', 'User Index' => 'admin/users', $user->name => 'admin/users/'.$user->name.'/edit']) !!}
+    {!! breadcrumbs(['Admin Panel' => 'admin', 'User Index' => 'admin/users', $user->name => 'admin/users/' . $user->name . '/edit']) !!}
 
-<h1>User: {!! $user->displayName !!}</h1>
-<ul class="nav nav-tabs mb-3">
-  <li class="nav-item">
-    <a class="nav-link active" href="{{ $user->adminUrl }}">Account</a>
-  </li>
-  <li class="nav-item">
-    <a class="nav-link" href="{{ url('admin/users/'.$user->name.'/updates') }}">Account Updates</a>
-  </li>
-  <li class="nav-item">
-    <a class="nav-link" href="{{ url('admin/users/'.$user->name.'/ban') }}">Ban</a>
-  </li>
-</ul>
+    <h1>User: {!! $user->displayName !!}</h1>
+    <ul class="nav nav-tabs mb-3">
+        <li class="nav-item">
+            <a class="nav-link active" href="{{ $user->adminUrl }}">Account</a>
+        </li>
+        <li class="nav-item">
+            <a class="nav-link" href="{{ url('admin/users/' . $user->name . '/updates') }}">Account Updates</a>
+        </li>
+        <li class="nav-item">
+            <a class="nav-link" href="{{ url('admin/users/' . $user->name . '/ban') }}">Ban</a>
+        </li>
+        <li class="nav-item">
+            <a class="nav-link" href="{{ url('admin/users/' . $user->name . '/deactivate') }}">Deactivate</a>
+        </li>
+    </ul>
 
-<div class="card p-3 mb-2">
-    <h3>Basic Info</h3>
-    {!! Form::open(['url' => 'admin/users/'.$user->name.'/basic']) !!}
+    <div class="card p-3 mb-2">
+        <h3>Basic Info</h3>
+        {!! Form::open(['url' => 'admin/users/' . $user->name . '/basic']) !!}
         <div class="form-group row">
             <label class="col-md-2 col-form-label">Username</label>
             <div class="col-md-10">
@@ -29,14 +34,14 @@
         </div>
         <div class="form-group row">
             <label class="col-md-2 col-form-label">Rank
-                @if($user->isAdmin)
+                @if ($user->isAdmin)
                     {!! add_help('The rank of the admin user cannot be edited.') !!}
                 @elseif(!Auth::user()->canEditRank($user->rank))
                     {!! add_help('Your rank is not high enough to edit this user.') !!}
                 @endif
             </label>
             <div class="col-md-10">
-                @if(!$user->isAdmin && Auth::user()->canEditRank($user->rank))
+                @if (!$user->isAdmin && Auth::user()->canEditRank($user->rank))
                     {!! Form::select('rank_id', $ranks, $user->rank_id, ['class' => 'form-control']) !!}
                 @else
                     {!! Form::text('rank_id', $ranks[$user->rank_id], ['class' => 'form-control', 'disabled']) !!}
@@ -46,12 +51,12 @@
         <div class="text-right">
             {!! Form::submit('Edit', ['class' => 'btn btn-primary']) !!}
         </div>
-    {!! Form::close() !!}
-</div>
+        {!! Form::close() !!}
+    </div>
 
-<div class="card p-3 mb-2">
-    <h3>Account</h3>
-    {!! Form::open(['url' => 'admin/users/'.$user->name.'/account']) !!}
+    <div class="card p-3 mb-2">
+        <h3>Account</h3>
+        {!! Form::open(['url' => 'admin/users/' . $user->name . '/account']) !!}
         <div class="form-group row">
             <label class="col-md-2 col-form-label">Email Address</label>
             <div class="col-md-10">
@@ -65,7 +70,9 @@
             </div>
         </div>
         <div class="form-group row">
-            <label class="col-md-2 col-form-label">Is an FTO {!! add_help('FTO (First Time Owner) means that they have no record of possessing a character from this world. This status is automatically updated when they earn their first character, but can be toggled manually in case off-record transfers have happened before.') !!}</label>
+            <label class="col-md-2 col-form-label">Is an FTO {!! add_help(
+                'FTO (First Time Owner) means that they have no record of possessing a character from this world. This status is automatically updated when they earn their first character, but can be toggled manually in case off-record transfers have happened before.',
+            ) !!}</label>
             <div class="col-md-10">
                 <div class="form-check form-control-plaintext">
                     {!! Form::checkbox('is_fto', 1, $user->settings->is_fto, ['class' => 'form-check-input', 'id' => 'checkFTO']) !!}
@@ -75,48 +82,54 @@
         <div class="text-right">
             {!! Form::submit('Edit', ['class' => 'btn btn-primary']) !!}
         </div>
-    {!! Form::close() !!}
-</div>
+        {!! Form::close() !!}
+    </div>
 
-<div class="card p-3 mb-2">
-    <h3>Birthdate</h3>
-    @if(!$user->checkBirthday)<p class="text-danger">This user is currently set to an underage DOB</p>@endif
-    {!! Form::open(['url' => 'admin/users/'.$user->name.'/birthday']) !!}
+    <div class="card p-3 mb-2">
+        <h3>Birthdate</h3>
+        @if ($user->birthday)
+            <p>This user's birthday is set to {{ format_date($user->birthday, false) }}.</p>
+            @if (!$user->checkBirthday)
+                <p class="text-danger">This user is currently set to an underage DOB.</p>
+            @endif
+        @else
+            <p class="text-danger">This user has not set their DOB.</p>
+        @endif
+        {!! Form::open(['url' => 'admin/users/' . $user->name . '/birthday']) !!}
         <div class="form-group row">
-            <label class="col-md-2 col-form-label">Birthday</label>
+            <label class="col-md-2 col-form-label">Date of Birth</label>
             <div class="col-md-10 row">
-                {{ Form::selectRange('dob[day]', 1, 31, $user->birthday ? intval($user->birthday->format('d')) : null, ['class' => 'form-control col-2 mr-1']) }}
-                {{ Form::selectMonth('dob[month]', $user->birthday ? intval($user->birthday->format('m')) : null, ['class' => 'form-control col-2 mr-1']) }}
-                {{ Form::selectYear('dob[year]', date('Y'), date('Y') - 70, $user->birthday ? intval($user->birthday->format('Y')) : null, ['class' => 'form-control col-2']) }}
+                {!! Form::date('dob', null, ['class' => 'form-control']) !!}
             </div>
         </div>
         <div class="text-right">
             {!! Form::submit('Edit', ['class' => 'btn btn-primary']) !!}
         </div>
-    {!! Form::close() !!}
-</div>
+        {!! Form::close() !!}
+    </div>
 
-<div class="card p-3 mb-2">
-<h3>Aliases</h3>
-    <p>As users are supposed to verify that they own their account(s) themselves, aliases cannot be edited directly. If a user wants to change their alias, clear it here and ask them to go through the verification process again while logged into their new account. If the alias is the user's primary alias, their remaining aliases will be checked to see if they have a valid primary alias. If they do, it will become their new primary alias.</p>
-    @if($user->aliases->count())
-        @foreach($user->aliases as $alias)
-        <div class="form-group row">
-            <div class="col-2">
-                <label>Alias{{ $alias->is_primary_alias ? ' (Primary)' : '' }}</label>
-            </div>
-            <div class="col-10">
-                <div class="d-flex">
-                    {!! Form::text('alias', $alias->alias . '@' . $alias->siteDisplayName . (!$alias->is_visible ? ' (Hidden)' : ''), ['class' => 'form-control', 'disabled']) !!}
-                    {!! Form::open(['url' => 'admin/users/'.$user->name.'/alias/'.$alias->id]) !!}
-                    <div class="text-right ml-2">{!! Form::submit('Clear Alias', ['class' => 'btn btn-danger']) !!}</div>
+    <div class="card p-3 mb-2">
+        <h3>Aliases</h3>
+        <p>As users are supposed to verify that they own their account(s) themselves, aliases cannot be edited directly. If a user wants to change their alias, clear it here and ask them to go through the verification process again while logged into
+            their new account. If the alias is the user's primary alias, their remaining aliases will be checked to see if they have a valid primary alias. If they do, it will become their new primary alias.</p>
+        @if ($user->aliases->count())
+            @foreach ($user->aliases as $alias)
+                <div class="form-group row">
+                    <div class="col-2">
+                        <label>Alias{{ $alias->is_primary_alias ? ' (Primary)' : '' }}</label>
+                    </div>
+                    <div class="col-10">
+                        <div class="d-flex">
+                            {!! Form::text('alias', $alias->alias . '@' . $alias->siteDisplayName . (!$alias->is_visible ? ' (Hidden)' : ''), ['class' => 'form-control', 'disabled']) !!}
+                            {!! Form::open(['url' => 'admin/users/' . $user->name . '/alias/' . $alias->id]) !!}
+                            <div class="text-right ml-2">{!! Form::submit('Clear Alias', ['class' => 'btn btn-danger']) !!}</div>
+                        </div>
+                    </div>
+                    {!! Form::close() !!}
                 </div>
-            </div>
-            {!! Form::close() !!}
-        </div>
-        @endforeach
-    @else
-        <p>No aliases found.</p>
-    @endif
-</div>
+            @endforeach
+        @else
+            <p>No aliases found.</p>
+        @endif
+    </div>
 @endsection
diff --git a/resources/views/admin/users/user_ban.blade.php b/resources/views/admin/users/user_ban.blade.php
index 363ae52314..a39bb15851 100644
--- a/resources/views/admin/users/user_ban.blade.php
+++ b/resources/views/admin/users/user_ban.blade.php
@@ -1,27 +1,32 @@
 @extends('admin.layout')
 
-@section('admin-title') User: {{ $user->name }} @stop
+@section('admin-title')
+    User: {{ $user->name }}
+@endsection
 
 @section('admin-content')
-{!! breadcrumbs(['Admin Panel' => 'admin', 'User Index' => 'admin/users', $user->name => 'admin/users/'.$user->name.'/edit', 'Account Updates' => 'admin/users/'.$user->name.'/updates']) !!}
+    {!! breadcrumbs(['Admin Panel' => 'admin', 'User Index' => 'admin/users', $user->name => 'admin/users/' . $user->name . '/edit', 'Account Updates' => 'admin/users/' . $user->name . '/updates']) !!}
 
-<h1>User: {!! $user->displayName !!}</h1>
-<ul class="nav nav-tabs mb-3">
-  <li class="nav-item">
-    <a class="nav-link" href="{{ $user->adminUrl }}">Account</a>
-  </li>
-  <li class="nav-item">
-    <a class="nav-link" href="{{ url('admin/users/'.$user->name.'/updates') }}">Account Updates</a>
-  </li>
-  <li class="nav-item">
-    <a class="nav-link active" href="{{ url('admin/users/'.$user->name.'/ban') }}">Ban</a>
-  </li>
-</ul>
+    <h1>User: {!! $user->displayName !!}</h1>
+    <ul class="nav nav-tabs mb-3">
+        <li class="nav-item">
+            <a class="nav-link" href="{{ $user->adminUrl }}">Account</a>
+        </li>
+        <li class="nav-item">
+            <a class="nav-link" href="{{ url('admin/users/' . $user->name . '/updates') }}">Account Updates</a>
+        </li>
+        <li class="nav-item">
+            <a class="nav-link active" href="{{ url('admin/users/' . $user->name . '/ban') }}">Ban</a>
+        </li>
+        <li class="nav-item">
+            <a class="nav-link" href="{{ url('admin/users/' . $user->name . '/deactivate') }}">Deactivate</a>
+        </li>
+    </ul>
 
-<h3>{{ $user->is_banned ? 'Edit ' : '' }}Ban</h3>
-<p>Banning the user will remove their rank, cancel all of their queued submissions and transfers, and prevent them from using any other site features. The ban reason will be displayed on the blacklist.</p>
+    <h3>{{ $user->is_banned ? 'Edit ' : '' }}Ban</h3>
+    <p>Banning the user will remove their rank, cancel all of their queued submissions and transfers, and prevent them from using any other site features. The ban reason will be displayed on the blacklist.</p>
 
-{!! Form::open(['url' => 'admin/users/'.$user->name.'/ban', 'id' => 'banForm']) !!}
+    {!! Form::open(['url' => 'admin/users/' . $user->name . '/ban', 'id' => 'banForm']) !!}
     <div class="form-group">
         {!! Form::label('Reason (Optional; no HTML)') !!}
         {!! Form::textarea('ban_reason', $user->settings->ban_reason, ['class' => 'form-control']) !!}
@@ -29,33 +34,31 @@
     <div class="text-right">
         {!! Form::submit($user->is_banned ? 'Edit' : 'Ban', ['class' => 'btn btn' . ($user->is_banned ? '' : '-outline') . '-danger ban-button']) !!}
     </div>
-{!! Form::close() !!}
-
-@if($user->is_banned)
-    <h3>Unban</h3>
-    <p>Unbanning the user will grant them access to site features again. However, if they had a rank before being banned, it will not be restored.</p>
-    <div class="text-right">
-        <a href="#" class="btn btn-outline-danger unban-button">Unban</a>
-    </div>
-@endif
+    {!! Form::close() !!}
 
+    @if ($user->is_banned)
+        <h3>Unban</h3>
+        <p>Unbanning the user will grant them access to site features again. However, if they had a rank before being banned, it will not be restored.</p>
+        <div class="text-right">
+            <a href="#" class="btn btn-outline-danger unban-button">Unban</a>
+        </div>
+    @endif
 @endsection
 
 @section('scripts')
-<script>
-    $(document).ready(function(){
-        @if(!$user->is_banned)
-            $('.ban-button').on('click', function(e) {
-                e.preventDefault();
-                loadModal("{{ url('admin/users/'.$user->name.'/ban-confirm') }}", 'Ban User');
-            });
-        @else 
-            $('.unban-button').on('click', function(e) {
-                e.preventDefault();
-                loadModal("{{ url('admin/users/'.$user->name.'/unban-confirm') }}", 'Unban User');
-            });
-        @endif
-    });
-</script>
+    <script>
+        $(document).ready(function() {
+            @if (!$user->is_banned)
+                $('.ban-button').on('click', function(e) {
+                    e.preventDefault();
+                    loadModal("{{ url('admin/users/' . $user->name . '/ban-confirm') }}", 'Ban User');
+                });
+            @else
+                $('.unban-button').on('click', function(e) {
+                    e.preventDefault();
+                    loadModal("{{ url('admin/users/' . $user->name . '/unban-confirm') }}", 'Unban User');
+                });
+            @endif
+        });
+    </script>
 @endsection
-
diff --git a/resources/views/admin/users/user_deactivate.blade.php b/resources/views/admin/users/user_deactivate.blade.php
new file mode 100644
index 0000000000..9488edb6a0
--- /dev/null
+++ b/resources/views/admin/users/user_deactivate.blade.php
@@ -0,0 +1,64 @@
+@extends('admin.layout')
+
+@section('admin-title')
+    User: {{ $user->name }}
+@endsection
+
+@section('admin-content')
+    {!! breadcrumbs(['Admin Panel' => 'admin', 'User Index' => 'admin/users', $user->name => 'admin/users/' . $user->name . '/edit', 'Account Updates' => 'admin/users/' . $user->name . '/updates']) !!}
+
+    <h1>User: {!! $user->displayName !!}</h1>
+    <ul class="nav nav-tabs mb-3">
+        <li class="nav-item">
+            <a class="nav-link" href="{{ $user->adminUrl }}">Account</a>
+        </li>
+        <li class="nav-item">
+            <a class="nav-link" href="{{ url('admin/users/' . $user->name . '/updates') }}">Account Updates</a>
+        </li>
+        <li class="nav-item">
+            <a class="nav-link" href="{{ url('admin/users/' . $user->name . '/ban') }}">Ban</a>
+        </li>
+        <li class="nav-item">
+            <a class="nav-link active" href="{{ url('admin/users/' . $user->name . '/deactivate') }}">Deactivate</a>
+        </li>
+    </ul>
+
+    <h3>{{ $user->is_deactivated ? 'Edit Deactivation' : 'Deactivate' }}</h3>
+    <p>Deactivating the user will remove their rank, cancel all of their queued submissions and transfers, and prevent them from using any other site features. The deactivate reason will be displayed on the blacklist.</p>
+
+    {!! Form::open(['url' => 'admin/users/' . $user->name . '/deactivate', 'id' => 'deactivateForm']) !!}
+    <div class="form-group">
+        {!! Form::label('Reason (Optional; no HTML)') !!}
+        {!! Form::textarea('deactivate_reason', $user->settings->deactivate_reason, ['class' => 'form-control']) !!}
+    </div>
+    <div class="text-right">
+        {!! Form::submit($user->is_deactivated ? 'Edit' : 'Deactivate', ['class' => 'btn btn' . ($user->is_deactivated ? '' : '-outline') . '-danger deactivate-button']) !!}
+    </div>
+    {!! Form::close() !!}
+
+    @if ($user->is_deactivated)
+        <h3>Reactivate</h3>
+        <p>Reactivating the user will grant them access to site features again. However, if they had a rank before being deactivatened, it will not be restored.</p>
+        <div class="text-right">
+            <a href="#" class="btn btn-outline-danger reactivate-button">Reactivate</a>
+        </div>
+    @endif
+@endsection
+
+@section('scripts')
+    <script>
+        $(document).ready(function() {
+            @if (!$user->is_deactivated)
+                $('.deactivate-button').on('click', function(e) {
+                    e.preventDefault();
+                    loadModal("{{ url('admin/users/' . $user->name . '/deactivate-confirm') }}", 'Deactivate User');
+                });
+            @else
+                $('.reactivate-button').on('click', function(e) {
+                    e.preventDefault();
+                    loadModal("{{ url('admin/users/' . $user->name . '/reactivate-confirm') }}", 'Reactivate User');
+                });
+            @endif
+        });
+    </script>
+@endsection
diff --git a/resources/views/admin/users/user_update_log.blade.php b/resources/views/admin/users/user_update_log.blade.php
index c9a2a0f385..e5591aef6a 100644
--- a/resources/views/admin/users/user_update_log.blade.php
+++ b/resources/views/admin/users/user_update_log.blade.php
@@ -1,56 +1,75 @@
 @extends('admin.layout')
 
-@section('admin-title') User: {{ $user->name }} @stop
+@section('admin-title')
+    User: {{ $user->name }}
+@endsection
 
 @section('admin-content')
-{!! breadcrumbs(['Admin Panel' => 'admin', 'User Index' => 'admin/users', $user->name => 'admin/users/'.$user->name.'/edit', 'Account Updates' => 'admin/users/'.$user->name.'/updates']) !!}
+    {!! breadcrumbs(['Admin Panel' => 'admin', 'User Index' => 'admin/users', $user->name => 'admin/users/' . $user->name . '/edit', 'Account Updates' => 'admin/users/' . $user->name . '/updates']) !!}
 
-<h1>User: {!! $user->displayName !!}</h1>
-<ul class="nav nav-tabs mb-3">
-  <li class="nav-item">
-    <a class="nav-link" href="{{ $user->adminUrl }}">Account</a>
-  </li>
-  <li class="nav-item">
-    <a class="nav-link active" href="{{ url('admin/users/'.$user->name.'/updates') }}">Account Updates</a>
-  </li>
-  <li class="nav-item">
-    <a class="nav-link" href="{{ url('admin/users/'.$user->name.'/ban') }}">Ban</a>
-  </li>
-</ul>
+    <h1>User: {!! $user->displayName !!}</h1>
+    <ul class="nav nav-tabs mb-3">
+        <li class="nav-item">
+            <a class="nav-link" href="{{ $user->adminUrl }}">Account</a>
+        </li>
+        <li class="nav-item">
+            <a class="nav-link active" href="{{ url('admin/users/' . $user->name . '/updates') }}">Account Updates</a>
+        </li>
+        <li class="nav-item">
+            <a class="nav-link" href="{{ url('admin/users/' . $user->name . '/ban') }}">Ban</a>
+        </li>
+        <li class="nav-item">
+            <a class="nav-link" href="{{ url('admin/users/' . $user->name . '/deactivate') }}">Deactivate</a>
+        </li>
+    </ul>
 
-<h3>Account Updates</h3>
-<p>This is a list of changes that have been made to this account's information, whether by the user or by a staff member.</p>
+    <h3>Account Updates</h3>
+    <p>This is a list of changes that have been made to this account's information, whether by the user or by a staff member.</p>
 
-{!! $logs->render() !!}
-<table class="table table-sm">
-    <thead>
-        <tr>
-            <th>Staff Member</th>
-            <th>Type</th>
-            <th>Data</th>
-            <th>Date</th>
-        </tr>
-    </thead>
-    <tbody>
-        @foreach($logs as $log)
-            <tr>
-                <td>{!! $log->staff_id ? $log->staff->displayName : '---' !!}</td>
-                <td>{{ $log->type }}</td>
-                <td>
-                    @foreach($log->data as $key => $value)
-                        <div>
-                            @if(is_string($value))
-                                <strong>{{ ucfirst(str_replace('_', ' ', $key)) }}: </strong>{{ $value }}
-                            @endif
+    {!! $logs->render() !!}
+    <div class="mb-4 logs-table">
+        <div class="logs-table-header">
+            <div class="row">
+                <div class="col-6 col-md-3">
+                    <div class="logs-table-cell">Staff Member</div>
+                </div>
+                <div class="col-6 col-md-3">
+                    <div class="logs-table-cell">Type</div>
+                </div>
+                <div class="col-6 col-md-3">
+                    <div class="logs-table-cell">Data</div>
+                </div>
+                <div class="col-6 col-md-3">
+                    <div class="logs-table-cell">Date</div>
+                </div>
+            </div>
+        </div>
+        <div class="logs-table-body">
+            @foreach ($logs as $log)
+                <div class="row">
+                    <div class="col-6 col-md-3">
+                        <div class="logs-table-cell">{!! $log->staff_id ? $log->staff->displayName : '---' !!}</div>
+                    </div>
+                    <div class="col-6 col-md-3">
+                        <div class="logs-table-cell">{{ $log->type }}</div>
+                    </div>
+                    <div class="col-6 col-md-3">
+                        <div class="logs-table-cell">
+                            @foreach ($log->data as $key => $value)
+                                <div>
+                                    @if (is_string($value))
+                                        <strong>{{ ucfirst(str_replace('_', ' ', $key)) }}: </strong>{{ $value }}
+                                    @endif
+                                </div>
+                            @endforeach
                         </div>
-                    @endforeach
-                </td>
-                <td>{!! format_date($log->created_at) !!}</td>
-            </tr>
-        @endforeach
-    </tbody>
-</table>
-{!! $logs->render() !!}
-
+                    </div>
+                    <div class="col-6 col-md-3">
+                        <div class="logs-table-cell">{!! format_date($log->created_at) !!}</div>
+                    </div>
+                </div>
+            @endforeach
+        </div>
+    </div>
+    {!! $logs->render() !!}
 @endsection
-
diff --git a/resources/views/auth/_require_setup.blade.php b/resources/views/auth/_require_setup.blade.php
index 7ab4c159ea..6277597a5f 100644
--- a/resources/views/auth/_require_setup.blade.php
+++ b/resources/views/auth/_require_setup.blade.php
@@ -1,2 +1,2 @@
 <h1>Setup Required</h1>
-<p>Basic setup for this site has not yet been completed. Please follow setup instructions to finish setting up the site first!</p>
\ No newline at end of file
+<p>Basic setup for this site has not yet been completed. Please follow setup instructions to finish setting up the site first!</p>
diff --git a/resources/views/auth/birthday.blade.php b/resources/views/auth/birthday.blade.php
index ef2fb1c850..7ffa4d8785 100644
--- a/resources/views/auth/birthday.blade.php
+++ b/resources/views/auth/birthday.blade.php
@@ -1,28 +1,28 @@
 @extends('layouts.app')
 
-@section('title') Add Your Birthday @endsection
+@section('title')
+    Add Your Birthday
+@endsection
 
 @section('content')
+    <h1>Add Birthday</h1>
+    <p>Your account does not have a birth date. To gain access to personalised site features, you must add a birthdate to your {{ config('lorekeeper.settings.site_name', 'Lorekeeper') }} account. Your birthday is used to verify if you are allowed to
+        access this site.
+        <br>It is private by default.
+    </p>
+    <p><strong>Please make sure you enter the correct date.</strong></p>
 
-<h1>Add Birthday</h1>
-<p>Your account does not have a birth date. To gain access to personalised site features, you must add a birthdate to your {{ config('lorekeeper.settings.site_name', 'Lorekeeper') }} account. Your birthday is used to verify if you are allowed to access this site.
-<br>It is private by default.</p>
-<p><strong>Please make sure you enter the correct date.</strong></p>
-
-{!! Form::open(['url' => '/birthday']) !!}
-<div class="form-group row">
-    {{ Form::label('dob', 'Date of Birth', ['class' => 'col-md-4 col-form-label text-md-right']) }}
+    {!! Form::open(['url' => '/birthday']) !!}
+    <div class="form-group row">
+        {{ Form::label('dob', 'Date of Birth', ['class' => 'col-md-4 col-form-label text-md-right']) }}
         <div class="col-md-6">
             <div class="col-md row">
-            {{ Form::selectRange('dob[day]', 1, 31, null, ['class' => 'form-control col-2 mr-1']) }}
-            {{ Form::selectMonth('dob[month]', null, ['class' => 'form-control col-2 mr-1']) }}
-            {{ Form::selectYear('dob[year]', date('Y'), date('Y') - 70, null, ['class' => 'form-control col-2']) }}
+                {!! Form::date('dob', null, ['class' => 'form-control']) !!}
+            </div>
+        </div>
+        <div class="text-right">
+            {!! Form::submit('Submit', ['class' => 'btn btn-primary']) !!}
         </div>
     </div>
-    <div class="text-right">
-        {!! Form::submit('Submit', ['class' => 'btn btn-primary']) !!}
-    </div>
-</div>
-{!! Form::close() !!}
-
-@endsection
\ No newline at end of file
+    {!! Form::close() !!}
+@endsection
diff --git a/resources/views/auth/blocked.blade.php b/resources/views/auth/blocked.blade.php
index d2f8438f6c..ad3731f18a 100644
--- a/resources/views/auth/blocked.blade.php
+++ b/resources/views/auth/blocked.blade.php
@@ -1,10 +1,10 @@
 @extends('layouts.app')
 
-@section('title') Blocked @endsection
+@section('title')
+    Blocked
+@endsection
 
 @section('content')
-
-<h3>You are not Permitted to access this site.</h3>
-<p>You are too young to access this website. Please contact an admin if you believe this is a mistake.</p>
-
-@endsection
\ No newline at end of file
+    <h3>You are not Permitted to access this site.</h3>
+    <p>You are too young to access this website. Please contact an admin if you believe this is a mistake.</p>
+@endsection
diff --git a/resources/views/auth/confirm_two_factor.blade.php b/resources/views/auth/confirm_two_factor.blade.php
new file mode 100644
index 0000000000..75f18fac5a
--- /dev/null
+++ b/resources/views/auth/confirm_two_factor.blade.php
@@ -0,0 +1,37 @@
+@extends('account.layout')
+
+@section('account-title')
+    Confirm Two Factor Auth
+@endsection
+
+@section('account-content')
+    <h1>Confirm Two-Factor Authentication</h1>
+
+    <p>Two factor authentication information has been generated. Please scan the provided QR code with an authenticator app on your phone, then confirm with a code from the app to enable two-factor authentication.</p>
+
+    <p>Please also note that these recovery codes will not be shown to you again. Please save them before continuing.</p>
+
+    <div class="row text-center mb-2">
+        <div class="col-md mb-2">
+            <h4>QR Code:</h4>
+            {!! $qrCode !!}
+        </div>
+
+        <div class="col-md">
+            <h4>Recovery Codes:</h4>
+            @foreach ($recoveryCodes as $recoveryCode)
+                {{ $recoveryCode }}<br />
+            @endforeach
+        </div>
+    </div>
+
+    {!! Form::open(['url' => 'account/two-factor/confirm']) !!}
+    <div class="form-group">
+        {!! Form::label('Confirm 2FA') !!}
+        {!! Form::text('code', null, ['class' => 'form-control']) !!}
+    </div>
+    <div class="text-right">
+        {!! Form::submit('Confirm', ['class' => 'btn btn-primary']) !!}
+    </div>
+    {!! Form::close() !!}
+@endsection
diff --git a/resources/views/auth/link.blade.php b/resources/views/auth/link.blade.php
index 02e84d3422..1f64f8a309 100644
--- a/resources/views/auth/link.blade.php
+++ b/resources/views/auth/link.blade.php
@@ -1,21 +1,24 @@
 @extends('layouts.app')
 
-@section('title') Link Account @endsection
+@section('title')
+    Link Account
+@endsection
 
 @section('content')
-<h1>Link Account</h1>
-<p>Your account does not have any external social media accounts linked to it. For the purposes of verifying your identity, you must link at least one of the following accounts to your {{ config('lorekeeper.settings.site_name', 'Lorekeeper') }} account. This will give you access to more personalised features of this site.</p>
+    <h1>Link Account</h1>
+    <p>Your account does not have any external social media accounts linked to it. For the purposes of verifying your identity, you must link at least one of the following accounts to your {{ config('lorekeeper.settings.site_name', 'Lorekeeper') }}
+        account. This will give you access to more personalised features of this site.</p>
 
-<div class="alert alert-warning">You can add other accounts after this process has been completed. Please make sure you are logged into the correct account before continuing.</div>
+    <div class="alert alert-warning">You can add other accounts after this process has been completed. Please make sure you are logged into the correct account before continuing.</div>
 
-<div class="mx-auto" style="width: 250px;">
-    @foreach(Config::get('lorekeeper.sites') as $provider => $site)
-        @if(isset($site['auth']) && $site['auth'] && isset($site['primary_alias']) && $site['primary_alias'])
-            <div class="d-flex mb-3">
-                <div class="d-flex justify-content-end align-items-center"><i class="{{ $site['icon'] }} fa-fw mr-3"></i></div>
-                <div class=""><a href="{{ url('auth/redirect/'.$provider) }}" class="btn btn-outline-primary">Link <strong>{{ $site['full_name'] }}</strong> Account</a></div>
-            </div>
-        @endif
-    @endforeach
-</div>
+    <div class="mx-auto" style="width: 250px;">
+        @foreach (config('lorekeeper.sites') as $provider => $site)
+            @if (isset($site['auth']) && $site['auth'] && isset($site['primary_alias']) && $site['primary_alias'])
+                <div class="d-flex mb-3">
+                    <div class="d-flex justify-content-end align-items-center"><i class="{{ $site['icon'] }} fa-fw mr-3"></i></div>
+                    <div class=""><a href="{{ url('auth/redirect/' . $provider) }}" class="btn btn-outline-primary">Link <strong>{{ $site['full_name'] }}</strong> Account</a></div>
+                </div>
+            @endif
+        @endforeach
+    </div>
 @endsection
diff --git a/resources/views/auth/login.blade.php b/resources/views/auth/login.blade.php
index 71cf93987c..cd8523a880 100644
--- a/resources/views/auth/login.blade.php
+++ b/resources/views/auth/login.blade.php
@@ -1,71 +1,91 @@
 @extends('layouts.app')
 
-@section('title') Login @endsection
+@section('title')
+    Login
+@endsection
 
 @section('content')
-@if($userCount)
-    <div class="row">
-        <div class="col-md-6 offset-md-4">
-            <h1>Log In</h1>
+    @if ($userCount)
+        @if (session('status'))
+            <div class="alert alert-success mb-4">
+                {{ session('status') }}
+            </div>
+        @endif
+
+        <div class="row">
+            <div class="col-md-6 offset-md-4">
+                <h1>Log In</h1>
+            </div>
         </div>
-    </div>
-    <form method="POST" action="{{ route('login') }}">
-        @csrf
+        <form method="POST" action="{{ route('login') }}">
+            @csrf
+            @honeypot
 
-        <div class="form-group row">
-            <label for="email" class="col-md-4 col-form-label text-md-right">{{ __('E-Mail Address') }}</label>
+            <div class="form-group row">
+                <label for="email" class="col-md-4 col-form-label text-md-right">{{ __('E-Mail Address') }}</label>
 
-            <div class="col-md-6">
-                <input id="email" type="email" class="form-control{{ $errors->has('email') ? ' is-invalid' : '' }}" name="email" value="{{ old('email') }}" required autofocus>
-                @if ($errors->has('email'))
-                    <span class="invalid-feedback" role="alert">
-                        <strong>{{ $errors->first('email') }}</strong>
-                    </span>
-                @endif
+                <div class="col-md-6">
+                    <input id="email" type="email" class="form-control{{ $errors->has('email') ? ' is-invalid' : '' }}" name="email" value="{{ old('email') }}" required autofocus>
+                    @if ($errors->has('email'))
+                        <span class="invalid-feedback" role="alert">
+                            <strong>{{ $errors->first('email') }}</strong>
+                        </span>
+                    @endif
+                </div>
             </div>
-        </div>
 
-        <div class="form-group row">
-            <label for="password" class="col-md-4 col-form-label text-md-right">{{ __('Password') }}</label>
+            <div class="form-group row">
+                <label for="password" class="col-md-4 col-form-label text-md-right">{{ __('Password') }}</label>
 
-            <div class="col-md-6">
-                <input id="password" type="password" class="form-control{{ $errors->has('password') ? ' is-invalid' : '' }}" name="password" required>
+                <div class="col-md-6">
+                    <input id="password" type="password" class="form-control{{ $errors->has('password') ? ' is-invalid' : '' }}" name="password" required>
 
-                @if ($errors->has('password'))
-                    <span class="invalid-feedback" role="alert">
-                        <strong>{{ $errors->first('password') }}</strong>
-                    </span>
-                @endif
+                    @if ($errors->has('password'))
+                        <span class="invalid-feedback" role="alert">
+                            <strong>{{ $errors->first('password') }}</strong>
+                        </span>
+                    @endif
+                </div>
             </div>
-        </div>
 
-        <div class="form-group row">
-            <div class="col-md-6 offset-md-4">
-                <div class="form-check">
-                    <input class="form-check-input" type="checkbox" name="remember" id="remember" {{ old('remember') ? 'checked' : '' }}>
+            <div class="form-group row">
+                <div class="col-md-6 offset-md-4">
+                    <div class="form-check">
+                        <input class="form-check-input" type="checkbox" name="remember" id="remember" {{ old('remember') ? 'checked' : '' }}>
 
-                    <label class="form-check-label" for="remember">
-                        {{ __('Remember Me') }}
-                    </label>
+                        <label class="form-check-label" for="remember">
+                            {{ __('Remember Me') }}
+                        </label>
+                    </div>
                 </div>
             </div>
-        </div>
 
-        <div class="form-group row mb-0">
-            <div class="col-md-8 offset-md-4">
-                <button type="submit" class="btn btn-primary">
-                    {{ __('Login') }}
-                </button>
+            <div class="form-group row mb-0">
+                <div class="col-md-8 offset-md-4">
+                    <button type="submit" class="btn btn-primary">
+                        {{ __('Login') }}
+                    </button>
 
-                @if (Route::has('password.request'))
-                    <a class="btn btn-link" href="{{ route('password.request') }}">
-                        {{ __('Forgot Your Password?') }}
-                    </a>
-                @endif
+                    @if (Route::has('password.request'))
+                        <a class="btn btn-link" href="{{ route('password.request') }}">
+                            {{ __('Forgot Your Password?') }}
+                        </a>
+                    @endif
+                </div>
             </div>
-        </div>
-    </form>
-@else 
-    @include('auth._require_setup')
-@endif
+        </form>
+
+        @if ($altLogins)
+            <h3 class="text-center mt-5 pt-2">Alternate Logins</h3>
+            @foreach ($altLogins as $provider => $site)
+                @if (isset($site['login']) && $site['login'])
+                    <div class="text-center pt-3 w-75 m-auto">
+                        <a href="{{ url('/login/redirect/' . $provider) }}" class="btn btn-primary text-white w-100"><i class="{{ $site['icon'] }} mr-2"></i> Login With {{ ucfirst($provider) }}</a>
+                    </div>
+                @endif
+            @endforeach
+        @endif
+    @else
+        @include('auth._require_setup')
+    @endif
 @endsection
diff --git a/resources/views/auth/passwords/confirm.blade.php b/resources/views/auth/passwords/confirm.blade.php
new file mode 100644
index 0000000000..cf5132c152
--- /dev/null
+++ b/resources/views/auth/passwords/confirm.blade.php
@@ -0,0 +1,49 @@
+@extends('layouts.app')
+
+@section('content')
+    <div class="container">
+        <div class="row justify-content-center">
+            <div class="col-md-8">
+                <div class="card">
+                    <div class="card-header">{{ __('Confirm Password') }}</div>
+
+                    <div class="card-body">
+                        {{ __('Please confirm your password before continuing.') }}
+
+                        <form method="POST" action="{{ route('password.confirm') }}">
+                            @csrf
+
+                            <div class="form-group row">
+                                <label for="password" class="col-md-4 col-form-label text-md-right">{{ __('Password') }}</label>
+
+                                <div class="col-md-6">
+                                    <input id="password" type="password" class="form-control @error('password') is-invalid @enderror" name="password" required autocomplete="current-password">
+
+                                    @error('password')
+                                        <span class="invalid-feedback" role="alert">
+                                            <strong>{{ $message }}</strong>
+                                        </span>
+                                    @enderror
+                                </div>
+                            </div>
+
+                            <div class="form-group row mb-0">
+                                <div class="col-md-8 offset-md-4">
+                                    <button type="submit" class="btn btn-primary">
+                                        {{ __('Confirm Password') }}
+                                    </button>
+
+                                    @if (Route::has('password.request'))
+                                        <a class="btn btn-link" href="{{ route('password.request') }}">
+                                            {{ __('Forgot Your Password?') }}
+                                        </a>
+                                    @endif
+                                </div>
+                            </div>
+                        </form>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+@endsection
diff --git a/resources/views/auth/passwords/email.blade.php b/resources/views/auth/passwords/email.blade.php
index 9b2084b67a..c8501103af 100644
--- a/resources/views/auth/passwords/email.blade.php
+++ b/resources/views/auth/passwords/email.blade.php
@@ -1,42 +1,44 @@
 @extends('layouts.app')
 
-@section('title') Reset Password @endsection
+@section('title')
+    Reset Password
+@endsection
 
 @section('content')
-@if (session('status'))
-    <div class="alert alert-success" role="alert">
-        {{ session('status') }}
-    </div>
-@endif
+    @if (session('status'))
+        <div class="alert alert-success" role="alert">
+            {{ session('status') }}
+        </div>
+    @endif
 
-<div class="row">
-    <div class="col-md-6 offset-md-4">
-        <h1>Reset Password</h1>
+    <div class="row">
+        <div class="col-md-6 offset-md-4">
+            <h1>Reset Password</h1>
+        </div>
     </div>
-</div>
-<form method="POST" action="{{ route('password.email') }}">
-    @csrf
+    <form method="POST" action="{{ route('password.email') }}">
+        @csrf
 
-    <div class="form-group row">
-        <label for="email" class="col-md-4 col-form-label text-md-right">{{ __('E-Mail Address') }}</label>
+        <div class="form-group row">
+            <label for="email" class="col-md-4 col-form-label text-md-right">{{ __('E-Mail Address') }}</label>
 
-        <div class="col-md-6">
-            <input id="email" type="email" class="form-control{{ $errors->has('email') ? ' is-invalid' : '' }}" name="email" value="{{ old('email') }}" required>
+            <div class="col-md-6">
+                <input id="email" type="email" class="form-control{{ $errors->has('email') ? ' is-invalid' : '' }}" name="email" value="{{ old('email') }}" required>
 
-            @if ($errors->has('email'))
-                <span class="invalid-feedback" role="alert">
-                    <strong>{{ $errors->first('email') }}</strong>
-                </span>
-            @endif
+                @if ($errors->has('email'))
+                    <span class="invalid-feedback" role="alert">
+                        <strong>{{ $errors->first('email') }}</strong>
+                    </span>
+                @endif
+            </div>
         </div>
-    </div>
 
-    <div class="form-group row mb-0">
-        <div class="col-md-6 offset-md-4">
-            <button type="submit" class="btn btn-primary">
-                {{ __('Send Password Reset Link') }}
-            </button>
+        <div class="form-group row mb-0">
+            <div class="col-md-6 offset-md-4">
+                <button type="submit" class="btn btn-primary">
+                    {{ __('Send Password Reset Link') }}
+                </button>
+            </div>
         </div>
-    </div>
-</form>
+    </form>
 @endsection
diff --git a/resources/views/auth/passwords/forgot.blade.php b/resources/views/auth/passwords/forgot.blade.php
new file mode 100644
index 0000000000..ba4298c4fd
--- /dev/null
+++ b/resources/views/auth/passwords/forgot.blade.php
@@ -0,0 +1,29 @@
+@extends('layouts.app')
+
+@section('title')
+    Forgot Password
+@endsection
+
+@section('content')
+    @if (isset($status) || isset($errors))
+        <div class="alert alert-success mb-4">
+            Form submitted successfully. If this email address is registered to an account, you will receive a password reset email.
+        </div>
+    @endif
+
+    <h1>Forgot Password</h1>
+
+    <p>Please enter the email address associated with your account. An email will be sent to this address to reset your password.</p>
+
+    {!! Form::open(['url' => 'forgot-password']) !!}
+    <div class="form-group row">
+        {!! Form::label('Email', null, ['class' => 'col-md-3 col-form-label text-md-right']) !!}
+        <div class="col-md-7">
+            {!! Form::text('email', null, ['class' => 'form-control']) !!}
+        </div>
+    </div>
+    <div class="text-right">
+        {!! Form::submit('Submit', ['class' => 'btn btn-primary']) !!}
+    </div>
+    {!! Form::close() !!}
+@endsection
diff --git a/resources/views/auth/passwords/reset.blade.php b/resources/views/auth/passwords/reset.blade.php
index cd890ddb94..41480e480b 100644
--- a/resources/views/auth/passwords/reset.blade.php
+++ b/resources/views/auth/passwords/reset.blade.php
@@ -1,60 +1,62 @@
 @extends('layouts.app')
 
-@section('title') Reset Password @endsection
+@section('title')
+    Reset Password
+@endsection
 
 @section('content')
-<div class="row">
-    <div class="col-md-6 offset-md-4">
-        <h1>Reset Password</h1>
+    <div class="row">
+        <div class="col-md-6 offset-md-4">
+            <h1>Reset Password</h1>
+        </div>
     </div>
-</div>
-<form method="POST" action="{{ route('password.update') }}">
-    @csrf
+    <form method="POST" action="{{ route('password.update') }}">
+        @csrf
 
-    <input type="hidden" name="token" value="{{ $token }}">
+        <input type="hidden" name="token" value="{{ request()->route('token') }}">
 
-    <div class="form-group row">
-        <label for="email" class="col-md-4 col-form-label text-md-right">{{ __('E-Mail Address') }}</label>
+        <div class="form-group row">
+            <label for="email" class="col-md-4 col-form-label text-md-right">{{ __('E-Mail Address') }}</label>
 
-        <div class="col-md-6">
-            <input id="email" type="email" class="form-control{{ $errors->has('email') ? ' is-invalid' : '' }}" name="email" value="{{ $email ?? old('email') }}" required autofocus>
+            <div class="col-md-6">
+                <input id="email" type="email" class="form-control{{ $errors->has('email') ? ' is-invalid' : '' }}" name="email" value="{{ request()->email ?? old('email') }}" required autofocus>
 
-            @if ($errors->has('email'))
-                <span class="invalid-feedback" role="alert">
-                    <strong>{{ $errors->first('email') }}</strong>
-                </span>
-            @endif
+                @if ($errors->has('email'))
+                    <span class="invalid-feedback" role="alert">
+                        <strong>{{ $errors->first('email') }}</strong>
+                    </span>
+                @endif
+            </div>
         </div>
-    </div>
 
-    <div class="form-group row">
-        <label for="password" class="col-md-4 col-form-label text-md-right">{{ __('Password') }}</label>
+        <div class="form-group row">
+            <label for="password" class="col-md-4 col-form-label text-md-right">{{ __('Password') }}</label>
 
-        <div class="col-md-6">
-            <input id="password" type="password" class="form-control{{ $errors->has('password') ? ' is-invalid' : '' }}" name="password" required>
+            <div class="col-md-6">
+                <input id="password" type="password" class="form-control{{ $errors->has('password') ? ' is-invalid' : '' }}" name="password" required>
 
-            @if ($errors->has('password'))
-                <span class="invalid-feedback" role="alert">
-                    <strong>{{ $errors->first('password') }}</strong>
-                </span>
-            @endif
+                @if ($errors->has('password'))
+                    <span class="invalid-feedback" role="alert">
+                        <strong>{{ $errors->first('password') }}</strong>
+                    </span>
+                @endif
+            </div>
         </div>
-    </div>
 
-    <div class="form-group row">
-        <label for="password-confirm" class="col-md-4 col-form-label text-md-right">{{ __('Confirm Password') }}</label>
+        <div class="form-group row">
+            <label for="password-confirm" class="col-md-4 col-form-label text-md-right">{{ __('Confirm Password') }}</label>
 
-        <div class="col-md-6">
-            <input id="password-confirm" type="password" class="form-control" name="password_confirmation" required>
+            <div class="col-md-6">
+                <input id="password-confirm" type="password" class="form-control" name="password_confirmation" required>
+            </div>
         </div>
-    </div>
 
-    <div class="form-group row mb-0">
-        <div class="col-md-6 offset-md-4">
-            <button type="submit" class="btn btn-primary">
-                {{ __('Reset Password') }}
-            </button>
+        <div class="form-group row mb-0">
+            <div class="col-md-6 offset-md-4">
+                <button type="submit" class="btn btn-primary">
+                    {{ __('Reset Password') }}
+                </button>
+            </div>
         </div>
-    </div>
-</form>
+    </form>
 @endsection
diff --git a/resources/views/auth/register.blade.php b/resources/views/auth/register.blade.php
index db76968355..77b40e15b6 100644
--- a/resources/views/auth/register.blade.php
+++ b/resources/views/auth/register.blade.php
@@ -1,121 +1,135 @@
 @extends('layouts.app')
 
-@section('title') Register @endsection
+@section('title')
+    Register
+@endsection
 
 @section('content')
-@if($userCount)
-    <div class="row">
-        <div class="col-md-6 offset-md-4">
-            <h1>Register</h1>
-        </div>
-    </div>
-    <form method="POST" action="{{ route('register') }}">
-        @csrf
-
-        <div class="form-group row">
-            <label for="name" class="col-md-4 col-form-label text-md-right">Username</label>
-
-            <div class="col-md-6">
-                <input id="name" type="text" class="form-control{{ $errors->has('name') ? ' is-invalid' : '' }}" name="name" value="{{ old('name') }}" required autofocus>
-
-                @if ($errors->has('name'))
-                    <span class="invalid-feedback" role="alert">
-                        <strong>{{ $errors->first('name') }}</strong>
-                    </span>
-                @endif
+    @if ($userCount)
+        <div class="row">
+            <div class="col-md-6 offset-md-4">
+                <h1>Register</h1>
             </div>
         </div>
 
-        <div class="form-group row">
-            <label for="email" class="col-md-4 col-form-label text-md-right">E-mail Address</label>
-
-            <div class="col-md-6">
-                <input id="email" type="email" class="form-control{{ $errors->has('email') ? ' is-invalid' : '' }}" name="email" value="{{ old('email') }}" required>
-
-                @if ($errors->has('email'))
-                    <span class="invalid-feedback" role="alert">
-                        <strong>{{ $errors->first('email') }}</strong>
-                    </span>
+        @if ($altRegistrations)
+            <h3 class="text-center">Alternate Registrations</h3>
+            @foreach ($altRegistrations as $provider => $site)
+                @if (isset($site['login']) && $site['login'])
+                    <div class="text-center w-75 m-auto pt-2 pb-2">
+                        <a href="{{ url('/login/redirect/' . $provider) }}" class="btn btn-primary text-white w-100"><i class="{{ $site['icon'] }} mr-2"></i> Register With {{ ucfirst($provider) }}</a>
+                    </div>
                 @endif
-            </div>
-        </div>
+            @endforeach
+        @endif
 
-        <div class="form-group row">
-            <label for="password" class="col-md-4 col-form-label text-md-right">{{ __('Password') }}</label>
+        <h3 class="mt-5 text-center">Regular Registration</h3>
+        <form method="POST" action="{{ route('register') }}">
+            @csrf
+            @honeypot
 
-            <div class="col-md-6">
-                <input id="password" type="password" class="form-control{{ $errors->has('password') ? ' is-invalid' : '' }}" name="password" required>
+            <div class="form-group row">
+                <label for="name" class="col-md-4 col-form-label text-md-right">Username</label>
 
-                @if ($errors->has('password'))
-                    <span class="invalid-feedback" role="alert">
-                        <strong>{{ $errors->first('password') }}</strong>
-                    </span>
-                @endif
+                <div class="col-md-6">
+                    <input id="name" type="text" class="form-control{{ $errors->has('name') ? ' is-invalid' : '' }}" name="name" value="{{ old('name') }}" required autofocus>
+
+                    @if ($errors->has('name'))
+                        <span class="invalid-feedback" role="alert">
+                            <strong>{{ $errors->first('name') }}</strong>
+                        </span>
+                    @endif
+                </div>
             </div>
-        </div>
 
-        <div class="form-group row">
-            <label for="password-confirm" class="col-md-4 col-form-label text-md-right">{{ __('Confirm Password') }}</label>
+            <div class="form-group row">
+                <label for="email" class="col-md-4 col-form-label text-md-right">E-mail Address</label>
+
+                <div class="col-md-6">
+                    <input id="email" type="email" class="form-control{{ $errors->has('email') ? ' is-invalid' : '' }}" name="email" value="{{ old('email') }}" required>
 
-            <div class="col-md-6">
-                <input id="password-confirm" type="password" class="form-control" name="password_confirmation" required>
+                    @if ($errors->has('email'))
+                        <span class="invalid-feedback" role="alert">
+                            <strong>{{ $errors->first('email') }}</strong>
+                        </span>
+                    @endif
+                </div>
             </div>
-        </div>
 
-        @if(!Settings::get('is_registration_open'))
             <div class="form-group row">
-                <label for="name" class="col-md-4 col-form-label text-md-right">Invitation Key {!! add_help('Registration is currently closed. An invitation key is required to create an account.') !!}</label>
+                <label for="password" class="col-md-4 col-form-label text-md-right">{{ __('Password') }}</label>
 
                 <div class="col-md-6">
-                    <input id="code" type="text" class="form-control{{ $errors->has('code') ? ' is-invalid' : '' }}" name="code" value="{{ old('code') }}" required autofocus>
+                    <input id="password" type="password" class="form-control{{ $errors->has('password') ? ' is-invalid' : '' }}" name="password" required>
 
-                    @if ($errors->has('code'))
+                    @if ($errors->has('password'))
                         <span class="invalid-feedback" role="alert">
-                            <strong>{{ $errors->first('code') }}</strong>
+                            <strong>{{ $errors->first('password') }}</strong>
                         </span>
                     @endif
                 </div>
             </div>
-        @endif
 
-        <div class="form-group row">
-            {{ Form::label('dob', 'Date of Birth', ['class' => 'col-md-4 col-form-label text-md-right']) }}
-            <div class="col-md-6">
-                <div class="col-md row">
-                {{ Form::selectRange('dob[day]', 1, 31, null, ['class' => 'form-control col-2 mr-1']) }}
-                {{ Form::selectMonth('dob[month]', null, ['class' => 'form-control col-2 mr-1']) }}
-                {{ Form::selectYear('dob[year]', date('Y'), date('Y') - 70, null, ['class' => 'form-control col-2']) }}
-            </div>
+            <div class="form-group row">
+                <label for="password-confirm" class="col-md-4 col-form-label text-md-right">{{ __('Confirm Password') }}</label>
 
+                <div class="col-md-6">
+                    <input id="password-confirm" type="password" class="form-control" name="password_confirmation" required>
+                </div>
             </div>
-            @if ($errors->has('dob'))
-                <span class="invalid-feedback" role="alert">
-                    <strong>{{ $errors->first('dob') }}</strong>
-                </span>
+
+            @if (!Settings::get('is_registration_open'))
+                <div class="form-group row">
+                    <label for="name" class="col-md-4 col-form-label text-md-right">Invitation Key {!! add_help('Registration is currently closed. An invitation key is required to create an account.') !!}</label>
+
+                    <div class="col-md-6">
+                        <input id="code" type="text" class="form-control{{ $errors->has('code') ? ' is-invalid' : '' }}" name="code" value="{{ old('code') }}" required autofocus>
+
+                        @if ($errors->has('code'))
+                            <span class="invalid-feedback" role="alert">
+                                <strong>{{ $errors->first('code') }}</strong>
+                            </span>
+                        @endif
+                    </div>
+                </div>
             @endif
-        </div>
 
-        <div class="form-group row">
-            <div class="col-md-6 offset-md-4">
-                <div class="form-check">
-                    <label class="form-check-label">
-                        {!! Form::checkbox('agreement', 1, false, ['class' => 'form-check-input']) !!}
-                        I have read and agree to the <a href="{{ url('info/terms') }}">Terms of Service</a> and <a href="{{ url('info/privacy') }}">Privacy Policy</a>.
-                    </label>
+            <div class="form-group row">
+                {{ Form::label('dob', 'Date of Birth', ['class' => 'col-md-4 col-form-label text-md-right']) }}
+                <div class="col-md-6">
+                    {!! Form::date('dob', null, ['class' => 'form-control']) !!}
                 </div>
+                @if ($errors->has('dob'))
+                    <span class="invalid-feedback" role="alert">
+                        <strong>{{ $errors->first('dob') }}</strong>
+                    </span>
+                @endif
             </div>
-        </div>
 
-        <div class="form-group row mb-0">
-            <div class="col-md-6 offset-md-4">
-                <button type="submit" class="btn btn-primary">
-                    {{ __('Register') }}
-                </button>
+            <div class="form-group row">
+                <div class="col-md-6 offset-md-4">
+                    <div class="form-check">
+                        <label class="form-check-label">
+                            {!! Form::checkbox('agreement', 1, false, ['class' => 'form-check-input']) !!}
+                            I have read and agree to the <a href="{{ url('info/terms') }}">Terms of Service</a> and <a href="{{ url('info/privacy') }}">Privacy Policy</a>.
+                        </label>
+                    </div>
+                </div>
             </div>
-        </div>
-    </form>
 
-@else 
-    @include('auth._require_setup')
-@endif
+            @if (config('lorekeeper.extensions.use_recaptcha'))
+                {!! RecaptchaV3::field('register') !!}
+            @endif
+
+            <div class="form-group row mb-0">
+                <div class="col-md-6 offset-md-4">
+                    <button type="submit" value="register" class="btn btn-primary">
+                        {{ __('Register') }}
+                    </button>
+                </div>
+            </div>
+        </form>
+    @else
+        @include('auth._require_setup')
+    @endif
 @endsection
diff --git a/resources/views/auth/register_with_driver.blade.php b/resources/views/auth/register_with_driver.blade.php
new file mode 100644
index 0000000000..f87ac2755c
--- /dev/null
+++ b/resources/views/auth/register_with_driver.blade.php
@@ -0,0 +1,82 @@
+@extends('layouts.app')
+
+@section('title')
+    Register
+@endsection
+
+@section('content')
+    @if ($userCount)
+        <div class="row">
+            <div class="col-md-6 offset-md-4">
+                <h1>Register with {{ $provider }}</h1>
+            </div>
+        </div>
+        <form method="POST" action="{{ url('register/' . $provider) }}">
+            @csrf
+            {!! Form::hidden('token', $token ?? old('token')) !!}
+
+            <div class="form-group row">
+                <label for="name" class="col-md-4 col-form-label text-md-right">Username</label>
+
+                <div class="col-md-6">
+                    <input id="name" type="text" class="form-control{{ $errors->has('name') ? ' is-invalid' : '' }}" name="name" value="{{ old('name') ?? $user }}" required autofocus>
+
+                    @if ($errors->has('name'))
+                        <span class="invalid-feedback" role="alert">
+                            <strong>{{ $errors->first('name') }}</strong>
+                        </span>
+                    @endif
+                </div>
+            </div>
+
+            @if (!Settings::get('is_registration_open'))
+                <div class="form-group row">
+                    <label for="name" class="col-md-4 col-form-label text-md-right">Invitation Key {!! add_help('Registration is currently closed. An invitation key is required to create an account.') !!}</label>
+
+                    <div class="col-md-6">
+                        <input id="code" type="text" class="form-control{{ $errors->has('code') ? ' is-invalid' : '' }}" name="code" value="{{ old('code') }}" required autofocus>
+
+                        @if ($errors->has('code'))
+                            <span class="invalid-feedback" role="alert">
+                                <strong>{{ $errors->first('code') }}</strong>
+                            </span>
+                        @endif
+                    </div>
+                </div>
+            @endif
+
+            <div class="form-group row">
+                {{ Form::label('dob', 'Date of Birth', ['class' => 'col-md-4 col-form-label text-md-right']) }}
+                <div class="col-md-6">
+                    {!! Form::date('dob', null, ['class' => 'form-control']) !!}
+                </div>
+                @if ($errors->has('dob'))
+                    <span class="invalid-feedback" role="alert">
+                        <strong>{{ $errors->first('dob') }}</strong>
+                    </span>
+                @endif
+            </div>
+
+            <div class="form-group row">
+                <div class="col-md-6 offset-md-4">
+                    <div class="form-check">
+                        <label class="form-check-label">
+                            {!! Form::checkbox('agreement', 1, false, ['class' => 'form-check-input']) !!}
+                            I have read and agree to the <a href="{{ url('info/terms') }}">Terms of Service</a> and <a href="{{ url('info/privacy') }}">Privacy Policy</a>.
+                        </label>
+                    </div>
+                </div>
+            </div>
+
+            <div class="form-group row mb-0">
+                <div class="col-md-6 offset-md-4">
+                    <button type="submit" class="btn btn-primary">
+                        {{ __('Register') }}
+                    </button>
+                </div>
+            </div>
+        </form>
+    @else
+        @include('auth._require_setup')
+    @endif
+@endsection
diff --git a/resources/views/auth/two-factor-challenge.blade.php b/resources/views/auth/two-factor-challenge.blade.php
new file mode 100644
index 0000000000..89141af212
--- /dev/null
+++ b/resources/views/auth/two-factor-challenge.blade.php
@@ -0,0 +1,65 @@
+@extends('layouts.app')
+
+@section('title')
+    Login: Two-Factor Auth
+@endsection
+
+@section('content')
+    <div class="text-center">
+        <h1>Two-Factor Authentication</h1>
+    </div>
+
+    {!! Form::open(['url' => 'two-factor-challenge']) !!}
+    <div class="form-group row">
+        {!! Form::label('Code', null, ['class' => 'col-md-3 col-form-label text-md-right']) !!}
+        <div class="col-md-7">
+            {!! Form::text('code', null, ['class' => 'form-control']) !!}
+        </div>
+    </div>
+
+    <div class="form-group row">
+        {!! Form::label('use_recovery', 'Use a Recovery Code', ['class' => 'form-label text-md-right col-md-6']) !!}
+        <div class="col-md-6">
+            {!! Form::checkbox('use_recovery', 1, old('use_recovery'), ['class' => 'form-check-input', 'data-toggle' => 'toggle', 'data-on' => 'Yes', 'data-off' => 'No', 'id' => 'useRecovery']) !!}
+        </div>
+    </div>
+    <div class="mb-3" id="recoveryContainer">
+        <div class="form-group row">
+            {!! Form::label('Recovery Code', null, ['class' => 'col-md-3 col-form-label text-md-right']) !!}
+            <div class="col-md-7">
+                {!! Form::text('recovery_code', null, ['class' => 'form-control']) !!}
+            </div>
+        </div>
+    </div>
+
+    <div class="text-right">
+        {!! Form::submit('Submit', ['class' => 'btn btn-primary']) !!}
+    </div>
+    {!! Form::close() !!}
+@endsection
+
+@section('scripts')
+    @parent
+
+    <script>
+        $(document).ready(function() {
+            var $useRecovery = $('#useRecovery');
+            var $recoveryContainer = $('#recoveryContainer');
+
+            var useRecovery = $useRecovery.is(':checked');
+
+            updateOptions();
+
+            $useRecovery.on('change', function(e) {
+                useRecovery = $useRecovery.is(':checked');
+
+                updateOptions();
+            });
+
+            function updateOptions() {
+                if (useRecovery) $recoveryContainer.removeClass('hide');
+                else $recoveryContainer.addClass('hide');
+            }
+        });
+    </script>
+@endsection
diff --git a/resources/views/auth/verify.blade.php b/resources/views/auth/verify.blade.php
index 169a521f60..1068ec5d69 100644
--- a/resources/views/auth/verify.blade.php
+++ b/resources/views/auth/verify.blade.php
@@ -1,21 +1,23 @@
 @extends('layouts.app')
 
-@section('title') Verify Email @endsection
+@section('title')
+    Verify Email
+@endsection
 
 @section('content')
-<h1>Verify Email</h1>
-@if (session('resent'))
-    <div class="alert alert-success" role="alert">
-        {{ __('A fresh verification link has been sent to your email address.') }}
-    </div>
-@endif
+    <h1>Verify Email</h1>
+    @if (session('resent'))
+        <div class="alert alert-success" role="alert">
+            {{ __('A fresh verification link has been sent to your email address.') }}
+        </div>
+    @endif
 
-{{ __('Before proceeding, please check your email for a verification link.') }}
-{{ __('If you did not receive the email') }}, 
-<form class="d-inline" method="POST" action="{{ route('verification.resend') }}">
-    @csrf
-    <button type="submit" class="btn btn-link p-0 m-0 align-baseline">
-        {{ __('click here to request another') }}
-    </button>.
-</form>
+    {{ __('Before proceeding, please check your email for a verification link.') }}
+    {{ __('If you did not receive the email') }},
+    <form class="d-inline" method="POST" action="{{ url('email/verification-notification') }}">
+        @csrf
+        <button type="submit" class="btn btn-link p-0 m-0 align-baseline">
+            {{ __('click here to request another') }}
+        </button>.
+    </form>
 @endsection
diff --git a/resources/views/browse/_masterlist_content.blade.php b/resources/views/browse/_masterlist_content.blade.php
index 8ad791a762..dc77bfe409 100644
--- a/resources/views/browse/_masterlist_content.blade.php
+++ b/resources/views/browse/_masterlist_content.blade.php
@@ -1,134 +1,145 @@
 <div>
     {!! Form::open(['method' => 'GET']) !!}
-        <div class="form-inline justify-content-end">
-            <div class="form-group mr-3 mb-3">
-                {!! Form::label('name', 'Character Name/Code: ', ['class' => 'mr-2']) !!}
-                {!! Form::text('name', Request::get('name'), ['class' => 'form-control']) !!}
-            </div>
-            <div class="form-group mb-3">
-                {!! Form::select('rarity_id', $rarities, Request::get('rarity_id'), ['class' => 'form-control mr-3']) !!}
-            </div>
-            <div class="form-group mb-3">
-                {!! Form::select('species_id', $specieses, Request::get('species_id'), ['class' => 'form-control']) !!}
-            </div>
+    <div class="form-inline justify-content-end">
+        <div class="form-group mr-3 mb-3">
+            {!! Form::label('name', 'Character Name/Code: ', ['class' => 'mr-2']) !!}
+            {!! Form::text('name', Request::get('name'), ['class' => 'form-control']) !!}
         </div>
-        <div class="text-right mb-3"><a href="#advancedSearch" class="btn btn-sm btn-outline-info" data-toggle="collapse">Show Advanced Search Options <i class="fas fa-caret-down"></i></a></div>
-        <div class="card bg-light mb-3 collapse" id="advancedSearch">
-            <div class="card-body masterlist-advanced-search">
-                @if(!$isMyo)
-                    <div class="masterlist-search-field">
-                        {!! Form::label('character_category_id', 'Category: ') !!}
-                        {!! Form::select('character_category_id', $categories, Request::get('character_category_id'), ['class' => 'form-control']) !!}
-                    </div>
-                    <div class="masterlist-search-field">
-                        {!! Form::label('subtype_id', 'Species Subtype: ') !!}
-                        {!! Form::select('subtype_id', $subtypes, Request::get('subtype_id'), ['class' => 'form-control']) !!}
-                    </div>
-                    <div class="masterlist-search-field">
-                        {!! Form::label('title_id', 'Title: ') !!}
-                        {!! Form::select('title_id', $titles, Request::get('title_id'), ['class' => 'form-control', 'id' => 'customTitle']) !!}
-                    </div>
-                    <div class="masterlist-search-field" id="customTitleOptions">
-                        {!! Form::label('title_data', 'Custom Title: ') !!}
-                        {!! Form::text('title_data', Request::get('title_data'), ['class' => 'form-control']) !!}
-                    </div>
-                @endif
-                <hr/>
-                <div class="masterlist-search-field">
-                    {!! Form::label('owner', 'Owner Username: ') !!}
-                    {!! Form::select('owner', $userOptions, Request::get('owner'), ['class'=> 'form-control mr-2 userselectize', 'style' => 'width: 250px', 'placeholder' => 'Select a User']) !!}
-                </div>
-                <div class="masterlist-search-field">
-                    {!! Form::label('artist', 'Artist: ') !!}
-                    {!! Form::select('artist', $userOptions, Request::get('artist'), ['class'=> 'form-control mr-2 userselectize', 'style' => 'width: 250px', 'placeholder' => 'Select a User']) !!}
-                </div>
-                <div class="masterlist-search-field">
-                    {!! Form::label('designer', 'Designer: ') !!}
-                    {!! Form::select('designer', $userOptions, Request::get('designer'), ['class'=> 'form-control mr-2 userselectize', 'style' => 'width: 250px', 'placeholder' => 'Select a User']) !!}
-                </div>
-                <hr />
-                <div class="masterlist-search-field">
-                    {!! Form::label('owner_url', 'Owner URL / Username: ') !!} {!! add_help ('Example: https://deviantart.com/username OR username') !!}
-                    {!! Form::text('owner_url', Request::get('owner_url'), ['class'=> 'form-control mr-2', 'style' => 'width: 250px', 'placeholder' => 'Type a Username']) !!}
-                </div>
-                <div class="masterlist-search-field">
-                    {!! Form::label('artist_url', 'Artist URL / Username: ') !!} {!! add_help ('Example: https://deviantart.com/username OR username') !!}
-                    {!! Form::text('artist_url', Request::get('artist_url'), ['class'=> 'form-control mr-2', 'style' => 'width: 250px', 'placeholder' => 'Type a Username']) !!}
-                </div>
-                <div class="masterlist-search-field">
-                    {!! Form::label('designer_url', 'Designer URL / Username: ') !!} {!! add_help ('Example: https://deviantart.com/username OR username') !!}
-                    {!! Form::text('designer_url', Request::get('designer_url'), ['class'=> 'form-control mr-2', 'style' => 'width: 250px', 'placeholder' => 'Type a Username']) !!}
-                </div>
-                <hr/>
+        <div class="form-group mb-3 mr-1">
+            {!! Form::select('rarity_id', $rarities, Request::get('rarity_id'), ['class' => 'form-control mr-2']) !!}
+        </div>
+        <div class="form-group mb-3">
+            {!! Form::select('species_id', $specieses, Request::get('species_id'), ['class' => 'form-control']) !!}
+        </div>
+    </div>
+    <div class="text-right mb-3"><a href="#advancedSearch" class="btn btn-sm btn-outline-info" data-toggle="collapse">Show Advanced Search Options <i class="fas fa-caret-down"></i></a></div>
+    <div class="card bg-light mb-3 collapse" id="advancedSearch">
+        <div class="card-body masterlist-advanced-search">
+            @if (!$isMyo)
                 <div class="masterlist-search-field">
-                    {!! Form::label('sale_value_min', 'Resale Minimum ($): ') !!}
-                    {!! Form::text('sale_value_min', Request::get('sale_value_min'), ['class' => 'form-control']) !!}
+                    {!! Form::label('character_category_id', 'Category: ') !!}
+                    {!! Form::select('character_category_id', $categories, Request::get('character_category_id'), ['class' => 'form-control mr-2', 'style' => 'width: 250px']) !!}
                 </div>
                 <div class="masterlist-search-field">
-                    {!! Form::label('sale_value_max', 'Resale Maximum ($): ') !!}
-                    {!! Form::text('sale_value_max', Request::get('sale_value_max'), ['class' => 'form-control']) !!}
+                    {!! Form::label('subtype_id', 'Species Subtype: ') !!}
+                    {!! Form::select('subtype_id', $subtypes, Request::get('subtype_id'), ['class' => 'form-control mr-2', 'style' => 'width: 250px']) !!}
                 </div>
-                @if(!$isMyo)
-                    <div class="masterlist-search-field">
-                        {!! Form::label('is_gift_art_allowed', 'Gift Art Status: ') !!}
-                        {!! Form::select('is_gift_art_allowed', [0 => 'Any', 2 => 'Ask First', 1 => 'Yes', 3 => 'Yes OR Ask First'], Request::get('is_gift_art_allowed'), ['class' => 'form-control']) !!}
-                    </div>
-                    <div class="masterlist-search-field">
-                        {!! Form::label('is_gift_writing_allowed', 'Gift Writing Status: ') !!}
-                        {!! Form::select('is_gift_writing_allowed', [0 => 'Any', 2 => 'Ask First', 1 => 'Yes', 3 => 'Yes OR Ask First'], Request::get('is_gift_writing_allowed'), ['class' => 'form-control']) !!}
-                    </div>
-                @endif
-                <br />
-                {{-- Setting the width and height on the toggles as they don't seem to calculate correctly if the div is collapsed. --}}
                 <div class="masterlist-search-field">
-                    {!! Form::checkbox('is_trading', 1, Request::get('is_trading'), ['class' => 'form-check-input',  'data-toggle' => 'toggle', 'data-on' => 'Open For Trade', 'data-off' => 'Any Trading Status', 'data-width' => '200', 'data-height' => '46']) !!}
+                    {!! Form::label('title_id', 'Title: ') !!}
+                    {!! Form::select('title_id', $titles, Request::get('title_id'), ['class' => 'form-control', 'id' => 'customTitle']) !!}
                 </div>
-                <div class="masterlist-search-field">
-                    {!! Form::checkbox('is_sellable', 1, Request::get('is_sellable'), ['class' => 'form-check-input',  'data-toggle' => 'toggle', 'data-on' => 'Can Be Sold', 'data-off' => 'Any Sellable Status', 'data-width' => '204', 'data-height' => '46']) !!}
+                <div class="masterlist-search-field" id="customTitleOptions">
+                    {!! Form::label('title_data', 'Custom Title: ') !!}
+                    {!! Form::text('title_data', Request::get('title_data'), ['class' => 'form-control']) !!}
                 </div>
+                <hr />
+            @endif
+            <div class="masterlist-search-field">
+                {!! Form::label('owner', 'Owner Username: ') !!}
+                {!! Form::select('owner', $userOptions, Request::get('owner'), ['class' => 'form-control mr-2 userselectize', 'style' => 'width: 250px', 'placeholder' => 'Select a User']) !!}
+            </div>
+            <div class="masterlist-search-field">
+                {!! Form::label('artist', 'Artist: ') !!}
+                {!! Form::select('artist', $userOptions, Request::get('artist'), ['class' => 'form-control mr-2 userselectize', 'style' => 'width: 250px', 'placeholder' => 'Select a User']) !!}
+            </div>
+            <div class="masterlist-search-field">
+                {!! Form::label('designer', 'Designer: ') !!}
+                {!! Form::select('designer', $userOptions, Request::get('designer'), ['class' => 'form-control mr-2 userselectize', 'style' => 'width: 250px', 'placeholder' => 'Select a User']) !!}
+            </div>
+            <hr />
+            <div class="masterlist-search-field">
+                {!! Form::label('owner_url', 'Owner URL / Username: ') !!} {!! add_help('Example: https://deviantart.com/username OR username') !!}
+                {!! Form::text('owner_url', Request::get('owner_url'), ['class' => 'form-control mr-2', 'style' => 'width: 250px', 'placeholder' => 'Type a Username']) !!}
+            </div>
+            <div class="masterlist-search-field">
+                {!! Form::label('artist_url', 'Artist URL / Username: ') !!} {!! add_help('Example: https://deviantart.com/username OR username') !!}
+                {!! Form::text('artist_url', Request::get('artist_url'), ['class' => 'form-control mr-2', 'style' => 'width: 250px', 'placeholder' => 'Type a Username']) !!}
+            </div>
+            <div class="masterlist-search-field">
+                {!! Form::label('designer_url', 'Designer URL / Username: ') !!} {!! add_help('Example: https://deviantart.com/username OR username') !!}
+                {!! Form::text('designer_url', Request::get('designer_url'), ['class' => 'form-control mr-2', 'style' => 'width: 250px', 'placeholder' => 'Type a Username']) !!}
+            </div>
+            <hr />
+            <div class="masterlist-search-field">
+                {!! Form::label('sale_value_min', 'Resale Minimum ($): ') !!}
+                {!! Form::text('sale_value_min', Request::get('sale_value_min'), ['class' => 'form-control mr-2', 'style' => 'width: 250px']) !!}
+            </div>
+            <div class="masterlist-search-field">
+                {!! Form::label('sale_value_max', 'Resale Maximum ($): ') !!}
+                {!! Form::text('sale_value_max', Request::get('sale_value_max'), ['class' => 'form-control mr-2', 'style' => 'width: 250px']) !!}
+            </div>
+            @if (!$isMyo)
                 <div class="masterlist-search-field">
-                    {!! Form::checkbox('is_tradeable', 1, Request::get('is_tradeable'), ['class' => 'form-check-input',  'data-toggle' => 'toggle', 'data-on' => 'Can Be Traded', 'data-off' => 'Any Tradeable Status', 'data-width' => '220', 'data-height' => '46']) !!}
+                    {!! Form::label('is_gift_art_allowed', 'Gift Art Status: ') !!}
+                    {!! Form::select('is_gift_art_allowed', [0 => 'Any', 2 => 'Ask First', 1 => 'Yes', 3 => 'Yes OR Ask First'], Request::get('is_gift_art_allowed'), ['class' => 'form-control', 'style' => 'width: 250px']) !!}
                 </div>
                 <div class="masterlist-search-field">
-                    {!! Form::checkbox('is_giftable', 1, Request::get('is_giftable'), ['class' => 'form-check-input',  'data-toggle' => 'toggle', 'data-on' => 'Can Be Gifted', 'data-off' => 'Any Giftable Status', 'data-width' => '202', 'data-height' => '46']) !!}
-                </div>
-                <hr />
-                    <a href="#" class="float-right btn btn-sm btn-outline-primary add-feature-button">Add Trait</a>
-                    {!! Form::label('Has Traits: ') !!} {!! add_help('This will narrow the search to characters that have ALL of the selected traits at the same time.') !!}
-                    <div id="featureBody" class="row">
-                        @if(Request::get('feature_id'))
-                            @foreach(Request::get('feature_id') as $featureId)
-                                <div class="feature-block col-md-3 col-sm-4 col-6 mt-3">
-                                    <div class="card">
-                                        <div class="card-body d-flex">
-                                            {!! Form::select('feature_id[]', $features, $featureId, ['class' => 'form-control feature-select selectize', 'placeholder' => 'Select Trait']) !!}
-                                            <a href="#" class="btn feature-remove ml-2"><i class="fas fa-times"></i></a>
-                                        </div>
-                                    </div>
+                    {!! Form::label('is_gift_writing_allowed', 'Gift Writing Status: ') !!}
+                    {!! Form::select('is_gift_writing_allowed', [0 => 'Any', 2 => 'Ask First', 1 => 'Yes', 3 => 'Yes OR Ask First'], Request::get('is_gift_writing_allowed'), ['class' => 'form-control', 'style' => 'width: 250px']) !!}
+                </div>
+            @endif
+            <br />
+            {{-- Setting the width and height on the toggles as they don't seem to calculate correctly if the div is collapsed. --}}
+            <div class="masterlist-search-field">
+                {!! Form::checkbox('is_trading', 1, Request::get('is_trading'), ['class' => 'form-check-input', 'data-toggle' => 'toggle', 'data-on' => 'Open For Trade', 'data-off' => 'Any Trading Status', 'data-width' => '200', 'data-height' => '46']) !!}
+            </div>
+            <div class="masterlist-search-field">
+                {!! Form::checkbox('is_sellable', 1, Request::get('is_sellable'), ['class' => 'form-check-input', 'data-toggle' => 'toggle', 'data-on' => 'Can Be Sold', 'data-off' => 'Any Sellable Status', 'data-width' => '204', 'data-height' => '46']) !!}
+            </div>
+            <div class="masterlist-search-field">
+                {!! Form::checkbox('is_tradeable', 1, Request::get('is_tradeable'), ['class' => 'form-check-input', 'data-toggle' => 'toggle', 'data-on' => 'Can Be Traded', 'data-off' => 'Any Tradeable Status', 'data-width' => '220', 'data-height' => '46']) !!}
+            </div>
+            <div class="masterlist-search-field">
+                {!! Form::checkbox('is_giftable', 1, Request::get('is_giftable'), ['class' => 'form-check-input', 'data-toggle' => 'toggle', 'data-on' => 'Can Be Gifted', 'data-off' => 'Any Giftable Status', 'data-width' => '202', 'data-height' => '46']) !!}
+            </div>
+            <hr />
+            <a href="#" class="float-right btn btn-sm btn-outline-primary add-feature-button">Add Trait</a>
+            {!! Form::label('Has Traits: ') !!} {!! add_help('This will narrow the search to characters that have ALL of the selected traits at the same time.') !!}
+            <div id="featureBody" class="row w-100">
+                @if (Request::get('feature_id'))
+                    @foreach (Request::get('feature_id') as $featureId)
+                        <div class="feature-block col-md-4 col-sm-6 mt-3 p-1">
+                            <div class="card">
+                                <div class="card-body d-flex">
+                                    {!! Form::select('feature_id[]', $features, $featureId, ['class' => 'form-control feature-select selectize', 'placeholder' => 'Select Trait']) !!}
+                                    <a href="#" class="btn feature-remove ml-2"><i class="fas fa-times"></i></a>
                                 </div>
-                            @endforeach
-                        @endif
-                    </div>
-                <hr />
-                <div class="masterlist-search-field">
-                    {!! Form::checkbox('search_images', 1, Request::get('search_images'), ['class' => 'form-check-input mr-3',  'data-toggle' => 'toggle']) !!}
-                    <span class="ml-2">Include all character images in search {!! add_help('Each character can have multiple images for each updated version of the character, which captures the traits on that character at that point in time. By default the search will only search on the most up-to-date image, but this option will retrieve characters that match the criteria on older images - you may get results that are outdated.') !!}</span>
-                </div>
-
+                            </div>
+                        </div>
+                    @endforeach
+                @endif
+            </div>
+            <hr />
+            <div class="masterlist-search-field">
+                {!! Form::checkbox('search_images', 1, Request::get('search_images'), ['class' => 'form-check-input mr-3', 'data-toggle' => 'toggle']) !!}
+                <span class="ml-2">Include all character images in search {!! add_help(
+                    'Each character can have multiple images for each updated version of the character, which captures the traits on that character at that point in time. By default the search will only search on the most up-to-date image, but this option will retrieve characters that match the criteria on older images - you may get results that are outdated.',
+                ) !!}</span>
             </div>
 
         </div>
-        <div class="form-inline justify-content-end mb-3">
-            <div class="form-group mr-3">
-                {!! Form::label('sort', 'Sort: ', ['class' => 'mr-2']) !!}
-                {!! Form::select('sort', ['number_desc' => 'Number Descending', 'number_asc' => 'Number Ascending', 'id_desc' => 'Newest First', 'id_asc' => 'Oldest First', 'sale_value_desc' => 'Highest Sale Value', 'sale_value_asc' => 'Lowest Sale Value'], Request::get('sort'), ['class' => 'form-control']) !!}
-            </div>
-            {!! Form::submit('Search', ['class' => 'btn btn-primary']) !!}
+
+    </div>
+    <div class="form-inline justify-content-end mb-3">
+        <div class="form-group mr-3">
+            {!! Form::label('sort', 'Sort: ', ['class' => 'mr-2']) !!}
+            @if (!$isMyo)
+                {!! Form::select(
+                    'sort',
+                    ['number_desc' => 'Number Descending', 'number_asc' => 'Number Ascending', 'id_desc' => 'Newest First', 'id_asc' => 'Oldest First', 'sale_value_desc' => 'Highest Sale Value', 'sale_value_asc' => 'Lowest Sale Value'],
+                    Request::get('sort'),
+                    ['class' => 'form-control'],
+                ) !!}
+            @else
+                {!! Form::select('sort', ['id_desc' => 'Newest First', 'id_asc' => 'Oldest First', 'sale_value_desc' => 'Highest Sale Value', 'sale_value_asc' => 'Lowest Sale Value'], Request::get('sort'), ['class' => 'form-control']) !!}
+            @endif
         </div>
+        {!! Form::submit('Search', ['class' => 'btn btn-primary']) !!}
+    </div>
     {!! Form::close() !!}
 </div>
 <div class="hide" id="featureContent">
-    <div class="feature-block col-md-3 col-sm-4 col-6 mt-3">
+    <div class="feature-block col-md-4 col-sm-6 mt-3 p-1">
         <div class="card">
             <div class="card-body d-flex">
                 {!! Form::select('feature_id[]', $features, null, ['class' => 'form-control feature-select selectize', 'placeholder' => 'Select Trait']) !!}
@@ -146,24 +157,28 @@
 
 {!! $characters->render() !!}
 <div id="gridView" class="hide">
-    @foreach($characters->chunk(4) as $chunk)
+    @foreach ($characters->chunk(4) as $chunk)
         <div class="row">
-            @foreach($chunk as $character)
-            <div class="col-md-3 col-6 text-center">
-                <div>
-                    <a href="{{ $character->url }}"><img src="{{ $character->image->thumbnailUrl }}" class="img-thumbnail" alt="Thumbnail for {{ $character->fullName }}"/></a>
-                </div>
-                <div class="mt-1">
-                    <a href="{{ $character->url }}" class="h5 mb-0">@if(!$character->is_visible) <i class="fas fa-eye-slash"></i> @endif {{ $character->fullName }}</a>
-                </div>
-                <div class="small">
-                    {!! $character->image->species_id ? $character->image->species->displayName : 'No Species' !!} ・ {!! $character->image->rarity_id ? $character->image->rarity->displayName : 'No Rarity' !!}
-                    @if(Settings::get('character_title_display') && $character->image->hasTitle)
-                        ・ {!! $character->image->title_id ? $character->image->title->displayNameShort : (isset($character->image->title_data['short']) ? nl2br(htmlentities($character->image->title_data['short'])) : nl2br(htmlentities($character->image->title_data['full']))) !!}
-                    @endif
-                     ・ {!! $character->displayOwner !!}
+            @foreach ($chunk as $character)
+                <div class="col-md-3 col-6 text-center">
+                    <div>
+                        <a href="{{ $character->url }}"><img src="{{ $character->image->thumbnailUrl }}" class="img-thumbnail" alt="Thumbnail for {{ $character->fullName }}" /></a>
+                    </div>
+                    <div class="mt-1">
+                        <a href="{{ $character->url }}" class="h5 mb-0">
+                            @if (!$character->is_visible)
+                                <i class="fas fa-eye-slash"></i>
+                            @endif {{ Illuminate\Support\Str::limit($character->fullName, 20, $end = '...') }}
+                        </a>
+                    </div>
+                    <div class="small">
+                        {!! $character->image->species_id ? $character->image->species->displayName : 'No Species' !!} ・ {!! $character->image->rarity_id ? $character->image->rarity->displayName : 'No Rarity' !!}
+                        @if(Settings::get('character_title_display') && $character->image->hasTitle)
+                            ・ {!! $character->image->title_id ? $character->image->title->displayNameShort : (isset($character->image->title_data['short']) ? nl2br(htmlentities($character->image->title_data['short'])) : nl2br(htmlentities($character->image->title_data['full']))) !!}
+                        @endif
+                        ・ {!! $character->displayOwner !!}
+                    </div>
                 </div>
-            </div>
             @endforeach
         </div>
     @endforeach
@@ -183,10 +198,14 @@
             </tr>
         </thead>
         <tbody>
-            @foreach($characters as $character)
+            @foreach ($characters as $character)
                 <tr>
                     <td>{!! $character->displayOwner !!}</td>
-                    <td>@if(!$character->is_visible) <i class="fas fa-eye-slash"></i> @endif {!! $character->displayName !!}</td>
+                    <td>
+                        @if (!$character->is_visible)
+                            <i class="fas fa-eye-slash"></i>
+                        @endif {!! $character->displayName !!}
+                    </td>
                     <td>{!! $character->image->rarity_id ? $character->image->rarity->displayName : 'None' !!}</td>
                     <td>{!! $character->image->species_id ? $character->image->species->displayName : 'None' !!}</td>
                     @if(Settings::get('character_title_display'))
diff --git a/resources/views/browse/_masterlist_js.blade.php b/resources/views/browse/_masterlist_js.blade.php
index 70ee128933..8a1009aa33 100644
--- a/resources/views/browse/_masterlist_js.blade.php
+++ b/resources/views/browse/_masterlist_js.blade.php
@@ -20,25 +20,22 @@
             setView('list');
         });
 
-        function initView()
-        {
+        function initView() {
             view = window.localStorage.getItem('lorekeeper_masterlist_view');
-            if(!view) view = 'grid';
+            if (!view) view = 'grid';
             setView(view);
         }
 
-        function setView(status)
-        {
+        function setView(status) {
             view = status;
 
-            if(view == 'grid') {
+            if (view == 'grid') {
                 $gridView.removeClass('hide');
                 $gridButton.addClass('active');
                 $listView.addClass('hide');
                 $listButton.removeClass('active');
                 window.localStorage.setItem('lorekeeper_masterlist_view', 'grid');
-            }
-            else if (view == 'list') {
+            } else if (view == 'list') {
                 $listView.removeClass('hide');
                 $listButton.addClass('active');
                 $gridView.addClass('hide');
@@ -71,19 +68,38 @@ function updateTitleSearch() {
 
         // handle the ones that were already there
         var $existingFeatures = $('#featureBody .feature-block');
-        $existingFeatures.find('.selectize').selectize();
+        @if (config('lorekeeper.extensions.organised_traits_dropdown'))
+            $existingFeatures.find('.selectize').selectize({
+                render: {
+                    item: featureSelectedRender
+                }
+            });
+        @else
+            $existingFeatures.find('.selectize').selectize();
+        @endif
         addRemoveListener($existingFeatures);
 
         $addFeatureButton.on('click', function(e) {
             e.preventDefault();
             var $clone = $featureSelect.clone();
             $featureBody.append($clone);
-            $clone.find('.selectize').selectize();
+            @if (config('lorekeeper.extensions.organised_traits_dropdown'))
+                $clone.find('.selectize').selectize({
+                    render: {
+                        item: featureSelectedRender
+                    }
+                });
+            @else
+                $clone.find('.selectize').selectize();
+            @endif
             addRemoveListener($clone);
         });
 
-        function addRemoveListener($node)
-        {
+        function featureSelectedRender(item, escape) {
+            return '<div><span>' + escape(item["text"].trim()) + ' (' + escape(item["optgroup"].trim()) + ')' + '</span></div>';
+        }
+
+        function addRemoveListener($node) {
             $node.find('.feature-remove').on('click', function(e) {
                 e.preventDefault();
                 $(this).parent().parent().parent().remove();
diff --git a/resources/views/browse/_sidebar.blade.php b/resources/views/browse/_sidebar.blade.php
index c2abc27cfe..516990b4c1 100644
--- a/resources/views/browse/_sidebar.blade.php
+++ b/resources/views/browse/_sidebar.blade.php
@@ -5,12 +5,12 @@
         <div class="sidebar-item"><a href="{{ url('masterlist') }}" class="{{ set_active('masterlist*') }}">Characters</a></div>
         <div class="sidebar-item"><a href="{{ url('myos') }}" class="{{ set_active('myos*') }}">MYO Slots</a></div>
     </li>
-    @if(isset($sublists) && $sublists->count() > 0)
+    @if (isset($sublists) && $sublists->count() > 0)
         <li class="sidebar-section">
             <div class="sidebar-section-header">Sub Masterlists</div>
-            @foreach($sublists as $sublist)
-            <div class="sidebar-item"><a href="{{ url('sublist/'.$sublist->key) }}" class="{{ set_active('sublist/'.$sublist->key) }}">{{ $sublist->name }}</a></div>
+            @foreach ($sublists as $sublist)
+                <div class="sidebar-item"><a href="{{ url('sublist/' . $sublist->key) }}" class="{{ set_active('sublist/' . $sublist->key) }}">{{ $sublist->name }}</a></div>
             @endforeach
         </li>
     @endif
-</ul>
\ No newline at end of file
+</ul>
diff --git a/resources/views/browse/blacklist.blade.php b/resources/views/browse/blacklist.blade.php
index c3ad2b46f8..4aa684dc5b 100644
--- a/resources/views/browse/blacklist.blade.php
+++ b/resources/views/browse/blacklist.blade.php
@@ -1,36 +1,38 @@
 @extends('layouts.app')
 
-@section('title') Blacklist @endsection
+@section('title')
+    Blacklist
+@endsection
 
 @section('content')
-{!! breadcrumbs(['Users' => 'users', 'Blacklist' => 'blacklist']) !!}
-<h1>User Blacklist</h1>
+    {!! breadcrumbs(['Users' => 'users', 'Blacklist' => 'blacklist']) !!}
+    <h1>User Blacklist</h1>
 
-@if(!$canView)
+    @if (!$canView)
+        {{-- blade-formatter-disable --}}
     @if($key != '0' &&
         ($privacy == 3 ||
         (Auth::check() &&
         ($privacy == 2 ||
         ($privacy == 1 && Auth::user()->isStaff) ||
         ($privacy == 0 && Auth::user()->isAdmin)))))
-            <p>This page requires a key to view. Please enter the key below to view the blacklist.</p>
-            @if(Request::get('key'))
-                <p class="text-danger">Incorrect key entered.</p>
-            @endif
-            {!! Form::open(['method' => 'GET', 'class' => 'form-inline']) !!}
-                <div class="form-group mr-3 mb-3">
-                    {!! Form::text('key', null, ['class' => 'form-control']) !!}
-                </div>
-                <div class="form-group mb-3">
-                    {!! Form::submit('Submit', ['class' => 'btn btn-primary']) !!}
-                </div>
-            {!! Form::close() !!}
-    @else 
+        {{-- blade-formatter-enable --}}
+        <p>This page requires a key to view. Please enter the key below to view the blacklist.</p>
+        @if (Request::get('key'))
+            <p class="text-danger">Incorrect key entered.</p>
+        @endif
+        {!! Form::open(['method' => 'GET', 'class' => 'form-inline']) !!}
+        <div class="form-group mr-3 mb-3">
+            {!! Form::text('key', null, ['class' => 'form-control']) !!}
+        </div>
+        <div class="form-group mb-3">
+            {!! Form::submit('Submit', ['class' => 'btn btn-primary']) !!}
+        </div>
+        {!! Form::close() !!}
+    @else
         <p>You cannot view this page.</p>
     @endif
-
-@else 
-
+@else
     {!! $users->render() !!}
     <table class="users-table table table-sm table-responsive-xs">
         <thead>
@@ -42,7 +44,7 @@
             </tr>
         </thead>
         <tbody>
-            @foreach($users as $user)
+            @foreach ($users as $user)
                 <tr>
                     <td>{!! $user->displayName !!}</td>
                     <td>{!! $user->displayAlias !!}</td>
@@ -54,7 +56,7 @@
     </table>
     {!! $users->render() !!}
 
-    <div class="text-center mt-4 small text-muted">{{ $users->total() }} result{{ $users->total() == 1 ? '' : 's' }} found.</div>
-@endif
-
+    <div class="text-center mt-4 small text-muted">{{ $users->total() }} result{{ $users->total() == 1 ? '' : 's' }}
+        found.</div>
+    @endif
 @endsection
diff --git a/resources/views/browse/deactivated.blade.php b/resources/views/browse/deactivated.blade.php
new file mode 100644
index 0000000000..fdd711ffc1
--- /dev/null
+++ b/resources/views/browse/deactivated.blade.php
@@ -0,0 +1,58 @@
+@extends('layouts.app')
+
+@section('title')
+    Deactivated Users
+@endsection
+
+@section('content')
+    {!! breadcrumbs(['Users' => 'users', 'Deactivated' => 'deactivated']) !!}
+    <h1>Deactivated Users</h1>
+
+    @if (!$canView)
+        {{-- blade-formatter-disable --}}
+    @if($key != '0' &&
+        ($privacy == 3 ||
+        (Auth::check() &&
+        ($privacy == 2 ||
+        ($privacy == 1 && Auth::user()->isStaff) ||
+        ($privacy == 0 && Auth::user()->isAdmin)))))
+    {{-- blade-formatter-enable --}}
+        <p>This page requires a key to view. Please enter the key below to view the deactivated users.</p>
+        @if (Request::get('key'))
+            <p class="text-danger">Incorrect key entered.</p>
+        @endif
+        {!! Form::open(['method' => 'GET', 'class' => 'form-inline']) !!}
+        <div class="form-group mr-3 mb-3">
+            {!! Form::text('key', null, ['class' => 'form-control']) !!}
+        </div>
+        <div class="form-group mb-3">
+            {!! Form::submit('Submit', ['class' => 'btn btn-primary']) !!}
+        </div>
+        {!! Form::close() !!}
+    @else
+        <p>You cannot view this page.</p>
+    @endif
+@else
+    {!! $users->render() !!}
+    <div class="row ml-md-2">
+        <div class="d-flex row flex-wrap col-12 pb-1 px-0 ubt-bottom">
+            <div class="col-12 col-md-4 font-weight-bold">Username</div>
+            <div class="col-4 col-md-2 font-weight-bold">Primary Alias</div>
+            <div class="col-4 col-md-3 font-weight-bold">Deactivated by</div>
+            <div class="col-4 col-md-2 font-weight-bold">Deactivated at</div>
+        </div>
+        @foreach ($users as $user)
+            <div class="d-flex row flex-wrap col-12 mt-1 pt-1 px-0 ubt-top">
+                <div class="col-12 col-md-4 ">{!! $user->displayName !!}</div>
+                <div class="col-4 col-md-2">{!! $user->displayAlias !!}</div>
+                <div class="col-4 col-md-3">{!! $user->deactivated_by == $user->id ? 'Self' : 'Staff' !!}</div>
+                <div class="col-4 col-md-2">{!! pretty_date($user->settings->deactivated_at, false) !!}</div>
+            </div>
+        @endforeach
+    </div>
+    {!! $users->render() !!}
+
+    <div class="text-center mt-4 small text-muted">{{ $users->total() }} result{{ $users->total() == 1 ? '' : 's' }}
+        found.</div>
+    @endif
+@endsection
diff --git a/resources/views/browse/masterlist.blade.php b/resources/views/browse/masterlist.blade.php
index 886ef15ad1..927dd8d1a8 100644
--- a/resources/views/browse/masterlist.blade.php
+++ b/resources/views/browse/masterlist.blade.php
@@ -1,19 +1,20 @@
 @extends('layouts.app')
 
-@section('title') Character Masterlist @endsection
+@section('title')
+    Character Masterlist
+@endsection
 
 @section('sidebar')
     @include('browse._sidebar')
 @endsection
 
 @section('content')
-{!! breadcrumbs(['Character Masterlist' => 'masterlist']) !!}
-<h1>Character Masterlist</h1>
-
-@include('browse._masterlist_content', ['characters' => $characters])
+    {!! breadcrumbs(['Character Masterlist' => 'masterlist']) !!}
+    <h1>Character Masterlist</h1>
 
+    @include('browse._masterlist_content', ['characters' => $characters])
 @endsection
 
 @section('scripts')
-@include('browse._masterlist_js')
-@endsection
\ No newline at end of file
+    @include('browse._masterlist_js')
+@endsection
diff --git a/resources/views/browse/myo_masterlist.blade.php b/resources/views/browse/myo_masterlist.blade.php
index 6051500018..0d9bd0fcfb 100644
--- a/resources/views/browse/myo_masterlist.blade.php
+++ b/resources/views/browse/myo_masterlist.blade.php
@@ -1,19 +1,20 @@
 @extends('layouts.app')
 
-@section('title') MYO Slot Masterlist @endsection
+@section('title')
+    MYO Slot Masterlist
+@endsection
 
 @section('sidebar')
     @include('browse._sidebar')
 @endsection
 
 @section('content')
-{!! breadcrumbs(['MYO Slot Masterlist' => 'myos']) !!}
-<h1>MYO Slot Masterlist</h1>
-
-@include('browse._masterlist_content', ['characters' => $slots])
+    {!! breadcrumbs(['MYO Slot Masterlist' => 'myos']) !!}
+    <h1>MYO Slot Masterlist</h1>
 
+    @include('browse._masterlist_content', ['characters' => $slots])
 @endsection
 
 @section('scripts')
-@include('browse._masterlist_js')
-@endsection
\ No newline at end of file
+    @include('browse._masterlist_js')
+@endsection
diff --git a/resources/views/browse/sub_masterlist.blade.php b/resources/views/browse/sub_masterlist.blade.php
index a0673e4680..40f292ff4e 100644
--- a/resources/views/browse/sub_masterlist.blade.php
+++ b/resources/views/browse/sub_masterlist.blade.php
@@ -1,19 +1,20 @@
 @extends('layouts.app')
 
-@section('title') {{ $sublist->name }} Masterlist @endsection
+@section('title')
+    {{ $sublist->name }} Masterlist
+@endsection
 
 @section('sidebar')
     @include('browse._sidebar')
 @endsection
 
 @section('content')
-{!! breadcrumbs([$sublist->name.' Masterlist' => $sublist->key ]) !!}
-<h1>{{ $sublist->name }} Masterlist</h1>
-
-@include('browse._masterlist_content', ['characters' => $characters])
+    {!! breadcrumbs([$sublist->name . ' Masterlist' => $sublist->key]) !!}
+    <h1>{{ $sublist->name }} Masterlist</h1>
 
+    @include('browse._masterlist_content', ['characters' => $characters])
 @endsection
 
 @section('scripts')
-@include('browse._masterlist_js')
-@endsection
\ No newline at end of file
+    @include('browse._masterlist_js')
+@endsection
diff --git a/resources/views/browse/users.blade.php b/resources/views/browse/users.blade.php
index 5d61b7e463..d0d781ea3c 100644
--- a/resources/views/browse/users.blade.php
+++ b/resources/views/browse/users.blade.php
@@ -1,18 +1,23 @@
 @extends('layouts.app')
 
-@section('title') Users @endsection
+@section('title')
+    Users
+@endsection
 
 @section('content')
-{!! breadcrumbs(['Users' => 'users']) !!}
-<h1>
-    User Index
-    @if($blacklistLink)
-        <a href="{{ url('blacklist') }}" class="btn btn-dark float-right">Blacklist</a>
-    @endif
-</h1>
+    {!! breadcrumbs(['Users' => 'users']) !!}
+    <h1>
+        User Index
+        @if ($blacklistLink)
+            <a href="{{ url('blacklist') }}" class="btn btn-dark float-right ml-2">Blacklist</a>
+        @endif
+        @if ($deactivatedLink || (Auth::check() && Auth::user()->isStaff))
+            <a href="{{ url('deactivated-list') }}" class="btn btn-dark float-right">Deactivated Accounts</a>
+        @endif
+    </h1>
 
-<div>
-    {!! Form::open(['method' => 'GET', 'class' => 'form-inline justify-content-end']) !!}
+    <div>
+        {!! Form::open(['method' => 'GET', 'class' => 'form-inline justify-content-end']) !!}
         <div class="form-group mr-3 mb-3">
             {!! Form::text('name', Request::get('name'), ['class' => 'form-control']) !!}
         </div>
@@ -20,40 +25,66 @@
             {!! Form::select('rank_id', $ranks, Request::get('rank_id'), ['class' => 'form-control']) !!}
         </div>
         <div class="form-group mr-3 mb-3">
-            {!! Form::select('sort', [
-                'alpha'          => 'Sort Alphabetically (A-Z)',
-                'alpha-reverse'  => 'Sort Alphabetically (Z-A)',
-                'alias'          => 'Sort by Alias (A-Z)',
-                'alias-reverse'  => 'Sort by Alias (Z-A)',
-                'rank'           => 'Sort by Rank (Default)',
-                'newest'         => 'Newest First',
-                'oldest'         => 'Oldest First'    
-            ], Request::get('sort') ? : 'category', ['class' => 'form-control']) !!}
+            {!! Form::select(
+                'sort',
+                [
+                    'alpha' => 'Sort Alphabetically (A-Z)',
+                    'alpha-reverse' => 'Sort Alphabetically (Z-A)',
+                    'alias' => 'Sort by Alias (A-Z)',
+                    'alias-reverse' => 'Sort by Alias (Z-A)',
+                    'rank' => 'Sort by Rank (Default)',
+                    'newest' => 'Newest First',
+                    'oldest' => 'Oldest First',
+                ],
+                Request::get('sort') ?: 'rank',
+                ['class' => 'form-control'],
+            ) !!}
         </div>
         <div class="form-group mb-3">
             {!! Form::submit('Search', ['class' => 'btn btn-primary']) !!}
         </div>
-    {!! Form::close() !!}
-</div>
-{!! $users->render() !!}
-  <div class="row ml-md-2">
-    <div class="d-flex row flex-wrap col-12 pb-1 px-0 ubt-bottom">
-      <div class="col-12 col-md-4 font-weight-bold">Username</div>
-      <div class="col-4 col-md-3 font-weight-bold">Primary Alias</div>
-      <div class="col-4 col-md-2 font-weight-bold">Rank</div>
-      <div class="col-4 col-md-3 font-weight-bold">Joined</div>
+        {!! Form::close() !!}
     </div>
-    @foreach($users as $user)
-    <div class="d-flex row flex-wrap col-12 mt-1 pt-1 px-0 ubt-top">
-      <div class="col-12 col-md-4 ">{!! $user->displayName !!}</div>
-      <div class="col-4 col-md-3">{!! $user->displayAlias !!}</div>
-      <div class="col-4 col-md-2">{!! $user->rank->displayName !!}</div>
-      <div class="col-4 col-md-3">{!! pretty_date($user->created_at, false) !!}</div>
+    {!! $users->render() !!}
+    <div class="mb-4 logs-table">
+        <div class="logs-table-header">
+            <div class="row">
+                <div class="col-12 col-md-4">
+                    <div class="logs-table-cell">Username</div>
+                </div>
+                <div class="col-4 col-md-3">
+                    <div class="logs-table-cell">Primary Alias</div>
+                </div>
+                <div class="col-4 col-md-2">
+                    <div class="logs-table-cell">Rank</div>
+                </div>
+                <div class="col-4 col-md-3">
+                    <div class="logs-table-cell">Joined</div>
+                </div>
+            </div>
+        </div>
+        <div class="logs-table-body">
+            @foreach ($users as $user)
+                <div class="logs-table-row">
+                    <div class="row flex-wrap">
+                        <div class="col-12 col-md-4">
+                            <div class="logs-table-cell">{!! $user->displayName !!}</div>
+                        </div>
+                        <div class="col-4 col-md-3">
+                            <div class="logs-table-cell">{!! $user->displayAlias !!}</div>
+                        </div>
+                        <div class="col-4 col-md-2">
+                            <div class="logs-table-cell">{!! $user->rank->displayName !!}</div>
+                        </div>
+                        <div class="col-4 col-md-3">
+                            <div class="logs-table-cell">{!! pretty_date($user->created_at, false) !!}</div>
+                        </div>
+                    </div>
+                </div>
+            @endforeach
+        </div>
     </div>
-    @endforeach
-  </div>
-{!! $users->render() !!}
-
-<div class="text-center mt-4 small text-muted">{{ $users->total() }} result{{ $users->total() == 1 ? '' : 's' }} found.</div>
+    {!! $users->render() !!}
 
+    <div class="text-center mt-4 small text-muted">{{ $users->total() }} result{{ $users->total() == 1 ? '' : 's' }} found.</div>
 @endsection
diff --git a/resources/views/character/_character_log_row.blade.php b/resources/views/character/_character_log_row.blade.php
index 5ede1fc688..57245f2bda 100644
--- a/resources/views/character/_character_log_row.blade.php
+++ b/resources/views/character/_character_log_row.blade.php
@@ -1,5 +1,17 @@
-<div class="d-flex row flex-wrap col-12 mt-1 pt-1 px-0 ubt-top">
-  <div class="col-6 col-md-2">{!! $log->sender ? $log->sender->displayName : '' !!}</div>
-  <div class="col-6 col-md-8">{!! $log->log !!}</div>
-  <div class="col-6 col-md-2">{!! pretty_date($log->created_at) !!}</div>
+<div class="row flex-wrap">
+    <div class="col-6 col-md-2">
+        <div class="logs-table-cell">
+            {!! $log->sender ? $log->sender->displayName : '' !!}
+        </div>
+    </div>
+    <div class="col-6 col-md-8">
+        <div class="logs-table-cell">
+            {!! $log->log !!}
+        </div>
+    </div>
+    <div class="col-6 col-md-2">
+        <div class="logs-table-cell">
+            {!! pretty_date($log->created_at) !!}
+        </div>
+    </div>
 </div>
diff --git a/resources/views/character/_header.blade.php b/resources/views/character/_header.blade.php
index fc54f4e6db..add97df226 100644
--- a/resources/views/character/_header.blade.php
+++ b/resources/views/character/_header.blade.php
@@ -1,33 +1,80 @@
+@if (!$character->is_myo_slot && config('lorekeeper.extensions.previous_and_next_characters.display') && isset($extPrevAndNextBtnsUrl))
+    @if ($extPrevAndNextBtns['prevCharName'] || $extPrevAndNextBtns['nextCharName'])
+        <div class="row mb-4">
+            @if ($extPrevAndNextBtns['prevCharName'])
+                <div class="col text-left float-left">
+                    <a class="btn btn-outline-success text-success" href="{{ $extPrevAndNextBtns['prevCharUrl'] }}{!! $extPrevAndNextBtnsUrl !!}">
+                        <i class="fas fa-angle-double-left"></i> Previous Character ・ <span class="text-primary">{!! $extPrevAndNextBtns['prevCharName'] !!}</span>
+                    </a>
+                </div>
+            @endif
+            @if ($extPrevAndNextBtns['nextCharName'])
+                <div class="col text-right float-right">
+                    <a class="btn btn-outline-success text-success" href="{{ $extPrevAndNextBtns['nextCharUrl'] }}{!! $extPrevAndNextBtnsUrl !!}">
+                        <span class="text-primary">{!! $extPrevAndNextBtns['nextCharName'] !!}</span> ・ Next Character <i class="fas fa-angle-double-right"></i><br />
+                    </a>
+                </div>
+            @endif
+        </div>
+    @endif
+@endif
 <div class="character-masterlist-categories">
-    @if(!$character->is_myo_slot)
+    @if (!$character->is_myo_slot)
         {!! $character->category->displayName !!} ・ {!! $character->image->species->displayName !!} ・ {!! $character->image->rarity->displayName !!}
         @if(Settings::get('character_title_display') && $character->image->hasTitle)
             ・ "{!! $character->image->title_id ? $character->image->title->displayName : nl2br(htmlentities($character->image->title_data['full'])) !!}"
         @endif
     @else
-        MYO Slot @if($character->image->species_id) ・ {!! $character->image->species->displayName !!}@endif @if($character->image->rarity_id) ・ {!! $character->image->rarity->displayName !!}@endif
-    @endif
+        MYO Slot @if ($character->image->species_id)
+            ・ {!! $character->image->species->displayName !!}
+            @endif @if ($character->image->rarity_id)
+                ・ {!! $character->image->rarity->displayName !!}
+            @endif
+        @endif
 </div>
 <h1 class="mb-0">
-    @if(Config::get('lorekeeper.extensions.character_status_badges'))
+    @if (config('lorekeeper.extensions.character_status_badges'))
         <!-- character trade/gift status badges -->
         <div class="float-right">
-            <span class="btn {{ $character->is_trading ? 'badge-success' : 'badge-danger' }} float-right ml-2" data-toggle="tooltip" title="{{ $character->is_trading ? 'OPEN for sale and trade offers.' : 'CLOSED for sale and trade offers.' }}"><i class="fas fa-comments-dollar"></i></span>
-            @if(!$character->is_myo_slot)
-                <span class="btn {{ $character->is_gift_writing_allowed == 1 ? 'badge-success' : ($character->is_gift_writing_allowed == 2 ? 'badge-warning text-light' : 'badge-danger') }} float-right ml-2" data-toggle="tooltip" title="{{ $character->is_gift_writing_allowed == 1 ? 'OPEN for gift writing.' : ($character->is_gift_writing_allowed == 2 ? 'PLEASE ASK before gift writing.' : 'CLOSED for gift writing.') }}"><i class="fas fa-file-alt"></i></span>
-                <span class="btn {{ $character->is_gift_art_allowed == 1 ? 'badge-success' : ($character->is_gift_art_allowed == 2 ? 'badge-warning text-light' : 'badge-danger') }} float-right ml-2" data-toggle="tooltip" title="{{ $character->is_gift_art_allowed == 1 ? 'OPEN for gift art.' : ($character->is_gift_art_allowed == 2 ? 'PLEASE ASK before gift art.' : 'CLOSED for gift art.') }}"><i class="fas fa-pencil-ruler"></i></span>
+            <span class="btn {{ $character->is_trading ? 'badge-success' : 'badge-danger' }} float-right ml-2" data-toggle="tooltip" title="{{ $character->is_trading ? 'OPEN for sale and trade offers.' : 'CLOSED for sale and trade offers.' }}"><i
+                    class="fas fa-comments-dollar"></i></span>
+            @if (!$character->is_myo_slot)
+                <span class="btn {{ $character->is_gift_writing_allowed == 1 ? 'badge-success' : ($character->is_gift_writing_allowed == 2 ? 'badge-warning text-light' : 'badge-danger') }} float-right ml-2" data-toggle="tooltip"
+                    title="{{ $character->is_gift_writing_allowed == 1 ? 'OPEN for gift writing.' : ($character->is_gift_writing_allowed == 2 ? 'PLEASE ASK before gift writing.' : 'CLOSED for gift writing.') }}"><i class="fas fa-file-alt"></i></span>
+                <span class="btn {{ $character->is_gift_art_allowed == 1 ? 'badge-success' : ($character->is_gift_art_allowed == 2 ? 'badge-warning text-light' : 'badge-danger') }} float-right ml-2" data-toggle="tooltip"
+                    title="{{ $character->is_gift_art_allowed == 1 ? 'OPEN for gift art.' : ($character->is_gift_art_allowed == 2 ? 'PLEASE ASK before gift art.' : 'CLOSED for gift art.') }}"><i class="fas fa-pencil-ruler"></i></span>
             @endif
         </div>
     @endif
-    @if($character->is_visible && Auth::check() && $character->user_id != Auth::user()->id)
+    @if ($character->is_visible && Auth::check() && $character->user_id != Auth::user()->id)
         <?php $bookmark = Auth::user()->hasBookmarked($character); ?>
-        <a href="#" class="btn btn-outline-info float-right bookmark-button ml-2" data-id="{{ $bookmark ? $bookmark->id : 0 }}" data-character-id="{{ $character->id }}"><i class="fas fa-bookmark"></i> {{ $bookmark ? 'Edit Bookmark' : 'Bookmark' }}</a>
+        <a href="#" class="btn btn-outline-info float-right bookmark-button ml-2" data-id="{{ $bookmark ? $bookmark->id : 0 }}" data-character-id="{{ $character->id }}"><i class="fas fa-bookmark"></i>
+            {{ $bookmark ? 'Edit Bookmark' : 'Bookmark' }}</a>
+    @endif
+    @if (config('lorekeeper.extensions.character_TH_profile_link') && $character->profile->link)
+        <a class="btn btn-outline-info float-right" data-character-id="{{ $character->id }}" href="{{ $character->profile->link }}"><i class="fas fa-home"></i> Profile</a>
+    @endif
+    @if (!$character->is_visible)
+        <i class="fas fa-eye-slash"></i>
+    @endif
+    {!! $character->displayName !!}
+    @if (!$character->is_myo_slot)
+        <i data-toggle="tooltip" title="Click to Copy the Character Code" id="copy" style="font-size: 14px; vertical-align: middle;" class="far fa-copy text-small"></i>
     @endif
-    @if(Config::get('lorekeeper.extensions.character_TH_profile_link') && $character->profile->link)
-            <a class="btn btn-outline-info float-right" data-character-id="{{ $character->id }}" href="{{ $character->profile->link }}"><i class="fas fa-home"></i> Profile</a>
-        @endif
-    @if(!$character->is_visible) <i class="fas fa-eye-slash"></i> @endif {!! $character->displayName !!}
 </h1>
 <div class="mb-3">
     Owned by {!! $character->displayOwner !!}
 </div>
+
+
+<script>
+    $('#copy').on('click', async (e) => {
+        await window.navigator.clipboard.writeText("{{ $character->slug }}");
+        e.currentTarget.classList.remove('toCopy');
+        e.currentTarget.classList.add('toCheck');
+        setTimeout(() => {
+            e.currentTarget.classList.remove('toCheck');
+            e.currentTarget.classList.add('toCopy');
+        }, 2000);
+    });
+</script>
diff --git a/resources/views/character/_image_info.blade.php b/resources/views/character/_image_info.blade.php
index 38092ea043..56ac333a3f 100644
--- a/resources/views/character/_image_info.blade.php
+++ b/resources/views/character/_image_info.blade.php
@@ -12,7 +12,12 @@
                 <li class="nav-item">
                     <a class="nav-link" id="creditsTab-{{ $image->id }}" data-toggle="tab" href="#credits-{{ $image->id }}" role="tab">Credits</a>
                 </li>
-                @if(Auth::check() && Auth::user()->hasPower('manage_characters'))
+                @if (isset($showMention) && $showMention)
+                    <li class="nav-item">
+                        <a class="nav-link" id="mentionTab-{{ $image->id }}" data-toggle="tab" href="#mention-{{ $image->id }}" role="tab">Mention</a>
+                    </li>
+                @endif
+                @if (Auth::check() && Auth::user()->hasPower('manage_characters'))
                     <li class="nav-item">
                         <a class="nav-link" id="settingsTab-{{ $image->id }}" data-toggle="tab" href="#settings-{{ $image->id }}" role="tab"><i class="fas fa-cog"></i></a>
                     </li>
@@ -23,26 +28,32 @@
             <div class="text-right mb-1">
                 <div class="badge badge-primary">Image #{{ $image->id }}</div>
             </div>
-            @if(!$image->character->is_myo_slot && !$image->is_valid)
+            @if (!$image->character->is_myo_slot && !$image->is_valid)
                 <div class="alert alert-danger">
                     This version of this character is outdated, and only noted here for recordkeeping purposes. Do not use as an official reference.
                 </div>
             @endif
 
-            {{-- Basic info  --}}
+            {{-- Basic info --}}
             <div class="tab-pane fade show active" id="info-{{ $image->id }}">
                 <div class="row">
-                    <div class="col-lg-4 col-md-6 col-4"><h5>Species</h5></div>
+                    <div class="col-lg-4 col-md-6 col-4">
+                        <h5>Species</h5>
+                    </div>
                     <div class="col-lg-8 col-md-6 col-8">{!! $image->species_id ? $image->species->displayName : 'None' !!}</div>
                 </div>
-                @if($image->subtype_id)
+                @if ($image->subtype_id)
                     <div class="row">
-                        <div class="col-lg-4 col-md-6 col-4"><h5>Subtype</h5></div>
+                        <div class="col-lg-4 col-md-6 col-4">
+                            <h5>Subtype</h5>
+                        </div>
                         <div class="col-lg-8 col-md-6 col-8">{!! $image->subtype_id ? $image->subtype->displayName : 'None' !!}</div>
                     </div>
                 @endif
                 <div class="row">
-                    <div class="col-lg-4 col-md-6 col-4"><h5>Rarity</h5></div>
+                    <div class="col-lg-4 col-md-6 col-4">
+                        <h5>Rarity</h5>
+                    </div>
                     <div class="col-lg-8 col-md-6 col-8">{!! $image->rarity_id ? $image->rarity->displayName : 'None' !!}</div>
                 </div>
                 @if($image->hasTitle)
@@ -53,22 +64,32 @@
                 @endif
 
                 <div class="mb-3">
-                    <div><h5>Traits</h5></div>
-                    @if(Config::get('lorekeeper.extensions.traits_by_category'))
+                    <div>
+                        <h5>Traits</h5>
+                    </div>
+                    @if (config('lorekeeper.extensions.traits_by_category'))
                         <div>
-                            @php $traitgroup = $image->features()->get()->groupBy('feature_category_id') @endphp
-                            @if($image->features()->count())
-                                @foreach($traitgroup as $key => $group)
-                                <div class="mb-2">
-                                    @if($key)
-                                        <strong>{!! $group->first()->feature->category->displayName !!}:</strong>
-                                    @else
-                                        <strong>Miscellaneous:</strong>
-                                    @endif
-                                    @foreach($group as $feature)
-                                        <div class="ml-md-2">{!! $feature->feature->displayName !!} @if($feature->data) ({{ $feature->data }}) @endif</div>
-                                    @endforeach
-                                </div>
+                            @php
+                                $traitgroup = $image
+                                    ->features()
+                                    ->get()
+                                    ->groupBy('feature_category_id');
+                            @endphp
+                            @if ($image->features()->count())
+                                @foreach ($traitgroup as $key => $group)
+                                    <div class="mb-2">
+                                        @if ($key)
+                                            <strong>{!! $group->first()->feature->category->displayName !!}:</strong>
+                                        @else
+                                            <strong>Miscellaneous:</strong>
+                                        @endif
+                                        @foreach ($group as $feature)
+                                            <div class="ml-md-2">{!! $feature->feature->displayName !!} @if ($feature->data)
+                                                    ({{ $feature->data }})
+                                                @endif
+                                            </div>
+                                        @endforeach
+                                    </div>
                                 @endforeach
                             @else
                                 <div>No traits listed.</div>
@@ -76,10 +97,19 @@
                         </div>
                     @else
                         <div>
-                            <?php $features = $image->features()->with('feature.category')->get(); ?>
-                            @if($features->count())
-                                @foreach($features as $feature)
-                                    <div>@if($feature->feature->feature_category_id) <strong>{!! $feature->feature->category->displayName !!}:</strong> @endif {!! $feature->feature->displayName !!} @if($feature->data) ({{ $feature->data }}) @endif</div>
+                            <?php $features = $image
+                                ->features()
+                                ->with('feature.category')
+                                ->get(); ?>
+                            @if ($features->count())
+                                @foreach ($features as $feature)
+                                    <div>
+                                        @if ($feature->feature->feature_category_id)
+                                            <strong>{!! $feature->feature->category->displayName !!}:</strong>
+                                            @endif {!! $feature->feature->displayName !!} @if ($feature->data)
+                                                ({{ $feature->data }})
+                                            @endif
+                                    </div>
                                 @endforeach
                             @else
                                 <div>No traits listed.</div>
@@ -94,7 +124,7 @@
                     <strong>Last Edited:</strong> {!! pretty_date($image->updated_at) !!}
                 </div>
 
-                @if(Auth::check() && Auth::user()->hasPower('manage_characters'))
+                @if (Auth::check() && Auth::user()->hasPower('manage_characters'))
                     <div class="mt-3">
                         <a href="#" class="btn btn-outline-info btn-sm edit-features" data-id="{{ $image->id }}"><i class="fas fa-cog"></i> Edit</a>
                     </div>
@@ -103,63 +133,96 @@
 
             {{-- Image notes --}}
             <div class="tab-pane fade" id="notes-{{ $image->id }}">
-                @if($image->parsed_description)
+                @if ($image->parsed_description)
                     <div class="parsed-text imagenoteseditingparse">{!! $image->parsed_description !!}</div>
                 @else
                     <div class="imagenoteseditingparse">No additional notes given.</div>
                 @endif
-				@if(Auth::check() && Auth::user()->hasPower('manage_characters'))
+                @if (Auth::check() && Auth::user()->hasPower('manage_characters'))
                     <div class="mt-3">
                         <a href="#" class="btn btn-outline-info btn-sm edit-notes" data-id="{{ $image->id }}"><i class="fas fa-cog"></i> Edit</a>
                     </div>
-				@endif
+                @endif
             </div>
 
             {{-- Image credits --}}
             <div class="tab-pane fade" id="credits-{{ $image->id }}">
 
                 <div class="row mb-2">
-                    <div class="col-lg-4 col-md-6 col-4"><h5>Design</h5></div>
+                    <div class="col-lg-4 col-md-6 col-4">
+                        <h5>Design</h5>
+                    </div>
                     <div class="col-lg-8 col-md-6 col-8">
-                        @foreach($image->designers as $designer)
+                        @foreach ($image->designers as $designer)
                             <div>{!! $designer->displayLink() !!}</div>
                         @endforeach
                     </div>
                 </div>
                 <div class="row">
-                    <div class="col-lg-4 col-md-6 col-4"><h5>Art</h5></div>
+                    <div class="col-lg-4 col-md-6 col-4">
+                        <h5>Art</h5>
+                    </div>
                     <div class="col-lg-8 col-md-6 col-8">
-                        @foreach($image->artists as $artist)
+                        @foreach ($image->artists as $artist)
                             <div>{!! $artist->displayLink() !!}</div>
                         @endforeach
                     </div>
                 </div>
 
-                @if(Auth::check() && Auth::user()->hasPower('manage_characters'))
+                @if (Auth::check() && Auth::user()->hasPower('manage_characters'))
                     <div class="mt-3">
                         <a href="#" class="btn btn-outline-info btn-sm edit-credits" data-id="{{ $image->id }}"><i class="fas fa-cog"></i> Edit</a>
                     </div>
                 @endif
             </div>
 
-            @if(Auth::check() && Auth::user()->hasPower('manage_characters'))
+            @if (isset($showMention) && $showMention)
+                {{-- Mention This tab --}}
+                <div class="tab-pane fade" id="mention-{{ $image->id }}">
+                    In the rich text editor:
+                    <div class="alert alert-secondary">
+                        [character={{ $character->slug }}]
+                    </div>
+                    In a comment:
+                    <div class="alert alert-secondary">
+                        [{{ $character->fullName }}]({{ $character->url }})
+                    </div>
+                    <hr>
+                    <div class="my-2">
+                        <strong>For Thumbnails:</strong>
+                    </div>
+                    In the rich text editor:
+                    <div class="alert alert-secondary">
+                        [charthumb={{ $character->slug }}]
+                    </div>
+                    In a comment:
+                    <div class="alert alert-secondary">
+                        [![Thumbnail of {{ $character->fullName }}]({{ $character->image->thumbnailUrl }})]({{ $character->url }})
+                    </div>
+                </div>
+            @endif
+
+            @if (Auth::check() && Auth::user()->hasPower('manage_characters'))
                 <div class="tab-pane fade" id="settings-{{ $image->id }}">
-                    {!! Form::open(['url' => 'admin/character/image/'.$image->id.'/settings']) !!}
-                        <div class="form-group">
-                            {!! Form::checkbox('is_visible', 1, $image->is_visible, ['class' => 'form-check-input', 'data-toggle' => 'toggle']) !!}
-                            {!! Form::label('is_visible', 'Is Viewable', ['class' => 'form-check-label ml-3']) !!} {!! add_help('If this is turned off, the image will not be visible by anyone without the Manage Masterlist power.') !!}
-                        </div>
-                        <div class="form-group">
-                            {!! Form::checkbox('is_valid', 1, $image->is_valid, ['class' => 'form-check-input', 'data-toggle' => 'toggle']) !!}
-                            {!! Form::label('is_valid', 'Is Valid', ['class' => 'form-check-label ml-3']) !!} {!! add_help('If this is turned off, the image will still be visible, but displayed with a note that the image is not a valid reference.') !!}
-                        </div>
-                        <div class="text-right">
-                            {!! Form::submit('Edit', ['class' => 'btn btn-primary']) !!}
-                        </div>
+                    {!! Form::open(['url' => 'admin/character/image/' . $image->id . '/settings']) !!}
+                    <div class="form-group">
+                        {!! Form::checkbox('is_visible', 1, $image->is_visible, ['class' => 'form-check-input', 'data-toggle' => 'toggle']) !!}
+                        {!! Form::label('is_visible', 'Is Viewable', ['class' => 'form-check-label ml-3']) !!} {!! add_help('If this is turned off, the image will not be visible by anyone without the Manage Masterlist power.') !!}
+                    </div>
+                    <div class="form-group">
+                        {!! Form::checkbox('is_valid', 1, $image->is_valid, ['class' => 'form-check-input', 'data-toggle' => 'toggle']) !!}
+                        {!! Form::label('is_valid', 'Is Valid', ['class' => 'form-check-label ml-3']) !!} {!! add_help('If this is turned off, the image will still be visible, but displayed with a note that the image is not a valid reference.') !!}
+                    </div>
+                    <div class="text-right">
+                        {!! Form::submit('Edit', ['class' => 'btn btn-primary']) !!}
+                    </div>
                     {!! Form::close() !!}
                     <hr />
                     <div class="text-right">
-                    @if($character->character_image_id != $image->id) <a href="#" class="btn btn-outline-info btn-sm active-image" data-id="{{ $image->id }}">Set Active</a> @endif <a href="#" class="btn btn-outline-info btn-sm reupload-image" data-id="{{ $image->id }}">Reupload Image</a> <a href="#" class="btn btn-outline-danger btn-sm delete-image" data-id="{{ $image->id }}">Delete</a>
+                        @if ($character->character_image_id != $image->id)
+                            <a href="#" class="btn btn-outline-info btn-sm active-image" data-id="{{ $image->id }}">Set Active</a>
+                        @endif <a href="#" class="btn btn-outline-info btn-sm reupload-image" data-id="{{ $image->id }}">Reupload Image</a> <a href="#" class="btn btn-outline-danger btn-sm delete-image"
+                            data-id="{{ $image->id }}">Delete</a>
                     </div>
                 </div>
             @endif
diff --git a/resources/views/character/_image_js.blade.php b/resources/views/character/_image_js.blade.php
index 425b5a7000..af2d0a989d 100644
--- a/resources/views/character/_image_js.blade.php
+++ b/resources/views/character/_image_js.blade.php
@@ -2,12 +2,12 @@
     $(document).ready(function() {
         $('.edit-features').on('click', function(e) {
             e.preventDefault();
-            loadModal("{{ url('admin/character/image') }}/"+$(this).data('id')+"/traits", 'Edit Traits');
+            loadModal("{{ url('admin/character/image') }}/" + $(this).data('id') + "/traits", 'Edit Traits');
         });
         $('.edit-notes').on('click', function(e) {
             e.preventDefault();
-            $( "div.imagenoteseditingparse" ).load("{{ url('admin/character/image') }}/"+$(this).data('id')+"/notes", function() {
-			    tinymce.init({
+            $("div.imagenoteseditingparse").load("{{ url('admin/character/image') }}/" + $(this).data('id') + "/notes", function() {
+                tinymce.init({
                     selector: '.imagenoteseditingparse .wysiwyg',
                     height: 500,
                     menubar: false,
@@ -25,37 +25,33 @@
                     spoiler_caption: 'Toggle Spoiler',
                     target_list: false
                 });
-			});
-            $( ".edit-notes" ).remove();
+            });
+            $(".edit-notes").remove();
         });
         $('.edit-credits').on('click', function(e) {
             e.preventDefault();
-            loadModal("{{ url('admin/character/image') }}/"+$(this).data('id')+"/credits", 'Edit Image Credits');
-        });
-        $('.edit-credits').on('click', function(e) {
-            e.preventDefault();
-            loadModal("{{ url('admin/character/image') }}/"+$(this).data('id')+"/credits", 'Edit Image Credits');
+            loadModal("{{ url('admin/character/image') }}/" + $(this).data('id') + "/credits", 'Edit Image Credits');
         });
         $('.reupload-image').on('click', function(e) {
             e.preventDefault();
-            loadModal("{{ url('admin/character/image') }}/"+$(this).data('id')+"/reupload", 'Reupload Image');
+            loadModal("{{ url('admin/character/image') }}/" + $(this).data('id') + "/reupload", 'Reupload Image');
         });
         $('.active-image').on('click', function(e) {
             e.preventDefault();
-            loadModal("{{ url('admin/character/image') }}/"+$(this).data('id')+"/active", 'Set Active');
+            loadModal("{{ url('admin/character/image') }}/" + $(this).data('id') + "/active", 'Set Active');
         });
         $('.delete-image').on('click', function(e) {
             e.preventDefault();
-            loadModal("{{ url('admin/character/image') }}/"+$(this).data('id')+"/delete", 'Delete Image');
+            loadModal("{{ url('admin/character/image') }}/" + $(this).data('id') + "/delete", 'Delete Image');
         });
         $('.edit-stats').on('click', function(e) {
             e.preventDefault();
-            loadModal("{{ url($character->is_myo_slot ? 'admin/myo/' : 'admin/character/') }}/"+$(this).data('{{ $character->is_myo_slot ? 'id' : 'slug' }}')+"/stats", 'Edit Character Stats');
+            loadModal("{{ url($character->is_myo_slot ? 'admin/myo/' : 'admin/character/') }}/" + $(this).data('{{ $character->is_myo_slot ? 'id' : 'slug' }}') + "/stats", 'Edit Character Stats');
         });
         $('.edit-description').on('click', function(e) {
             e.preventDefault();
-            $( "div.descriptioneditingparse" ).load("{{ url($character->is_myo_slot ? 'admin/myo/' : 'admin/character/') }}/"+$(this).data('{{ $character->is_myo_slot ? 'id' : 'slug' }}')+"/description", function() {
-			    tinymce.init({
+            $("div.descriptioneditingparse").load("{{ url($character->is_myo_slot ? 'admin/myo/' : 'admin/character/') }}/" + $(this).data('{{ $character->is_myo_slot ? 'id' : 'slug' }}') + "/description", function() {
+                tinymce.init({
                     selector: '.descriptioneditingparse .wysiwyg',
                     height: 500,
                     menubar: false,
@@ -73,13 +69,13 @@
                     spoiler_caption: 'Toggle Spoiler',
                     target_list: false
                 });
-			});
-            $( ".edit-description" ).remove();
+            });
+            $(".edit-description").remove();
         });
         $('.delete-character').on('click', function(e) {
             e.preventDefault();
-            loadModal("{{ url($character->is_myo_slot ? 'admin/myo/' : 'admin/character/') }}/"+$(this).data('{{ $character->is_myo_slot ? 'id' : 'slug' }}')+"/delete", 'Delete Character');
+            loadModal("{{ url($character->is_myo_slot ? 'admin/myo/' : 'admin/character/') }}/" + $(this).data('{{ $character->is_myo_slot ? 'id' : 'slug' }}') + "/delete", 'Delete Character');
         });
 
     });
-</script>
\ No newline at end of file
+</script>
diff --git a/resources/views/character/_inventory_stack.blade.php b/resources/views/character/_inventory_stack.blade.php
index 92d27a5a25..3c40431ded 100644
--- a/resources/views/character/_inventory_stack.blade.php
+++ b/resources/views/character/_inventory_stack.blade.php
@@ -1,26 +1,25 @@
-@if(!$stack)
+@if (!$stack)
     <div class="text-center">Invalid stack selected.</div>
 @else
     <div class="text-center">
-        <div class="mb-1"><a href="{{ $item->url }}"><img src="{{ $item->imageUrl }}" alt="{{ $item->name }}"/></a></div>
-        <div @if(count($item->tags)) class="mb-1" @endif><a href="{{ $item->url }}">{{ $item->name }}</a></div>
+        <div class="mb-1"><a href="{{ $item->url }}"><img src="{{ $item->imageUrl }}" alt="{{ $item->name }}" /></a></div>
+        <div @if (count($item->tags)) class="mb-1" @endif><a href="{{ $item->url }}">{{ $item->name }}</a></div>
     </div>
 
     <h5>Item Variations</h5>
-    @if($user && $user->hasPower('edit_inventories'))
+    @if ($user && $user->hasPower('edit_inventories'))
         <p class="alert alert-warning my-2">Note: Your rank allows you to transfer character-bound items.</p>
     @endif
 
-    {!! Form::open(['url' => 'character/'.$character->slug.'/inventory/edit']) !!}
+    {!! Form::open(['url' => 'character/' . $character->slug . '/inventory/edit']) !!}
     <div class="card" style="border: 0px">
         <table class="table table-sm">
             <thead class="thead">
                 <tr class="d-flex">
-                    @if($user && !$readOnly &&
-                    ($owner_id == $user->id || $has_power == TRUE))
+                    @if ($user && !$readOnly && ($owner_id == $user->id || $has_power == true))
                         <th class="col-1"><input id="toggle-checks" type="checkbox" onclick="toggleChecks(this)"></th>
                     @endif
-                    @if($item->category->can_name)
+                    @if ($item->category->can_name)
                         <th class="col-2">Name</th>
                     @endif
                     <th class="col">Source</th>
@@ -30,18 +29,18 @@
                 </tr>
             </thead>
             <tbody>
-                @foreach($stack as $itemRow)
-                    <tr id ="itemRow{{ $itemRow->id }}" class="d-flex {{ $itemRow->isTransferrable ? '' : 'accountbound' }}">
-                        @if($user && !$readOnly && ($owner_id == $user->id || $has_power == TRUE))
+                @foreach ($stack as $itemRow)
+                    <tr id="itemRow{{ $itemRow->id }}" class="d-flex {{ $itemRow->isTransferrable ? '' : 'accountbound' }}">
+                        @if ($user && !$readOnly && ($owner_id == $user->id || $has_power == true))
                             <td class="col-1">{!! Form::checkbox('ids[]', $itemRow->id, false, ['class' => 'item-check', 'onclick' => 'updateQuantities(this)']) !!}</td>
                         @endif
-                        @if($item->category->can_name)
-                            <td class="col-2">{!! htmlentities($itemRow->stack_name) ? : 'N/A' !!}</td>
+                        @if ($item->category->can_name)
+                            <td class="col-2">{!! htmlentities($itemRow->stack_name) ?: 'N/A' !!}</td>
                         @endif
                         <td class="col">{!! array_key_exists('data', $itemRow->data) ? ($itemRow->data['data'] ? $itemRow->data['data'] : 'N/A') : 'N/A' !!}</td>
                         <td class="col">{!! array_key_exists('notes', $itemRow->data) ? ($itemRow->data['notes'] ? $itemRow->data['notes'] : 'N/A') : 'N/A' !!}</td>
-                        @if($user && !$readOnly && ($owner_id == $user->id || $has_power == TRUE))
-                            @if($itemRow->availableQuantity)
+                        @if ($user && !$readOnly && ($owner_id == $user->id || $has_power == true))
+                            @if ($itemRow->availableQuantity)
                                 <td class="col-2">{!! Form::selectRange('', 1, $itemRow->availableQuantity, 1, ['class' => 'quantity-select', 'type' => 'number', 'style' => 'min-width:40px;']) !!} /{{ $itemRow->availableQuantity }}</td>
                             @else
                                 <td class="col-2">{!! Form::selectRange('', 0, 0, 0, ['class' => 'quantity-select', 'type' => 'number', 'style' => 'min-width:40px;', 'disabled']) !!} /{{ $itemRow->availableQuantity }}</td>
@@ -50,7 +49,7 @@
                             <td class="col-3">{!! $itemRow->count !!}</td>
                         @endif
                         <td class="col-1">
-                            @if(!$itemRow->isTransferrable)
+                            @if (!$itemRow->isTransferrable)
                                 <i class="fas fa-lock" data-toggle="tooltip" title="Character-bound items cannot be transferred but can be deleted."></i>
                             @endif
                         </td>
@@ -60,39 +59,54 @@
         </table>
     </div>
 
-    @if($user && !$readOnly &&
-        ($owner_id == $user->id || $has_power == TRUE))
+    @if ($user && !$readOnly && ($owner_id == $user->id || $has_power == true))
         <div class="card mt-3">
             <ul class="list-group list-group-flush">
-                @if($item->category->can_name)
-                <li class="list-group-item">
-                    <a class="card-title h5 collapse-title" data-toggle="collapse" href="#nameForm">@if($owner_id != $user->id) [ADMIN] @endif Name Item</a>
-                    <div id="nameForm" class="collapse">
-                        <p>Enter a name to display for the selected stack(s)! Note that only one of the stacks' names will display on the inventory page and title of this panel, while other stacks' names will appear in the list above.</p>
-                        {!! Form::open() !!}
+                @if ($item->category->can_name)
+                    <li class="list-group-item">
+                        <a class="card-title h5 collapse-title" data-toggle="collapse" href="#nameForm">
+                            @if ($owner_id != $user->id)
+                                [ADMIN]
+                            @endif Name Item
+                        </a>
+                        <div id="nameForm" class="collapse">
+                            <p>Enter a name to display for the selected stack(s)! Note that only one of the stacks' names will display on the inventory page and title of this panel, while other stacks' names will appear in the list above.</p>
+                            {!! Form::open() !!}
                             <div class="form-group">
                                 {!! Form::text('stack_name', null, ['class' => 'form-control stock-field', 'data-name' => 'stack_name']) !!}
                             </div>
                             <div class="text-right">
                                 {!! Form::button('Submit', ['class' => 'btn btn-primary', 'name' => 'action', 'value' => 'name', 'type' => 'submit']) !!}
                             </div>
-                        {!! Form::close() !!}
-                </div>
-                </li>
+                            {!! Form::close() !!}
+                        </div>
+                    </li>
                 @endif
-                @if($owner_id != null)
-                <li class="list-group-item">
-                    <a class="card-title h5 collapse-title" data-toggle="collapse" href="#transferForm">@if($owner_id != $user->id) [ADMIN] @endif Transfer Item</a>
-                    <div id="transferForm" class="collapse">
-                        <p>This will transfer this item back to @if($owner_id != $user->id) this user's @else your @endif inventory.</p>
-                        <div class="text-right">
-                            {!! Form::button('Transfer', ['class' => 'btn btn-primary', 'name' => 'action', 'value' => 'take', 'type' => 'submit']) !!}
+                @if ($owner_id != null)
+                    <li class="list-group-item">
+                        <a class="card-title h5 collapse-title" data-toggle="collapse" href="#transferForm">
+                            @if ($owner_id != $user->id)
+                                [ADMIN]
+                            @endif Transfer Item
+                        </a>
+                        <div id="transferForm" class="collapse">
+                            <p>This will transfer this item back to @if ($owner_id != $user->id)
+                                    this user's
+                                @else
+                                    your
+                                @endif inventory.</p>
+                            <div class="text-right">
+                                {!! Form::button('Transfer', ['class' => 'btn btn-primary', 'name' => 'action', 'value' => 'take', 'type' => 'submit']) !!}
+                            </div>
                         </div>
-                </div>
-                </li>
+                    </li>
                 @endif
                 <li class="list-group-item">
-                    <a class="card-title h5 collapse-title" data-toggle="collapse" href="#deleteForm">@if($owner_id != $user->id) [ADMIN] @endif Delete Item</a>
+                    <a class="card-title h5 collapse-title" data-toggle="collapse" href="#deleteForm">
+                        @if ($owner_id != $user->id)
+                            [ADMIN]
+                        @endif Delete Item
+                    </a>
                     <div id="deleteForm" class="collapse">
                         <p>This action is not reversible. Are you sure you want to delete this item?</p>
                         <div class="text-right">
@@ -108,19 +122,20 @@
 
 <script>
     $(document).keydown(function(e) {
-    var code = e.keyCode || e.which;
-    if(code == 13)
-        return false;
+        var code = e.keyCode || e.which;
+        if (code == 13)
+            return false;
     });
+
     function toggleChecks($toggle) {
         $.each($('.item-check'), function(index, checkbox) {
             $toggle.checked ? checkbox.setAttribute('checked', 'checked') : checkbox.removeAttribute('checked');
             updateQuantities(checkbox);
         });
     }
+
     function updateQuantities($checkbox) {
         var $rowId = "#itemRow" + $checkbox.value
         $($rowId).find('.quantity-select').prop('name', $checkbox.checked ? 'quantities[]' : '')
     }
 </script>
-
diff --git a/resources/views/character/_sidebar.blade.php b/resources/views/character/_sidebar.blade.php
index 931cff18e2..f1b5290aec 100644
--- a/resources/views/character/_sidebar.blade.php
+++ b/resources/views/character/_sidebar.blade.php
@@ -2,28 +2,28 @@
     <li class="sidebar-header"><a href="{{ $character->url }}" class="card-link">{{ $character->slug }}</a></li>
     <li class="sidebar-section">
         <div class="sidebar-section-header">Character</div>
-        <div class="sidebar-item"><a href="{{ $character->url }}" class="{{ set_active('character/'.$character->slug) }}">Information</a></div>
-        <div class="sidebar-item"><a href="{{ $character->url . '/profile' }}" class="{{ set_active('character/'.$character->slug.'/profile') }}">Profile</a></div>
-        <div class="sidebar-item"><a href="{{ $character->url . '/gallery' }}" class="{{ set_active('character/'.$character->slug.'/gallery') }}">Gallery</a></div>
-        <div class="sidebar-item"><a href="{{ $character->url . '/inventory' }}" class="{{ set_active('character/'.$character->slug.'/inventory') }}">Inventory</a></div>
-        <div class="sidebar-item"><a href="{{ $character->url . '/bank' }}" class="{{ set_active('character/'.$character->slug.'/bank') }}">Bank</a></div>
+        <div class="sidebar-item"><a href="{{ $character->url }}" class="{{ set_active('character/' . $character->slug) }}">Information</a></div>
+        <div class="sidebar-item"><a href="{{ $character->url . '/profile' }}" class="{{ set_active('character/' . $character->slug . '/profile') }}">Profile</a></div>
+        <div class="sidebar-item"><a href="{{ $character->url . '/gallery' }}" class="{{ set_active('character/' . $character->slug . '/gallery') }}">Gallery</a></div>
+        <div class="sidebar-item"><a href="{{ $character->url . '/inventory' }}" class="{{ set_active('character/' . $character->slug . '/inventory') }}">Inventory</a></div>
+        <div class="sidebar-item"><a href="{{ $character->url . '/bank' }}" class="{{ set_active('character/' . $character->slug . '/bank') }}">Bank</a></div>
     </li>
     <li class="sidebar-section">
         <div class="sidebar-section-header">History</div>
-        <div class="sidebar-item"><a href="{{ $character->url . '/images' }}" class="{{ set_active('character/'.$character->slug.'/images') }}">Images</a></div>
-        <div class="sidebar-item"><a href="{{ $character->url . '/change-log' }}" class="{{ set_active('character/'.$character->slug.'/change-log') }}">Change Log</a></div>
-        <div class="sidebar-item"><a href="{{ $character->url . '/ownership' }}" class="{{ set_active('character/'.$character->slug.'/ownership') }}">Ownership History</a></div>
-        <div class="sidebar-item"><a href="{{ $character->url . '/item-logs' }}" class="{{ set_active('character/'.$character->slug.'/item-logs') }}">Item Logs</a></div>
-        <div class="sidebar-item"><a href="{{ $character->url . '/currency-logs' }}" class="{{ set_active('character/'.$character->slug.'/currency-logs') }}">Currency Logs</a></div>
-        <div class="sidebar-item"><a href="{{ $character->url . '/submissions' }}" class="{{ set_active('character/'.$character->slug.'/submissions') }}">Submissions</a></div>
+        <div class="sidebar-item"><a href="{{ $character->url . '/images' }}" class="{{ set_active('character/' . $character->slug . '/images') }}">Images</a></div>
+        <div class="sidebar-item"><a href="{{ $character->url . '/change-log' }}" class="{{ set_active('character/' . $character->slug . '/change-log') }}">Change Log</a></div>
+        <div class="sidebar-item"><a href="{{ $character->url . '/ownership' }}" class="{{ set_active('character/' . $character->slug . '/ownership') }}">Ownership History</a></div>
+        <div class="sidebar-item"><a href="{{ $character->url . '/item-logs' }}" class="{{ set_active('character/' . $character->slug . '/item-logs') }}">Item Logs</a></div>
+        <div class="sidebar-item"><a href="{{ $character->url . '/currency-logs' }}" class="{{ set_active('character/' . $character->slug . '/currency-logs') }}">Currency Logs</a></div>
+        <div class="sidebar-item"><a href="{{ $character->url . '/submissions' }}" class="{{ set_active('character/' . $character->slug . '/submissions') }}">Submissions</a></div>
     </li>
-    @if(Auth::check() && (Auth::user()->id == $character->user_id || Auth::user()->hasPower('manage_characters')))
+    @if (Auth::check() && (Auth::user()->id == $character->user_id || Auth::user()->hasPower('manage_characters')))
         <li class="sidebar-section">
             <div class="sidebar-section-header">Settings</div>
-            <div class="sidebar-item"><a href="{{ $character->url . '/profile/edit' }}" class="{{ set_active('character/'.$character->slug.'/profile/edit') }}">Edit Profile</a></div>
-            <div class="sidebar-item"><a href="{{ $character->url . '/transfer' }}" class="{{ set_active('character/'.$character->slug.'/transfer') }}">Transfer</a></div>
-            @if(Auth::user()->id == $character->user_id)
-                <div class="sidebar-item"><a href="{{ $character->url . '/approval' }}" class="{{ set_active('character/'.$character->slug.'/approval') }}">Update Design</a></div>
+            <div class="sidebar-item"><a href="{{ $character->url . '/profile/edit' }}" class="{{ set_active('character/' . $character->slug . '/profile/edit') }}">Edit Profile</a></div>
+            <div class="sidebar-item"><a href="{{ $character->url . '/transfer' }}" class="{{ set_active('character/' . $character->slug . '/transfer') }}">Transfer</a></div>
+            @if (Auth::user()->id == $character->user_id)
+                <div class="sidebar-item"><a href="{{ $character->url . '/approval' }}" class="{{ set_active('character/' . $character->slug . '/approval') }}">Update Design</a></div>
             @endif
         </li>
     @endif
diff --git a/resources/views/character/_tab_images.blade.php b/resources/views/character/_tab_images.blade.php
index 1461afd887..bc2707a95c 100644
--- a/resources/views/character/_tab_images.blade.php
+++ b/resources/views/character/_tab_images.blade.php
@@ -1,7 +1,7 @@
 <div class="row">
-    @foreach($character->images as $image)
+    @foreach ($character->images as $image)
         <div class="col-md-3 col-4">
-            <a href="#" class="d-block"><img src="{{ $image->thumbnailUrl }}" class="image-thumb img-thumbnail" alt="Thumbnail for {{ $image->character->fullName }}"/></a>
+            <a href="#" class="d-block"><img src="{{ $image->thumbnailUrl }}" class="image-thumb img-thumbnail" alt="Thumbnail for {{ $image->character->fullName }}" /></a>
         </div>
     @endforeach
 </div>
diff --git a/resources/views/character/_tab_notes.blade.php b/resources/views/character/_tab_notes.blade.php
index 74652aa3d0..9c15a1f546 100644
--- a/resources/views/character/_tab_notes.blade.php
+++ b/resources/views/character/_tab_notes.blade.php
@@ -1,10 +1,10 @@
-@if($character->parsed_description)
+@if ($character->parsed_description)
     <div class="parsed-text descriptioneditingparse">{!! $character->parsed_description !!}</div>
-@else 
+@else
     <div class="parsed-text descriptioneditingparse">No additional notes given.</div>
 @endif
-@if(Auth::check() && Auth::user()->hasPower('manage_characters'))
+@if (Auth::check() && Auth::user()->hasPower('manage_characters'))
     <div class="mt-3">
         <a href="#" class="btn btn-outline-info btn-sm edit-description" data-{{ $character->is_myo_slot ? 'id' : 'slug' }}="{{ $character->is_myo_slot ? $character->id : $character->slug }}"><i class="fas fa-cog"></i> Edit</a>
     </div>
-@endif
\ No newline at end of file
+@endif
diff --git a/resources/views/character/_tab_stats.blade.php b/resources/views/character/_tab_stats.blade.php
index b6afcb25e5..686f3dfc4c 100644
--- a/resources/views/character/_tab_stats.blade.php
+++ b/resources/views/character/_tab_stats.blade.php
@@ -1,34 +1,55 @@
 <div class="row">
-    <div class="col-lg-3 col-4"><h5>Owner</h5></div>
+    <div class="col-lg-3 col-4">
+        <h5>Owner</h5>
+    </div>
     <div class="col-lg-9 col-8">{!! $character->displayOwner !!}</div>
 </div>
-@if(!$character->is_myo_slot)
+@if (!$character->is_myo_slot)
     <div class="row">
-        <div class="col-lg-3 col-4"><h5>Category</h5></div>
+        <div class="col-lg-3 col-4">
+            <h5>Category</h5>
+        </div>
         <div class="col-lg-9 col-8">{!! $character->category->displayName !!}</div>
     </div>
 @endif
 <div class="row">
-    <div class="col-lg-3 col-4"><h5 class="mb-0">Created</h5></div>
+    <div class="col-lg-3 col-4">
+        <h5 class="mb-0">Created</h5>
+    </div>
     <div class="col-lg-9 col-8">{!! format_date($character->created_at) !!}</div>
 </div>
 
 <hr />
 
-<h5><i class="text-{{ $character->is_giftable ? 'success far fa-circle' : 'danger fas fa-times'  }} fa-fw mr-2"></i> {{ $character->is_giftable ? 'Can' : 'Cannot'  }} be gifted</h5>
-<h5><i class="text-{{ $character->is_tradeable ? 'success far fa-circle' : 'danger fas fa-times'  }} fa-fw mr-2"></i> {{ $character->is_tradeable ? 'Can' : 'Cannot'  }} be traded</h5>
-<h5><i class="text-{{ $character->is_sellable ? 'success far fa-circle' : 'danger fas fa-times'  }} fa-fw mr-2"></i> {{ $character->is_sellable ? 'Can' : 'Cannot'  }} be sold</h5>
-<div class="row">
-    <div class="col-lg-3 col-4"><h5>Sale Value</h5></div>
-    <div class="col-lg-9 col-8">{{ Config::get('lorekeeper.settings.currency_symbol') }}{{ $character->sale_value }}</div>
-</div>
-@if($character->transferrable_at && $character->transferrable_at->isFuture())
+
+<h5>
+    <i class="text-{{ $character->is_giftable ? 'success far fa-circle' : 'danger fas fa-times' }} fa-fw mr-2"></i> {{ $character->is_giftable ? 'Can' : 'Cannot' }} be gifted
+</h5>
+<h5>
+    <i class="text-{{ $character->is_tradeable ? 'success far fa-circle' : 'danger fas fa-times' }} fa-fw mr-2"></i> {{ $character->is_tradeable ? 'Can' : 'Cannot' }} be traded
+</h5>
+<h5>
+    <i class="text-{{ $character->is_sellable ? 'success far fa-circle' : 'danger fas fa-times' }} fa-fw mr-2"></i> {{ $character->is_sellable ? 'Can' : 'Cannot' }} be sold
+</h5>
+@if ($character->sale_value > 0)
+    <div class="row">
+        <div class="col-lg-3 col-4">
+            <h5>Sale Value</h5>
+        </div>
+        <div class="col-lg-9 col-8">
+            {{ Config::get('lorekeeper.settings.currency_symbol') }}{{ $character->sale_value }}
+        </div>
+    </div>
+@endif
+@if ($character->transferrable_at && $character->transferrable_at->isFuture())
     <div class="row">
-        <div class="col-lg-3 col-4"><h5>Cooldown</h5></div>
+        <div class="col-lg-3 col-4">
+            <h5>Cooldown</h5>
+        </div>
         <div class="col-lg-9 col-8">Cannot be transferred until {!! format_date($character->transferrable_at) !!}</div>
     </div>
 @endif
-@if(Auth::check() && Auth::user()->hasPower('manage_characters'))
+@if (Auth::check() && Auth::user()->hasPower('manage_characters'))
     <div class="mt-3">
         <a href="#" class="btn btn-outline-info btn-sm edit-stats" data-{{ $character->is_myo_slot ? 'id' : 'slug' }}="{{ $character->is_myo_slot ? $character->id : $character->slug }}"><i class="fas fa-cog"></i> Edit</a>
     </div>
diff --git a/resources/views/character/admin/_active_image_modal.blade.php b/resources/views/character/admin/_active_image_modal.blade.php
index 9259f42327..50f2ad2f9a 100644
--- a/resources/views/character/admin/_active_image_modal.blade.php
+++ b/resources/views/character/admin/_active_image_modal.blade.php
@@ -1,8 +1,8 @@
-{!! Form::open(['url' => 'admin/character/image/'.$image->id.'/active']) !!}
-    <p>This will set this image to be the character's thumbnail image and the first image a user sees when they view the character.</p> 
-    <p>A non-visible image cannot be set as a character's active image. A non-valid image can, but this is not recommended. A character's active image cannot be deleted.</p>
+{!! Form::open(['url' => 'admin/character/image/' . $image->id . '/active']) !!}
+<p>This will set this image to be the character's thumbnail image and the first image a user sees when they view the character.</p>
+<p>A non-visible image cannot be set as a character's active image. A non-valid image can, but this is not recommended. A character's active image cannot be deleted.</p>
 
-    <div class="text-right">
-        {!! Form::submit('Set Active', ['class' => 'btn btn-primary']) !!}
-    </div>
-{!! Form::close() !!}
\ No newline at end of file
+<div class="text-right">
+    {!! Form::submit('Set Active', ['class' => 'btn btn-primary']) !!}
+</div>
+{!! Form::close() !!}
diff --git a/resources/views/character/admin/_delete_character_modal.blade.php b/resources/views/character/admin/_delete_character_modal.blade.php
index 41c89ec8cd..80dba94868 100644
--- a/resources/views/character/admin/_delete_character_modal.blade.php
+++ b/resources/views/character/admin/_delete_character_modal.blade.php
@@ -1,9 +1,9 @@
-{!! Form::open(['url' => $isMyo ? 'admin/myo/'.$character->id.'/delete' : 'admin/character/'.$character->slug.'/delete']) !!}
-    <p>This will delete the entire character and its images. <strong>This data will not be retrievable.</strong> </p>
-    <p>If you're looking for a less permanent option, you can set the character to not viewable and it will be hidden from public view.</p> 
-    <p>Are you sure you want to do this?</p>
+{!! Form::open(['url' => $isMyo ? 'admin/myo/' . $character->id . '/delete' : 'admin/character/' . $character->slug . '/delete']) !!}
+<p>This will delete the entire character and its images. <strong>This data will not be retrievable.</strong> </p>
+<p>If you're looking for a less permanent option, you can set the character to not viewable and it will be hidden from public view.</p>
+<p>Are you sure you want to do this?</p>
 
-    <div class="text-right">
-        {!! Form::submit('Delete', ['class' => 'btn btn-danger']) !!}
-    </div>
-{!! Form::close() !!}
\ No newline at end of file
+<div class="text-right">
+    {!! Form::submit('Delete', ['class' => 'btn btn-danger']) !!}
+</div>
+{!! Form::close() !!}
diff --git a/resources/views/character/admin/_delete_image_modal.blade.php b/resources/views/character/admin/_delete_image_modal.blade.php
index 77e0e6a5b0..07984e77c5 100644
--- a/resources/views/character/admin/_delete_image_modal.blade.php
+++ b/resources/views/character/admin/_delete_image_modal.blade.php
@@ -1,9 +1,9 @@
-{!! Form::open(['url' => 'admin/character/image/'.$image->id.'/delete']) !!}
-    <p>This will delete the image from the character's profile. <strong>The image and its thumbnail will not be retrievable.</strong> </p>
-    <p>If you're looking for a less permanent option, you can set the image to not viewable and it will be hidden from public view.</p> 
-    <p>Are you sure you want to do this?</p>
+{!! Form::open(['url' => 'admin/character/image/' . $image->id . '/delete']) !!}
+<p>This will delete the image from the character's profile. <strong>The image and its thumbnail will not be retrievable.</strong> </p>
+<p>If you're looking for a less permanent option, you can set the image to not viewable and it will be hidden from public view.</p>
+<p>Are you sure you want to do this?</p>
 
-    <div class="text-right">
-        {!! Form::submit('Delete', ['class' => 'btn btn-danger']) !!}
-    </div>
-{!! Form::close() !!}
\ No newline at end of file
+<div class="text-right">
+    {!! Form::submit('Delete', ['class' => 'btn btn-danger']) !!}
+</div>
+{!! Form::close() !!}
diff --git a/resources/views/character/admin/_edit_credits_modal.blade.php b/resources/views/character/admin/_edit_credits_modal.blade.php
index 529edebb2c..00d55d90e2 100644
--- a/resources/views/character/admin/_edit_credits_modal.blade.php
+++ b/resources/views/character/admin/_edit_credits_modal.blade.php
@@ -1,70 +1,60 @@
-{!! Form::open(['url' => 'admin/character/image/'.$image->id.'/credits']) !!}
-    <div class="form-group">
-        {!! Form::label('Designer(s)') !!}
-        <div id="designerList">
-            <?php $designerCount = count($image->designers); ?>
-            @foreach($image->designers as $count=>$designer)
-                <div class="mb-2 d-flex">
-                    {!! Form::select('designer_id['.$designer->id.']', $users, $designer->user_id, ['class'=> 'form-control mr-2 selectize', 'placeholder' => 'Select a Designer']) !!}
-                    {!! Form::text('designer_url['.$designer->id.']', $designer->url, ['class' => 'form-control mr-2', 'placeholder' => 'Designer URL']) !!}
-                    
-                    <a href="#" class="add-designer btn btn-link" data-toggle="tooltip" title="Add another designer"
-                    @if($count != $designerCount - 1)
-                        style="visibility: hidden;"
-                    @endif
-                    >+</a>
-                </div>
-            @endforeach
-            @if(!count($image->designers))
-                <div class="mb-2 d-flex">
-                    {!! Form::select('designer_id[]', $users, null, ['class'=> 'form-control mr-2 selectize', 'placeholder' => 'Select a Designer']) !!}
-                    {!! Form::text('designer_url[]', null, ['class' => 'form-control mr-2', 'placeholder' => 'Designer URL']) !!}
-                    
-                    <a href="#" class="add-designer btn btn-link" data-toggle="tooltip" title="Add another designer"
-                    >+</a>
-                </div>
-            @endif
-        </div>
-        <div class="designer-row hide mb-2">
-            {!! Form::select('designer_id[]', $users, null, ['class'=> 'form-control mr-2 designer-select', 'placeholder' => 'Select a Designer']) !!}
-            {!! Form::text('designer_url[]', null, ['class' => 'form-control mr-2', 'placeholder' => 'Designer URL']) !!}
-            <a href="#" class="add-designer btn btn-link" data-toggle="tooltip" title="Add another designer">+</a>
-        </div>
+{!! Form::open(['url' => 'admin/character/image/' . $image->id . '/credits']) !!}
+<div class="form-group">
+    {!! Form::label('Designer(s)') !!}
+    <div id="designerList">
+        <?php $designerCount = count($image->designers); ?>
+        @foreach ($image->designers as $count => $designer)
+            <div class="mb-2 d-flex">
+                {!! Form::select('designer_id[' . $designer->id . ']', $users, $designer->user_id, ['class' => 'form-control mr-2 selectize', 'placeholder' => 'Select a Designer']) !!}
+                {!! Form::text('designer_url[' . $designer->id . ']', $designer->url, ['class' => 'form-control mr-2', 'placeholder' => 'Designer URL']) !!}
+
+                <a href="#" class="add-designer btn btn-link" data-toggle="tooltip" title="Add another designer" @if ($count != $designerCount - 1) style="visibility: hidden;" @endif>+</a>
+            </div>
+        @endforeach
+        @if (!count($image->designers))
+            <div class="mb-2 d-flex">
+                {!! Form::select('designer_id[]', $users, null, ['class' => 'form-control mr-2 selectize', 'placeholder' => 'Select a Designer']) !!}
+                {!! Form::text('designer_url[]', null, ['class' => 'form-control mr-2', 'placeholder' => 'Designer URL']) !!}
+
+                <a href="#" class="add-designer btn btn-link" data-toggle="tooltip" title="Add another designer">+</a>
+            </div>
+        @endif
     </div>
-    <div class="form-group">
-        {!! Form::label('Artist(s)') !!}
-        <div id="artistList">
-            <?php $artistCount = count($image->artists); ?>
-            @foreach($image->artists as $count=>$artist)
-                <div class="mb-2 d-flex">
-                    {!! Form::select('artist_id['.$artist->id.']', $users, $artist->user_id, ['class'=> 'form-control mr-2 selectize', 'placeholder' => 'Select an Artist']) !!}
-                    {!! Form::text('artist_url['.$artist->id.']', $artist->url, ['class' => 'form-control mr-2', 'placeholder' => 'Artist URL']) !!}
-                    <a href="#" class="add-artist btn btn-link" data-toggle="tooltip" title="Add another artist"
-                    @if($count != $artistCount - 1)
-                        style="visibility: hidden;"
-                    @endif
-                    >+</a>
-                </div>
-            @endforeach
-            @if(!count($image->artists))
-                <div class="mb-2 d-flex">
-                    {!! Form::select('artist_id[]', $users, null, ['class'=> 'form-control mr-2 selectize', 'placeholder' => 'Select an Artist']) !!}
-                    {!! Form::text('artist_url[]', null, ['class' => 'form-control mr-2', 'placeholder' => 'Artist URL']) !!}
-                    <a href="#" class="add-artist btn btn-link" data-toggle="tooltip" title="Add another artist"
-                    >+</a>
-                </div>
-            @endif
-        </div>
-        <div class="artist-row hide mb-2">
-            {!! Form::select('artist_id[]', $users, null, ['class'=> 'form-control mr-2 artist-select', 'placeholder' => 'Select an Artist']) !!}
-            {!! Form::text('artist_url[]', null, ['class' => 'form-control mr-2', 'placeholder' => 'Artist URL']) !!}
-            <a href="#" class="add-artist btn btn-link mb-2" data-toggle="tooltip" title="Add another artist">+</a>
-        </div>
+    <div class="designer-row hide mb-2">
+        {!! Form::select('designer_id[]', $users, null, ['class' => 'form-control mr-2 designer-select', 'placeholder' => 'Select a Designer']) !!}
+        {!! Form::text('designer_url[]', null, ['class' => 'form-control mr-2', 'placeholder' => 'Designer URL']) !!}
+        <a href="#" class="add-designer btn btn-link" data-toggle="tooltip" title="Add another designer">+</a>
     </div>
-
-    <div class="text-right">
-        {!! Form::submit('Edit', ['class' => 'btn btn-primary']) !!}
+</div>
+<div class="form-group">
+    {!! Form::label('Artist(s)') !!}
+    <div id="artistList">
+        <?php $artistCount = count($image->artists); ?>
+        @foreach ($image->artists as $count => $artist)
+            <div class="mb-2 d-flex">
+                {!! Form::select('artist_id[' . $artist->id . ']', $users, $artist->user_id, ['class' => 'form-control mr-2 selectize', 'placeholder' => 'Select an Artist']) !!}
+                {!! Form::text('artist_url[' . $artist->id . ']', $artist->url, ['class' => 'form-control mr-2', 'placeholder' => 'Artist URL']) !!}
+                <a href="#" class="add-artist btn btn-link" data-toggle="tooltip" title="Add another artist" @if ($count != $artistCount - 1) style="visibility: hidden;" @endif>+</a>
+            </div>
+        @endforeach
+        @if (!count($image->artists))
+            <div class="mb-2 d-flex">
+                {!! Form::select('artist_id[]', $users, null, ['class' => 'form-control mr-2 selectize', 'placeholder' => 'Select an Artist']) !!}
+                {!! Form::text('artist_url[]', null, ['class' => 'form-control mr-2', 'placeholder' => 'Artist URL']) !!}
+                <a href="#" class="add-artist btn btn-link" data-toggle="tooltip" title="Add another artist">+</a>
+            </div>
+        @endif
     </div>
+    <div class="artist-row hide mb-2">
+        {!! Form::select('artist_id[]', $users, null, ['class' => 'form-control mr-2 artist-select', 'placeholder' => 'Select an Artist']) !!}
+        {!! Form::text('artist_url[]', null, ['class' => 'form-control mr-2', 'placeholder' => 'Artist URL']) !!}
+        <a href="#" class="add-artist btn btn-link mb-2" data-toggle="tooltip" title="Add another artist">+</a>
+    </div>
+</div>
+
+<div class="text-right">
+    {!! Form::submit('Edit', ['class' => 'btn btn-primary']) !!}
+</div>
 {!! Form::close() !!}
 
 <script>
@@ -74,6 +64,7 @@
             e.preventDefault();
             addDesignerRow($(this));
         });
+
         function addDesignerRow($trigger) {
             var $clone = $('.designer-row').clone();
             $('#designerList').append($clone);
@@ -83,14 +74,17 @@ function addDesignerRow($trigger) {
                 e.preventDefault();
                 addDesignerRow($(this));
             })
-            $trigger.css({ visibility: 'hidden' });
+            $trigger.css({
+                visibility: 'hidden'
+            });
             $clone.find('.designer-select').selectize();
         }
-        
+
         $('.add-artist').on('click', function(e) {
             e.preventDefault();
             addArtistRow($(this));
         });
+
         function addArtistRow($trigger) {
             var $clone = $('.artist-row').clone();
             $('#artistList').append($clone);
@@ -100,9 +94,10 @@ function addArtistRow($trigger) {
                 e.preventDefault();
                 addArtistRow($(this));
             })
-            $trigger.css({ visibility: 'hidden' });
+            $trigger.css({
+                visibility: 'hidden'
+            });
             $clone.find('.artist-select').selectize();
         }
     });
-
-</script>
\ No newline at end of file
+</script>
diff --git a/resources/views/character/admin/_edit_description_modal.blade.php b/resources/views/character/admin/_edit_description_modal.blade.php
index 701c8c4539..bc55f8c960 100644
--- a/resources/views/character/admin/_edit_description_modal.blade.php
+++ b/resources/views/character/admin/_edit_description_modal.blade.php
@@ -1,16 +1,16 @@
-{!! Form::open(['url' => $isMyo ? 'admin/myo/'.$character->id.'/description' : 'admin/character/'.$character->slug.'/description']) !!}
-    <div class="form-group">
-        {!! Form::label('Character Description') !!}
-        {!! Form::textarea('description', $character->description, ['class' => 'form-control wysiwyg']) !!}
-    </div>
+{!! Form::open(['url' => $isMyo ? 'admin/myo/' . $character->id . '/description' : 'admin/character/' . $character->slug . '/description']) !!}
+<div class="form-group">
+    {!! Form::label('Character Description') !!}
+    {!! Form::textarea('description', $character->description, ['class' => 'form-control wysiwyg']) !!}
+</div>
 
-    <div class="text-right">
-        {!! Form::submit('Edit', ['class' => 'btn btn-primary']) !!}
-    </div>
+<div class="text-right">
+    {!! Form::submit('Edit', ['class' => 'btn btn-primary']) !!}
+</div>
 {!! Form::close() !!}
 
 <script>
     $(document).ready(function() {
         @include('js._modal_wysiwyg')
     });
-</script>
\ No newline at end of file
+</script>
diff --git a/resources/views/character/admin/_edit_features_modal.blade.php b/resources/views/character/admin/_edit_features_modal.blade.php
index 7bfd788616..a4951faca1 100644
--- a/resources/views/character/admin/_edit_features_modal.blade.php
+++ b/resources/views/character/admin/_edit_features_modal.blade.php
@@ -1,66 +1,91 @@
-{!! Form::open(['url' => 'admin/character/image/'.$image->id.'/traits']) !!}
-    <div class="form-group">
-        {!! Form::label('Species') !!}
-        {!! Form::select('species_id', $specieses, $image->species_id, ['class' => 'form-control', 'id' => 'species']) !!}
-    </div>
+{!! Form::open(['url' => 'admin/character/image/' . $image->id . '/traits']) !!}
+<div class="form-group">
+    {!! Form::label('Species') !!}
+    {!! Form::select('species_id', $specieses, $image->species_id, ['class' => 'form-control', 'id' => 'species']) !!}
+</div>
 
-    <div class="form-group" id="subtypes">
-        {!! Form::label('Subtype (Optional)') !!}
-        {!! Form::select('subtype_id', $subtypes, $image->subtype_id, ['class' => 'form-control', 'id' => 'subtype']) !!}
-    </div>
+<div class="form-group" id="subtypes">
+    {!! Form::label('Subtype (Optional)') !!}
+    {!! Form::select('subtype_id', $subtypes, $image->subtype_id, ['class' => 'form-control', 'id' => 'subtype']) !!}
+</div>
 
-    <div class="form-group">
-        {!! Form::label('Character Rarity') !!}
-        {!! Form::select('rarity_id', $rarities, $image->rarity_id, ['class' => 'form-control']) !!}
-    </div>
+<div class="form-group">
+    {!! Form::label('Character Rarity') !!}
+    {!! Form::select('rarity_id', $rarities, $image->rarity_id, ['class' => 'form-control']) !!}
+</div>
 
-    <div class="row no-gutters">
-        <div class="col-md-6 pr-2">
-            <div class="form-group">
-                {!! Form::label('Character Title') !!}
-                {!! Form::select('title_id', $titles, $image->title_id ?? (isset($image->title_data) ? 'custom' : null), ['class' => 'form-control', 'id' => 'charTitle']) !!}
-            </div>
+<div class="row no-gutters">
+    <div class="col-md-6 pr-2">
+        <div class="form-group">
+            {!! Form::label('Character Title') !!}
+            {!! Form::select('title_id', $titles, $image->title_id ?? (isset($image->title_data) ? 'custom' : null), ['class' => 'form-control', 'id' => 'charTitle']) !!}
         </div>
-        <div class="col-md-6">
-            <div class="form-group" id="titleOptions">
-                {!! Form::label('Extra Info/Custom Title (Optional)') !!} {!! add_help('If \'custom title\' is selected, this will be displayed as the title. If a preexisting title is selected, it will be displayed in addition to it.'.(Settings::get('character_title_display') ? ' The short version is only used in the case of a custom title.' : '')) !!}
-                <div class="d-flex">
-                    {!! Form::text('title_data[full]', isset($image->title_data['full']) ? $image->title_data['full'] : null, ['class' => 'form-control mr-2', 'placeholder' => 'Full Title']) !!}
-                    @if(Settings::get('character_title_display'))
-                        {!! Form::text('title_data[short]', isset($image->title_data['short']) ? $image->title_data['short'] : null, ['class' => 'form-control mr-2', 'placeholder' => 'Short Title (Optional)']) !!}
-                    @endif
-                </div>
+    </div>
+    <div class="col-md-6">
+        <div class="form-group" id="titleOptions">
+            {!! Form::label('Extra Info/Custom Title (Optional)') !!} {!! add_help('If \'custom title\' is selected, this will be displayed as the title. If a preexisting title is selected, it will be displayed in addition to it.'.(Settings::get('character_title_display') ? ' The short version is only used in the case of a custom title.' : '')) !!}
+            <div class="d-flex">
+                {!! Form::text('title_data[full]', isset($image->title_data['full']) ? $image->title_data['full'] : null, ['class' => 'form-control mr-2', 'placeholder' => 'Full Title']) !!}
+                @if(Settings::get('character_title_display'))
+                    {!! Form::text('title_data[short]', isset($image->title_data['short']) ? $image->title_data['short'] : null, ['class' => 'form-control mr-2', 'placeholder' => 'Short Title (Optional)']) !!}
+                @endif
             </div>
         </div>
     </div>
+</div>
 
-    <div class="form-group">
-        {!! Form::label('Traits') !!}
-        <div id="featureList">
-            @foreach($image->features as $feature)
-                <div class="d-flex mb-2">
-                    {!! Form::select('feature_id[]', $features, $feature->feature_id, ['class' => 'form-control mr-2 feature-select original', 'placeholder' => 'Select Trait']) !!}
-                    {!! Form::text('feature_data[]', $feature->data, ['class' => 'form-control mr-2', 'placeholder' => 'Extra Info (Optional)']) !!}
-                    <a href="#" class="remove-feature btn btn-danger mb-2">×</a>
-                </div>
-            @endforeach
-        </div>
-        <div><a href="#" class="btn btn-primary" id="add-feature">Add Trait</a></div>
-        <div class="feature-row hide mb-2">
-            {!! Form::select('feature_id[]', $features, null, ['class' => 'form-control mr-2 feature-select', 'placeholder' => 'Select Trait']) !!}
-            {!! Form::text('feature_data[]', null, ['class' => 'form-control mr-2', 'placeholder' => 'Extra Info (Optional)']) !!}
-            <a href="#" class="remove-feature btn btn-danger mb-2">×</a>
-        </div>
+<div class="form-group">
+    {!! Form::label('Traits') !!}
+    <div><a href="#" class="btn btn-primary mb-2" id="add-feature">Add Trait</a></div>
+    <div id="featureList">
+        @foreach ($image->features as $feature)
+            <div class="d-flex mb-2">
+                {!! Form::select('feature_id[]', $features, $feature->feature_id, ['class' => 'form-control mr-2 feature-select original', 'placeholder' => 'Select Trait']) !!}
+                {!! Form::text('feature_data[]', $feature->data, ['class' => 'form-control mr-2', 'placeholder' => 'Extra Info (Optional)']) !!}
+                <a href="#" class="remove-feature btn btn-danger mb-2">×</a>
+            </div>
+        @endforeach
     </div>
-
-    <div class="text-right">
-        {!! Form::submit('Edit', ['class' => 'btn btn-primary']) !!}
+    <div class="feature-row hide mb-2">
+        {!! Form::select('feature_id[]', $features, null, ['class' => 'form-control mr-2 feature-select', 'placeholder' => 'Select Trait']) !!}
+        {!! Form::text('feature_data[]', null, ['class' => 'form-control mr-2', 'placeholder' => 'Extra Info (Optional)']) !!}
+        <a href="#" class="remove-feature btn btn-danger mb-2">×</a>
     </div>
+</div>
+
+<div class="text-right">
+    {!! Form::submit('Edit', ['class' => 'btn btn-primary']) !!}
+</div>
 {!! Form::close() !!}
 
 <script>
     $(document).ready(function() {
-        $('.original.feature-select').selectize();
+        var $title = $('#charTitle');
+        var $titleOptions = $('#titleOptions');
+
+        var titleEntry = $title.val() != 0;
+
+        updateTitleEntry(titleEntry);
+
+        $title.on('change', function(e) {
+            var titleEntry = $title.val() != 0;
+            updateTitleEntry(titleEntry);
+        });
+
+        function updateTitleEntry($show) {
+            if($show) $titleOptions.removeClass('hide');
+            else $titleOptions.addClass('hide');
+        }
+
+        @if (config('lorekeeper.extensions.organised_traits_dropdown'))
+            $('.original.feature-select').selectize({
+                render: {
+                    item: featureSelectedRender
+                }
+            });
+        @else
+            $('.original.feature-select').selectize();
+        @endif
         $('#add-feature').on('click', function(e) {
             e.preventDefault();
             addFeatureRow();
@@ -69,6 +94,7 @@
             e.preventDefault();
             removeFeatureRow($(this));
         })
+
         function addFeatureRow() {
             var $clone = $('.feature-row').clone();
             $('#featureList').append($clone);
@@ -78,39 +104,44 @@ function addFeatureRow() {
                 e.preventDefault();
                 removeFeatureRow($(this));
             })
-            $clone.find('.feature-select').selectize();
+
+            @if (config('lorekeeper.extensions.organised_traits_dropdown'))
+                $clone.find('.feature-select').selectize({
+                    render: {
+                        item: featureSelectedRender
+                    }
+                });
+            @else
+                $clone.find('.feature-select').selectize();
+            @endif
         }
+
         function removeFeatureRow($trigger) {
             $trigger.parent().remove();
         }
-    });
 
-    $(document).ready(function() {
-        var $title = $('#charTitle');
-        var $titleOptions = $('#titleOptions');
-
-        var titleEntry = $title.val() != 0;
-
-        updateTitleEntry(titleEntry);
-
-        $title.on('change', function(e) {
-            var titleEntry = $title.val() != 0;
-            updateTitleEntry(titleEntry);
-        });
-
-        function updateTitleEntry($show) {
-            if($show) $titleOptions.removeClass('hide');
-            else $titleOptions.addClass('hide');
+        function featureSelectedRender(item, escape) {
+            return '<div><span>' + escape(item["text"].trim()) + ' (' + escape(item["optgroup"].trim()) + ')' + '</span></div>';
         }
+        refreshSubtype();
     });
 
-    $( "#species" ).change(function() {
-      var species = $('#species').val();
-      var id = '<?php echo($image->id); ?>';
-      $.ajax({
-        type: "GET", url: "{{ url('admin/character/image/traits/subtype') }}?species="+species+"&id="+id, dataType: "text"
-      }).done(function (res) { $("#subtypes").html(res); }).fail(function (jqXHR, textStatus, errorThrown) { alert("AJAX call failed: " + textStatus + ", " + errorThrown); });
-
+    $("#species").change(function() {
+        refreshSubtype();
     });
 
+    function refreshSubtype() {
+        var species = $('#species').val();
+        var id = '<?php echo $image->id; ?>';
+        $.ajax({
+            type: "GET",
+            url: "{{ url('admin/character/image/traits/subtype') }}?species=" + species + "&id=" + id,
+            dataType: "text"
+        }).done(function(res) {
+            $("#subtypes").html(res);
+        }).fail(function(jqXHR, textStatus, errorThrown) {
+            alert("AJAX call failed: " + textStatus + ", " + errorThrown);
+        });
+
+    };
 </script>
diff --git a/resources/views/character/admin/_edit_notes_modal.blade.php b/resources/views/character/admin/_edit_notes_modal.blade.php
index 0e9c6167ec..6f29ca73cf 100644
--- a/resources/views/character/admin/_edit_notes_modal.blade.php
+++ b/resources/views/character/admin/_edit_notes_modal.blade.php
@@ -1,16 +1,16 @@
-{!! Form::open(['url' => 'admin/character/image/'.$image->id.'/notes']) !!}
-    <div class="form-group">
-        {!! Form::label('Image Notes') !!}
-        {!! Form::textarea('description', $image->description, ['class' => 'form-control wysiwyg']) !!}
-    </div>
+{!! Form::open(['url' => 'admin/character/image/' . $image->id . '/notes']) !!}
+<div class="form-group">
+    {!! Form::label('Image Notes') !!}
+    {!! Form::textarea('description', $image->description, ['class' => 'form-control wysiwyg']) !!}
+</div>
 
-    <div class="text-right">
-        {!! Form::submit('Edit', ['class' => 'btn btn-primary']) !!}
-    </div>
+<div class="text-right">
+    {!! Form::submit('Edit', ['class' => 'btn btn-primary']) !!}
+</div>
 {!! Form::close() !!}
 
 <script>
     $(document).ready(function() {
         @include('js._modal_wysiwyg')
     });
-</script>
\ No newline at end of file
+</script>
diff --git a/resources/views/character/admin/_edit_stats_modal.blade.php b/resources/views/character/admin/_edit_stats_modal.blade.php
index de0dd53828..d71be2bd9f 100644
--- a/resources/views/character/admin/_edit_stats_modal.blade.php
+++ b/resources/views/character/admin/_edit_stats_modal.blade.php
@@ -1,92 +1,67 @@
-{!! Form::open(['url' => $isMyo ? 'admin/myo/'.$character->id.'/stats' : 'admin/character/'.$character->slug.'/stats']) !!}
-    @if($isMyo)
-        <div class="form-group">
-            {!! Form::label('Name') !!}
-            {!! Form::text('name', $character->name, ['class' => 'form-control']) !!}
-        </div>
-    @else
-        <div class="row">
-            <div class="col-md-6">
-                <div class="form-group">
-                    {!! Form::label('Character Category') !!}
-                    {!! Form::select('character_category_id', $categories, $character->category->id, ['class' => 'form-control']) !!}
-                </div>
-            </div>
-            <div class="col-md-6">
-                <div class="form-group">
-                    {!! Form::label('Number') !!} {!! add_help('This number helps to identify the character and should preferably be unique either within the category, or among all characters.') !!}
-                    {!! Form::text('number', $number, ['class' => 'form-control mr-2', 'id' => 'number']) !!}
-                </div>
+{!! Form::open(['url' => $isMyo ? 'admin/myo/' . $character->id . '/stats' : 'admin/character/' . $character->slug . '/stats']) !!}
+@if ($isMyo)
+    <div class="form-group">
+        {!! Form::label('Name') !!}
+        {!! Form::text('name', $character->name, ['class' => 'form-control']) !!}
+    </div>
+@else
+    <div class="row">
+        <div class="col-md-6">
+            <div class="form-group">
+                {!! Form::label('Character Category') !!}
+                {!! Form::select('character_category_id', $categories, $character->category->id, ['class' => 'form-control']) !!}
             </div>
         </div>
-        <div class="form-group">
-            {!! Form::label('Character Code') !!} {!! add_help('This code identifies the character itself. This must be unique among all characters (as it\'s used to generate the character\'s page URL).') !!}
-            {!! Form::text('slug', $character->slug, ['class' => 'form-control', 'id' => 'code']) !!}
+        <div class="col-md-6">
+            <div class="form-group">
+                {!! Form::label('Number') !!} {!! add_help('This number helps to identify the character and should preferably be unique either within the category, or among all characters.') !!}
+                {!! Form::text('number', $number, ['class' => 'form-control mr-2', 'id' => 'number']) !!}
+            </div>
         </div>
-    @endif
-
-    <div class="alert alert-info">
-        These are displayed on the character's profile, but don't have any effect on site functionality except for the following: 
-        <ul>
-            <li>If all switches are off, the character cannot be transferred by the user (directly or through trades).</li>
-            <li>If a transfer cooldown is set, the character also cannot be transferred by the user (directly or through trades) until the cooldown is up.</li>
-        </ul>
     </div>
     <div class="form-group">
-        {!! Form::checkbox('is_giftable', 1, $character->is_giftable, ['class' => 'form-check-input', 'data-toggle' => 'toggle']) !!}
-        {!! Form::label('is_giftable', 'Is Giftable', ['class' => 'form-check-label ml-3']) !!}
+        {!! Form::label('Character Code') !!} {!! add_help('This code identifies the character itself. This must be unique among all characters (as it\'s used to generate the character\'s page URL).') !!}
+        {!! Form::text('slug', $character->slug, ['class' => 'form-control', 'id' => 'code']) !!}
     </div>
-    <div class="form-group">
-        {!! Form::checkbox('is_tradeable', 1, $character->is_tradeable, ['class' => 'form-check-input', 'data-toggle' => 'toggle']) !!}
-        {!! Form::label('is_tradeable', 'Is Tradeable', ['class' => 'form-check-label ml-3']) !!}
-    </div>
-    <div class="form-group">
-        {!! Form::checkbox('is_sellable', 1, $character->is_sellable, ['class' => 'form-check-input', 'data-toggle' => 'toggle', 'id' => 'resellable']) !!}
-        {!! Form::label('is_sellable', 'Is Resellable', ['class' => 'form-check-label ml-3']) !!}
-    </div>
-    <div class="card mb-3" id="resellOptions">
-        <div class="card-body">
-            {!! Form::label('Resale Value') !!} {!! add_help('This value is publicly displayed on the character\'s page.') !!}
-            {!! Form::text('sale_value', $character->sale_value, ['class' => 'form-control']) !!}
+@endif
+
+<div class="alert alert-info">
+    These are displayed on the character's profile, but don't have any effect on site functionality except for the following:
+    <ul>
+        <li>If all switches are off, the character cannot be transferred by the user (directly or through trades).</li>
+        <li>If a transfer cooldown is set, the character also cannot be transferred by the user (directly or through trades) until the cooldown is up.</li>
+    </ul>
+</div>
+<div class="form-group">
+    {!! Form::checkbox('is_giftable', 1, $character->is_giftable, ['class' => 'form-check-input', 'data-toggle' => 'toggle']) !!}
+    {!! Form::label('is_giftable', 'Is Giftable', ['class' => 'form-check-label ml-3']) !!}
+</div>
+<div class="form-group">
+    {!! Form::checkbox('is_tradeable', 1, $character->is_tradeable, ['class' => 'form-check-input', 'data-toggle' => 'toggle']) !!}
+    {!! Form::label('is_tradeable', 'Is Tradeable', ['class' => 'form-check-label ml-3']) !!}
+</div>
+<div class="form-group">
+    {!! Form::checkbox('is_sellable', 1, $character->is_sellable, ['class' => 'form-check-input', 'data-toggle' => 'toggle', 'id' => 'resellable']) !!}
+    {!! Form::label('is_sellable', 'Is Resellable', ['class' => 'form-check-label ml-3']) !!}
+</div>
+<div class="form-group">
+    {!! Form::label('Resale Value') !!} {!! add_help('This value is publicly displayed on the character\'s page. It\'s hidden if zero or lower.') !!}
+    {!! Form::text('sale_value', $character->sale_value, ['class' => 'form-control']) !!}
+</div>
+<div class="form-group">
+    {!! Form::label('On Transfer Cooldown Until (Optional)') !!}
+    <div class="input-group">
+        {!! Form::text('transferrable_at', $character->transferrable_at, ['class' => 'form-control datepickeralt']) !!}
+        <div class="input-group-append">
+            <a class="btn btn-info collapsed" href="#collapsedt" data-toggle="collapse"><i class="fas fa-calendar-alt"></i></a>
         </div>
     </div>
-    <div class="form-group">
-        {!! Form::label('On Transfer Cooldown Until (Optional)') !!} 
-        {!! Form::text('transferrable_at', $character->transferrable_at, ['class' => 'form-control', 'id' => 'datepicker']) !!}
-    </div>
+    <div class="collapse datepicker" id="collapsedt"></div>
+</div>
 
-    <div class="text-right">
-        {!! Form::submit('Edit', ['class' => 'btn btn-primary']) !!}
-    </div>
+<div class="text-right">
+    {!! Form::submit('Edit', ['class' => 'btn btn-primary']) !!}
+</div>
 {!! Form::close() !!}
 
-<script>
-    $(document).ready(function() {
-        $( "#datepicker" ).datetimepicker({
-            dateFormat: "yy-mm-dd",
-            timeFormat: 'HH:mm:ss',
-        });
-
-        //$('[data-toggle=toggle]').bootstrapToggle();
-
-        // Resell options /////////////////////////////////////////////////////////////////////////////
-
-        var $resellable = $('#resellable');
-        var $resellOptions = $('#resellOptions');
-
-        var resellable = $resellable.is(':checked');
-
-        updateOptions();
-
-        $resellable.on('change', function(e) {
-            resellable = $resellable.is(':checked');
-
-            updateOptions();
-        });
-
-        function updateOptions() {
-            if(resellable) $resellOptions.removeClass('hide');
-            else $resellOptions.addClass('hide');
-        }
-    });
-</script>
\ No newline at end of file
+@include('widgets._datetimepicker_js', ['dtinline' => 'datepickeralt', 'dtvalue' => $character->transferrable_at])
diff --git a/resources/views/character/admin/_reupload_image_modal.blade.php b/resources/views/character/admin/_reupload_image_modal.blade.php
index aecaaea562..71d0508538 100644
--- a/resources/views/character/admin/_reupload_image_modal.blade.php
+++ b/resources/views/character/admin/_reupload_image_modal.blade.php
@@ -1,9 +1,9 @@
-{!! Form::open(['url' => 'admin/character/image/'.$image->id.'/reupload', 'files' => true]) !!}
+{!! Form::open(['url' => 'admin/character/image/' . $image->id . '/reupload', 'files' => true]) !!}
 <div class="form-group">
-        {!! Form::label('Character Image') !!} {!! add_help('This is the full masterlist image. Note that the image is not protected in any way, so take precautions to avoid art/design theft.') !!}
-        <div>{!! Form::file('image', ['id' => 'mainImage']) !!}</div>
-    </div>
-@if (Config::get('lorekeeper.settings.masterlist_image_automation') === 1)
+    {!! Form::label('Character Image') !!} {!! add_help('This is the full masterlist image. Note that the image is not protected in any way, so take precautions to avoid art/design theft.') !!}
+    <div>{!! Form::file('image', ['id' => 'mainImage']) !!}</div>
+</div>
+@if (config('lorekeeper.settings.masterlist_image_automation') === 1)
     <div class="form-group">
         {!! Form::checkbox('use_cropper', 1, 1, ['class' => 'form-check-input', 'data-toggle' => 'toggle', 'id' => 'useCropper']) !!}
         {!! Form::label('use_cropper', 'Use Thumbnail Automation', ['class' => 'form-check-label ml-3']) !!} {!! add_help('A thumbnail is required for the upload (used for the masterlist). You can use the Thumbnail Automation, or upload a custom thumbnail.') !!}
@@ -33,17 +33,17 @@
         </div>
     </div>
 @endif
-    <div class="card mb-3" id="thumbnailUpload">
-        <div class="card-body">
-            {!! Form::label('Thumbnail Image') !!} {!! add_help('This image is shown on the masterlist page.') !!}
-            <div>{!! Form::file('thumbnail') !!}</div>
-            <div class="text-muted">Recommended size: {{ Config::get('lorekeeper.settings.masterlist_thumbnails.width') }}px x {{ Config::get('lorekeeper.settings.masterlist_thumbnails.height') }}px</div>
-        </div>
+<div class="card mb-3" id="thumbnailUpload">
+    <div class="card-body">
+        {!! Form::label('Thumbnail Image') !!} {!! add_help('This image is shown on the masterlist page.') !!}
+        <div>{!! Form::file('thumbnail') !!}</div>
+        <div class="text-muted">Recommended size: {{ config('lorekeeper.settings.masterlist_thumbnails.width') }}px x {{ config('lorekeeper.settings.masterlist_thumbnails.height') }}px</div>
     </div>
+</div>
 
-    <div class="text-right">
-        {!! Form::submit('Edit', ['class' => 'btn btn-primary']) !!}
-    </div>
+<div class="text-right">
+    {!! Form::submit('Edit', ['class' => 'btn btn-primary']) !!}
+</div>
 {!! Form::close() !!}
 
 <script>
@@ -67,11 +67,10 @@
         });
 
         function updateCropper() {
-            if(useCropper) {
+            if (useCropper) {
                 $thumbnailUpload.addClass('hide');
                 $thumbnailCrop.removeClass('hide');
-            }
-            else {
+            } else {
                 $thumbnailCrop.addClass('hide');
                 $thumbnailUpload.removeClass('hide');
             }
@@ -79,8 +78,8 @@ function updateCropper() {
 
         // Croppie ////////////////////////////////////////////////////////////////////////////////////
 
-        var thumbnailWidth = {{ Config::get('lorekeeper.settings.masterlist_thumbnails.width') }};
-        var thumbnailHeight = {{ Config::get('lorekeeper.settings.masterlist_thumbnails.height') }};
+        var thumbnailWidth = {{ config('lorekeeper.settings.masterlist_thumbnails.width') }};
+        var thumbnailHeight = {{ config('lorekeeper.settings.masterlist_thumbnails.height') }};
         var $cropper = $('#cropper');
         var c = null;
         var $x0 = $('#cropX0');
@@ -99,7 +98,10 @@ function readURL(input) {
                             width: thumbnailWidth,
                             height: thumbnailHeight
                         },
-                        boundary: { width: thumbnailWidth + 100, height: thumbnailHeight + 100 },
+                        boundary: {
+                            width: thumbnailWidth + 100,
+                            height: thumbnailHeight + 100
+                        },
                         update: function() {
                             updateCropValues();
                         }
@@ -124,5 +126,4 @@ function updateCropValues() {
             $y1.val(values.points[3]);
         }
     });
-
 </script>
diff --git a/resources/views/character/admin/_upload_image_subtype.blade.php b/resources/views/character/admin/_upload_image_subtype.blade.php
index ea467f395c..50e76dda4c 100644
--- a/resources/views/character/admin/_upload_image_subtype.blade.php
+++ b/resources/views/character/admin/_upload_image_subtype.blade.php
@@ -1,2 +1,2 @@
 {!! Form::label('Subtype (Optional)') !!}
-{!! Form::select('subtype_id', $subtypes, old('subtype_id') ? : $subtype, ['class' => 'form-control', 'id' => 'subtype']) !!}
+{!! Form::select('subtype_id', $subtypes, old('subtype_id') ?: $subtype, ['class' => 'form-control', 'id' => 'subtype']) !!}
diff --git a/resources/views/character/admin/upload_image.blade.php b/resources/views/character/admin/upload_image.blade.php
index 3e5ee4c9c3..74048d96bb 100644
--- a/resources/views/character/admin/upload_image.blade.php
+++ b/resources/views/character/admin/upload_image.blade.php
@@ -1,298 +1,336 @@
 @extends('character.layout')
 
-@section('profile-title') {{ $character->fullName }} - Upload New Image @endsection
+@section('profile-title')
+    {{ $character->fullName }} - Upload New Image
+@endsection
 
 @section('profile-content')
-{!! breadcrumbs(['Masterlist' => 'masterlist', $character->fullName => $character->url]) !!}
-
-@include('character._header', ['character' => $character])
-
-<p>This will add a new image to the character's gallery. The character's active image will be changed to the new one automatically. If the character is marked as visible, the owner of the character will be notified of the upload.</p>
-
-{!! Form::open(['url' => 'admin/character/'.$character->slug.'/image', 'files' => true]) !!}
-
-<h3>Validity</h3>
-
-<div class="form-group">
-    {!! Form::checkbox('is_valid', 1, 1, ['class' => 'form-check-input', 'data-toggle' => 'toggle']) !!}
-    {!! Form::label('is_valid', 'Is Valid', ['class' => 'form-check-label ml-3']) !!} {!! add_help('If this is turned off, the image will still be visible, but displayed with a note that the image is not a valid reference.') !!}
-</div>
-
-<h3>Image Upload</h3>
-
-<div class="form-group">
-    {!! Form::label('Character Image') !!} {!! add_help('This is the full masterlist image. Note that the image is not protected in any way, so take precautions to avoid art/design theft.') !!}
-    <div>{!! Form::file('image', ['id' => 'mainImage']) !!}</div>
-</div>
-@if (Config::get('lorekeeper.settings.masterlist_image_automation') === 1)
-<div class="form-group">
-    {!! Form::checkbox('use_cropper', 1, 1, ['class' => 'form-check-input', 'data-toggle' => 'toggle', 'id' => 'useCropper']) !!}
-    {!! Form::label('use_cropper', 'Use Thumbnail Automation', ['class' => 'form-check-label ml-3']) !!} {!! add_help('A thumbnail is required for the upload (used for the masterlist). You can use the Thumbnail Automation, or upload a custom thumbnail.') !!}
-</div>
-<div class="card mb-3" id="thumbnailCrop">
-    <div class="card-body">
-        <div id="cropSelect">By using this function, the thumbnail will be automatically generated from the full image.</div>
-        {!! Form::hidden('x0', 1) !!}
-        {!! Form::hidden('x1', 1) !!}
-        {!! Form::hidden('y0', 1) !!}
-        {!! Form::hidden('y1', 1) !!}
+    {!! breadcrumbs(['Masterlist' => 'masterlist', $character->fullName => $character->url]) !!}
+
+    @include('character._header', ['character' => $character])
+
+    <p>This will add a new image to the character's gallery. The character's active image will be changed to the new one automatically. If the character is marked as visible, the owner of the character will be notified of the upload.</p>
+
+    {!! Form::open(['url' => 'admin/character/' . $character->slug . '/image', 'files' => true]) !!}
+
+    <h3>Validity</h3>
+
+    <div class="form-group">
+        {!! Form::checkbox('is_valid', 1, 1, ['class' => 'form-check-input', 'data-toggle' => 'toggle']) !!}
+        {!! Form::label('is_valid', 'Is Valid', ['class' => 'form-check-label ml-3']) !!} {!! add_help('If this is turned off, the image will still be visible, but displayed with a note that the image is not a valid reference.') !!}
     </div>
-</div>
-@else
-<div class="form-group">
-    {!! Form::checkbox('use_cropper', 1, 1, ['class' => 'form-check-input', 'data-toggle' => 'toggle', 'id' => 'useCropper']) !!}
-        {!! Form::label('use_cropper', 'Use Image Cropper', ['class' => 'form-check-label ml-3']) !!} {!! add_help('A thumbnail is required for the upload (used for the masterlist). You can use the image cropper (crop dimensions can be adjusted in the site code), or upload a custom thumbnail.') !!}
-</div>
-<div class="card mb-3" id="thumbnailCrop">
-    <div class="card-body">
-        <div id="cropSelect">Select an image to use the thumbnail cropper.</div>
-        <img src="#" id="cropper" class="hide" alt="" />
-        {!! Form::hidden('x0', null, ['id' => 'cropX0']) !!}
-        {!! Form::hidden('x1', null, ['id' => 'cropX1']) !!}
-        {!! Form::hidden('y0', null, ['id' => 'cropY0']) !!}
-        {!! Form::hidden('y1', null, ['id' => 'cropY1']) !!}
+
+    <h3>Image Upload</h3>
+
+    <div class="form-group">
+        {!! Form::label('Character Image') !!} {!! add_help('This is the full masterlist image. Note that the image is not protected in any way, so take precautions to avoid art/design theft.') !!}
+        <div>{!! Form::file('image', ['id' => 'mainImage']) !!}</div>
     </div>
-</div>
-@endif
-<div class="card mb-3" id="thumbnailUpload">
-    <div class="card-body">
-        {!! Form::label('Thumbnail Image') !!} {!! add_help('This image is shown on the masterlist page.') !!}
-        <div>{!! Form::file('thumbnail') !!}</div>
-        <div class="text-muted">Recommended size: {{ Config::get('lorekeeper.settings.masterlist_thumbnails.width') }}px x {{ Config::get('lorekeeper.settings.masterlist_thumbnails.height') }}px</div>
+    @if (config('lorekeeper.settings.masterlist_image_automation') === 1)
+        <div class="form-group">
+            {!! Form::checkbox('use_cropper', 1, 1, ['class' => 'form-check-input', 'data-toggle' => 'toggle', 'id' => 'useCropper']) !!}
+            {!! Form::label('use_cropper', 'Use Thumbnail Automation', ['class' => 'form-check-label ml-3']) !!} {!! add_help('A thumbnail is required for the upload (used for the masterlist). You can use the Thumbnail Automation, or upload a custom thumbnail.') !!}
+        </div>
+        <div class="card mb-3" id="thumbnailCrop">
+            <div class="card-body">
+                <div id="cropSelect">By using this function, the thumbnail will be automatically generated from the full image.</div>
+                {!! Form::hidden('x0', 1) !!}
+                {!! Form::hidden('x1', 1) !!}
+                {!! Form::hidden('y0', 1) !!}
+                {!! Form::hidden('y1', 1) !!}
+            </div>
+        </div>
+    @else
+        <div class="form-group">
+            {!! Form::checkbox('use_cropper', 1, 1, ['class' => 'form-check-input', 'data-toggle' => 'toggle', 'id' => 'useCropper']) !!}
+            {!! Form::label('use_cropper', 'Use Image Cropper', ['class' => 'form-check-label ml-3']) !!} {!! add_help('A thumbnail is required for the upload (used for the masterlist). You can use the image cropper (crop dimensions can be adjusted in the site code), or upload a custom thumbnail.') !!}
+        </div>
+        <div class="card mb-3" id="thumbnailCrop">
+            <div class="card-body">
+                <div id="cropSelect">Select an image to use the thumbnail cropper.</div>
+                <img src="#" id="cropper" class="hide" alt="" />
+                {!! Form::hidden('x0', null, ['id' => 'cropX0']) !!}
+                {!! Form::hidden('x1', null, ['id' => 'cropX1']) !!}
+                {!! Form::hidden('y0', null, ['id' => 'cropY0']) !!}
+                {!! Form::hidden('y1', null, ['id' => 'cropY1']) !!}
+            </div>
+        </div>
+    @endif
+    <div class="card mb-3" id="thumbnailUpload">
+        <div class="card-body">
+            {!! Form::label('Thumbnail Image') !!} {!! add_help('This image is shown on the masterlist page.') !!}
+            <div>{!! Form::file('thumbnail') !!}</div>
+            <div class="text-muted">Recommended size: {{ config('lorekeeper.settings.masterlist_thumbnails.width') }}px x {{ config('lorekeeper.settings.masterlist_thumbnails.height') }}px</div>
+        </div>
     </div>
-</div>
-<p class="alert alert-info">
-    This section is for crediting the image creators. The first box is for the designer or artist's on-site username (if any). The second is for a link to the designer or artist if they don't have an account on the site.
-</p>
-<div class="form-group">
-    {!! Form::label('Designer(s)') !!}
-    <div id="designerList">
-        <div class="mb-2 d-flex">
-            {!! Form::select('designer_id[]', $users, null, ['class'=> 'form-control mr-2 selectize', 'placeholder' => 'Select a Designer']) !!}
+    <p class="alert alert-info">
+        This section is for crediting the image creators. The first box is for the designer or artist's on-site username (if any). The second is for a link to the designer or artist if they don't have an account on the site.
+    </p>
+    <div class="form-group">
+        {!! Form::label('Designer(s)') !!}
+        <div id="designerList">
+            <div class="mb-2 d-flex">
+                {!! Form::select('designer_id[]', $users, null, ['class' => 'form-control mr-2 selectize', 'placeholder' => 'Select a Designer']) !!}
+                {!! Form::text('designer_url[]', null, ['class' => 'form-control mr-2', 'placeholder' => 'Designer URL']) !!}
+                <a href="#" class="add-designer btn btn-link" data-toggle="tooltip" title="Add another designer">+</a>
+            </div>
+        </div>
+        <div class="designer-row hide mb-2">
+            {!! Form::select('designer_id[]', $users, null, ['class' => 'form-control mr-2 designer-select', 'placeholder' => 'Select a Designer']) !!}
             {!! Form::text('designer_url[]', null, ['class' => 'form-control mr-2', 'placeholder' => 'Designer URL']) !!}
             <a href="#" class="add-designer btn btn-link" data-toggle="tooltip" title="Add another designer">+</a>
         </div>
     </div>
-    <div class="designer-row hide mb-2">
-        {!! Form::select('designer_id[]', $users, null, ['class'=> 'form-control mr-2 designer-select', 'placeholder' => 'Select a Designer']) !!}
-        {!! Form::text('designer_url[]', null, ['class' => 'form-control mr-2', 'placeholder' => 'Designer URL']) !!}
-        <a href="#" class="add-designer btn btn-link" data-toggle="tooltip" title="Add another designer">+</a>
-    </div>
-</div>
-<div class="form-group">
-    {!! Form::label('Artist(s)') !!}
-    <div id="artistList">
-        <div class="mb-2 d-flex">
-            {!! Form::select('artist_id[]', $users, null, ['class'=> 'form-control mr-2 selectize', 'placeholder' => 'Select an Artist']) !!}
+    <div class="form-group">
+        {!! Form::label('Artist(s)') !!}
+        <div id="artistList">
+            <div class="mb-2 d-flex">
+                {!! Form::select('artist_id[]', $users, null, ['class' => 'form-control mr-2 selectize', 'placeholder' => 'Select an Artist']) !!}
+                {!! Form::text('artist_url[]', null, ['class' => 'form-control mr-2', 'placeholder' => 'Artist URL']) !!}
+                <a href="#" class="add-artist btn btn-link" data-toggle="tooltip" title="Add another artist">+</a>
+            </div>
+        </div>
+        <div class="artist-row hide mb-2">
+            {!! Form::select('artist_id[]', $users, null, ['class' => 'form-control mr-2 artist-select', 'placeholder' => 'Select an Artist']) !!}
             {!! Form::text('artist_url[]', null, ['class' => 'form-control mr-2', 'placeholder' => 'Artist URL']) !!}
-            <a href="#" class="add-artist btn btn-link" data-toggle="tooltip" title="Add another artist">+</a>
+            <a href="#" class="add-artist btn btn-link mb-2" data-toggle="tooltip" title="Add another artist">+</a>
         </div>
     </div>
-    <div class="artist-row hide mb-2">
-        {!! Form::select('artist_id[]', $users, null, ['class'=> 'form-control mr-2 artist-select', 'placeholder' => 'Select an Artist']) !!}
-        {!! Form::text('artist_url[]', null, ['class' => 'form-control mr-2', 'placeholder' => 'Artist URL']) !!}
-        <a href="#" class="add-artist btn btn-link mb-2" data-toggle="tooltip" title="Add another artist">+</a>
+
+    <div class="form-group">
+        {!! Form::label('Image Notes (Optional)') !!} {!! add_help('This section is for making additional notes about the image.') !!}
+        {!! Form::textarea('image_description', old('image_description'), ['class' => 'form-control wysiwyg']) !!}
     </div>
-</div>
-
-<div class="form-group">
-    {!! Form::label('Image Notes (Optional)') !!} {!! add_help('This section is for making additional notes about the image.') !!}
-    {!! Form::textarea('image_description', old('image_description'), ['class' => 'form-control wysiwyg']) !!}
-</div>
-
-<h3>
-    {{-- <div class="float-right"><a href="#" class="btn btn-info btn-sm" data-toggle="tooltip" title="This will fill the below fields with the same data as the character's current image. Note that this will overwrite any changes made below.">Fill Data</a></div> --}}
-Traits
-</h3>
-
-<div class="form-group">
-    {!! Form::label('Species') !!}
-    {!! Form::select('species_id', $specieses, old('species_id') ? : $character->image->species_id, ['class' => 'form-control', 'id' => 'species']) !!}
-</div>
-
-<div class="form-group" id="subtypes">
-    {!! Form::label('Subtype (Optional)') !!}
-    {!! Form::select('subtype_id', $subtypes, old('subtype_id') ? : $character->image->subtype_id, ['class' => 'form-control', 'id' => 'subtype']) !!}
-</div>
-
-<div class="form-group">
-    {!! Form::label('Character Rarity') !!}
-    {!! Form::select('rarity_id', $rarities, old('rarity_id') ? : $character->image->rarity_id, ['class' => 'form-control']) !!}
-</div>
-
-<div class="form-group">
-    {!! Form::label('Traits') !!}
-    <div id="featureList">
+
+    <h3>
+        {{-- <div class="float-right"><a href="#" class="btn btn-info btn-sm" data-toggle="tooltip" title="This will fill the below fields with the same data as the character's current image. Note that this will overwrite any changes made below.">Fill Data</a></div> --}}
+        Traits
+    </h3>
+
+    <div class="form-group">
+        {!! Form::label('Species') !!}
+        {!! Form::select('species_id', $specieses, old('species_id') ?: $character->image->species_id, ['class' => 'form-control', 'id' => 'species']) !!}
     </div>
-    <div><a href="#" class="btn btn-primary" id="add-feature">Add Trait</a></div>
-    <div class="feature-row hide mb-2">
-        {!! Form::select('feature_id[]', $features, null, ['class' => 'form-control mr-2 feature-select', 'placeholder' => 'Select Trait']) !!}
-        {!! Form::text('feature_data[]', null, ['class' => 'form-control mr-2', 'placeholder' => 'Extra Info (Optional)']) !!}
-        <a href="#" class="remove-feature btn btn-danger mb-2">×</a>
+
+    <div class="form-group" id="subtypes">
+        {!! Form::label('Subtype (Optional)') !!}
+        {!! Form::select('subtype_id', $subtypes, old('subtype_id') ?: $character->image->subtype_id, ['class' => 'form-control', 'id' => 'subtype']) !!}
     </div>
-</div>
 
-<div class="text-right">
-    {!! Form::submit('Create Image', ['class' => 'btn btn-primary']) !!}
-</div>
-{!! Form::close() !!}
+    <div class="form-group">
+        {!! Form::label('Character Rarity') !!}
+        {!! Form::select('rarity_id', $rarities, old('rarity_id') ?: $character->image->rarity_id, ['class' => 'form-control']) !!}
+    </div>
+
+    <div class="form-group">
+        {!! Form::label('Traits') !!}
+        <div><a href="#" class="btn btn-primary mb-2" id="add-feature">Add Trait</a></div>
+        <div id="featureList">
+            @if (config('lorekeeper.extensions.autopopulate_image_features'))
+                @foreach ($character->image->features as $feature)
+                    <div class="d-flex mb-2">
+                        {!! Form::select('feature_id[]', $features, $feature->feature_id, ['class' => 'form-control mr-2 feature-select original', 'placeholder' => 'Select Trait']) !!}
+                        {!! Form::text('feature_data[]', $feature->data, ['class' => 'form-control mr-2', 'placeholder' => 'Extra Info (Optional)']) !!}
+                        <a href="#" class="remove-feature btn btn-danger mb-2">×</a>
+                    </div>
+                @endforeach
+            @endif
+        </div>
+        <div class="feature-row hide mb-2">
+            {!! Form::select('feature_id[]', $features, null, ['class' => 'form-control mr-2 feature-select', 'placeholder' => 'Select Trait']) !!}
+            {!! Form::text('feature_data[]', null, ['class' => 'form-control mr-2', 'placeholder' => 'Extra Info (Optional)']) !!}
+            <a href="#" class="remove-feature btn btn-danger mb-2">×</a>
+        </div>
+    </div>
+
+    <div class="text-right">
+        {!! Form::submit('Create Image', ['class' => 'btn btn-primary']) !!}
+    </div>
+    {!! Form::close() !!}
 
 @endsection
 
 @section('scripts')
-@parent
-<script>
-$( document ).ready(function() {
-
-    // Cropper ////////////////////////////////////////////////////////////////////////////////////
-
-    var $useCropper = $('#useCropper');
-    var $thumbnailCrop = $('#thumbnailCrop');
-    var $thumbnailUpload = $('#thumbnailUpload');
-
-    var useCropper = $useCropper.is(':checked');
-
-    updateCropper();
-
-    $useCropper.on('change', function(e) {
-        useCropper = $useCropper.is(':checked');
-
-        updateCropper();
-    });
-
-    function updateCropper() {
-        if(useCropper) {
-            $thumbnailUpload.addClass('hide');
-            $thumbnailCrop.removeClass('hide');
-        }
-        else {
-            $thumbnailCrop.addClass('hide');
-            $thumbnailUpload.removeClass('hide');
-        }
-    }
-
-    // Designers and artists //////////////////////////////////////////////////////////////////////
-
-    $('.selectize').selectize();
-    $('.add-designer').on('click', function(e) {
-        e.preventDefault();
-        addDesignerRow($(this));
-    });
-    function addDesignerRow($trigger) {
-        var $clone = $('.designer-row').clone();
-        $('#designerList').append($clone);
-        $clone.removeClass('hide designer-row');
-        $clone.addClass('d-flex');
-        $clone.find('.add-designer').on('click', function(e) {
-            e.preventDefault();
-            addDesignerRow($(this));
-        })
-        $clone.find('.designer-select').selectize();
-        $trigger.css({ visibility: 'hidden' });
-    }
-
-    $('.add-artist').on('click', function(e) {
-        e.preventDefault();
-        addArtistRow($(this));
-    });
-    function addArtistRow($trigger) {
-        var $clone = $('.artist-row').clone();
-        $('#artistList').append($clone);
-        $clone.removeClass('hide artist-row');
-        $clone.addClass('d-flex');
-        $clone.find('.add-artist').on('click', function(e) {
-            e.preventDefault();
-            addArtistRow($(this));
-        })
-        $clone.find('.artist-select').selectize();
-        $trigger.css({ visibility: 'hidden' });
-    }
-
-    // Traits /////////////////////////////////////////////////////////////////////////////////////
-
-    $('#add-feature').on('click', function(e) {
-        e.preventDefault();
-        addFeatureRow();
-    });
-    $('.remove-feature').on('click', function(e) {
-        e.preventDefault();
-        removeFeatureRow($(this));
-    })
-    function addFeatureRow() {
-        var $clone = $('.feature-row').clone();
-        $('#featureList').append($clone);
-        $clone.removeClass('hide feature-row');
-        $clone.addClass('d-flex');
-        $clone.find('.remove-feature').on('click', function(e) {
-            e.preventDefault();
-            removeFeatureRow($(this));
-        })
-        $clone.find('.feature-select').selectize();
-    }
-    function removeFeatureRow($trigger) {
-        $trigger.parent().remove();
-    }
-
-    // Croppie ////////////////////////////////////////////////////////////////////////////////////
-
-    var thumbnailWidth = {{ Config::get('lorekeeper.settings.masterlist_thumbnails.width') }};
-    var thumbnailHeight = {{ Config::get('lorekeeper.settings.masterlist_thumbnails.height') }};
-    var $cropper = $('#cropper');
-    var c = null;
-    var $x0 = $('#cropX0');
-    var $y0 = $('#cropY0');
-    var $x1 = $('#cropX1');
-    var $y1 = $('#cropY1');
-    var zoom = 0;
-
-    function readURL(input) {
-        if (input.files && input.files[0]) {
-            var reader = new FileReader();
-            reader.onload = function(e) {
-                $cropper.attr('src', e.target.result);
-                c = new Croppie($cropper[0], {
-                    viewport: {
-                        width: thumbnailWidth,
-                        height: thumbnailHeight
-                    },
-                    boundary: { width: thumbnailWidth + 100, height: thumbnailHeight + 100 },
-                    update: function() {
-                        updateCropValues();
-                    }
+    @parent
+    <script>
+        $(document).ready(function() {
+
+            // Cropper ////////////////////////////////////////////////////////////////////////////////////
+
+            var $useCropper = $('#useCropper');
+            var $thumbnailCrop = $('#thumbnailCrop');
+            var $thumbnailUpload = $('#thumbnailUpload');
+
+            var useCropper = $useCropper.is(':checked');
+
+            updateCropper();
+
+            $useCropper.on('change', function(e) {
+                useCropper = $useCropper.is(':checked');
+
+                updateCropper();
+            });
+
+            function updateCropper() {
+                if (useCropper) {
+                    $thumbnailUpload.addClass('hide');
+                    $thumbnailCrop.removeClass('hide');
+                } else {
+                    $thumbnailCrop.addClass('hide');
+                    $thumbnailUpload.removeClass('hide');
+                }
+            }
+
+            // Designers and artists //////////////////////////////////////////////////////////////////////
+
+            $('.selectize').selectize();
+            $('.add-designer').on('click', function(e) {
+                e.preventDefault();
+                addDesignerRow($(this));
+            });
+
+            function addDesignerRow($trigger) {
+                var $clone = $('.designer-row').clone();
+                $('#designerList').append($clone);
+                $clone.removeClass('hide designer-row');
+                $clone.addClass('d-flex');
+                $clone.find('.add-designer').on('click', function(e) {
+                    e.preventDefault();
+                    addDesignerRow($(this));
+                })
+                $clone.find('.designer-select').selectize();
+                $trigger.css({
+                    visibility: 'hidden'
                 });
-                updateCropValues();
-                $('#cropSelect').addClass('hide');
-                $cropper.removeClass('hide');
             }
-            reader.readAsDataURL(input.files[0]);
-        }
-    }
 
-    $("#mainImage").change(function() {
-        readURL(this);
-    });
+            $('.add-artist').on('click', function(e) {
+                e.preventDefault();
+                addArtistRow($(this));
+            });
+
+            function addArtistRow($trigger) {
+                var $clone = $('.artist-row').clone();
+                $('#artistList').append($clone);
+                $clone.removeClass('hide artist-row');
+                $clone.addClass('d-flex');
+                $clone.find('.add-artist').on('click', function(e) {
+                    e.preventDefault();
+                    addArtistRow($(this));
+                })
+                $clone.find('.artist-select').selectize();
+                $trigger.css({
+                    visibility: 'hidden'
+                });
+            }
+
+            // Traits /////////////////////////////////////////////////////////////////////////////////////
+
+            $('#add-feature').on('click', function(e) {
+                e.preventDefault();
+                addFeatureRow();
+            });
+            $('.remove-feature').on('click', function(e) {
+                e.preventDefault();
+                removeFeatureRow($(this));
+            })
+
+            function addFeatureRow() {
+                var $clone = $('.feature-row').clone();
+                $('#featureList').append($clone);
+                $clone.removeClass('hide feature-row');
+                $clone.addClass('d-flex');
+                $clone.find('.remove-feature').on('click', function(e) {
+                    e.preventDefault();
+                    removeFeatureRow($(this));
+                })
+                @if (config('lorekeeper.extensions.organised_traits_dropdown'))
+                    $clone.find('.feature-select').selectize({
+                        render: {
+                            item: featureSelectedRender
+                        }
+                    });
+                @else
+                    $clone.find('.feature-select').selectize();
+                @endif
+            }
+
+            function removeFeatureRow($trigger) {
+                $trigger.parent().remove();
+            }
+
+            function featureSelectedRender(item, escape) {
+                return '<div><span>' + escape(item["text"].trim()) + ' (' + escape(item["optgroup"].trim()) + ')' + '</span></div>';
+            }
+
+            // Croppie ////////////////////////////////////////////////////////////////////////////////////
+
+            var thumbnailWidth = {{ config('lorekeeper.settings.masterlist_thumbnails.width') }};
+            var thumbnailHeight = {{ config('lorekeeper.settings.masterlist_thumbnails.height') }};
+            var $cropper = $('#cropper');
+            var c = null;
+            var $x0 = $('#cropX0');
+            var $y0 = $('#cropY0');
+            var $x1 = $('#cropX1');
+            var $y1 = $('#cropY1');
+            var zoom = 0;
+
+            function readURL(input) {
+                if (input.files && input.files[0]) {
+                    var reader = new FileReader();
+                    reader.onload = function(e) {
+                        $cropper.attr('src', e.target.result);
+                        c = new Croppie($cropper[0], {
+                            viewport: {
+                                width: thumbnailWidth,
+                                height: thumbnailHeight
+                            },
+                            boundary: {
+                                width: thumbnailWidth + 100,
+                                height: thumbnailHeight + 100
+                            },
+                            update: function() {
+                                updateCropValues();
+                            }
+                        });
+                        updateCropValues();
+                        $('#cropSelect').addClass('hide');
+                        $cropper.removeClass('hide');
+                    }
+                    reader.readAsDataURL(input.files[0]);
+                }
+            }
 
-    function updateCropValues() {
-        var values = c.get();
-        $x0.val(values.points[0]);
-        $y0.val(values.points[1]);
-        $x1.val(values.points[2]);
-        $y1.val(values.points[3]);
-    }
+            $("#mainImage").change(function() {
+                readURL(this);
+            });
 
+            function updateCropValues() {
+                var values = c.get();
+                $x0.val(values.points[0]);
+                $y0.val(values.points[1]);
+                $x1.val(values.points[2]);
+                $y1.val(values.points[3]);
+            }
 
-});
 
+        });
 
 
-$( "#species" ).change(function() {
-  var species = $('#species').val();
-  var id = '<?php echo($character->image->id); ?>';
-  $.ajax({
-    type: "GET", url: "{{ url('admin/character/image/subtype') }}?species="+species+"&id="+id, dataType: "text"
-  }).done(function (res) { $("#subtypes").html(res); }).fail(function (jqXHR, textStatus, errorThrown) { alert("AJAX call failed: " + textStatus + ", " + errorThrown); });
 
-});
+        $("#species").change(function() {
+            var species = $('#species').val();
+            var id = '<?php echo $character->image->id; ?>';
+            $.ajax({
+                type: "GET",
+                url: "{{ url('admin/character/image/subtype') }}?species=" + species + "&id=" + id,
+                dataType: "text"
+            }).done(function(res) {
+                $("#subtypes").html(res);
+            }).fail(function(jqXHR, textStatus, errorThrown) {
+                alert("AJAX call failed: " + textStatus + ", " + errorThrown);
+            });
 
-</script>
+        });
+    </script>
 @endsection
diff --git a/resources/views/character/bank.blade.php b/resources/views/character/bank.blade.php
index 7c983de1ab..7d84217288 100644
--- a/resources/views/character/bank.blade.php
+++ b/resources/views/character/bank.blade.php
@@ -1,63 +1,75 @@
 @extends('character.layout', ['isMyo' => $character->is_myo_slot])
 
-@section('profile-title') {{ $character->fullName }}'s Bank @endsection
+@section('profile-title')
+    {{ $character->fullName }}'s Bank
+@endsection
 
-@section('meta-img') {{ $character->image->thumbnailUrl }} @endsection
+@section('meta-img')
+    {{ $character->image->thumbnailUrl }}
+@endsection
 
 @section('profile-content')
-{!! breadcrumbs([($character->category->masterlist_sub_id ? $character->category->sublist->name.' Masterlist' : 'Character masterlist') => ($character->category->masterlist_sub_id ? 'sublist/'.$character->category->sublist->key : 'masterlist' ), $character->fullName => $character->url, "Bank" => $character->url.'/bank']) !!}
-
-@include('character._header', ['character' => $character])
-
-<h3>
-    @if(Auth::check() && Auth::user()->hasPower('edit_inventories'))
-        <a href="#" class="float-right btn btn-outline-info btn-sm" id="grantButton" data-toggle="modal" data-target="#grantModal"><i class="fas fa-cog"></i> Admin</a>
-    @endif
-    Currencies
-</h3>
-@if(count($currencies))
-<div class="card mb-4">
-    <ul class="list-group list-group-flush">
+    {!! breadcrumbs([
+        $character->category->masterlist_sub_id ? $character->category->sublist->name . ' Masterlist' : 'Character masterlist' => $character->category->masterlist_sub_id ? 'sublist/' . $character->category->sublist->key : 'masterlist',
+        $character->fullName => $character->url,
+        'Bank' => $character->url . '/bank',
+    ]) !!}
 
-        @foreach($currencies as $currency)
-            <li class="list-group-item">
-                <div class="row">
-                    <div class="col-lg-2 col-md-3 col-6 text-right">
-                        <strong>
-                            <a href="{{ $currency->url }}">
-                                {{ $currency->name }}
-                                @if($currency->abbreviation) ({{ $currency->abbreviation }}) @endif
-                            </a>
-                        </strong>
-                    </div>
-                    <div class="col-lg-10 col-md-9 col-6">
-                        {{ $currency->quantity }} @if($currency->has_icon) {!! $currency->displayIcon !!} @endif
-                    </div>
-                </div>
-            </li>
-        @endforeach
-    </ul>
-</div>
-@else
-<div class="card mb-4">
-    <div class="card-body">
-        No currencies owned.
-    </div>
-</div>
-@endif
+    @include('character._header', ['character' => $character])
 
-@if(Auth::check() && Auth::user()->id == $character->user_id)
     <h3>
-        Take/Give Currency
+        @if (Auth::check() && Auth::user()->hasPower('edit_inventories'))
+            <a href="#" class="float-right btn btn-outline-info btn-sm" id="grantButton" data-toggle="modal" data-target="#grantModal"><i class="fas fa-cog"></i> Admin</a>
+        @endif
+        Currencies
     </h3>
-    {!! Form::open(['url' => 'character/'.$character->slug.'/bank/transfer']) !!}
+    @if (count($currencies))
+        <div class="card mb-4">
+            <ul class="list-group list-group-flush">
+
+                @foreach ($currencies as $currency)
+                    <li class="list-group-item">
+                        <div class="row">
+                            <div class="col-lg-2 col-md-3 col-6 text-right">
+                                <strong>
+                                    <a href="{{ $currency->url }}">
+                                        {{ $currency->name }}
+                                        @if ($currency->abbreviation)
+                                            ({{ $currency->abbreviation }})
+                                        @endif
+                                    </a>
+                                </strong>
+                            </div>
+                            <div class="col-lg-10 col-md-9 col-6">
+                                {{ $currency->quantity }} @if ($currency->has_icon)
+                                    {!! $currency->displayIcon !!}
+                                @endif
+                            </div>
+                        </div>
+                    </li>
+                @endforeach
+            </ul>
+        </div>
+    @else
+        <div class="card mb-4">
+            <div class="card-body">
+                No currencies owned.
+            </div>
+        </div>
+    @endif
+
+    @if (Auth::check() && Auth::user()->id == $character->user_id)
+        <h3>
+            Take/Give Currency
+        </h3>
+        {!! Form::open(['url' => 'character/' . $character->slug . '/bank/transfer']) !!}
         <div class="form-group">
             <div class="row">
                 <div class="col-md-6">
-                    <label>{{ Form::radio('action', 'take' , true, ['class' => 'take-button']) }} Take from Character</label>
+                    <label>{{ Form::radio('action', 'take', true, ['class' => 'take-button']) }} Take from Character</label>
                 </div>
                 <div class="col-md-6">
-                    <label>{{ Form::radio('action', 'give' , false, ['class' => 'give-button']) }} Give to Character</label>
+                    <label>{{ Form::radio('action', 'give', false, ['class' => 'give-button']) }} Give to Character</label>
                 </div>
             </div>
         </div>
@@ -80,35 +92,52 @@
         <div class="text-right">
             {!! Form::submit('Transfer', ['class' => 'btn btn-primary']) !!}
         </div>
-    {!! Form::close() !!}
-@endif
-<h3>Latest Activity</h3>
-<div class="row ml-md-2">
-  <div class="d-flex row flex-wrap col-12 mt-1 pt-1 px-0 ubt-bottom">
-    <div class="col-6 col-md-2 font-weight-bold">Sender</div>
-    <div class="col-6 col-md-2 font-weight-bold">Recipient</div>
-    <div class="col-6 col-md-2 font-weight-bold">Currency</div>
-    <div class="col-6 col-md-4 font-weight-bold">Log</div>
-    <div class="col-6 col-md-2 font-weight-bold">Date</div>
-  </div>
-    @foreach($logs as $log)
-        @include('user._currency_log_row', ['log' => $log, 'owner' => $character])
-    @endforeach
-</div>
-<div class="text-right">
-    <a href="{{ url($character->url.'/currency-logs') }}">View all...</a>
-</div>
+        {!! Form::close() !!}
+    @endif
 
-@if(Auth::check() && Auth::user()->hasPower('edit_inventories'))
-    <div class="modal fade" id="grantModal" tabindex="-1" role="dialog">
-        <div class="modal-dialog" role="document">
-            <div class="modal-content">
-                <div class="modal-header">
-                    <span class="modal-title h5 mb-0">[ADMIN] Grant/remove currency</span>
-                    <button type="button" class="close" data-dismiss="modal">&times;</button>
+    <h3>Latest Activity</h3>
+    <div class="mb-4 logs-table">
+        <div class="logs-table-header">
+            <div class="row">
+                <div class="col-6 col-md-2">
+                    <div class="logs-table-cell">Sender</div>
+                </div>
+                <div class="col-6 col-md-2">
+                    <div class="logs-table-cell">Recipient</div>
+                </div>
+                <div class="col-6 col-md-2">
+                    <div class="logs-table-cell">Currency</div>
+                </div>
+                <div class="col-6 col-md-4">
+                    <div class="logs-table-cell">Log</div>
+                </div>
+                <div class="col-6 col-md-2">
+                    <div class="logs-table-cell">Date</div>
+                </div>
+            </div>
+        </div>
+        <div class="logs-table-body">
+            @foreach ($logs as $log)
+                <div class="logs-table-row">
+                    @include('user._currency_log_row', ['log' => $log, 'owner' => $character])
                 </div>
-                <div class="modal-body">
-                    {!! Form::open(['url' => 'admin/character/'.$character->slug.'/grant']) !!}
+            @endforeach
+        </div>
+    </div>
+    <div class="text-right">
+        <a href="{{ url($character->url . '/currency-logs') }}">View all...</a>
+    </div>
+
+    @if (Auth::check() && Auth::user()->hasPower('edit_inventories'))
+        <div class="modal fade" id="grantModal" tabindex="-1" role="dialog">
+            <div class="modal-dialog" role="document">
+                <div class="modal-content">
+                    <div class="modal-header">
+                        <span class="modal-title h5 mb-0">[ADMIN] Grant/remove currency</span>
+                        <button type="button" class="close" data-dismiss="modal">&times;</button>
+                    </div>
+                    <div class="modal-body">
+                        {!! Form::open(['url' => 'admin/character/' . $character->slug . '/grant']) !!}
                         <div class="row">
                             <div class="col-md-6">
                                 <div class="form-group">
@@ -131,27 +160,26 @@
                         <div class="text-right">
                             {!! Form::submit('Submit', ['class' => 'btn btn-primary']) !!}
                         </div>
-                    {!! Form::close() !!}
+                        {!! Form::close() !!}
+                    </div>
                 </div>
             </div>
         </div>
-    </div>
-@endif
-
+    @endif
 @endsection
 
 @section('scripts')
-@parent
-<script>
-    $(document).ready(function(){
-        $('.take-button').on('click', function() {
-            $('.take').removeClass('hide');
-            $('.give').addClass('hide');
-        })
-        $('.give-button').on('click', function() {
-            $('.give').removeClass('hide');
-            $('.take').addClass('hide');
-        })
-    });
-</script>
+    @parent
+    <script>
+        $(document).ready(function() {
+            $('.take-button').on('click', function() {
+                $('.take').removeClass('hide');
+                $('.give').addClass('hide');
+            })
+            $('.give-button').on('click', function() {
+                $('.give').removeClass('hide');
+                $('.take').addClass('hide');
+            })
+        });
+    </script>
 @endsection
diff --git a/resources/views/character/character.blade.php b/resources/views/character/character.blade.php
index dfd853f3be..228894251c 100644
--- a/resources/views/character/character.blade.php
+++ b/resources/views/character/character.blade.php
@@ -1,60 +1,69 @@
 @extends('character.layout', ['isMyo' => $character->is_myo_slot])
 
-@section('profile-title') {{ $character->fullName }} @endsection
+@section('profile-title')
+    {{ $character->fullName }}
+@endsection
 
-@section('meta-img') {{ $character->image->thumbnailUrl }} @endsection
+@section('meta-img')
+    {{ $character->image->thumbnailUrl }}
+@endsection
 
 @section('profile-content')
-@if($character->is_myo_slot)
-{!! breadcrumbs(['MYO Slot Masterlist' => 'myos', $character->fullName => $character->url]) !!}
-@else
-{!! breadcrumbs([($character->category->masterlist_sub_id ? $character->category->sublist->name.' Masterlist' : 'Character masterlist') => ($character->category->masterlist_sub_id ? 'sublist/'.$character->category->sublist->key : 'masterlist' ), $character->fullName => $character->url]) !!}
-@endif
+    @if ($character->is_myo_slot)
+        {!! breadcrumbs(['MYO Slot Masterlist' => 'myos', $character->fullName => $character->url]) !!}
+    @else
+        {!! breadcrumbs([
+            $character->category->masterlist_sub_id ? $character->category->sublist->name . ' Masterlist' : 'Character masterlist' => $character->category->masterlist_sub_id ? 'sublist/' . $character->category->sublist->key : 'masterlist',
+            $character->fullName => $character->url,
+        ]) !!}
+    @endif
 
-@include('character._header', ['character' => $character])
+    @include('character._header', ['character' => $character])
 
-{{-- Main Image --}}
-<div class="row mb-3">
-    <div class="col-md-7">
-        <div class="text-center">
-            <a href="{{ $character->image->canViewFull(Auth::check() ? Auth::user() : null) && file_exists( public_path($character->image->imageDirectory.'/'.$character->image->fullsizeFileName)) ? $character->image->fullsizeUrl : $character->image->imageUrl }}" data-lightbox="entry" data-title="{{ $character->fullName }}">
-                <img src="{{ $character->image->canViewFull(Auth::check() ? Auth::user() : null) && file_exists( public_path($character->image->imageDirectory.'/'.$character->image->fullsizeFileName)) ? $character->image->fullsizeUrl : $character->image->imageUrl }}" class="image" alt="{{ $character->fullName }}" />
-            </a>
+    {{-- Main Image --}}
+    <div class="row mb-3">
+        <div class="col-md-7">
+            <div class="text-center">
+                <a href="{{ $character->image->canViewFull(Auth::check() ? Auth::user() : null) && file_exists(public_path($character->image->imageDirectory . '/' . $character->image->fullsizeFileName)) ? $character->image->fullsizeUrl : $character->image->imageUrl }}"
+                    data-lightbox="entry" data-title="{{ $character->fullName }}">
+                    <img src="{{ $character->image->canViewFull(Auth::check() ? Auth::user() : null) && file_exists(public_path($character->image->imageDirectory . '/' . $character->image->fullsizeFileName)) ? $character->image->fullsizeUrl : $character->image->imageUrl }}"
+                        class="image" alt="{{ $character->fullName }}" />
+                </a>
+            </div>
+            @if ($character->image->canViewFull(Auth::check() ? Auth::user() : null) && file_exists(public_path($character->image->imageDirectory . '/' . $character->image->fullsizeFileName)))
+                <div class="text-right">You are viewing the full-size image. <a href="{{ $character->image->imageUrl }}">View watermarked image</a>?</div>
+            @endif
         </div>
-        @if($character->image->canViewFull(Auth::check() ? Auth::user() : null) && file_exists( public_path($character->image->imageDirectory.'/'.$character->image->fullsizeFileName)))
-            <div class="text-right">You are viewing the full-size image. <a href="{{ $character->image->imageUrl }}">View watermarked image</a>?</div>
-        @endif
+        @include('character._image_info', ['image' => $character->image])
     </div>
-    @include('character._image_info', ['image' => $character->image])
-</div>
 
-{{-- Info --}}
-<div class="card character-bio">
-    <div class="card-header">
-        <ul class="nav nav-tabs card-header-tabs">
-            <li class="nav-item">
-                <a class="nav-link active" id="statsTab" data-toggle="tab" href="#stats" role="tab">Stats</a>
-            </li>
-            <li class="nav-item">
-                <a class="nav-link" id="notesTab" data-toggle="tab" href="#notes" role="tab">Description</a>
-            </li>
-            @if(Auth::check() && Auth::user()->hasPower('manage_characters'))
+    {{-- Info --}}
+    <div class="card character-bio">
+        <div class="card-header">
+            <ul class="nav nav-tabs card-header-tabs">
                 <li class="nav-item">
-                    <a class="nav-link" id="settingsTab" data-toggle="tab" href="#settings-{{ $character->slug }}" role="tab"><i class="fas fa-cog"></i></a>
+                    <a class="nav-link active" id="statsTab" data-toggle="tab" href="#stats" role="tab">Stats</a>
                 </li>
-            @endif
-        </ul>
-    </div>
-    <div class="card-body tab-content">
-        <div class="tab-pane fade show active" id="stats">
-            @include('character._tab_stats', ['character' => $character])
-        </div>
-        <div class="tab-pane fade" id="notes">
-            @include('character._tab_notes', ['character' => $character])
+                <li class="nav-item">
+                    <a class="nav-link" id="notesTab" data-toggle="tab" href="#notes" role="tab">Description</a>
+                </li>
+                @if (Auth::check() && Auth::user()->hasPower('manage_characters'))
+                    <li class="nav-item">
+                        <a class="nav-link" id="settingsTab" data-toggle="tab" href="#settings-{{ $character->slug }}" role="tab"><i class="fas fa-cog"></i></a>
+                    </li>
+                @endif
+            </ul>
         </div>
-        @if(Auth::check() && Auth::user()->hasPower('manage_characters'))
-            <div class="tab-pane fade" id="settings-{{ $character->slug }}">
-                {!! Form::open(['url' => $character->is_myo_slot ? 'admin/myo/'.$character->id.'/settings' : 'admin/character/'.$character->slug.'/settings']) !!}
+        <div class="card-body tab-content">
+            <div class="tab-pane fade show active" id="stats">
+                @include('character._tab_stats', ['character' => $character])
+            </div>
+            <div class="tab-pane fade" id="notes">
+                @include('character._tab_notes', ['character' => $character])
+            </div>
+            @if (Auth::check() && Auth::user()->hasPower('manage_characters'))
+                <div class="tab-pane fade" id="settings-{{ $character->slug }}">
+                    {!! Form::open(['url' => $character->is_myo_slot ? 'admin/myo/' . $character->id . '/settings' : 'admin/character/' . $character->slug . '/settings']) !!}
                     <div class="form-group">
                         {!! Form::checkbox('is_visible', 1, $character->is_visible, ['class' => 'form-check-input', 'data-toggle' => 'toggle']) !!}
                         {!! Form::label('is_visible', 'Is Visible', ['class' => 'form-check-label ml-3']) !!} {!! add_help('Turn this off to hide the character. Only mods with the Manage Masterlist power (that\'s you!) can view it - the owner will also not be able to see the character\'s page.') !!}
@@ -62,16 +71,15 @@
                     <div class="text-right">
                         {!! Form::submit('Edit', ['class' => 'btn btn-primary']) !!}
                     </div>
-                {!! Form::close() !!}
-                <hr />
-                <div class="text-right">
-                    <a href="#" class="btn btn-outline-danger btn-sm delete-character" data-slug="{{ $character->slug }}">Delete</a>
+                    {!! Form::close() !!}
+                    <hr />
+                    <div class="text-right">
+                        <a href="#" class="btn btn-outline-danger btn-sm delete-character" data-slug="{{ $character->slug }}">Delete</a>
+                    </div>
                 </div>
-            </div>
-        @endif
+            @endif
+        </div>
     </div>
-</div>
-
 @endsection
 
 @section('scripts')
diff --git a/resources/views/character/character_logs.blade.php b/resources/views/character/character_logs.blade.php
index 14ef90c929..a424a61d22 100644
--- a/resources/views/character/character_logs.blade.php
+++ b/resources/views/character/character_logs.blade.php
@@ -1,32 +1,50 @@
 @extends('character.layout', ['isMyo' => $character->is_myo_slot])
 
-@section('profile-title') {{ $character->fullName }}'s Change Log @endsection
+@section('profile-title')
+    {{ $character->fullName }}'s Change Log
+@endsection
 
-@section('meta-img') {{ $character->image->thumbnailUrl }} @endsection
+@section('meta-img')
+    {{ $character->image->thumbnailUrl }}
+@endsection
 
 @section('profile-content')
-@if($character->is_myo_slot)
-{!! breadcrumbs(['MYO Slot Masterlist' => 'myos', $character->fullName => $character->url, 'Change Log' => $character->url.'/change-log']) !!}
-@else
-{!! breadcrumbs([($character->category->masterlist_sub_id ? $character->category->sublist->name.' Masterlist' : 'Character masterlist') => ($character->category->masterlist_sub_id ? 'sublist/'.$character->category->sublist->key : 'masterlist' ), $character->fullName => $character->url, 'Change Log' => $character->url.'/change-log']) !!}
-@endif
-
-@include('character._header', ['character' => $character])
-
-<h3>Change Log</h3>
-
-{!! $logs->render() !!}
-<div class="row ml-md-2 mb-4">
-  <div class="d-flex row flex-wrap col-12 mt-1 pt-1 px-0 ubt-bottom">
-    <div class="col-6 col-md-2 font-weight-bold">Edited By</div>
-    <div class="col-6 col-md-8 font-weight-bold">Log</div>
-    <div class="col-6 col-md-2 font-weight-bold">Date</div>
-  </div>
-  @foreach($logs as $log)
-      @include('character._character_log_row', ['log' => $log, 'character' => $character])
-  @endforeach
-
-</div>
-{!! $logs->render() !!}
-
+    @if ($character->is_myo_slot)
+        {!! breadcrumbs(['MYO Slot Masterlist' => 'myos', $character->fullName => $character->url, 'Change Log' => $character->url . '/change-log']) !!}
+    @else
+        {!! breadcrumbs([
+            $character->category->masterlist_sub_id ? $character->category->sublist->name . ' Masterlist' : 'Character masterlist' => $character->category->masterlist_sub_id ? 'sublist/' . $character->category->sublist->key : 'masterlist',
+            $character->fullName => $character->url,
+            'Change Log' => $character->url . '/change-log',
+        ]) !!}
+    @endif
+
+    @include('character._header', ['character' => $character])
+
+    <h3>Change Log</h3>
+
+    {!! $logs->render() !!}
+    <div class="mb-4 logs-table">
+        <div class="logs-table-header">
+            <div class="row">
+                <div class="col-6 col-md-2">
+                    <div class="logs-table-cell">Edited By</div>
+                </div>
+                <div class="col-6 col-md-8">
+                    <div class="logs-table-cell">Log</div>
+                </div>
+                <div class="col-6 col-md-2">
+                    <div class="logs-table-cell">Date</div>
+                </div>
+            </div>
+        </div>
+        <div class="logs-table-body">
+            @foreach ($logs as $log)
+                <div class="logs-table-row">
+                    @include('character._character_log_row', ['log' => $log, 'character' => $character])
+                </div>
+            @endforeach
+        </div>
+    </div>
+    {!! $logs->render() !!}
 @endsection
diff --git a/resources/views/character/currency_logs.blade.php b/resources/views/character/currency_logs.blade.php
index 8e8cab956f..ef05d947eb 100644
--- a/resources/views/character/currency_logs.blade.php
+++ b/resources/views/character/currency_logs.blade.php
@@ -1,30 +1,54 @@
 @extends('character.layout', ['isMyo' => $character->is_myo_slot])
 
-@section('profile-title') {{ $character->fullName }}'s Currency Logs @endsection
+@section('profile-title')
+    {{ $character->fullName }}'s Currency Logs
+@endsection
 
-@section('meta-img') {{ $character->image->thumbnailUrl }} @endsection
+@section('meta-img')
+    {{ $character->image->thumbnailUrl }}
+@endsection
 
 @section('profile-content')
-{!! breadcrumbs([($character->category->masterlist_sub_id ? $character->category->sublist->name.' Masterlist' : 'Character masterlist') => ($character->category->masterlist_sub_id ? 'sublist/'.$character->category->sublist->key : 'masterlist' ), $character->fullName => $character->url,  "Bank" => $character->url.'/bank', 'Logs' => $character->url.'/currency-logs']) !!}
-
-@include('character._header', ['character' => $character])
-
-<h3>Currency Logs</h3>
-
-{!! $logs->render() !!}
-
-<div class="row ml-md-2">
-  <div class="d-flex row flex-wrap col-12 mt-1 pt-1 px-0 ubt-bottom">
-    <div class="col-6 col-md-2 font-weight-bold">Sender</div>
-    <div class="col-6 col-md-2 font-weight-bold">Recipient</div>
-    <div class="col-6 col-md-2 font-weight-bold">Currency</div>
-    <div class="col-6 col-md-4 font-weight-bold">Log</div>
-    <div class="col-6 col-md-2 font-weight-bold">Date</div>
-  </div>
-    @foreach($logs as $log)
-        @include('user._currency_log_row', ['log' => $log, 'owner' => $character])
-    @endforeach
-</div>
-{!! $logs->render() !!}
-
+    {!! breadcrumbs([
+        $character->category->masterlist_sub_id ? $character->category->sublist->name . ' Masterlist' : 'Character masterlist' => $character->category->masterlist_sub_id ? 'sublist/' . $character->category->sublist->key : 'masterlist',
+        $character->fullName => $character->url,
+        'Bank' => $character->url . '/bank',
+        'Logs' => $character->url . '/currency-logs',
+    ]) !!}
+
+    @include('character._header', ['character' => $character])
+
+    <h3>Currency Logs</h3>
+
+    {!! $logs->render() !!}
+
+    <div class="mb-4 logs-table">
+        <div class="logs-table-header">
+            <div class="row">
+                <div class="col-6 col-md-2">
+                    <div class="logs-table-cell">Sender</div>
+                </div>
+                <div class="col-6 col-md-2">
+                    <div class="logs-table-cell">Recipient</div>
+                </div>
+                <div class="col-6 col-md-2">
+                    <div class="logs-table-cell">Currency</div>
+                </div>
+                <div class="col-6 col-md-4">
+                    <div class="logs-table-cell">Log</div>
+                </div>
+                <div class="col-6 col-md-2">
+                    <div class="logs-table-cell">Date</div>
+                </div>
+            </div>
+        </div>
+        <div class="logs-table-body">
+            @foreach ($logs as $log)
+                <div class="logs-table-row">
+                    @include('user._currency_log_row', ['log' => $log, 'owner' => $character])
+                </div>
+            @endforeach
+        </div>
+    </div>
+    {!! $logs->render() !!}
 @endsection
diff --git a/resources/views/character/design/_confirm_modal.blade.php b/resources/views/character/design/_confirm_modal.blade.php
index 4e4dd6afe1..1d7564875d 100644
--- a/resources/views/character/design/_confirm_modal.blade.php
+++ b/resources/views/character/design/_confirm_modal.blade.php
@@ -1,9 +1,9 @@
-@if($request->user_id == Auth::user()->id)
-    @if($request->isComplete)
+@if ($request->user_id == Auth::user()->id)
+    @if ($request->isComplete)
         <p>This will submit the design approval request. While the request is in the queue, <u>you will not be able to edit it</u>. </p>
         <p>Are you sure you want to submit this request?</p>
-        {!! Form::open(['url' => 'designs/'.$request->id.'/submit', 'class' => 'text-right']) !!}
-            {!! Form::submit('Submit Request', ['class' => 'btn btn-primary']) !!}
+        {!! Form::open(['url' => 'designs/' . $request->id . '/submit', 'class' => 'text-right']) !!}
+        {!! Form::submit('Submit Request', ['class' => 'btn btn-primary']) !!}
         {!! Form::close() !!}
     @else
         <p class="text-danger">Not all sections have been completed yet. Please visit the necessary tab(s) and click Save to update them, even if no modifications to the information are needed.</p>
@@ -11,6 +11,6 @@
             <button class="btn btn-primary" disabled>Submit Request</button>
         </div>
     @endif
-@else 
+@else
     <div>You cannot submit this request.</div>
-@endif
\ No newline at end of file
+@endif
diff --git a/resources/views/character/design/_delete_modal.blade.php b/resources/views/character/design/_delete_modal.blade.php
index d84d32b562..b1b8304b4b 100644
--- a/resources/views/character/design/_delete_modal.blade.php
+++ b/resources/views/character/design/_delete_modal.blade.php
@@ -1,13 +1,13 @@
-@if($request->user_id == Auth::user()->id)
-    @if($request->status == 'Draft')
+@if ($request->user_id == Auth::user()->id)
+    @if ($request->status == 'Draft')
         <p>This will delete the request and return all attached items/currency to you. </p>
         <p>Are you sure you want to delete this request?</p>
-        {!! Form::open(['url' => 'designs/'.$request->id.'/delete', 'class' => 'text-right']) !!}
-            {!! Form::submit('Delete Request', ['class' => 'btn btn-danger']) !!}
+        {!! Form::open(['url' => 'designs/' . $request->id . '/delete', 'class' => 'text-right']) !!}
+        {!! Form::submit('Delete Request', ['class' => 'btn btn-danger']) !!}
         {!! Form::close() !!}
     @else
         <p class="text-danger">This request has already been submitted to the queue and cannot be deleted.</p>
     @endif
-@else 
+@else
     <div>You cannot delete this request.</div>
-@endif
\ No newline at end of file
+@endif
diff --git a/resources/views/character/design/_header.blade.php b/resources/views/character/design/_header.blade.php
index 9c5adddcf7..be69c0b166 100644
--- a/resources/views/character/design/_header.blade.php
+++ b/resources/views/character/design/_header.blade.php
@@ -1,99 +1,116 @@
 <h1>
-    Request (#{{ $request->id }}): {!! $request->character ? $request->character->displayName : 'Deleted Character [#'.$request->character_id.']' !!}
-    <span class="float-right badge badge-{{ ($request->status == 'Draft' || $request->status == 'Pending') ? 'secondary' : ($request->status == 'Approved' ? 'success' : 'danger') }}">{{ $request->status }}
+    Request (#{{ $request->id }}): {!! $request->character ? $request->character->displayName : 'Deleted Character [#' . $request->character_id . ']' !!}
+    <span class="float-right badge badge-{{ $request->status == 'Draft' || $request->status == 'Pending' ? 'secondary' : ($request->status == 'Approved' ? 'success' : 'danger') }}">{{ $request->status }}
 </h1>
 
-@if(isset($request->staff_id))
-    @if($request->staff_comments && ($request->user_id == Auth::user()->id || Auth::user()->hasPower('manage_submissions')))
+@if (isset($request->staff_id))
+    @if ($request->staff_comments && ($request->user_id == Auth::user()->id || Auth::user()->hasPower('manage_characters')))
         <h5 class="text-danger">Staff Comments ({!! $request->staff->displayName !!})</h5>
-        <div class="card border-danger mb-3"><div class="card-body">{!! nl2br(htmlentities($request->staff_comments)) !!}</div></div>
+        <div class="card border-danger mb-3">
+            <div class="card-body">{!! nl2br(htmlentities($request->staff_comments)) !!}</div>
+        </div>
     @else
         <p>No staff comment was provided.</p>
     @endif
 @endif
 
-@if($request->status != 'Draft' && Auth::user()->hasPower('manage_characters') && Config::get('lorekeeper.extensions.design_update_voting'))
+@if ($request->status != 'Draft' && Auth::user()->hasPower('manage_characters') && config('lorekeeper.extensions.design_update_voting'))
     <?php
-        $rejectSum = 0;
-        $approveSum = 0;
-        foreach($request->voteData as $voter=>$vote) {
-            if($vote == 1) $rejectSum += 1;
-            if($vote == 2) $approveSum += 1;
+    $rejectSum = 0;
+    $approveSum = 0;
+    foreach ($request->voteData as $voter => $vote) {
+        if ($vote == 1) {
+            $rejectSum += 1;
         }
+        if ($vote == 2) {
+            $approveSum += 1;
+        }
+    }
     ?>
-    <div class="card mb-3"><div class="card-body">
-        <h5 class="text-left">{{$request->status == 'Pending' ? 'Vote' : 'Past Votes'}} on this {{ $request->update_type == 'MYO' ? 'MYO Submission' : 'Design Update' }}
-        @if($request->status == 'Pending')
-            <span class="text-right float-right">
-                <div class="row">
-                    <div class="col-sm-6 text-center text-danger">
-                        {{ $rejectSum }}/{{ Settings::get('design_votes_needed') }}
-                        {!! Form::open(['url' => 'admin/designs/vote/'.$request->id.'/reject', 'id' => 'voteRejectForm']) !!}
-                            <button class="btn {{ $request->voteData->get(Auth::user()->id) == 1 ? 'btn-danger' : 'btn-outline-danger' }}" style="min-width:40px;" data-action="reject"><i class="fas fa-times"></i></button>
-                        {!! Form::close() !!}
-                    </div>
-                    <div class="col-sm-6 text-center text-success">
-                        {{ $approveSum }}/{{ Settings::get('design_votes_needed') }}
-                        {!! Form::open(['url' => 'admin/designs/vote/'.$request->id.'/approve', 'id' => 'voteApproveForm']) !!}
-                            <button class="btn {{ $request->voteData->get(Auth::user()->id) == 2 ? 'btn-success' : 'btn-outline-success' }}" style="min-width:40px;" data-action="approve"><i class="fas fa-check"></i></button>
-                        {!! Form::close() !!}
-                    </div>
-                </div>
-            </span>
-        @endif
-        </h5>
+    <div class="card mb-3">
+        <div class="card-body">
+            <h5 class="text-left">{{ $request->status == 'Pending' ? 'Vote' : 'Past Votes' }} on this {{ $request->update_type == 'MYO' ? 'MYO Submission' : 'Design Update' }}
+                @if ($request->status == 'Pending')
+                    <span class="text-right float-right">
+                        <div class="row">
+                            <div class="col-sm-6 text-center text-danger">
+                                {{ $rejectSum }}/{{ Settings::get('design_votes_needed') }}
+                                {!! Form::open(['url' => 'admin/designs/vote/' . $request->id . '/reject', 'id' => 'voteRejectForm']) !!}
+                                <button class="btn {{ $request->voteData->get(Auth::user()->id) == 1 ? 'btn-danger' : 'btn-outline-danger' }}" style="min-width:40px;" data-action="reject"><i class="fas fa-times"></i></button>
+                                {!! Form::close() !!}
+                            </div>
+                            <div class="col-sm-6 text-center text-success">
+                                {{ $approveSum }}/{{ Settings::get('design_votes_needed') }}
+                                {!! Form::open(['url' => 'admin/designs/vote/' . $request->id . '/approve', 'id' => 'voteApproveForm']) !!}
+                                <button class="btn {{ $request->voteData->get(Auth::user()->id) == 2 ? 'btn-success' : 'btn-outline-success' }}" style="min-width:40px;" data-action="approve"><i class="fas fa-check"></i></button>
+                                {!! Form::close() !!}
+                            </div>
+                        </div>
+                    </span>
+                @endif
+            </h5>
             <p>
-                {{ $request->update_type == 'MYO' ? 'MYO Submissions' : 'Design updates' }} need {{ Settings::get('design_votes_needed') }} votes before they are considered approved. Note that this does not automatically process the submission in any case, only indicate a consensus.
+                {{ $request->update_type == 'MYO' ? 'MYO Submissions' : 'Design updates' }} need {{ Settings::get('design_votes_needed') }} votes before they are considered approved. Note that this does not automatically process the submission
+                in any case, only indicate a consensus.
             </p>
-        <hr/>
-        @if(isset($request->vote_data) && $request->vote_data)
-            <h4>Votes:</h4>
+            <hr />
+            @if (isset($request->vote_data) && $request->vote_data)
+                <h4>Votes:</h4>
                 <div class="row">
                     <div class="col-md">
                         <h5>Reject:</h5>
                         <ul>
-                        @foreach($request->voteData as $voter=>$vote)
-                            @if($vote == 1)
-                            <li>
-                                {!! App\Models\User\User::find($voter)->displayName !!} {{ $voter == Auth::user()->id ? '(you)' : '' }}
-                            </li>
-                            @endif
-                        @endforeach
+                            @foreach ($request->voteData as $voter => $vote)
+                                @if ($vote == 1)
+                                    <li>
+                                        {!! App\Models\User\User::find($voter)->displayName !!} {{ $voter == Auth::user()->id ? '(you)' : '' }}
+                                    </li>
+                                @endif
+                            @endforeach
                         </ul>
                     </div>
                     <div class="col-md">
                         <h5>Approve:</h5>
                         <ul>
-                        @foreach($request->voteData as $voter=>$vote)
-                            @if($vote == 2)
-                            <li>
-                                {!! App\Models\User\User::find($voter)->displayName !!} {{ $voter == Auth::user()->id ? '(you)' : '' }}
-                            </li>
-                            @endif
-                        @endforeach
+                            @foreach ($request->voteData as $voter => $vote)
+                                @if ($vote == 2)
+                                    <li>
+                                        {!! App\Models\User\User::find($voter)->displayName !!} {{ $voter == Auth::user()->id ? '(you)' : '' }}
+                                    </li>
+                                @endif
+                            @endforeach
                         </ul>
                     </div>
                 </div>
-        @else
-            <p>No votes have been cast yet!</p>
-        @endif
-    </div></div>
+            @else
+                <p>No votes have been cast yet!</p>
+            @endif
+        </div>
+    </div>
 @endif
 
 <ul class="nav nav-tabs mb-3">
     <li class="nav-item">
-        <a class="nav-link {{ set_active('designs/' . $request->id) }}" href="{{ url('designs/' . $request->id) }}">@if($request->is_complete)<i class="text-success fas fa-check-circle fa-fw mr-2"></i> @endif Status</a>
+        <a class="nav-link {{ set_active('designs/' . $request->id) }}" href="{{ url('designs/' . $request->id) }}">
+            @if ($request->is_complete)
+                <i class="text-success fas fa-check-circle fa-fw mr-2"></i>
+            @endif Status
+        </a>
     </li>
     <li class="nav-item">
-        <a class="nav-link {{ set_active('designs/' . $request->id . '/comments') }}" href="{{ url('designs/' . $request->id . '/comments') }}"><i class="text-{{ $request->has_comments ? 'success far fa-circle' : 'danger fas fa-times'  }} fa-fw mr-2"></i> Comments</a>
+        <a class="nav-link {{ set_active('designs/' . $request->id . '/comments') }}" href="{{ url('designs/' . $request->id . '/comments') }}"><i
+                class="text-{{ $request->has_comments ? 'success far fa-circle' : 'danger fas fa-times' }} fa-fw mr-2"></i> Comments</a>
     </li>
     <li class="nav-item">
-        <a class="nav-link {{ set_active('designs/' . $request->id . '/image') }}" href="{{ url('designs/' . $request->id . '/image') }}"><i class="text-{{ $request->has_image ? 'success far fa-circle' : 'danger fas fa-times'  }} fa-fw mr-2"></i> Masterlist Image</a>
+        <a class="nav-link {{ set_active('designs/' . $request->id . '/image') }}" href="{{ url('designs/' . $request->id . '/image') }}"><i class="text-{{ $request->has_image ? 'success far fa-circle' : 'danger fas fa-times' }} fa-fw mr-2"></i>
+            Masterlist Image</a>
     </li>
     <li class="nav-item">
-        <a class="nav-link {{ set_active('designs/' . $request->id . '/addons') }}" href="{{ url('designs/' . $request->id . '/addons') }}"><i class="text-{{ $request->has_addons ? 'success far fa-circle' : 'danger fas fa-times'  }} fa-fw mr-2"></i> Add-ons</a>
+        <a class="nav-link {{ set_active('designs/' . $request->id . '/addons') }}" href="{{ url('designs/' . $request->id . '/addons') }}"><i
+                class="text-{{ $request->has_addons ? 'success far fa-circle' : 'danger fas fa-times' }} fa-fw mr-2"></i> Add-ons</a>
     </li>
     <li class="nav-item">
-        <a class="nav-link {{ set_active('designs/' . $request->id . '/traits') }}" href="{{ url('designs/' . $request->id . '/traits') }}"><i class="text-{{ $request->has_features ? 'success far fa-circle' : 'danger fas fa-times'  }} fa-fw mr-2"></i> Traits</a>
+        <a class="nav-link {{ set_active('designs/' . $request->id . '/traits') }}" href="{{ url('designs/' . $request->id . '/traits') }}"><i
+                class="text-{{ $request->has_features ? 'success far fa-circle' : 'danger fas fa-times' }} fa-fw mr-2"></i> Traits</a>
     </li>
-</ul>
\ No newline at end of file
+</ul>
diff --git a/resources/views/character/design/_sidebar.blade.php b/resources/views/character/design/_sidebar.blade.php
index e78a382a9e..8eab1210eb 100644
--- a/resources/views/character/design/_sidebar.blade.php
+++ b/resources/views/character/design/_sidebar.blade.php
@@ -1,8 +1,8 @@
 <ul>
-    @if(isset($request))
+    @if (isset($request))
         <li class="sidebar-section">
             <div class="sidebar-section-header">Current Request</div>
-            <div class="sidebar-item"><a href="{{ $request->url }}" class="{{ set_active('designs/'.$request->id) }}">View</a></div>
+            <div class="sidebar-item"><a href="{{ $request->url }}" class="{{ set_active('designs/' . $request->id) }}">View</a></div>
             <div class="sidebar-item"><a href="{{ $request->url . '/comments' }}" class="{{ set_active('designs/' . $request->id . '/comments') }}">Comments</a></div>
             <div class="sidebar-item"><a href="{{ $request->url . '/image' }}" class="{{ set_active('designs/' . $request->id . '/image') }}">Image</a></div>
             <div class="sidebar-item"><a href="{{ $request->url . '/addons' }}" class="{{ set_active('designs/' . $request->id . '/addons') }}">Add-ons</a></div>
@@ -14,4 +14,4 @@
         <div class="sidebar-item"><a href="{{ url('designs') }}" class="{{ set_active('designs') }}">Drafts</a></div>
         <div class="sidebar-item"><a href="{{ url('designs/pending') }}" class="{{ set_active('designs/*') }}">Submissions</a></div>
     </li>
-</ul>
\ No newline at end of file
+</ul>
diff --git a/resources/views/character/design/addons.blade.php b/resources/views/character/design/addons.blade.php
index 16575e290b..4e5f2102c9 100644
--- a/resources/views/character/design/addons.blade.php
+++ b/resources/views/character/design/addons.blade.php
@@ -1,96 +1,102 @@
 @extends('character.design.layout')
 
-@section('design-title') Design Approval Request (#{{ $request->id }}) :: Comments @endsection
+@section('design-title')
+    Request (#{{ $request->id }}) :: Add-ons
+@endsection
 
 @section('design-content')
-{!! breadcrumbs(['Design Approvals' => 'designs', 'Request (#' . $request->id . ')' => 'designs/' . $request->id, 'Comments' => 'designs/' . $request->id . '/comments']) !!}
+    {!! breadcrumbs(['Design Approvals' => 'designs', 'Request (#' . $request->id . ')' => 'designs/' . $request->id, 'Add-ons' => 'designs/' . $request->id . '/addons']) !!}
 
-@include('character.design._header', ['request' => $request])
+    @include('character.design._header', ['request' => $request])
 
-<h2>Add-ons</h2>
+    <h2>Add-ons</h2>
 
-@if($request->status == 'Draft' && $request->user_id == Auth::user()->id && $request->character)
-    <p>Select items and/or currency to add onto your request. These items will be removed from your inventory{{ $request->character->is_myo_slot ? '' : ' and/or character' }} but refunded if removed from the request, the request is rejected, or the request is deleted. If you don't intend to attach any items/currency, click the Save button once to mark this section complete regardless.</p>
-    {!! Form::open(['url' => 'designs/'.$request->id.'/addons']) !!}
+    @if ($request->status == 'Draft' && $request->user_id == Auth::user()->id && $request->character)
+        <p>Select items and/or currency to add onto your request. These items will be removed from your inventory{{ $request->character->is_myo_slot ? '' : ' and/or character' }} but refunded if removed from the request, the request is rejected, or the
+            request is deleted. If you don't intend to attach any items/currency, click the Save button once to mark this section complete regardless.</p>
+        {!! Form::open(['url' => 'designs/' . $request->id . '/addons']) !!}
         @include('widgets._inventory_select', ['user' => Auth::user(), 'inventory' => $inventory, 'categories' => $categories, 'selected' => $request->inventory])
         @include('widgets._bank_select', ['owner' => Auth::user(), 'selected' => $request->userBank])
 
-        @if(!$request->character->is_myo_slot)
+        @if (!$request->character->is_myo_slot)
             @include('widgets._bank_select', ['owner' => $request->character, 'selected' => $request->characterBank])
         @endif
 
         <div class="text-right">
             {!! Form::submit('Save', ['class' => 'btn btn-primary']) !!}
         </div>
-    {!! Form::close() !!}
-@else
-    <p>Items and/or currency listed have been removed from their holders and will be refunded if the request is rejected.</p>
-    @if($inventory && count($inventory))
-        <h3>{!! $request->user->displayName !!}'s Inventory</h3>
-        <div class="card mb-3">
-            <div class="card-body">
-                <table class="table table-sm">
-                    <thead class="thead-light">
-                        <tr class="d-flex">
-                            <th class="col-2">Item</th>
-                            <th class="col-4">Source</th>
-                            <th class="col-4">Notes</th>
-                            <th class="col-2">Quantity</th>
-                        </tr>
-                    </thead>
-                    <tbody>
-                        @foreach($inventory['user_items'] as $itemRow)
+        {!! Form::close() !!}
+    @else
+        <p>Items and/or currency listed have been removed from their holders and will be refunded if the request is rejected.</p>
+        @if ($inventory && count($inventory))
+            <h3>{!! $request->user->displayName !!}'s Inventory</h3>
+            <div class="card mb-3">
+                <div class="card-body">
+                    <table class="table table-sm">
+                        <thead class="thead-light">
                             <tr class="d-flex">
-                                <td class="col-2">@if(isset($items[$itemRow['asset']->item_id]->image_url)) <img class="small-icon" src="{{ $items[$itemRow['asset']->item_id]->image_url }}" alt=" {{ $items[$itemRow['asset']->item_id]->name }} "> @endif {!! $items[$itemRow['asset']->item_id]->name !!}
-                                <td class="col-4">{!! array_key_exists('data', $itemRow['asset']->data) ? ($itemRow['asset']->data['data'] ? $itemRow['asset']->data['data'] : 'N/A') : 'N/A' !!}</td>
-                                <td class="col-4">{!! array_key_exists('notes', $itemRow['asset']->data) ? ($itemRow['asset']->data['notes'] ? $itemRow['asset']->data['notes'] : 'N/A') : 'N/A' !!}</td>
-                                <td class="col-2">{!! $itemRow['quantity'] !!}
+                                <th class="col-2">Item</th>
+                                <th class="col-4">Source</th>
+                                <th class="col-4">Notes</th>
+                                <th class="col-2">Quantity</th>
                             </tr>
-                        @endforeach
-                    </tbody>
-                </table>
+                        </thead>
+                        <tbody>
+                            @foreach ($inventory['user_items'] as $itemRow)
+                                <tr class="d-flex">
+                                    <td class="col-2">
+                                        @if (isset($itemRow['asset']) && isset($items[$itemRow['asset']->item_id]->image_url))
+                                            <img class="small-icon" src="{{ $items[$itemRow['asset']->item_id]->image_url }}" alt=" {{ $items[$itemRow['asset']->item_id]->name }} ">
+                                        @endif {!! isset($itemRow['asset']) ? $items[$itemRow['asset']->item_id]->name : '<i>Deleted User Item</i>' !!}
+                                    <td class="col-4">{!! isset($itemRow['asset']) && array_key_exists('data', $itemRow['asset']->data) ? ($itemRow['asset']->data['data'] ? $itemRow['asset']->data['data'] : 'N/A') : 'N/A' !!}</td>
+                                    <td class="col-4">{!! isset($itemRow['asset']) && array_key_exists('notes', $itemRow['asset']->data) ? ($itemRow['asset']->data['notes'] ? $itemRow['asset']->data['notes'] : 'N/A') : 'N/A' !!}</td>
+                                    <td class="col-2">{!! $itemRow['quantity'] !!}
+                                </tr>
+                            @endforeach
+                        </tbody>
+                    </table>
+                </div>
             </div>
-        </div>
-    @endif
-    @if(count($request->userBank))
-        <h3>{!! $request->user->displayName !!}'s Bank</h3>
-        <table class="table table-sm mb-3">
-            <thead>
-                <tr>
-                    <th width="70%">Currency</th>
-                    <th width="30%">Quantity</th>
-                </tr>
-            </thead>
-            <tbody>
-                @foreach($request->getBank('user') as $currency)
+        @endif
+        @if (count($request->userBank))
+            <h3>{!! $request->user->displayName !!}'s Bank</h3>
+            <table class="table table-sm mb-3">
+                <thead>
                     <tr>
-                        <td>{!! $currency->displayName !!}</td>
-                        <td>{{ $currency->quantity }}</td>
+                        <th width="70%">Currency</th>
+                        <th width="30%">Quantity</th>
                     </tr>
-                @endforeach
-            </tbody>
-        </table>
-    @endif
-    @if($request->character && count($request->characterBank))
-        <h3>{!! $request->character->displayName !!}'s Bank</h3>
-        <table class="table table-sm mb-3">
-            <thead>
-                <tr>
-                    <th width="70%">Currency</th>
-                    <th width="30%">Quantity</th>
-                </tr>
-            </thead>
-            <tbody>
-                @foreach($request->getBank('character') as $currency)
+                </thead>
+                <tbody>
+                    @foreach ($request->getBank('user') as $currency)
+                        <tr>
+                            <td>{!! $currency->displayName !!}</td>
+                            <td>{{ $currency->quantity }}</td>
+                        </tr>
+                    @endforeach
+                </tbody>
+            </table>
+        @endif
+        @if ($request->character && count($request->characterBank))
+            <h3>{!! $request->character->displayName !!}'s Bank</h3>
+            <table class="table table-sm mb-3">
+                <thead>
                     <tr>
-                        <td>{!! $currency->displayName !!}</td>
-                        <td>{{ $currency->quantity }}</td>
+                        <th width="70%">Currency</th>
+                        <th width="30%">Quantity</th>
                     </tr>
-                @endforeach
-            </tbody>
-        </table>
+                </thead>
+                <tbody>
+                    @foreach ($request->getBank('character') as $currency)
+                        <tr>
+                            <td>{!! $currency->displayName !!}</td>
+                            <td>{{ $currency->quantity }}</td>
+                        </tr>
+                    @endforeach
+                </tbody>
+            </table>
+        @endif
     @endif
-@endif
 
 @endsection
 
diff --git a/resources/views/character/design/comments.blade.php b/resources/views/character/design/comments.blade.php
index a799b8eeef..a008cef284 100644
--- a/resources/views/character/design/comments.blade.php
+++ b/resources/views/character/design/comments.blade.php
@@ -1,17 +1,19 @@
 @extends('character.design.layout')
 
-@section('design-title') Design Approval Request (#{{ $request->id }}) :: Comments @endsection
+@section('design-title')
+    Request (#{{ $request->id }}) :: Comments
+@endsection
 
 @section('design-content')
-{!! breadcrumbs(['Design Approvals' => 'designs', 'Request (#' . $request->id . ')' => 'designs/' . $request->id, 'Comments' => 'designs/' . $request->id . '/comments']) !!}
+    {!! breadcrumbs(['Design Approvals' => 'designs', 'Request (#' . $request->id . ')' => 'designs/' . $request->id, 'Comments' => 'designs/' . $request->id . '/comments']) !!}
 
-@include('character.design._header', ['request' => $request])
+    @include('character.design._header', ['request' => $request])
 
-<h2>Comments</h2>
+    <h2>Comments</h2>
 
-@if($request->status == 'Draft' && $request->user_id == Auth::user()->id)
-    <p>Enter an optional comment about your submission (e.g. calculations) that staff will consider when reviewing your request. If you don't have a comment, click the Save button once to mark this section complete regardless.</p>
-    {!! Form::open(['url' => 'designs/'.$request->id.'/comments']) !!}
+    @if ($request->status == 'Draft' && $request->user_id == Auth::user()->id)
+        <p>Enter an optional comment about your submission (e.g. calculations) that staff will consider when reviewing your request. If you don't have a comment, click the Save button once to mark this section complete regardless.</p>
+        {!! Form::open(['url' => 'designs/' . $request->id . '/comments']) !!}
         <div class="form-group">
             {!! Form::label('Comments (Optional)') !!}
             {!! Form::textarea('comments', $request->comments, ['class' => 'form-control']) !!}
@@ -19,13 +21,12 @@
         <div class="text-right">
             {!! Form::submit('Save', ['class' => 'btn btn-primary']) !!}
         </div>
-    {!! Form::close() !!}
-@else
-    <div class="card">
-        <div class="card-body">
-            {!! nl2br(htmlentities($request->comments)) !!}
+        {!! Form::close() !!}
+    @else
+        <div class="card">
+            <div class="card-body">
+                {!! nl2br(htmlentities($request->comments)) !!}
+            </div>
         </div>
-    </div>
-@endif
-
-@endsection
\ No newline at end of file
+    @endif
+@endsection
diff --git a/resources/views/character/design/features.blade.php b/resources/views/character/design/features.blade.php
index fcc3b8d0b8..f1be46d448 100644
--- a/resources/views/character/design/features.blade.php
+++ b/resources/views/character/design/features.blade.php
@@ -1,20 +1,25 @@
 @extends('character.design.layout')
 
-@section('design-title') Design Approval Request (#{{ $request->id }}) :: Comments @endsection
+@section('design-title')
+    Request (#{{ $request->id }}) :: Traits
+@endsection
 
 @section('design-content')
-{!! breadcrumbs(['Design Approvals' => 'designs', 'Request (#' . $request->id . ')' => 'designs/' . $request->id, 'Traits' => 'designs/' . $request->id . '/traits']) !!}
+    {!! breadcrumbs(['Design Approvals' => 'designs', 'Request (#' . $request->id . ')' => 'designs/' . $request->id, 'Traits' => 'designs/' . $request->id . '/traits']) !!}
 
-@include('character.design._header', ['request' => $request])
+    @include('character.design._header', ['request' => $request])
 
-<h2>Traits</h2>
+    <h2>
+        Traits</h2>
 
-@if($request->status == 'Draft' && $request->user_id == Auth::user()->id)
-    <p>Select the traits for the {{ $request->character->is_myo_slot ? 'created' : 'updated' }} character. @if($request->character->is_myo_slot) Some traits may have been restricted for you - you cannot change them. @endif Staff will not be able to modify these traits for you during approval, so if in doubt, please communicate with them beforehand to make sure that your design is acceptable.</p>
-    {!! Form::open(['url' => 'designs/'.$request->id.'/traits']) !!}
+    @if ($request->status == 'Draft' && $request->user_id == Auth::user()->id)
+        <p>Select the traits for the {{ $request->character->is_myo_slot ? 'created' : 'updated' }} character. @if ($request->character->is_myo_slot)
+                Some traits may have been restricted for you - you cannot change them.
+            @endif Staff will not be able to modify these traits for you during approval, so if in doubt, please communicate with them beforehand to make sure that your design is acceptable.</p>
+        {!! Form::open(['url' => 'designs/' . $request->id . '/traits']) !!}
         <div class="form-group">
             {!! Form::label('species_id', 'Species') !!}
-            @if($request->character->is_myo_slot && $request->character->image->species_id)
+            @if ($request->character->is_myo_slot && $request->character->image->species_id)
                 <div class="alert alert-secondary">{!! $request->character->image->species->displayName !!}</div>
             @else
                 {!! Form::select('species_id', $specieses, $request->species_id, ['class' => 'form-control', 'id' => 'species']) !!}
@@ -24,11 +29,11 @@
 
         <div class="form-group">
             {!! Form::label('subtype_id', 'Species Subtype') !!}
-            @if($request->character->is_myo_slot && $request->character->image->subtype_id)
+            @if ($request->character->is_myo_slot && $request->character->image->subtype_id)
                 <div class="alert alert-secondary">{!! $request->character->image->subtype->displayName !!}</div>
             @else
                 <div id="subtypes">
-                  {!! Form::select('subtype_id', $subtypes, $request->subtype_id, ['class' => 'form-control', 'id' => 'subtype']) !!}
+                    {!! Form::select('subtype_id', $subtypes, $request->subtype_id, ['class' => 'form-control', 'id' => 'subtype']) !!}
                 </div>
             @endif
 
@@ -36,7 +41,7 @@
 
         <div class="form-group">
             {!! Form::label('rarity_id', 'Character Rarity') !!}
-            @if($request->character->is_myo_slot && $request->character->image->rarity_id)
+            @if ($request->character->is_myo_slot && $request->character->image->rarity_id)
                 <div class="alert alert-secondary">{!! $request->character->image->rarity->displayName !!}</div>
             @else
                 {!! Form::select('rarity_id', $rarities, $request->rarity_id, ['class' => 'form-control', 'id' => 'rarity']) !!}
@@ -69,10 +74,11 @@
 
         <div class="form-group">
             {!! Form::label('Traits') !!}
+            <div><a href="#" class="btn btn-primary mb-2" id="add-feature">Add Trait</a></div>
             <div id="featureList">
                 {{-- Add in the compulsory traits for MYO slots --}}
-                @if($request->character->is_myo_slot && $request->character->image->features)
-                    @foreach($request->character->image->features as $feature)
+                @if ($request->character->is_myo_slot && $request->character->image->features)
+                    @foreach ($request->character->image->features as $feature)
                         <div class="mb-2 d-flex align-items-center">
                             {!! Form::text('', $feature->name, ['class' => 'form-control mr-2', 'disabled']) !!}
                             {!! Form::text('', $feature->data, ['class' => 'form-control mr-2', 'disabled']) !!}
@@ -82,17 +88,16 @@
                 @endif
 
                 {{-- Add in the ones that currently exist --}}
-                @if($request->features)
-                    @foreach($request->features as $feature)
+                @if ($request->features)
+                    @foreach ($request->features as $feature)
                         <div class="mb-2 d-flex">
-                            {!! Form::select('feature_id[]', $features, $feature->feature_id, ['class' => 'form-control mr-2 feature-select', 'placeholder' => 'Select Trait']) !!}
+                            {!! Form::select('feature_id[]', $features, $feature->feature_id, ['class' => 'form-control mr-2 initial feature-select', 'placeholder' => 'Select Trait']) !!}
                             {!! Form::text('feature_data[]', $feature->data, ['class' => 'form-control mr-2', 'placeholder' => 'Extra Info (Optional)']) !!}
                             <a href="#" class="remove-feature btn btn-danger mb-2">×</a>
                         </div>
                     @endforeach
                 @endif
             </div>
-            <div><a href="#" class="btn btn-primary" id="add-feature">Add Trait</a></div>
             <div class="feature-row hide mb-2">
                 {!! Form::select('feature_id[]', $features, null, ['class' => 'form-control mr-2 feature-select', 'placeholder' => 'Select Trait']) !!}
                 {!! Form::text('feature_data[]', null, ['class' => 'form-control mr-2', 'placeholder' => 'Extra Info (Optional)']) !!}
@@ -102,82 +107,103 @@
         <div class="text-right">
             {!! Form::submit('Save', ['class' => 'btn btn-primary']) !!}
         </div>
-    {!! Form::close() !!}
-@else
-    <div class="mb-1">
-        <div class="row">
-            <div class="col-md-2 col-4"><h5>Species</h5></div>
-            <div class="col-md-10 col-8">{!! $request->species ? $request->species->displayName : 'None Selected' !!}</div>
-        </div>
-        @if($request->subtype_id)
-        <div class="row">
-            <div class="col-md-2 col-4"><h5>Subtype</h5></div>
-            <div class="col-md-10 col-8">
-            @if($request->character->is_myo_slot && $request->character->image->subtype_id)
-                {!! $request->character->image->subtype->displayName !!}
-            @else
-                {!! $request->subtype_id ? $request->subtype->displayName : 'None Selected' !!}
-            @endif
+        {!! Form::close() !!}
+    @else
+        <div class="mb-1">
+            <div class="row">
+                <div class="col-md-2 col-4">
+                    <h5>Species</h5>
+                </div>
+                <div class="col-md-10 col-8">{!! $request->species ? $request->species->displayName : 'None Selected' !!}</div>
             </div>
-        </div>
-        @endif
-        <div class="row">
-            <div class="col-md-2 col-4"><h5>Rarity</h5></div>
-            <div class="col-md-10 col-8">{!! $request->rarity ? $request->rarity->displayName : 'None Selected' !!}</div>
-        </div>
-        @if(isset($request->title_id) || isset($request->title_data))
+            @if ($request->subtype_id)
+                <div class="row">
+                    <div class="col-md-2 col-4">
+                        <h5>Subtype</h5>
+                    </div>
+                    <div class="col-md-10 col-8">
+                        @if ($request->character->is_myo_slot && $request->character->image->subtype_id)
+                            {!! $request->character->image->subtype->displayName !!}
+                        @else
+                            {!! $request->subtype_id ? $request->subtype->displayName : 'None Selected' !!}
+                        @endif
+                    </div>
+                </div>
+            @endif
             <div class="row">
-                <div class="col-md-2 col-4"><h5>Title</h5></div>
-                <div class="col-md-10 col-8">{!! $request->title_id ? $request->title->displayNamePartial.(isset($request->title_data) ? ' ('.nl2br(htmlentities($request->title_data['full'])).')' : null) : (nl2br(htmlentities($request->title_data['full']))) !!}</div>
+                <div class="col-md-2 col-4">
+                    <h5>Rarity</h5>
+                </div>
+                <div class="col-md-10 col-8">{!! $request->rarity ? $request->rarity->displayName : 'None Selected' !!}</div>
             </div>
-        @endif
-    </div>
-    <h5>Traits</h5>
-    <div>
-        @if($request->character && $request->character->is_myo_slot && $request->character->image->features)
-            @foreach($request->character->image->features as $feature)
-                <div>@if($feature->feature->feature_category_id) <strong>{!! $feature->feature->category->displayName !!}:</strong> @endif {!! $feature->feature->displayName !!} @if($feature->data) ({{ $feature->data }}) @endif <span class="text-danger">*Required</span></div>
+            @if(isset($request->title_id) || isset($request->title_data))
+                <div class="row">
+                    <div class="col-md-2 col-4"><h5>Title</h5></div>
+                    <div class="col-md-10 col-8">{!! $request->title_id ? $request->title->displayNamePartial.(isset($request->title_data) ? ' ('.nl2br(htmlentities($request->title_data['full'])).')' : null) : (nl2br(htmlentities($request->title_data['full']))) !!}</div>
+                </div>
+            @endif
+        </div>
+        <h5>Traits</h5>
+        <div>
+            @if ($request->character && $request->character->is_myo_slot && $request->character->image->features)
+                @foreach ($request->character->image->features as $feature)
+                    <div>
+                        @if ($feature->feature->feature_category_id)
+                            <strong>{!! $feature->feature->category->displayName !!}:</strong>
+                            @endif {!! $feature->feature->displayName !!} @if ($feature->data)
+                                ({{ $feature->data }})
+                            @endif <span class="text-danger">*Required</span>
+                    </div>
+                @endforeach
+            @endif
+            @foreach ($request->features as $feature)
+                <div>
+                    @if ($feature->feature->feature_category_id)
+                        <strong>{!! $feature->feature->category->displayName !!}:</strong>
+                        @endif {!! $feature->feature->displayName !!} @if ($feature->data)
+                            ({{ $feature->data }})
+                        @endif
+                </div>
             @endforeach
-        @endif
-        @foreach($request->features as $feature)
-            <div>@if($feature->feature->feature_category_id) <strong>{!! $feature->feature->category->displayName !!}:</strong> @endif {!! $feature->feature->displayName !!} @if($feature->data) ({{ $feature->data }}) @endif</div>
-        @endforeach
-    </div>
-@endif
+        </div>
+    @endif
 
 @endsection
 
 @section('scripts')
-@include('widgets._image_upload_js')
-
-<script>
-    $(document).ready(function() {
-        var $title = $('#charTitle');
-        var $titleOptions = $('#titleOptions');
+    @include('widgets._image_upload_js')
+    <script>
+        $(document).ready(function() {
+            var $title = $('#charTitle');
+            var $titleOptions = $('#titleOptions');
 
-        var titleEntry = $title.val() != 0;
-
-        updateTitleEntry(titleEntry);
-
-        $title.on('change', function(e) {
             var titleEntry = $title.val() != 0;
-            updateTitleEntry(titleEntry);
-        });
 
-        function updateTitleEntry($show) {
-            if($show) $titleOptions.removeClass('hide');
-            else $titleOptions.addClass('hide');
-        }
-    });
+            updateTitleEntry(titleEntry);
 
-  $( "#species" ).change(function() {
-    var species = $('#species').val();
-    var id = '<?php echo($request->id); ?>';
-    $.ajax({
-      type: "GET", url: "{{ url('designs/traits/subtype') }}?species="+species+"&id="+id, dataType: "text"
-    }).done(function (res) { $("#subtypes").html(res); }).fail(function (jqXHR, textStatus, errorThrown) { alert("AJAX call failed: " + textStatus + ", " + errorThrown); });
+            $title.on('change', function(e) {
+                var titleEntry = $title.val() != 0;
+                updateTitleEntry(titleEntry);
+            });
 
-  });
-</script>
+            function updateTitleEntry($show) {
+                if($show) $titleOptions.removeClass('hide');
+                else $titleOptions.addClass('hide');
+            }
+        });
+        $("#species").change(function() {
+            var species = $('#species').val();
+            var id = '<?php echo $request->id; ?>';
+            $.ajax({
+                type: "GET",
+                url: "{{ url('designs/traits/subtype') }}?species=" + species + "&id=" + id,
+                dataType: "text"
+            }).done(function(res) {
+                $("#subtypes").html(res);
+            }).fail(function(jqXHR, textStatus, errorThrown) {
+                alert("AJAX call failed: " + textStatus + ", " + errorThrown);
+            });
 
+        });
+    </script>
 @endsection
diff --git a/resources/views/character/design/image.blade.php b/resources/views/character/design/image.blade.php
index b994da0799..112b2861e7 100644
--- a/resources/views/character/design/image.blade.php
+++ b/resources/views/character/design/image.blade.php
@@ -1,65 +1,74 @@
 @extends('character.design.layout')
 
-@section('design-title') Design Approval Request (#{{ $request->id }}) :: Image @endsection
+@section('design-title')
+    Request (#{{ $request->id }}) :: Image
+@endsection
 
 @section('design-content')
-{!! breadcrumbs(['Design Approvals' => 'designs', 'Request (#' . $request->id . ')' => 'designs/' . $request->id, 'Masterlist Image' => 'designs/' . $request->id . '/image']) !!}
+    {!! breadcrumbs(['Design Approvals' => 'designs', 'Request (#' . $request->id . ')' => 'designs/' . $request->id, 'Masterlist Image' => 'designs/' . $request->id . '/image']) !!}
 
-@include('character.design._header', ['request' => $request])
+    @include('character.design._header', ['request' => $request])
 
-<h2>Masterlist Image</h2>
+    <h2>Masterlist Image</h2>
 
-@if($request->has_image)
-    <div class="card mb-3">
-        <div class="card-body bg-secondary text-white">
-            <div class="row mb-3">
-                <div class="col-md-6">
-                    <h3 class="text-center">Main Image</h3>
-                    <div class="text-center">
-                        <a href="{{ $request->imageUrl }}"><img src="{{ $request->imageUrl }}" class="mw-100" alt="Request {{ $request->id }}" /></a>
+    @if ($request->has_image)
+        <div class="card mb-3">
+            <div class="card-body bg-secondary text-white">
+                <div class="row mb-3">
+                    <div class="col-md-6">
+                        <h3 class="text-center">Main Image</h3>
+                        <div class="text-center">
+                            <a href="{{ $request->imageUrl }}?v={{ $request->updated_at->timestamp }}" data-lightbox="entry" data-title="Request #{{ $request->id }}"><img src="{{ $request->imageUrl }}?v={{ $request->updated_at->timestamp }}" class="mw-100"
+                                    alt="Request {{ $request->id }}" /></a>
+                        </div>
                     </div>
-                </div>
-                <div class="col-md-6">
-                    <h3 class="text-center">Thumbnail Image</h3>
-                    <div class="text-center">
-                        <a href="{{ $request->thumbnailUrl }}"><img src="{{ $request->thumbnailUrl }}" class="mw-100" alt="Thumbnail for request {{ $request->id }}" /></a>
+                    <div class="col-md-6">
+                        <h3 class="text-center">Thumbnail Image</h3>
+                        <div class="text-center">
+                            <a href="{{ $request->thumbnailUrl }}?v={{ $request->updated_at->timestamp }}" data-lightbox="entry" data-title="Request #{{ $request->id }} thumbnail"><img
+                                    src="{{ $request->thumbnailUrl }}?v={{ $request->updated_at->timestamp }}" class="mw-100" alt="Thumbnail for request {{ $request->id }}" /></a>
+                        </div>
                     </div>
                 </div>
             </div>
-        </div>
 
-        @if(!($request->status == 'Draft' && $request->user_id == Auth::user()->id))
-            <div class="card-body">
-                <h4 class="mb-3">Credits</h4>
-                <div class="row">
-                    <div class="col-lg-4 col-md-6 col-4"><h5>Design</h5></div>
-                    <div class="col-lg-8 col-md-6 col-8">
-                        @foreach($request->designers as $designer)
-                            <div>{!! $designer->displayLink() !!}</div>
-                        @endforeach
+            @if (!($request->status == 'Draft' && $request->user_id == Auth::user()->id))
+                <div class="card-body">
+                    <h4 class="mb-3">Credits</h4>
+                    <div class="row">
+                        <div class="col-lg-4 col-md-6 col-4">
+                            <h5>Design</h5>
+                        </div>
+                        <div class="col-lg-8 col-md-6 col-8">
+                            @foreach ($request->designers as $designer)
+                                <div>{!! $designer->displayLink() !!}</div>
+                            @endforeach
+                        </div>
                     </div>
-                </div>
-                <div class="row">
-                    <div class="col-lg-4 col-md-6 col-4"><h5>Art</h5></div>
-                    <div class="col-lg-8 col-md-6 col-8">
-                        @foreach($request->artists as $artist)
-                            <div>{!! $artist->displayLink() !!}</div>
-                        @endforeach
+                    <div class="row">
+                        <div class="col-lg-4 col-md-6 col-4">
+                            <h5>Art</h5>
+                        </div>
+                        <div class="col-lg-8 col-md-6 col-8">
+                            @foreach ($request->artists as $artist)
+                                <div>{!! $artist->displayLink() !!}</div>
+                            @endforeach
+                        </div>
                     </div>
                 </div>
-            </div>
-        @endif
-    </div>
-@endif
-
-@if(($request->status == 'Draft' && $request->user_id == Auth::user()->id) || ($request->status == 'Pending' && Auth::user()->hasPower('manage_characters')))
-    @if($request->status == 'Draft' && $request->user_id == Auth::user()->id)
-        <p>Select the image you would like to use on the masterlist and an optional thumbnail. Please only upload images that you are allowed to use AND are able to credit to the artist! Note that while staff members cannot edit your uploaded image, they may choose to recrop or upload a different thumbnail.</p>
-    @else
-        <p>As a staff member, you may modify the thumbnail of the uploaded image and/or the credits, but not the image itself. If you have recropped the thumbnail, you may need to hard refresh to see the new one.</p>
+            @endif
+        </div>
     @endif
-    {!! Form::open(['url' => 'designs/'.$request->id.'/image', 'files' => true]) !!}
-        @if($request->status == 'Draft' && $request->user_id == Auth::user()->id)
+
+    @if (($request->status == 'Draft' && $request->user_id == Auth::user()->id) || ($request->status == 'Pending' && Auth::user()->hasPower('manage_characters')))
+        @if ($request->status == 'Draft' && $request->user_id == Auth::user()->id)
+            <p>Select the image you would like to use on the masterlist and an optional thumbnail. Please only upload images that you are allowed to use AND are able to credit to the artist! Note that while staff members cannot edit your uploaded image,
+                they may choose to recrop or upload a different thumbnail.</p>
+        @else
+            <p>As a staff member, you may modify the thumbnail of the uploaded image and/or the credits, but not the image itself. If you have recropped the thumbnail, you may need to hard refresh to see the new one.</p>
+        @endif
+        {!! Form::open(['url' => 'designs/' . $request->id . '/image', 'files' => true]) !!}
+        @if ($request->status == 'Draft' && $request->user_id == Auth::user()->id)
             <div class="form-group">
                 {!! Form::label('Image') !!} {!! add_help('This is the image that will be used on the masterlist. Note that the image is not protected in any way, so take precautions to avoid art/design theft.') !!}
                 <div>{!! Form::file('image', ['id' => 'mainImage']) !!}</div>
@@ -70,43 +79,49 @@
                 {!! Form::label('modify_thumbnail', 'Modify Thumbnail', ['class' => 'form-check-label ml-3']) !!} {!! add_help('Toggle this option to modify the thumbnail, otherwise only the credits will be saved.') !!}
             </div>
         @endif
-@if (Config::get('lorekeeper.settings.masterlist_image_automation') === 1)
-        <div class="form-group">
-            {!! Form::checkbox('use_cropper', 1, 1, ['class' => 'form-check-input', 'data-toggle' => 'toggle', 'id' => 'useCropper']) !!}
-            {!! Form::label('use_cropper', 'Use Thumbnail Automation', ['class' => 'form-check-label ml-3']) !!} {!! add_help('A thumbnail is required for the upload (used for the masterlist). You can use the Thumbnail Automation, or upload a custom thumbnail.') !!}
-        </div>
-        <div class="card mb-3" id="thumbnailCrop">
-            <div class="card-body">
-                <div id="cropSelect">By using this function, the thumbnail will be automatically generated from the full image.</div>
-                {!! Form::hidden('x0', 1) !!}
-                {!! Form::hidden('x1', 1) !!}
-                {!! Form::hidden('y0', 1) !!}
-                {!! Form::hidden('y1', 1) !!}
+        @if (config('lorekeeper.settings.masterlist_image_automation') === 1)
+            @if (config('lorekeeper.settings.masterlist_image_automation_hide_manual_thumbnail') === 0 || Auth::user()->hasPower('manage_characters'))
+                <div class="form-group">
+                    {!! Form::checkbox('use_cropper', 1, 1, ['class' => 'form-check-input', 'data-toggle' => 'toggle', 'id' => 'useCropper']) !!}
+                    {!! Form::label('use_cropper', 'Use Thumbnail Automation', ['class' => 'form-check-label ml-3']) !!} {!! add_help('A thumbnail is required for the upload (used for the masterlist). You can use the Thumbnail Automation, or upload a custom thumbnail.') !!}
+                </div>
+            @else
+                {!! Form::hidden('use_cropper', 1) !!}
+            @endif
+            <div class="card mb-3" id="thumbnailCrop">
+                <div class="card-body">
+                    <div id="cropSelect">By using this function, the thumbnail will be automatically generated from the full image.</div>
+                    {!! Form::hidden('x0', 1) !!}
+                    {!! Form::hidden('x1', 1) !!}
+                    {!! Form::hidden('y0', 1) !!}
+                    {!! Form::hidden('y1', 1) !!}
+                </div>
             </div>
-        </div>
-@else
-        <div class="form-group">
-            {!! Form::checkbox('use_cropper', 1, 1, ['class' => 'form-check-input', 'data-toggle' => 'toggle', 'id' => 'useCropper']) !!}
-            {!! Form::label('use_cropper', 'Use Image Cropper', ['class' => 'form-check-label ml-3']) !!} {!! add_help('A thumbnail is required for the upload (used for the masterlist). You can use the image cropper (crop dimensions can be adjusted in the site code), or upload a custom thumbnail.') !!}
-        </div>
-        <div class="card mb-3" id="thumbnailCrop">
-            <div class="card-body">
-                <div id="cropSelect">Select an image to use the thumbnail cropper.</div>
-                <img src="#" id="cropper" class="hide" alt="" />
-                {!! Form::hidden('x0', null, ['id' => 'cropX0']) !!}
-                {!! Form::hidden('x1', null, ['id' => 'cropX1']) !!}
-                {!! Form::hidden('y0', null, ['id' => 'cropY0']) !!}
-                {!! Form::hidden('y1', null, ['id' => 'cropY1']) !!}
+        @else
+            <div class="form-group">
+                {!! Form::checkbox('use_cropper', 1, 1, ['class' => 'form-check-input', 'data-toggle' => 'toggle', 'id' => 'useCropper']) !!}
+                {!! Form::label('use_cropper', 'Use Image Cropper', ['class' => 'form-check-label ml-3']) !!} {!! add_help('A thumbnail is required for the upload (used for the masterlist). You can use the image cropper (crop dimensions can be adjusted in the site code), or upload a custom thumbnail.') !!}
             </div>
-        </div>
-@endif
-        <div class="card mb-3" id="thumbnailUpload">
-            <div class="card-body">
-                {!! Form::label('Thumbnail Image') !!} {!! add_help('This image is shown on the masterlist page.') !!}
-                <div>{!! Form::file('thumbnail') !!}</div>
-                <div class="text-muted">Recommended size: {{ Config::get('lorekeeper.settings.masterlist_thumbnails.width') }}px x {{ Config::get('lorekeeper.settings.masterlist_thumbnails.height') }}px</div>
+            <div class="card mb-3" id="thumbnailCrop">
+                <div class="card-body">
+                    <div id="cropSelect">Select an image to use the thumbnail cropper.</div>
+                    <img src="{{ $request->imageUrl }}" id="cropper" class="hide" alt="" />
+                    {!! Form::hidden('x0', null, ['id' => 'cropX0']) !!}
+                    {!! Form::hidden('x1', null, ['id' => 'cropX1']) !!}
+                    {!! Form::hidden('y0', null, ['id' => 'cropY0']) !!}
+                    {!! Form::hidden('y1', null, ['id' => 'cropY1']) !!}
+                </div>
             </div>
-        </div>
+        @endif
+        @if (config('lorekeeper.settings.masterlist_image_automation') === 0 || config('lorekeeper.settings.masterlist_image_automation_hide_manual_thumbnail') === 0 || Auth::user()->hasPower('manage_characters'))
+            <div class="card mb-3" id="thumbnailUpload">
+                <div class="card-body">
+                    {!! Form::label('Thumbnail Image') !!} {!! add_help('This image is shown on the masterlist page.') !!}
+                    <div>{!! Form::file('thumbnail') !!}</div>
+                    <div class="text-muted">Recommended size: {{ config('lorekeeper.settings.masterlist_thumbnails.width') }}px x {{ config('lorekeeper.settings.masterlist_thumbnails.height') }}px</div>
+                </div>
+            </div>
+        @endif
         <p>
             This section is for crediting the image creators. The first box is for the designer or artist's on-site username (if any). The second is for a link to the designer or artist if they don't have an account on the site.
         </p>
@@ -114,70 +129,64 @@
             {!! Form::label('Designer(s)') !!}
             <div id="designerList">
                 <?php $designerCount = count($request->designers); ?>
-                @foreach($request->designers as $count=>$designer)
+                @foreach ($request->designers as $count => $designer)
                     <div class="mb-2 d-flex">
-                        {!! Form::select('designer_id['.$designer->id.']', $users, $designer->user_id, ['class'=> 'form-control mr-2 selectize', 'placeholder' => 'Select a Designer']) !!}
-                        {!! Form::text('designer_url['.$designer->id.']', $designer->url, ['class' => 'form-control mr-2', 'placeholder' => 'Designer URL']) !!}
+                        {!! Form::select('designer_id[' . $designer->id . ']', $users, $designer->user_id, ['class' => 'form-control mr-2 selectize', 'placeholder' => 'Select a Designer']) !!}
+                        {!! Form::text('designer_url[' . $designer->id . ']', $designer->url, ['class' => 'form-control mr-2', 'placeholder' => 'Designer URL']) !!}
 
-                        <a href="#" class="add-designer btn btn-link" data-toggle="tooltip" title="Add another designer"
-                        @if($count != $designerCount - 1)
-                            style="visibility: hidden;"
-                        @endif
-                        >+</a>
+                        <a href="#" class="add-designer btn btn-link" data-toggle="tooltip" title="Add another designer" @if ($count != $designerCount - 1) style="visibility: hidden;" @endif>+</a>
                     </div>
                 @endforeach
-                @if(!count($request->designers))
+                @if (!count($request->designers))
                     <div class="mb-2 d-flex">
-                        {!! Form::select('designer_id[]', $users, null, ['class'=> 'form-control mr-2 selectize', 'placeholder' => 'Select a Designer']) !!}
+                        {!! Form::select('designer_id[]', $users, null, ['class' => 'form-control mr-2 selectize', 'placeholder' => 'Select a Designer']) !!}
                         {!! Form::text('designer_url[]', null, ['class' => 'form-control mr-2', 'placeholder' => 'Designer URL']) !!}
                         <a href="#" class="add-designer btn btn-link" data-toggle="tooltip" title="Add another designer">+</a>
                     </div>
                 @endif
             </div>
-            <div class="designer-row hide mb-2">
-                {!! Form::select('designer_id[]', $users, null, ['class'=> 'form-control mr-2 designer-select', 'placeholder' => 'Select a Designer']) !!}
-                {!! Form::text('designer_url[]', null, ['class' => 'form-control mr-2', 'placeholder' => 'Designer URL']) !!}
-                <a href="#" class="add-designer btn btn-link" data-toggle="tooltip" title="Add another designer">+</a>
-            </div>
         </div>
         <div class="form-group">
             {!! Form::label('Artist(s)') !!}
             <div id="artistList">
                 <?php $artistCount = count($request->artists); ?>
-                @foreach($request->artists as $count=>$artist)
+                @foreach ($request->artists as $count => $artist)
                     <div class="mb-2 d-flex">
-                        {!! Form::select('artist_id['.$artist->id.']', $users, $artist->user_id, ['class'=> 'form-control mr-2 selectize', 'placeholder' => 'Select an Artist']) !!}
-                        {!! Form::text('artist_url['.$artist->id.']', $artist->url, ['class' => 'form-control mr-2', 'placeholder' => 'Artist URL']) !!}
-                        <a href="#" class="add-artist btn btn-link" data-toggle="tooltip" title="Add another artist"
-                        @if($count != $artistCount - 1)
-                            style="visibility: hidden;"
-                        @endif
-                        >+</a>
+                        {!! Form::select('artist_id[' . $artist->id . ']', $users, $artist->user_id, ['class' => 'form-control mr-2 selectize', 'placeholder' => 'Select an Artist']) !!}
+                        {!! Form::text('artist_url[' . $artist->id . ']', $artist->url, ['class' => 'form-control mr-2', 'placeholder' => 'Artist URL']) !!}
+                        <a href="#" class="add-artist btn btn-link" data-toggle="tooltip" title="Add another artist" @if ($count != $artistCount - 1) style="visibility: hidden;" @endif>+</a>
                     </div>
                 @endforeach
-                @if(!count($request->artists))
+                @if (!count($request->artists))
                     <div class="mb-2 d-flex">
-                        {!! Form::select('artist_id[]', $users, null, ['class'=> 'form-control mr-2 selectize', 'placeholder' => 'Select an Artist']) !!}
+                        {!! Form::select('artist_id[]', $users, null, ['class' => 'form-control mr-2 selectize', 'placeholder' => 'Select an Artist']) !!}
                         {!! Form::text('artist_url[]', null, ['class' => 'form-control mr-2', 'placeholder' => 'Artist URL']) !!}
                         <a href="#" class="add-artist btn btn-link" data-toggle="tooltip" title="Add another artist">+</a>
                     </div>
                 @endif
             </div>
-            <div class="artist-row hide mb-2">
-                {!! Form::select('artist_id[]', $users, null, ['class'=> 'form-control mr-2 artist-select', 'placeholder' => 'Select an Artist']) !!}
-                {!! Form::text('artist_url[]', null, ['class' => 'form-control mr-2', 'placeholder' => 'Artist URL']) !!}
-                <a href="#" class="add-artist btn btn-link mb-2" data-toggle="tooltip" title="Add another artist">+</a>
-            </div>
         </div>
         <div class="text-right">
             {!! Form::submit('Save', ['class' => 'btn btn-primary']) !!}
         </div>
 
-    {!! Form::close() !!}
-@endif
+        {!! Form::close() !!}
+    @endif
+
+
+    <div class="designer-row hide mb-2">
+        {!! Form::select('designer_id[]', $users, null, ['class' => 'form-control mr-2 designer-select', 'placeholder' => 'Select a Designer']) !!}
+        {!! Form::text('designer_url[]', null, ['class' => 'form-control mr-2', 'placeholder' => 'Designer URL']) !!}
+        <a href="#" class="add-designer btn btn-link" data-toggle="tooltip" title="Add another designer">+</a>
+    </div>
+    <div class="artist-row hide mb-2">
+        {!! Form::select('artist_id[]', $users, null, ['class' => 'form-control mr-2 artist-select', 'placeholder' => 'Select an Artist']) !!}
+        {!! Form::text('artist_url[]', null, ['class' => 'form-control mr-2', 'placeholder' => 'Artist URL']) !!}
+        <a href="#" class="add-artist btn btn-link mb-2" data-toggle="tooltip" title="Add another artist">+</a>
+    </div>
 
 @endsection
 
 @section('scripts')
-@include('widgets._image_upload_js', ['useUploaded' => ($request->status == 'Pending' && Auth::user()->hasPower('manage_characters'))])
+    @include('widgets._image_upload_js', ['useUploaded' => $request->status == 'Pending' && Auth::user()->hasPower('manage_characters')])
 @endsection
diff --git a/resources/views/character/design/index.blade.php b/resources/views/character/design/index.blade.php
index 26f6c21f17..809311d0ba 100644
--- a/resources/views/character/design/index.blade.php
+++ b/resources/views/character/design/index.blade.php
@@ -1,65 +1,68 @@
 @extends('character.design.layout')
 
-@section('design-title') Design Approvals @endsection
+@section('design-title')
+    Index
+@endsection
 
 @section('design-content')
-{!! breadcrumbs(['Design Approvals' => 'designs'] + ($status == 'draft' ? ['Drafts' => 'designs'] : ['Submissions' => 'designs/'.$status])) !!}
+    {!! breadcrumbs(['Design Approvals' => 'designs'] + ($status == 'draft' ? ['Drafts' => 'designs'] : ['Submissions' => 'designs/' . $status])) !!}
 
-@if($status == 'draft')
-    <h1>Design Approval Drafts</h1>
+    @if ($status == 'draft')
+        <h1>Design Approval Drafts</h1>
 
-    <p>Design approval requests allow you to submit updates to your character's design, or submit a finished design for a MYO slot. To create a new approval request, go to the character or MYO slot's page and choose "Update Design" from the sidebar.</p>
-@else
-    <h1>
-        Design Approvals
-    </h1>
+        <p>Design approval requests allow you to submit updates to your character's design, or submit a finished design for a MYO slot. To create a new approval request, go to the character or MYO slot's page and choose "Update Design" from the sidebar.
+        </p>
+    @else
+        <h1>
+            Design Approvals
+        </h1>
 
-    <p>This is a list of design approval requests you have submitted. These will be reviewed by staff, and approved if the design meets the requirements and guidelines. </p>
+        <p>This is a list of design approval requests you have submitted. These will be reviewed by staff, and approved if the design meets the requirements and guidelines. </p>
 
-    <ul class="nav nav-tabs mb-3">
-        <li class="nav-item">
-            <a class="nav-link {{ $status == 'pending' ? 'active' : '' }}" href="{{ url('designs/pending') }}">Pending</a>
-        </li>
-        <li class="nav-item">
-            <a class="nav-link {{ $status == 'approved' ? 'active' : '' }}" href="{{ url('designs/approved') }}">Approved</a>
-        </li>
-        <li class="nav-item">
-            <a class="nav-link {{ $status == 'rejected' ? 'active' : '' }}" href="{{ url('designs/rejected') }}">Rejected</a>
-        </li>
-    </ul>
-@endif
+        <ul class="nav nav-tabs mb-3">
+            <li class="nav-item">
+                <a class="nav-link {{ $status == 'pending' ? 'active' : '' }}" href="{{ url('designs/pending') }}">Pending</a>
+            </li>
+            <li class="nav-item">
+                <a class="nav-link {{ $status == 'approved' ? 'active' : '' }}" href="{{ url('designs/approved') }}">Approved</a>
+            </li>
+            <li class="nav-item">
+                <a class="nav-link {{ $status == 'rejected' ? 'active' : '' }}" href="{{ url('designs/rejected') }}">Rejected</a>
+            </li>
+        </ul>
+    @endif
 
-@if(count($requests))
-    {!! $requests->render() !!}
-    <table class="table table-sm">
-        <thead>
-            <tr>
-                <th>Character/MYO Slot</th>
-                <th width="20%">Submitted</th>
-                @if ($status != 'draft')
-                    <th width="20%">Status</th>
-                @endif
-                <th></th>
-            </tr>
-        </thead>
-        <tbody>
-            @foreach($requests as $r)
+    @if (count($requests))
+        {!! $requests->render() !!}
+        <table class="table table-sm">
+            <thead>
                 <tr>
-                    <td>{!! $r->character ? $r->character->displayName : 'Deleted Character [#'.$r->character_id.']' !!}</td>
-                    <td>{!! $r->submitted_at ? format_date($r->submitted_at) : '---' !!}</td>
-                    @if($status != 'draft')
-                        <td>
-                            <span class="badge badge-{{ $r->status == 'Pending' ? 'secondary' : ($r->status == 'Approved' ? 'success' : 'danger') }}">{{ $r->status }}</span>
-                        </td>
+                    <th>Character/MYO Slot</th>
+                    <th width="20%">Submitted</th>
+                    @if ($status != 'draft')
+                        <th width="20%">Status</th>
                     @endif
-                    <td class="text-right"><a href="{{ $r->url }}" class="btn btn-primary btn-sm">Details</a></td>
+                    <th></th>
                 </tr>
-            @endforeach
-        </tbody>
-    </table>
-    {!! $requests->render() !!}
-@else 
-    <p>No {{ 'requests' }} found.</p>
-@endif
+            </thead>
+            <tbody>
+                @foreach ($requests as $r)
+                    <tr>
+                        <td>{!! $r->character ? $r->character->displayName : 'Deleted Character [#' . $r->character_id . ']' !!}</td>
+                        <td>{!! $r->submitted_at ? format_date($r->submitted_at) : '---' !!}</td>
+                        @if ($status != 'draft')
+                            <td>
+                                <span class="badge badge-{{ $r->status == 'Pending' ? 'secondary' : ($r->status == 'Approved' ? 'success' : 'danger') }}">{{ $r->status }}</span>
+                            </td>
+                        @endif
+                        <td class="text-right"><a href="{{ $r->url }}" class="btn btn-primary btn-sm">Details</a></td>
+                    </tr>
+                @endforeach
+            </tbody>
+        </table>
+        {!! $requests->render() !!}
+    @else
+        <p>No {{ 'requests' }} found.</p>
+    @endif
 
-@endsection
\ No newline at end of file
+@endsection
diff --git a/resources/views/character/design/layout.blade.php b/resources/views/character/design/layout.blade.php
index b79f5e6be9..a1b1988854 100644
--- a/resources/views/character/design/layout.blade.php
+++ b/resources/views/character/design/layout.blade.php
@@ -1,6 +1,7 @@
 @extends('layouts.app')
 
-@section('title') 
+@section('title')
+    Design Approvals ::
     @yield('design-title')
 @endsection
 
@@ -13,5 +14,5 @@
 @endsection
 
 @section('scripts')
-@parent
-@endsection
\ No newline at end of file
+    @parent
+@endsection
diff --git a/resources/views/character/design/request.blade.php b/resources/views/character/design/request.blade.php
index 3456f48fdd..5663532170 100644
--- a/resources/views/character/design/request.blade.php
+++ b/resources/views/character/design/request.blade.php
@@ -1,90 +1,92 @@
 @extends('character.design.layout')
 
-@section('design-title') Design Approval Request (#{{ $request->id }}) @endsection
+@section('design-title')
+    Request (#{{ $request->id }})
+@endsection
 
 @section('design-content')
-{!! breadcrumbs(['Design Approvals' => 'designs', 'Request (#' . $request->id . ')' => 'designs/' . $request->id]) !!}
+    {!! breadcrumbs(['Design Approvals' => 'designs', 'Request (#' . $request->id . ')' => 'designs/' . $request->id]) !!}
 
-@include('character.design._header', ['request' => $request])
+    @include('character.design._header', ['request' => $request])
 
-@if($request->status == 'Draft')
-    <p>
-        This request has not been submitted to the approval queue yet. 
-        @if($request->user_id == Auth::user()->id)
-            Staff members are able to view this page when provided with a direct link. Click on any of the tabs to edit the section.
-        @else 
-            As a staff member with the ability to edit the masterlist, you can view the details of the request by clicking the tabs.
-        @endif
-    </p>
-    @if($request->user_id == Auth::user()->id)
-        @if($request->isComplete)
-            <div class="text-right">
-                <button class="btn btn-outline-danger delete-button">Delete Request</button> 
-                <a href="#" class="btn btn-outline-primary submit-button">Submit Request</a>
-            </div>
-        @else
-            <p class="text-danger">Not all sections have been completed yet. Please visit the necessary tab(s) and click Save to update them, even if no modifications to the information are needed.</p>
-            <div class="text-right">
-                <button class="btn btn-outline-danger delete-button">Delete Request</button>  
-                <button class="btn btn-outline-primary" disabled>Submit Request</button>
-            </div>
-        @endif
-    @endif
-@elseif($request->status == 'Pending')
-    <p>
-        This request is in the approval queue. 
-        @if(!Auth::user()->hasPower('manage_characters'))
-            Please wait for it to be processed.
-        @else 
-            As a staff member with the ability to edit the masterlist, you can view the details of the request, but can only edit certain parts of it.
+    @if ($request->status == 'Draft')
+        <p>
+            This request has not been submitted to the approval queue yet.
+            @if ($request->user_id == Auth::user()->id)
+                Staff members are able to view this page when provided with a direct link. Click on any of the tabs to edit the section.
+            @else
+                As a staff member with the ability to edit the masterlist, you can view the details of the request by clicking the tabs.
+            @endif
+        </p>
+        @if ($request->user_id == Auth::user()->id)
+            @if ($request->isComplete)
+                <div class="text-right">
+                    <button class="btn btn-outline-danger delete-button">Delete Request</button>
+                    <a href="#" class="btn btn-outline-primary submit-button">Submit Request</a>
+                </div>
+            @else
+                <p class="text-danger">Not all sections have been completed yet. Please visit the necessary tab(s) and click Save to update them, even if no modifications to the information are needed.</p>
+                <div class="text-right">
+                    <button class="btn btn-outline-danger delete-button">Delete Request</button>
+                    <button class="btn btn-outline-primary" disabled>Submit Request</button>
+                </div>
+            @endif
         @endif
-    </p>
-    @if(Auth::user()->hasPower('manage_characters'))
-        <div class="card mb-3">
-            <div class="card-body">
-                <a href="#" class="btn btn-outline-secondary process-button btn-sm float-right" data-action="cancel">Cancel</a>
-                <strong class="text-secondary">Cancelling</strong> the request returns it to its draft status, allowing the user to make further edits.
+    @elseif($request->status == 'Pending')
+        <p>
+            This request is in the approval queue.
+            @if (!Auth::user()->hasPower('manage_characters'))
+                Please wait for it to be processed.
+            @else
+                As a staff member with the ability to edit the masterlist, you can view the details of the request, but can only edit certain parts of it.
+            @endif
+        </p>
+        @if (Auth::user()->hasPower('manage_characters'))
+            <div class="card mb-3">
+                <div class="card-body">
+                    <a href="#" class="btn btn-outline-secondary process-button btn-sm float-right" data-action="cancel">Cancel</a>
+                    <strong class="text-secondary">Cancelling</strong> the request returns it to its draft status, allowing the user to make further edits.
+                </div>
             </div>
-        </div>
-        <div class="card mb-3">
-            <div class="card-body">
-                <a href="#" class="btn btn-outline-success process-button btn-sm float-right" data-action="approve">Approve</a>
-                <strong class="text-success">Approving</strong> the request creates the update.
+            <div class="card mb-3">
+                <div class="card-body">
+                    <a href="#" class="btn btn-outline-success process-button btn-sm float-right" data-action="approve">Approve</a>
+                    <strong class="text-success">Approving</strong> the request creates the update.
+                </div>
             </div>
-        </div>
-        <div class="card">
-            <div class="card-body">
-                <a href="#" class="btn btn-outline-danger process-button btn-sm float-right" data-action="reject">Reject</a>
-                <strong class="text-danger">Rejecting</strong> the update returns any attached items and the user may not edit it any more.
+            <div class="card">
+                <div class="card-body">
+                    <a href="#" class="btn btn-outline-danger process-button btn-sm float-right" data-action="reject">Reject</a>
+                    <strong class="text-danger">Rejecting</strong> the update returns any attached items and the user may not edit it any more.
+                </div>
             </div>
-        </div>
+        @endif
+    @elseif($request->status == 'Approved')
+        <p>This request has been approved. The data is preserved as a record of this submission.</p>
     @endif
-@elseif($request->status == 'Approved')
-    <p>This request has been approved. The data is preserved as a record of this submission.</p>
-@endif
 
 @endsection
 
 @section('scripts')
-<script>
-$(document).ready(function() {
-    @if($request->user_id == Auth::user()->id && $request->status == 'Draft')
-        $('.submit-button').on('click', function(e) {
-            e.preventDefault();
-            loadModal("{{ url('designs/'.$request->id.'/confirm/') }}", 'Confirm Submission');
-        });
-        $('.delete-button').on('click', function(e) {
-            e.preventDefault();
-            loadModal("{{ url('designs/'.$request->id.'/delete/') }}", 'Delete Submission');
-        });
-    @endif
+    <script>
+        $(document).ready(function() {
+            @if ($request->user_id == Auth::user()->id && $request->status == 'Draft')
+                $('.submit-button').on('click', function(e) {
+                    e.preventDefault();
+                    loadModal("{{ url('designs/' . $request->id . '/confirm/') }}", 'Confirm Submission');
+                });
+                $('.delete-button').on('click', function(e) {
+                    e.preventDefault();
+                    loadModal("{{ url('designs/' . $request->id . '/delete/') }}", 'Delete Submission');
+                });
+            @endif
 
-    @if(Auth::user()->hasPower('manage_characters'))
-        $('.process-button').on('click', function(e) {
-            e.preventDefault();
-            loadModal("{{ url('admin/designs/edit/'.$request->id) }}/" + $(this).data('action'), 'Confirm Action');
+            @if (Auth::user()->hasPower('manage_characters'))
+                $('.process-button').on('click', function(e) {
+                    e.preventDefault();
+                    loadModal("{{ url('admin/designs/edit/' . $request->id) }}/" + $(this).data('action'), 'Confirm Action');
+                });
+            @endif
         });
-    @endif
-});
-</script>
-@endsection
\ No newline at end of file
+    </script>
+@endsection
diff --git a/resources/views/character/edit_profile.blade.php b/resources/views/character/edit_profile.blade.php
index 214424382e..b80a1ddb77 100644
--- a/resources/views/character/edit_profile.blade.php
+++ b/resources/views/character/edit_profile.blade.php
@@ -1,73 +1,83 @@
 @extends('character.layout', ['isMyo' => $character->is_myo_slot])
 
-@section('profile-title') Editing {{ $character->fullName }}'s Profile @endsection
+@section('profile-title')
+    Editing {{ $character->fullName }}'s Profile
+@endsection
 
-@section('meta-img') {{ $character->image->thumbnailUrl }} @endsection
+@section('meta-img')
+    {{ $character->image->thumbnailUrl }}
+@endsection
 
 @section('profile-content')
-@if($character->is_myo_slot)
-{!! breadcrumbs(['MYO Slot Masterlist' => 'myos', $character->fullName => $character->url, 'Editing Profile' => $character->url . '/profile/edit']) !!}
-@else
-{!! breadcrumbs([($character->category->masterlist_sub_id ? $character->category->sublist->name.' Masterlist' : 'Character masterlist') => ($character->category->masterlist_sub_id ? 'sublist/'.$character->category->sublist->key : 'masterlist' ), $character->fullName => $character->url, 'Editing Profile' => $character->url . '/profile/edit']) !!}
-@endif
+    @if ($character->is_myo_slot)
+        {!! breadcrumbs(['MYO Slot Masterlist' => 'myos', $character->fullName => $character->url, 'Editing Profile' => $character->url . '/profile/edit']) !!}
+    @else
+        {!! breadcrumbs([
+            $character->category->masterlist_sub_id ? $character->category->sublist->name . ' Masterlist' : 'Character masterlist' => $character->category->masterlist_sub_id ? 'sublist/' . $character->category->sublist->key : 'masterlist',
+            $character->fullName => $character->url,
+            'Editing Profile' => $character->url . '/profile/edit',
+        ]) !!}
+    @endif
 
-@include('character._header', ['character' => $character])
+    @include('character._header', ['character' => $character])
 
-@if($character->user_id != Auth::user()->id)
-    <div class="alert alert-warning">
-        You are editing this character as a staff member.
-    </div>
-@endif
+    @if ($character->user_id != Auth::user()->id)
+        <div class="alert alert-warning">
+            You are editing this character as a staff member.
+        </div>
+    @endif
 
-{!! Form::open(['url' => $character->url . '/profile/edit']) !!}
-@if(!$character->is_myo_slot)
-    <div class="form-group">
-        {!! Form::label('name', 'Name') !!}
-        {!! Form::text('name', $character->name, ['class' => 'form-control']) !!}
-    </div>
-    @if(Config::get('lorekeeper.extensions.character_TH_profile_link'))
+    {!! Form::open(['url' => $character->url . '/profile/edit']) !!}
+    @if (!$character->is_myo_slot)
         <div class="form-group">
-            {!! Form::label('link', 'Profile Link') !!}
-            {!! Form::text('link', $character->profile->link, ['class' => 'form-control']) !!}
+            {!! Form::label('name', 'Name') !!}
+            {!! Form::text('name', $character->name, ['class' => 'form-control']) !!}
         </div>
+        @if (config('lorekeeper.extensions.character_TH_profile_link'))
+            <div class="form-group">
+                {!! Form::label('link', 'Profile Link') !!}
+                {!! Form::text('link', $character->profile->link, ['class' => 'form-control']) !!}
+            </div>
+        @endif
     @endif
-@endif
-<div class="form-group">
-    {!! Form::label('text', 'Profile Content') !!}
-    {!! Form::textarea('text', $character->profile->text, ['class' => 'wysiwyg form-control']) !!}
-</div>
+    <div class="form-group">
+        {!! Form::label('text', 'Profile Content') !!}
+        {!! Form::textarea('text', $character->profile->text, ['class' => 'wysiwyg form-control']) !!}
+    </div>
 
-@if($character->user_id == Auth::user()->id)
-    @if(!$character->is_myo_slot)
-        <div class="row">
-            <div class="col-md form-group">
-                {!! Form::label('is_gift_art_allowed', 'Allow Gift Art', ['class' => 'form-check-label mb-3']) !!} {!! add_help('This will place the character on the list of characters that can be drawn for gift art. This does not have any other functionality, but allow users looking for characters to draw to find your character easily.') !!}
-                {!! Form::select('is_gift_art_allowed', [0 => 'No', 1 => 'Yes', 2 => 'Ask First'], $character->is_gift_art_allowed, ['class' => 'form-control user-select']) !!}
+    @if ($character->user_id == Auth::user()->id)
+        @if (!$character->is_myo_slot)
+            <div class="row">
+                <div class="col-md form-group">
+                    {!! Form::label('is_gift_art_allowed', 'Allow Gift Art', ['class' => 'form-check-label mb-3']) !!} {!! add_help('This will place the character on the list of characters that can be drawn for gift art. This does not have any other functionality, but allow users looking for characters to draw to find your character easily.') !!}
+                    {!! Form::select('is_gift_art_allowed', [0 => 'No', 1 => 'Yes', 2 => 'Ask First'], $character->is_gift_art_allowed, ['class' => 'form-control user-select']) !!}
+                </div>
+                <div class="col-md form-group">
+                    {!! Form::label('is_gift_writing_allowed', 'Allow Gift Writing', ['class' => 'form-check-label mb-3']) !!} {!! add_help(
+                        'This will place the character on the list of characters that can be written about for gift writing. This does not have any other functionality, but allow users looking for characters to write about to find your character easily.',
+                    ) !!}
+                    {!! Form::select('is_gift_writing_allowed', [0 => 'No', 1 => 'Yes', 2 => 'Ask First'], $character->is_gift_writing_allowed, ['class' => 'form-control user-select']) !!}
+                </div>
             </div>
-            <div class="col-md form-group">
-                {!! Form::label('is_gift_writing_allowed', 'Allow Gift Writing', ['class' => 'form-check-label mb-3']) !!} {!! add_help('This will place the character on the list of characters that can be written about for gift writing. This does not have any other functionality, but allow users looking for characters to write about to find your character easily.') !!}
-                {!! Form::select('is_gift_writing_allowed', [0 => 'No', 1 => 'Yes', 2 => 'Ask First'], $character->is_gift_writing_allowed, ['class' => 'form-control user-select']) !!}
+        @endif
+        @if ($character->is_tradeable || $character->is_sellable)
+            <div class="form-group disabled">
+                {!! Form::checkbox('is_trading', 1, $character->is_trading, ['class' => 'form-check-input', 'data-toggle' => 'toggle']) !!}
+                {!! Form::label('is_trading', 'Up For Trade', ['class' => 'form-check-label ml-3']) !!} {!! add_help('This will place the character on the list of characters that are currently up for trade. This does not have any other functionality, but allow users looking for trades to find your character easily.') !!}
             </div>
-        </div>
+        @else
+            <div class="alert alert-secondary">Cannot be set to "Up for Trade" as character cannot be traded or sold.</div>
+        @endif
     @endif
-    @if($character->is_tradeable ||  $character->is_sellable)
-        <div class="form-group disabled">
-            {!! Form::checkbox('is_trading', 1, $character->is_trading, ['class' => 'form-check-input', 'data-toggle' => 'toggle']) !!}
-            {!! Form::label('is_trading', 'Up For Trade', ['class' => 'form-check-label ml-3']) !!} {!! add_help('This will place the character on the list of characters that are currently up for trade. This does not have any other functionality, but allow users looking for trades to find your character easily.') !!}
+    @if ($character->user_id != Auth::user()->id)
+        <div class="form-group">
+            {!! Form::checkbox('alert_user', 1, true, ['class' => 'form-check-input', 'data-toggle' => 'toggle', 'data-onstyle' => 'danger']) !!}
+            {!! Form::label('alert_user', 'Notify User', ['class' => 'form-check-label ml-3']) !!} {!! add_help('This will send a notification to the user that their character profile has been edited. A notification will not be sent if the character is not visible.') !!}
         </div>
-    @else 
-        <div class="alert alert-secondary">Cannot be set to "Up for Trade" as character cannot be traded or sold.</div>
     @endif
-@endif
-@if($character->user_id != Auth::user()->id)
-    <div class="form-group">
-        {!! Form::checkbox('alert_user', 1, true, ['class' => 'form-check-input', 'data-toggle' => 'toggle', 'data-onstyle' => 'danger']) !!}
-        {!! Form::label('alert_user', 'Notify User', ['class' => 'form-check-label ml-3']) !!} {!! add_help('This will send a notification to the user that their character profile has been edited. A notification will not be sent if the character is not visible.') !!}
+    <div class="text-right">
+        {!! Form::submit('Edit Profile', ['class' => 'btn btn-primary']) !!}
     </div>
-@endif
-<div class="text-right">
-    {!! Form::submit('Edit Profile', ['class' => 'btn btn-primary']) !!}
-</div>
-{!! Form::close() !!}
+    {!! Form::close() !!}
 
-@endsection
\ No newline at end of file
+@endsection
diff --git a/resources/views/character/gallery.blade.php b/resources/views/character/gallery.blade.php
index 8ace8bb3f7..ab0579e40d 100644
--- a/resources/views/character/gallery.blade.php
+++ b/resources/views/character/gallery.blade.php
@@ -1,32 +1,40 @@
 @extends('character.layout', ['isMyo' => $character->is_myo_slot])
 
-@section('profile-title') {{ $character->fullName }}'s Gallery @endsection
+@section('profile-title')
+    {{ $character->fullName }}'s Gallery
+@endsection
 
-@section('meta-img') {{ $character->image->thumbnailUrl }} @endsection
+@section('meta-img')
+    {{ $character->image->thumbnailUrl }}
+@endsection
 
 @section('profile-content')
-@if($character->is_myo_slot)
-{!! breadcrumbs(['MYO Slot Masterlist' => 'myos', $character->fullName => $character->url,  'Gallery' => $character->url . '/gallery']) !!}
-@else
-{!! breadcrumbs([($character->category->masterlist_sub_id ? $character->category->sublist->name.' Masterlist' : 'Character masterlist') => ($character->category->masterlist_sub_id ? 'sublist/'.$character->category->sublist->key : 'masterlist' ), $character->fullName => $character->url,  'Gallery' => $character->url . '/gallery']) !!}
-@endif
-
-@include('character._header', ['character' => $character])
-
-<p>These images are user-submitted and should not be confused with the official record of the character's design and history visible <a href="{{ url($character->url . '/images') }}">here</a>.</p>
-
-@if($character->gallerySubmissions->count())
-    {!! $submissions->render() !!}
-
-<div class="d-flex align-content-around flex-wrap mb-2">
-    @foreach($submissions as $submission)
-        @include('galleries._thumb', ['submission' => $submission, 'gallery' => false])
-    @endforeach
-</div>
-
-    {!! $submissions->render() !!}
-@else
-    <p>No submissions found!</p>
-@endif
+    @if ($character->is_myo_slot)
+        {!! breadcrumbs(['MYO Slot Masterlist' => 'myos', $character->fullName => $character->url, 'Gallery' => $character->url . '/gallery']) !!}
+    @else
+        {!! breadcrumbs([
+            $character->category->masterlist_sub_id ? $character->category->sublist->name . ' Masterlist' : 'Character masterlist' => $character->category->masterlist_sub_id ? 'sublist/' . $character->category->sublist->key : 'masterlist',
+            $character->fullName => $character->url,
+            'Gallery' => $character->url . '/gallery',
+        ]) !!}
+    @endif
+
+    @include('character._header', ['character' => $character])
+
+    <p>These images are user-submitted and should not be confused with the official record of the character's design and history visible <a href="{{ url($character->url . '/images') }}">here</a>.</p>
+
+    @if ($character->gallerySubmissions->count())
+        {!! $submissions->render() !!}
+
+        <div class="d-flex align-content-around flex-wrap mb-2">
+            @foreach ($submissions as $submission)
+                @include('galleries._thumb', ['submission' => $submission, 'gallery' => false])
+            @endforeach
+        </div>
+
+        {!! $submissions->render() !!}
+    @else
+        <p>No submissions found!</p>
+    @endif
 
 @endsection
diff --git a/resources/views/character/images.blade.php b/resources/views/character/images.blade.php
index cc743fc198..f67739b230 100644
--- a/resources/views/character/images.blade.php
+++ b/resources/views/character/images.blade.php
@@ -1,73 +1,87 @@
 @extends('character.layout', ['isMyo' => $character->is_myo_slot])
 
-@section('profile-title') {{ $character->fullName }}'s Images @endsection
+@section('profile-title')
+    {{ $character->fullName }}'s Images
+@endsection
 
-@section('meta-img') {{ $character->image->thumbnailUrl }} @endsection
+@section('meta-img')
+    {{ $character->image->thumbnailUrl }}
+@endsection
 
 @section('profile-content')
-{!! breadcrumbs([($character->category->masterlist_sub_id ? $character->category->sublist->name.' Masterlist' : 'Character masterlist') => ($character->category->masterlist_sub_id ? 'sublist/'.$character->category->sublist->key : 'masterlist' ), $character->fullName => $character->url, 'Images' => $character->url . '/images']) !!}
+    {!! breadcrumbs([
+        $character->category->masterlist_sub_id ? $character->category->sublist->name . ' Masterlist' : 'Character masterlist' => $character->category->masterlist_sub_id ? 'sublist/' . $character->category->sublist->key : 'masterlist',
+        $character->fullName => $character->url,
+        'Images' => $character->url . '/images',
+    ]) !!}
 
-@include('character._header', ['character' => $character])
+    @include('character._header', ['character' => $character])
 
-<div class="tab-content">
-    @foreach($character->images($user)->with('features.feature')->with('species')->with('rarity')->get() as $image)
-        <div class="tab-pane fade {{ $image->id == $character->character_image_id ? 'show active' : '' }}" id="image-{{ $image->id }}">
-            <div class="row mb-3">
-                <div class="col-md-7">
-                    <div class="text-center">
-                        <a href="{{ $image->canViewFull(Auth::check() ? Auth::user() : null) && file_exists( public_path($image->imageDirectory.'/'.$image->fullsizeFileName)) ? $image->fullsizeUrl : $image->imageUrl }}" data-lightbox="entry" data-title="{{ $character->fullName }} [#{{ $image->id }}] {{ $image->canViewFull(Auth::check() ? Auth::user() : null) && file_exists( public_path($image->imageDirectory.'/'.$image->fullsizeFileName)) ? ' : Full-size Image' : ''}}">
-                            <img src="{{ $image->canViewFull(Auth::check() ? Auth::user() : null) && file_exists( public_path($image->imageDirectory.'/'.$image->fullsizeFileName)) ? $image->fullsizeUrl : $image->imageUrl }}" class="image" alt="{{ $image->character->fullName }}" />
-                        </a>
+    <div class="tab-content">
+        @foreach ($character->images($user)->with('features.feature')->with('species')->with('rarity')->get() as $image)
+            <div class="tab-pane fade {{ $image->id == $character->character_image_id ? 'show active' : '' }}" id="image-{{ $image->id }}">
+                <div class="row mb-3">
+                    <div class="col-md-7">
+                        <div class="text-center">
+                            <a href="{{ $image->canViewFull(Auth::check() ? Auth::user() : null) && file_exists(public_path($image->imageDirectory . '/' . $image->fullsizeFileName)) ? $image->fullsizeUrl : $image->imageUrl }}" data-lightbox="entry"
+                                data-title="{{ $character->fullName }} [#{{ $image->id }}] {{ $image->canViewFull(Auth::check() ? Auth::user() : null) && file_exists(public_path($image->imageDirectory . '/' . $image->fullsizeFileName)) ? ' : Full-size Image' : '' }}">
+                                <img src="{{ $image->canViewFull(Auth::check() ? Auth::user() : null) && file_exists(public_path($image->imageDirectory . '/' . $image->fullsizeFileName)) ? $image->fullsizeUrl : $image->imageUrl }}" class="image"
+                                    alt="{{ $image->character->fullName }}" />
+                            </a>
+                        </div>
+                        @if ($image->canViewFull(Auth::check() ? Auth::user() : null) && file_exists(public_path($image->imageDirectory . '/' . $image->fullsizeFileName)))
+                            <div class="text-right">You are viewing the full-size image. <a href="{{ $image->imageUrl }}">View watermarked image</a>?</div>
+                        @endif
                     </div>
-                    @if($image->canViewFull(Auth::check() ? Auth::user() : null) && file_exists( public_path($image->imageDirectory.'/'.$image->fullsizeFileName)))
-                        <div class="text-right">You are viewing the full-size image. <a href="{{ $image->imageUrl }}">View watermarked image</a>?</div>
-                    @endif
+                    @include('character._image_info', ['image' => $image])
                 </div>
-                @include('character._image_info', ['image' => $image])
             </div>
-        </div>
-    @endforeach
-</div>
-<?php $canManage = Auth::check() && Auth::user()->hasPower('manage_characters'); ?>
-<h3>
-    Images
-    @if($canManage)
-        <a href="{{ url('admin/character/'.$character->slug.'/image') }}" class="float-right btn btn-outline-info btn-sm"><i class="fas fa-plus"></i> Add Image</a>
-    @endif
-</h3>
-
-<ul class="row nav image-nav mb-2" @if($canManage) id="sortable" @endif>
-    @foreach($character->images($user)->get() as $image)
-        <li class="col-md-3 col-6 text-center nav-item sort-item" data-id="{{ $image->id }}">
-            <a id="thumbnail-{{ $image->id }}" data-toggle="tab" href="#image-{{ $image->id }}" role="tab" class="{{ $image->id == $character->character_image_id ? 'active' : '' }}"><img src="{{ $image->thumbnailUrl }}" class="img-thumbnail" alt="Thumbnail for {{ $image->character->fullName }}"/></a>
-        </li>
-    @endforeach
-</ul>
-@if($canManage)
-    {!! Form::open(['url' => 'admin/character/' . $character->slug . '/images/sort', 'class' => 'text-right']) !!}
-    {!! Form::hidden('sort', '', ['id' => 'sortableOrder']) !!}
-    {!! Form::submit('Save Order', ['class' => 'btn btn-primary']) !!}
-    {!! Form::close() !!}
-@endif
+        @endforeach
+    </div>
+    <?php $canManage = Auth::check() && Auth::user()->hasPower('manage_characters'); ?>
+    <h3>
+        Images
+        @if ($canManage)
+            <a href="{{ url('admin/character/' . $character->slug . '/image') }}" class="float-right btn btn-outline-info btn-sm"><i class="fas fa-plus"></i> Add Image</a>
+        @endif
+    </h3>
 
+    <ul class="row nav image-nav mb-2" @if ($canManage) id="sortable" @endif>
+        @foreach ($character->images($user)->get() as $image)
+            <li class="col-md-3 col-6 text-center nav-item sort-item" data-id="{{ $image->id }}">
+                <a id="thumbnail-{{ $image->id }}" data-toggle="tab" href="#image-{{ $image->id }}" role="tab" class="{{ $image->id == $character->character_image_id ? 'active' : '' }}"><img src="{{ $image->thumbnailUrl }}"
+                        class="img-thumbnail" alt="Thumbnail for {{ $image->character->fullName }}" /></a>
+            </li>
+        @endforeach
+    </ul>
+    @if ($canManage)
+        {!! Form::open(['url' => 'admin/character/' . $character->slug . '/images/sort', 'class' => 'text-right']) !!}
+        {!! Form::hidden('sort', '', ['id' => 'sortableOrder']) !!}
+        {!! Form::submit('Save Order', ['class' => 'btn btn-primary']) !!}
+        {!! Form::close() !!}
+    @endif
 @endsection
 @section('scripts')
     @parent
     @include('character._image_js')
-    @if($canManage)
+    @if ($canManage)
         <script>
-            $( document ).ready(function() {
-                $( "#sortable" ).sortable({
+            $(document).ready(function() {
+                $("#sortable").sortable({
                     characters: '.sort-item',
                     placeholder: "sortable-placeholder",
-                    stop: function( event, ui ) {
-                        $('#sortableOrder').val($(this).sortable("toArray", {attribute:"data-id"}));
+                    stop: function(event, ui) {
+                        $('#sortableOrder').val($(this).sortable("toArray", {
+                            attribute: "data-id"
+                        }));
                     },
                     create: function() {
-                        $('#sortableOrder').val($(this).sortable("toArray", {attribute:"data-id"}));
+                        $('#sortableOrder').val($(this).sortable("toArray", {
+                            attribute: "data-id"
+                        }));
                     }
                 });
-                $( "#sortable" ).disableSelection();
+                $("#sortable").disableSelection();
             });
         </script>
     @endif
diff --git a/resources/views/character/inventory.blade.php b/resources/views/character/inventory.blade.php
index 4933e8dc7e..976c75eae7 100644
--- a/resources/views/character/inventory.blade.php
+++ b/resources/views/character/inventory.blade.php
@@ -1,177 +1,263 @@
 @extends('character.layout', ['isMyo' => $character->is_myo_slot])
 
-@section('profile-title') {{ $character->fullName }}'s Inventory @endsection
+@section('profile-title')
+    {{ $character->fullName }}'s Inventory
+@endsection
 
 @section('profile-content')
-@if($character->is_myo_slot)
-{!! breadcrumbs(['MYO Slot Masterlist' => 'myos', $character->fullName => $character->url, 'Inventory' => $character->url.'/inventory']) !!}
-@else
-{!! breadcrumbs([($character->category->masterlist_sub_id ? $character->category->sublist->name.' Masterlist' : 'Character masterlist') => ($character->category->masterlist_sub_id ? 'sublist/'.$character->category->sublist->key : 'masterlist' ), $character->fullName => $character->url, 'Inventory' => $character->url.'/inventory']) !!}
-@endif
+    @if ($character->is_myo_slot)
+        {!! breadcrumbs(['MYO Slot Masterlist' => 'myos', $character->fullName => $character->url, 'Inventory' => $character->url . '/inventory']) !!}
+    @else
+        {!! breadcrumbs([
+            $character->category->masterlist_sub_id ? $character->category->sublist->name . ' Masterlist' : 'Character masterlist' => $character->category->masterlist_sub_id ? 'sublist/' . $character->category->sublist->key : 'masterlist',
+            $character->fullName => $character->url,
+            'Inventory' => $character->url . '/inventory',
+        ]) !!}
+    @endif
 
-@include('character._header', ['character' => $character])
+    @include('character._header', ['character' => $character])
 
-<h3>
-    @if(Auth::check() && Auth::user()->hasPower('edit_inventories'))
-        <a href="#" class="float-right btn btn-outline-info btn-sm" id="grantButton" data-toggle="modal" data-target="#grantModal"><i class="fas fa-cog"></i> Admin</a>
-    @endif
-    Items
-</h3>
-
-@foreach($items as $categoryId=>$categoryItems)
-    <div class="card mb-3 inventory-category">
-        <h5 class="card-header inventory-header">
-            {!! isset($categories[$categoryId]) ? '<a href="'.$categories[$categoryId]->searchUrl.'">'.$categories[$categoryId]->name.'</a>' : 'Miscellaneous' !!}
-        </h5>
-        <div class="card-body inventory-body">
-            @foreach($categoryItems->chunk(4) as $chunk)
-                <div class="row mb-3">
-                    @foreach($chunk as $itemId=>$stack)
-                        <?php
-                            $canName = $stack->first()->category->can_name;
-                            $stackName = $stack->first()->pivot->pluck('stack_name', 'id')->toArray()[$stack->first()->pivot->id];
-                            $stackNameClean = htmlentities($stackName);
-                        ?>
-                        <div class="col-sm-3 col-6 text-center inventory-item" data-id="{{ $stack->first()->pivot->id }}" data-name="{!! $canName && $stackName ? htmlentities($stackNameClean).' [' : null !!}{{ $character->name ? $character->name : $character->slug }}'s {{ $stack->first()->name }}{!! $canName && $stackName ? ']' : null !!}">
-                            <div class="mb-1">
-                                <a href="#" class="inventory-stack"><img src="{{ $stack->first()->imageUrl }}" alt="{{ $stack->first()->name }}"/></a>
-                            </div>
-                            <div class="{{ $canName ? 'text-muted' : '' }}">
-                                <a href="#" class="inventory-stack inventory-stack-name">{{ $stack->first()->name }} x{{ $stack->sum('pivot.count') }}</a>
-                            </div>
-                            @if($canName && $stackName)
-                                <div>
-                                    <span class="inventory-stack inventory-stack-name badge badge-info" style="font-size:95%; margin:5px;">"{{ $stackName }}"</span>
+    <h3>
+        @if (Auth::check() && Auth::user()->hasPower('edit_inventories'))
+            <a href="#" class="float-right btn btn-outline-info btn-sm" id="grantButton" data-toggle="modal" data-target="#grantModal"><i class="fas fa-cog"></i> Admin</a>
+        @endif
+        Items
+    </h3>
+
+    <div class="text-right mb-3">
+        <div class="btn-group">
+            <button type="button" class="btn btn-secondary active def-view-button" data-toggle="tooltip" title="Default View" alt="Default View"><i class="fas fa-th"></i></button>
+            <button type="button" class="btn btn-secondary sum-view-button" data-toggle="tooltip" title="Summarized View" alt="Summarized View"><i class="fas fa-bars"></i></button>
+        </div>
+    </div>
+
+    <div id="defView" class="hide">
+        @foreach ($items as $categoryId => $categoryItems)
+            <div class="card mb-3 inventory-category">
+                <h5 class="card-header inventory-header">
+                    {!! isset($categories[$categoryId]) ? '<a href="' . $categories[$categoryId]->searchUrl . '">' . $categories[$categoryId]->name . '</a>' : 'Miscellaneous' !!}
+                    <a class="small inventory-collapse-toggle collapse-toggle" href="#categoryId_{!! isset($categories[$categoryId]) ? $categories[$categoryId]->id : 'miscellaneous' !!}" data-toggle="collapse">
+                        Show
+                    </a>
+                </h5>
+                <div class="card-body inventory-body collapse show" id="categoryId_{!! isset($categories[$categoryId]) ? $categories[$categoryId]->id : 'miscellaneous' !!}">
+                    @foreach ($categoryItems->chunk(4) as $chunk)
+                        <div class="row mb-3">
+                            @foreach ($chunk as $itemId => $stack)
+                                <?php
+                                $canName = $stack->first()->category->can_name;
+                                $stackName = $stack
+                                    ->first()
+                                    ->pivot->pluck('stack_name', 'id')
+                                    ->toArray()[$stack->first()->pivot->id];
+                                $stackNameClean = htmlentities($stackName);
+                                ?>
+                                <div class="col-sm-3 col-6 text-center inventory-item" data-id="{{ $stack->first()->pivot->id }}"
+                                    data-name="{!! $canName && $stackName ? htmlentities($stackNameClean) . ' [' : null !!}{{ $character->name ? $character->name : $character->slug }}'s {{ $stack->first()->name }}{!! $canName && $stackName ? ']' : null !!}">
+                                    <div class="mb-1">
+                                        <a href="#" class="inventory-stack">
+                                            <img src="{{ $stack->first()->imageUrl }}" alt="{{ $stack->first()->name }}" />
+                                        </a>
+                                    </div>
+                                    <div class="{{ $canName ? 'text-muted' : '' }}">
+                                        <a href="#" class="inventory-stack inventory-stack-name">
+                                            {{ $stack->first()->name }} x{{ $stack->sum('pivot.count') }}
+                                        </a>
+                                    </div>
+                                    @if ($canName && $stackName)
+                                        <div>
+                                            <span class="inventory-stack inventory-stack-name badge badge-info" style="font-size:95%; margin:5px;">"{{ $stackName }}"</span>
+                                        </div>
+                                    @endif
                                 </div>
+                            @endforeach
+                        </div>
+                    @endforeach
+                </div>
+            </div>
+        @endforeach
+    </div>
+
+    <div id="sumView" class="hide">
+        @foreach ($items as $categoryId => $categoryItems)
+            <div class="card mb-2">
+                <h5 class="card-header">
+                    {!! isset($categories[$categoryId]) ? '<a href="' . $categories[$categoryId]->searchUrl . '">' . $categories[$categoryId]->name . '</a>' : 'Miscellaneous' !!}
+                    <a class="small inventory-collapse-toggle collapse-toggle" href="#categoryId_{!! isset($categories[$categoryId]) ? $categories[$categoryId]->id : 'miscellaneous' !!}" data-toggle="collapse">
+                        Show
+                    </a>
+                </h5>
+                <div class="card-body p-2 collapse show row" id="categoryId_{!! isset($categories[$categoryId]) ? $categories[$categoryId]->id : 'miscellaneous' !!}">
+                    @foreach ($categoryItems as $itemtype)
+                        <div class="col-lg-3 col-sm-4 col-12">
+                            @if ($itemtype->first()->has_image)
+                                <img src="{{ $itemtype->first()->imageUrl }}" style="height: 25px;" alt="{{ $itemtype->first()->name }}" />
                             @endif
+                            <a href="{{ $itemtype->first()->idUrl }}">{{ $itemtype->first()->name }}</a>
+                            <ul class="mb-0">
+                                @foreach ($itemtype as $item)
+                                    <?php
+                                    $canName = $item->category->can_name;
+                                    $itemNames = $item->pivot->pluck('stack_name', 'id');
+                                    $stackName = $itemNames[$item->pivot->id];
+                                    $stackNameClean = htmlentities($stackName);
+                                    ?>
+                                    <div data-id="{{ $item->pivot->id }}" data-name="{!! $canName && $stackName ? htmlentities($stackNameClean) . ' [' : null !!}{{ $character->name ? $character->name : $character->slug }}'s {{ $item->name }}{!! $canName && $stackName ? ']' : null !!}">
+                                        <li>
+                                            <a class="inventory-stack" href="#">
+                                                Stack of x{{ $item->pivot->count }}.
+                                                @if ($canName && $stackName)
+                                                    <span class="text-info m-0" style="font-size:95%; margin:5px;" data-toggle="tooltip" data-placement="top" title='Named stack:<br />"{{ $stackName }}"'>
+                                                        &nbsp;<i class="fas fa-tag"></i>
+                                                    </span>
+                                                @endif
+                                            </a>
+                                        </li>
+                                    </div>
+                                @endforeach
+                            </ul>
                         </div>
                     @endforeach
                 </div>
+            </div>
+        @endforeach
+    </div>
+
+    <h3>Latest Activity</h3>
+    <div class="mb-4 logs-table">
+        <div class="logs-table-header">
+            <div class="row">
+                <div class="col-6 col-md-2">
+                    <div class="logs-table-cell">Sender</div>
+                </div>
+                <div class="col-6 col-md-2">
+                    <div class="logs-table-cell">Recipient</div>
+                </div>
+                <div class="col-6 col-md-2">
+                    <div class="logs-table-cell">Character</div>
+                </div>
+                <div class="col-6 col-md-4">
+                    <div class="logs-table-cell">Log</div>
+                </div>
+                <div class="col-6 col-md-2">
+                    <div class="logs-table-cell">Date</div>
+                </div>
+            </div>
+        </div>
+        <div class="logs-table-body">
+            @foreach ($logs as $log)
+                <div class="logs-table-row">
+                    @include('user._item_log_row', ['log' => $log, 'owner' => $character])
+                </div>
             @endforeach
         </div>
     </div>
-@endforeach
-
-<h3>Latest Activity</h3>
-<div class="row ml-md-2 mb-4">
-  <div class="d-flex row flex-wrap col-12 mt-1 pt-1 px-0 ubt-bottom">
-    <div class="col-6 col-md-2 font-weight-bold">Sender</div>
-    <div class="col-6 col-md-2 font-weight-bold">Recipient</div>
-    <div class="col-6 col-md-2 font-weight-bold">Character</div>
-    <div class="col-6 col-md-4 font-weight-bold">Log</div>
-    <div class="col-6 col-md-2 font-weight-bold">Date</div>
-  </div>
-      @foreach($logs as $log)
-          @include('user._item_log_row', ['log' => $log, 'owner' => $character])
-      @endforeach
-</div>
-<div class="text-right">
-    <a href="{{ url($character->url.'/item-logs') }}">View all...</a>
-</div>
-
-@if(Auth::check() && Auth::user()->hasPower('edit_inventories'))
-    <div class="modal fade" id="grantModal" tabindex="-1" role="dialog">
-        <div class="modal-dialog" role="document">
-            <div class="modal-content">
-                <div class="modal-header">
-                    <span class="modal-title h5 mb-0">[ADMIN] Grant Items</span>
-                    <button type="button" class="close" data-dismiss="modal">&times;</button>
-                </div>
-                <div class="modal-body">
-                <p>Note that granting items does not check against any category hold limits for characters.</p>
-                <div class="form-group">
-                {!! Form::open(['url' => 'admin/character/'.$character->slug.'/grant-items']) !!}
-
-                    {!! Form::label('Item(s)') !!} {!! add_help('Must have at least 1 item and Quantity must be at least 1.') !!}
-                    <div id="itemList">
-                        <div class="d-flex mb-2">
-                            {!! Form::select('item_ids[]', $itemOptions, null, ['class' => 'form-control mr-2 default item-select', 'placeholder' => 'Select Item']) !!}
-                            {!! Form::text('quantities[]', 1, ['class' => 'form-control mr-2', 'placeholder' => 'Quantity']) !!}
-                            <a href="#" class="remove-item btn btn-danger mb-2 disabled">×</a>
-                        </div>
-                    </div>
-                    <div><a href="#" class="btn btn-primary" id="add-item">Add Item</a></div>
-                    <div class="item-row hide mb-2">
-                        {!! Form::select('item_ids[]', $itemOptions, null, ['class' => 'form-control mr-2 item-select', 'placeholder' => 'Select Item']) !!}
-                        {!! Form::text('quantities[]', 1, ['class' => 'form-control mr-2', 'placeholder' => 'Quantity']) !!}
-                        <a href="#" class="remove-item btn btn-danger mb-2">×</a>
+    <div class="text-right">
+        <a href="{{ url($character->url . '/item-logs') }}">View all...</a>
+    </div>
+
+    @if (Auth::check() && Auth::user()->hasPower('edit_inventories'))
+        <div class="modal fade" id="grantModal" tabindex="-1" role="dialog">
+            <div class="modal-dialog" role="document">
+                <div class="modal-content">
+                    <div class="modal-header">
+                        <span class="modal-title h5 mb-0">[ADMIN] Grant Items</span>
+                        <button type="button" class="close" data-dismiss="modal">&times;</button>
                     </div>
+                    <div class="modal-body">
+                        <p>Note that granting items does not check against any category hold limits for characters.</p>
+                        <div class="form-group">
+                            {!! Form::open(['url' => 'admin/character/' . $character->slug . '/grant-items']) !!}
 
-                    <h5>Additional Data</h5>
+                            {!! Form::label('Item(s)') !!} {!! add_help('Must have at least 1 item and Quantity must be at least 1.') !!}
+                            <div id="itemList">
+                                <div class="d-flex mb-2">
+                                    {!! Form::select('item_ids[]', $itemOptions, null, ['class' => 'form-control mr-2 default item-select', 'placeholder' => 'Select Item']) !!}
+                                    {!! Form::text('quantities[]', 1, ['class' => 'form-control mr-2', 'placeholder' => 'Quantity']) !!}
+                                    <a href="#" class="remove-item btn btn-danger mb-2 disabled">×</a>
+                                </div>
+                            </div>
+                            <div><a href="#" class="btn btn-primary" id="add-item">Add Item</a></div>
+                            <div class="item-row hide mb-2">
+                                {!! Form::select('item_ids[]', $itemOptions, null, ['class' => 'form-control mr-2 item-select', 'placeholder' => 'Select Item']) !!}
+                                {!! Form::text('quantities[]', 1, ['class' => 'form-control mr-2', 'placeholder' => 'Quantity']) !!}
+                                <a href="#" class="remove-item btn btn-danger mb-2">×</a>
+                            </div>
 
-                    <div class="form-group">
-                        {!! Form::label('data', 'Reason (Optional)') !!} {!! add_help('A reason for the grant. This will be noted in the logs and in the inventory description.') !!}
-                        {!! Form::text('data', null, ['class' => 'form-control', 'maxlength' => 400]) !!}
-                    </div>
+                            <h5>Additional Data</h5>
 
-                    <div class="form-group">
-                        {!! Form::label('notes', 'Notes (Optional)') !!} {!! add_help('Additional notes for the item. This will appear in the item\'s description, but not in the logs.') !!}
-                        {!! Form::text('notes', null, ['class' => 'form-control', 'maxlength' => 400]) !!}
-                    </div>
+                            <div class="form-group">
+                                {!! Form::label('data', 'Reason (Optional)') !!} {!! add_help('A reason for the grant. This will be noted in the logs and in the inventory description.') !!}
+                                {!! Form::text('data', null, ['class' => 'form-control', 'maxlength' => 400]) !!}
+                            </div>
 
-                    <div class="form-group">
-                        {!! Form::checkbox('disallow_transfer', 1, 0, ['class' => 'form-check-input', 'data-toggle' => 'toggle']) !!}
-                        {!! Form::label('disallow_transfer', 'Character-bound', ['class' => 'form-check-label ml-3']) !!} {!! add_help('If this is on, the character\'s owner will not be able to transfer this item to their inventory. Items that disallow transfers by default will still not be transferrable.') !!}
-                    </div>
+                            <div class="form-group">
+                                {!! Form::label('notes', 'Notes (Optional)') !!} {!! add_help('Additional notes for the item. This will appear in the item\'s description, but not in the logs.') !!}
+                                {!! Form::text('notes', null, ['class' => 'form-control', 'maxlength' => 400]) !!}
+                            </div>
 
-                    <div class="text-right">
-                        {!! Form::submit('Submit', ['class' => 'btn btn-primary']) !!}
-                    </div>
+                            <div class="form-group">
+                                {!! Form::checkbox('disallow_transfer', 1, 0, ['class' => 'form-check-input', 'data-toggle' => 'toggle']) !!}
+                                {!! Form::label('disallow_transfer', 'Character-bound', ['class' => 'form-check-label ml-3']) !!} {!! add_help('If this is on, the character\'s owner will not be able to transfer this item to their inventory. Items that disallow transfers by default will still not be transferrable.') !!}
+                            </div>
 
-                {!! Form::close() !!}
+                            <div class="text-right">
+                                {!! Form::submit('Submit', ['class' => 'btn btn-primary']) !!}
+                            </div>
+
+                            {!! Form::close() !!}
+                        </div>
+                    </div>
                 </div>
             </div>
         </div>
-    </div>
-@endif
-
+    @endif
 @endsection
 
 @section('scripts')
+    @include('widgets._inventory_select_js', ['readOnly' => true])
+    @include('widgets._inventory_view_js')
+    <script>
+        $(document).ready(function() {
+            $('.inventory-stack').on('click', function(e) {
+                e.preventDefault();
+                var $parent = $(this).parent().parent();
+                loadModal("{{ url('items') }}/character/" + $parent.data('id'), $parent.data('name'));
+            });
 
-@include('widgets._inventory_select_js', ['readOnly' => true])
-
-<script>
-
-$( document ).ready(function() {
-    $('.inventory-stack').on('click', function(e) {
-        e.preventDefault();
-        var $parent = $(this).parent().parent();
-        loadModal("{{ url('items') }}/character/" + $parent.data('id'), $parent.data('name'));
-    });
-
-    $('.default.item-select').selectize();
-        $('#add-item').on('click', function(e) {
-            e.preventDefault();
-            addItemRow();
-        });
-        $('.remove-item').on('click', function(e) {
-            e.preventDefault();
-            removeItemRow($(this));
-        })
-        function addItemRow() {
-            var $rows = $("#itemList > div")
-            if($rows.length === 1) {
-                $rows.find('.remove-item').removeClass('disabled')
-            }
-            var $clone = $('.item-row').clone();
-            $('#itemList').append($clone);
-            $clone.removeClass('hide item-row');
-            $clone.addClass('d-flex');
-            $clone.find('.remove-item').on('click', function(e) {
+            $('.default.item-select').selectize();
+            $('#add-item').on('click', function(e) {
+                e.preventDefault();
+                addItemRow();
+            });
+            $('.remove-item').on('click', function(e) {
                 e.preventDefault();
                 removeItemRow($(this));
             })
-            $clone.find('.item-select').selectize();
-        }
-        function removeItemRow($trigger) {
-            $trigger.parent().remove();
-            var $rows = $("#itemList > div")
-            if($rows.length === 1) {
-                $rows.find('.remove-item').addClass('disabled')
+
+            function addItemRow() {
+                var $rows = $("#itemList > div")
+                if ($rows.length === 1) {
+                    $rows.find('.remove-item').removeClass('disabled')
+                }
+                var $clone = $('.item-row').clone();
+                $('#itemList').append($clone);
+                $clone.removeClass('hide item-row');
+                $clone.addClass('d-flex');
+                $clone.find('.remove-item').on('click', function(e) {
+                    e.preventDefault();
+                    removeItemRow($(this));
+                })
+                $clone.find('.item-select').selectize();
             }
-        }
-});
 
-</script>
+            function removeItemRow($trigger) {
+                $trigger.parent().remove();
+                var $rows = $("#itemList > div")
+                if ($rows.length === 1) {
+                    $rows.find('.remove-item').addClass('disabled')
+                }
+            }
+        });
+    </script>
 @endsection
diff --git a/resources/views/character/item_logs.blade.php b/resources/views/character/item_logs.blade.php
index 6c84a63b4d..9f6c01b824 100644
--- a/resources/views/character/item_logs.blade.php
+++ b/resources/views/character/item_logs.blade.php
@@ -1,31 +1,53 @@
 @extends('character.layout', ['isMyo' => $character->is_myo_slot])
 
-@section('profile-title') {{ $character->fullName }}'s Item Logs @endsection
+@section('profile-title')
+    {{ $character->fullName }}'s Item Logs
+@endsection
 
 @section('profile-content')
-@if($character->is_myo_slot)
-{!! breadcrumbs(['MYO Slot Masterlist' => 'myos', $character->fullName => $character->url, 'Inventory' => $character->url.'/inventory', 'Logs' => $character->url.'/item-logs']) !!}
-@else
-{!! breadcrumbs([($character->category->masterlist_sub_id ? $character->category->sublist->name.' Masterlist' : 'Character masterlist') => ($character->category->masterlist_sub_id ? 'sublist/'.$character->category->sublist->key : 'masterlist' ), $character->fullName => $character->url, 'Inventory' => $character->url.'/inventory', 'Logs' => $character->url.'/item-logs']) !!}
-@endif
-
-@include('character._header', ['character' => $character])
+    @if ($character->is_myo_slot)
+        {!! breadcrumbs(['MYO Slot Masterlist' => 'myos', $character->fullName => $character->url, 'Inventory' => $character->url . '/inventory', 'Logs' => $character->url . '/item-logs']) !!}
+    @else
+        {!! breadcrumbs([
+            $character->category->masterlist_sub_id ? $character->category->sublist->name . ' Masterlist' : 'Character masterlist' => $character->category->masterlist_sub_id ? 'sublist/' . $character->category->sublist->key : 'masterlist',
+            $character->fullName => $character->url,
+            'Inventory' => $character->url . '/inventory',
+            'Logs' => $character->url . '/item-logs',
+        ]) !!}
+    @endif
 
-<h3>Item Logs</h3>
+    @include('character._header', ['character' => $character])
 
-{!! $logs->render() !!}
-<div class="row ml-md-2 mb-4">
-  <div class="d-flex row flex-wrap col-12 mt-1 pt-1 px-0 ubt-bottom">
-    <div class="col-6 col-md-2 font-weight-bold">Sender</div>
-    <div class="col-6 col-md-2 font-weight-bold">Recipient</div>
-    <div class="col-6 col-md-2 font-weight-bold">Item</div>
-    <div class="col-6 col-md-4 font-weight-bold">Log</div>
-    <div class="col-6 col-md-2 font-weight-bold">Date</div>
-  </div>
-    @foreach($logs as $log)
-        @include('user._item_log_row', ['log' => $log, 'owner' => $character])
-    @endforeach
-</div>
-{!! $logs->render() !!}
+    <h3>Item Logs</h3>
 
+    {!! $logs->render() !!}
+    <div class="mb-4 logs-table">
+        <div class="logs-table-header">
+            <div class="row">
+                <div class="col-6 col-md-2">
+                    <div class="logs-table-cell">Sender</div>
+                </div>
+                <div class="col-6 col-md-2">
+                    <div class="logs-table-cell">Recipient</div>
+                </div>
+                <div class="col-6 col-md-2">
+                    <div class="logs-table-cell">Item</div>
+                </div>
+                <div class="col-6 col-md-4">
+                    <div class="logs-table-cell">Log</div>
+                </div>
+                <div class="col-6 col-md-2">
+                    <div class="logs-table-cell">Date</div>
+                </div>
+            </div>
+        </div>
+        <div class="logs-table-body">
+            @foreach ($logs as $log)
+                <div class="logs-table-row">
+                    @include('user._item_log_row', ['log' => $log, 'owner' => $character])
+                </div>
+            @endforeach
+        </div>
+    </div>
+    {!! $logs->render() !!}
 @endsection
diff --git a/resources/views/character/layout.blade.php b/resources/views/character/layout.blade.php
index 13d8b8f4e3..2f81717469 100644
--- a/resources/views/character/layout.blade.php
+++ b/resources/views/character/layout.blade.php
@@ -1,9 +1,12 @@
 @extends('layouts.app')
 
-@section('title') Character ::@yield('profile-title')@endsection
+@section('title')
+    Character ::
+    @yield('profile-title')
+@endsection
 
 @section('sidebar')
-    @include('character.'.($isMyo ? 'myo.' : '').'_sidebar')
+    @include('character.' . ($isMyo ? 'myo.' : '') . '_sidebar')
 @endsection
 
 @section('content')
@@ -11,14 +14,15 @@
 @endsection
 
 @section('scripts')
-@parent
-<script>
-    $( document ).ready(function(){
-        $('.bookmark-button').on('click', function(e) {
-            e.preventDefault();
-            var $this = $(this);
-            loadModal($this.data('id') ? "{{ url('account/bookmarks/edit') }}" + '/' + $this.data('id') : "{{ url('account/bookmarks/create') }}?character_id=" + $this.data('character-id'), $this.data('id') ? 'Edit Bookmark' : 'Bookmark Character');
+    @parent
+    <script>
+        $(document).ready(function() {
+            $('.bookmark-button').on('click', function(e) {
+                e.preventDefault();
+                var $this = $(this);
+                loadModal($this.data('id') ? "{{ url('account/bookmarks/edit') }}" + '/' + $this.data('id') : "{{ url('account/bookmarks/create') }}?character_id=" + $this.data('character-id'), $this.data('id') ? 'Edit Bookmark' :
+                    'Bookmark Character');
+            });
         });
-    });
-</script>
-@endsection
\ No newline at end of file
+    </script>
+@endsection
diff --git a/resources/views/character/myo/_sidebar.blade.php b/resources/views/character/myo/_sidebar.blade.php
index 7c80c7e0a5..1c2828915b 100644
--- a/resources/views/character/myo/_sidebar.blade.php
+++ b/resources/views/character/myo/_sidebar.blade.php
@@ -2,21 +2,21 @@
     <li class="sidebar-header"><a href="{{ $character->url }}" class="card-link">{{ $character->fullName }}</a></li>
     <li class="sidebar-section">
         <div class="sidebar-section-header">Character</div>
-        <div class="sidebar-item"><a href="{{ $character->url . '/profile' }}" class="{{ set_active('myo/'.$character->id.'/profile') }}">Profile</a></div>
+        <div class="sidebar-item"><a href="{{ $character->url . '/profile' }}" class="{{ set_active('myo/' . $character->id . '/profile') }}">Profile</a></div>
     </li>
     <li class="sidebar-section">
         <div class="sidebar-section-header">History</div>
-        <div class="sidebar-item"><a href="{{ $character->url . '/change-log' }}" class="{{ set_active('myo/'.$character->id.'/change-log') }}">Change Log</a></div>
-        <div class="sidebar-item"><a href="{{ $character->url . '/ownership' }}" class="{{ set_active('myo/'.$character->id.'/ownership') }}">Ownership History</a></div>
+        <div class="sidebar-item"><a href="{{ $character->url . '/change-log' }}" class="{{ set_active('myo/' . $character->id . '/change-log') }}">Change Log</a></div>
+        <div class="sidebar-item"><a href="{{ $character->url . '/ownership' }}" class="{{ set_active('myo/' . $character->id . '/ownership') }}">Ownership History</a></div>
     </li>
-    @if(Auth::check() && (Auth::user()->id == $character->user_id || Auth::user()->hasPower('manage_characters')))
+    @if (Auth::check() && (Auth::user()->id == $character->user_id || Auth::user()->hasPower('manage_characters')))
         <li class="sidebar-section">
             <div class="sidebar-section-header">Settings</div>
-            <div class="sidebar-item"><a href="{{ $character->url . '/profile/edit' }}" class="{{ set_active('myo/'.$character->id.'/profile/edit') }}">Edit Profile</a></div>
-            <div class="sidebar-item"><a href="{{ $character->url . '/transfer' }}" class="{{ set_active('myo/'.$character->id.'/transfer') }}">Transfer</a></div>
-            @if(Auth::user()->id == $character->user_id)
-                <div class="sidebar-item"><a href="{{ $character->url . '/approval' }}" class="{{ set_active('myo/'.$character->id.'/approval') }}">Submit MYO Design</a></div>
+            <div class="sidebar-item"><a href="{{ $character->url . '/profile/edit' }}" class="{{ set_active('myo/' . $character->id . '/profile/edit') }}">Edit Profile</a></div>
+            <div class="sidebar-item"><a href="{{ $character->url . '/transfer' }}" class="{{ set_active('myo/' . $character->id . '/transfer') }}">Transfer</a></div>
+            @if (Auth::user()->id == $character->user_id)
+                <div class="sidebar-item"><a href="{{ $character->url . '/approval' }}" class="{{ set_active('myo/' . $character->id . '/approval') }}">Submit MYO Design</a></div>
             @endif
         </li>
     @endif
-</ul>
\ No newline at end of file
+</ul>
diff --git a/resources/views/character/myo/character.blade.php b/resources/views/character/myo/character.blade.php
index d154058b85..3a72657f58 100644
--- a/resources/views/character/myo/character.blade.php
+++ b/resources/views/character/myo/character.blade.php
@@ -1,49 +1,51 @@
 @extends('character.layout', ['isMyo' => true])
 
-@section('profile-title') {{ $character->fullName }} @endsection
+@section('profile-title')
+    {{ $character->fullName }}
+@endsection
 
 @section('profile-content')
-{!! breadcrumbs(['MYO Slot Masterlist' => 'myos', $character->fullName => $character->url]) !!}
+    {!! breadcrumbs(['MYO Slot Masterlist' => 'myos', $character->fullName => $character->url]) !!}
 
-@include('character._header', ['character' => $character])
+    @include('character._header', ['character' => $character])
 
-{{-- Main Image --}}
-<div class="row mb-3">
-    <div class="text-center col-md-7">
-        <a href="{{ $character->image->imageUrl }}" data-lightbox="entry" data-title="{{ $character->fullName }}">
-            <img src="{{ $character->image->imageUrl }}" class="image" alt="{{ $character->fullName }}" />
-        </a>
+    {{-- Main Image --}}
+    <div class="row mb-3">
+        <div class="text-center col-md-7">
+            <a href="{{ $character->image->imageUrl }}" data-lightbox="entry" data-title="{{ $character->fullName }}">
+                <img src="{{ $character->image->imageUrl }}" class="image" alt="{{ $character->fullName }}" />
+            </a>
+        </div>
+        @include('character._image_info', ['image' => $character->image])
     </div>
-    @include('character._image_info', ['image' => $character->image])
-</div>
 
-{{-- Info --}}
-<div class="card character-bio">
-    <div class="card-header">
-        <ul class="nav nav-tabs card-header-tabs">
-            <li class="nav-item">
-                <a class="nav-link active" id="statsTab" data-toggle="tab" href="#stats" role="tab">Stats</a>
-            </li>
-            <li class="nav-item">
-                <a class="nav-link" id="notesTab" data-toggle="tab" href="#notes" role="tab">Description</a>
-            </li>
-            @if(Auth::check() && Auth::user()->hasPower('manage_characters'))
+    {{-- Info --}}
+    <div class="card character-bio">
+        <div class="card-header">
+            <ul class="nav nav-tabs card-header-tabs">
                 <li class="nav-item">
-                    <a class="nav-link" id="settingsTab" data-toggle="tab" href="#settings-all" role="tab"><i class="fas fa-cog"></i></a>
+                    <a class="nav-link active" id="statsTab" data-toggle="tab" href="#stats" role="tab">Stats</a>
                 </li>
-            @endif
-        </ul>
-    </div>
-    <div class="card-body tab-content">
-        <div class="tab-pane fade show active" id="stats">
-            @include('character._tab_stats', ['character' => $character])
-        </div>
-        <div class="tab-pane fade" id="notes">
-            @include('character._tab_notes', ['character' => $character])
+                <li class="nav-item">
+                    <a class="nav-link" id="notesTab" data-toggle="tab" href="#notes" role="tab">Description</a>
+                </li>
+                @if (Auth::check() && Auth::user()->hasPower('manage_characters'))
+                    <li class="nav-item">
+                        <a class="nav-link" id="settingsTab" data-toggle="tab" href="#settings-all" role="tab"><i class="fas fa-cog"></i></a>
+                    </li>
+                @endif
+            </ul>
         </div>
-        @if(Auth::check() && Auth::user()->hasPower('manage_characters'))
-            <div class="tab-pane fade" id="settings-all">
-                {!! Form::open(['url' => $character->is_myo_slot ? 'admin/myo/'.$character->id.'/settings' : 'admin/character/'.$character->slug.'/settings']) !!}
+        <div class="card-body tab-content">
+            <div class="tab-pane fade show active" id="stats">
+                @include('character._tab_stats', ['character' => $character])
+            </div>
+            <div class="tab-pane fade" id="notes">
+                @include('character._tab_notes', ['character' => $character])
+            </div>
+            @if (Auth::check() && Auth::user()->hasPower('manage_characters'))
+                <div class="tab-pane fade" id="settings-all">
+                    {!! Form::open(['url' => $character->is_myo_slot ? 'admin/myo/' . $character->id . '/settings' : 'admin/character/' . $character->slug . '/settings']) !!}
                     <div class="form-group">
                         {!! Form::checkbox('is_visible', 1, $character->is_visible, ['class' => 'form-check-input', 'data-toggle' => 'toggle']) !!}
                         {!! Form::label('is_visible', 'Is Visible', ['class' => 'form-check-label ml-3']) !!} {!! add_help('Turn this off to hide the character. Only mods with the Manage Masterlist power (that\'s you!) can view it - the owner will also not be able to see the character\'s page.') !!}
@@ -51,16 +53,15 @@
                     <div class="text-right">
                         {!! Form::submit('Edit', ['class' => 'btn btn-primary']) !!}
                     </div>
-                {!! Form::close() !!}
-                <hr />
-                <div class="text-right">
-                    <a href="#" class="btn btn-outline-danger btn-sm delete-character" data-id="{{ $character->id }}">Delete</a>
+                    {!! Form::close() !!}
+                    <hr />
+                    <div class="text-right">
+                        <a href="#" class="btn btn-outline-danger btn-sm delete-character" data-id="{{ $character->id }}">Delete</a>
+                    </div>
                 </div>
-            </div>
-        @endif
+            @endif
+        </div>
     </div>
-</div>
-
 @endsection
 
 @section('scripts')
diff --git a/resources/views/character/ownership_logs.blade.php b/resources/views/character/ownership_logs.blade.php
index 45cd3e8389..b6674e2985 100644
--- a/resources/views/character/ownership_logs.blade.php
+++ b/resources/views/character/ownership_logs.blade.php
@@ -1,32 +1,53 @@
 @extends('character.layout', ['isMyo' => $character->is_myo_slot])
 
-@section('profile-title') {{ $character->fullName }}'s Ownership History @endsection
+@section('profile-title')
+    {{ $character->fullName }}'s Ownership History
+@endsection
 
-@section('meta-img') {{ $character->image->thumbnailUrl }} @endsection
+@section('meta-img')
+    {{ $character->image->thumbnailUrl }}
+@endsection
 
 @section('profile-content')
-@if($character->is_myo_slot)
-{!! breadcrumbs(['MYO Slot Masterlist' => 'myos', $character->fullName => $character->url, 'Ownership History' => $character->url.'/ownership']) !!}
-@else
-{!! breadcrumbs([($character->category->masterlist_sub_id ? $character->category->sublist->name.' Masterlist' : 'Character masterlist') => ($character->category->masterlist_sub_id ? 'sublist/'.$character->category->sublist->key : 'masterlist' ), $character->fullName => $character->url, 'Ownership History' => $character->url.'/ownership']) !!}
-@endif
-
-@include('character._header', ['character' => $character])
+    @if ($character->is_myo_slot)
+        {!! breadcrumbs(['MYO Slot Masterlist' => 'myos', $character->fullName => $character->url, 'Ownership History' => $character->url . '/ownership']) !!}
+    @else
+        {!! breadcrumbs([
+            $character->category->masterlist_sub_id ? $character->category->sublist->name . ' Masterlist' : 'Character masterlist' => $character->category->masterlist_sub_id ? 'sublist/' . $character->category->sublist->key : 'masterlist',
+            $character->fullName => $character->url,
+            'Ownership History' => $character->url . '/ownership',
+        ]) !!}
+    @endif
 
-<h3>Ownership History</h3>
+    @include('character._header', ['character' => $character])
 
-{!! $logs->render() !!}
-<div class="row ml-md-2 mb-4">
-  <div class="d-flex row flex-wrap col-12 mt-1 pt-1 px-0 ubt-bottom">
-    <div class="col-6 col-md font-weight-bold">Sender</div>
-    <div class="col-6 col-md font-weight-bold">Recipient</div>
-    <div class="col-6 col-md-4 font-weight-bold">Log</div>
-    <div class="col-6 col-md font-weight-bold">Date</div>
-  </div>
-    @foreach($logs as $log)
-        @include('user._ownership_log_row', ['log' => $log, 'user' => $character->user])
-    @endforeach
-</div>
-{!! $logs->render() !!}
+    <h3>Ownership History</h3>
 
+    {!! $logs->render() !!}
+    <div class="mb-4 logs-table">
+        <div class="logs-table-header">
+            <div class="row">
+                <div class="col-6 col-md">
+                    <div class="logs-table-cell">Sender</div>
+                </div>
+                <div class="col-6 col-md">
+                    <div class="logs-table-cell">Recipient</div>
+                </div>
+                <div class="col-6 col-md-4">
+                    <div class="logs-table-cell">Log</div>
+                </div>
+                <div class="col-6 col-md">
+                    <div class="logs-table-cell">Date</div>
+                </div>
+            </div>
+        </div>
+        <div class="logs-table-body">
+            @foreach ($logs as $log)
+                <div class="logs-table-row">
+                    @include('user._ownership_log_row', ['log' => $log, 'user' => $character->user])
+                </div>
+            @endforeach
+        </div>
+    </div>
+    {!! $logs->render() !!}
 @endsection
diff --git a/resources/views/character/profile.blade.php b/resources/views/character/profile.blade.php
index 5e9747ae36..38f6fedeb4 100644
--- a/resources/views/character/profile.blade.php
+++ b/resources/views/character/profile.blade.php
@@ -1,57 +1,75 @@
 @extends('character.layout', ['isMyo' => $character->is_myo_slot])
 
-@section('profile-title') {{ $character->fullName }}'s Profile @endsection
+@section('profile-title')
+    {{ $character->fullName }}'s Profile
+@endsection
 
-@section('meta-img') {{ $character->image->thumbnailUrl }} @endsection
+@section('meta-img')
+    {{ $character->image->thumbnailUrl }}
+@endsection
 
 @section('profile-content')
-@if($character->is_myo_slot)
-{!! breadcrumbs(['MYO Slot Masterlist' => 'myos', $character->fullName => $character->url, 'Profile' => $character->url . '/profile']) !!}
-@else
-{!! breadcrumbs([($character->category->masterlist_sub_id ? $character->category->sublist->name.' Masterlist' : 'Character masterlist') => ($character->category->masterlist_sub_id ? 'sublist/'.$character->category->sublist->key : 'masterlist' ), $character->fullName => $character->url, 'Profile' => $character->url . '/profile']) !!}
-@endif
+    @if ($character->is_myo_slot)
+        {!! breadcrumbs(['MYO Slot Masterlist' => 'myos', $character->fullName => $character->url, 'Profile' => $character->url . '/profile']) !!}
+    @else
+        {!! breadcrumbs([
+            $character->category->masterlist_sub_id ? $character->category->sublist->name . ' Masterlist' : 'Character masterlist' => $character->category->masterlist_sub_id ? 'sublist/' . $character->category->sublist->key : 'masterlist',
+            $character->fullName => $character->url,
+            'Profile' => $character->url . '/profile',
+        ]) !!}
+    @endif
 
-@include('character._header', ['character' => $character])
+    @include('character._header', ['character' => $character])
 
-<div class="mb-3">
-    <div class="text-center">
-        <a href="{{ $character->image->canViewFull(Auth::check() ? Auth::user() : null) && file_exists( public_path($character->image->imageDirectory.'/'.$character->image->fullsizeFileName)) ? $character->image->fullsizeUrl : $character->image->imageUrl }}" data-lightbox="entry" data-title="{{ $character->fullName }}">
-            <img src="{{ $character->image->canViewFull(Auth::check() ? Auth::user() : null) && file_exists( public_path($character->image->imageDirectory.'/'.$character->image->fullsizeFileName)) ? $character->image->fullsizeUrl : $character->image->imageUrl }}" class="image" style="max-height:700px; max-width:700px;" alt="{{ $character->fullName }}"/>
-        </a>
+    <div class="mb-3">
+        <div class="text-center">
+            <a href="{{ $character->image->canViewFull(Auth::check() ? Auth::user() : null) && file_exists(public_path($character->image->imageDirectory . '/' . $character->image->fullsizeFileName)) ? $character->image->fullsizeUrl : $character->image->imageUrl }}"
+                data-lightbox="entry" data-title="{{ $character->fullName }}">
+                <img src="{{ $character->image->canViewFull(Auth::check() ? Auth::user() : null) && file_exists(public_path($character->image->imageDirectory . '/' . $character->image->fullsizeFileName)) ? $character->image->fullsizeUrl : $character->image->imageUrl }}"
+                    class="image img-fluid" alt="{{ $character->fullName }}" />
+            </a>
+        </div>
+        @if ($character->image->canViewFull(Auth::check() ? Auth::user() : null) && file_exists(public_path($character->image->imageDirectory . '/' . $character->image->fullsizeFileName)))
+            <div class="text-right">You are viewing the full-size image. <a href="{{ $character->image->imageUrl }}">View watermarked image</a>?</div>
+        @endif
     </div>
-    @if($character->image->canViewFull(Auth::check() ? Auth::user() : null) && file_exists( public_path($character->image->imageDirectory.'/'.$character->image->fullsizeFileName)))
-        <div class="text-right">You are viewing the full-size image. <a href="{{ $character->image->imageUrl }}">View watermarked image</a>?</div>
-    @endif
-</div>
 
-{{-- Bio --}}
-<a class="float-left" href="{{ url('reports/new?url=') . $character->url . '/profile' }}"><i class="fas fa-exclamation-triangle" data-toggle="tooltip" title="Click here to report this character's profile." style="opacity: 50%;"></i></a>
-@if(Auth::check() && ($character->user_id == Auth::user()->id || Auth::user()->hasPower('manage_characters')))
-    <div class="text-right mb-2">
-        <a href="{{ $character->url . '/profile/edit' }}" class="btn btn-outline-info btn-sm"><i class="fas fa-cog"></i> Edit Profile</a>
-    </div>
-@endif
-@if($character->profile->parsed_text)
-    <div class="card mb-3">
-        <div class="card-body parsed-text">
+    {{-- Bio --}}
+    <a class="float-left" href="{{ url('reports/new?url=') . $character->url . '/profile' }}"><i class="fas fa-exclamation-triangle" data-toggle="tooltip" title="Click here to report this character's profile." style="opacity: 50%;"></i></a>
+    @if (Auth::check() && ($character->user_id == Auth::user()->id || Auth::user()->hasPower('manage_characters')))
+        <div class="text-right mb-2">
+            <a href="{{ $character->url . '/profile/edit' }}" class="btn btn-outline-info btn-sm"><i class="fas fa-cog"></i> Edit Profile</a>
+        </div>
+    @endif
+    @if ($character->profile->parsed_text)
+        <div class="card mb-3">
+            <div class="card-body parsed-text">
                 {!! $character->profile->parsed_text !!}
+            </div>
         </div>
-    </div>
-@endif
+    @endif
 
-@if($character->is_trading || $character->is_gift_art_allowed || $character->is_gift_writing_allowed)
-    <div class="card mb-3">
-        <ul class="list-group list-group-flush">
-            @if($character->is_gift_art_allowed >= 1 && !$character->is_myo_slot)
-                <li class="list-group-item"><h5 class="mb-0"><i class="{{ $character->is_gift_art_allowed == 1 ? 'text-success' : 'text-secondary' }} far fa-circle fa-fw mr-2"></i> {{ $character->is_gift_art_allowed == 1 ? 'Gift art is allowed' : 'Please ask before gift art' }}</h5></li>
-            @endif
-            @if($character->is_gift_writing_allowed >= 1 && !$character->is_myo_slot)
-                <li class="list-group-item"><h5 class="mb-0"><i class="{{ $character->is_gift_writing_allowed == 1 ? 'text-success' : 'text-secondary' }} far fa-circle fa-fw mr-2"></i> {{ $character->is_gift_writing_allowed == 1 ? 'Gift writing is allowed' : 'Please ask before gift writing' }}</h5></li>
-            @endif
-            @if($character->is_trading)
-                <li class="list-group-item"><h5 class="mb-0"><i class="text-success far fa-circle fa-fw mr-2"></i> Open for trades</h5></li>
-            @endif
-        </ul>
-    </div>
-@endif
+    @if ($character->is_trading || $character->is_gift_art_allowed || $character->is_gift_writing_allowed)
+        <div class="card mb-3">
+            <ul class="list-group list-group-flush">
+                @if ($character->is_gift_art_allowed >= 1 && !$character->is_myo_slot)
+                    <li class="list-group-item">
+                        <h5 class="mb-0"><i class="{{ $character->is_gift_art_allowed == 1 ? 'text-success' : 'text-secondary' }} far fa-circle fa-fw mr-2"></i>
+                            {{ $character->is_gift_art_allowed == 1 ? 'Gift art is allowed' : 'Please ask before gift art' }}</h5>
+                    </li>
+                @endif
+                @if ($character->is_gift_writing_allowed >= 1 && !$character->is_myo_slot)
+                    <li class="list-group-item">
+                        <h5 class="mb-0"><i class="{{ $character->is_gift_writing_allowed == 1 ? 'text-success' : 'text-secondary' }} far fa-circle fa-fw mr-2"></i>
+                            {{ $character->is_gift_writing_allowed == 1 ? 'Gift writing is allowed' : 'Please ask before gift writing' }}</h5>
+                    </li>
+                @endif
+                @if ($character->is_trading)
+                    <li class="list-group-item">
+                        <h5 class="mb-0"><i class="text-success far fa-circle fa-fw mr-2"></i> Open for trades</h5>
+                    </li>
+                @endif
+            </ul>
+        </div>
+    @endif
 @endsection
diff --git a/resources/views/character/submission_logs.blade.php b/resources/views/character/submission_logs.blade.php
index 6b38c9afb4..3154b6489c 100644
--- a/resources/views/character/submission_logs.blade.php
+++ b/resources/views/character/submission_logs.blade.php
@@ -1,45 +1,82 @@
 @extends('character.layout', ['isMyo' => $character->is_myo_slot])
 
-@section('profile-title') {{ $character->fullName }}'s Submissions @endsection
+@section('profile-title')
+    {{ $character->fullName }}'s Submissions
+@endsection
 
-@section('meta-img') {{ $character->image->thumbnailUrl }} @endsection
+@section('meta-img')
+    {{ $character->image->thumbnailUrl }}
+@endsection
 
 @section('profile-content')
-{!! breadcrumbs([($character->category->masterlist_sub_id ? $character->category->sublist->name.' Masterlist' : 'Character masterlist') => ($character->category->masterlist_sub_id ? 'sublist/'.$character->category->sublist->key : 'masterlist' ), $character->fullName => $character->url, 'Submissions' => $character->url.'/submissions']) !!}
-
-@include('character._header', ['character' => $character])
-
-<h3>Submissions</h3>
-
-@if(count($logs))
-
-{!! $logs->render() !!}
-
-<div class="row ml-md-2">
-  <div class="d-flex row flex-wrap col-12 mt-1 pt-1 px-0 ubt-bottom">
-    <div class="col-12 col-md-2 font-weight-bold">Submitted By</div>
-    <div class="col-6 col-md-2 font-weight-bold">Prompt</div>
-    <div class="col-6 col-md-4 font-weight-bold">Link</div>
-    <div class="col-6 col-md-3 font-weight-bold">Date</div>
-  </div>
-
-  @foreach($logs as $log)
-    <div class="d-flex row flex-wrap col-12 mt-1 pt-1 px-0 ubt-top">
-      <div class="col-12 col-md-2">{!! $log->user->displayName !!}</div>
-      <div class="col-6 col-md-2">{!! $log->prompt_id ? $log->prompt->displayName : '---' !!}</div>
-      <div class="col-6 col-md-4">
-        <span class="ubt-texthide"><a href="{{ $log->url }}">{{ $log->url }}</a></span>
-      </div>
-      <div class="col-6 col-md-3">{!! pretty_date($log->created_at) !!}</div>
-      <div class="col-6 col-md-1"><a href="{{ $log->viewUrl }}" class="btn btn-primary btn-sm py-0 px-1">Details</a></div>
-    </div>
-  @endforeach
-</div>
-
-{!! $logs->render() !!}
-
-@else
-    <p>No submissions found.</p>
-@endif
+    {!! breadcrumbs([
+        $character->category->masterlist_sub_id ? $character->category->sublist->name . ' Masterlist' : 'Character masterlist' => $character->category->masterlist_sub_id ? 'sublist/' . $character->category->sublist->key : 'masterlist',
+        $character->fullName => $character->url,
+        'Submissions' => $character->url . '/submissions',
+    ]) !!}
+
+    @include('character._header', ['character' => $character])
+
+    <h3>Submissions</h3>
+
+    @if (count($logs))
+        {!! $logs->render() !!}
+
+        <div class="mb-4 logs-table">
+            <div class="logs-table-header">
+                <div class="row">
+                    <div class="col-12 col-md-2">
+                        <div class="logs-table-cell">Submitted By</div>
+                    </div>
+                    <div class="col-6 col-md-2">
+                        <div class="logs-table-cell">Prompt</div>
+                    </div>
+                    <div class="col-6 col-md-4">
+                        <div class="logs-table-cell">Link</div>
+                    </div>
+                    <div class="col-6 col-md-3">
+                        <div class="logs-table-cell">Date</div>
+                    </div>
+                </div>
+            </div>
+            <div class="logs-table-body">
+                @foreach ($logs as $log)
+                    <div class="logs-table-row">
+                        <div class="row flex-wrap">
+                            <div class="col-12 col-md-2">
+                                <div class="logs-table-cell">
+                                    {!! $log->user->displayName !!}
+                                </div>
+                            </div>
+                            <div class="col-6 col-md-2">
+                                <div class="logs-table-cell">
+                                    {!! $log->prompt_id ? $log->prompt->displayName : '---' !!}
+                                </div>
+                            </div>
+                            <div class="col-6 col-md-4">
+                                <div class="logs-table-cell">
+                                    <span class="ubt-texthide"><a href="{{ $log->url }}">{{ $log->url }}</a></span>
+                                </div>
+                            </div>
+                            <div class="col-6 col-md-3">
+                                <div class="logs-table-cell">
+                                    {!! pretty_date($log->created_at) !!}
+                                </div>
+                            </div>
+                            <div class="col-6 col-md-1">
+                                <div class="logs-table-cell">
+                                    <a href="{{ $log->viewUrl }}" class="btn btn-primary btn-sm py-0 px-1">Details</a>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                @endforeach
+            </div>
+        </div>
+
+        {!! $logs->render() !!}
+    @else
+        <p>No submissions found.</p>
+    @endif
 
 @endsection
diff --git a/resources/views/character/transfer.blade.php b/resources/views/character/transfer.blade.php
index d614423ec9..c0474b6410 100644
--- a/resources/views/character/transfer.blade.php
+++ b/resources/views/character/transfer.blade.php
@@ -1,96 +1,106 @@
 @extends('character.layout', ['isMyo' => $character->is_myo_slot])
 
-@section('profile-title') Transferring {{ $character->fullName }} @endsection
+@section('profile-title')
+    Transferring {{ $character->fullName }}
+@endsection
 
-@section('meta-img') {{ $character->image->thumbnailUrl }} @endsection
+@section('meta-img')
+    {{ $character->image->thumbnailUrl }}
+@endsection
 
 @section('profile-content')
-@if($character->is_myo_slot)
-{!! breadcrumbs(['MYO Slot Masterlist' => 'myos', $character->fullName => $character->url, 'Transfer' => $character->url . '/transfer']) !!}
-@else
-{!! breadcrumbs([($character->category->masterlist_sub_id ? $character->category->sublist->name.' Masterlist' : 'Character masterlist') => ($character->category->masterlist_sub_id ? 'sublist/'.$character->category->sublist->key : 'masterlist' ), $character->fullName => $character->url, 'Transfer' => $character->url . '/transfer']) !!}
-@endif
+    @if ($character->is_myo_slot)
+        {!! breadcrumbs(['MYO Slot Masterlist' => 'myos', $character->fullName => $character->url, 'Transfer' => $character->url . '/transfer']) !!}
+    @else
+        {!! breadcrumbs([
+            $character->category->masterlist_sub_id ? $character->category->sublist->name . ' Masterlist' : 'Character masterlist' => $character->category->masterlist_sub_id ? 'sublist/' . $character->category->sublist->key : 'masterlist',
+            $character->fullName => $character->url,
+            'Transfer' => $character->url . '/transfer',
+        ]) !!}
+    @endif
 
-@include('character._header', ['character' => $character])
+    @include('character._header', ['character' => $character])
 
-@if($character->user_id == Auth::user()->id)
-    <h3>Transfer Character</h3>
-    @if(!$character->is_sellable && !$character->is_tradeable && !$character->is_giftable)
-        <p>This character cannot be transferred.</p>
-    @elseif($character->transferrable_at && $character->transferrable_at->isFuture())
-        <p>This character is on transfer cooldown until <strong>{!! format_date($character->transferrable_at) !!}</strong> ({{ $character->transferrable_at->diffForHumans() }}). It cannot be transferred until then.</p>
-    @elseif($transfer)
-        <div class="card bg-light mb-3">
-            <div class="card-body">
-                <p>
-                    This character is already in a transfer to {!! $transfer->recipient->displayName !!}.
-                </p>
-                <div class="text-right">
-                    {!! Form::open(['url' => 'characters/transfer/act/' . $transfer->id]) !!}
+    @if ($character->user_id == Auth::user()->id)
+        <h3>Transfer Character</h3>
+        @if (!$character->is_sellable && !$character->is_tradeable && !$character->is_giftable)
+            <p>This character cannot be transferred.</p>
+        @elseif($character->transferrable_at && $character->transferrable_at->isFuture())
+            <p>This character is on transfer cooldown until <strong>{!! format_date($character->transferrable_at) !!}</strong> ({{ $character->transferrable_at->diffForHumans() }}). It cannot be transferred until then.</p>
+        @elseif($transfer)
+            <div class="card bg-light mb-3">
+                <div class="card-body">
+                    <p>
+                        This character is already in a transfer to {!! $transfer->recipient->displayName !!}.
+                    </p>
+                    <div class="text-right">
+                        {!! Form::open(['url' => 'characters/transfer/act/' . $transfer->id]) !!}
                         {!! Form::submit('Cancel', ['class' => 'btn btn-danger', 'name' => 'action']) !!}
-                    {!! Form::close() !!}
+                        {!! Form::close() !!}
+                    </div>
                 </div>
             </div>
-        </div>
-    @elseif($character->trade_id)
-        <p>This character is currently attached to a trade. (<a href="{{ $character->trade->url }}">View Trade</a>)</p>
-    @else
-        <p>
-            Transfers require the recipient to confirm that they want to receive the character. Before the recipient makes the confirmation, you may cancel the transfer, but cannot retrieve the character after it has been transferred.
-            @if($transfersQueue)
-                Additionally, a mod will need to approve of the transfer. There may be a wait until the recipient receives the character, even after they have confirmed the transfer.
-            @endif
-        </p>
-        @if($cooldown)
+        @elseif($character->trade_id)
+            <p>This character is currently attached to a trade. (<a href="{{ $character->trade->url }}">View Trade</a>)</p>
+        @else
             <p>
-                After a character is transferred (transfer is accepted{{ $transfersQueue ? ' and approved' : '' }}), a cooldown of <strong>{{ $cooldown }}</strong> days will be applied. During this time, the character cannot be transferred to another person.
+                Transfers require the recipient to confirm that they want to receive the character. Before the recipient makes the confirmation, you may cancel the transfer, but cannot retrieve the character after it has been transferred.
+                @if ($transfersQueue)
+                    Additionally, a mod will need to approve of the transfer. There may be a wait until the recipient receives the character, even after they have confirmed the transfer.
+                @endif
             </p>
+            @if ($cooldown)
+                <p>
+                    After a character is transferred (transfer is accepted{{ $transfersQueue ? ' and approved' : '' }}), a cooldown of <strong>{{ $cooldown }}</strong> days will be applied. During this time, the character cannot be transferred to
+                    another person.
+                </p>
+            @endif
+            {!! Form::open(['url' => $character->url . '/transfer']) !!}
+            <div class="form-group">
+                {!! Form::label('recipient_id', 'Recipient') !!}
+                {!! Form::select('recipient_id', $userOptions, old('recipient_id'), ['class' => 'form-control selectize', 'placeholder' => 'Select User']) !!}
+            </div>
+            <div class="form-group">
+                {!! Form::label('user_reason', 'Reason for Transfer (Required)') !!}
+                {!! Form::text('user_reason', '', ['class' => 'form-control']) !!}
+            </div>
+            <div class="text-right">
+                {!! Form::submit('Send Transfer', ['class' => 'btn btn-primary']) !!}
+            </div>
+            {!! Form::close() !!}
         @endif
-        {!! Form::open(['url' => $character->url . '/transfer']) !!}
+    @endif
+
+    @if (Auth::user()->hasPower('manage_characters'))
+        <h3>Admin Transfer</h3>
+        <div class="alert alert-warning">
+            You are editing this character as a staff member.
+        </div>
+        <p>This will transfer the character automatically, without requiring the recipient to confirm the transfer. You may also transfer a character that is marked non-transferrable, or still under cooldown. Both the old and new owners will be notified
+            of the transfer.</p>
+        <p>Fill in either of the recipient fields - if transferring to an off-site user, leave the recipient field blank and vice versa.</p>
+        {!! Form::open(['url' => $character->is_myo_slot ? 'admin/myo/' . $character->id . '/transfer' : 'admin/character/' . $character->slug . '/transfer']) !!}
         <div class="form-group">
             {!! Form::label('recipient_id', 'Recipient') !!}
             {!! Form::select('recipient_id', $userOptions, old('recipient_id'), ['class' => 'form-control selectize', 'placeholder' => 'Select User']) !!}
         </div>
         <div class="form-group">
-            {!! Form::label('user_reason', 'Reason for Transfer (Required)') !!}
-            {!! Form::text('user_reason', '', ['class' => 'form-control']) !!}
+            {!! Form::label('recipient_url', 'Recipient Url') !!} {!! add_help('Characters can only be transferred to offsite user URLs from site(s) used for authentication.') !!}
+            {!! Form::text('recipient_url', old('recipient_url'), ['class' => 'form-control']) !!}
+        </div>
+        <div class="form-group">
+            {!! Form::label('cooldown', 'Transfer Cooldown (days)') !!}
+            {!! Form::text('cooldown', $cooldown, ['class' => 'form-control']) !!}
+        </div>
+        <div class="form-group">
+            {!! Form::label('reason', 'Reason for Transfer (optional)') !!}
+            {!! Form::text('reason', '', ['class' => 'form-control']) !!}
         </div>
         <div class="text-right">
             {!! Form::submit('Send Transfer', ['class' => 'btn btn-primary']) !!}
         </div>
         {!! Form::close() !!}
     @endif
-@endif
-
-@if(Auth::user()->hasPower('manage_characters'))
-    <h3>Admin Transfer</h3>
-    <div class="alert alert-warning">
-        You are editing this character as a staff member.
-    </div>
-    <p>This will transfer the character automatically, without requiring the recipient to confirm the transfer. You may also transfer a character that is marked non-transferrable, or still under cooldown. Both the old and new owners will be notified of the transfer.</p>
-    <p>Fill in either of the recipient fields - if transferring to an off-site user, leave the recipient field blank and vice versa.</p>
-    {!! Form::open(['url' => $character->is_myo_slot ? 'admin/myo/'.$character->id.'/transfer' : 'admin/character/' . $character->slug . '/transfer']) !!}
-    <div class="form-group">
-        {!! Form::label('recipient_id', 'Recipient') !!}
-        {!! Form::select('recipient_id', $userOptions, old('recipient_id'), ['class' => 'form-control selectize', 'placeholder' => 'Select User']) !!}
-    </div>
-    <div class="form-group">
-        {!! Form::label('recipient_url', 'Recipient Url') !!} {!! add_help('Characters can only be transferred to offsite user URLs from site(s) used for authentication.') !!}
-        {!! Form::text('recipient_url', old('recipient_url'), ['class' => 'form-control']) !!}
-    </div>
-    <div class="form-group">
-        {!! Form::label('cooldown', 'Transfer Cooldown (days)') !!}
-        {!! Form::text('cooldown', $cooldown, ['class' => 'form-control']) !!}
-    </div>
-    <div class="form-group">
-        {!! Form::label('reason', 'Reason for Transfer (optional)') !!}
-        {!! Form::text('reason', '', ['class' => 'form-control']) !!}
-    </div>
-    <div class="text-right">
-        {!! Form::submit('Send Transfer', ['class' => 'btn btn-primary']) !!}
-    </div>
-    {!! Form::close() !!}
-@endif
 
 @endsection
 @section('scripts')
diff --git a/resources/views/character/update_form.blade.php b/resources/views/character/update_form.blade.php
index c8862b4b33..fb16cc07f6 100644
--- a/resources/views/character/update_form.blade.php
+++ b/resources/views/character/update_form.blade.php
@@ -1,44 +1,52 @@
 @extends('character.layout', ['isMyo' => $character->is_myo_slot])
 
-@section('profile-title') {{ $character->is_myo_slot ? 'MYO Approval' : 'Design Update' }} for {{ $character->fullName }} @endsection
+@section('profile-title')
+    {{ $character->is_myo_slot ? 'MYO Approval' : 'Design Update' }} for {{ $character->fullName }}
+@endsection
 
-@section('meta-img') {{ $character->image->thumbnailUrl }} @endsection
+@section('meta-img')
+    {{ $character->image->thumbnailUrl }}
+@endsection
 
 @section('profile-content')
+    @if ($character->is_myo_slot)
+        {!! breadcrumbs(['MYO Slot Masterlist' => 'myos', $character->fullName => $character->url, $character->is_myo_slot ? 'MYO Approval' : 'Design Update' => $character->url . '/approval']) !!}
+    @else
+        {!! breadcrumbs([
+            $character->category->masterlist_sub_id ? $character->category->sublist->name . ' Masterlist' : 'Character masterlist' => $character->category->masterlist_sub_id ? 'sublist/' . $character->category->sublist->key : 'masterlist',
+            $character->fullName => $character->url,
+            $character->is_myo_slot ? 'MYO Approval' : 'Design Update' => $character->url . '/approval',
+        ]) !!}
+    @endif
 
-@if($character->is_myo_slot)
-{!! breadcrumbs(['MYO Slot Masterlist' => 'myos', $character->fullName => $character->url, ($character->is_myo_slot ? 'MYO Approval' : 'Design Update') => $character->url.'/approval']) !!}
-@else
-{!! breadcrumbs([($character->category->masterlist_sub_id ? $character->category->sublist->name.' Masterlist' : 'Character masterlist') => ($character->category->masterlist_sub_id ? 'sublist/'.$character->category->sublist->key : 'masterlist' ), $character->fullName => $character->url, ($character->is_myo_slot ? 'MYO Approval' : 'Design Update') => $character->url.'/approval']) !!}
-@endif
+    @include('character._header', ['character' => $character])
 
-@include('character._header', ['character' => $character])
-
-<h3>
-    {{ $character->is_myo_slot ? 'MYO Approval' : 'Design Update' }} Request
-</h3>
-@if(!$queueOpen)
-    <div class="alert alert-danger">
-        The {{ $character->is_myo_slot ? 'MYO approval' : 'design update' }} queue is currently closed. You cannot submit a new approval request at this time.
-    </div>
-@elseif(!$request)
-    <p>No {{ $character->is_myo_slot ? 'MYO approval' : 'design update' }} request found. Would you like to create one?</p>
-    <p>This will prepare a request to approve {{ $character->is_myo_slot ? 'your MYO slot\'s design' : 'a design update for your character' }}, which will allow you to upload a new masterlist image, list their new traits and spend items/currency on the design. You will be able to edit the contents of your request as much as you like before submission. Staff will be able to view the draft and provide feedback. </p>
-    {!! Form::open(['url' => $character->is_myo_slot ? 'myo/'.$character->id.'/approval' : 'character/'.$character->slug.'/approval']) !!}
-    <div class="text-right">
-        {!! Form::submit('Create Request', ['class' => 'btn btn-primary']) !!}
-    </div>
-    {!! Form::close() !!}
-@else
-    <p>You have a {{ $character->is_myo_slot ? 'MYO approval' : 'design update' }} request {{ $request->status == 'Draft' ? 'that has not been submitted' : 'awaiting approval' }}. <a href="{{ $request->url }}">Click here to view {{ $request->status == 'Draft' ? 'and edit ' : '' }}it.</a></p>
-@endif 
+    <h3>
+        {{ $character->is_myo_slot ? 'MYO Approval' : 'Design Update' }} Request
+    </h3>
+    @if (!$queueOpen)
+        <div class="alert alert-danger">
+            The {{ $character->is_myo_slot ? 'MYO approval' : 'design update' }} queue is currently closed. You cannot submit a new approval request at this time.
+        </div>
+    @elseif(!$request)
+        <p>No {{ $character->is_myo_slot ? 'MYO approval' : 'design update' }} request found. Would you like to create one?</p>
+        <p>This will prepare a request to approve {{ $character->is_myo_slot ? 'your MYO slot\'s design' : 'a design update for your character' }}, which will allow you to upload a new masterlist image, list their new traits and spend items/currency on
+            the design. You will be able to edit the contents of your request as much as you like before submission. Staff will be able to view the draft and provide feedback. </p>
+        {!! Form::open(['url' => $character->is_myo_slot ? 'myo/' . $character->id . '/approval' : 'character/' . $character->slug . '/approval']) !!}
+        <div class="text-right">
+            {!! Form::submit('Create Request', ['class' => 'btn btn-primary']) !!}
+        </div>
+        {!! Form::close() !!}
+    @else
+        <p>You have a {{ $character->is_myo_slot ? 'MYO approval' : 'design update' }} request {{ $request->status == 'Draft' ? 'that has not been submitted' : 'awaiting approval' }}. <a href="{{ $request->url }}">Click here to view
+                {{ $request->status == 'Draft' ? 'and edit ' : '' }}it.</a></p>
+    @endif
 @endsection
 
 @section('scripts')
     @parent
     @include('widgets._image_upload_js')
     <script>
-        $(document).ready(function(){
-        });
+        $(document).ready(function() {});
     </script>
-@endsection
\ No newline at end of file
+@endsection
diff --git a/resources/views/comments/_actions.blade.php b/resources/views/comments/_actions.blade.php
new file mode 100644
index 0000000000..17456eb71f
--- /dev/null
+++ b/resources/views/comments/_actions.blade.php
@@ -0,0 +1,282 @@
+{{-- Action buttons --}}
+@if (Auth::check())
+    <div class="my-1 row justify-content-between no-gutters">
+        <div class="col-auto">
+            @can('reply-to-comment', $comment)
+                <button data-toggle="modal" data-target="#reply-modal-{{ $comment->getKey() }}" class="btn btn-sm px-3 py-2 px-sm-2 py-sm-1 btn-faded text-uppercase"><i class="fas fa-comment"></i><span
+                        class="ml-2 d-none d-sm-inline-block">Reply</span></button>
+            @endcan
+            @can('edit-comment', $comment)
+                <button data-toggle="modal" data-target="#comment-modal-{{ $comment->getKey() }}" class="btn btn-sm px-3 py-2 px-sm-2 py-sm-1 btn-faded text-uppercase"><i class="fas fa-edit"></i><span
+                        class="ml-2 d-none d-sm-inline-block">Edit</span></button>
+            @endcan
+            @if (((Auth::user()->id == $comment->commentable_id && $comment->commentable_type == 'App\Models\User\UserProfile') || Auth::user()->isStaff) && (isset($compact) && !$compact))
+                <button data-toggle="modal" data-target="#feature-modal-{{ $comment->getKey() }}" class="btn btn-sm px-3 py-2 px-sm-2 py-sm-1 btn-faded text-success text-uppercase"><i class="fas fa-star"></i><span
+                        class="ml-2 d-none d-sm-inline-block">{{ $comment->is_featured ? 'Unf' : 'F' }}eature Comment</span></button>
+            @endif
+            @can('delete-comment', $comment)
+                <button data-toggle="modal" data-target="#delete-modal-{{ $comment->getKey() }}" class="btn btn-sm px-3 py-2 px-sm-2 py-sm-1 btn-outline-danger text-uppercase"><i class="fas fa-minus-circle"></i><span
+                        class="ml-2 d-none d-sm-inline-block">Delete</span></button>
+            @endcan
+        </div>
+        <div class="col-auto text-right">
+            {{-- Likes Section --}}
+            <a href="#" data-toggle="modal" data-target="#show-likes-{{ $comment->id }}">
+                <button href="#" data-toggle="tooltip" title="Click to View" class="btn btn-sm px-3 py-2 px-sm-2 py-sm-1 btn-faded">
+                    {{ $comment->likes()->where('is_like', 1)->count() -$comment->likes()->where('is_like', 0)->count() }}
+                    {{ $comment->likes()->where('is_like', 1)->count() -$comment->likes()->where('is_like', 0)->count() !=1? 'Likes': 'Like' }}
+                </button>
+            </a>
+            {!! Form::open(['url' => 'comments/' . $comment->id . '/like/1', 'class' => 'd-inline-block']) !!}
+            {!! Form::button('<i class="fas fa-thumbs-up"></i>', [
+                'type' => 'submit',
+                'class' =>
+                    'btn btn-sm px-3 py-2 px-sm-2 py-sm-1 ' .
+                    ($comment->likes()->where('user_id', Auth::user()->id)->where('is_like', 1)->exists()
+                        ? 'btn-success'
+                        : 'btn-outline-success') .
+                    ' text-uppercase',
+            ]) !!}
+            {!! Form::close() !!}
+            @if (Settings::get('comment_dislikes_enabled') || (isset($allow_dislikes) && $allow_dislikes))
+                {!! Form::open(['url' => 'comments/' . $comment->id . '/like/0', 'class' => 'd-inline-block']) !!}
+                {!! Form::button('<i class="fas fa-thumbs-down"></i>', [
+                    'type' => 'submit',
+                    'class' =>
+                        'btn btn-sm px-3 py-2 px-sm-2 py-sm-1 ' .
+                        ($comment->likes()->where('user_id', Auth::user()->id)->where('is_like', 0)->exists()
+                            ? 'btn-danger'
+                            : 'btn-outline-danger') .
+                        ' text-uppercase',
+                ]) !!}
+                {!! Form::close() !!}
+            @endif
+        </div>
+    </div>
+@endif
+
+{{-- Modals --}}
+@can('edit-comment', $comment)
+    <div class="modal fade" id="comment-modal-{{ $comment->getKey() }}" tabindex="-1" role="dialog">
+        <div class="modal-dialog modal-lg" role="document">
+            <div class="modal-content">
+                {{ Form::model($comment, ['route' => ['comments.update', $comment->getKey()]]) }}
+                <div class="modal-header">
+                    <h5 class="modal-title">Edit Comment</h5>
+                    <button type="button" class="close" data-dismiss="modal">
+                        <span>&times;</span>
+                    </button>
+                </div>
+                <div class="modal-body">
+                    <div class="form-group">
+                        {!! Form::label('message', 'Update your message here:') !!}
+                        {!! Form::textarea('message', $comment->comment, ['class' => 'form-control ' . config('lorekeeper.settings.wysiwyg_comments') ? 'comment-wysiwyg' : '', 'rows' => 3, config('lorekeeper.settings.wysiwyg_comments') ? '' : 'required']) !!}
+                        <small class="form-text text-muted"><a target="_blank" href="https://help.github.com/articles/basic-writing-and-formatting-syntax">Markdown</a> cheatsheet.</small>
+                    </div>
+                </div>
+                <div class="modal-footer">
+                    <button type="button" class="btn btn-sm btn-outline-secondary text-uppercase" data-dismiss="modal">Cancel</button>
+                    {!! Form::submit('Update', ['class' => 'btn btn-sm btn-outline-success text-uppercase']) !!}
+                </div>
+                </form>
+            </div>
+        </div>
+    </div>
+@endcan
+{{-- modal large --}}
+@can('reply-to-comment', $comment)
+    <div class="modal fade" id="reply-modal-{{ $comment->getKey() }}" tabindex="-1" role="dialog">
+        <div class="modal-dialog modal-lg" role="document">
+            <div class="modal-content">
+                {{ Form::open(['route' => ['comments.reply', $comment->getKey()]]) }}
+                <div class="modal-header">
+                    <h5 class="modal-title">Reply to Comment</h5>
+                    <button type="button" class="close" data-dismiss="modal">
+                        <span>&times;</span>
+                    </button>
+                </div>
+                <div class="modal-body">
+                    <div class="form-group">
+                        {!! Form::label('message', 'Enter your message here:') !!}
+                        {!! Form::textarea('message', null, ['class' => 'form-control ' . config('lorekeeper.settings.wysiwyg_comments') ? 'comment-wysiwyg' : '', 'rows' => 3, config('lorekeeper.settings.wysiwyg_comments') ? '' : 'required']) !!}
+                        <small class="form-text text-muted"><a target="_blank" href="https://help.github.com/articles/basic-writing-and-formatting-syntax">Markdown</a> cheatsheet.</small>
+                    </div>
+                </div>
+                <div class="modal-footer">
+                    <button type="button" class="btn btn-sm btn-outline-secondary text-uppercase" data-dismiss="modal">Cancel</button>
+                    {!! Form::submit('Reply', ['class' => 'btn btn-sm btn-outline-success text-uppercase']) !!}
+                </div>
+                </form>
+            </div>
+        </div>
+    </div>
+@endcan
+
+@can('delete-comment', $comment)
+    <div class="modal fade" id="delete-modal-{{ $comment->getKey() }}" tabindex="-1" role="dialog">
+        <div class="modal-dialog modal-lg" role="document">
+            <div class="modal-content">
+                <div class="modal-header">
+                    <h5 class="modal-title">Delete Comment</h5>
+                    <button type="button" class="close" data-dismiss="modal">
+                        <span>&times;</span>
+                    </button>
+                </div>
+                <div class="modal-body">
+                    <div class="form-group">Are you sure you want to delete this comment?</div>
+                    <div class="alert alert-warning">
+                        <strong>Comments can be restored in the database.</strong>
+                        <br> Deleting a comment does not delete the comment record.
+                    </div>
+                    <div class="text-right">
+                        <a href="{{ route('comments.destroy', $comment->getKey()) }}" onclick="event.preventDefault();document.getElementById('comment-delete-form-{{ $comment->getKey() }}').submit();" class="btn btn-danger text-uppercase">Delete</a>
+                        <form id="comment-delete-form-{{ $comment->getKey() }}" action="{{ route('comments.destroy', $comment->getKey()) }}" method="POST" style="display: none;">
+                            @method('DELETE')
+                            @csrf
+                        </form>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+@endcan
+
+<div class="modal fade" id="feature-modal-{{ $comment->getKey() }}" tabindex="-1" role="dialog">
+    <div class="modal-dialog modal-lg" role="document">
+        <div class="modal-content">
+            <div class="modal-header">
+                <h5 class="modal-title">{{ $comment->is_featured ? 'Unf' : 'F' }}eature Comment</h5>
+                <button type="button" class="close" data-dismiss="modal">
+                    <span>&times;</span>
+                </button>
+            </div>
+            <div class="modal-body">
+                <div class="form-group">Are you sure you want to {{ $comment->is_featured ? 'un' : '' }}feature this comment?</div>
+            </div>
+            <div class="alert alert-warning">Comments can be unfeatured.</div>
+            {!! Form::open(['url' => 'comments/' . $comment->id . '/feature']) !!}
+            @if (!$comment->is_featured)
+                {!! Form::submit('Feature', ['class' => 'btn btn-primary w-100 mb-0 mx-0']) !!}
+            @else
+                {!! Form::submit('Unfeature', ['class' => 'btn btn-primary w-100 mb-0 mx-0']) !!}
+            @endif
+            {!! Form::close() !!}
+        </div>
+    </div>
+</div>
+
+<div class="modal fade" id="show-likes-{{ $comment->id }}" tabindex="-1" role="dialog">
+    <div class="modal-dialog modal-lg" role="document">
+        <div class="modal-content">
+            <div class="modal-header">
+                <h5 class="modal-title">Likes</h5>
+                <button type="button" class="close" data-dismiss="modal">
+                    <span>&times;</span>
+                </button>
+            </div>
+            <div class="modal-body">
+                @if (count($comment->likes) > 0)
+                    <div class="mb-4 logs-table">
+                        <div class="logs-table-header">
+                            <div class="row">
+                                <div class="col-4 col-md-3">
+                                    <div class="logs-table-cell">User</div>
+                                </div>
+                                <div class="col-12 col-md-4">
+                                    <div class="logs-table-cell"></div>
+                                </div>
+                                <div class="col-4 col-md-3">
+                                    <div class="logs-table-cell"></div>
+                                </div>
+                            </div>
+                        </div>
+                        <div class="logs-table-body">
+                            @foreach ($comment->likes as $like)
+                                <div class="logs-table-row">
+                                    <div class="row flex-wrap">
+                                        <div class="col-4 col-md-3">
+                                            <div class="logs-table-cell"><img style="max-height: 2em;" src="{{ $like->user->avatarUrl }}" /></div>
+                                        </div>
+                                        <div class="col-12 col-md-4">
+                                            <div class="logs-table-cell">{!! $like->user->displayName !!}</div>
+                                        </div>
+                                        <div class="col-4 col-md-4 text-right">
+                                            <div class="logs-table-cell">{!! $like->is_like ? '<i class="fas fa-thumbs-up"></i>' : '<i class="fas fa-thumbs-down"></i>' !!}</div>
+                                        </div>
+                                    </div>
+                                </div>
+                            @endforeach
+                        </div>
+                    </div>
+                @else
+                    <div class="alert alert-info">No likes yet.</div>
+                @endif
+            </div>
+        </div>
+    </div>
+</div>
+
+{{-- edits modal --}}
+{{-- the button for this appears in the main view, but to keep it from being cluttered we will keep the models within this section --}}
+@if (Auth::check() && Auth::user()->isStaff)
+    <div class="modal fade" id="show-edits-{{ $comment->id }}" tabindex="-1" role="dialog">
+        <div class="modal-dialog modal-lg" role="document">
+            <div class="modal-content">
+                <div class="modal-header">
+                    <h5 class="modal-title">Edit History</h5>
+                    <button type="button" class="close" data-dismiss="modal">
+                        <span>&times;</span>
+                    </button>
+                </div>
+                <div class="modal-body">
+                    @if (count($comment->edits) > 0)
+                        <div class="mb-4 logs-table">
+                            <div class="logs-table-header">
+                                <div class="row">
+                                    <div class="col-4 col-md-3">
+                                        <div class="logs-table-cell">Time</div>
+                                    </div>
+                                    <div class="col-12 col-md-4">
+                                        <div class="logs-table-cell">Old Comment</div>
+                                    </div>
+                                    <div class="col-4 col-md-3">
+                                        <div class="logs-table-cell">New Comment</div>
+                                    </div>
+                                </div>
+                            </div>
+                            <div class="logs-table-body">
+                                @foreach ($comment->edits as $edit)
+                                    <div class="logs-table-row">
+                                        <div class="row flex-wrap">
+                                            <div class="col-4 col-md-3">
+                                                <div class="logs-table-cell">
+                                                    {!! format_date($edit->created_at) !!}
+                                                </div>
+                                            </div>
+                                            <div class="col-12 col-md-4">
+                                                <div class="logs-table-cell">
+                                                    <span data-toggle="tooltip" title="{{ $edit->data['old_comment'] }}">
+                                                        {{ Str::limit($edit->data['old_comment'], 50) }}
+                                                    </span>
+                                                </div>
+                                            </div>
+                                            <div class="col-12 col-md-4">
+                                                <div class="logs-table-cell">
+                                                    <span data-toggle="tooltip" title="{{ $edit->data['new_comment'] }}">
+                                                        {{ Str::limit($edit->data['new_comment'], 50) }}
+                                                    </span>
+                                                </div>
+                                            </div>
+                                        </div>
+                                    </div>
+                                @endforeach
+                            </div>
+                        </div>
+                    @else
+                        <div class="alert alert-info">No edits yet.</div>
+                    @endif
+                </div>
+            </div>
+        </div>
+    </div>
+@endif
diff --git a/resources/views/comments/_comment.blade.php b/resources/views/comments/_comment.blade.php
index 47c39a2d66..22a86537c6 100644
--- a/resources/views/comments/_comment.blade.php
+++ b/resources/views/comments/_comment.blade.php
@@ -3,181 +3,120 @@
     $markdown->setSafeMode(true);
 @endphp
 
-@if(isset($reply) && $reply === true)
-  <div id="comment-{{ $comment->getKey() }}" class="comment_replies border-left col-12 column mw-100 pr-0 pt-4" style="flex-basis: 100%;">
-@else
-  <div id="comment-{{ $comment->getKey() }}"  class="pt-4" style="flex-basis: 100%;">
-@endif
-    <div class="media-body row mw-100 mx-0" style="flex:1;flex-wrap:wrap;">
-        @if(isset($compact) && !$compact)
-        <div class="d-none d-md-block">
-            <img class="mr-3 mt-2" src="/images/avatars/{{ $comment->commenter->avatar }}" style="width:70px; height:70px; border-radius:50%;" alt="{{ $comment->commenter->name }} Avatar">
-        </div>
-        @endif
-        <div class="d-block" style="flex:1">
-            <div class="row mx-0 px-0 align-items-md-end">
-                <h5 class="mt-0 mb-1 col mx-0 px-0">
-                    {!! $comment->commenter->commentDisplayName !!} @if($comment->commenter->isStaff == true)<small class="text-success">Staff Member</small>@endif
-                </h5>
-                @if($comment->is_featured)<div class="ml-1 text-muted text-right col-6 mx-0 pr-1"><small class="text-success">Featured by Owner</small></div> @endif
-            </div>
-            <div class="border p-3 rounded {{ $comment->is_featured ? 'border-success bg-light' : '' }} "><p>{!! nl2br($markdown->line($comment->comment)) !!} </p>
-            <p class="border-top pt-1 text-right mb-0">
-                <small class="text-muted">{!! $comment->created_at !!}
-                @if($comment->created_at != $comment->updated_at) 
-                    <span class="text-muted border-left mx-1 px-1">(Edited {!! ($comment->updated_at) !!})</span>
-                @endif
-                </small>
-                @if($comment->type == "User-User")
-                    <a href="{{ url('comment/').'/'.$comment->id }}"><i class="fas fa-link ml-1" style="opacity: 50%;"></i></a>
-                @endif
-                <a href="{{ url('reports/new?url=') . $comment->url }}"><i class="fas fa-exclamation-triangle" data-toggle="tooltip" title="Click here to report this comment." style="opacity: 50%;"></i></a>
-            </p>
-        </div>
-        @if(Auth::check())
-            <div class="my-1">
-                @can('reply-to-comment', $comment)
-                    <button data-toggle="modal" data-target="#reply-modal-{{ $comment->getKey() }}" class="btn btn-sm px-3 py-2 px-sm-2 py-sm-1  btn-faded text-uppercase"><i class="fas fa-comment"></i><span class="ml-2 d-none d-sm-inline-block">Reply</span></button>
-                @endcan
-                @can('edit-comment', $comment)
-                    <button data-toggle="modal" data-target="#comment-modal-{{ $comment->getKey() }}" class="btn btn-sm px-3 py-2 px-sm-2 py-sm-1  btn-faded text-uppercase"><i class="fas fa-edit"></i><span class="ml-2 d-none d-sm-inline-block">Edit</span></button>
-                @endcan
-                @if(((Auth::user()->id == $comment->commentable_id) || Auth::user()->isStaff) && (isset($compact) && !$compact))
-                    <button data-toggle="modal" data-target="#feature-modal-{{ $comment->getKey() }}" class="btn btn-sm px-3 py-2 px-sm-2 py-sm-1  btn-faded text-success text-uppercase"><i class="fas fa-star"></i><span class="ml-2 d-none d-sm-inline-block">{{$comment->is_featured ? 'Unf' : 'F' }}eature Comment</span></button>
-                @endif
-                @can('delete-comment', $comment)
-                    <button data-toggle="modal" data-target="#delete-modal-{{ $comment->getKey() }}" class="btn btn-sm px-3 py-2 px-sm-2 py-sm-1 btn-outline-danger text-uppercase"><i class="fas fa-minus-circle"></i><span class="ml-2 d-none d-sm-inline-block">Delete</span></button>
-                @endcan
-            </div>
-        @endif
-        
-            @can('edit-comment', $comment)
-                <div class="modal fade" id="comment-modal-{{ $comment->getKey() }}" tabindex="-1" role="dialog">
-                    <div class="modal-dialog" role="document">
-                        <div class="modal-content">
-                            <form method="POST" action="{{ route('comments.update', $comment->getKey()) }}">
-                                @method('PUT')
-                                @csrf
-                                <div class="modal-header">
-                                    <h5 class="modal-title">Edit Comment</h5>
-                                    <button type="button" class="close" data-dismiss="modal">
-                                    <span>&times;</span>
-                                    </button>
-                                </div>
-                                <div class="modal-body">
-                                    <div class="form-group">
-                                        <label for="message">Update your message here:</label>
-                                        <textarea required class="form-control" name="message" rows="3">{{ $comment->comment }}</textarea>
-                                        <small class="form-text text-muted"><a target="_blank" href="https://help.github.com/articles/basic-writing-and-formatting-syntax">Markdown cheatsheet.</a></small>
-                                    </div>
-                                </div>
-                                <div class="modal-footer">
-                                    <button type="button" class="btn btn-sm btn-outline-secondary text-uppercase" data-dismiss="modal">Cancel</button>
-                                    <button type="submit" class="btn btn-sm btn-outline-success text-uppercase">Update</button>
-                                </div>
-                            </form>
-                        </div>
-                    </div>
+@if ($comment->deleted_at == null)
+    <div id="comment-{{ $comment->getKey() }}" class="{{ isset($reply) && $reply === true ? 'comment_replies border-left col-12 column mw-100 pr-0' : '' }} pt-4" style="flex-basis: 100%;">
+        <div class="media-body row mw-100 mx-0" style="flex:1;flex-wrap:wrap;">
+            {{-- Show avatar if not compact --}}
+            @if (isset($compact) && !$compact)
+                <div class="d-none d-md-block">
+                    <img class="mr-3 mt-2" src="{{ $comment->commenter->avatarUrl }}" style="width:70px; height:70px; border-radius:50%;" alt="{{ $comment->commenter->name }} Avatar">
                 </div>
-            @endcan
+            @endif
 
-            @can('reply-to-comment', $comment)
-                <div class="modal fade" id="reply-modal-{{ $comment->getKey() }}" tabindex="-1" role="dialog">
-                    <div class="modal-dialog" role="document">
-                        <div class="modal-content">
-                            <form method="POST" action="{{ route('comments.reply', $comment->getKey()) }}">
-                                @csrf
-                                <div class="modal-header">
-                                    <h5 class="modal-title">Reply to Comment</h5>
-                                    <button type="button" class="close" data-dismiss="modal">
-                                    <span>&times;</span>
-                                    </button>
-                                </div>
-                                <div class="modal-body">
-                                    <div class="form-group">
-                                        <label for="message">Enter your message here:</label>
-                                        <textarea required class="form-control" name="message" rows="3"></textarea>
-                                        <small class="form-text text-muted"><a target="_blank" href="https://help.github.com/articles/basic-writing-and-formatting-syntax">Markdown cheatsheet.</a></small>
-                                    </div>
-                                </div>
-                                <div class="modal-footer">
-                                    <button type="button" class="btn btn-sm btn-outline-secondary text-uppercase" data-dismiss="modal">Cancel</button>
-                                    <button type="submit" class="btn btn-sm btn-outline-success text-uppercase">Reply</button>
-                                </div>
-                            </form>
-                        </div>
-                    </div>
-                </div>
-            @endcan 
+            {{-- Main comment block --}}
+            <div class="d-block" style="flex:1">
 
-            @can('delete-comment', $comment)
-                <div class="modal fade" id="delete-modal-{{ $comment->getKey() }}" tabindex="-1" role="dialog">
-                    <div class="modal-dialog" role="document">
-                        <div class="modal-content">
-                            <div class="modal-header">
-                                <h5 class="modal-title">Delete Comment</h5>
-                                <button type="button" class="close" data-dismiss="modal">
-                                    <span>&times;</span>
-                                    </button>
-                                        </div>
-                                <div class="modal-body">
-                                    <div class="form-group">Are you sure you want to delete this comment?</div></div>
-                                    <div class="alert alert-warning"><strong>Comments can be restored in the database.</strong> <br> Deleting a comment does not delete the comment record.</div>
-                                    <a href="{{ route('comments.destroy', $comment->getKey()) }}" onclick="event.preventDefault();document.getElementById('comment-delete-form-{{ $comment->getKey() }}').submit();" class="btn btn-danger text-uppercase">Delete</a>
-                            <form id="comment-delete-form-{{ $comment->getKey() }}" action="{{ route('comments.destroy', $comment->getKey()) }}" method="POST" style="display: none;">
-                                @method('DELETE')
-                                @csrf
-                            </form>
-                        </div>
-                    </div>
+                {{-- Comment block header --}}
+                <div class="row mx-0 px-0 align-items-md-end">
+                    <h5 class="mt-0 mb-1 col mx-0 px-0">
+                        {!! $comment->commenter->commentDisplayName !!} @if ($comment->commenter->isStaff == true)
+                            <small class="text-success">Staff Member</small>
+                        @endif
+                    </h5>
+                    @if ($comment->is_featured)
+                        <div class="ml-1 text-muted text-right col-6 mx-0 pr-1"><small class="text-success">Featured by Owner</small></div>
+                    @endif
                 </div>
-            @endcan 
 
-            <div class="modal fade" id="feature-modal-{{ $comment->getKey() }}" tabindex="-1" role="dialog">
-                <div class="modal-dialog" role="document">
-                    <div class="modal-content">
-                        <div class="modal-header">
-                            <h5 class="modal-title">{{ $comment->is_featured ? 'Unf' : 'F' }}eature Comment</h5>
-                            <button type="button" class="close" data-dismiss="modal">
-                            <span>&times;</span>
-                            </button>
-                        </div>
-                        <div class="modal-body">
-                            <div class="form-group">Are you sure you want to {{ $comment->is_featured ? 'un' : '' }}feature this comment?</div>
-                        </div>
-                        <div class="alert alert-warning">Comments can be unfeatured.</div>
-                        {!! Form::open(['url' => 'comments/'.$comment->id.'/feature']) !!}
-                            @if(!$comment->is_featured) {!! Form::submit('Feature', ['class' => 'btn btn-primary w-100 mb-0 mx-0']) !!}
-                            @else {!! Form::submit('Unfeature', ['class' => 'btn btn-primary w-100 mb-0 mx-0']) !!}
+                {{-- Comment --}}
+                <div
+                    class="comment border p-3 rounded {{ $comment->is_featured ? 'border-success bg-light' : '' }} {{ $comment->likes()->where('is_like', 1)->count() -$comment->likes()->where('is_like', 0)->count() <0? 'bg-light bg-gradient': '' }}">
+                    {!! config('lorekeeper.settings.wysiwyg_comments') ? $comment->comment : '<p>' . nl2br($markdown->line(strip_tags($comment->comment))) . '</p>' !!}
+                    <p class="border-top pt-1 text-right mb-0">
+                        <small class="text-muted">{!! $comment->created_at !!}
+                            @if ($comment->created_at != $comment->updated_at)
+                                <span class="text-muted border-left mx-1 px-1">(Edited {!! $comment->updated_at !!})
+                                    @if (Auth::check() && Auth::user()->isStaff)
+                                        <a href="#" data-toggle="modal" data-target="#show-edits-{{ $comment->id }}">Edit History</a>
+                                    @endif
+                                </span>
                             @endif
-                        {!! Form::close() !!}
-                    </div>
+                        </small>
+                        @if ($comment->type == 'User-User')
+                            <a href="{{ url('comment/') . '/' . $comment->id }}"><i class="fas fa-link ml-1" style="opacity: 50%;"></i></a>
+                        @endif
+                        <a href="{{ url('reports/new?url=') . $comment->url }}"><i class="fas fa-exclamation-triangle" data-toggle="tooltip" title="Click here to report this comment." style="opacity: 50%;"></i></a>
+                    </p>
                 </div>
-            </div>
 
-            
-        </div>
+                @include('comments._actions', ['comment' => $comment, 'compact' => isset($compact) ? $compact : false])
+
+            </div>
 
-            <br /><br />{{-- Margin bottom --}}
             {{-- Recursion for children --}}
-            <div class="w-100 mw-100">
-                @if($grouped_comments->has($comment->getKey()))
-                    @foreach($grouped_comments[$comment->getKey()] as $child)
+            <div class="mt-3 w-100 mw-100">
+                @if ($grouped_comments->has($comment->getKey()))
+                    @foreach ($grouped_comments[$comment->getKey()] as $child)
                         @php $limit++; @endphp
 
-                        @if($limit >= 3) 
-                            <a href="{{ url('comment/').'/'.$comment->id }}"><span class="btn btn-secondary w-100 my-2">See More Replies</span></a>
-                            @break
+                        @if ($limit >= 3)
+                            <a href="{{ url('comment/') . '/' . $comment->id }}"><span class="btn btn-secondary w-100 my-2">See More Replies</span></a>
+                        @break
+                    @endif
+
+                    @include('comments::_comment', [
+                        'comment' => $child,
+                        'reply' => true,
+                        'grouped_comments' => $grouped_comments,
+                    ])
+                @endforeach
+            @endif
+        </div>
+    </div>
+</div>
+@else
+<div id="comment-{{ $comment->getKey() }}" class="{{ isset($reply) && $reply === true ? 'comment_replies border-left col-12 column mw-100 pr-0' : '' }} pt-4" style="flex-basis: 100%;">
+    <div class="media-body row mw-100 mx-0 mb-3" style="flex:1;flex-wrap:wrap;">
+        @if (isset($compact) && !$compact)
+            <div class="d-none d-md-block">
+                <img class="mr-3 mt-2" src="/images/avatars/default.jpg" style="width:70px; height:70px; border-radius:50%;" alt="Default Avatar">
+            </div>
+        @endif
+        <div class="d-block bg-light" style="flex:1">
+            <div class="border p-3 rounded">
+                <p>Comment deleted</p>
+                <p class="border-top pt-1 text-right mb-0">
+                    <small class="text-muted">{!! $comment->created_at !!}
+                        @if ($comment->created_at != $comment->deleted_at)
+                            <span class="text-muted border-left mx-1 px-1">(Deleted {!! $comment->deleted_at !!})</span>
                         @endif
+                    </small>
+                    @if ($comment->type == 'User-User')
+                        <a href="{{ url('comment/') . '/' . $comment->id }}"><i class="fas fa-link ml-1" style="opacity: 50%;"></i></a>
+                    @endif
+                </p>
+            </div>
+        </div>
+
+        {{-- Recursion for children --}}
+        <div class="w-100 mw-100">
+            @if ($grouped_comments->has($comment->getKey()))
+                @foreach ($grouped_comments[$comment->getKey()] as $child)
+                    @php $limit++; @endphp
 
-                        @include('comments::_comment', [
-                            'comment' => $child,
-                            'reply' => true,
-                            'grouped_comments' => $grouped_comments
-                        ])
-                    @endforeach
+                    @if ($limit >= 3)
+                        <a href="{{ url('comment/') . '/' . $comment->id }}"><span class="btn btn-secondary w-100 my-2">See More Replies</span></a>
+                    @break
                 @endif
-            </div>
 
+                @include('comments::_comment', [
+                    'comment' => $child,
+                    'reply' => true,
+                    'grouped_comments' => $grouped_comments,
+                ])
+            @endforeach
+        @endif
     </div>
-  </div>
\ No newline at end of file
+</div>
+</div>
+@endif
diff --git a/resources/views/comments/_form.blade.php b/resources/views/comments/_form.blade.php
index 20a36655d5..8b8a5ccd26 100644
--- a/resources/views/comments/_form.blade.php
+++ b/resources/views/comments/_form.blade.php
@@ -1,32 +1,15 @@
-<div class="card">
+<div class="card mt-3">
     <div class="card-body">
-        @if($errors->has('commentable_type'))
-            <div class="alert alert-danger" role="alert">
-                {{ $errors->first('commentable_type') }}
-            </div>
-        @endif
-        @if($errors->has('commentable_id'))
-            <div class="alert alert-danger" role="alert">
-                {{ $errors->first('commentable_id') }}
-            </div>
-        @endif
-        <form method="POST" action="{{ route('comments.store') }}">
-            @csrf
-            @honeypot
-            <input type="hidden" name="commentable_type" value="\{{ get_class($model) }}" />
-            <input type="hidden" name="commentable_id" value="{{ $model->getKey() }}" />
-            <input type="hidden" name="type" value="{{ isset($type) ? $type : null }}" />
+        {!! Form::open(['url' => 'comments/make/' . base64_encode(urlencode(get_class($model))) . '/' . $model->getKey()]) !!}
+        <input type="hidden" name="type" value="{{ isset($type) ? $type : null }}" />
+        <div class="form-group">
+            {!! Form::label('message', 'Enter your message here:') !!}
+            {!! Form::textarea('message', null, ['class' => 'form-control ' . (config('lorekeeper.settings.wysiwyg_comments') ? 'comment-wysiwyg' : ''), 'rows' => 5, config('lorekeeper.settings.wysiwyg_comments') ? '' : 'required']) !!}
+            <small class="form-text text-muted"><a target="_blank" href="https://help.github.com/articles/basic-writing-and-formatting-syntax">Markdown</a> cheatsheet.</small>
+        </div>
 
-            <div class="form-group">
-                <label for="message">Enter your message here:</label>
-                <textarea class="form-control @if($errors->has('message')) is-invalid @endif" name="message" rows="3"></textarea>
-                <div class="invalid-feedback">
-                    Your message is required.
-                </div>
-                <small class="form-text text-muted"><a target="_blank" href="https://help.github.com/articles/basic-writing-and-formatting-syntax">Markdown</a> cheatsheet.</small>
-            </div>
-            <button type="submit" class="btn btn-sm btn-outline-success text-uppercase">Submit</button>
-        </form>
+        {!! Form::submit('Submit', ['class' => 'btn btn-sm btn-outline-success text-uppercase']) !!}
+        {!! Form::close() !!}
     </div>
 </div>
-<br />
\ No newline at end of file
+<br />
diff --git a/resources/views/comments/_perma_comments.blade.php b/resources/views/comments/_perma_comments.blade.php
index f23b5f2d01..9b31cc6ad6 100644
--- a/resources/views/comments/_perma_comments.blade.php
+++ b/resources/views/comments/_perma_comments.blade.php
@@ -1,180 +1,128 @@
 @inject('markdown', 'Parsedown')
-@php 
+@php
     $markdown->setSafeMode(true);
 @endphp
-@if(isset($reply) && $reply === true)
-  <div id="comment-{{ $comment->getKey() }}" class="comment_replies border-left col-12 column mw-100 pr-0 pt-4" style="flex-basis: 100%;">
-@else
-  <div id="comment-{{ $comment->getKey() }}"  class="pt-4" style="flex-basis: 100%;">
-@endif
-<div class="media-body row mw-100 mx-0" style="flex:1;flex-wrap:wrap;">
-    <div class="d-none d-md-block">
-        <img class="mr-3 mt-2" src="/images/avatars/{{ $comment->commenter->avatar }}" style="width:70px; height:70px; border-radius:50%;" alt="{{ $comment->commenter->name }} Avatar">
-    </div>
-    <div class="d-block" style="flex:1">
-        <div class="row mx-0 px-0 align-items-md-end">
-            <h5 class="mt-0 mb-1 col mx-0 px-0">
-                {!! $comment->commenter->commentDisplayName !!} @if($comment->commenter->isStaff == true)<small class="text-muted">Staff Member</small>@endif
-            </h5>
-            @if($comment->is_featured)<div class="ml-1 text-muted text-right col-6 mx-0 pr-1"><small class="text-success">Featured by Owner</small></div> @endif
-        </div>
-        <div class="border p-3 rounded {{ $limit == 0 ? 'shadow-sm border-info' : '' }} {{ ($comment->is_featured && ($limit != 0)) ? 'border-success' : '' }} "><p>{!! nl2br($markdown->line($comment->comment)) !!} </p>
-        <p class="border-top pt-1 text-right mb-0">
-            <small class="text-muted">{!! $comment->created_at !!}
-            @if($comment->created_at != $comment->updated_at) 
-                <span class="text-muted border-left mx-1 px-1">(Edited {!! ($comment->updated_at) !!})</span>
-            @endif
-            </small>
-            <a href="{{ url('comment/').'/'.$comment->id }}"><i class="fas fa-link ml-1" style="opacity: 50%;"></i></a>
-        </p>
-    </div>
-    @if(Auth::check())
-        <div class="my-1">
-            @can('reply-to-comment', $comment)
-                <button data-toggle="modal" data-target="#reply-modal-{{ $comment->getKey() }}" class="btn btn-sm px-3 py-2 px-sm-2 py-sm-1  btn-faded text-uppercase"><i class="fas fa-comment"></i><span class="ml-2 d-none d-sm-inline-block">Reply</span></button>
-            @endcan
-            @can('edit-comment', $comment)
-                <button data-toggle="modal" data-target="#comment-modal-{{ $comment->getKey() }}" class="btn btn-sm px-3 py-2 px-sm-2 py-sm-1  btn-faded text-uppercase"><i class="fas fa-edit"></i><span class="ml-2 d-none d-sm-inline-block">Edit</span></button>
-            @endcan
-            @if((Auth::user()->id == $comment->commentable_id) || Auth::user()->isStaff)
-                <button data-toggle="modal" data-target="#feature-modal-{{ $comment->getKey() }}" class="btn btn-sm px-3 py-2 px-sm-2 py-sm-1  btn-faded text-success text-uppercase"><i class="fas fa-star"></i><span class="ml-2 d-none d-sm-inline-block">{{$comment->is_featured ? 'Unf' : 'F' }}eature Comment</span></button>
-            @endif
-            @can('delete-comment', $comment)
-                <button data-toggle="modal" data-target="#delete-modal-{{ $comment->getKey() }}" class="btn btn-sm px-3 py-2 px-sm-2 py-sm-1 btn-outline-danger text-uppercase"><i class="fas fa-minus-circle"></i><span class="ml-2 d-none d-sm-inline-block">Delete</span></button>
-            @endcan
-        </div>
+
+@if ($comment->deleted_at == null)
+    @if (isset($reply) && $reply === true)
+        <div id="comment-{{ $comment->getKey() }}" class="comment_replies border-left col-12 column mw-100 pr-0 pt-4" style="flex-basis: 100%;">
+        @else
+            <div id="comment-{{ $comment->getKey() }}" class="pt-4" style="flex-basis: 100%;">
     @endif
-    
-        @can('edit-comment', $comment)
-            <div class="modal fade" id="comment-modal-{{ $comment->getKey() }}" tabindex="-1" role="dialog">
-                <div class="modal-dialog" role="document">
-                    <div class="modal-content">
-                        <form method="POST" action="{{ route('comments.update', $comment->getKey()) }}">
-                            @method('PUT')
-                            @csrf
-                            <div class="modal-header">
-                                <h5 class="modal-title">Edit Comment</h5>
-                                <button type="button" class="close" data-dismiss="modal">
-                                <span>&times;</span>
-                                </button>
-                            </div>
-                            <div class="modal-body">
-                                <div class="form-group">
-                                    <label for="message">Update your message here:</label>
-                                    <textarea required class="form-control" name="message" rows="3">{{ $comment->comment }}</textarea>
-                                    <small class="form-text text-muted"><a target="_blank" href="https://help.github.com/articles/basic-writing-and-formatting-syntax">Markdown cheatsheet.</a></small>
-                                </div>
-                            </div>
-                            <div class="modal-footer">
-                                <button type="button" class="btn btn-sm btn-outline-secondary text-uppercase" data-dismiss="modal">Cancel</button>
-                                <button type="submit" class="btn btn-sm btn-outline-success text-uppercase">Update</button>
-                            </div>
-                        </form>
-                    </div>
-                </div>
+    <div class="media-body row mw-100 mx-0" style="flex:1;flex-wrap:wrap;">
+        <div class="d-none d-md-block">
+            <img class="mr-3 mt-2" src="{{ $comment->commenter->avatarUrl }}" style="width:70px; height:70px; border-radius:50%;" alt="{{ $comment->commenter->name }}'s Avatar">
+        </div>
+        <div class="d-block" style="flex:1">
+            <div class="row mx-0 px-0 align-items-md-end">
+                <h5 class="mt-0 mb-1 col mx-0 px-0">
+                    {!! $comment->commenter->commentDisplayName !!} @if ($comment->commenter->isStaff == true)
+                        <small class="text-muted">Staff Member</small>
+                    @endif
+                </h5>
+                @if ($comment->is_featured)
+                    <div class="ml-1 text-muted text-right col-6 mx-0 pr-1"><small class="text-success">Featured by Owner</small></div>
+                @endif
             </div>
-        @endcan
-
-        @can('reply-to-comment', $comment)
-            <div class="modal fade" id="reply-modal-{{ $comment->getKey() }}" tabindex="-1" role="dialog">
-                <div class="modal-dialog" role="document">
-                    <div class="modal-content">
-                        <form method="POST" action="{{ route('comments.reply', $comment->getKey()) }}">
-                            @csrf
-                            <div class="modal-header">
-                                <h5 class="modal-title">Reply to Comment</h5>
-                                <button type="button" class="close" data-dismiss="modal">
-                                <span>&times;</span>
-                                </button>
-                            </div>
-                            <div class="modal-body">
-                                <div class="form-group">
-                                    <label for="message">Enter your message here:</label>
-                                    <textarea required class="form-control" name="message" rows="3"></textarea>
-                                    <small class="form-text text-muted"><a target="_blank" href="https://help.github.com/articles/basic-writing-and-formatting-syntax">Markdown cheatsheet.</a></small>
-                                </div>
-                            </div>
-                            <div class="modal-footer">
-                                <button type="button" class="btn btn-sm btn-outline-secondary text-uppercase" data-dismiss="modal">Cancel</button>
-                                <button type="submit" class="btn btn-sm btn-outline-success text-uppercase">Reply</button>
-                            </div>
-                        </form>
-                    </div>
-                </div>
+            <div
+                class="comment border p-3 rounded {{ $limit == 0 ? 'shadow-sm border-info' : '' }} {{ $comment->is_featured && $limit != 0 ? 'border-success' : '' }} {{ $comment->likes()->where('is_like', 1)->count() -$comment->likes()->where('is_like', 0)->count() <0? 'bg-light bg-gradient': '' }}">
+                <p>
+                    {!! config('lorekeeper.settings.wysiwyg_comments') ? $comment->comment : '<p>' . nl2br($markdown->line(strip_tags($comment->comment))) . '</p>' !!}
+                </p>
+                <p class="border-top pt-1 text-right mb-0">
+                    <small class="text-muted">{!! $comment->created_at !!}
+                        @if ($comment->created_at != $comment->updated_at)
+                            <span class="text-muted border-left mx-1 px-1">(Edited {!! $comment->updated_at !!})
+                                @if (Auth::check() && Auth::user()->isStaff)
+                                    <a href="#" data-toggle="modal" data-target="#show-edits-{{ $comment->id }}">Edit History</a>
+                                @endif
+                            </span>
+                        @endif
+                    </small>
+                    <a href="{{ url('comment/') . '/' . $comment->id }}"><i class="fas fa-link ml-1" style="opacity: 50%;"></i></a>
+                    <a href="{{ url('reports/new?url=') . $comment->url }}"><i class="fas fa-exclamation-triangle" data-toggle="tooltip" title="Click here to report this comment." style="opacity: 50%;"></i></a>
+                </p>
             </div>
-        @endcan 
 
-        @can('delete-comment', $comment)
-            <div class="modal fade" id="delete-modal-{{ $comment->getKey() }}" tabindex="-1" role="dialog">
-                <div class="modal-dialog" role="document">
-                    <div class="modal-content">
-                        <div class="modal-header">
-                            <h5 class="modal-title">Delete Comment</h5>
-                            <button type="button" class="close" data-dismiss="modal">
-                                <span>&times;</span>
-                                </button>
-                                    </div>
-                            <div class="modal-body">
-                                <div class="form-group">Are you sure you want to delete this comment?</div></div>
-                                <div class="alert alert-warning"><strong>Comments can be restored in the database.</strong> <br> Deleting a comment does not delete the comment record.</div>
-                                <a href="{{ route('comments.destroy', $comment->getKey()) }}" onclick="event.preventDefault();document.getElementById('comment-delete-form-{{ $comment->getKey() }}').submit();" class="btn btn-danger text-uppercase">Delete</a>
-                        <form id="comment-delete-form-{{ $comment->getKey() }}" action="{{ route('comments.destroy', $comment->getKey()) }}" method="POST" style="display: none;">
-                            @method('DELETE')
-                            @csrf
-                        </form>
-                    </div>
-                </div>
-            </div>
-        @endcan 
+            @include('comments._actions', ['comment' => $comment, 'compact' => isset($compact) ? $compact : false])
 
-        <div class="modal fade" id="feature-modal-{{ $comment->getKey() }}" tabindex="-1" role="dialog">
-            <div class="modal-dialog" role="document">
-                <div class="modal-content">
-                    <div class="modal-header">
-                        <h5 class="modal-title">{{ $comment->is_featured ? 'Unf' : 'F' }}eature Comment</h5>
-                        <button type="button" class="close" data-dismiss="modal">
-                        <span>&times;</span>
-                        </button>
-                    </div>
-                    <div class="modal-body">
-                        <div class="form-group">Are you sure you want to {{ $comment->is_featured ? 'un' : '' }}feature this comment?</div>
-                    </div>
-                    <div class="alert alert-warning">Comments can be unfeatured.</div>
-                    {!! Form::open(['url' => 'comments/'.$comment->id.'/feature']) !!}
-                        @if(!$comment->is_featured) {!! Form::submit('Feature', ['class' => 'btn btn-primary w-100 mb-0 mx-0']) !!}
-                        @else {!! Form::submit('Unfeature', ['class' => 'btn btn-primary w-100 mb-0 mx-0']) !!}
-                        @endif
-                    {!! Form::close() !!}
-                </div>
-            </div>
-    </div>
-</div>
+        </div>
 
-        
-{{-- add a limit check so if limit is reached but replies are still presnt to display a button with current amount of replies
+        {{-- add a limit check so if limit is reached but replies are still presnt to display a button with current amount of replies
 use child function
-url should be equal to the last replies permalink (e.g reply 5)--}}
+url should be equal to the last replies permalink (e.g reply 5) --}}
 
 
         {{-- Recursion for children --}}
         <div class="w-100 mw-100">
             @php $children = $depth == 0 ? $comment->children->sortByDesc('created_at')->paginate(5) : $comment->children->sortByDesc('created_at') @endphp
-            @foreach($children as $reply)
+            @foreach ($children as $reply)
                 @php $limit++; @endphp
 
-                @if($limit >= 5 && $depth >= 1) 
-                    <a href="{{ url('comment/').'/'.$comment->id }}"><span class="btn btn-secondary w-100">See More Replies</span></a>
-                    @break
-                @endif
+                @if ($limit >= 5 && $depth >= 1)
+                    <a href="{{ url('comment/') . '/' . $comment->id }}"><span class="btn btn-secondary w-100">See More Replies</span></a>
+                @break
+            @endif
 
-                @include('comments._perma_comments', [
-                    'comment' => $reply,
-                    'reply' => true,
-                    'limit' => $limit,
-                    'depth' => $depth+1
-                ])
-                @endforeach
-            @if($depth == 0) {!! $children->render() !!} @endif
+            @include('comments._perma_comments', [
+                'comment' => $reply,
+                'reply' => true,
+                'limit' => $limit,
+                'depth' => $depth + 1,
+            ])
+        @endforeach
+        @if ($depth == 0)
+            {!! $children->render() !!}
+        @endif
+    </div>
+</div>
+</div>
+@else
+@if (isset($reply) && $reply === true)
+    <div id="comment-{{ $comment->getKey() }}" class="comment_replies border-left col-12 column mw-100 pr-0 pt-4" style="flex-basis: 100%;">
+    @else
+        <div id="comment-{{ $comment->getKey() }}" class="pt-4" style="flex-basis: 100%;">
+@endif
+<div class="media-body row mw-100 mx-0" style="flex:1;flex-wrap:wrap;">
+    <div class="d-none d-md-block">
+        <img class="mr-3 mt-2" src="/images/avatars/default.jpg" style="width:70px; height:70px; border-radius:50%;" alt="Default Avatar">
+    </div>
+    <div class="d-block bg-light" style="flex:1">
+        <div class="border p-3 rounded {{ $limit == 0 ? 'shadow-sm border-info' : '' }}">
+            <p>Comment deleted </p>
+            <p class="border-top pt-1 text-right mb-0">
+                <small class="text-muted">{!! $comment->created_at !!}
+                    @if ($comment->created_at != $comment->deleted_at)
+                        <span class="text-muted border-left mx-1 px-1">(Deleted {!! $comment->deleted_at !!})</span>
+                    @endif
+                </small>
+                <a href="{{ url('comment/') . '/' . $comment->id }}"><i class="fas fa-link ml-1" style="opacity: 50%;"></i></a>
+            </p>
         </div>
     </div>
-</div>
\ No newline at end of file
+
+    {{-- Recursion for children --}}
+    <div class="w-100 mw-100">
+        @php $children = $depth == 0 ? $comment->children->sortByDesc('created_at')->paginate(5) : $comment->children->sortByDesc('created_at') @endphp
+        @foreach ($children as $reply)
+            @php $limit++; @endphp
+
+            @if ($limit >= 5 && $depth >= 1)
+                <a href="{{ url('comment/') . '/' . $comment->id }}"><span class="btn btn-secondary w-100">See More Replies</span></a>
+            @break
+        @endif
+
+        @include('comments._perma_comments', [
+            'comment' => $reply,
+            'reply' => true,
+            'limit' => $limit,
+            'depth' => $depth + 1,
+        ])
+    @endforeach
+    @if ($depth == 0)
+        {!! $children->render() !!}
+    @endif
+</div>
+</div>
+</div>
+@endif
diff --git a/resources/views/comments/_perma_layout.blade.php b/resources/views/comments/_perma_layout.blade.php
index ff94f31cd8..41d8188a35 100644
--- a/resources/views/comments/_perma_layout.blade.php
+++ b/resources/views/comments/_perma_layout.blade.php
@@ -1,24 +1,49 @@
 @extends('layouts.app')
 
-@section('title') Comments @endsection
+@section('title')
+    Comments
+@endsection
 
-@section('profile-title') Comment  @endsection
+@section('profile-title')
+    Comment
+@endsection
 
 @section('content')
+    <h1>Comments on {!! $comment->commentable_type == 'App\Models\User\UserProfile' ? $comment->commentable->user->displayName : $comment->commentable->displayName !!}</h1>
+    <h5>
+        @if (isset($comment->child_id))
+            <a href="{{ url('comment/') . '/' . $comment->child_id }}" class="btn btn-secondary btn-sm mr-2">See Parent</a>
+            <a href="{{ url('comment/') . '/' . $comment->topComment->id }}" class="btn btn-secondary btn-sm mr-2">Go To Top Comment</a>
+        @endif
+    </h5>
 
-<h1>Comments on {!! ($comment->commentable_type == 'App\Models\User\UserProfile') ? $comment->commentable->user->displayName : $comment->commentable->displayName !!}</h1>
-<h5>
-    @if(isset($comment->child_id)) 
-        <a href="{{ url('comment/').'/'. $comment->child_id }}" class="btn btn-secondary btn-sm mr-2">See Parent</a>    
-        <a href="{{ url('comment/').'/'. $comment->topComment->id }}" class="btn btn-secondary btn-sm mr-2">Go To Top Comment</a> 
-    @endif
-</h5>
-
-<hr>
-<br>
-<div class="d-flex mw-100 row mx-0" style="overflow:hidden;">
-    @include('comments._perma_comments', ['comment' => $comment, 'limit' => 0, 'depth' => 0])
-</div>
-
-
-@endsection
\ No newline at end of file
+    <hr>
+    <br>
+    <div class="d-flex mw-100 row mx-0" style="overflow:hidden;">
+        @include('comments._perma_comments', ['comment' => $comment, 'limit' => 0, 'depth' => 0])
+    </div>
+@endsection
+@section('scripts')
+    <script>
+        $(document).ready(function() {
+            tinymce.init({
+                selector: '.comment-wysiwyg',
+                height: 300,
+                menubar: false,
+                convert_urls: false,
+                plugins: [
+                    'advlist autolink lists link image charmap print preview anchor',
+                    'searchreplace visualblocks code fullscreen spoiler',
+                    'insertdatetime media table paste code help wordcount'
+                ],
+                toolbar: 'undo redo | formatselect | bold italic backcolor | alignleft aligncenter alignright alignjustify | bullist numlist outdent indent | link image | spoiler-add spoiler-remove | removeformat | code',
+                content_css: [
+                    '{{ asset('css/app.css') }}',
+                    '{{ asset('css/lorekeeper.css') }}'
+                ],
+                spoiler_caption: 'Toggle Spoiler',
+                target_list: false
+            });
+        });
+    </script>
+@endsection
diff --git a/resources/views/comments/comments.blade.php b/resources/views/comments/comments.blade.php
index ffcf9da767..463e0533c8 100644
--- a/resources/views/comments/comments.blade.php
+++ b/resources/views/comments/comments.blade.php
@@ -1,19 +1,21 @@
 @php
     if (isset($approved) and $approved == true) {
-        if(isset($type) && $type != null) $comments = $model->approvedComments->where('type', $type);
-        else $comments = $model->approvedComments->where('type', "User-User");
+        if (isset($type) && $type != null) {
+            $comments = $model->approvedComments->where('type', $type);
+        } else {
+            $comments = $model->approvedComments->where('type', 'User-User');
+        }
     } else {
-        if(isset($type) && $type != null) $comments = $model->commentz->where('type', $type);
-        else $comments = $model->commentz->where('type', "User-User");
+        if (isset($type) && $type != null) {
+            $comments = $model->commentz->where('type', $type);
+        } else {
+            $comments = $model->commentz->where('type', 'User-User');
+        }
     }
 @endphp
 
-@if($comments->count() < 1)
-    <div class="alert alert-warning">There are no comments yet.</div>
-@endif
-
-@if(!isset($type) || $type == "User-User")
-<h2>Comments</h2>
+@if (!isset($type) || $type == 'User-User')
+    <h2>Comments</h2>
 @endif
 <div class="d-flex mw-100 row mx-0" style="overflow:hidden;">
     @php
@@ -26,49 +28,49 @@
 
             $slicedParentComments = $parentComments->slice($page * $perPage, $perPage);
 
-            $m = Config::get('comments.model'); // This has to be done like this, otherwise it will complain.
-            $modelKeyName = (new $m)->getKeyName(); // This defaults to 'id' if not changed.
+            $m = config('comments.model'); // This has to be done like this, otherwise it will complain.
+            $modelKeyName = (new $m())->getKeyName(); // This defaults to 'id' if not changed.
 
             $slicedParentCommentsIds = $slicedParentComments->pluck($modelKeyName)->toArray();
 
             // Remove parent Comments from comments.
             $comments = $comments->where('child_id', '!=', '');
 
-            $grouped_comments = new \Illuminate\Pagination\LengthAwarePaginator(
-                $slicedParentComments->merge($comments)->groupBy('child_id'),
-                $parentComments->count(),
-                $perPage
-            );
+            $grouped_comments = new \Illuminate\Pagination\LengthAwarePaginator($slicedParentComments->merge($comments)->groupBy('child_id'), $parentComments->count(), $perPage);
 
             $grouped_comments->withPath(request()->url());
         } else {
             $grouped_comments = $comments->groupBy('child_id');
         }
     @endphp
-    @foreach($grouped_comments as $comment_id => $comments)
+    @foreach ($grouped_comments as $comment_id => $comments)
         {{-- Process parent nodes --}}
-        @if($comment_id == '')
-            @foreach($comments as $comment)
+        @if ($comment_id == '')
+            @foreach ($comments as $comment)
                 @include('comments::_comment', [
                     'comment' => $comment,
                     'grouped_comments' => $grouped_comments,
                     'limit' => 0,
-                    'compact' => ($comment->type == "Staff-Staff") ? true : false,
+                    'compact' => $comment->type == 'Staff-Staff' ? true : false,
+                    'allow_dislikes' => isset($allow_dislikes) ? $allow_dislikes : false,
                 ])
             @endforeach
         @endif
     @endforeach
 </div>
 
-@isset ($perPage)
-    {{ $grouped_comments->links() }}
+@if ($comments->count() < 1)
+    <div class="alert alert-warning">There are no comments yet.</div>
+@endif
+
+@isset($perPage)
+    <div class="ml-auto mt-2">{{ $grouped_comments->links() }}</div>
 @endisset
 
-<br><br><br>
 @auth
     @include('comments._form')
 @else
-    <div class="card">
+    <div class="card mt-3">
         <div class="card-body">
             <h5 class="card-title">Authentication required</h5>
             <p class="card-text">You must log in to post a comment.</p>
@@ -76,3 +78,29 @@
         </div>
     </div>
 @endauth
+
+@section('scripts')
+    @parent
+    <script>
+        $(document).ready(function() {
+            tinymce.init({
+                selector: '.comment-wysiwyg',
+                height: 250,
+                menubar: false,
+                convert_urls: false,
+                plugins: [
+                    'advlist autolink lists link image charmap print preview anchor',
+                    'searchreplace visualblocks code fullscreen spoiler',
+                    'insertdatetime media table paste code help wordcount'
+                ],
+                toolbar: 'undo redo | formatselect | bold italic backcolor | alignleft aligncenter alignright alignjustify | bullist numlist outdent indent | link image | spoiler-add spoiler-remove | removeformat | code',
+                content_css: [
+                    '{{ asset('css/app.css') }}',
+                    '{{ asset('css/lorekeeper.css') }}'
+                ],
+                spoiler_caption: 'Toggle Spoiler',
+                target_list: false
+            });
+        });
+    </script>
+@endsection
diff --git a/resources/views/components/admin-edit.blade.php b/resources/views/components/admin-edit.blade.php
new file mode 100644
index 0000000000..c9c20d8179
--- /dev/null
+++ b/resources/views/components/admin-edit.blade.php
@@ -0,0 +1,7 @@
+<div class="float-right">
+    <a href="{{ $object->adminUrl }}" data-toggle="tooltip" data-title="Edit {{ $title }}">
+        <!-- Uses default "crown" if the "pen" fontawesome icon isn't available. -->
+        <i class="fas fa-pen fa-crown"></i>
+        <span class="sr-only">Edit {{ $title }}</span>
+    </a>
+</div>
diff --git a/resources/views/galleries/_archive_submission.blade.php b/resources/views/galleries/_archive_submission.blade.php
index d507526c00..efe6839375 100644
--- a/resources/views/galleries/_archive_submission.blade.php
+++ b/resources/views/galleries/_archive_submission.blade.php
@@ -1,14 +1,15 @@
-@if($submission)
-    {!! Form::open(['url' => 'gallery/archive/'.$submission->id]) !!}
+@if ($submission)
+    {!! Form::open(['url' => 'gallery/archive/' . $submission->id]) !!}
 
-    <p>You are about to {{ $submission->is_visible ? 'archive' : 'unarchive' }} the submission <strong>{{ $submission->title }}</strong>. This is reversible; you will be able to {{ $submission->is_visible ? 'unarchive' : 'archive'}} the submission at any time. Archiving a submission hides it from view by other users, but not staff.</p>
+    <p>You are about to {{ $submission->is_visible ? 'archive' : 'unarchive' }} the submission <strong>{{ $submission->title }}</strong>. This is reversible; you will be able to {{ $submission->is_visible ? 'unarchive' : 'archive' }} the
+        submission at any time. Archiving a submission hides it from view by other users, but not staff.</p>
     <p>Are you sure you want to {{ $submission->is_visible ? 'archive' : 'unarchive' }} <strong>{{ $submission->title }}</strong>?</p>
 
     <div class="text-right">
-        {!! Form::submit(($submission->is_visible ? 'Archive' : 'Unarchive').' Submission', ['class' => 'btn btn-warning']) !!}
+        {!! Form::submit(($submission->is_visible ? 'Archive' : 'Unarchive') . ' Submission', ['class' => 'btn btn-warning']) !!}
     </div>
 
     {!! Form::close() !!}
-@else 
+@else
     Invalid submission selected.
-@endif
\ No newline at end of file
+@endif
diff --git a/resources/views/galleries/_character.blade.php b/resources/views/galleries/_character.blade.php
index e7947adb61..a2a255ebb9 100644
--- a/resources/views/galleries/_character.blade.php
+++ b/resources/views/galleries/_character.blade.php
@@ -1,5 +1,5 @@
-@if($character)
-    <div class="character-info float-left mr-2" data-id="{{ $character->id }}"><img src="{{ $character->image->thumbnailUrl }}" style="height:40px;" alt="Thumbnail image for {{ $character->fullName }}"/></div>
+@if ($character)
+    <div class="character-info float-left mr-2" data-id="{{ $character->id }}"><img src="{{ $character->image->thumbnailUrl }}" style="height:40px;" alt="Thumbnail image for {{ $character->fullName }}" /></div>
     <div><a href="{{ $character->url }}">{{ isset($character->name) ? $character->fullName : $character->slug }}</a></div>
 @else
     <div class="text-danger character-info" data-id="0">Character not found.</div>
diff --git a/resources/views/galleries/_character_select.blade.php b/resources/views/galleries/_character_select.blade.php
index 7d050f9d3a..d28615febd 100644
--- a/resources/views/galleries/_character_select.blade.php
+++ b/resources/views/galleries/_character_select.blade.php
@@ -1,3 +1,12 @@
+@php
+    $characters = \App\Models\Character\Character::visible(Auth::check() ? Auth::user() : null)
+        ->myo(0)
+        ->orderBy('slug', 'DESC')
+        ->get()
+        ->pluck('fullName', 'slug')
+        ->toArray();
+@endphp
+
 <div id="characterComponents" class="hide">
     <div class="submission-character mb-3">
         <div class="row">
@@ -8,14 +17,13 @@
                 </div>
             </div>
             <div class="col-md-7">
-                <a href="#" class="float-right fas fa-close"></a>
-                    <div class="form-group">
-                        {!! Form::text('slug[]', null, ['class' => 'form-control character-code', 'placeholder' => 'Character Code (EX-001, for example)']) !!}
-                    </div>
+                <div class="form-group">
+                    {!! Form::select('slug[]', $characters, null, ['class' => 'form-control character-code', 'placeholder' => 'Character Code (EX-001, for example)']) !!}
+                </div>
             </div>
             <div class="col-md-1 text-right">
                 <a href="#" class="remove-character text-muted"><i class="fas fa-times"></i></a>
             </div>
         </div>
     </div>
-</div>
\ No newline at end of file
+</div>
diff --git a/resources/views/galleries/_character_select_entry.blade.php b/resources/views/galleries/_character_select_entry.blade.php
index 6c97d1bdfe..a01033736b 100644
--- a/resources/views/galleries/_character_select_entry.blade.php
+++ b/resources/views/galleries/_character_select_entry.blade.php
@@ -1,21 +1,29 @@
+@php
+    $characters = \App\Models\Character\Character::visible(Auth::check() ? Auth::user() : null)
+        ->myo(0)
+        ->orderBy('slug', 'DESC')
+        ->get()
+        ->pluck('fullName', 'slug')
+        ->toArray();
+@endphp
+
 <div class="submission-character mb-3">
     <div class="row">
         <div class="col-md-4">
             <div>
                 <div class="character-image-blank hide">Enter character code.</div>
                 <div class="character-image-loaded">
-                    @include('galleries._character', ['character' => $character->character])
+                    @include('galleries._character', ['character' => $character->character ? $character->character : $character])
                 </div>
             </div>
         </div>
         <div class="col-md-7">
-            <a href="#" class="float-right fas fa-close"></a>
-                <div class="form-group">
-                    {!! Form::text('slug[]', $character->character->slug, ['class' => 'form-control character-code']) !!}
-                </div>
+            <div class="form-group">
+                {!! Form::select('slug[]', $characters, $character->character ? $character->character->slug : $character->slug, ['class' => 'form-control character-code', 'placeholder' => 'Select Character']) !!}
+            </div>
         </div>
         <div class="col-md-1 text-right">
             <a href="#" class="remove-character text-muted"><i class="fas fa-times"></i></a>
         </div>
     </div>
-</div>
\ No newline at end of file
+</div>
diff --git a/resources/views/galleries/_character_select_js.blade.php b/resources/views/galleries/_character_select_js.blade.php
index 717a798a9a..d17fbb09f1 100644
--- a/resources/views/galleries/_character_select_js.blade.php
+++ b/resources/views/galleries/_character_select_js.blade.php
@@ -14,13 +14,14 @@
             $clone = $components.find('.submission-character').clone();
             attachListeners($clone);
             $characters.append($clone);
+            $clone.find('.character-code').selectize();
             count++;
         });
 
         function attachListeners(node) {
             node.find('.character-code').on('change', function(e) {
                 var $parent = $(this).parent().parent().parent().parent();
-                $parent.find('.character-image-loaded').load('{{ url('gallery/submit/character') }}/'+$(this).val(), function(response, status, xhr) {
+                $parent.find('.character-image-loaded').load('{{ url('gallery/submit/character') }}/' + $(this).val(), function(response, status, xhr) {
                     $parent.find('.character-image-blank').addClass('hide');
                     $parent.find('.character-image-loaded').removeClass('hide');
                     $parent.find('.character-rewards').removeClass('hide');
@@ -33,4 +34,4 @@ function attachListeners(node) {
         }
 
     });
-</script>
\ No newline at end of file
+</script>
diff --git a/resources/views/galleries/_queue_submission.blade.php b/resources/views/galleries/_queue_submission.blade.php
index b56ba1e2a3..45df0fc2d0 100644
--- a/resources/views/galleries/_queue_submission.blade.php
+++ b/resources/views/galleries/_queue_submission.blade.php
@@ -6,42 +6,49 @@
             </div>
             <div class="col-md text-center align-self-center">
                 <h5>{!! $submission->displayName !!}</h5>
-                @if(isset($submission->content_warning))
+                @if (isset($submission->content_warning))
                     <p><span class="text-danger"><strong>Content Warning:</strong></span> {!! nl2br(htmlentities($submission->content_warning)) !!}</p>
                 @endif
-                @if(isset($queue) && $queue)
-                <span style="font-size:95%;" class="badge badge-{{ $submission->status == 'Accepted' ? 'success' : ($submission->status == 'Rejected' ? 'danger' : 'secondary') }}">{{ $submission->status }}</span> ・
+                @if (isset($queue) && $queue)
+                    <span style="font-size:95%;" class="badge badge-{{ $submission->status == 'Accepted' ? 'success' : ($submission->status == 'Rejected' ? 'danger' : 'secondary') }}">{{ $submission->status }}</span> ・
                 @endif
-                In {!! $submission->gallery->displayName !!} ・ By {!! $submission->credits !!}<br/>
+                In {!! $submission->gallery->displayName !!} ・ By {!! $submission->credits !!}<br />
                 Submitted {!! pretty_date($submission->created_at) !!} ・ Last updated {!! pretty_date($submission->updated_at) !!}
 
-                @if($submission->status == 'Pending' && $submission->collaboratorApproved && Auth::user()->hasPower('manage_submissions'))
+                @if ($submission->status == 'Pending' && $submission->collaboratorApproved && Auth::user()->hasPower('manage_submissions'))
                     <?php
-                        $rejectSum[$key] = 0;
-                        $approveSum[$key] = 0;
-                        foreach($submission->voteData as $voter=>$vote) {
-                            if($vote == 1) $rejectSum[$key] += 1;
-                            if($vote == 2) $approveSum[$key] += 1;
+                    $rejectSum[$key] = 0;
+                    $approveSum[$key] = 0;
+                    foreach ($submission->voteData as $voter => $vote) {
+                        if ($vote == 1) {
+                            $rejectSum[$key] += 1;
                         }
+                        if ($vote == 2) {
+                            $approveSum[$key] += 1;
+                        }
+                    }
                     ?>
                     <div class="row mt-2">
                         <div class="col-6 text-right text-danger">
                             {{ $rejectSum[$key] }}/{{ $submission->gallery->votes_required }}
-                            {!! Form::open(['url' => 'admin/gallery/edit/'.$submission->id.'/reject', 'id' => 'voteRejectForm']) !!}
-                                <button class="btn {{ $submission->voteData->get(Auth::user()->id) == 1 ? 'btn-danger' : 'btn-outline-danger' }}" style="min-width:40px;" data-action="reject"><i class="fas fa-times"></i></button>
+                            {!! Form::open(['url' => 'admin/gallery/edit/' . $submission->id . '/reject', 'id' => 'voteRejectForm']) !!}
+                            <button class="btn {{ $submission->voteData->get(Auth::user()->id) == 1 ? 'btn-danger' : 'btn-outline-danger' }}" style="min-width:40px;" data-action="reject"><i class="fas fa-times"></i></button>
                             {!! Form::close() !!}
                         </div>
                         <div class="col-6 text-left text-success">
                             {{ $approveSum[$key] }}/{{ $submission->gallery->votes_required }}
-                            {!! Form::open(['url' => 'admin/gallery/edit/'.$submission->id.'/accept', 'id' => 'voteApproveForm']) !!}
-                                <button class="btn {{ $submission->voteData->get(Auth::user()->id) == 2 ? 'btn-success' : 'btn-outline-success' }}" style="min-width:40px;" data-action="approve"><i class="fas fa-check"></i></button>
+                            {!! Form::open(['url' => 'admin/gallery/edit/' . $submission->id . '/accept', 'id' => 'voteApproveForm']) !!}
+                            <button class="btn {{ $submission->voteData->get(Auth::user()->id) == 2 ? 'btn-success' : 'btn-outline-success' }}" style="min-width:40px;" data-action="approve"><i class="fas fa-check"></i></button>
                             {!! Form::close() !!}
                         </div>
                     </div>
                 @endif
 
-                @if(isset($queue) && $queue)
-                    <h6 class="mt-2">{{ App\Models\Comment::where('commentable_type', 'App\Models\Gallery\GallerySubmission')->where('commentable_id', $submission->id)->where('type', 'Staff-User')->count() }} {{ Auth::user()->hasPower('manage_submissions') ? 'Staff↔User Comment'.(App\Models\Comment::where('commentable_type', 'App\Models\Gallery\GallerySubmission')->where('commentable_id', $submission->id)->where('type', 'Staff-User')->count() != 1 ? 's' : '').' ・ ' : 'Staff Comment' }}{{ Auth::user()->hasPower('manage_submissions') ? App\Models\Comment::where('commentable_type', 'App\Models\Gallery\GallerySubmission')->where('commentable_id', $submission->id)->where('type', 'Staff-Staff')->count().' Staff↔Staff Comment'.(App\Models\Comment::where('commentable_type', 'App\Models\Gallery\GallerySubmission')->where('commentable_id', $submission->id)->where('type', 'Staff-Staff')->count() != 1 ? 's' : '') : '' }}</h6>
+                @if (isset($queue) && $queue)
+                    <h6 class="mt-2">{{ App\Models\Comment\Comment::where('commentable_type', 'App\Models\Gallery\GallerySubmission')->where('commentable_id', $submission->id)->where('type', 'Staff-User')->count() }}
+                        {{ Auth::user()->hasPower('manage_submissions')? 'Staff↔User Comment' .(App\Models\Comment\Comment::where('commentable_type', 'App\Models\Gallery\GallerySubmission')->where('commentable_id', $submission->id)->where('type', 'Staff-User')->count() != 1? 's': '') .' ・ ': 'Staff Comment' }}
+                        {{ Auth::user()->hasPower('manage_submissions')? App\Models\Comment\Comment::where('commentable_type', 'App\Models\Gallery\GallerySubmission')->where('commentable_id', $submission->id)->where('type', 'Staff-Staff')->count() .' Staff↔Staff Comment' .(App\Models\Comment\Comment::where('commentable_type', 'App\Models\Gallery\GallerySubmission')->where('commentable_id', $submission->id)->where('type', 'Staff-Staff')->count() != 1? 's': ''): '' }}
+                    </h6>
                     <h6 class="mt-2"><a href="{{ $submission->queueUrl }}">Detailed Log</a></h6>
                 @endif
             </div>
diff --git a/resources/views/galleries/_sidebar.blade.php b/resources/views/galleries/_sidebar.blade.php
index 6ade0e7198..960e12669a 100644
--- a/resources/views/galleries/_sidebar.blade.php
+++ b/resources/views/galleries/_sidebar.blade.php
@@ -5,24 +5,48 @@
         <li class="sidebar-section">
             <div class="sidebar-section-header">My Submissions</div>
             <div class="sidebar-item"><a href="{{ url('gallery/submissions/pending') }}" class="{{ set_active('gallery/submissions*') }}">My Submission Queue</a></div>
-            <div class="sidebar-item"><a href="{{ url('user/'.Auth::user()->name.'/gallery') }}" class="{{ set_active('user/'.Auth::user()->name.'/gallery') }}">My Gallery</a></div>
-            <div class="sidebar-item"><a href="{{ url('user/'.Auth::user()->name.'/favorites') }}" class="{{ set_active('user/'.Auth::user()->name.'/favorites') }}">My Favorites</a></div>
+            <div class="sidebar-item"><a href="{{ url('user/' . Auth::user()->name . '/gallery') }}" class="{{ set_active('user/' . Auth::user()->name . '/gallery') }}">My Gallery</a></div>
+            <div class="sidebar-item"><a href="{{ url('user/' . Auth::user()->name . '/favorites') }}" class="{{ set_active('user/' . Auth::user()->name . '/favorites') }}">My Favorites</a></div>
         </li>
     @endauth
 
-    @if($galleryPage && $sideGallery->children->count())
+    @if (config('lorekeeper.extensions.show_all_recent_submissions.enable') && config('lorekeeper.extensions.show_all_recent_submissions.links.sidebar'))
+        <li class="sidebar-section">
+            <div class="sidebar-item"><a href="{{ url('gallery/all') }}" class="{{ set_active('gallery/all') }}">All Recent Submissions</a></div>
+        </li>
+    @endif
+
+    @if ($galleryPage && $sideGallery->children->count())
         <li class="sidebar-section">
             <div class="sidebar-section-header">{{ $sideGallery->name }}: Sub-Galleries</div>
-            @foreach($sideGallery->children()->visible()->get() as $child)
-                <div class="sidebar-item"><a href="{{ url('gallery/'.$child->id) }}" class="{{ set_active('gallery/'.$child->id) }}">{{ $child->name }}</a></div>
+            @foreach ($sideGallery->children()->visible()->get() as $child)
+                <div class="sidebar-item"><a href="{{ url('gallery/' . $child->id) }}" class="{{ set_active('gallery/' . $child->id) }}">{{ $child->name }}</a></div>
+            @endforeach
+        </li>
+    @endif
+
+    @if ($galleryPage && $sideGallery->siblings() && $sideGallery->siblings->count())
+        <li class="sidebar-section">
+            <div class="sidebar-section-header">{{ $sideGallery->parent->name }}: Sub-Galleries</div>
+            @foreach ($sideGallery->siblings()->visible()->get() as $sibling)
+                <div class="sidebar-item"><a href="{{ url('gallery/' . $sibling->id) }}" class="{{ set_active('gallery/' . $sibling->id) }}">{{ $sibling->name }}</a></div>
+            @endforeach
+        </li>
+    @endif
+
+    @if ($galleryPage && $sideGallery->avunculi() && $sideGallery->avunculi->count())
+        <li class="sidebar-section">
+            <div class="sidebar-section-header">{{ $sideGallery->parent->parent->name }}: Sub-Galleries</div>
+            @foreach ($sideGallery->avunculi()->visible()->get() as $avunculus)
+                <div class="sidebar-item"><a href="{{ url('gallery/' . $avunculus->id) }}" class="{{ set_active('gallery/' . $avunculus->id) }}">{{ $avunculus->name }}</a></div>
             @endforeach
         </li>
     @endif
 
     <li class="sidebar-section">
         <div class="sidebar-section-header">Galleries</div>
-        @foreach($sidebarGalleries as $gallery)
-            <div class="sidebar-item"><a href="{{ url('gallery/'.$gallery->id) }}" class="{{ set_active('gallery/.$gallery->id') }}">{{ $gallery->name }}</a></div>
+        @foreach ($sidebarGalleries as $gallery)
+            <div class="sidebar-item"><a href="{{ url('gallery/' . $gallery->id) }}" class="{{ set_active('gallery/' . $gallery->id) }}">{{ $gallery->name }}</a></div>
         @endforeach
     </li>
 </ul>
diff --git a/resources/views/galleries/_submission_favorites.blade.php b/resources/views/galleries/_submission_favorites.blade.php
index 28d90d9c05..bf91e89e4e 100644
--- a/resources/views/galleries/_submission_favorites.blade.php
+++ b/resources/views/galleries/_submission_favorites.blade.php
@@ -1,9 +1,9 @@
-@if($submission)
+@if ($submission)
     <ul>
-    @foreach($submission->favorites as $favorite)
-        <li>{!! $favorite->user->displayName !!}</li>
-    @endforeach
+        @foreach ($submission->favorites as $favorite)
+            <li>{!! $favorite->user->displayName !!}</li>
+        @endforeach
     </ul>
-@else 
+@else
     Invalid submission selected.
-@endif
\ No newline at end of file
+@endif
diff --git a/resources/views/galleries/_thumb.blade.php b/resources/views/galleries/_thumb.blade.php
index 2a2f4e292a..c453d792a8 100644
--- a/resources/views/galleries/_thumb.blade.php
+++ b/resources/views/galleries/_thumb.blade.php
@@ -1,37 +1,55 @@
 <div class="flex-fill text-center mb-1">
     <a href="{{ $submission->url }}">@include('widgets._gallery_thumb', ['submission' => $submission])</a>
-    <?php if(isset($submission->hash) && !isset($submission->content_warning)) $width = Image::make($submission->imagePath.'/'.$submission->thumbnailFileName)->width(); else $width = 200; ?>
-    <div class="mt-1 mx-auto" style="max-width:{{ $width }}px; overflow: hidden; text-overflow: ellipsis;">
-        @if(isset($submission->content_warning))
+    <?php if (isset($submission->hash) && !isset($submission->content_warning)) {
+        $width = Image::make($submission->imagePath . '/' . $submission->thumbnailFileName)->width();
+    } else {
+        $width = 200;
+    } ?>
+    <div class="mt-1 mx-auto" style="max-width:{{ max(200, $width) }}px; overflow: hidden; text-overflow: ellipsis;">
+        @if (isset($submission->content_warning))
             <p><span class="text-danger"><strong>Content Warning:</strong></span> {!! nl2br(htmlentities($submission->content_warning)) !!}</p>
         @endif
-        <a href="{{ $submission->url }}" class="h5 mb-0">@if(!$submission->isVisible) <i class="fas fa-eye-slash"></i> @endif {{ $submission->displayTitle }}</a>
+        <a href="{{ $submission->url }}" class="h5 mb-0">
+            @if (!$submission->isVisible)
+                <i class="fas fa-eye-slash"></i>
+            @endif {{ $submission->displayTitle }}
+        </a>
     </div>
     <div class="small">
-            @if(Auth::check() && ($submission->user->id != Auth::user()->id && $submission->collaborators->where('user_id', Auth::user()->id)->first() == null) && $submission->isVisible)
-                {!! Form::open(['url' => '/gallery/favorite/'.$submission->id]) !!}
-                    @if(isset($gallery) && !$gallery)
-                        In {!! $submission->gallery->displayName !!} ・
-                    @endif
-                    By {!! $submission->credits !!}
-                        @if(isset($gallery) && !$gallery)
-                            <br/>
-                        @else
-                            ・
-                        @endif
-                    {{ $submission->favorites->count() }} {!! Form::button('<i class="fas fa-star"></i> ', ['style' => 'border:0; border-radius:.5em;', 'class' => ($submission->favorites->where('user_id', Auth::user()->id)->first() != null ? 'btn-success' : ''), 'data-toggle' => 'tooltip', 'title' => ($submission->favorites->where('user_id', Auth::user()->id)->first() == null ? 'Add to' : 'Remove from').' your Favorites', 'type' => 'submit']) !!} ・ {{ App\Models\Comment::where('commentable_type', 'App\Models\Gallery\GallerySubmission')->where('commentable_id', $submission->id)->where('type', 'User-User')->count() }} <i class="fas fa-comment"></i>
-                {!! Form::close() !!}
+        @if (Auth::check() && ($submission->user->id != Auth::user()->id && $submission->collaborators->where('user_id', Auth::user()->id)->first() == null) && $submission->isVisible)
+            {!! Form::open(['url' => '/gallery/favorite/' . $submission->id]) !!}
+            @if (isset($gallery) && !$gallery)
+                In {!! $submission->gallery->displayName !!} ・
+            @endif
+            By {!! $submission->credits !!}
+            @if (isset($gallery) && !$gallery)
+                <br />
             @else
-                @if(isset($gallery) && !$gallery)
-                    In {!! $submission->gallery->displayName !!} ・
-                @endif
-                By {!! $submission->credits !!}
-                    @if(isset($gallery) && !$gallery)
-                        <br/>
-                    @else
-                        ・
-                    @endif
-                {{ $submission->favorites->count() }} <i class="fas fa-star" data-toggle="tooltip" title="Favorites"></i> ・ {{ App\Models\Comment::where('commentable_type', 'App\Models\Gallery\GallerySubmission')->where('commentable_id', $submission->id)->where('type', 'User-User')->count() }} <i class="fas fa-comment" data-toggle="tooltip" title="Comments"></i>
+                ・
+            @endif
+            {{ $submission->favorites->count() }} {!! Form::button('<i class="fas fa-star"></i> ', [
+                'style' => 'border:0; border-radius:.5em;',
+                'class' => $submission->favorites->where('user_id', Auth::user()->id)->first() != null ? 'btn-success' : '',
+                'data-toggle' => 'tooltip',
+                'title' => ($submission->favorites->where('user_id', Auth::user()->id)->first() == null ? 'Add to' : 'Remove from') . ' your Favorites',
+                'type' => 'submit',
+            ]) !!} ・
+            {{ App\Models\Comment\Comment::where('commentable_type', 'App\Models\Gallery\GallerySubmission')->where('commentable_id', $submission->id)->where('type', 'User-User')->count() }}
+            <i class="fas fa-comment"></i>
+            {!! Form::close() !!}
+        @else
+            @if (isset($gallery) && !$gallery)
+                In {!! $submission->gallery->displayName !!} ・
             @endif
+            By {!! $submission->credits !!}
+            @if (isset($gallery) && !$gallery)
+                <br />
+            @else
+                ・
+            @endif
+            {{ $submission->favorites->count() }} <i class="fas fa-star" data-toggle="tooltip" title="Favorites"></i> ・
+            {{ App\Models\Comment\Comment::where('commentable_type', 'App\Models\Gallery\GallerySubmission')->where('commentable_id', $submission->id)->where('type', 'User-User')->count() }} <i class="fas fa-comment" data-toggle="tooltip"
+                title="Comments"></i>
+        @endif
     </div>
 </div>
diff --git a/resources/views/galleries/create_edit_submission.blade.php b/resources/views/galleries/create_edit_submission.blade.php
index 6e64054cd0..dbf676d1b2 100644
--- a/resources/views/galleries/create_edit_submission.blade.php
+++ b/resources/views/galleries/create_edit_submission.blade.php
@@ -1,56 +1,65 @@
 @extends('galleries.layout')
 
-@section('gallery-title') {{ $submission->id ? 'Edit' : 'Create' }} Submission @endsection
+@section('gallery-title')
+    {{ $submission->id ? 'Edit' : 'Create' }} Submission
+@endsection
 
 @section('gallery-content')
-{!! breadcrumbs(['Gallery' => 'gallery', $gallery->name => 'gallery/'.$gallery->id, ($submission->id ? 'Edit' : 'Create').' Submission' => $submission->id ? 'gallery/submissions/edit/'.$submission->id : 'gallery/submit/'.$gallery->id]) !!}
-
-<h1>
-    {{ $submission->id ? 'Edit Submission (#'.$submission->id.', "'.$submission->displayTitle.'")' : 'Submit to '.$gallery->name }}
-    @if($submission->id)
-        <div class="float-right">
-            @if($submission->status == 'Accepted')
-                <a href="#" class="btn btn-warning archive-submission-button">{{ $submission->isVisible ? 'Archive' : 'Unarchive' }}</a>
+    {!! breadcrumbs([
+        'Gallery' => 'gallery',
+        $gallery->name => 'gallery/' . $gallery->id,
+        ($submission->id ? 'Edit' : 'Create') . ' Submission' => $submission->id ? 'gallery/submissions/edit/' . $submission->id : 'gallery/submit/' . $gallery->id,
+    ]) !!}
+
+    <h1>
+        {{ $submission->id ? 'Edit Submission (#' . $submission->id . ', "' . $submission->displayTitle . '")' : 'Submit to ' . $gallery->name }}
+        @if ($submission->id)
+            <div class="float-right">
+                @if ($submission->status == 'Accepted')
+                    <a href="#" class="btn btn-warning archive-submission-button">{{ $submission->isVisible ? 'Archive' : 'Unarchive' }}</a>
+                @endif
+                <a href="/gallery/view/{{ $submission->id }}" class="btn btn-outline-primary">View Submission</a>
+            </div>
+        @endif
+    </h1>
+
+    @if (!$submission->id && ($closed || !$gallery->canSubmit(Auth::user())))
+        <div class="alert alert-danger">
+            @if ($closed)
+                Gallery submissions are currently closed.
+            @else
+                You can't submit to this gallery.
             @endif
-            <a href="/gallery/view/{{ $submission->id }}" class="btn btn-outline-primary">View Submission</a>
         </div>
-    @endif
-</h1>
-
-@if(!$submission->id && ($closed || !$gallery->canSubmit(Auth::user())))
-    <div class="alert alert-danger">
-        @if($closed) Gallery submissions are currently closed.
-        @else You can't submit to this gallery. @endif
-    </div>
-@else
-    {!! Form::open(['url' => $submission->id ? 'gallery/edit/'.$submission->id : 'gallery/submit', 'id' => 'gallerySubmissionForm', 'files' => true]) !!}
+    @else
+        {!! Form::open(['url' => $submission->id ? 'gallery/edit/' . $submission->id : 'gallery/submit', 'id' => 'gallerySubmissionForm', 'files' => true]) !!}
 
         <h2>Main Content</h2>
         <p>Upload an image and/or text as the content of your submission. You <strong>can</strong> upload both in the event that you have an image with accompanying text or vice versa.</p>
 
         <div class="form-group">
             {!! Form::label('Image') !!}
-            @if($submission->id && isset($submission->hash) && $submission->hash)
+            @if ($submission->id && isset($submission->hash) && $submission->hash)
                 <div class="card mb-2" id="existingImage">
                     <div class="card-body text-center">
-                        <img src="{{ $submission->imageUrl }}" style="max-width:100%; max-height:60vh;" alt="Image submission"/>
+                        <img src="{{ $submission->imageUrl }}" style="max-width:100%; max-height:60vh;" alt="Image submission" />
                     </div>
                 </div>
             @endif
             <div class="card mb-2 hide" id="imageContainer">
                 <div class="card-body text-center">
-                    <img src="#" id="image" style="max-width:100%; max-height:60vh;" alt="Image submission"/>
+                    <img src="#" id="image" style="max-width:100%; max-height:60vh;" alt="Image submission" />
                 </div>
             </div>
             <div class="card p-2">
-                {!! Form::file('image', ['id' => 'mainImage']) !!}
-                <small>Images may be PNG, GIF, or JPG and up to 3MB in size.</small>
+                {!! Form::file('image', ['class' => 'form-control-file', 'id' => 'mainImage']) !!}
+                <small>Images may be PNG, GIF, JPG, or WebP and up to 3MB in size.</small>
             </div>
         </div>
 
         <div class="form-group">
             {!! Form::label('Text') !!}
-            {!! Form::textarea('text', $submission->text, ['class' => 'form-control wysiwyg']) !!}
+            {!! Form::textarea('text', $submission->text ?? old('text'), ['class' => 'form-control wysiwyg']) !!}
         </div>
 
         <div class="row">
@@ -58,163 +67,209 @@
                 <h3>Basic Information</h3>
                 <div class="form-group">
                     {!! Form::label('Title') !!} {!! add_help('You <strong>do not</strong> need to indicate that a piece is a trade, gift, for a prompt etc. as this will be automatically added based on your input elsewhere in this form.') !!}
-                    {!! Form::text('title', $submission->title, ['class' => 'form-control']) !!}
+                    {!! Form::text('title', $submission->title ?? old('title'), ['class' => 'form-control']) !!}
                 </div>
 
                 <div class="form-group">
                     {!! Form::label('Description (Optional)') !!}
-                    {!! Form::textarea('description', $submission->description, ['class' => 'form-control wysiwyg']) !!}
+                    {!! Form::textarea('description', $submission->description ?? old('description'), ['class' => 'form-control wysiwyg']) !!}
                 </div>
 
                 <div class="form-group">
-                    {!! Form::label('Content Warning (Optional)') !!} {!! add_help('Provide a succinct content warning for the piece if necessary. If a content warning is provided, the thumbnail will be replaced with a generic image and the warning displayed under it. The piece will be displayed in full on its page, however.') !!}
-                    {!! Form::text('content_warning', $submission->content_warning, ['class' => 'form-control']) !!}
+                    {!! Form::label('Content Warning (Optional)') !!} {!! add_help(
+                        'Provide a succinct content warning for the piece if necessary. If a content warning is provided, the thumbnail will be replaced with a generic image and the warning displayed under it. The piece will be displayed in full on its page, however.',
+                    ) !!}
+                    {!! Form::text('content_warning', $submission->content_warning ?? old('content_warning'), ['class' => 'form-control']) !!}
                 </div>
 
-                @if($gallery->prompt_selection == 1 && (!$submission->id || Auth::user()->hasPower('manage_submissions')))
+                @if ($gallery->prompt_selection == 1 && (!$submission->id || Auth::user()->hasPower('manage_submissions')))
                     <div class="form-group">
-                        {!! Form::label('prompt_id', ($submission->id && Auth::user()->hasPower('manage_submissions') ? '[Admin] ' : '').'Prompt (Optional)') !!} {!! add_help('This <strong>does not</strong> automatically submit to the selected prompt, and you will need to submit to it separately. The prompt selected here will be displayed on the submission page for future reference. You will not be able to edit this after creating the submission.') !!}
-                        {!! Form::select('prompt_id', $prompts, $submission->prompt_id, ['class' => 'form-control selectize', 'id' => 'prompt', 'placeholder' => 'Select a Prompt']) !!}
+                        {!! Form::label('prompt_id', ($submission->id && Auth::user()->hasPower('manage_submissions') ? '[Admin] ' : '') . 'Prompt (Optional)') !!} {!! add_help(
+                            'This <strong>does not</strong> automatically submit to the selected prompt, and you will need to submit to it separately. The prompt selected here will be displayed on the submission page for future reference. You will not be able to edit this after creating the submission.',
+                        ) !!}
+                        {!! Form::select('prompt_id', $prompts, $submission->prompt_id ?? old('prompt_id'), ['class' => 'form-control selectize', 'id' => 'prompt', 'placeholder' => 'Select a Prompt']) !!}
                     </div>
                 @else
-                    {!! $submission->prompt_id ? '<p><strong>Prompt:</strong> '.$submission->prompt->displayName.'</p>' : '' !!}
+                    {!! $submission->prompt_id ? '<p><strong>Prompt:</strong> ' . $submission->prompt->displayName . '</p>' : '' !!}
                 @endif
 
-                @if($submission->id && Auth::user()->hasPower('manage_submissions'))
+                @if ($submission->id && Auth::user()->hasPower('manage_submissions'))
                     <div class="form-group">
-                        {!! Form::label('gallery_id', '[Admin] Gallery / Move Submission') !!} {!! add_help('Use in the event you need to move a submission between galleries. If left blank, leaves the submission in its current location. Note that if currency rewards from submissions are enabled, this won\'t retroactively fill out the form if moved from a gallery where they are disabled to one where they are enabled.') !!}
+                        {!! Form::label('gallery_id', '[Admin] Gallery / Move Submission') !!} {!! add_help(
+                            'Use in the event you need to move a submission between galleries. If left blank, leaves the submission in its current location. Note that if currency rewards from submissions are enabled, this won\'t retroactively fill out the form if moved from a gallery where they are disabled to one where they are enabled.',
+                        ) !!}
                         {!! Form::select('gallery_id', $galleryOptions, null, ['class' => 'form-control selectize gallery-select original', 'id' => 'gallery', 'placeholder' => '']) !!}
                     </div>
                 @endif
 
-                @if(!$submission->id)
+                @if (!$submission->id)
                     {!! Form::hidden('gallery_id', $gallery->id) !!}
                 @endif
 
                 <h3>Characters</h3>
                 <p>
                     Add the characters included in this piece.
-                    @if(Settings::get('gallery_submissions_reward_currency'))
-                     This helps the staff processing your submission award {!! $currency->displayName !!} for it, so be sure to add every character.
+                    @if (Settings::get('gallery_submissions_reward_currency'))
+                        This helps the staff processing your submission award {!! $currency->displayName !!} for it, so be sure to add every character.
                     @endif
                 </p>
                 <div id="characters" class="mb-3">
-                    @if($submission->id)
-                        @foreach($submission->characters as $character)
+                    @if ($submission->id)
+                        @foreach ($submission->characters as $character)
                             @include('galleries._character_select_entry', ['character' => $character])
                         @endforeach
                     @endif
+                    @if (old('slug'))
+                        @foreach (array_unique(old('slug')) as $slug)
+                            @include('galleries._character_select_entry', ['character' => \App\Models\Character\Character::where('slug', $slug)->first()])
+                        @endforeach
+                    @endif
                 </div>
                 <div class="text-right mb-3">
                     <a href="#" class="btn btn-outline-info" id="addCharacter">Add Character</a>
                 </div>
             </div>
-            @if(!$submission->id || $submission->status == 'Pending')
-            <div class="col-md-4">
-                <div class="card mb-4">
-                    <div class="card-header">
-                        <h5>Collaborators</h5>
-                    </div>
-                    <div class="card-body">
-                        <p>If this piece is a collaboration, add collaborators and their roles here, including yourself. <strong>Otherwise, leave this blank</strong>. You <strong>will not</strong> be able to edit this once the submission has been accepted, but will while it is still pending.</p>
-                        @if(!$submission->id || $submission->status == 'Pending')
-                            <div class="text-right mb-3">
-                                <a href="#" class="btn btn-outline-info" id="add-collaborator">Add Collaborator</a>
-                            </div>
-                            <div id="collaboratorList">
-                                @if($submission->id)
-                                    @foreach($submission->collaborators as $collaborator)
-                                        <div class="mb-2">
-                                            <div class="d-flex">{!! $collaborator->has_approved ? '<div class="btn btn-success mb-2 mr-2" data-toggle="tooltip" title="Has Approved"><i class="fas fa-check"></i></div>' : '' !!}{!! Form::select('collaborator_id[]', $users, $collaborator->user_id, ['class' => 'form-control mr-2 collaborator-select original', 'placeholder' => 'Select User']) !!}</div>
-                                            <div class="d-flex">
-                                                {!! Form::text('collaborator_data[]', $collaborator->data, ['class' => 'form-control mr-2', 'placeholder' => 'Role (Sketch, Lines, etc.)']) !!}
-                                                <a href="#" class="remove-collaborator btn btn-danger mb-2">×</a>
+            @if (!$submission->id || $submission->status == 'Pending')
+                <div class="col-md-4">
+                    <div class="card mb-4">
+                        <div class="card-header">
+                            <h5>Collaborators</h5>
+                        </div>
+                        <div class="card-body">
+                            <p>If this piece is a collaboration, add collaborators and their roles here, including yourself. <strong>Otherwise, leave this blank</strong>. You <strong>will not</strong> be able to edit this once the submission has been
+                                accepted, but will while it is still pending.</p>
+                            @if (!$submission->id || $submission->status == 'Pending')
+                                <div class="text-right mb-3">
+                                    <a href="#" class="btn btn-outline-info" id="add-collaborator">Add Collaborator</a>
+                                </div>
+                                <div id="collaboratorList">
+                                    @if ($submission->id)
+                                        @foreach ($submission->collaborators as $collaborator)
+                                            <div class="mb-2">
+                                                <div class="d-flex">{!! $collaborator->has_approved ? '<div class="btn btn-success mb-2 mr-2" data-toggle="tooltip" title="Has Approved"><i class="fas fa-check"></i></div>' : '' !!}{!! Form::select('collaborator_id[]', $users, $collaborator->user_id, ['class' => 'form-control mr-2 collaborator-select original', 'placeholder' => 'Select User']) !!}</div>
+                                                <div class="d-flex">
+                                                    {!! Form::text('collaborator_data[]', $collaborator->data, ['class' => 'form-control mr-2', 'placeholder' => 'Role (Sketch, Lines, etc.)']) !!}
+                                                    <a href="#" class="remove-collaborator btn btn-danger mb-2">×</a>
+                                                </div>
                                             </div>
-                                        </div>
-                                    @endforeach
-                                @endif
-                            </div>
-                        @else
-                            <p>
-                                @if($submission->collaborators->count())
-                                    @foreach($submission->collaborators as $collaborator)
-                                        {!! $collaborator->user->displayName !!}: {{ $collaborator->data }}<br/>
-                                    @endforeach
-                                @endif
-                            </p>
-                        @endif
-                    </div>
-                </div>
-                <div class="card mb-4">
-                    <div class="card-header">
-                        <h5>Other Participants</h5>
-                    </div>
-                    <div class="card-body">
-                        <p>If this piece is gift, part of a trade, or was commissioned, specify the related user(s) here and select their role. <strong>Otherwise, leave this blank</strong>. You <strong>will not</strong> be able to edit this once the submission has been accepted, but will while it is still pending.</p>
-                        @if(!$submission->id || $submission->status == 'Pending')
-                            <div class="text-right mb-3">
-                                <a href="#" class="btn btn-outline-info" id="add-participant">Add Participant</a>
-                            </div>
-                            <div id="participantList">
-                                @if($submission->id)
-                                    @foreach($submission->participants as $participant)
-                                        <div class="mb-2">
-                                            <div class="d-flex">{!! Form::select('participant_id[]', $users, $participant->user_id, ['class' => 'form-control mr-2 participant-select original', 'placeholder' => 'Select User']) !!}</div>
-                                            <div class="d-flex">
-                                                {!! Form::select('participant_type[]', ['Gift' => 'Gift For', 'Trade' => 'Traded For', 'Comm' => 'Commissioned', 'Comm (Currency)' => 'Commissioned ('.$currency->name.')'], $participant->type, ['class' => 'form-control mr-2', 'placeholder' => 'Select Role']) !!}
-                                                <a href="#" class="remove-participant btn btn-danger mb-2">×</a>
+                                        @endforeach
+                                    @endif
+                                    @if (old('collaborator_id'))
+                                        @foreach (old('collaborator_id') as $key => $collaborator)
+                                            <div class="mb-2">
+                                                <div class="d-flex">{!! Form::select('collaborator_id[]', $users, $collaborator, ['class' => 'form-control mr-2 collaborator-select original', 'placeholder' => 'Select User']) !!}</div>
+                                                <div class="d-flex">
+                                                    {!! Form::text('collaborator_data[]', old('collaborator_data')[$key], ['class' => 'form-control mr-2', 'placeholder' => 'Role (Sketch, Lines, etc.)']) !!}
+                                                    <a href="#" class="remove-collaborator btn btn-danger mb-2">×</a>
+                                                </div>
                                             </div>
-                                        </div>
-                                    @endforeach
-                                @endif
-                            </div>
-                        @else
-                            <p>
-                                @if($submission->participants->count())
-                                    @foreach($submission->participants as $participant)
-                                        {!! $participant->user->displayName !!}: {{ $participant->displayType }}<br/>
-                                    @endforeach
-                                @endif
-                            </p>
-                        @endif
+                                        @endforeach
+                                    @endif
+                                </div>
+                            @else
+                                <p>
+                                    @if ($submission->collaborators->count())
+                                        @foreach ($submission->collaborators as $collaborator)
+                                            {!! $collaborator->user->displayName !!}: {{ $collaborator->data }}<br />
+                                        @endforeach
+                                    @endif
+                                </p>
+                            @endif
+                        </div>
                     </div>
-                </div>
-                @if(Settings::get('gallery_submissions_reward_currency') && $gallery->currency_enabled && !$submission->id)
                     <div class="card mb-4">
                         <div class="card-header">
-                            <h5>{!! $currency->name !!} Awards</h5>
+                            <h5>Other Participants</h5>
                         </div>
                         <div class="card-body">
-                            <p>Please select options as appropriate for this piece. This will help the staff processing your submission award {!! $currency->displayName !!} for it. You <strong>will not</strong> be able to edit this after creating the submission.</p>
-
-                            @foreach(Config::get('lorekeeper.group_currency_form') as $key=>$field)
-                                <div class="form-group">
-                                    @if($field['type'] == 'checkbox')
-                                        <input class="form-check-input ml-0 pr-4" name="{{ $key }}" type="checkbox" value="{{ isset($field['value']) ? $field['value'] : 1 }}">
-                                    @endif
-                                    @if(isset($field['label']))
-                                        {!! Form::label((isset($field['multiple']) && $field['multiple'] ? $key.'[]' : $key), $field['label'], ['class' => 'label-class'.($field['type'] == 'checkbox' ? ' ml-3' : '').(isset($field['rules']) && $field['rules'] ? ' '.$field['rules'] : '' )]) !!}
+                            <p>If this piece is gift, part of a trade, or was commissioned, specify the related user(s) here and select their role. <strong>Otherwise, leave this blank</strong>. You <strong>will not</strong> be able to edit this once the
+                                submission has been accepted, but will while it is still pending.</p>
+                            @if (!$submission->id || $submission->status == 'Pending')
+                                <div class="text-right mb-3">
+                                    <a href="#" class="btn btn-outline-info" id="add-participant">Add Participant</a>
+                                </div>
+                                <div id="participantList">
+                                    @if ($submission->id)
+                                        @foreach ($submission->participants as $participant)
+                                            <div class="mb-2">
+                                                <div class="d-flex">{!! Form::select('participant_id[]', $users, $participant->user_id, ['class' => 'form-control mr-2 participant-select original', 'placeholder' => 'Select User']) !!}</div>
+                                                <div class="d-flex">
+                                                    {!! Form::select('participant_type[]', ['Gift' => 'Gift For', 'Trade' => 'Traded For', 'Comm' => 'Commissioned', 'Comm (Currency)' => 'Commissioned (' . $currency->name . ')'], $participant->type, [
+                                                        'class' => 'form-control mr-2',
+                                                        'placeholder' => 'Select Role',
+                                                    ]) !!}
+                                                    <a href="#" class="remove-participant btn btn-danger mb-2">×</a>
+                                                </div>
+                                            </div>
+                                        @endforeach
                                     @endif
-                                    @if($field['type'] == 'choice' && isset($field['choices']))
-                                        @foreach($field['choices'] as $value=>$choice)
-                                            <div class="choice-wrapper">
-                                                <input class="form-check-input ml-0 pr-4" name="{{ isset($field['multiple']) && $field['multiple'] ? $key.'[]' : $key }}" id="{{ isset($field['multiple']) && $field['multiple'] ? $key.'[]' : $key.'_'.$value }}" type="{{ isset($field['multiple']) && $field['multiple'] ? 'checkbox' : 'radio' }}" value="{{ $value }}">
-                                                <label for="{{ $key }}[]" class="label-class ml-3">{{ $choice }}</label>
+                                    @if (old('participant_id'))
+                                        @foreach (old('participant_id') as $key => $participant)
+                                            <div class="mb-2">
+                                                <div class="d-flex">{!! Form::select('participant_id[]', $users, $participant, ['class' => 'form-control mr-2 participant-select original', 'placeholder' => 'Select User']) !!}</div>
+                                                <div class="d-flex">
+                                                    {!! Form::select('participant_type[]', ['Gift' => 'Gift For', 'Trade' => 'Traded For', 'Comm' => 'Commissioned', 'Comm (Currency)' => 'Commissioned (' . $currency->name . ')'], old('participant_type')[$key], [
+                                                        'class' => 'form-control mr-2',
+                                                        'placeholder' => 'Select Role',
+                                                    ]) !!}
+                                                    <a href="#" class="remove-participant btn btn-danger mb-2">×</a>
+                                                </div>
                                             </div>
                                         @endforeach
-                                    @elseif($field['type'] != 'checkbox')
-                                        <input class="form-control" name="{{ $key }}" type="{{ $field['type'] }}" id="{{ $key }}">
                                     @endif
                                 </div>
-                            @endforeach
+                            @else
+                                <p>
+                                    @if ($submission->participants->count())
+                                        @foreach ($submission->participants as $participant)
+                                            {!! $participant->user->displayName !!}: {{ $participant->displayType }}<br />
+                                        @endforeach
+                                    @endif
+                                </p>
+                            @endif
                         </div>
                     </div>
-                @endif
-            </div>
+                    @if (Settings::get('gallery_submissions_reward_currency') && $gallery->currency_enabled && !$submission->id)
+                        <div class="card mb-4">
+                            <div class="card-header">
+                                <h5>{!! $currency->name !!} Awards</h5>
+                            </div>
+                            <div class="card-body">
+                                <p>Please select options as appropriate for this piece. This will help the staff processing your submission award {!! $currency->displayName !!} for it. You <strong>will not</strong> be able to edit this after creating the
+                                    submission.</p>
+
+                                @foreach (config('lorekeeper.group_currency_form') as $key => $field)
+                                    <div class="form-group">
+                                        @if ($field['type'] == 'checkbox')
+                                            <input class="form-check-input ml-0 pr-4" name="{{ $key }}" type="checkbox" value="{{ isset($field['value']) ? $field['value'] : 1 }}">
+                                        @endif
+                                        @if (isset($field['label']))
+                                            {!! Form::label(isset($field['multiple']) && $field['multiple'] ? $key . '[]' : $key, $field['label'], [
+                                                'class' => 'label-class' . ($field['type'] == 'checkbox' ? ' ml-3' : '') . (isset($field['rules']) && $field['rules'] ? ' ' . $field['rules'] : ''),
+                                            ]) !!}
+                                        @endif
+                                        @if ($field['type'] == 'choice' && isset($field['choices']))
+                                            @foreach ($field['choices'] as $value => $choice)
+                                                <div class="choice-wrapper">
+                                                    <input class="form-check-input ml-0 pr-4" name="{{ isset($field['multiple']) && $field['multiple'] ? $key . '[]' : $key }}"
+                                                        id="{{ isset($field['multiple']) && $field['multiple'] ? $key . '[]' : $key . '_' . $value }}" type="{{ isset($field['multiple']) && $field['multiple'] ? 'checkbox' : 'radio' }}"
+                                                        value="{{ $value }}">
+                                                    <label for="{{ $key }}[]" class="label-class ml-3">{{ $choice }}</label>
+                                                </div>
+                                            @endforeach
+                                        @elseif($field['type'] != 'checkbox')
+                                            <input class="form-control" name="{{ $key }}" type="{{ $field['type'] }}" id="{{ $key }}">
+                                        @endif
+                                    </div>
+                                @endforeach
+                            </div>
+                        </div>
+                    @endif
+                </div>
             @endif
         </div>
 
-        @if($submission->id && Auth::user()->id != $submission->user->id && Auth::user()->hasPower('manage_submissions'))
+        @if ($submission->id && Auth::user()->id != $submission->user->id && Auth::user()->hasPower('manage_submissions'))
             <div class="form-group">
                 {!! Form::checkbox('alert_user', 1, true, ['class' => 'form-check-input', 'data-toggle' => 'toggle', 'data-onstyle' => 'danger']) !!}
                 {!! Form::label('alert_user', 'Notify User', ['class' => 'form-check-label ml-3']) !!} {!! add_help('This will send a notification to the user that either their submission has been edited or moved. It does not send both notifications, preferring the move notification if relevant.') !!}
@@ -224,141 +279,151 @@
         <div class="text-right">
             <a href="#" class="btn btn-primary" id="submitButton">Submit</a>
         </div>
-    {!! Form::close() !!}
-
-    @include('galleries._character_select')
-    <div class="collaborator-row hide mb-2">
-        {!! Form::select('collaborator_id[]', $users, null, ['class' => 'form-control mr-2 collaborator-select', 'placeholder' => 'Select User']) !!}
-        <div class="d-flex">
-            {!! Form::text('collaborator_data[]', null, ['class' => 'form-control mr-2', 'placeholder' => 'Role (Sketch, Lines, etc.)']) !!}
-            <a href="#" class="remove-collaborator btn btn-danger mb-2">×</a>
+        {!! Form::close() !!}
+
+        @include('galleries._character_select')
+        <div class="collaborator-row hide mb-2">
+            {!! Form::select('collaborator_id[]', $users, null, ['class' => 'form-control mr-2 collaborator-select', 'placeholder' => 'Select User']) !!}
+            <div class="d-flex">
+                {!! Form::text('collaborator_data[]', null, ['class' => 'form-control mr-2', 'placeholder' => 'Role (Sketch, Lines, etc.)']) !!}
+                <a href="#" class="remove-collaborator btn btn-danger mb-2">×</a>
+            </div>
         </div>
-    </div>
-    <div class="participant-row hide mb-2">
-        {!! Form::select('participant_id[]', $users, null, ['class' => 'form-control mr-2 participant-select', 'placeholder' => 'Select User']) !!}
-        <div class="d-flex">
-            {!! Form::select('participant_type[]', ['Gift' => 'Gift For', 'Trade' => 'Traded For', 'Comm' => 'Commissioned', 'Comm (Currency)' => 'Commissioned ('.$currency->name.')'], null, ['class' => 'form-control mr-2', 'placeholder' => 'Select Role']) !!}
-            <a href="#" class="remove-participant btn btn-danger mb-2">×</a>
+        <div class="participant-row hide mb-2">
+            {!! Form::select('participant_id[]', $users, null, ['class' => 'form-control mr-2 participant-select', 'placeholder' => 'Select User']) !!}
+            <div class="d-flex">
+                {!! Form::select('participant_type[]', ['Gift' => 'Gift For', 'Trade' => 'Traded For', 'Comm' => 'Commissioned', 'Comm (Currency)' => 'Commissioned (' . $currency->name . ')'], null, [
+                    'class' => 'form-control mr-2',
+                    'placeholder' => 'Select Role',
+                ]) !!}
+                <a href="#" class="remove-participant btn btn-danger mb-2">×</a>
+            </div>
         </div>
-    </div>
-
-    <div class="modal fade" id="confirmationModal" tabindex="-1" role="dialog">
-        <div class="modal-dialog" role="document">
-            <div class="modal-content">
-                <div class="modal-header">
-                    <span class="modal-title h5 mb-0">Confirm  Submission</span>
-                    <button type="button" class="close" data-dismiss="modal">&times;</button>
-                </div>
-                <div class="modal-body">
-                    <p>
-                        @if(!$submission->id)
-                            This will submit the form and put it into the approval queue. You will not be able to edit certain parts after the submission has been made, so please review the contents before submitting. Click the Confirm button to complete the submission.
-                        @else
-                            This will update the submission.{{ $submission->status == 'Pending' ? ' If you have added or removed any collaborators, they will not be informed (so as not to send additional notifications to previously notified collaborators), so please make sure to do so if necessary as all collaborators must approve a submission for it to be submitted for admin approval.' : '' }}
-                        @endif
-                    </p>
-                    <div class="text-right">
-                        <a href="#" id="formSubmit" class="btn btn-primary">Confirm</a>
+
+        <div class="modal fade" id="confirmationModal" tabindex="-1" role="dialog">
+            <div class="modal-dialog" role="document">
+                <div class="modal-content">
+                    <div class="modal-header">
+                        <span class="modal-title h5 mb-0">Confirm Submission</span>
+                        <button type="button" class="close" data-dismiss="modal">&times;</button>
+                    </div>
+                    <div class="modal-body">
+                        <p>
+                            @if (!$submission->id)
+                                This will submit the form and put it into the approval queue. You will not be able to edit certain parts after the submission has been made, so please review the contents before submitting. Click the Confirm button to
+                                complete the submission.
+                            @else
+                                This will update the
+                                submission.{{ $submission->status == 'Pending' ? ' If you have added or removed any collaborators, they will not be informed (so as not to send additional notifications to previously notified collaborators), so please make sure to do so if necessary as all collaborators must approve a submission for it to be submitted for admin approval.' : '' }}
+                            @endif
+                        </p>
+                        <div class="text-right">
+                            <a href="#" id="formSubmit" class="btn btn-primary">Confirm</a>
+                        </div>
                     </div>
                 </div>
             </div>
         </div>
-    </div>
-@endif
+    @endif
 
 @endsection
 
 @section('scripts')
-@parent
-@if(!$closed || ($submission->id && $submission->status != 'Rejected'))
-    @include('galleries._character_select_js')
-
-    <script>
-        $(document).ready(function() {
-            var $submitButton = $('#submitButton');
-            var $confirmationModal = $('#confirmationModal');
-            var $formSubmit = $('#formSubmit');
-            var $gallerySubmissionForm = $('#gallerySubmissionForm');
-
-            $submitButton.on('click', function(e) {
-                e.preventDefault();
-                $confirmationModal.modal('show');
-            });
+    @parent
+    @if (!$closed || ($submission->id && $submission->status != 'Rejected'))
+        @include('galleries._character_select_js')
 
-            $formSubmit.on('click', function(e) {
-                e.preventDefault();
-                $gallerySubmissionForm.submit();
-            });
+        <script>
+            $(document).ready(function() {
+                var $submitButton = $('#submitButton');
+                var $confirmationModal = $('#confirmationModal');
+                var $formSubmit = $('#formSubmit');
+                var $gallerySubmissionForm = $('#gallerySubmissionForm');
 
-            $('.archive-submission-button').on('click', function(e) {
-                e.preventDefault();
-                loadModal("{{ url('gallery/archive') }}/{{ $submission->id }}", 'Archive Submission');
-            });
+                $submitButton.on('click', function(e) {
+                    e.preventDefault();
+                    $confirmationModal.modal('show');
+                });
 
-            $('.original.collaborator-select').selectize();
-            $('#add-collaborator').on('click', function(e) {
-                e.preventDefault();
-                addCollaboratorRow();
-            });
-            $('.remove-collaborator').on('click', function(e) {
-                e.preventDefault();
-                removeCollaboratorRow($(this));
-            })
-            function addCollaboratorRow() {
-                var $clone = $('.collaborator-row').clone();
-                $('#collaboratorList').append($clone);
-                $clone.removeClass('hide collaborator-row');
-                $clone.find('.remove-collaborator').on('click', function(e) {
+                $formSubmit.on('click', function(e) {
+                    e.preventDefault();
+                    $gallerySubmissionForm.submit();
+                });
+
+                $('.archive-submission-button').on('click', function(e) {
+                    e.preventDefault();
+                    loadModal("{{ url('gallery/archive') }}/{{ $submission->id }}", 'Archive Submission');
+                });
+
+                $('.original.collaborator-select').selectize();
+                $('#add-collaborator').on('click', function(e) {
+                    e.preventDefault();
+                    addCollaboratorRow();
+                });
+                $('.remove-collaborator').on('click', function(e) {
                     e.preventDefault();
                     removeCollaboratorRow($(this));
                 })
-                $clone.find('.collaborator-select').selectize();
-            }
-            function removeCollaboratorRow($trigger) {
-                $trigger.parent().parent().remove();
-            }
-
-            $('.original.participant-select').selectize();
-            $('#add-participant').on('click', function(e) {
-                e.preventDefault();
-                addParticipantRow();
-            });
-            $('.remove-participant').on('click', function(e) {
-                e.preventDefault();
-                removeParticipantRow($(this));
-            })
-            function addParticipantRow() {
-                var $clone = $('.participant-row').clone();
-                $('#participantList').append($clone);
-                $clone.removeClass('hide participant-row');
-                $clone.find('.remove-participant').on('click', function(e) {
+
+                function addCollaboratorRow() {
+                    var $clone = $('.collaborator-row').clone();
+                    $('#collaboratorList').append($clone);
+                    $clone.removeClass('hide collaborator-row');
+                    $clone.find('.remove-collaborator').on('click', function(e) {
+                        e.preventDefault();
+                        removeCollaboratorRow($(this));
+                    })
+                    $clone.find('.collaborator-select').selectize();
+                }
+
+                function removeCollaboratorRow($trigger) {
+                    $trigger.parent().parent().remove();
+                }
+
+                $('.original.participant-select').selectize();
+                $('#add-participant').on('click', function(e) {
+                    e.preventDefault();
+                    addParticipantRow();
+                });
+                $('.remove-participant').on('click', function(e) {
                     e.preventDefault();
                     removeParticipantRow($(this));
                 })
-                $clone.find('.participant-select').selectize();
-            }
-            function removeParticipantRow($trigger) {
-                $trigger.parent().parent().remove();
-            }
-
-            var $image = $('#image');
-            function readURL(input) {
-                if (input.files && input.files[0]) {
-                    var reader = new FileReader();
-                    reader.onload = function(e) {
-                        $image.attr('src', e.target.result);
-                        $('#existingImage').addClass('hide');
-                        $('#imageContainer').removeClass('hide');
+
+                function addParticipantRow() {
+                    var $clone = $('.participant-row').clone();
+                    $('#participantList').append($clone);
+                    $clone.removeClass('hide participant-row');
+                    $clone.find('.remove-participant').on('click', function(e) {
+                        e.preventDefault();
+                        removeParticipantRow($(this));
+                    })
+                    $clone.find('.participant-select').selectize();
+                }
+
+                function removeParticipantRow($trigger) {
+                    $trigger.parent().parent().remove();
+                }
+
+                var $image = $('#image');
+
+                function readURL(input) {
+                    if (input.files && input.files[0]) {
+                        var reader = new FileReader();
+                        reader.onload = function(e) {
+                            $image.attr('src', e.target.result);
+                            $('#existingImage').addClass('hide');
+                            $('#imageContainer').removeClass('hide');
+                        }
+                        reader.readAsDataURL(input.files[0]);
                     }
-                    reader.readAsDataURL(input.files[0]);
                 }
-            }
-            $("#mainImage").change(function() {
-                readURL(this);
-            });
+                $("#mainImage").change(function() {
+                    readURL(this);
+                });
 
-            $('.original.gallery-select').selectize();
-        });
-    </script>
-@endif
+                $('.original.gallery-select').selectize();
+            });
+        </script>
+    @endif
 @endsection
diff --git a/resources/views/galleries/gallery.blade.php b/resources/views/galleries/gallery.blade.php
index e8f8b83b1f..0df2319563 100644
--- a/resources/views/galleries/gallery.blade.php
+++ b/resources/views/galleries/gallery.blade.php
@@ -1,32 +1,37 @@
 @extends('galleries.layout')
 
-@section('gallery-title') {{ $gallery->name }} @endsection
+@section('gallery-title')
+    {{ $gallery->name }}
+@endsection
 
 @section('gallery-content')
-{!! breadcrumbs(['Gallery' => 'gallery', $gallery->name => 'gallery/'.$gallery->id]) !!}
+    <x-admin-edit title="Gallery" :object="$gallery" />
+    {!! breadcrumbs(['Gallery' => 'gallery', $gallery->name => 'gallery/' . $gallery->id]) !!}
 
-<h1>
-    {{ $gallery->name }}
-    @if(Auth::check() && $gallery->canSubmit(Auth::user())) <a href="{{ url('gallery/submit/'.$gallery->id) }}" class="btn btn-primary float-right"><i class="fas fa-plus mr-1"></i> Submit</a> @endif
-</h1>
-@if(isset($gallery->start_at) || isset($gallery->end_at))
-    <p>
-        @if($gallery->start_at)
-            <strong>Open{{ $gallery->start_at->isFuture() ? 's' : 'ed' }}: </strong>{!! pretty_date($gallery->start_at) !!}
-        @endif
-        {{ $gallery->start_at && $gallery->end_at ? ' ・ ' : '' }}
-        @if($gallery->end_at)
-            <strong>Close{{ $gallery->end_at->isFuture() ? 's' : 'd' }}: </strong>{!! pretty_date($gallery->end_at) !!}
+    <h1>
+        {{ $gallery->name }}
+        @if (Auth::check() && $gallery->canSubmit(Auth::user()))
+            <a href="{{ url('gallery/submit/' . $gallery->id) }}" class="btn btn-primary float-right"><i class="fas fa-plus mr-1"></i> Submit</a>
         @endif
-    </p>
-@endif
-<p>{!! $gallery->description !!}</p>
-@if(!$gallery->submissions->count() && $gallery->children->count() && $childSubmissions->count())
-    <p>This gallery has no submissions; instead, displayed is a selection of the most recent submissions from its sub-galleries. Please navigate to one of the sub-galleries to view more.</p>
-@endif
+    </h1>
+    @if (isset($gallery->start_at) || isset($gallery->end_at))
+        <p>
+            @if ($gallery->start_at)
+                <strong>Open{{ $gallery->start_at->isFuture() ? 's' : 'ed' }}: </strong>{!! pretty_date($gallery->start_at) !!}
+            @endif
+            {{ $gallery->start_at && $gallery->end_at ? ' ・ ' : '' }}
+            @if ($gallery->end_at)
+                <strong>Close{{ $gallery->end_at->isFuture() ? 's' : 'd' }}: </strong>{!! pretty_date($gallery->end_at) !!}
+            @endif
+        </p>
+    @endif
+    <p>{!! $gallery->description !!}</p>
+    @if (!$gallery->submissions->count() && $gallery->children->count() && $childSubmissions->count())
+        <p>This gallery has no submissions; instead, displayed is a selection of the most recent submissions from its sub-galleries. Please navigate to one of the sub-galleries to view more.</p>
+    @endif
 
-<div>
-    {!! Form::open(['method' => 'GET', 'class' => 'form-inline justify-content-end']) !!}
+    <div>
+        {!! Form::open(['method' => 'GET', 'class' => 'form-inline justify-content-end']) !!}
         <div class="form-group mr-3 mb-3">
             {!! Form::text('title', Request::get('title'), ['class' => 'form-control', 'placeholder' => 'Title']) !!}
         </div>
@@ -34,39 +39,44 @@
             {!! Form::select('prompt_id', $prompts, Request::get('prompt_id'), ['class' => 'form-control']) !!}
         </div>
         <div class="form-group mr-3 mb-3">
-            {!! Form::select('sort', [
-                'newest'         => 'Newest First',
-                'oldest'         => 'Oldest First',
-                'alpha'          => 'Sort Alphabetically (A-Z)',
-                'alpha-reverse'  => 'Sort Alphabetically (Z-A)',
-                'prompt'         => 'Sort by Prompt (Newest to Oldest)',
-                'prompt-reverse' => 'Sort by Prompt (Oldest to Newest)',
-            ], Request::get('sort') ? : 'category', ['class' => 'form-control']) !!}
+            {!! Form::select(
+                'sort',
+                [
+                    'newest' => 'Newest First',
+                    'oldest' => 'Oldest First',
+                    'alpha' => 'Sort Alphabetically (A-Z)',
+                    'alpha-reverse' => 'Sort Alphabetically (Z-A)',
+                    'prompt' => 'Sort by Prompt (Newest to Oldest)',
+                    'prompt-reverse' => 'Sort by Prompt (Oldest to Newest)',
+                ],
+                Request::get('sort') ?: 'category',
+                ['class' => 'form-control'],
+            ) !!}
         </div>
         <div class="form-group mb-3">
             {!! Form::submit('Search', ['class' => 'btn btn-primary']) !!}
         </div>
-    {!! Form::close() !!}
-</div>
+        {!! Form::close() !!}
+    </div>
 
-@if($gallery->submissions->count())
-    {!! $submissions->render() !!}
+    @if ($gallery->submissions->count())
+        {!! $submissions->render() !!}
 
-<div class="d-flex align-content-around flex-wrap mb-2">
-    @foreach($submissions as $submission)
-        @include('galleries._thumb', ['submission' => $submission, 'gallery' => true])
-    @endforeach
-</div>
+        <div class="d-flex align-content-around flex-wrap mb-2">
+            @foreach ($submissions as $submission)
+                @include('galleries._thumb', ['submission' => $submission, 'gallery' => true])
+            @endforeach
+        </div>
 
-    {!! $submissions->render() !!}
-@elseif($childSubmissions->count())
-    <div class="d-flex align-content-around flex-wrap mb-2">
-        @foreach($childSubmissions->orderBy('created_at', 'DESC')->get()->take(20) as $submission)
-            @include('galleries._thumb', ['submission' => $submission, 'gallery' => false])
-        @endforeach
-    </div>
-@else
-    <p>No submissions found!</p>
-@endif
+        {!! $submissions->render() !!}
+    @elseif($childSubmissions->count())
+        <div class="d-flex align-content-around flex-wrap mb-2">
+            @foreach ($childSubmissions->orderBy('created_at', 'DESC')->get()->take(20) as $submission)
+                @include('galleries._thumb', ['submission' => $submission, 'gallery' => false])
+            @endforeach
+        </div>
+    @else
+        <p>No submissions found!</p>
+    @endif
 
 @endsection
diff --git a/resources/views/galleries/index.blade.php b/resources/views/galleries/index.blade.php
index 5b6d9be940..a6d3098823 100644
--- a/resources/views/galleries/index.blade.php
+++ b/resources/views/galleries/index.blade.php
@@ -1,72 +1,87 @@
 @extends('galleries.layout')
 
-@section('gallery-title') Home @endsection
+@section('gallery-title')
+    Home
+@endsection
 
 @section('gallery-content')
-{!! breadcrumbs(['Gallery' => 'gallery']) !!}
-<h1>Gallery</h1>
+    {!! breadcrumbs(['Gallery' => 'gallery']) !!}
+    <h1>
+        @if (config('lorekeeper.extensions.show_all_recent_submissions.enable') && config('lorekeeper.extensions.show_all_recent_submissions.links.indexbutton'))
+            <div class="float-right">
+                <a class="btn btn-primary" href="gallery/all">
+                    All Recent Submissions
+                </a>
+            </div>
+        @endif
+        Gallery
+    </h1>
 
-@if($galleries->count())
-    {!! $galleries->render() !!}
+    @if ($galleries->count())
+        {!! $galleries->render() !!}
 
-    @foreach($galleries as $gallery)
-        <div class="card mb-4">
-            <div class="card-header">
-                <h4>
-                    {!! $gallery->displayName !!}
-                    @if(Auth::check() && $gallery->canSubmit(Auth::user())) <a href="{{ url('gallery/submit/'.$gallery->id) }}" class="btn btn-primary float-right"><i class="fas fa-plus"></i></a> @endif
-                </h4>
-                @if($gallery->children->count() || (isset($gallery->start_at) || isset($gallery->end_at)))
-                    <p>
-                        @if(isset($gallery->start_at) || isset($gallery->end_at))
-                            @if($gallery->start_at)
-                                <strong>Open{{ $gallery->start_at->isFuture() ? 's' : 'ed' }}: </strong>{!! pretty_date($gallery->start_at) !!}
+        @foreach ($galleries as $gallery)
+            <div class="card mb-4">
+                <div class="card-header">
+                    <h4>
+                        {!! $gallery->displayName !!}
+                        @if (Auth::check() && $gallery->canSubmit(Auth::user()))
+                            <a href="{{ url('gallery/submit/' . $gallery->id) }}" class="btn btn-primary float-right"><i class="fas fa-plus"></i></a>
+                        @endif
+                    </h4>
+                    @if ($gallery->children->count() || (isset($gallery->start_at) || isset($gallery->end_at)))
+                        <p>
+                            @if (isset($gallery->start_at) || isset($gallery->end_at))
+                                @if ($gallery->start_at)
+                                    <strong>Open{{ $gallery->start_at->isFuture() ? 's' : 'ed' }}: </strong>{!! pretty_date($gallery->start_at) !!}
+                                @endif
+                                {{ $gallery->start_at && $gallery->end_at ? ' ・ ' : '' }}
+                                @if ($gallery->end_at)
+                                    <strong>Close{{ $gallery->end_at->isFuture() ? 's' : 'ed' }}: </strong>{!! pretty_date($gallery->end_at) !!}
+                                @endif
                             @endif
-                            {{ $gallery->start_at && $gallery->end_at ? ' ・ ' : '' }}
-                            @if($gallery->end_at)
-                                <strong>Close{{ $gallery->end_at->isFuture() ? 's' : 'ed' }}: </strong>{!! pretty_date($gallery->end_at) !!}
+                            {{ $gallery->children->count() && (isset($gallery->start_at) || isset($gallery->end_at)) ? ' ・ ' : '' }}
+                            @if ($gallery->children->count())
+                                Sub-galleries:
+                                @foreach ($gallery->children()->visible()->get() as $count => $child)
+                                    {!! $child->displayName !!}{{ !$loop->last ? ', ' : '' }}
+                                @endforeach
                             @endif
-                        @endif
-                        {{ $gallery->children->count() && (isset($gallery->start_at) || isset($gallery->end_at)) ? ' ・ ' : '' }}
-                        @if($gallery->children->count())
-                            Sub-galleries:
-                            @foreach($gallery->children()->visible()->get() as $count=>$child)
-                                {!! $child->displayName !!}{{ !$loop->last ? ', ' : '' }}
+                        </p>
+                    @endif
+                </div>
+                <div class="card-body">
+                    @if ($gallery->submissions()->where('status', 'Accepted')->count())
+                        <div class="row">
+                            @foreach ($gallery->submissions()->where('is_visible', 1)->where('status', 'Accepted')->take(4)->get() as $submission)
+                                <div class="col-md-3 text-center align-self-center">
+                                    @include('galleries._thumb', ['submission' => $submission, 'gallery' => true])
+                                </div>
                             @endforeach
+                        </div>
+                        @if ($gallery->submissions()->where('status', 'Accepted')->count() > 4)
+                            <div class="text-right"><a href="{{ url('gallery/' . $gallery->id) }}">See More...</a></div>
                         @endif
-                    </p>
-                @endif
-            </div>
-            <div class="card-body">
-                @if($gallery->submissions->where('status', 'Accepted')->count())
-                    <div class="row">
-                        @foreach($gallery->submissions->where('is_visible', 1)->where('status', 'Accepted')->take(4) as $submission)
-                            <div class="col-md-3 text-center align-self-center">
-                                @include('galleries._thumb', ['submission' => $submission, 'gallery' => true])
-                            </div>
-                        @endforeach
-                    </div>
-                    @if($gallery->submissions->where('status', 'Accepted')->count() > 4)
-                        <div class="text-right"><a href="{{ url('gallery/'.$gallery->id) }}">See More...</a></div>
+                    @elseif(
+                        $gallery->children->count() &&
+                            App\Models\Gallery\GallerySubmission::whereIn('gallery_id', $gallery->children->pluck('id')->toArray())->where('is_visible', 1)->where('status', 'Accepted')->count())
+                        <div class="row">
+                            @foreach (App\Models\Gallery\GallerySubmission::whereIn('gallery_id', $gallery->children->pluck('id')->toArray())->where('is_visible', 1)->where('status', 'Accepted')->orderBy('created_at', 'DESC')->get()->take(4) as $submission)
+                                <div class="col-md-3 text-center align-self-center">
+                                    @include('galleries._thumb', ['submission' => $submission, 'gallery' => false])
+                                </div>
+                            @endforeach
+                        </div>
+                    @else
+                        <p>This gallery has no submissions!</p>
                     @endif
-                @elseif($gallery->children->count() && App\Models\Gallery\GallerySubmission::whereIn('gallery_id', $gallery->children->pluck('id')->toArray())->where('is_visible', 1)->where('status', 'Accepted')->count())
-                    <div class="row">
-                        @foreach(App\Models\Gallery\GallerySubmission::whereIn('gallery_id', $gallery->children->pluck('id')->toArray())->where('is_visible', 1)->where('status', 'Accepted')->orderBy('created_at', 'DESC')->get()->take(4) as $submission)
-                            <div class="col-md-3 text-center align-self-center">
-                                @include('galleries._thumb', ['submission' => $submission, 'gallery' => false])
-                            </div>
-                        @endforeach
-                    </div>
-                @else
-                    <p>This gallery has no submissions!</p>
-                @endif
+                </div>
             </div>
-        </div>
-    @endforeach
+        @endforeach
 
-    {!! $galleries->render() !!}
-@else
-    <p>There aren't any galleries!</p>
-@endif
+        {!! $galleries->render() !!}
+    @else
+        <p>There aren't any galleries!</p>
+    @endif
 
 @endsection
diff --git a/resources/views/galleries/layout.blade.php b/resources/views/galleries/layout.blade.php
index 9b864ca196..1ef904321e 100644
--- a/resources/views/galleries/layout.blade.php
+++ b/resources/views/galleries/layout.blade.php
@@ -1,6 +1,6 @@
 @extends('layouts.app')
 
-@section('title') 
+@section('title')
     Gallery :: @yield('gallery-title')
 @endsection
 
@@ -13,5 +13,5 @@
 @endsection
 
 @section('scripts')
-@parent
-@endsection
\ No newline at end of file
+    @parent
+@endsection
diff --git a/resources/views/galleries/showall.blade.php b/resources/views/galleries/showall.blade.php
new file mode 100644
index 0000000000..2ff8c8117d
--- /dev/null
+++ b/resources/views/galleries/showall.blade.php
@@ -0,0 +1,62 @@
+@extends('galleries.layout')
+
+@section('gallery-title')
+    All Recent Submissions
+@endsection
+
+@section('gallery-content')
+    {!! breadcrumbs(['Gallery' => 'gallery', 'All Recent Submissions' => 'gallery/all']) !!}
+
+    <h1>
+        All Recent Submissions
+    </h1>
+
+    <p>This page displays all recent submissions, regardless of gallery.</p>
+    @if (!$submissions->count())
+        <p>There are no submissions.</p>
+    @endif
+
+    <div>
+        {!! Form::open(['method' => 'GET', 'class' => 'form-inline justify-content-end']) !!}
+        <div class="form-group mr-3 mb-3">
+            {!! Form::text('title', Request::get('title'), ['class' => 'form-control', 'placeholder' => 'Title']) !!}
+        </div>
+        <div class="form-group mr-3 mb-3">
+            {!! Form::select('prompt_id', $prompts, Request::get('prompt_id'), ['class' => 'form-control']) !!}
+        </div>
+        <div class="form-group mr-3 mb-3">
+            {!! Form::select(
+                'sort',
+                [
+                    'newest' => 'Newest First',
+                    'oldest' => 'Oldest First',
+                    'alpha' => 'Sort Alphabetically (A-Z)',
+                    'alpha-reverse' => 'Sort Alphabetically (Z-A)',
+                    'prompt' => 'Sort by Prompt (Newest to Oldest)',
+                    'prompt-reverse' => 'Sort by Prompt (Oldest to Newest)',
+                ],
+                Request::get('sort') ?: 'category',
+                ['class' => 'form-control'],
+            ) !!}
+        </div>
+        <div class="form-group mb-3">
+            {!! Form::submit('Search', ['class' => 'btn btn-primary']) !!}
+        </div>
+        {!! Form::close() !!}
+    </div>
+
+    @if ($submissions->count())
+        {!! $submissions->render() !!}
+
+        <div class="d-flex align-content-around flex-wrap mb-2">
+            @foreach ($submissions as $submission)
+                @include('galleries._thumb', ['submission' => $submission, 'gallery' => true])
+            @endforeach
+        </div>
+
+        {!! $submissions->render() !!}
+    @else
+        <p>No submissions found!</p>
+    @endif
+
+@endsection
diff --git a/resources/views/galleries/submission.blade.php b/resources/views/galleries/submission.blade.php
index e2c9c767d9..fd0b51b416 100644
--- a/resources/views/galleries/submission.blade.php
+++ b/resources/views/galleries/submission.blade.php
@@ -1,122 +1,149 @@
 @extends('galleries.layout')
 
-@section('gallery-title') {{ $submission->displayTitle }} @endsection
+@section('gallery-title')
+    {{ $submission->displayTitle }}
+@endsection
 
-@section('meta-img') {{ isset($submission->hash) ? $submission->thumbnailUrl : asset('images/meta-image.png') }} @endsection
+@section('meta-img')
+    {{ isset($submission->hash) ? $submission->thumbnailUrl : asset('images/meta-image.png') }}
+@endsection
 
 @section('gallery-content')
-{!! breadcrumbs(['gallery' => 'gallery', $submission->gallery->displayName => 'gallery/'.$submission->gallery->id, $submission->displayTitle => 'gallery/view/'.$submission->id ]) !!}
+    {!! breadcrumbs(['gallery' => 'gallery', $submission->gallery->displayName => 'gallery/' . $submission->gallery->id, $submission->displayTitle => 'gallery/view/' . $submission->id]) !!}
 
-<h1>
-    @if(!$submission->isVisible) <i class="fas fa-eye-slash"></i> @endif {{ $submission->displayTitle }}
-    <div class="float-right">
-        @if(Auth::check())
-            {!! Form::open(['url' => '/gallery/favorite/'.$submission->id]) !!}
-                @if($submission->user->id != Auth::user()->id && $submission->collaborators->where('user_id', Auth::user()->id)->first() == null && $submission->isVisible)
-                    {!! Form::button('<i class="fas fa-star"></i> ', ['class' => 'btn '. ($submission->favorites->where('user_id', Auth::user()->id)->first() == null ? 'btn-outline-primary' : 'btn-primary'), 'data-toggle' => 'tooltip', 'title' => ($submission->favorites->where('user_id', Auth::user()->id)->first() == null ? 'Add to' : 'Remove from').' your Favorites', 'type' => 'submit']) !!}
+    <h1>
+        @if (!$submission->isVisible)
+            <i class="fas fa-eye-slash"></i>
+        @endif {{ $submission->displayTitle }}
+        <div class="float-right">
+            @if (Auth::check())
+                {!! Form::open(['url' => '/gallery/favorite/' . $submission->id]) !!}
+                @if ($submission->user->id != Auth::user()->id && $submission->collaborators->where('user_id', Auth::user()->id)->first() == null && $submission->isVisible)
+                    {!! Form::button('<i class="fas fa-star"></i> ', [
+                        'class' => 'btn ' . ($submission->favorites->where('user_id', Auth::user()->id)->first() == null ? 'btn-outline-primary' : 'btn-primary'),
+                        'data-toggle' => 'tooltip',
+                        'title' => ($submission->favorites->where('user_id', Auth::user()->id)->first() == null ? 'Add to' : 'Remove from') . ' your Favorites',
+                        'type' => 'submit',
+                    ]) !!}
                 @endif
-                @if($submission->user->id == Auth::user()->id || Auth::user()->hasPower('manage_submissions'))
+                @if ($submission->user->id == Auth::user()->id || Auth::user()->hasPower('manage_submissions'))
                     <a class="btn btn-outline-primary" href="/gallery/queue/{{ $submission->id }}" data-toggle="tooltip" title="View Log Details"><i class="fas fa-clipboard-list"></i></a>
                     <a class="btn btn-outline-primary" href="/gallery/edit/{{ $submission->id }}"><i class="fas fa-edit"></i> Edit</a>
                 @endif
-            {!! Form::close() !!}
-        @endif
-    </div>
-</h1>
-<div class="mb-3 mb-sm-4">
-    <div class="row">
-        <div class="col-md">
-            In {!! $submission->gallery->displayName !!} ・
-            By {!! $submission->credits !!}
+                {!! Form::close() !!}
+            @endif
         </div>
-        <div class="col-md text-right">
-            {{ $submission->favorites->count() }} Favorite{{ $submission->favorites->count() != 1 ? 's' : ''}} ・ {{ $commentCount }} Comment{{ $commentCount != 1 ? 's' : ''}}
-        </div>
-    </diV>
-</div>
+    </h1>
+    <div class="mb-3 mb-sm-4">
+        <div class="row">
+            <div class="col-md">
+                In {!! $submission->gallery->displayName !!} ・
+                By {!! $submission->credits !!}
+            </div>
+            <div class="col-md text-right">
+                {{ $submission->favorites->count() }} Favorite{{ $submission->favorites->count() != 1 ? 's' : '' }} ・ {{ $commentCount }} Comment{{ $commentCount != 1 ? 's' : '' }}
+            </div>
+        </diV>
+    </div>
 
-<!-- Main Content -->
-@if(isset($submission->parsed_text) && $submission->parsed_text) <div class="card mx-md-4 mb-4"><div class="card-body"> @endif
-    @if(isset($submission->hash) && $submission->hash)
+    <!-- Main Content -->
+    @if (isset($submission->parsed_text) && $submission->parsed_text)
+        <div class="card mx-md-4 mb-4">
+            <div class="card-body">
+    @endif
+    @if (isset($submission->hash) && $submission->hash)
         <div class="text-center mb-4">
             <a href="{{ $submission->imageUrl }}" data-lightbox="entry" data-title="{{ $submission->displayTitle }}">
-                <img src="{{ $submission->imageUrl }}" class="image" style="max-width:100%; {{ isset($submission->parsed_text) && $submission->parsed_text ? 'max-height:50vh;' : 'max-height:70vh;' }} border-radius:.5em;" data-toggle="tooltip" title="Click to view larger size" alt="{{ $submission->displayTitle }}"/>
+                <img src="{{ $submission->imageUrl }}" class="image" style="max-width:100%; {{ isset($submission->parsed_text) && $submission->parsed_text ? 'max-height:50vh;' : 'max-height:70vh;' }} border-radius:.5em;" data-toggle="tooltip"
+                    title="Click to view larger size" alt="{{ $submission->displayTitle }}" />
             </a>
         </div>
     @endif
-    @if(isset($submission->parsed_text) && $submission->parsed_text)
+    @if (isset($submission->parsed_text) && $submission->parsed_text)
         {!! $submission->parsed_text !!}
     @endif
-@if(isset($submission->parsed_text) && $submission->parsed_text) </div></div> @endif
+    @if (isset($submission->parsed_text) && $submission->parsed_text)
+        </div>
+        </div>
+    @endif
 
-<!-- Submission Info -->
-<div class="row mx-md-2 mb-4">
-    <div class="col-md mb-4">
-        <div class="row mb-4 no-gutters">
-            <div class="col-md-2 mb-4 mobile-hide text-center">
-                <a href="/user/{{ $submission->user->name }}"><img src="/images/avatars/{{ $submission->user->avatar }}" style="border-radius:50%; margin-right:25px; max-width:100%;" data-toggle="tooltip" title="{{ $submission->user->name }}" alt="{{ $submission->user->name }}"/></a>
-            </div>
-            <div class="col-md ml-md-2">
-                <div class="card">
-                    <div class="card-header">
-                        <h5>{{ $submission->displayTitle }}
-                        <a class="float-right" href="{{ url('reports/new?url=') . $submission->url }}"><i class="fas fa-exclamation-triangle" data-toggle="tooltip" title="Click here to report this submission." style="opacity: 50%;"></i></a></h5>
-                        <div class="float-right">
-                            @if(Auth::check() && ($submission->user->id != Auth::user()->id && $submission->collaborators->where('user_id', Auth::user()->id)->first() == null) && $submission->isVisible)
-                                {!! Form::open(['url' => '/gallery/favorite/'.$submission->id]) !!}
-                                    {{ $submission->favorites->count() }} {!! Form::button('<i class="fas fa-star"></i> ', ['style' => 'border:0; border-radius:.5em;', 'class' => ($submission->favorites->where('user_id', Auth::user()->id)->first() != null ? 'btn-success' : ''), 'data-toggle' => 'tooltip', 'title' => ($submission->favorites->where('user_id', Auth::user()->id)->first() == null ? 'Add to' : 'Remove from').' your Favorites', 'type' => 'submit']) !!} ・ {{ $commentCount }} <i class="fas fa-comment"></i>
-                                {!! Form::close() !!}
-                            @else
-                                {{ $submission->favorites->count() }} <i class="fas fa-star" data-toggle="tooltip" title="Favorites"></i> ・ {{ $commentCount }} <i class="fas fa-comment" data-toggle="tooltip" title="Comments"></i>
+    <!-- Submission Info -->
+    <div class="row mx-md-2 mb-4">
+        <div class="col-md mb-4">
+            <div class="row mb-4 no-gutters">
+                <div class="col-md-2 mb-4 mobile-hide text-center">
+                    <a href="/user/{{ $submission->user->name }}"><img src="{{ $submission->user->avatarUrl }}" style="border-radius:50%; margin-right:25px; max-width:100%;" data-toggle="tooltip" title="{{ $submission->user->name }}"
+                            alt="{{ $submission->user->name }}'s Avatar" /></a>
+                </div>
+                <div class="col-md ml-md-2">
+                    <div class="card">
+                        <div class="card-header">
+                            <h5>{{ $submission->displayTitle }}
+                                <a class="float-right" href="{{ url('reports/new?url=') . $submission->url }}"><i class="fas fa-exclamation-triangle" data-toggle="tooltip" title="Click here to report this submission." style="opacity: 50%;"></i></a>
+                            </h5>
+                            <div class="float-right">
+                                @if (Auth::check() && ($submission->user->id != Auth::user()->id && $submission->collaborators->where('user_id', Auth::user()->id)->first() == null) && $submission->isVisible)
+                                    {!! Form::open(['url' => '/gallery/favorite/' . $submission->id]) !!}
+                                    {{ $submission->favorites->count() }} {!! Form::button('<i class="fas fa-star"></i> ', [
+                                        'style' => 'border:0; border-radius:.5em;',
+                                        'class' => $submission->favorites->where('user_id', Auth::user()->id)->first() != null ? 'btn-success' : '',
+                                        'data-toggle' => 'tooltip',
+                                        'title' => ($submission->favorites->where('user_id', Auth::user()->id)->first() == null ? 'Add to' : 'Remove from') . ' your Favorites',
+                                        'type' => 'submit',
+                                    ]) !!} ・ {{ $commentCount }} <i class="fas fa-comment"></i>
+                                    {!! Form::close() !!}
+                                @else
+                                    {{ $submission->favorites->count() }} <i class="fas fa-star" data-toggle="tooltip" title="Favorites"></i> ・ {{ $commentCount }} <i class="fas fa-comment" data-toggle="tooltip" title="Comments"></i>
+                                @endif
+                            </div>
+                            In {!! $submission->gallery->displayName !!} ・ By {!! $submission->credits !!}
+                            @if (isset($submission->content_warning))
+                                ・ <span class="text-danger"><strong>Content Warning:</strong></span> {!! nl2br(htmlentities($submission->content_warning)) !!}
                             @endif
                         </div>
-                        In {!! $submission->gallery->displayName !!} ・ By {!! $submission->credits !!}
-                        @if(isset($submission->content_warning))
-                            ・ <span class="text-danger"><strong>Content Warning:</strong></span> {!! nl2br(htmlentities($submission->content_warning)) !!}
-                        @endif
-                    </div>
-                    <div class="card-body">
-                        {!! $submission->parsed_description ? $submission->parsed_description : '<i>No description provided.</i>' !!}
+                        <div class="card-body">
+                            {!! $submission->parsed_description ? $submission->parsed_description : '<i>No description provided.</i>' !!}
 
-                        <hr/>
-                        <p>
-                            <strong>Submitted By</strong> {!! $submission->user->displayName !!}
-                            @if($submission->prompt_id)
-                                <strong>for</strong> {!! $submission->prompt->displayName !!}
-                            @endif
-                            @if($submission->favorites->count())
-                                 ・ <a class="view-favorites" href="#">View Favorites</a>
-                            @endif
-                            <br/>
-                            <strong>Submitted:</strong> {!! pretty_date($submission->created_at) !!} ・
-                            <strong>Last Updated:</strong> {!! pretty_date($submission->updated_at) !!}
-                        </p>
+                            <hr />
+                            <p>
+                                <strong>Submitted By</strong> {!! $submission->user->displayName !!}
+                                @if ($submission->prompt_id)
+                                    <strong>for</strong> {!! $submission->prompt->displayName !!}
+                                @endif
+                                @if ($submission->favorites->count())
+                                    ・ <a class="view-favorites" href="#">View Favorites</a>
+                                @endif
+                                <br />
+                                <strong>Submitted:</strong> {!! pretty_date($submission->created_at) !!} ・
+                                <strong>Last Updated:</strong> {!! pretty_date($submission->updated_at) !!}
+                            </p>
+                        </div>
                     </div>
                 </div>
             </div>
         </div>
-    </div>
-    <div class="col-md-4 col-lg-3">
-        @if($submission->collaborators->count())
-            <div class="card mb-4">
-                <div class="card-header">
-                    <h5>Collaborators</h5>
-                </div>
-                <div class="card-body">
-                    @if($submission->status == 'Pending' && Auth::check() && $submission->collaborators->where('user_id', Auth::user()->id)->first() != null)
-                        <p>Check that your role in the collaboration is correct as listed, and if not, make any changes. You can also remove yourself from the collaborator list if necessary. When you are done, or if the record is already accurate, press "submit" to make any changes and mark yourself as having approved. You will be able to edit this until the submission is approved.</p>
-                        {!! Form::open(['url' => '/gallery/collaborator/'.$submission->id]) !!}
-                            @foreach($submission->collaborators as $collaborator)
-                                @if($collaborator->user_id == Auth::user()->id)
-                                <div class="mb-2">
-                                    <div class="d-flex">{!! $collaborator->has_approved ? '<div class="mb-2 mr-2 text-success" data-toggle="tooltip" title="Has Approved"><i class="fas fa-check"></i></div>' : '' !!}{!! $collaborator->user->displayName !!}:
-                                    </div>
-                                    <div class="d-flex">
-                                        {!! Form::text('collaborator_data[]', $collaborator->data, ['class' => 'form-control mr-2', 'placeholder' => 'Role (Sketch, Lines, etc.)']) !!}
+        <div class="col-md-4 col-lg-3">
+            @if ($submission->collaborators->count())
+                <div class="card mb-4">
+                    <div class="card-header">
+                        <h5>Collaborators</h5>
+                    </div>
+                    <div class="card-body">
+                        @if ($submission->status == 'Pending' && Auth::check() && $submission->collaborators->where('user_id', Auth::user()->id)->first() != null)
+                            <p>Check that your role in the collaboration is correct as listed, and if not, make any changes. You can also remove yourself from the collaborator list if necessary. When you are done, or if the record is already accurate,
+                                press "submit" to make any changes and mark yourself as having approved. You will be able to edit this until the submission is approved.</p>
+                            {!! Form::open(['url' => '/gallery/collaborator/' . $submission->id]) !!}
+                            @foreach ($submission->collaborators as $collaborator)
+                                @if ($collaborator->user_id == Auth::user()->id)
+                                    <div class="mb-2">
+                                        <div class="d-flex">{!! $collaborator->has_approved ? '<div class="mb-2 mr-2 text-success" data-toggle="tooltip" title="Has Approved"><i class="fas fa-check"></i></div>' : '' !!}{!! $collaborator->user->displayName !!}:
+                                        </div>
+                                        <div class="d-flex">
+                                            {!! Form::text('collaborator_data[]', $collaborator->data, ['class' => 'form-control mr-2', 'placeholder' => 'Role (Sketch, Lines, etc.)']) !!}
+                                        </div>
+                                        {!! Form::label('remove_user', 'Remove Me', ['class' => 'form-check-label ml-3']) !!} {!! add_help('If toggled on, this will remove the record of your collaboration from this submission.') !!}
+                                        {!! Form::checkbox('remove_user', 1, false, ['class' => 'form-check-input', 'data-toggle' => 'toggle', 'data-onstyle' => 'danger']) !!}
                                     </div>
-                                    {!! Form::label('remove_user', 'Remove Me', ['class' => 'form-check-label ml-3']) !!} {!! add_help('If toggled on, this will remove the record of your collaboration from this submission.') !!}
-                                    {!! Form::checkbox('remove_user', 1, false, ['class' => 'form-check-input', 'data-toggle' => 'toggle', 'data-onstyle' => 'danger']) !!}
-                                </div>
                                 @else
                                     <div class="d-flex">
                                         {!! $collaborator->has_approved ? '<div class="mb-2 mr-2 text-success" data-toggle="tooltip" title="Has Approved"><i class="fas fa-check"></i></div>' : '' !!} {!! $collaborator->user->displayName !!}: {{ $collaborator->data }}
@@ -126,102 +153,101 @@
                             <div class="mt-2 text-right">
                                 {!! Form::submit('Submit', ['class' => 'btn btn-primary']) !!}
                             </div>
-                        {!! Form::close() !!}
-                    @else
-                        @foreach($submission->collaborators as $collaborator)
+                            {!! Form::close() !!}
+                        @else
+                            @foreach ($submission->collaborators as $collaborator)
+                                <div class="d-flex">
+                                    {!! $submission->status == 'Pending' && $collaborator->has_approved ? '<div class="mb-2 mr-2 text-success" data-toggle="tooltip" title="Has Approved"><i class="fas fa-check"></i></div>' : '' !!} {!! $collaborator->user->displayName !!}: {{ $collaborator->data }}
+                                </div>
+                            @endforeach
+                        @endif
+                    </div>
+                </div>
+            @endif
+            @if ($submission->participants->count())
+                <div class="card mb-4">
+                    <div class="card-header">
+                        <h5>Participants</h5>
+                    </div>
+                    <div class="card-body">
+                        @foreach ($submission->participants as $participant)
                             <div class="d-flex">
-                                {!! $submission->status == 'Pending' && $collaborator->has_approved ? '<div class="mb-2 mr-2 text-success" data-toggle="tooltip" title="Has Approved"><i class="fas fa-check"></i></div>' : '' !!} {!! $collaborator->user->displayName !!}: {{ $collaborator->data }}
+                                {!! $participant->user->displayName !!}: {{ $participant->displayType }}
                             </div>
                         @endforeach
-                    @endif
-                </div>
-            </div>
-        @endif
-        @if($submission->participants->count())
-            <div class="card mb-4">
-                <div class="card-header">
-                    <h5>Participants</h5>
-                </div>
-                <div class="card-body">
-                    @foreach($submission->participants as $participant)
-                        <div class="d-flex">
-                            {!! $participant->user->displayName !!}: {{ $participant->displayType }}
-                        </div>
-                    @endforeach
+                    </div>
                 </div>
-            </div>
-        @endif
-        @if($submission->characters->count())
-            <div class="card mb-4">
-                <div class="card-header">
-                    <h5>Characters</h5>
+            @endif
+            @if ($submission->characters->count())
+                <div class="card mb-4">
+                    <div class="card-header">
+                        <h5>Characters</h5>
+                    </div>
+                    <div class="card-body">
+                        @foreach ($submission->characters->chunk(1) as $chunk)
+                            <div class="row mb-2">
+                                @foreach ($chunk as $character)
+                                    <div class="col-md">
+                                        @include('galleries._character', ['character' => $character->character])
+                                    </div>
+                                @endforeach
+                            </div>
+                        @endforeach
+                    </div>
                 </div>
-                <div class="card-body">
-                    @foreach($submission->characters->chunk(1) as $chunk)
-                        <div class="row mb-2">
-                            @foreach($chunk as $character)
-                                <div class="col-md">
-                                    @include('galleries._character', ['character' => $character->character])
-                                </div>
-                            @endforeach
-                        </div>
-                    @endforeach
+            @endif
+            @if ($submission->promptSubmissions->count())
+                <div class="card mb-4">
+                    <div class="card-header">
+                        <h5>Prompt Submissions</h5>
+                    </div>
+                    <div class="card-body">
+                        @foreach ($submission->promptSubmissions as $promptSubmission)
+                            <strong><a href="{{ $promptSubmission->viewUrl }}">#{{ $promptSubmission->id }} for {!! $promptSubmission->prompt->name !!}</a></strong> by {!! $promptSubmission->user->displayName !!}<br />
+                        @endforeach
+                    </div>
                 </div>
-            </div>
-        @endif
-        @if($submission->promptSubmissions->count())
+            @endif
             <div class="card mb-4">
                 <div class="card-header">
-                    <h5>Prompt Submissions</h5>
+                    <h5>Mention This</h5>
                 </div>
                 <div class="card-body">
-                    @foreach($submission->promptSubmissions as $promptSubmission)
-                        <strong><a href="{{ $promptSubmission->viewUrl }}">#{{ $promptSubmission->id }} for {!! $promptSubmission->prompt->name !!}</a></strong> by {!! $promptSubmission->user->displayName !!}<br/>
-                    @endforeach
-                </div>
-            </div>
-        @endif
-        <div class="card mb-4">
-            <div class="card-header">
-                <h5>Mention This</h5>
-            </div>
-            <div class="card-body">
-                In the rich text editor:
-                <div class="alert alert-secondary">
-                    [thumb={{ $submission->id }}]
-                </div>
-                In a comment:
-                <div class="alert alert-secondary">
-                    @if(isset($submission->hash) && !isset($submission->content_warning))
-                        [![Image]({{$submission->thumbnailUrl }})]({{ $submission->url }})
-                    @else
-                        [{{ $submission->displayTitle }} by {{ $submission->creditsPlain }} {{ isset($submission->hash) ? '(Art)' : '(Literature)' }}{{ isset($submission->content_warning) ? ' ・ **Content Warning:** '.nl2br(htmlentities($submission->content_warning)) : '' }}]({{ $submission->url }})
-                    @endif
+                    In the rich text editor:
+                    <div class="alert alert-secondary">
+                        [thumb={{ $submission->id }}]
+                    </div>
+                    In a comment:
+                    <div class="alert alert-secondary">
+                        @if (isset($submission->hash) && !isset($submission->content_warning))
+                            [![Image]({{ $submission->thumbnailUrl }})]({{ $submission->url }})
+                        @else
+                            [{{ $submission->displayTitle }} by {{ $submission->creditsPlain }}
+                            {{ isset($submission->hash) ? '(Art)' : '(Literature)' }}{{ isset($submission->content_warning) ? ' ・ **Content Warning:** ' . nl2br(htmlentities($submission->content_warning)) : '' }}]({{ $submission->url }})
+                        @endif
+                    </div>
                 </div>
             </div>
         </div>
     </div>
-</div>
 
-<!-- Comments -->
-@if($submission->isVisible)
-    <div class="container">
-        @comments(['model' => $submission,
-                'perPage' => 5
-            ])
-    </div>
-@endif
+    <!-- Comments -->
+    @if ($submission->isVisible)
+        <div class="container">
+            @comments(['model' => $submission, 'perPage' => 5])
+        </div>
+    @endif
 
 @endsection
 
 @section('scripts')
-@parent
-<script>
-    $(document).ready(function() {
-        $('.view-favorites').on('click', function(e) {
-            e.preventDefault();
-            loadModal("{{ url('gallery/view/favorites') }}/{{ $submission->id }}", 'Favorited By');
+    @parent
+    <script>
+        $(document).ready(function() {
+            $('.view-favorites').on('click', function(e) {
+                e.preventDefault();
+                loadModal("{{ url('gallery/view/favorites') }}/{{ $submission->id }}", 'Favorited By');
+            });
         });
-    });
-</script>
+    </script>
 @endsection
diff --git a/resources/views/galleries/submission_log.blade.php b/resources/views/galleries/submission_log.blade.php
index 78397fe514..eed81414b8 100644
--- a/resources/views/galleries/submission_log.blade.php
+++ b/resources/views/galleries/submission_log.blade.php
@@ -1,48 +1,73 @@
 @extends('galleries.layout')
 
-@section('gallery-title') {{ $submission->title }} Log @endsection
+@section('gallery-title')
+    {{ $submission->title }} Log
+@endsection
 
 @section('gallery-content')
-{!! breadcrumbs(['gallery' => 'gallery', $submission->gallery->displayName => 'gallery/'.$submission->gallery->id, $submission->title => 'gallery/view/'.$submission->id, 'Log Details' => 'gallery/queue/'.$submission->id ]) !!}
+    {!! breadcrumbs(['gallery' => 'gallery', $submission->gallery->displayName => 'gallery/' . $submission->gallery->id, $submission->title => 'gallery/view/' . $submission->id, 'Log Details' => 'gallery/queue/' . $submission->id]) !!}
 
-<h1>Log Details
-    <span class="float-right badge badge-{{ $submission->status == 'Pending' ? 'secondary' : ($submission->status == 'Accepted' ? 'success' : 'danger') }}">{{ $submission->collaboratorApproved ? $submission->status : 'Pending Collaborator Approval' }}</span>
-</h1>
+    <h1>Log Details
+        <span
+            class="float-right badge badge-{{ $submission->status == 'Pending' ? 'secondary' : ($submission->status == 'Accepted' ? 'success' : 'danger') }}">{{ $submission->collaboratorApproved ? $submission->status : 'Pending Collaborator Approval' }}</span>
+    </h1>
 
-@include('galleries._queue_submission', ['key' => 0])
+    @include('galleries._queue_submission', ['key' => 0])
 
-<div class="row">
-    <div class="col-md">
-        @if(Settings::get('gallery_submissions_reward_currency') && $submission->gallery->currency_enabled)
-            <div class="card mb-4">
-                <div class="card-header">
-                    <h5>{!! $currency->displayName !!} Award Info <a class="small inventory-collapse-toggle collapse-toggle {{ $submission->status == 'Accepted' ? '' : 'collapsed' }}" href="#currencyForm" data-toggle="collapse">Show</a></h5>
-                </div>
-                <div class="card-body collapse {{ $submission->status == 'Accepted' ? 'show' : '' }}" id="currencyForm">
-                    @if($submission->status == 'Accepted')
-                        @if(!$submission->is_valued)
-                            @if(Auth::user()->hasPower('manage_submissions'))
-                                <p>Enter in the amount of {{ $currency->name }} that {{ $submission->collaborators->count() ? 'each collaborator' : 'the submitting user'}}{{ $submission->participants->count() ? ' and any participants' : '' }} should receive. The suggested amount has been pre-filled for you based on the provided form responses, but this is only a guideline based on user input and should be verified and any adjustments made as necessary.</p>
-                                {!! Form::open(['url' => 'admin/gallery/edit/'.$submission->id.'/value']) !!}
-                                    @if(!$submission->collaborators->count() || $submission->collaborators->where('user_id', $submission->user_id)->first() == null)
+    <div class="row">
+        <div class="col-md">
+            @if (Settings::get('gallery_submissions_reward_currency') && $submission->gallery->currency_enabled)
+                <div class="card mb-4">
+                    <div class="card-header">
+                        <h5>{!! $currency->displayName !!} Award Info <a class="small inventory-collapse-toggle collapse-toggle {{ $submission->status == 'Accepted' ? '' : 'collapsed' }}" href="#currencyForm" data-toggle="collapse">Show</a></h5>
+                    </div>
+                    <div class="card-body collapse {{ $submission->status == 'Accepted' ? 'show' : '' }}" id="currencyForm">
+                        @if ($submission->status == 'Accepted')
+                            @if (!$submission->is_valued)
+                                @if (Auth::user()->hasPower('manage_submissions'))
+                                    <p>Enter in the amount of {{ $currency->name }} that {{ $submission->collaborators->count() ? 'each collaborator' : 'the submitting user' }}{{ $submission->participants->count() ? ' and any participants' : '' }}
+                                        should receive. The suggested amount has been pre-filled for you based on the provided form responses, but this is only a guideline based on user input and should be verified and any adjustments made as necessary.
+                                    </p>
+                                    {!! Form::open(['url' => 'admin/gallery/edit/' . $submission->id . '/value']) !!}
+                                    @if (!$submission->collaborators->count() || $submission->collaborators->where('user_id', $submission->user_id)->first() == null)
                                         <div class="form-group">
                                             {!! Form::label($submission->user->name) !!}:
-                                            {!! Form::number('value[submitted]['.$submission->user->id.']', isset($submission->data['total']) ? round(($submission->characters->count() ? round($submission->data['total'] * $submission->characters->count()) : $submission->data['total']) / ($submission->collaborators->count() ? $submission->collaborators->count() : '1')) : 0, ['class' => 'form-control']) !!}
+                                            {!! Form::number(
+                                                'value[submitted][' . $submission->user->id . ']',
+                                                isset($submission->data['total'])
+                                                    ? round(($submission->characters->count() ? round($submission->data['total'] * $submission->characters->count()) : $submission->data['total']) / ($submission->collaborators->count() ? $submission->collaborators->count() : '1'))
+                                                    : 0,
+                                                ['class' => 'form-control'],
+                                            ) !!}
                                         </div>
                                     @endif
-                                    @if($submission->collaborators->count())
-                                        @foreach($submission->collaborators as $key=>$collaborator)
+                                    @if ($submission->collaborators->count())
+                                        @foreach ($submission->collaborators as $key => $collaborator)
                                             <div class="form-group">
-                                                {!! Form::label($collaborator->user->name.' ('.$collaborator->data.')') !!}:
-                                                {!! Form::number('value[collaborator]['.$collaborator->user->id.']', isset($submission->data['total']) ? round(($submission->characters->count() ? round($submission->data['total'] * $submission->characters->count()) : $submission->data['total']) / ($submission->collaborators->count() ? $submission->collaborators->count() : '1')) : 0, ['class' => 'form-control']) !!}
+                                                {!! Form::label($collaborator->user->name . ' (' . $collaborator->data . ')') !!}:
+                                                {!! Form::number(
+                                                    'value[collaborator][' . $collaborator->user->id . ']',
+                                                    isset($submission->data['total'])
+                                                        ? round(($submission->characters->count() ? round($submission->data['total'] * $submission->characters->count()) : $submission->data['total']) / ($submission->collaborators->count() ? $submission->collaborators->count() : '1'))
+                                                        : 0,
+                                                    ['class' => 'form-control'],
+                                                ) !!}
                                             </div>
                                         @endforeach
                                     @endif
-                                    @if($submission->participants->count())
-                                        @foreach($submission->participants as $key=>$participant)
+                                    @if ($submission->participants->count())
+                                        @foreach ($submission->participants as $key => $participant)
                                             <div class="form-group">
-                                                {!! Form::label($participant->user->name.' ('.$participant->displayType.')') !!}:
-                                                {!! Form::number('value[participant]['.$participant->user->id.']', isset($submission->data['total']) ? ($participant->type == 'Comm' ? round(($submission->characters->count() ? round($submission->data['total'] * $submission->characters->count()) : $submission->data['total']) / ($submission->collaborators->count() ? $submission->collaborators->count() : '1')/2) : 0) : 0, ['class' => 'form-control']) !!}
+                                                {!! Form::label($participant->user->name . ' (' . $participant->displayType . ')') !!}:
+                                                {!! Form::number(
+                                                    'value[participant][' . $participant->user->id . ']',
+                                                    isset($submission->data['total'])
+                                                        ? ($participant->type == 'Comm'
+                                                            ? round(($submission->characters->count() ? round($submission->data['total'] * $submission->characters->count()) : $submission->data['total']) / ($submission->collaborators->count() ? $submission->collaborators->count() : '1') / 2)
+                                                            : 0)
+                                                        : 0,
+                                                    ['class' => 'form-control'],
+                                                ) !!}
                                             </div>
                                         @endforeach
                                     @endif
@@ -53,147 +78,141 @@
                                     <div class="text-right">
                                         {!! Form::submit('Submit', ['class' => 'btn btn-primary']) !!}
                                     </div>
-                                {!! Form::close() !!}
+                                    {!! Form::close() !!}
+                                @else
+                                    <p>This submission hasn't been evaluated yet. You'll receive a notification once it has!</p>
+                                @endif
                             @else
-                                <p>This submission hasn't been evaluated yet. You'll receive a notification once it has!</p>
+                                @if (isset($submission->data['staff']))
+                                    <p><strong>Processed By:</strong> {!! App\Models\User\User::find($submission->data['staff'])->displayName !!}</p>
+                                @endif
+                                @if (isset($submission->data['ineligible']) && $submission->data['ineligible'] == 1)
+                                    <p>This submission has been evaluated as ineligible for {{ $currency->name }} rewards.</p>
+                                @else
+                                    <p>{{ $currency->name }} has been awarded for this submission.</p>
+                                    <div class="row">
+                                        @if (isset($submission->data['value']['submitted']))
+                                            <div class="col-md-4">
+                                                {!! $submission->user->displayName !!}: {!! $currency->display($submission->data['value']['submitted'][$submission->user->id]) !!}
+                                            </div>
+                                        @endif
+                                        @if ($submission->collaborators->count())
+                                            <div class="col-md-4">
+                                                @foreach ($submission->collaborators as $collaborator)
+                                                    {!! $collaborator->user->displayName !!} ({{ $collaborator->data }}): {!! $currency->display($submission->data['value']['collaborator'][$collaborator->user->id]) !!}
+                                                    <br />
+                                                @endforeach
+                                            </div>
+                                        @endif
+                                        @if ($submission->participants->count())
+                                            <div class="col-md-4">
+                                                @foreach ($submission->participants as $participant)
+                                                    {!! $participant->user->displayName !!} ({{ $participant->displayType }}): {!! $currency->display($submission->data['value']['participant'][$participant->user->id]) !!}
+                                                    <br />
+                                                @endforeach
+                                            </div>
+                                        @endif
+                                    </div>
+                                @endif
                             @endif
                         @else
-                            @if(isset($submission->data['staff']))<p><strong>Processed By:</strong> {!! App\Models\User\User::find($submission->data['staff'])->displayName !!}</p>@endif
-                            @if(isset($submission->data['ineligible']) && $submission->data['ineligible'] == 1)
-                                <p>This submission has been evaluated as ineligible for {{ $currency->name }} rewards.</p>
-                            @else
-                                <p>{{ $currency->name }} has been awarded for this submission.</p>
-                                <div class="row">
-                                    @if(isset($submission->data['value']['submitted']))
-                                        <div class="col-md-4">
-                                        {!! $submission->user->displayName !!}: {!! $currency->display($submission->data['value']['submitted'][$submission->user->id]) !!}
-                                        </div>
-                                    @endif
-                                    @if($submission->collaborators->count())
-                                        <div class="col-md-4">
-                                        @foreach($submission->collaborators as $collaborator)
-                                            {!! $collaborator->user->displayName !!} ({{ $collaborator->data }}): {!! $currency->display($submission->data['value']['collaborator'][$collaborator->user->id]) !!}
-                                        <br/>
-                                        @endforeach
-                                        </div>
-                                    @endif
-                                    @if($submission->participants->count())
-                                        <div class="col-md-4">
-                                        @foreach($submission->participants as $participant)
-                                            {!! $participant->user->displayName !!} ({{ $participant->displayType }}): {!! $currency->display($submission->data['value']['participant'][$participant->user->id]) !!}
-                                        <br/>
-                                        @endforeach
-                                        </div>
-                                    @endif
-                                </div>
-                            @endif
+                            <p>This submission is not eligible for currency awards{{ $submission->status == 'Pending' ? ' yet-- it must be accepted first' : '' }}.</p>
                         @endif
-                    @else
-                        <p>This submission is not eligible for currency awards{{ $submission->status == 'Pending' ? ' yet-- it must be accepted first' : '' }}.</p>
-                    @endif
-                    <hr/>
-                    @if(isset($submission->data['total']))
-                        <h6>Form Responses:</h6>
-                        <div class="row mb-2">
-                            @foreach($submission->data['currencyData'] as $key=>$data)
-                                <div class="col-md-3 text-center">
-                                    @if(isset($data))
-                                        <strong>{{ Config::get('lorekeeper.group_currency_form')[$key]['name'] }}:</strong><br/>
-                                        @if(Config::get('lorekeeper.group_currency_form')[$key]['type'] == 'choice')
-                                            @if(isset(Config::get('lorekeeper.group_currency_form')[$key]['multiple']) && Config::get('lorekeeper.group_currency_form')[$key]['multiple'] == 'true')
-                                                @foreach($data as $answer)
-                                                    {{ Config::get('lorekeeper.group_currency_form')[$key]['choices'][$answer] }}<br/>
-                                                @endforeach
+                        <hr />
+                        @if (isset($submission->data['total']))
+                            <h6>Form Responses:</h6>
+                            <div class="row mb-2">
+                                @foreach ($submission->data['currencyData'] as $key => $data)
+                                    <div class="col-md-3 text-center">
+                                        @if (isset($data))
+                                            <strong>{{ config('lorekeeper.group_currency_form')[$key]['name'] }}:</strong><br />
+                                            @if (config('lorekeeper.group_currency_form')[$key]['type'] == 'choice')
+                                                @if (isset(config('lorekeeper.group_currency_form')[$key]['multiple']) && config('lorekeeper.group_currency_form')[$key]['multiple'] == 'true')
+                                                    @foreach ($data as $answer)
+                                                        {{ config('lorekeeper.group_currency_form')[$key]['choices'][$answer] }}<br />
+                                                    @endforeach
+                                                @else
+                                                    {{ config('lorekeeper.group_currency_form')[$key]['choices'][$data] }}
+                                                @endif
                                             @else
-                                                {{ Config::get('lorekeeper.group_currency_form')[$key]['choices'][$data] }}
+                                                {{ config('lorekeeper.group_currency_form')[$key]['type'] == 'checkbox' ? (config('lorekeeper.group_currency_form')[$key]['value'] == $data ? 'True' : 'False') : $data }}
                                             @endif
-                                        @else
-                                            {{ Config::get('lorekeeper.group_currency_form')[$key]['type'] == 'checkbox' ? (Config::get('lorekeeper.group_currency_form')[$key]['value'] == $data ? 'True' : 'False') : $data }}
                                         @endif
+                                    </div>
+                                @endforeach
+                            </div>
+                            @if (Auth::user()->hasPower('manage_submissions') && isset($submission->data['total']))
+                                <h6>[Admin]</h6>
+                                <p class="text-center">
+                                    <strong>Calculated Total:</strong> {{ $submission->data['total'] }}
+                                    @if ($submission->characters->count())
+                                        ・ <strong> Times {{ $submission->characters->count() }} Characters:</strong> {{ round($submission->data['total'] * $submission->characters->count()) }}
                                     @endif
-                                </div>
-                            @endforeach
-                        </div>
-                        @if(Auth::user()->hasPower('manage_submissions') && isset($submission->data['total']))
-                        <h6>[Admin]</h6>
-                            <p class="text-center">
-                                <strong>Calculated Total:</strong> {{ $submission->data['total'] }}
-                                @if($submission->characters->count())
-                                    ・ <strong> Times {{ $submission->characters->count() }} Characters:</strong> {{ round($submission->data['total'] * $submission->characters->count()) }}
-                                @endif
-                                @if($submission->collaborators->count())
-                                    <br/><strong>Divided by {{ $submission->collaborators->count() }} Collaborators:</strong> {{ round($submission->data['total'] / $submission->collaborators->count()) }}
-                                    @if($submission->characters->count())
-                                        ・ <strong> Times {{ $submission->characters->count() }} Characters:</strong> {{ round(round($submission->data['total'] * $submission->characters->count()) / $submission->collaborators->count()) }}
+                                    @if ($submission->collaborators->count())
+                                        <br /><strong>Divided by {{ $submission->collaborators->count() }} Collaborators:</strong> {{ round($submission->data['total'] / $submission->collaborators->count()) }}
+                                        @if ($submission->characters->count())
+                                            ・ <strong> Times {{ $submission->characters->count() }} Characters:</strong> {{ round(round($submission->data['total'] * $submission->characters->count()) / $submission->collaborators->count()) }}
+                                        @endif
                                     @endif
-                                @endif
-                                <br/>For a suggested {!! $currency->display(
-                                    round(
-                                        ($submission->characters->count() ? round($submission->data['total'] * $submission->characters->count()) : $submission->data['total']) / ($submission->collaborators->count() ? $submission->collaborators->count() : '1')
-                                    )
-                                ) !!}{{ $submission->collaborators->count() ? ' per collaborator' : ''}}
-                            </p>
+                                    <br />For a suggested {!! $currency->display(
+                                        round(($submission->characters->count() ? round($submission->data['total'] * $submission->characters->count()) : $submission->data['total']) / ($submission->collaborators->count() ? $submission->collaborators->count() : '1')),
+                                    ) !!}{{ $submission->collaborators->count() ? ' per collaborator' : '' }}
+                                </p>
+                            @endif
+                        @else
+                            <p>This submission does not have form data associated with it.</p>
                         @endif
-                    @else
-                        <p>This submission does not have form data associated with it.</p>
-                    @endif
-                </div>
-            </div>
-        @endif
-        <div class="card mb-4">
-            <div class="card-header">
-                <h4>Staff Comments</h4> {!! Auth::user()->hasPower('staff_comments') ? '(Visible to '.$submission->credits.')' : '' !!}
-            </div>
-            <div class="card-body">
-                @if(isset($submission->parsed_staff_comments))
-                    <h5>Staff Comments (Old):</h5>
-                    {!! $submission->parsed_staff_comments !!}
-                    <hr/>
-                @endif
-                <!-- Staff-User Comments -->
-                <div class="container">
-                    @comments(['model' => $submission,
-                            'type' => 'Staff-User',
-                            'perPage' => 5
-                        ])
+                    </div>
                 </div>
-            </div>
-        </div>
-    </div>
-    @if(Auth::user()->hasPower('manage_submissions') && $submission->collaboratorApproved)
-        <div class="col-md-5">
+            @endif
             <div class="card mb-4">
                 <div class="card-header">
-                    <h5>[Admin] Vote Info</h5>
+                    <h4>Staff Comments</h4> {!! Auth::user()->hasPower('staff_comments') ? '(Visible to ' . $submission->credits . ')' : '' !!}
                 </div>
                 <div class="card-body">
-                    @if(isset($submission->vote_data) && $submission->voteData->count())
-                        @foreach($submission->voteData as $voter=>$vote)
-                            <li>
-                                {!! App\Models\User\User::find($voter)->displayName !!} {{ $voter == Auth::user()->id ? '(you)' : '' }}: <span {!! $vote == 2 ? 'class="text-success">Accept' : 'class="text-danger">Reject' !!}</span>
-                            </li>
-                        @endforeach
-                    @else
-                        <p>No votes have been cast yet!</p>
+                    @if (isset($submission->parsed_staff_comments))
+                        <h5>Staff Comments (Old):</h5>
+                        {!! $submission->parsed_staff_comments !!}
+                        <hr />
                     @endif
-                </div>
-            </div>
-            <div class="card mb-4">
-                <div class="card-header">
-                    <h5>[Admin] Staff Comments</h5> (Only visible to staff)
-                </div>
-                <div class="card-body">
                     <!-- Staff-User Comments -->
                     <div class="container">
-                        @comments(['model' => $submission,
-                                'type' => 'Staff-Staff',
-                                'perPage' => 5
-                            ])
+                        @comments(['model' => $submission, 'type' => 'Staff-User', 'perPage' => 5])
                     </div>
                 </div>
             </div>
         </div>
-    @endif
-</div>
+        @if (Auth::user()->hasPower('manage_submissions') && $submission->collaboratorApproved)
+            <div class="col-md-5">
+                <div class="card mb-4">
+                    <div class="card-header">
+                        <h5>[Admin] Vote Info</h5>
+                    </div>
+                    <div class="card-body">
+                        @if (isset($submission->vote_data) && $submission->voteData->count())
+                            @foreach ($submission->voteData as $voter => $vote)
+                                <li>
+                                    {!! App\Models\User\User::find($voter)->displayName !!} {{ $voter == Auth::user()->id ? '(you)' : '' }}: <span {!! $vote == 2 ? 'class="text-success">Accept' : 'class="text-danger">Reject' !!}</span>
+                                </li>
+                            @endforeach
+                        @else
+                            <p>No votes have been cast yet!</p>
+                        @endif
+                    </div>
+                </div>
+                <div class="card mb-4">
+                    <div class="card-header">
+                        <h5>[Admin] Staff Comments</h5> (Only visible to staff)
+                    </div>
+                    <div class="card-body">
+                        <!-- Staff-User Comments -->
+                        <div class="container">
+                            @comments(['model' => $submission, 'type' => 'Staff-Staff', 'perPage' => 5])
+                        </div>
+                    </div>
+                </div>
+            </div>
+        @endif
+    </div>
 
 @endsection
diff --git a/resources/views/galleries/submissions.blade.php b/resources/views/galleries/submissions.blade.php
index 08fb0d24b2..66af758910 100644
--- a/resources/views/galleries/submissions.blade.php
+++ b/resources/views/galleries/submissions.blade.php
@@ -1,40 +1,42 @@
 @extends('galleries.layout')
 
-@section('gallery-title') Gallery Submissions @endsection
+@section('gallery-title')
+    Gallery Submissions
+@endsection
 
 @section('gallery-content')
-{!! breadcrumbs(['gallery' => 'gallery', 'Gallery Submissions' => 'Gallery/Submissions']) !!}
-
-<h1>
-    Gallery Submissions
-</h1>
-
-<p>This is the log of your gallery submissions. You can submit a piece to a particular gallery by navigating to it and clicking the "submit" button.</p>
-<p>Pending submissions require approval from any collaborators{{ Settings::get('gallery_submissions_require_approval') ? ', as well as staff,' : '' }} before appearing in the gallery.</p>
-
-<ul class="nav nav-tabs mb-3">
-    <li class="nav-item">
-        <a class="nav-link {{ set_active('gallery/submissions/pending') }}" href="{{ url('gallery/submissions/pending') }}">Pending</a>
-    </li>
-    <li class="nav-item">
-        <a class="nav-link {{ set_active('gallery/submissions/accepted') }}" href="{{ url('gallery/submissions/accepted') }}">Accepted</a>
-    </li>
-    <li class="nav-item">
-        <a class="nav-link {{ set_active('gallery/submissions/rejected') }}" href="{{ url('gallery/submissions/rejected') }}">Rejected</a>
-    </li>
-</ul>
-
-@if(count($submissions))
-    {!! $submissions->render() !!}
-
-    @foreach($submissions as $key=>$submission)
-        @include('galleries._queue_submission', ['queue' => true])
-    @endforeach
-
-    {!! $submissions->render() !!}
-    <div class="text-center mt-4 small text-muted">{{ $submissions->total() }} result{{ $submissions->total() == 1 ? '' : 's' }} found.</div>
-@else
-    <p>No gallery submissions found.</p>
-@endif
+    {!! breadcrumbs(['gallery' => 'gallery', 'Gallery Submissions' => 'Gallery/Submissions']) !!}
+
+    <h1>
+        Gallery Submissions
+    </h1>
+
+    <p>This is the log of your gallery submissions. You can submit a piece to a particular gallery by navigating to it and clicking the "submit" button.</p>
+    <p>Pending submissions require approval from any collaborators{{ Settings::get('gallery_submissions_require_approval') ? ', as well as staff,' : '' }} before appearing in the gallery.</p>
+
+    <ul class="nav nav-tabs mb-3">
+        <li class="nav-item">
+            <a class="nav-link {{ set_active('gallery/submissions/pending') }}" href="{{ url('gallery/submissions/pending') }}">Pending</a>
+        </li>
+        <li class="nav-item">
+            <a class="nav-link {{ set_active('gallery/submissions/accepted') }}" href="{{ url('gallery/submissions/accepted') }}">Accepted</a>
+        </li>
+        <li class="nav-item">
+            <a class="nav-link {{ set_active('gallery/submissions/rejected') }}" href="{{ url('gallery/submissions/rejected') }}">Rejected</a>
+        </li>
+    </ul>
+
+    @if (count($submissions))
+        {!! $submissions->render() !!}
+
+        @foreach ($submissions as $key => $submission)
+            @include('galleries._queue_submission', ['queue' => true])
+        @endforeach
+
+        {!! $submissions->render() !!}
+        <div class="text-center mt-4 small text-muted">{{ $submissions->total() }} result{{ $submissions->total() == 1 ? '' : 's' }} found.</div>
+    @else
+        <p>No gallery submissions found.</p>
+    @endif
 
 @endsection
diff --git a/resources/views/home/_character.blade.php b/resources/views/home/_character.blade.php
index 68ec2fece5..e98494c2dc 100644
--- a/resources/views/home/_character.blade.php
+++ b/resources/views/home/_character.blade.php
@@ -1,6 +1,9 @@
-@if($character)
-    <div class="character-info" data-id="{{ $character->id }}"><img src="{{ $character->image->thumbnailUrl }}" class="mw-100" alt="Thumbnail for {{ $character->fullName }}"/></div>
+@if ($character)
+    <div class="character-info" data-id="{{ $character->id }}"><img src="{{ $character->image->thumbnailUrl }}" class="mw-100" alt="Thumbnail for {{ $character->fullName }}" /></div>
     <div class="text-center"><a href="{{ $character->url }}">{{ $character->slug }}</a></div>
+    @if (!$character->is_visible && Auth::check() && Auth::user()->isStaff)
+        <div class="text-danger character-info" data-id="0"><i class="fas fa-eye-slash mr-1"></i> Character hidden from public view.</div>
+    @endif
 @else
     <div class="text-danger character-info" data-id="0">Character not found.</div>
 @endif
diff --git a/resources/views/home/_inventory_consolidate.blade.php b/resources/views/home/_inventory_consolidate.blade.php
new file mode 100644
index 0000000000..8108b07834
--- /dev/null
+++ b/resources/views/home/_inventory_consolidate.blade.php
@@ -0,0 +1,11 @@
+<p>Do you find yourself with too many identical variations of the same item? This tool will consolidate all of the same variant of item into one.</p>
+<p>Please note the following:</p>
+<ul>
+    <li>This tool will go over all item stacks (variations) in your inventory. It does not include character inventories.</li>
+    <li>Variations are considered identical if they have the same source and notes fields. These must be <i>exactly the same</i>.</li>
+    <li>It cannot consolidate stacks that are partially held in trades and submissions.</li>
+    <li>This operation is not reversible. You can, however, run it multiple times if necessary.</li>
+</ul>
+{!! Form::open(['url' => 'inventory/consolidate', 'class' => 'text-right']) !!}
+{!! Form::submit('Consolidate', ['class' => 'btn btn-primary', 'name' => 'action']) !!}
+{!! Form::close() !!}
diff --git a/resources/views/home/_inventory_stack.blade.php b/resources/views/home/_inventory_stack.blade.php
index 48b08ae5b8..51586d1046 100644
--- a/resources/views/home/_inventory_stack.blade.php
+++ b/resources/views/home/_inventory_stack.blade.php
@@ -1,15 +1,16 @@
-@if(!$stack)
-    <div class="text-center">Invalid stack selected.</div>
+@if (!$stack)
+    <div class="text-center">
+        Invalid stack selected.</div>
 @else
     <div class="text-center">
-        @if($item->has_image)
-            <div class="mb-1"><a href="{{ $item->url }}"><img src="{{ $item->imageUrl }}" alt="{{ $item->name }}"/></a></div>
+        @if ($item->has_image)
+            <div class="mb-1"><a href="{{ $item->url }}"><img src="{{ $item->imageUrl }}" alt="{{ $item->name }}" /></a></div>
         @endif
-        <div @if(count($item->tags)) class="mb-1" @endif><a href="{{ $item->idUrl }}">{{ $item->name }}</a></div>
-        @if(count($item->tags))
+        <div @if (count($item->tags)) class="mb-1" @endif><a href="{{ $item->idUrl }}">{{ $item->name }}</a></div>
+        @if (count($item->tags))
             <div>
-                @foreach($item->tags as $tag)
-                    @if($tag->is_active)
+                @foreach ($item->tags as $tag)
+                    @if ($tag->is_active)
                         {!! $tag->displayTag !!}
                     @endif
                 @endforeach
@@ -18,7 +19,7 @@
     </div>
 
     <h5>Item Variations</h5>
-    @if($user && $user->hasPower('edit_inventories'))
+    @if ($user && $user->hasPower('edit_inventories'))
         <p class="alert alert-warning my-2">Note: Your rank allows you to transfer account-bound items to another user.</p>
     @endif
 
@@ -27,7 +28,7 @@
         <table class="table table-sm">
             <thead class="thead">
                 <tr class="d-flex">
-                    @if($user && !$readOnly && ($stack->first()->user_id == $user->id || $user->hasPower('edit_inventories')))
+                    @if ($user && !$readOnly && ($stack->first()->user_id == $user->id || $user->hasPower('edit_inventories')))
                         <th class="col-1"><input id="toggle-checks" type="checkbox" onclick="toggleChecks(this)"></th>
                         <th class="col-4">Source</th>
                     @else
@@ -39,26 +40,32 @@
                 </tr>
             </thead>
             <tbody>
-                @foreach($stack as $itemRow)
-                    <tr id ="itemRow{{ $itemRow->id }}" class="d-flex {{ $itemRow->isTransferrable ? '' : 'accountbound' }}">
-                        @if($user && !$readOnly && ($stack->first()->user_id == $user->id || $user->hasPower('edit_inventories')))
+                @foreach ($stack as $itemRow)
+                    <tr id="itemRow{{ $itemRow->id }}" class="d-flex {{ $itemRow->isTransferrable ? '' : 'accountbound' }}">
+                        @if ($user && !$readOnly && ($stack->first()->user_id == $user->id || $user->hasPower('edit_inventories')))
                             <td class="col-1">{!! Form::checkbox('ids[]', $itemRow->id, false, ['class' => 'item-check', 'onclick' => 'updateQuantities(this)']) !!}</td>
                             <td class="col-4">{!! array_key_exists('data', $itemRow->data) ? ($itemRow->data['data'] ? $itemRow->data['data'] : 'N/A') : 'N/A' !!}</td>
                         @else
                             <td class="col-5">{!! array_key_exists('data', $itemRow->data) ? ($itemRow->data['data'] ? $itemRow->data['data'] : 'N/A') : 'N/A' !!}</td>
                         @endif
                         <td class="col-3">{!! array_key_exists('notes', $itemRow->data) ? ($itemRow->data['notes'] ? $itemRow->data['notes'] : 'N/A') : 'N/A' !!}</td>
-                        @if($user && !$readOnly && ($stack->first()->user_id == $user->id || $user->hasPower('edit_inventories')))
-                            @if($itemRow->availableQuantity)
-                                <td class="col-3">{!! Form::selectRange('', 1, $itemRow->availableQuantity, 1, ['class' => 'quantity-select', 'type' => 'number', 'style' => 'min-width:40px;']) !!} /{{ $itemRow->availableQuantity }} @if($itemRow->getOthers()) {{ $itemRow->getOthers() }} @endif</td>
+                        @if ($user && !$readOnly && ($stack->first()->user_id == $user->id || $user->hasPower('edit_inventories')))
+                            @if ($itemRow->availableQuantity)
+                                <td class="col-3">{!! Form::selectRange('', 1, $itemRow->availableQuantity, 1, ['class' => 'quantity-select', 'type' => 'number', 'style' => 'min-width:40px;']) !!} /{{ $itemRow->availableQuantity }} @if ($itemRow->getOthers())
+                                        {{ $itemRow->getOthers() }}
+                                    @endif
+                                </td>
                             @else
-                                <td class="col-3">{!! Form::selectRange('', 0, 0, 0, ['class' => 'quantity-select', 'type' => 'number', 'style' => 'min-width:40px;', 'disabled']) !!} /{{ $itemRow->availableQuantity }} @if($itemRow->getOthers()) {{ $itemRow->getOthers() }} @endif</td>
+                                <td class="col-3">{!! Form::selectRange('', 0, 0, 0, ['class' => 'quantity-select', 'type' => 'number', 'style' => 'min-width:40px;', 'disabled']) !!} /{{ $itemRow->availableQuantity }} @if ($itemRow->getOthers())
+                                        {{ $itemRow->getOthers() }}
+                                    @endif
+                                </td>
                             @endif
                         @else
                             <td class="col-3">{!! $itemRow->count !!}</td>
                         @endif
                         <td class="col-1">
-                            @if(!$itemRow->isTransferrable)
+                            @if (!$itemRow->isTransferrable)
                                 <i class="fas fa-lock" data-toggle="tooltip" title="Account-bound items cannot be transferred but can be deleted."></i>
                             @endif
                         </td>
@@ -68,20 +75,24 @@
         </table>
     </div>
 
-    @if($user && !$readOnly && ($stack->first()->user_id == $user->id || $user->hasPower('edit_inventories')))
+    @if ($user && !$readOnly && ($stack->first()->user_id == $user->id || $user->hasPower('edit_inventories')))
         <div class="card mt-3">
             <ul class="list-group list-group-flush">
-                @if(count($item->tags))
-                    @foreach($item->tags as $tag)
-                        @if(View::exists('inventory._'.$tag->tag))
-                            @include('inventory._'.$tag->tag, ['stack' => $stack, 'tag' => $tag])
+                @if (count($item->tags))
+                    @foreach ($item->tags as $tag)
+                        @if ($tag->is_active && View::exists('inventory._' . $tag->tag))
+                            @include('inventory._' . $tag->tag, ['stack' => $stack, 'tag' => $tag])
                         @endif
                     @endforeach
                 @endif
 
-                @if(isset($item->category) && $item->category->is_character_owned)
+                @if (isset($item->category) && $item->category->is_character_owned)
                     <li class="list-group-item">
-                        <a class="card-title h5 collapse-title" data-toggle="collapse" href="#characterTransferForm">@if($stack->first()->user_id != $user->id) [ADMIN] @endif Transfer Item to Character</a>
+                        <a class="card-title h5 collapse-title" data-toggle="collapse" href="#characterTransferForm">
+                            @if ($stack->first()->user_id != $user->id)
+                                [ADMIN]
+                            @endif Transfer Item to Character
+                        </a>
                         <div id="characterTransferForm" class="collapse">
                             <p>This will transfer this stack or stacks to this character's inventory.</p>
                             <div class="form-group">
@@ -93,9 +104,13 @@
                         </div>
                     </li>
                 @endif
-                @if(isset($item->data['resell']) && App\Models\Currency\Currency::where('id', $item->resell->flip()->pop())->first() && Config::get('lorekeeper.extensions.item_entry_expansion.resale_function'))
+                @if (isset($item->data['resell']) && App\Models\Currency\Currency::where('id', $item->resell->flip()->pop())->first() && config('lorekeeper.extensions.item_entry_expansion.resale_function'))
                     <li class="list-group-item">
-                        <a class="card-title h5 collapse-title" data-toggle="collapse" href="#resellForm">@if($stack->first()->user_id != $user->id) [ADMIN] @endif Sell Item</a>
+                        <a class="card-title h5 collapse-title" data-toggle="collapse" href="#resellForm">
+                            @if ($stack->first()->user_id != $user->id)
+                                [ADMIN]
+                            @endif Sell Item
+                        </a>
                         <div id="resellForm" class="collapse">
                             <p>This item can be sold for <strong>{!! App\Models\Currency\Currency::find($item->resell->flip()->pop())->display($item->resell->pop()) !!}</strong>. This action is not reversible. Are you sure you want to sell this item?</p>
                             <div class="text-right">
@@ -105,11 +120,15 @@
                     </li>
                 @endif
                 <li class="list-group-item">
-                    <a class="card-title h5 collapse-title" data-toggle="collapse" href="#transferForm">@if($stack->first()->user_id != $user->id) [ADMIN] @endif Transfer Item</a>
+                    <a class="card-title h5 collapse-title" data-toggle="collapse" href="#transferForm">
+                        @if ($stack->first()->user_id != $user->id)
+                            [ADMIN]
+                        @endif Transfer Item
+                    </a>
                     <div id="transferForm" class="collapse">
                         <div class="form-group">
                             {!! Form::label('user_id', 'Recipient') !!} {!! add_help('You can only transfer items to verified users.') !!}
-                            {!! Form::select('user_id', $userOptions, null, ['class'=>'form-control']) !!}
+                            {!! Form::select('user_id', $userOptions, null, ['class' => 'form-control']) !!}
                         </div>
                         <div class="text-right">
                             {!! Form::button('Transfer', ['class' => 'btn btn-primary', 'name' => 'action', 'value' => 'transfer', 'type' => 'submit']) !!}
@@ -117,7 +136,11 @@
                     </div>
                 </li>
                 <li class="list-group-item">
-                    <a class="card-title h5 collapse-title" data-toggle="collapse" href="#deleteForm">@if($stack->first()->user_id != $user->id) [ADMIN] @endif Delete Item</a>
+                    <a class="card-title h5 collapse-title" data-toggle="collapse" href="#deleteForm">
+                        @if ($stack->first()->user_id != $user->id)
+                            [ADMIN]
+                        @endif Delete Item
+                    </a>
                     <div id="deleteForm" class="collapse">
                         <p>This action is not reversible. Are you sure you want to delete this item?</p>
                         <div class="text-right">
@@ -133,20 +156,21 @@
 
 <script>
     $(document).keydown(function(e) {
-    var code = e.keyCode || e.which;
-    if(code == 13)
-        return false;
+        var code = e.keyCode || e.which;
+        if (code == 13)
+            return false;
     });
     $('.default.character-select').selectize();
+
     function toggleChecks($toggle) {
         $.each($('.item-check'), function(index, checkbox) {
             $toggle.checked ? checkbox.setAttribute('checked', 'checked') : checkbox.removeAttribute('checked');
             updateQuantities(checkbox);
         });
     }
+
     function updateQuantities($checkbox) {
         var $rowId = "#itemRow" + $checkbox.value
         $($rowId).find('.quantity-select').prop('name', $checkbox.checked ? 'quantities[]' : '')
     }
 </script>
-
diff --git a/resources/views/home/_prompt.blade.php b/resources/views/home/_prompt.blade.php
index 448273b768..3118314cd8 100644
--- a/resources/views/home/_prompt.blade.php
+++ b/resources/views/home/_prompt.blade.php
@@ -1,14 +1,14 @@
 <div class="card">
     <div class="card-body">
         <h4>Default Prompt Rewards</h4>
-        @if(isset($staffView) && $staffView)
+        @if (isset($staffView) && $staffView)
             <p>For reference, these are the default rewards for this prompt. The editable section above is <u>inclusive</u> of these rewards.</p>
-            @if($count)
+            @if ($count)
                 <p>This user has completed this prompt <strong>{{ $count }}</strong> time{{ $count == 1 ? '' : 's' }}.</p>
             @endif
         @else
             <p>These are the default rewards for this prompt. The actual rewards you receive may be edited by a staff member during the approval process.</p>
-            @if($count)
+            @if ($count)
                 <p>You have completed this prompt <strong>{{ $count }}</strong> time{{ $count == 1 ? '' : 's' }}.</p>
             @endif
         @endif
@@ -20,7 +20,7 @@
                 </tr>
             </thead>
             <tbody>
-                @foreach($prompt->rewards as $reward)
+                @foreach ($prompt->rewards as $reward)
                     <tr>
                         <td>{!! $reward->reward->displayName !!}</td>
                         <td>{{ $reward->quantity }}</td>
@@ -29,4 +29,4 @@
             </tbody>
         </table>
     </div>
-</div>
\ No newline at end of file
+</div>
diff --git a/resources/views/home/_report.blade.php b/resources/views/home/_report.blade.php
index 2b618d8338..64041fe99b 100644
--- a/resources/views/home/_report.blade.php
+++ b/resources/views/home/_report.blade.php
@@ -1,16 +1,30 @@
-<div class="d-flex row flex-wrap col-12 mt-1 pt-1 px-0 ubt-top">
+<div class="row flex-wrap">
     <div class="col-6 col-md-4">
-    <span class="ubt-texthide">@if(!$report->is_br)<a href="{{ $report->url }}">@endif {{ $report->url }} @if(!$report->is_br)</a>@endif</span>
+        <div class="logs-table-cell">
+            <span class="ubt-texthide">
+                @if (!$report->is_br)
+                    <a href="{{ $report->url }}">
+                        @endif {{ $report->url }} @if (!$report->is_br)
+                    </a>
+                @endif
+            </span>
+        </div>
+    </div>
+    <div class="col-6 col-md-5">
+        <div class="logs-table-cell">{!! pretty_date($report->created_at) !!}</div>
     </div>
-    <div class="col-6 col-md-5">{!! pretty_date($report->created_at) !!}</div>
     <div class="col-6 col-md-1">
-        <span class="badge badge-{{ $report->status == 'Pending' ? 'secondary' : ($report->status == 'Closed' ? 'success' : 'danger') }}">{{ $report->status }}</span>
+        <div class="logs-table-cell">
+            <span class="badge badge-{{ $report->status == 'Pending' ? 'secondary' : ($report->status == 'Closed' ? 'success' : 'danger') }}">{{ $report->status }}</span>
+        </div>
     </div>
     <div class="col-6 col-md-2 text-right">
-        @if($report->status == 'Closed' || ($report->status == 'Assigned' && $report->is_br && $report->error_type != 'exploit') || (Auth::check() && Auth::user()->id == $report->user_id)) 
-            <a href="{{ $report->viewUrl }}" class="btn btn-primary btn-sm">Details</a>
-        @else 
-            <a class="btn btn-dark btn-sm text-light">Report not closed</a>
-        @endif
+        <div class="logs-table-cell">
+            @if ($report->status == 'Closed' || ($report->status == 'Assigned' && $report->is_br && $report->error_type != 'exploit') || (Auth::check() && Auth::user()->id == $report->user_id))
+                <a href="{{ $report->viewUrl }}" class="btn btn-primary btn-sm">Details</a>
+            @else
+                <a class="btn btn-dark btn-sm text-light">Report not closed</a>
+            @endif
+        </div>
     </div>
-</div>
\ No newline at end of file
+</div>
diff --git a/resources/views/home/_report_content.blade.php b/resources/views/home/_report_content.blade.php
index e82cffd005..7a30d59c14 100644
--- a/resources/views/home/_report_content.blade.php
+++ b/resources/views/home/_report_content.blade.php
@@ -1,51 +1,65 @@
 <h1>
-   Report (#{{ $report->id }})
+    Report (#{{ $report->id }})
     <span class="float-right badge badge-{{ $report->status == 'Pending' ? 'secondary' : ($report->status == 'Closed' ? 'success' : 'danger') }}">{{ $report->status }}</span>
 </h1>
 <div class="mb-1">
     <div class="row">
-        <div class="col-md-2 col-4"><h5>User</h5></div>
+        <div class="col-md-2 col-4">
+            <h5>User</h5>
+        </div>
         <div class="col-md-10 col-8">{!! $report->user->displayName !!}</div>
     </div>
     <div class="row">
-        <div class="col-md-2 col-4"><h5>URL / Title</h5></div>
+        <div class="col-md-2 col-4">
+            <h5>URL / Title</h5>
+        </div>
         <div class="col-md-10 col-8"><a href="{{ $report->url }}">{{ $report->url }}</a></div>
     </div>
-    @if($report->is_br == 1)
+    @if ($report->is_br == 1)
         <div class="row">
-            <div class="col-md-2 col-4"><h5>Bug Type</h5></div>
-            <div class="col-md-10 col-8">{{ ucfirst($report->error_type).($report->error_type != 'exploit' ? ' Error' : '') }}</div>
+            <div class="col-md-2 col-4">
+                <h5>Bug Type</h5>
+            </div>
+            <div class="col-md-10 col-8">{{ ucfirst($report->error_type) . ($report->error_type != 'exploit' ? ' Error' : '') }}</div>
         </div>
     @endif
     <div class="row">
-        <div class="col-md-2 col-4"><h5>Submitted</h5></div>
+        <div class="col-md-2 col-4">
+            <h5>Submitted</h5>
+        </div>
         <div class="col-md-10 col-8">{!! format_date($report->created_at) !!} ({{ $report->created_at->diffForHumans() }})</div>
     </div>
-    @if($report->status != 'Pending')
+    @if ($report->status != 'Pending')
         <div class="row">
-            <div class="col-md-2 col-4"><h5>Assigned to</h5></div>
+            <div class="col-md-2 col-4">
+                <h5>Assigned to</h5>
+            </div>
             <div class="col-md-10 col-8">{!! $report->staff->displayName !!} at {!! format_date($report->updated_at) !!} ({{ $report->updated_at->diffForHumans() }})</div>
         </div>
     @endif
 </div>
-<h2>Report Details</h2>
-<div class="card mb-3"><div class="card-body">{!! nl2br(htmlentities($report->comments)) !!}</div></div>
 
-@if(Auth::check() && $report->status == 'Assigned' && $report->user == Auth::user() || Auth::user()->hasPower('manage_reports'))
-<div class="alert alert-danger">Admins will be alerted by new comments, however to keep the conversation organised we ask that you please reply to the admin comment.</div>
-    @comments([ 'type' => 'Staff-User', 'model' => $report, 'perPage' => 5 ])
+<h2>Report Details</h2>
+<div class="card mb-3">
+    <div class="card-body">{!! nl2br(htmlentities($report->comments)) !!}</div>
+</div>
+@if ((Auth::check() && $report->status == 'Assigned' && $report->user_id == Auth::user()->id) || Auth::user()->hasPower('manage_reports'))
+    <div class="alert alert-danger">Admins will be alerted by new comments, however to keep the conversation organised we ask that you please reply to the admin comment.</div>
+    @comments(['type' => 'Staff-User', 'model' => $report, 'perPage' => 5])
 @elseif($report->status == 'Closed')
-<div class="alert alert-danger"> You cannot comment on a closed ticket. </div>
+    <div class="alert alert-danger"> You cannot comment on a closed ticket. </div>
 @else
-<div class="alert alert-danger"> Please await admin assignment. </div>
+    <div class="alert alert-danger"> Please await admin assignment. </div>
 @endif
-@if(Auth::check() && $report->staff_comments && ($report->user_id == Auth::user()->id || Auth::user()->hasPower('manage_reports')))
+@if (Auth::check() && $report->staff_comments && ($report->user_id == Auth::user()->id || Auth::user()->hasPower('manage_reports')))
     <h2>Staff Comments</h2>
-    <div class="card mb-3"><div class="card-body">
-	    @if(isset($report->parsed_staff_comments))
-            {!! $report->parsed_staff_comments !!}
-        @else
-            {!! $report->staff_comments !!}
-        @endif
-		</div></div>
+    <div class="card mb-3">
+        <div class="card-body">
+            @if (isset($report->parsed_staff_comments))
+                {!! $report->parsed_staff_comments !!}
+            @else
+                {!! $report->staff_comments !!}
+            @endif
+        </div>
+    </div>
 @endif
diff --git a/resources/views/home/_sidebar.blade.php b/resources/views/home/_sidebar.blade.php
index 1d3c252b2c..a3400a3d2f 100644
--- a/resources/views/home/_sidebar.blade.php
+++ b/resources/views/home/_sidebar.blade.php
@@ -13,9 +13,10 @@
         <div class="sidebar-item"><a href="{{ url('claims') }}" class="{{ set_active('claims*') }}">Claims</a></div>
         <div class="sidebar-item"><a href="{{ url('characters/transfers/incoming') }}" class="{{ set_active('characters/transfers*') }}">Character Transfers</a></div>
         <div class="sidebar-item"><a href="{{ url('trades/open') }}" class="{{ set_active('trades/open*') }}">Trades</a></div>
+        <div class="sidebar-item"><a href="{{ url('comments/liked') }}" class="{{ set_active('comments/liked*') }}">Liked Comments</a></div>
     </li>
     <li class="sidebar-section">
         <div class="sidebar-section-header">Reports</div>
         <div class="sidebar-item"><a href="{{ url('reports') }}" class="{{ set_active('reports*') }}">Reports</a></div>
     </li>
-</ul>
\ No newline at end of file
+</ul>
diff --git a/resources/views/home/_submission.blade.php b/resources/views/home/_submission.blade.php
index 9e38958b26..88ae5c0ed2 100644
--- a/resources/views/home/_submission.blade.php
+++ b/resources/views/home/_submission.blade.php
@@ -1,5 +1,5 @@
 <tr>
-    @if($submission->prompt_id)
+    @if ($submission->prompt_id)
         <td>{!! $submission->prompt->displayName !!}</td>
     @endif
     <td class="text-break"><a href="{{ $submission->url }}">{{ $submission->url }}</a></td>
@@ -8,4 +8,4 @@
         <span class="badge badge-{{ $submission->status == 'Pending' ? 'secondary' : ($submission->status == 'Approved' ? 'success' : 'danger') }}">{{ $submission->status }}</span>
     </td>
     <td class="text-right"><a href="{{ $submission->viewUrl }}" class="btn btn-primary btn-sm">Details</a></td>
-</tr>
\ No newline at end of file
+</tr>
diff --git a/resources/views/home/_submission_content.blade.php b/resources/views/home/_submission_content.blade.php
index e4a3c78650..d883f78cc8 100644
--- a/resources/views/home/_submission_content.blade.php
+++ b/resources/views/home/_submission_content.blade.php
@@ -1,136 +1,191 @@
 <h1>
     {{ $submission->prompt_id ? 'Submission' : 'Claim' }} (#{{ $submission->id }})
-    <span class="float-right badge badge-{{ $submission->status == 'Pending' ? 'secondary' : ($submission->status == 'Approved' ? 'success' : 'danger') }}">{{ $submission->status }}</span>
+    @if (Auth::check() && $submission->user_id == Auth::user()->id && $submission->status == 'Draft')
+        <a href="{{ url(($isClaim ? 'claims' : 'submissions') . '/draft/' . $submission->id) }}" class="btn btn-sm btn-outline-secondary ml-3">Edit Draft <i class="fas fa-pen ml-2"></i></a>
+    @endif
+    <span class="float-right badge badge-{{ $submission->status == 'Pending' || $submission->status == 'Draft' ? 'secondary' : ($submission->status == 'Approved' ? 'success' : 'danger') }}">{{ $submission->status }}</span>
+
 </h1>
 
-<div class="mb-1">
-    <div class="row">
-        <div class="col-md-2 col-4"><h5>User</h5></div>
-        <div class="col-md-10 col-8">{!! $submission->user->displayName !!}</div>
-    </div>
-    @if($submission->prompt_id)
-        <div class="row">
-            <div class="col-md-2 col-4"><h5>Prompt</h5></div>
-            <div class="col-md-10 col-8">{!! $submission->prompt->displayName !!}</div>
+
+<div class="card mb-3" style="clear:both;">
+    <div class="card-body">
+        <div class="row mb-2 no-gutters">
+            <div class="col-md-2">
+                <h5 class="mb-0">User</h5>
+            </div>
+            <div class="col-md-10">{!! $submission->user->displayName !!}</div>
         </div>
-    @endif
-    <div class="row">
-        <div class="col-md-2 col-4"><h5>URL</h5></div>
-        <div class="col-md-10 col-8"><a href="{{ $submission->url }}">{{ $submission->url }}</a></div>
+        @if ($submission->prompt_id)
+            <div class="row mb-2 no-gutters">
+                <div class="col-md-2">
+                    <h5 class="mb-0">Prompt</h5>
+                </div>
+                <div class="col-md-10">{!! $submission->prompt->displayName !!}</div>
+            </div>
+        @endif
+        <div class="row mb-2 no-gutters">
+            <div class="col-md-2">
+                <h5 class="mb-0">URL</h5>
+            </div>
+            <div class="col-md-10"><a href="{{ $submission->url }}">{{ $submission->url }}</a></div>
+        </div>
+        <div class="row mb-2 no-gutters">
+            <div class="col-md-2">
+                <h5 class="mb-0">Submitted</h5>
+            </div>
+            <div class="col-md-10">
+                {!! format_date($submission->created_at) !!} ({{ $submission->created_at->diffForHumans() }})
+            </div>
+        </div>
+        @if ($submission->status != 'Pending' && $submission->status != 'Draft')
+            <div class="row mb-2 no-gutters">
+                <div class="col-md-2">
+                    <h5 class="mb-0">Processed</h5>
+                </div>
+                <div class="col-md-10">
+                    {!! format_date($submission->updated_at) !!} ({{ $submission->updated_at->diffForHumans() }}) by {!! $submission->staff->displayName !!}
+                </div>
+            </div>
+        @endif
     </div>
-    <div class="row">
-        <div class="col-md-2 col-4"><h5>Submitted</h5></div>
-        <div class="col-md-10 col-8">{!! format_date($submission->created_at) !!} ({{ $submission->created_at->diffForHumans() }})</div>
+</div>
+
+<div class="card mb-3">
+    <div class="card-header h2">Comments</div>
+    <div class="card-body">
+        {!! nl2br(htmlentities($submission->comments)) !!}
     </div>
-    @if($submission->status != 'Pending')
-        <div class="row">
-            <div class="col-md-2 col-4"><h5>Processed</h5></div>
-            <div class="col-md-10 col-8">{!! format_date($submission->updated_at) !!} ({{ $submission->updated_at->diffForHumans() }}) by {!! $submission->staff->displayName !!}</div>
+
+    @if (Auth::check() && $submission->staff_comments && ($submission->user_id == Auth::user()->id || Auth::user()->hasPower('manage_submissions')))
+        <div class="card-header h2">Staff Comments</div>
+        <div class="card-body">
+            @if (isset($submission->parsed_staff_comments))
+                {!! $submission->parsed_staff_comments !!}
+            @else
+                {!! $submission->staff_comments !!}
+            @endif
         </div>
     @endif
 </div>
-<h2>Comments</h2>
-<div class="card mb-3"><div class="card-body">{!! nl2br(htmlentities($submission->comments)) !!}</div></div>
-@if(Auth::check() && $submission->staff_comments && ($submission->user_id == Auth::user()->id || Auth::user()->hasPower('manage_submissions')))
-    <h2>Staff Comments</h2>
-    <div class="card mb-3"><div class="card-body">
-	    @if(isset($submission->parsed_staff_comments))
-            {!! $submission->parsed_staff_comments !!}
-        @else
-            {!! $submission->staff_comments !!}
-        @endif
-		</div></div>
-@endif
-
-<h2>Rewards</h2>
-<table class="table table-sm">
-    <thead>
-        <tr>
-            <th width="70%">Reward</th>
-            <th width="30%">Amount</th>
-        </tr>
-    </thead>
-    <tbody>
-        @foreach(parseAssetData( isset($submission->data['rewards']) ? $submission->data['rewards'] : $submission->data ) as $type)
-            @foreach($type as $asset)
-                <tr>
-                    <td>{!! $asset['asset'] ? $asset['asset']->displayName : 'Deleted Asset' !!}</td>
-                    <td>{{ $asset['quantity'] }}</td>
-                </tr>
-            @endforeach
-        @endforeach
-    </tbody>
-</table>
 
-<h2>Characters</h2>
-@foreach($submission->characters as $character)
-    <div class="submission-character-row mb-2">
-        <div class="submission-character-thumbnail"><a href="{{ $character->character->url }}"><img src="{{ $character->character->image->thumbnailUrl }}" class="img-thumbnail" alt="Thumbnail for {{ $character->character->fullName }}" /></a></div>
-        <div class="submission-character-info card ml-2">
-            <div class="card-body">
-                <div class="submission-character-info-content">
-                    <h3 class="mb-2 submission-character-info-header"><a href="{{ $character->character->url }}">{{ $character->character->fullName }}</a></h3>
-                    <div class="submission-character-info-body">
-                    <table class="table table-sm mb-0">
-                        <thead>
+@if (array_filter(parseAssetData(isset($submission->data['rewards']) ? $submission->data['rewards'] : $submission->data)))
+    <div class="card mb-3">
+        <div class="card-header h2">Rewards</div>
+        <div class="card-body">
+            <table class="table table-sm">
+                <thead class="thead-light">
+                    <tr>
+                        <th width="70%">Reward</th>
+                        <th width="30%">Amount</th>
+                    </tr>
+                </thead>
+                <tbody>
+                    @foreach (parseAssetData(isset($submission->data['rewards']) ? $submission->data['rewards'] : $submission->data) as $type)
+                        @foreach ($type as $asset)
                             <tr>
-                                <th width="70%">Reward</th>
-                                <th width="30%">Amount</th>
+                                <td>{!! $asset['asset'] ? $asset['asset']->displayName : 'Deleted Asset' !!}</td>
+                                <td>{{ $asset['quantity'] }}</td>
                             </tr>
-                        </thead>
-                        <tbody>
-                            @foreach(parseAssetData($character->data) as $key => $type)
+                        @endforeach
+                    @endforeach
+                </tbody>
+            </table>
+        </div>
+    </div>
+@endif
 
-                                @foreach($type as $asset)
-                                    <tr>
-                                        <td>{!! $asset['asset']->displayName !!} ({!! ucfirst($key) !!})</td>
-                                        <td>{{ $asset['quantity'] }}</td>
-                                    </tr>
-                                @endforeach
-                            @endforeach
+<div class="card mb-3">
+    <div class="card-header h2">Characters</div>
+    <div class="card-body">
+        @if (count(
+                $submission->characters()->whereRelation('character', 'deleted_at', null)->get()) != count($submission->characters()->get()))
+            <div class="alert alert-warning">
+                Some characters have been deleted since this submission was created.
+            </div>
+        @endif
+        @foreach ($submission->characters()->whereRelation('character', 'deleted_at', null)->get() as $character)
+            <div class="submission-character-row mb-2">
+                <div class="submission-character-thumbnail">
+                    <a href="{{ $character->character->url }}"><img src="{{ $character->character->image->thumbnailUrl }}" class="img-thumbnail" alt="Thumbnail for {{ $character->character->fullName }}" /></a>
+                </div>
+                <div class="submission-character-info card ml-2">
+                    <div class="card-body">
+                        <div class="submission-character-info-content">
+                            <h3 class="mb-2 submission-character-info-header"><a href="{{ $character->character->url }}">{{ $character->character->fullName }}</a></h3>
+                            <div class="submission-character-info-body">
+                                @if (array_filter(parseAssetData($character->data)))
+                                    <table class="table table-sm mb-0">
+                                        <thead class="thead-light">
+                                            <tr>
+                                                <th width="70%">Reward</th>
+                                                <th width="30%">Amount</th>
+                                            </tr>
+                                        </thead>
+                                        <tbody>
+                                            @foreach (parseAssetData($character->data) as $key => $type)
+                                                @foreach ($type as $asset)
+                                                    <tr>
+                                                        <td>{!! $asset['asset']->displayName !!} ({!! ucfirst($key) !!})</td>
+                                                        <td>{{ $asset['quantity'] }}</td>
+                                                    </tr>
+                                                @endforeach
+                                            @endforeach
 
-                            {{--
+                                            {{--
 
-                            If you want to "Categorize" the rewards by type, uncomment this and comment or remove the above @foreach.
+                                            If you want to "Categorize" the rewards by type, uncomment this and comment or remove the above @foreach.
 
-                            @foreach(parseAssetData($character->data) as $key => $type)
-                                @if(count($type))
-                                <tr><td colspan="2"><strong>{!! strtoupper($key) !!}</strong></td></tr>
-                                    @foreach($type as $asset)
-                                        <tr>
-                                            <td>{!! $asset['asset']->displayName !!}</td>
-                                            <td>{{ $asset['quantity'] }}</td>
-                                        </tr>
-                                    @endforeach
-                                @endif
-                            @endforeach
+                                            @foreach (parseAssetData($character->data) as $key => $type)
+                                                @if (count($type))
+                                                <tr><td colspan="2"><strong>{!! strtoupper($key) !!}</strong></td></tr>
+                                                    @foreach ($type as $asset)
+                                                        <tr>
+                                                            <td>{!! $asset['asset']->displayName !!}</td>
+                                                            <td>{{ $asset['quantity'] }}</td>
+                                                        </tr>
+                                                    @endforeach
+                                                @endif
+                                            @endforeach
 
-                            --}}
-                        </tbody>
-                    </table>
+                                            --}}
+                                        </tbody>
+                                    </table>
+                                @else
+                                    <p>
+                                        No rewards set.
+                                    </p>
+                                @endif
+                            </div>
+                        </div>
                     </div>
                 </div>
             </div>
-        </div>
+        @endforeach
     </div>
-@endforeach
+</div>
 
-@if(isset($inventory['user_items']))
-<h2>Add-Ons</h2>
-<p>These items have been removed from the {{ $submission->prompt_id ? 'submitter' : 'claimant' }}'s inventory and will be refunded if the request is rejected or consumed if it is approved.</p>
+@if (isset($inventory['user_items']) && array_filter($inventory['user_items']))
+    <div class="card mb-3">
+        <div class="card-header h2">Add-Ons</div>
+        <div class="card-body">
+            <p>These items have been removed from the {{ $submission->prompt_id ? 'submitter' : 'claimant' }}'s inventory and will be refunded if the request is rejected or consumed if it is approved.</p>
             <table class="table table-sm">
                 <thead class="thead-light">
-                        <tr class="d-flex">
-                            <th class="col-2">Item</th>
-                            <th class="col-4">Source</th>
-                            <th class="col-4">Notes</th>
-                            <th class="col-2">Quantity</th>
-                        </tr>
+                    <tr class="d-flex">
+                        <th class="col-2">Item</th>
+                        <th class="col-4">Source</th>
+                        <th class="col-4">Notes</th>
+                        <th class="col-2">Quantity</th>
+                    </tr>
                 </thead>
                 <tbody>
-                    @foreach($inventory['user_items'] as $itemRow)
+                    @foreach ($inventory['user_items'] as $itemRow)
                         <tr class="d-flex">
-                            <td class="col-2">@if(isset($itemsrow[$itemRow['asset']->item_id]->image_url)) <img class="small-icon" src="{{ $itemsrow[$itemRow['asset']->item_id]->image_url }}" alt="{{ $itemsrow[$itemRow['asset']->item_id]->name }}"> @endif {!! $itemsrow[$itemRow['asset']->item_id]->name !!}
+                            <td class="col-2">
+                                @if (isset($itemsrow[$itemRow['asset']->item_id]->image_url))
+                                    <img class="small-icon" src="{{ $itemsrow[$itemRow['asset']->item_id]->image_url }}" alt="{{ $itemsrow[$itemRow['asset']->item_id]->name }}">
+                                @endif {!! $itemsrow[$itemRow['asset']->item_id]->name !!}
                             <td class="col-4">{!! array_key_exists('data', $itemRow['asset']->data) ? ($itemRow['asset']->data['data'] ? $itemRow['asset']->data['data'] : 'N/A') : 'N/A' !!}</td>
                             <td class="col-4">{!! array_key_exists('notes', $itemRow['asset']->data) ? ($itemRow['asset']->data['notes'] ? $itemRow['asset']->data['notes'] : 'N/A') : 'N/A' !!}</td>
                             <td class="col-2">{!! $itemRow['quantity'] !!}
@@ -138,24 +193,30 @@
                     @endforeach
                 </tbody>
             </table>
+        </div>
+    </div>
 @endif
 
-@if(isset($inventory['currencies']))
-    <h3>{!! $submission->user->displayName !!}'s Bank</h3>
-    <table class="table table-sm mb-3">
-        <thead>
-            <tr>
-                <th width="70%">Currency</th>
-                <th width="30%">Quantity</th>
-            </tr>
-        </thead>
-        <tbody>
-            @foreach($inventory['currencies'] as $currency)
-                <tr>
-                    <td>{!! $currency['asset']->name !!}</td>
-                    <td>{{ $currency['quantity'] }}</td>
-                </tr>
-            @endforeach
-        </tbody>
-    </table>
+@if (isset($inventory['currencies']) && array_filter($inventory['currencies']))
+    <div class="card mb-3">
+        <div class="card-header h2">{!! $submission->user->displayName !!}'s Bank</div>
+        <div class="card-body">
+            <table class="table table-sm mb-3">
+                <thead class="thead-light">
+                    <tr>
+                        <th width="70%">Currency</th>
+                        <th width="30%">Quantity</th>
+                    </tr>
+                </thead>
+                <tbody>
+                    @foreach ($inventory['currencies'] as $currency)
+                        <tr>
+                            <td>{!! $currency['asset']->name !!}</td>
+                            <td>{{ $currency['quantity'] }}</td>
+                        </tr>
+                    @endforeach
+                </tbody>
+            </table>
+        </div>
+    </div>
 @endif
diff --git a/resources/views/home/_submission_form.blade.php b/resources/views/home/_submission_form.blade.php
new file mode 100644
index 0000000000..6dc8f9c215
--- /dev/null
+++ b/resources/views/home/_submission_form.blade.php
@@ -0,0 +1,164 @@
+@if ($submission->status == 'Draft')
+    {!! Form::open(['url' => $isClaim ? 'claims/edit' : 'submissions/edit', 'id' => 'submissionForm']) !!}
+@else
+    {!! Form::open(['url' => $isClaim ? 'claims/new' : 'submissions/new', 'id' => 'submissionForm']) !!}
+@endif
+
+@if (Auth::check() && $submission->staff_comments && ($submission->user_id == Auth::user()->id || Auth::user()->hasPower('manage_submissions')))
+    <h2>Staff Comments ({!! $submission->staff->displayName !!})</h2>
+    <div class="card mb-3">
+        <div class="card-body">
+            @if (isset($submission->parsed_staff_comments))
+                {!! $submission->parsed_staff_comments !!}
+            @else
+                {!! $submission->staff_comments !!}
+            @endif
+        </div>
+    </div>
+@endif
+
+@if (!$isClaim)
+    <div class="form-group">
+        {!! Form::label('prompt_id', 'Prompt') !!}
+        {!! Form::select('prompt_id', $prompts, isset($submission->prompt_id) ? $submission->prompt_id : old('prompt_id') ?? Request::get('prompt_id'), ['class' => 'form-control selectize', 'id' => 'prompt', 'placeholder' => '']) !!}
+    </div>
+@endif
+
+<div class="form-group">
+    {!! Form::label('url', $isClaim ? 'URL (Optional)' : 'Submission URL (Optional)') !!}
+    @if ($isClaim)
+        {!! add_help('Enter a URL relevant to your claim (for example, a comment proving you may make this claim).') !!}
+    @else
+        {!! add_help('Enter the URL of your submission (whether uploaded to dA or some other hosting service).') !!}
+    @endif
+    {!! Form::text('url', isset($submission->url) ? $submission->url : old('url') ?? Request::get('url'), ['class' => 'form-control', 'required']) !!}
+</div>
+
+<div class="form-group">
+    {!! Form::label('comments', 'Comments (Optional)') !!} {!! add_help('Enter a comment for your ' . ($isClaim ? 'claim' : 'submission') . ' (no HTML). This will be viewed by the mods when reviewing your ' . ($isClaim ? 'claim' : 'submission') . '.') !!}
+    {!! Form::textarea('comments', isset($submission->comments) ? $submission->comments : old('comments') ?? Request::get('comments'), ['class' => 'form-control']) !!}
+</div>
+
+@if ($submission->prompt_id)
+    <div class="mb-3">
+        @include('home._prompt', ['prompt' => $submission->prompt, 'staffView' => false])
+    </div>
+@endif
+
+<div class="card mb-3">
+    <div class="card-header h2">
+        Rewards
+    </div>
+    <div class="card-body">
+        @if ($isClaim)
+            <p>Select the rewards you would like to claim.</p>
+        @else
+            <p>Note that any rewards added here are <u>in addition</u> to the default prompt rewards. If you do not require any additional rewards, you can leave this blank.</p>
+        @endif
+
+        {{-- previous input --}}
+        @if (old('rewardable_type'))
+            @php
+                $loots = [];
+                foreach (old('rewardable_type') as $key => $type) {
+                    if (!isset(old('rewardable_id')[$key])) {
+                        continue;
+                    }
+                    $loots[] = (object) [
+                        'rewardable_type' => $type,
+                        'rewardable_id' => old('rewardable_id')[$key],
+                        'quantity' => old('quantity')[$key] ?? 1,
+                    ];
+                }
+            @endphp
+        @endif
+        @if ($isClaim)
+            @include('widgets._loot_select', ['loots' => $submission->id ? $submission->rewards : $loots ?? null, 'showLootTables' => false, 'showRaffles' => true])
+        @else
+            @include('widgets._loot_select', ['loots' => $submission->id ? $submission->rewards : $loots ?? null, 'showLootTables' => false, 'showRaffles' => false])
+        @endif
+
+        @if (!$isClaim)
+            <div id="rewards" class="mb-3"></div>
+        @endif
+    </div>
+</div>
+
+<div class="card mb-3">
+    <div class="card-header h2">
+        <a href="#" class="btn btn-outline-info float-right" id="addCharacter">Add Character</a>
+        Characters
+    </div>
+    <div class="card-body" style="clear:both;">
+        @if ($isClaim)
+            <p>If there are character-specific rewards you would like to claim, attach them here. Otherwise, this section can be left blank.</p>
+        @endif
+        <div id="characters" class="mb-3">
+            @foreach ($submission->characters as $character)
+                @include('widgets._character_select_entry', [
+                    'characterCurrencies' => $characterCurrencies,
+                    'items' => $items,
+                    'tables' => [],
+                    'showTables' => false,
+                    'character' => $character,
+                    'expanded_rewards' => $expanded_rewards,
+                ])
+            @endforeach
+            @if (old('slug') && !$submission->id)
+                @php
+                    session()->forget('_old_input.character_rewardable_type');
+                    session()->forget('_old_input.character_rewardable_id');
+                    session()->forget('_old_input.character_rewardable_quantity');
+                @endphp
+                @foreach (array_unique(old('slug')) as $slug)
+                    @include('widgets._character_select_entry', ['character' => \App\Models\Character\Character::where('slug', $slug)->first()])
+                @endforeach
+            @endif
+        </div>
+    </div>
+</div>
+
+<div class="card mb-3">
+    <div class="card-header h2">
+        Add-Ons
+    </div>
+    <div class="card-body">
+        <p>If your {{ $isClaim ? 'claim' : 'submission' }} consumes items, attach them here. Otherwise, this section can be left blank. These items will be removed from your inventory but refunded if your {{ $isClaim ? 'claim' : 'submission' }} is
+            rejected.</p>
+        <div id="addons" class="mb-3">
+            @include('widgets._inventory_select', [
+                'user' => Auth::user(),
+                'inventory' => $inventory,
+                'categories' => $categories,
+                'selected' => $submission->id ? $submission->getInventory($submission->user) : (old('stack_id') ? array_combine(old('stack_id'), old('stack_quantity')) : []),
+                'page' => $page,
+            ])
+            @include('widgets._bank_select', [
+                'owner' => Auth::user(),
+                'selected' => $submission->id ? $submission->getCurrencies($submission->user) : (old('currency_id') ? array_combine(old('currency_id')['user-' . Auth::user()->id], old('currency_quantity')['user-' . Auth::user()->id]) : []),
+            ])
+        </div>
+    </div>
+</div>
+
+@if ($submission->status == 'Draft')
+    <div class="text-right">
+        <a href="#" class="btn btn-danger mr-2" id="cancelButton">Delete Draft</a>
+        <a href="#" class="btn btn-secondary mr-2" id="draftButton">Save Draft</a>
+        <a href="#" class="btn btn-primary" id="confirmButton">Submit</a>
+    </div>
+@else
+    <div class="text-right">
+        <a href="#" class="btn btn-secondary mr-2" id="draftButton">Save Draft</a>
+        <a href="#" class="btn btn-primary" id="confirmButton">Submit</a>
+    </div>
+@endif
+
+{!! Form::close() !!}
+
+@include('widgets._character_select', ['characterCurrencies' => $characterCurrencies, 'showLootTables' => false])
+@if ($isClaim)
+    @include('widgets._loot_select_row', ['items' => $items, 'currencies' => $currencies, 'showLootTables' => false, 'showRaffles' => true])
+@else
+    @include('widgets._loot_select_row', ['items' => $items, 'currencies' => $currencies, 'showLootTables' => false, 'showRaffles' => false])
+@endif
diff --git a/resources/views/home/_transfer.blade.php b/resources/views/home/_transfer.blade.php
index 8bd713e6ba..2ba4ca2dce 100644
--- a/resources/views/home/_transfer.blade.php
+++ b/resources/views/home/_transfer.blade.php
@@ -1,42 +1,48 @@
 <div class="transfer-row mb-2">
-    <div class="transfer-thumbnail"><a href="{{ $transfer->character->url }}"><img src="{{ $transfer->character->image->thumbnailUrl }}" class="img-thumbnail" alt="Thumbnail for {{ $transfer->character->fullName }}" /></a></div>
+    @if ($transfer->character)
+        <div class="transfer-thumbnail"><a href="{{ $transfer->character->url }}"><img src="{{ $transfer->character->image->thumbnailUrl }}" class="img-thumbnail" alt="Thumbnail for {{ $transfer->character->fullName }}" /></a></div>
+    @endif
     <div class="transfer-info card ml-2">
         <div class="card-body">
             <div class="transfer-info-content">
-                <h3 class="mb-0 transfer-info-header"><a href="{{ $transfer->character->url }}">{{ $transfer->character->fullName }}</a></h3>
+                @if ($transfer->character)
+                    <h3 class="mb-0 transfer-info-header"><a href="{{ $transfer->character->url }}">{{ $transfer->character->fullName }}</a></h3>
+                @else
+                    <h3 class="mb-0 transfer-info-header">Character Deleted</h3>
+                @endif
                 <div class="transfer-info-body mb-3">
-                    @if(Auth::user()->id == $transfer->recipient_id)
+                    @if (Auth::user()->id == $transfer->recipient_id)
                         <p>Transfer sent by {!! $transfer->sender->displayName !!}, {!! format_date($transfer->created_at) !!}</p>
                     @else
                         <p>Transfer sent to {!! $transfer->recipient->displayName !!}, {!! format_date($transfer->created_at) !!}</p>
                     @endif
 
-                    @if($transfer->isActive && $transfersQueue)
-                        @if($transfer->is_approved)
+                    @if ($transfer->isActive && $transfersQueue)
+                        @if ($transfer->is_approved)
                             <h5 class="mb-0"><i class="text-success far fa-circle fa-fw mr-2"></i> Transfer approved {!! add_help('This transfer has been approved by a mod and will be processed once accepted.') !!}</h5>
                         @else
                             <h5 class="mb-0"><i class="text-danger fas fa-times fa-fw mr-2"></i> Transfer awaiting approval {!! add_help('This transfer has not been approved by a mod yet. Once approved and accepted by the recipient, it will be processed.') !!}</h5>
                         @endif
                     @elseif(!$transfer->isActive)
-                        @if($transfer->reason)
+                        @if ($transfer->reason)
                             <div class="alert alert-danger mb-0">{{ $transfer->reason }}</div>
                         @endif
                     @endif
                 </div>
                 <div class="transfer-info-footer">
-                    @if(Auth::user()->id == $transfer->recipient_id)
-                        @if($transfer->isActive)
-                            @if($transfer->status == 'Pending')
-                                {!! Form::open(['url' => 'characters/transfer/act/'.$transfer->id, 'class' => 'text-right']) !!}
-                                    {!! Form::submit('Accept', ['class' => 'btn btn-success', 'name' => 'action']) !!}
-                                    {!! Form::submit('Reject', ['class' => 'btn btn-danger', 'name' => 'action']) !!}
+                    @if (Auth::user()->id == $transfer->recipient_id)
+                        @if ($transfer->isActive)
+                            @if ($transfer->status == 'Pending')
+                                {!! Form::open(['url' => 'characters/transfer/act/' . $transfer->id, 'class' => 'text-right']) !!}
+                                {!! Form::submit('Accept', ['class' => 'btn btn-success', 'name' => 'action']) !!}
+                                {!! Form::submit('Reject', ['class' => 'btn btn-danger', 'name' => 'action']) !!}
                                 {!! Form::close() !!}
                             @else
                                 Currently awaiting mod approval
                             @endif
                         @else
                             <h2 class="text-right mb-0">
-                                @if($transfer->status == 'Accepted')
+                                @if ($transfer->status == 'Accepted')
                                     <span class="badge badge-success">Accepted</span>
                                 @elseif($transfer->status == 'Rejected')
                                     <span class="badge badge-danger">Rejected</span>
@@ -46,15 +52,15 @@
                             </h2>
                         @endif
                     @else
-                        @if($transfer->isActive)
-                            @if($transfer->status == 'Pending')
-                                {!! Form::open(['url' => 'characters/transfer/act/'.$transfer->id, 'class' => 'text-right']) !!}
-                                    {!! Form::submit('Cancel', ['class' => 'btn btn-danger', 'name' => 'action']) !!}
+                        @if ($transfer->isActive)
+                            @if ($transfer->status == 'Pending')
+                                {!! Form::open(['url' => 'characters/transfer/act/' . $transfer->id, 'class' => 'text-right']) !!}
+                                {!! Form::submit('Cancel', ['class' => 'btn btn-danger', 'name' => 'action']) !!}
                                 {!! Form::close() !!}
                             @endif
                         @else
                             <h2 class="text-right mb-0">
-                                @if($transfer->status == 'Accepted')
+                                @if ($transfer->status == 'Accepted')
                                     <span class="badge badge-success">Accepted</span>
                                 @elseif($transfer->status == 'Rejected')
                                     <span class="badge badge-danger">Rejected</span>
diff --git a/resources/views/home/account_search.blade.php b/resources/views/home/account_search.blade.php
index 6333709462..ca8cbb70d4 100644
--- a/resources/views/home/account_search.blade.php
+++ b/resources/views/home/account_search.blade.php
@@ -1,95 +1,119 @@
 @extends('home.layout')
 
-@section('home-title') Account Search @endsection
+@section('home-title')
+    Account Search
+@endsection
 
 @section('home-content')
-{!! breadcrumbs(['Inventory' => 'inventory', 'Account Search' => 'account-search']) !!}
+    {!! breadcrumbs(['Inventory' => 'inventory', 'Account Search' => 'account-search']) !!}
 
-<h1>Account Search</h1>
+    <h1>Account Search</h1>
 
-<p>Select an item to search for all occurrences of it in your and your characters' inventories. If a stack is currently "held" in a trade, design update, or submission, this will be stated and all held locations will be linked.</p>
+    <p>Select an item to search for all occurrences of it in your and your characters' inventories. If a stack is currently "held" in a trade, design update, or submission, this will be stated and all held locations will be linked.</p>
 
-{!! Form::open(['method' => 'GET', 'class' => '']) !!}
-<div class="form-inline justify-content-end">
-    <div class="form-group ml-3 mb-3">
-        {!! Form::select('item_id', $items, Request::get('item_id'), ['class' => 'form-control selectize', 'placeholder' => 'Select an Item', 'style' => 'width: 25em; max-width: 100%;']) !!}
-    </div>
-    <div class="form-group ml-3 mb-3">
-        {!! Form::submit('Search', ['class' => 'btn btn-primary']) !!}
+    {!! Form::open(['method' => 'GET', 'class' => '']) !!}
+    <div class="form-inline justify-content-end">
+        <div class="form-group ml-3 mb-3">
+            {!! Form::select('item_id', $items, Request::get('item_id'), ['class' => 'form-control selectize', 'placeholder' => 'Select an Item', 'style' => 'width: 25em; max-width: 100%;']) !!}
+        </div>
+        <div class="form-group ml-3 mb-3">
+            {!! Form::submit('Search', ['class' => 'btn btn-primary']) !!}
+        </div>
     </div>
-</div>
-{!! Form::close() !!}
+    {!! Form::close() !!}
 
-@if($item)
-    <h3>{{ $item->name }}</h3>
+    @if ($item)
+        <h3>{{ $item->name }}</h3>
 
-    <p>You currently have {{ $userItems->pluck('count')->sum()+$characterItems->pluck('count')->sum() }} of this item between your and your characters' inventories.</p>
+        <p>You currently have {{ $userItems->pluck('count')->sum() + $characterItems->pluck('count')->sum() }} of this item between your and your characters' inventories.</p>
 
-    @if($userItems->count())
-        <h5>In Your Inventory:</h5>
-        <ul>
-            @foreach($userItems as $item)
-                <li>
-                    A stack of {{ $item->count }}
-                    @if($item->count > $item->availableQuantity)
-                    ({{ $item->availableQuantity }} Available {{ $item->getOthers() }})
-                        <ul>
-                            <?php
+        @if ($userItems->count())
+            <h5>In Your Inventory:</h5>
+            <ul>
+                @foreach ($userItems as $item)
+                    <li>
+                        A stack of {{ $item->count }}
+                        @if ($item->count > $item->availableQuantity)
+                            ({{ $item->availableQuantity }} Available {{ $item->getOthers() }})
+                            <ul>
+                                <?php
                                 $tradesSent = $trades->where('sender_id', Auth::user()->id);
                                 $tradesReceived = $trades->where('recipient_id', Auth::user()->id);
-
+                                
                                 // Collect hold location IDs and quantities
                                 $holdLocations = [];
-                                if(isset($item->trade_count) && $item->trade_count > 0) {
-                                    foreach($tradesSent as $trade)
-                                        if(isset($trade->data['sender']) && $trade->data['sender'] != [] && isset($trade->data['sender']['user_items']) && isset($trade->data['sender']['user_items'][$item->id])) $holdLocations['trade'][$trade->id] = $trade->data['sender']['user_items'][$item->id];
-                                    foreach($tradesReceived as $trade)
-                                        if(isset($trade->data['recipient']) && $trade->data['recipient'] != [] && isset($trade->data['recipient']['user_items']) && isset($trade->data['recipient']['user_items'][$item->id])) $holdLocations['trade'][$trade->id] = $trade->data['recipient']['user_items'][$item->id];
+                                if (isset($item->trade_count) && $item->trade_count > 0) {
+                                    foreach ($tradesSent as $trade) {
+                                        if (isset($trade->data['sender']) && $trade->data['sender'] != [] && isset($trade->data['sender']['user_items']) && isset($trade->data['sender']['user_items'][$item->id])) {
+                                            $holdLocations['trade'][$trade->id] = $trade->data['sender']['user_items'][$item->id];
+                                        }
+                                    }
+                                    foreach ($tradesReceived as $trade) {
+                                        if (isset($trade->data['recipient']) && $trade->data['recipient'] != [] && isset($trade->data['recipient']['user_items']) && isset($trade->data['recipient']['user_items'][$item->id])) {
+                                            $holdLocations['trade'][$trade->id] = $trade->data['recipient']['user_items'][$item->id];
+                                        }
+                                    }
                                 }
-                                if(isset($item->update_count) && $item->update_count > 0)
-                                    foreach($designUpdates as $update)
-                                        if($update->data['user'] != [] && isset($update->data['user']['user_items']) && isset($update->data['user']['user_items'][$item->id])) $holdLocations['update'][$update->id] = $update->data['user']['user_items'][$item->id];
-                                if(isset($item->submission_count) && $item->submission_count > 0)
-                                    foreach($submissions as $submission)
-                                        if($submission->data['user'] != [] && isset($submission->data['user']['user_items']) && isset($submission->data['user']['user_items'][$item->id])) $holdLocations['submission'][$submission->id] = $submission->data['user']['user_items'][$item->id];
-
+                                if (isset($item->update_count) && $item->update_count > 0) {
+                                    foreach ($designUpdates as $update) {
+                                        if ($update->data['user'] != [] && isset($update->data['user']['user_items']) && isset($update->data['user']['user_items'][$item->id])) {
+                                            $holdLocations['update'][$update->id] = $update->data['user']['user_items'][$item->id];
+                                        }
+                                    }
+                                }
+                                if (isset($item->submission_count) && $item->submission_count > 0) {
+                                    foreach ($submissions as $submission) {
+                                        if ($submission->data['user'] != [] && isset($submission->data['user']['user_items']) && isset($submission->data['user']['user_items'][$item->id])) {
+                                            $holdLocations['submission'][$submission->id] = $submission->data['user']['user_items'][$item->id];
+                                        }
+                                    }
+                                }
+                                
                                 // Format a string with all the places a stack is held
                                 $held = [];
-                                if(isset($holdLocations['trade']))
-                                    foreach($holdLocations['trade'] as $trade=>$quantity) array_push($held, '<a href="'.App\Models\Trade::find($trade)->url.'">Trade #'.App\Models\Trade::find($trade)->id.'</a>'.' ('.$quantity.')');
-                                if(isset($holdLocations['update']))
-                                    foreach($holdLocations['update'] as $update=>$quantity) array_push($held, '<a href="'.App\Models\Character\CharacterDesignUpdate::find($update)->url.'">Design Update #'.App\Models\Character\CharacterDesignUpdate::find($update)->id.'</a>'.' ('.$quantity.')');
-                                if(isset($holdLocations['submission']))
-                                    foreach($holdLocations['submission'] as $submission=>$quantity) array_push($held, '<a href="'.App\Models\Submission\Submission::find($submission)->viewUrl.'">Submission #'.App\Models\Submission\Submission::find($submission)->id.'</a>'.' ('.$quantity.')');
-                            ?>
-                            @foreach($held as $location)
-                                <li>
-                                    {!! $location !!}
-                                </li>
-                            @endforeach
-                        </ul>
-                    @endif
-                </li>
-            @endforeach
-        </ul>
-    @endif
-    @if($characterItems->count())
-        <h5>In Character Inventories:</h5>
-        <ul>
-            @foreach($characterItems as $item)
-                <li>
-                    <a href="{{ $item->character->url }}">{{ $item->character->fullName }}</a> has a stack of {{ $item->count }}
-                </li>
-            @endforeach
-        </ul>
+                                if (isset($holdLocations['trade'])) {
+                                    foreach ($holdLocations['trade'] as $trade => $quantity) {
+                                        array_push($held, '<a href="' . App\Models\Trade::find($trade)->url . '">Trade #' . App\Models\Trade::find($trade)->id . '</a>' . ' (' . $quantity . ')');
+                                    }
+                                }
+                                if (isset($holdLocations['update'])) {
+                                    foreach ($holdLocations['update'] as $update => $quantity) {
+                                        array_push($held, '<a href="' . App\Models\Character\CharacterDesignUpdate::find($update)->url . '">Design Update #' . App\Models\Character\CharacterDesignUpdate::find($update)->id . '</a>' . ' (' . $quantity . ')');
+                                    }
+                                }
+                                if (isset($holdLocations['submission'])) {
+                                    foreach ($holdLocations['submission'] as $submission => $quantity) {
+                                        array_push($held, '<a href="' . App\Models\Submission\Submission::find($submission)->viewUrl . '">Submission #' . App\Models\Submission\Submission::find($submission)->id . '</a>' . ' (' . $quantity . ')');
+                                    }
+                                }
+                                ?>
+                                @foreach ($held as $location)
+                                    <li>
+                                        {!! $location !!}
+                                    </li>
+                                @endforeach
+                            </ul>
+                        @endif
+                    </li>
+                @endforeach
+            </ul>
+        @endif
+        @if ($characterItems->count())
+            <h5>In Character Inventories:</h5>
+            <ul>
+                @foreach ($characterItems as $item)
+                    <li>
+                        <a href="{{ $item->character->url }}">{{ $item->character->fullName }}</a> has a stack of {{ $item->count }}
+                    </li>
+                @endforeach
+            </ul>
+        @endif
     @endif
-@endif
-
-<script>
-    $(document).ready(function() {
-        $('.selectize').selectize();
-    });
 
-</script>
+    <script>
+        $(document).ready(function() {
+            $('.selectize').selectize();
+        });
+    </script>
 
 @endsection
diff --git a/resources/views/home/bank.blade.php b/resources/views/home/bank.blade.php
index 3f645aeb2f..32171424b0 100644
--- a/resources/views/home/bank.blade.php
+++ b/resources/views/home/bank.blade.php
@@ -1,44 +1,50 @@
 @extends('home.layout')
 
-@section('home-title') Bank @endsection
+@section('home-title')
+    Bank
+@endsection
 
 @section('home-content')
-{!! breadcrumbs(['Bank' => 'bank']) !!}
+    {!! breadcrumbs(['Bank' => 'bank']) !!}
 
-<h1>
-    Bank
-</h1>
+    <h1>
+        Bank
+    </h1>
 
-<h3>Currencies</h3>
-<div class="card mb-2">
-    <ul class="list-group list-group-flush">
+    <h3>Currencies</h3>
+    <div class="card mb-2">
+        <ul class="list-group list-group-flush">
 
-        @foreach(Auth::user()->getCurrencies(true) as $currency)
-            <li class="list-group-item">
-                <div class="row">
-                    <div class="col-lg-2 col-md-3 col-6 text-right">
-                        <strong>
-                            <a href="{{ $currency->url }}">
-                                {{ $currency->name }}
-                                @if($currency->abbreviation) ({{ $currency->abbreviation }}) @endif
-                            </a>
-                        </strong>
-                    </div>
-                    <div class="col-lg-10 col-md-9 col-6">
-                        {{ $currency->quantity }} @if($currency->has_icon) {!! $currency->displayIcon !!} @endif
+            @foreach (Auth::user()->getCurrencies(true) as $currency)
+                <li class="list-group-item">
+                    <div class="row">
+                        <div class="col-lg-2 col-md-3 col-6 text-right">
+                            <strong>
+                                <a href="{{ $currency->url }}">
+                                    {{ $currency->name }}
+                                    @if ($currency->abbreviation)
+                                        ({{ $currency->abbreviation }})
+                                    @endif
+                                </a>
+                            </strong>
+                        </div>
+                        <div class="col-lg-10 col-md-9 col-6">
+                            {{ $currency->quantity }} @if ($currency->has_icon)
+                                {!! $currency->displayIcon !!}
+                            @endif
+                        </div>
                     </div>
-                </div>
-            </li>
-        @endforeach
-    </ul>
-</div>
-<div class="text-right mb-4">
-    <a href="{{ url(Auth::user()->url.'/currency-logs') }}">View logs...</a>
-</div>
+                </li>
+            @endforeach
+        </ul>
+    </div>
+    <div class="text-right mb-4">
+        <a href="{{ url(Auth::user()->url . '/currency-logs') }}">View logs...</a>
+    </div>
 
-<h3>Transfer Currency</h3>
-<p>If you are transferring currency as part of a trade for on-site resources (items, currency, characters), using the <a href="{{ url('trades/open') }}">trade system</a> is recommended instead to protect yourself from being scammed.</p>
-{!! Form::open(['url' => 'bank/transfer']) !!}
+    <h3>Transfer Currency</h3>
+    <p>If you are transferring currency as part of a trade for on-site resources (items, currency, characters), using the <a href="{{ url('trades/open') }}">trade system</a> is recommended instead to protect yourself from being scammed.</p>
+    {!! Form::open(['url' => 'bank/transfer']) !!}
     <div class="form-group">
         {!! Form::label('user_id', 'Recipient') !!}
         {!! Form::select('user_id', $userOptions, null, ['class' => 'form-control']) !!}
@@ -58,6 +64,5 @@
     <div class="text-right">
         {!! Form::submit('Transfer', ['class' => 'btn btn-primary']) !!}
     </div>
-{!! Form::close() !!}
-
+    {!! Form::close() !!}
 @endsection
diff --git a/resources/views/home/bug_report_index.blade.php b/resources/views/home/bug_report_index.blade.php
index 2b4c47e6b6..5847f6f581 100644
--- a/resources/views/home/bug_report_index.blade.php
+++ b/resources/views/home/bug_report_index.blade.php
@@ -1,47 +1,61 @@
 @extends('layouts.app')
 
-@section('title') Bug Reports @endsection
+@section('title')
+    Bug Reports
+@endsection
 
 @section('content')
     {!! breadcrumbs(['Reports' => 'reports']) !!}
-<h1>
-Bug Reports
-</h1>
+    <h1>
+        Bug Reports
+    </h1>
 
-<p>Please check the current 'fix in progress' reports to ensure your bug is not already being worked on! If the title is not descriptive enough, or does not match your bug, feel free to create a new one.</p>
-<div class="alert alert-warning">Please note that certain bug reports cannot be viewed until they are closed to prevent abuse.</div>
+    <p>Please check the current 'fix in progress' reports to ensure your bug is not already being worked on! If the title is not descriptive enough, or does not match your bug, feel free to create a new one.</p>
+    <div class="alert alert-warning">Please note that certain bug reports cannot be viewed until they are closed to prevent abuse.</div>
 
-@if(Auth::check())
-    <div class="text-right">
+    @if (Auth::check())
+        <div class="text-right">
             <a href="{{ url('reports/new') }}" class="btn btn-success">New Report</a>
-    </div>
-@endif
-<br>
-{!! Form::open(['method' => 'GET', 'class' => 'form-inline justify-content-end']) !!}
-        <div class="form-group mr-3 mb-3">
-            {!! Form::text('url', Request::get('url'), ['class' => 'form-control', 'placeholder' => 'URL / Title']) !!}
-        </div>
-        <div class="form-group mb-3">
-            {!! Form::submit('Search', ['class' => 'btn btn-primary']) !!}
         </div>
+    @endif
+    <br>
+    {!! Form::open(['method' => 'GET', 'class' => 'form-inline justify-content-end']) !!}
+    <div class="form-group mr-3 mb-3">
+        {!! Form::text('url', Request::get('url'), ['class' => 'form-control', 'placeholder' => 'URL / Title']) !!}
+    </div>
+    <div class="form-group mb-3">
+        {!! Form::submit('Search', ['class' => 'btn btn-primary']) !!}
+    </div>
     {!! Form::close() !!}
 
-@if(count($reports))
-{!! $reports->render() !!}
-    <div class="row ml-md-2">
-      <div class="d-flex row flex-wrap col-12 mt-1 pt-1 px-0 ubt-bottom">
-        <div class="col-6 col-md-4 font-weight-bold">Link/Title</div>
-        <div class="col-6 col-md-5 font-weight-bold">Submitted</div>
-        <div class="col-12 col-md-1 font-weight-bold">Status</div>
-      </div>
-            @foreach($reports as $report)
-                @include('home._report', ['report' => $report])
-            @endforeach
-      </div>
-    {!! $reports->render() !!}
-    <div class="text-center mt-4 small text-muted">{{ $reports->total() }} result{{ $reports->total() == 1 ? '' : 's' }} found.</div>
-@else 
-    <p>No reports found.</p>
-@endif
+    @if (count($reports))
+        {!! $reports->render() !!}
+        <div class="mb-4 logs-table">
+            <div class="logs-table-header">
+                <div class="row">
+                    <div class="col-6 col-md-4">
+                        <div class="logs-table-cell">Link/Title</div>
+                    </div>
+                    <div class="col-6 col-md-5">
+                        <div class="logs-table-cell">Submitted</div>
+                    </div>
+                    <div class="col-12 col-md-1">
+                        <div class="logs-table-cell">Status</div>
+                    </div>
+                </div>
+            </div>
+            <div class="logs-table-body">
+                @foreach ($reports as $report)
+                    <div class="logs-table-row">
+                        @include('home._report', ['report' => $report])
+                    </div>
+                @endforeach
+            </div>
+        </div>
+        {!! $reports->render() !!}
+        <div class="text-center mt-4 small text-muted">{{ $reports->total() }} result{{ $reports->total() == 1 ? '' : 's' }} found.</div>
+    @else
+        <p>No reports found.</p>
+    @endif
 
 @endsection
diff --git a/resources/views/home/character_transfers.blade.php b/resources/views/home/character_transfers.blade.php
index 91d46339e6..a69aff9b06 100644
--- a/resources/views/home/character_transfers.blade.php
+++ b/resources/views/home/character_transfers.blade.php
@@ -1,31 +1,31 @@
 @extends('home.layout')
 
-@section('home-title') Character Transfers @endsection
-
-@section('home-content')
-{!! breadcrumbs(['Character Transfers' => 'characters/transfers']) !!}
-
-<h1>
+@section('home-title')
     Character Transfers
-</h1>
+@endsection
 
-<ul class="nav nav-tabs mb-3">
-  <li class="nav-item">
-    <a class="nav-link {{ set_active('characters/transfers/incoming*') }}" href="{{ url('characters/transfers/incoming') }}">Incoming</a>
-  </li>
-  <li class="nav-item">
-    <a class="nav-link {{ set_active('characters/transfers/outgoing*') }}" href="{{ url('characters/transfers/outgoing') }}">Outgoing</a>
-  </li>
-  <li class="nav-item">
-    <a class="nav-link {{ set_active('characters/transfers/completed*') }}" href="{{ url('characters/transfers/completed') }}">Completed</a>
-  </li>
-</ul>
+@section('home-content')
+    {!! breadcrumbs(['Character Transfers' => 'characters/transfers']) !!}
 
-{!! $transfers->render() !!}
-@foreach($transfers as $transfer)
-    @include('home._transfer', ['transfer' => $transfer])
-@endforeach
-{!! $transfers->render() !!}
+    <h1>
+        Character Transfers
+    </h1>
 
+    <ul class="nav nav-tabs mb-3">
+        <li class="nav-item">
+            <a class="nav-link {{ set_active('characters/transfers/incoming*') }}" href="{{ url('characters/transfers/incoming') }}">Incoming</a>
+        </li>
+        <li class="nav-item">
+            <a class="nav-link {{ set_active('characters/transfers/outgoing*') }}" href="{{ url('characters/transfers/outgoing') }}">Outgoing</a>
+        </li>
+        <li class="nav-item">
+            <a class="nav-link {{ set_active('characters/transfers/completed*') }}" href="{{ url('characters/transfers/completed') }}">Completed</a>
+        </li>
+    </ul>
 
+    {!! $transfers->render() !!}
+    @foreach ($transfers as $transfer)
+        @include('home._transfer', ['transfer' => $transfer])
+    @endforeach
+    {!! $transfers->render() !!}
 @endsection
diff --git a/resources/views/home/characters.blade.php b/resources/views/home/characters.blade.php
index 219ad9f81b..5e987386f0 100644
--- a/resources/views/home/characters.blade.php
+++ b/resources/views/home/characters.blade.php
@@ -1,49 +1,53 @@
 @extends('home.layout')
 
-@section('home-title') My Characters @endsection
+@section('home-title')
+    My Characters
+@endsection
 
 @section('home-content')
-{!! breadcrumbs(['My Characters' => 'characters']) !!}
+    {!! breadcrumbs(['My Characters' => 'characters']) !!}
 
-<h1>
-    My Characters
-</h1>
+    <h1>
+        My Characters
+    </h1>
 
-<p>This is a list of characters you own. Drag and drop to rearrange them.</p>
+    <p>This is a list of characters you own. Drag and drop to rearrange them.</p>
 
-<div id="sortable" class="row sortable">
-    @foreach($characters as $character)
-        <div class="col-md-3 col-6 text-center mb-2" data-id="{{ $character->id }}">
-            <div>
-                <a href="{{ $character->url }}"><img src="{{ $character->image->thumbnailUrl }}" class="img-thumbnail" alt="Thumbnail for {{ $character->fullName }}" /></a>
+    <div id="sortable" class="row sortable">
+        @foreach ($characters as $character)
+            <div class="col-md-3 col-6 text-center mb-2" data-id="{{ $character->id }}">
+                <div>
+                    <a href="{{ $character->url }}"><img src="{{ $character->image->thumbnailUrl }}" class="img-thumbnail" alt="Thumbnail for {{ $character->fullName }}" /></a>
+                </div>
+                <div class="mt-1 h5">
+                    {!! $character->displayName !!}
+                </div>
             </div>
-            <div class="mt-1 h5">
-                {!! $character->displayName !!}
-            </div>
-        </div>
-    @endforeach
-</div>
-{!! Form::open(['url' => 'characters/sort', 'class' => 'text-right']) !!}
+        @endforeach
+    </div>
+    {!! Form::open(['url' => 'characters/sort', 'class' => 'text-right']) !!}
     {!! Form::hidden('sort', null, ['id' => 'sortableOrder']) !!}
     {!! Form::submit('Save Order', ['class' => 'btn btn-primary']) !!}
-{!! Form::close() !!}
-
-
+    {!! Form::close() !!}
 @endsection
 @section('scripts')
     <script>
-        $( document ).ready(function() {
-            $( "#sortable" ).sortable({
+        $(document).ready(function() {
+            $("#sortable").sortable({
                 characters: '.sort-item',
                 placeholder: "sortable-placeholder col-md-3 col-6",
-                stop: function( event, ui ) {
-                    $('#sortableOrder').val($(this).sortable("toArray", {attribute:"data-id"}));
+                stop: function(event, ui) {
+                    $('#sortableOrder').val($(this).sortable("toArray", {
+                        attribute: "data-id"
+                    }));
                 },
                 create: function() {
-                    $('#sortableOrder').val($(this).sortable("toArray", {attribute:"data-id"}));
+                    $('#sortableOrder').val($(this).sortable("toArray", {
+                        attribute: "data-id"
+                    }));
                 }
             });
-            $( "#sortable" ).disableSelection();
+            $("#sortable").disableSelection();
         });
     </script>
 @endsection
diff --git a/resources/views/home/create_report.blade.php b/resources/views/home/create_report.blade.php
index 0f0baa8de8..86f8d19289 100644
--- a/resources/views/home/create_report.blade.php
+++ b/resources/views/home/create_report.blade.php
@@ -1,29 +1,31 @@
 @extends('home.layout')
 
-@section('home-title') New Submission @endsection
+@section('home-title')
+    New Submission
+@endsection
 
 @section('home-content')
     {!! breadcrumbs(['Reports' => 'reports', 'New Report' => 'reports/new']) !!}
 
-<h1>
-        New Report 
-</h1>
+    <h1>
+        New Report
+    </h1>
 
-@if($closed)
-    <div class="alert alert-danger">
-        The report queue is currently closed. You cannot make a new report at this time.
-    </div>
-@else 
-    {!! Form::open(['url' => 'reports/new', 'id' => 'submissionForm']) !!}
-    <div class="br-form-group alert alert-warning" style="display: none">
-        <div class="form-check">
-            When submitting a bug report, please use the 'URL / Title' section to briefly summarise the bug. Inlcude any links in the 'Comments' section. This is to allow an easy search.
+    @if ($closed)
+        <div class="alert alert-danger">
+            The report queue is currently closed. You cannot make a new report at this time.
+        </div>
+    @else
+        {!! Form::open(['url' => 'reports/new', 'id' => 'submissionForm']) !!}
+        <div class="br-form-group alert alert-warning" style="display: none">
+            <div class="form-check">
+                When submitting a bug report, please use the 'URL / Title' section to briefly summarise the bug. Inlcude any links in the 'Comments' section. This is to allow an easy search.
+            </div>
         </div>
-    </div>
         <div class="form-group">
-            {!! Form::label('url', 'URL / Title') !!} 
-                {!! add_help('Enter a URL relevant to your claim (for example, a comment proving you may make this claim). This field cannot be left blank.') !!} 
-            {!! Form::text('url',  Request::get('url'), ['class' => 'form-control', 'required']) !!}
+            {!! Form::label('url', 'URL / Title') !!}
+            {!! add_help('Enter a URL relevant to your claim (for example, a comment proving you may make this claim). This field cannot be left blank.') !!}
+            {!! Form::text('url', Request::get('url'), ['class' => 'form-control', 'required']) !!}
         </div>
         <div class="form-group">
             {!! Form::checkbox('is_br', 1, 0, ['class' => 'is-br-class form-check-input', 'data-toggle' => 'toggle']) !!}
@@ -41,37 +43,37 @@
         <div class="text-right">
             <a href="#" class="btn btn-primary" id="submitButton">Submit</a>
         </div>
-    {!! Form::close() !!}
+        {!! Form::close() !!}
 
 
-    <div class="modal fade" id="confirmationModal" tabindex="-1" role="dialog">
-        <div class="modal-dialog" role="document">
-            <div class="modal-content">
-                <div class="modal-header">
-                    <span class="modal-title h5 mb-0">Confirm  Report</span>
-                    <button type="button" class="close" data-dismiss="modal">&times;</button>
-                </div>
-                <div class="modal-body">
-                    <p>This will submit the form and put it into the report review queue. You will not be able to edit the contents after the report has been made. Click the Confirm button to complete the report.</p>
-                    <div class="text-right">
-                        <a href="#" id="formSubmit" class="btn btn-primary">Confirm</a>
+        <div class="modal fade" id="confirmationModal" tabindex="-1" role="dialog">
+            <div class="modal-dialog" role="document">
+                <div class="modal-content">
+                    <div class="modal-header">
+                        <span class="modal-title h5 mb-0">Confirm Report</span>
+                        <button type="button" class="close" data-dismiss="modal">&times;</button>
+                    </div>
+                    <div class="modal-body">
+                        <p>This will submit the form and put it into the report review queue. You will not be able to edit the contents after the report has been made. Click the Confirm button to complete the report.</p>
+                        <div class="text-right">
+                            <a href="#" id="formSubmit" class="btn btn-primary">Confirm</a>
+                        </div>
                     </div>
                 </div>
             </div>
         </div>
-    </div>
-@endif
+    @endif
 @endsection
 
 @section('scripts')
-@parent 
+    @parent
     <script>
         $(document).ready(function() {
             var $submitButton = $('#submitButton');
             var $confirmationModal = $('#confirmationModal');
             var $formSubmit = $('#formSubmit');
             var $submissionForm = $('#submissionForm');
-            
+
             $submitButton.on('click', function(e) {
                 e.preventDefault();
                 $confirmationModal.modal('show');
@@ -81,11 +83,11 @@
                 e.preventDefault();
                 $submissionForm.submit();
             });
-            $('.is-br-class').change(function(e){
-            console.log(this.checked)
-            $('.br-form-group').css('display',this.checked ? 'block' : 'none')
-                })
-            $('.br-form-group').css('display',$('.is-br-class').prop('checked') ? 'block' : 'none')
+            $('.is-br-class').change(function(e) {
+                console.log(this.checked)
+                $('.br-form-group').css('display', this.checked ? 'block' : 'none')
+            })
+            $('.br-form-group').css('display', $('.is-br-class').prop('checked') ? 'block' : 'none')
         });
     </script>
-@endsection
\ No newline at end of file
+@endsection
diff --git a/resources/views/home/create_submission.blade.php b/resources/views/home/create_submission.blade.php
index 9da191499f..cf66896354 100644
--- a/resources/views/home/create_submission.blade.php
+++ b/resources/views/home/create_submission.blade.php
@@ -1,151 +1,133 @@
 @extends('home.layout')
 
-@section('home-title') New Submission @endsection
+@section('home-title')
+    New Submission
+@endsection
 
 @section('home-content')
-@if($isClaim)
-    {!! breadcrumbs(['Claims' => 'claims', 'New Claim' => 'claims/new']) !!}
-@else
-    {!! breadcrumbs(['Prompt Submissions' => 'submissions', 'New Submission' => 'submissions/new']) !!}
-@endif
-
-<h1>
-    @if($isClaim)
-        New Claim
+    @if ($isClaim)
+        {!! breadcrumbs(['Claims' => 'claims', 'New Claim' => 'claims/new']) !!}
     @else
-        New Submission
+        {!! breadcrumbs(['Prompt Submissions' => 'submissions', 'New Submission' => 'submissions/new']) !!}
     @endif
-</h1>
-
-@if($closed)
-    <div class="alert alert-danger">
-        The {{ $isClaim ? 'claim' : 'submission' }} queue is currently closed. You cannot make a new {{ $isClaim ? 'claim' : 'submission' }} at this time.
-    </div>
-@else
-    {!! Form::open(['url' => $isClaim ? 'claims/new' : 'submissions/new', 'id' => 'submissionForm']) !!}
-        @if(!$isClaim)
-            <div class="form-group">
-                {!! Form::label('prompt_id', 'Prompt') !!}
-                {!! Form::select('prompt_id', $prompts, Request::get('prompt_id'), ['class' => 'form-control selectize', 'id' => 'prompt', 'placeholder' => '']) !!}
-            </div>
-        @endif
-        <div class="form-group">
-            {!! Form::label('url', $isClaim ? 'URL (Optional)' : 'Submission URL (Optional)') !!}
-            @if($isClaim)
-                {!! add_help('Enter a URL relevant to your claim (for example, a comment proving you may make this claim).') !!}
-            @else
-                {!! add_help('Enter the URL of your submission (whether uploaded to dA or some other hosting service).') !!}
-            @endif
-            {!! Form::text('url', null, ['class' => 'form-control', 'required']) !!}
-        </div>
-        <div class="form-group">
-            {!! Form::label('comments', 'Comments (Optional)') !!} {!! add_help('Enter a comment for your ' . ($isClaim ? 'claim' : 'submission') . ' (no HTML). This will be viewed by the mods when reviewing your ' . ($isClaim ? 'claim' : 'submission') . '.') !!}
-            {!! Form::textarea('comments', null, ['class' => 'form-control']) !!}
-        </div>
 
-        <h2>Rewards</h2>
-        @if($isClaim)
-            <p>Select the rewards you would like to claim.</p>
-        @else
-            <p>Note that any rewards added here are <u>in addition</u> to the default prompt rewards. If you do not require any additional rewards, you can leave this blank.</p>
-        @endif
-        @if($isClaim)
-            @include('widgets._loot_select', ['loots' => null, 'showLootTables' => false, 'showRaffles' => true])
+    <h1>
+        @if ($isClaim)
+            New Claim
         @else
-            @include('widgets._loot_select', ['loots' => null, 'showLootTables' => false, 'showRaffles' => false])
-        @endif
-        @if(!$isClaim)
-            <div id="rewards" class="mb-3"></div>
+            New Submission
         @endif
+    </h1>
 
-        <h2>Characters</h2>
-        @if($isClaim)
-            <p>If there are character-specific rewards you would like to claim, attach them here. Otherwise, this section can be left blank.</p>
-        @endif
-        <div id="characters" class="mb-3">
-        </div>
-        <div class="text-right mb-3">
-            <a href="#" class="btn btn-outline-info" id="addCharacter">Add Character</a>
-        </div>
-
-        <h2>Add-Ons</h2>
-        <p>If your {{ $isClaim ? 'claim' : 'submission' }} consumes items, attach them here. Otherwise, this section can be left blank. These items will be removed from your inventory but refunded if your {{ $isClaim ? 'claim' : 'submission' }} is rejected.</p>
-        <div id="addons" class="mb-3">
-        @include('widgets._inventory_select', ['user' => Auth::user(), 'inventory' => $inventory, 'categories' => $categories, 'selected' => [], 'page' => $page])
-        @include('widgets._bank_select', ['owner' => Auth::user(), 'selected' => null])
+    @if ($closed)
+        <div class="alert alert-danger">
+            The {{ $isClaim ? 'claim' : 'submission' }} queue is currently closed. You cannot make a new {{ $isClaim ? 'claim' : 'submission' }} at this time.
         </div>
-
-        <div class="text-right">
-            <a href="#" class="btn btn-primary" id="submitButton">Submit</a>
-        </div>
-    {!! Form::close() !!}
-
-    @include('widgets._character_select', ['characterCurrencies' => $characterCurrencies, 'showLootTables' => false])
-    @if($isClaim)
-        @include('widgets._loot_select_row', ['items' => $items, 'currencies' => $currencies, 'showLootTables' => false, 'showRaffles' => true])
     @else
-        @include('widgets._loot_select_row', ['items' => $items, 'currencies' => $currencies, 'showLootTables' => false, 'showRaffles' => false])
-    @endif
-
-    <div class="modal fade" id="confirmationModal" tabindex="-1" role="dialog">
-        <div class="modal-dialog" role="document">
-            <div class="modal-content">
-                <div class="modal-header">
-                    <span class="modal-title h5 mb-0">Confirm  {{ $isClaim ? 'Claim' : 'Submission' }}</span>
-                    <button type="button" class="close" data-dismiss="modal">&times;</button>
+        @include('home._submission_form', ['submission' => $submission])
+        <div class="modal fade" id="confirmationModal" tabindex="-1" role="dialog">
+            <div class="modal-dialog" role="document">
+
+                <div class="modal-content hide" id="confirmContent">
+                    <div class="modal-header">
+                        <span class="modal-title h5 mb-0">Confirm {{ $isClaim ? 'Claim' : 'Submission' }}</span>
+                        <button type="button" class="close" data-dismiss="modal">&times;</button>
+                    </div>
+                    <div class="modal-body">
+                        <p>
+                            This will submit the form and put it into the {{ $isClaim ? 'claims' : 'prompt' }} approval queue.
+                            You will not be able to edit the contents after the {{ $isClaim ? 'claim' : 'submission' }} has been made.
+                            If you aren't certain that you are ready, consider saving as a draft instead.
+                            Click the Confirm button to complete the {{ $isClaim ? 'claim' : 'submission' }}.
+                        </p>
+                        <div class="text-right">
+                            <a href="#" id="confirmSubmit" class="btn btn-primary">Confirm</a>
+                        </div>
+                    </div>
                 </div>
-                <div class="modal-body">
-                    <p>This will submit the form and put it into the {{ $isClaim ? 'claims' : 'prompt' }} approval queue. You will not be able to edit the contents after the {{ $isClaim ? 'claim' : 'submission' }} has been made. Click the Confirm button to complete the  {{ $isClaim ? 'claim' : 'submission' }}.</p>
-                    <div class="text-right">
-                        <a href="#" id="formSubmit" class="btn btn-primary">Confirm</a>
+
+                <div class="modal-content hide" id="draftContent">
+                    <div class="modal-header">
+                        <span class="modal-title h5 mb-0">Create Draft</span>
+                        <button type="button" class="close" data-dismiss="modal">&times;</button>
+                    </div>
+                    <div class="modal-body">
+                        <p>
+                            This will place the {{ $submission->prompt_id ? 'submission' : 'claim' }} into your drafts.
+                            Items and other attachments will be held, similar to in design update drafts.
+                        </p>
+                        <div class="text-right">
+                            <a href="#" id="draftSubmit" class="btn btn-success">Save as Draft</a>
+                        </div>
                     </div>
                 </div>
             </div>
         </div>
-    </div>
-@endif
+    @endif
 @endsection
 
 @section('scripts')
-@parent
-@if(!$closed)
-    @if($isClaim)
-        @include('js._loot_js', ['showLootTables' => false, 'showRaffles' => true])
-    @else
-        @include('js._loot_js', ['showLootTables' => false, 'showRaffles' => false])
-    @endif
-    @include('js._character_select_js')
-    @include('widgets._inventory_select_js', ['readOnly' => true])
-    @include('widgets._bank_select_row', ['owners' => [Auth::user()]])
-    @include('widgets._bank_select_js', [])
-
-    <script>
-        $(document).ready(function() {
-            var $submitButton = $('#submitButton');
-            var $confirmationModal = $('#confirmationModal');
-            var $formSubmit = $('#formSubmit');
-            var $submissionForm = $('#submissionForm');
-
-            @if(!$isClaim)
-                var $prompt = $('#prompt');
-                var $rewards = $('#rewards');
-
-                $prompt.selectize();
-                $prompt.on('change', function(e) {
-                    $rewards.load('{{ url('submissions/new/prompt') }}/'+$(this).val());
+    @parent
+    @if (!$closed)
+        @if ($isClaim)
+            @include('js._loot_js', ['showLootTables' => false, 'showRaffles' => true])
+        @else
+            @include('js._loot_js', ['showLootTables' => false, 'showRaffles' => false])
+        @endif
+        @include('js._character_select_js')
+        @include('widgets._inventory_select_js', ['readOnly' => true])
+        @include('widgets._bank_select_row', ['owners' => [Auth::user()]])
+        @include('widgets._bank_select_js', [])
+
+        <script>
+            $(document).ready(function() {
+                var $confirmationModal = $('#confirmationModal');
+                var $submissionForm = $('#submissionForm');
+
+                var $confirmButton = $('#confirmButton');
+                var $confirmContent = $('#confirmContent');
+                var $confirmSubmit = $('#confirmSubmit');
+
+                var $draftButton = $('#draftButton');
+                var $draftContent = $('#draftContent');
+                var $draftSubmit = $('#draftSubmit');
+
+                @if (!$isClaim)
+                    var $prompt = $('#prompt');
+                    var $rewards = $('#rewards');
+
+                    $prompt.selectize();
+                    $prompt.on('change', function(e) {
+                        $rewards.load('{{ url('submissions/new/prompt') }}/' + $(this).val());
+                    });
+                @endif
+
+                $confirmButton.on('click', function(e) {
+                    e.preventDefault();
+                    $confirmContent.removeClass('hide');
+                    $draftContent.addClass('hide');
+                    $confirmationModal.modal('show');
                 });
-            @endif
 
-            $submitButton.on('click', function(e) {
-                e.preventDefault();
-                $confirmationModal.modal('show');
-            });
+                $confirmSubmit.on('click', function(e) {
+                    e.preventDefault();
+                    $submissionForm.attr('action', '{{ url()->current() }}');
+                    $submissionForm.submit();
+                });
 
-            $formSubmit.on('click', function(e) {
-                e.preventDefault();
-                $submissionForm.submit();
+                $draftButton.on('click', function(e) {
+                    e.preventDefault();
+                    $draftContent.removeClass('hide');
+                    $confirmContent.addClass('hide');
+                    $confirmationModal.modal('show');
+                });
+
+                $draftSubmit.on('click', function(e) {
+                    e.preventDefault();
+                    $submissionForm.attr('action', '{{ url()->current() }}/draft');
+                    $submissionForm.submit();
+                });
             });
-        });
-    </script>
-@endif
+        </script>
+    @endif
 @endsection
diff --git a/resources/views/home/edit_submission.blade.php b/resources/views/home/edit_submission.blade.php
new file mode 100644
index 0000000000..39ef458576
--- /dev/null
+++ b/resources/views/home/edit_submission.blade.php
@@ -0,0 +1,177 @@
+@extends('home.layout')
+
+@section('home-title')
+    @if ($isClaim)
+        Claim Draft
+    @else
+        Submission Draft
+    @endif
+@endsection
+
+@section('home-content')
+    @if ($isClaim)
+        {!! breadcrumbs(['Claims' => 'claims', 'Claim Draft' => 'claims/drafts']) !!}
+    @else
+        {!! breadcrumbs(['Prompt Submissions' => 'submissions', 'Submission Draft' => 'submissions/drafts']) !!}
+    @endif
+
+    <h1>
+        @if ($isClaim)
+            Claim Draft
+        @else
+            Submission Draft
+        @endif
+    </h1>
+
+    @if ($closed)
+        <div class="alert alert-danger">
+            The {{ $isClaim ? 'claim' : 'submission' }} queue is currently closed. You cannot edit {{ $isClaim ? 'claim' : 'submission' }} drafts at this time.
+        </div>
+    @else
+        @include('home._submission_form', ['submission' => $submission])
+
+        <div class="modal fade" id="confirmationModal" tabindex="-1" role="dialog">
+            <div class="modal-dialog" role="document">
+
+                <div class="modal-content hide" id="confirmContent">
+                    <div class="modal-header">
+                        <span class="modal-title h5 mb-0">Confirm {{ $isClaim ? 'Claim' : 'Submission' }}</span>
+                        <button type="button" class="close" data-dismiss="modal">&times;</button>
+                    </div>
+                    <div class="modal-body">
+                        <p>
+                            This will submit the form and put it into the {{ $isClaim ? 'claims' : 'prompt' }} approval queue.
+                            You will not be able to edit the contents after the {{ $isClaim ? 'claim' : 'submission' }} has been made.
+                            If you aren't certain that you are ready, consider saving as a draft instead.
+                            Click the Confirm button to complete the {{ $isClaim ? 'claim' : 'submission' }}.
+                        </p>
+                        <div class="text-right">
+                            <a href="#" id="confirmSubmit" class="btn btn-primary">Confirm</a>
+                        </div>
+                    </div>
+                </div>
+
+                <div class="modal-content hide" id="draftContent">
+                    <div class="modal-header">
+                        <span class="modal-title h5 mb-0">Save Draft</span>
+                        <button type="button" class="close" data-dismiss="modal">&times;</button>
+                    </div>
+                    <div class="modal-body">
+                        <p>
+                            This will edit the existing {{ $submission->prompt_id ? 'submission' : 'claim' }} draft.
+                            Items and other attachments will be held, similar to in design update drafts.
+                        </p>
+                        <div class="text-right">
+                            <a href="#" id="draftSubmit" class="btn btn-success">Save Draft</a>
+                        </div>
+                    </div>
+                </div>
+
+                <div class="modal-content hide" id="cancelContent">
+                    <div class="modal-header">
+                        <span class="modal-title h5 mb-0">Delete Draft</span>
+                        <button type="button" class="close" data-dismiss="modal">&times;</button>
+                    </div>
+                    <div class="modal-body">
+                        <p>
+                            This will cancel the {{ $submission->prompt_id ? 'submission' : 'claim' }} draft and return any attachments to your inventories.
+                        </p>
+                        <div class="text-right">
+                            <a href="#" id="cancelSubmit" class="btn btn-danger">Delete Draft</a>
+                        </div>
+                    </div>
+                </div>
+
+            </div>
+        </div>
+    @endif
+@endsection
+
+@section('scripts')
+    @parent
+    @if (!$closed)
+        @if ($isClaim)
+            @include('js._loot_js', ['showLootTables' => false, 'showRaffles' => true])
+        @else
+            @include('js._loot_js', ['showLootTables' => false, 'showRaffles' => false])
+        @endif
+        @include('js._character_select_js')
+        @include('widgets._inventory_select_js', ['readOnly' => true])
+        @include('widgets._bank_select_row', ['owners' => [Auth::user()]])
+        @include('widgets._bank_select_js', [])
+
+        <script>
+            $(document).ready(function() {
+                var $confirmationModal = $('#confirmationModal');
+                var $submissionForm = $('#submissionForm');
+
+                var $confirmButton = $('#confirmButton');
+                var $confirmContent = $('#confirmContent');
+                var $confirmSubmit = $('#confirmSubmit');
+
+                var $draftButton = $('#draftButton');
+                var $draftContent = $('#draftContent');
+                var $draftSubmit = $('#draftSubmit');
+
+                var $cancelButton = $('#cancelButton');
+                var $cancelContent = $('#cancelContent');
+                var $cancelSubmit = $('#cancelSubmit');
+
+
+                @if (!$isClaim)
+                    var $prompt = $('#prompt');
+                    var $rewards = $('#rewards');
+
+                    $prompt.selectize();
+                    $prompt.on('change', function(e) {
+                        $rewards.load('{{ url('submissions/new/prompt') }}/' + $(this).val());
+                    });
+                @endif
+
+                $confirmButton.on('click', function(e) {
+                    e.preventDefault();
+                    $confirmContent.removeClass('hide');
+                    $draftContent.addClass('hide');
+                    $cancelContent.addClass('hide');
+                    $confirmationModal.modal('show');
+                });
+
+                $confirmSubmit.on('click', function(e) {
+                    e.preventDefault();
+                    $submissionForm.attr('action', '{{ url()->current() }}/submit');
+                    $submissionForm.submit();
+                });
+
+                $draftButton.on('click', function(e) {
+                    e.preventDefault();
+                    $draftContent.removeClass('hide');
+                    $confirmContent.addClass('hide');
+                    $cancelContent.addClass('hide');
+                    $confirmationModal.modal('show');
+                });
+
+                $draftSubmit.on('click', function(e) {
+                    e.preventDefault();
+                    $submissionForm.attr('action', '{{ url()->current() }}');
+                    $submissionForm.submit();
+                });
+
+                $cancelButton.on('click', function(e) {
+                    e.preventDefault();
+                    $cancelContent.removeClass('hide');
+                    $confirmContent.addClass('hide');
+                    $draftContent.addClass('hide');
+                    $confirmationModal.modal('show');
+                });
+
+                $cancelSubmit.on('click', function(e) {
+                    e.preventDefault();
+                    $submissionForm.attr('action', '{{ url()->current() }}/delete');
+                    $submissionForm.submit();
+                });
+
+
+            });
+        </script>
+    @endif
+@endsection
diff --git a/resources/views/home/home.blade.php b/resources/views/home/home.blade.php
index e69de29bb2..8b13789179 100644
--- a/resources/views/home/home.blade.php
+++ b/resources/views/home/home.blade.php
@@ -0,0 +1 @@
+
diff --git a/resources/views/home/inventory.blade.php b/resources/views/home/inventory.blade.php
index 20f61b8589..7180d21951 100644
--- a/resources/views/home/inventory.blade.php
+++ b/resources/views/home/inventory.blade.php
@@ -1,60 +1,106 @@
 @extends('home.layout')
 
-@section('home-title') Inventory @endsection
+@section('home-title')
+    Inventory
+@endsection
 
 @section('home-content')
-{!! breadcrumbs(['Inventory' => 'inventory']) !!}
+    {!! breadcrumbs(['Inventory' => 'inventory']) !!}
 
-<h1>
-    Inventory
-    <div class="float-right mb-3">
-        <a class="btn btn-primary" href="{{ url('inventory/account-search') }}"><i class="fas fa-search"></i> Account Search</a>
+    <h1>
+        Inventory
+        <div class="float-right mb-3">
+            <a class="btn btn-secondary consolidate-inventory" href="#">Consolidate</a>
+            <a class="btn btn-primary" href="{{ url('inventory/account-search') }}"><i class="fas fa-search"></i> Account Search</a>
+            <a class="btn btn-primary" href="{{ url('inventory/full-inventory') }}"><i class="fas fa-warehouse"></i> Full Inventory</a>
+        </div>
+    </h1>
+
+    <p>This is your inventory. Click on an item to view more details and actions you can perform on it.</p>
+
+    <div class="text-right mb-3">
+        <div class="btn-group">
+            <button type="button" class="btn btn-secondary active def-view-button" data-toggle="tooltip" title="Default View" alt="Default View"><i class="fas fa-th"></i></button>
+            <button type="button" class="btn btn-secondary sum-view-button" data-toggle="tooltip" title="Summarized View" alt="Summarized View"><i class="fas fa-bars"></i></button>
+        </div>
     </div>
-</h1>
-
-<p>This is your inventory. Click on an item to view more details and actions you can perform on it.</p>
-
-@foreach($items as $categoryId=>$categoryItems)
-    <div class="card mb-3 inventory-category">
-        <h5 class="card-header inventory-header">
-            {!! isset($categories[$categoryId]) ? '<a href="'.$categories[$categoryId]->searchUrl.'">'.$categories[$categoryId]->name.'</a>' : 'Miscellaneous' !!}
-            <a class="small inventory-collapse-toggle collapse-toggle collapsed" href="#{!! isset($categories[$categoryId]) ? str_replace(' ', '', $categories[$categoryId]->name) : 'miscellaneous' !!}" data-toggle="collapse">Show</a></h3>
-        </h5>
-        <div class="card-body inventory-body collapse show" id="{!! isset($categories[$categoryId]) ? str_replace(' ', '', $categories[$categoryId]->name) : 'miscellaneous' !!}">
-            @foreach($categoryItems->chunk(4) as $chunk)
-                <div class="row mb-3">
-                    @foreach($chunk as $itemId=>$stack)
-                        <div class="col-sm-3 col-6 text-center inventory-item" data-id="{{ $stack->first()->pivot->id }}" data-name="{{ $user->name }}'s {{ $stack->first()->name }}">
-                            @if($stack->first()->has_image)
-                                <div class="mb-1">
-                                    <a href="#" class="inventory-stack"><img src="{{ $stack->first()->imageUrl }}" alt="{{ $stack->first()->name }}"/></a>
+
+    <div id="defView" class="hide">
+        @foreach ($items as $categoryId => $categoryItems)
+            <div class="card mb-3 inventory-category">
+                <h5 class="card-header inventory-header">
+                    {!! isset($categories[$categoryId]) ? '<a href="' . $categories[$categoryId]->searchUrl . '">' . $categories[$categoryId]->name . '</a>' : 'Miscellaneous' !!}
+                    <a class="small inventory-collapse-toggle collapse-toggle" href="#categoryId_{!! isset($categories[$categoryId]) ? $categories[$categoryId]->id : 'miscellaneous' !!}" data-toggle="collapse">Show</a>
+                </h5>
+                <div class="card-body inventory-body collapse show" id="categoryId_{!! isset($categories[$categoryId]) ? $categories[$categoryId]->id : 'miscellaneous' !!}">
+                    @foreach ($categoryItems->chunk(4) as $chunk)
+                        <div class="row mb-3">
+                            @foreach ($chunk as $stack)
+                                <div class="col-sm-3 col-6 text-center inventory-item" data-id="{{ $stack->first()->pivot->id }}" data-name="{{ $user->name }}'s {{ $stack->first()->name }}">
+                                    @if ($stack->first()->has_image)
+                                        <div class="mb-1">
+                                            <a href="#" class="inventory-stack">
+                                                <img src="{{ $stack->first()->imageUrl }}" alt="{{ $stack->first()->name }}" />
+                                            </a>
+                                        </div>
+                                    @endif
+                                    <div>
+                                        <a href="#" class="inventory-stack inventory-stack-name">{{ $stack->first()->name }} x{{ $stack->sum('pivot.count') }}</a>
+                                    </div>
                                 </div>
+                            @endforeach
+                        </div>
+                    @endforeach
+                </div>
+            </div>
+        @endforeach
+    </div>
+
+    <div id="sumView" class="hide">
+        @foreach ($items as $categoryId => $categoryItems)
+            <div class="card mb-2">
+                <h5 class="card-header">
+                    {!! isset($categories[$categoryId]) ? '<a href="' . $categories[$categoryId]->searchUrl . '">' . $categories[$categoryId]->name . '</a>' : 'Miscellaneous' !!}
+                    <a class="small inventory-collapse-toggle collapse-toggle" href="#categoryId_{!! isset($categories[$categoryId]) ? $categories[$categoryId]->id : 'miscellaneous' !!}" data-toggle="collapse">Show</a>
+                </h5>
+                <div class="card-body p-2 collapse show row" id="categoryId_{!! isset($categories[$categoryId]) ? $categories[$categoryId]->id : 'miscellaneous' !!}">
+                    @foreach ($categoryItems as $itemtype)
+                        <div class="col-lg-3 col-sm-4 col-12">
+                            @if ($itemtype->first()->has_image)
+                                <img src="{{ $itemtype->first()->imageUrl }}" style="height: 25px;" alt="{{ $itemtype->first()->name }}" />
                             @endif
-                            <div>
-                                <a href="#" class="inventory-stack inventory-stack-name">{{ $stack->first()->name }} x{{ $stack->sum('pivot.count') }}</a>
-                            </div>
+                            <a href="{{ $itemtype->first()->idUrl }}">{{ $itemtype->first()->name }}</a>
+                            <ul class="mb-0" data-id="{{ $itemtype->first()->pivot->id }}" data-name="{{ $user->name }}'s {{ $itemtype->first()->name }}">
+                                @foreach ($itemtype as $item)
+                                    <li>
+                                        <a class="inventory-stack" href="#">Stack of x{{ $item->pivot->count }}</a>.
+                                    </li>
+                                @endforeach
+                            </ul>
                         </div>
                     @endforeach
                 </div>
-            @endforeach
-        </div>
+            </div>
+        @endforeach
     </div>
-@endforeach
-<div class="text-right mb-4">
-    <a href="{{ url(Auth::user()->url.'/item-logs') }}">View logs...</a>
-</div>
 
+    <div class="text-right mb-4">
+        <a href="{{ url(Auth::user()->url . '/item-logs') }}">View logs...</a>
+    </div>
 @endsection
 @section('scripts')
-<script>
-
-$( document ).ready(function() {
-    $('.inventory-stack').on('click', function(e) {
-        e.preventDefault();
-        var $parent = $(this).parent().parent();
-        loadModal("{{ url('items') }}/" + $parent.data('id'), $parent.data('name'));
-    });
-});
-
-</script>
+    @include('widgets._inventory_view_js')
+    <script>
+        $(document).ready(function() {
+            $('.inventory-stack').on('click', function(e) {
+                e.preventDefault();
+                var $parent = $(this).parent().parent();
+                loadModal("{{ url('items') }}/" + $parent.data('id'), $parent.data('name'));
+            });
+            $('.consolidate-inventory').on('click', function(e) {
+                e.preventDefault();
+                loadModal("{{ url('inventory/consolidate-inventory') }}", 'Consolidate Inventory');
+            });
+        });
+    </script>
 @endsection
diff --git a/resources/views/home/inventory_full.blade.php b/resources/views/home/inventory_full.blade.php
new file mode 100644
index 0000000000..fe721ab44a
--- /dev/null
+++ b/resources/views/home/inventory_full.blade.php
@@ -0,0 +1,97 @@
+@extends('home.layout')
+
+@section('home-title')
+    Full Inventory
+@endsection
+
+@section('home-content')
+    {!! breadcrumbs(['Inventory' => 'inventory', 'Full Inventory' => 'inventory-full']) !!}
+
+    <h1>
+        Full Inventory
+    </h1>
+
+    <p>This is your FULL inventory. Click on an item name to view more details on the item, click on the word 'stack' to see the actions you can perform on it.</p>
+
+    @foreach ($items as $categoryId => $categoryItems)
+        <div class="card mb-2">
+            <h5 class="card-header">
+                {!! isset($categories[$categoryId]) ? '<a href="' . $categories[$categoryId]->searchUrl . '">' . $categories[$categoryId]->name . '</a>' : 'Miscellaneous' !!}
+                <a class="small inventory-collapse-toggle collapse-toggle" href="#categoryId_{!! isset($categories[$categoryId]) ? $categories[$categoryId]->id : 'miscellaneous' !!}" data-toggle="collapse">Show</a>
+            </h5>
+            <div class="card-body p-2 collapse show row" id="categoryId_{!! isset($categories[$categoryId]) ? $categories[$categoryId]->id : 'miscellaneous' !!}">
+                @foreach ($categoryItems as $itemtype)
+                    <div class="col-lg-3 col-sm-4 col-12">
+                        @if ($itemtype->first()->has_image)
+                            <img src="{{ $itemtype->first()->imageUrl }}" style="height: 25px;" alt="{{ $itemtype->first()->name }}" />
+                        @endif
+                        <a href="{{ $itemtype->first()->idUrl }}">{{ $itemtype->first()->name }}</a>
+                        <ul class="mb-0">
+                            @foreach ($itemtype as $item)
+                                <li>
+                                    @if (isset($item->pivot->user_id))
+                                        <a class="invuser" data-id="{{ $item->pivot->id }}" data-name="{{ $user->name }}'s {{ $item->name }}" href="#">
+                                            Stack
+                                        </a>
+                                        of x{{ $item->pivot->count }} in
+                                        <a href="/inventory">
+                                            your inventory.
+                                        </a>
+                                    @else
+                                        @foreach ($characters as $char)
+                                            @if ($char->id == $item->pivot->character_id)
+                                                @php
+                                                    $charaname = $char->name ? $char->name : $char->slug;
+                                                    $charalink = $char->url;
+                                                    $charavisi = '';
+                                                    if (!$char->is_visible) {
+                                                        $charavisi = '<i class="fas fa-eye-slash"></i>';
+                                                    }
+                                                @endphp
+                                            @endif
+                                        @endforeach
+                                        <?php
+                                        $canName = $item->category->can_name;
+                                        $itemNames = $item->pivot->pluck('stack_name', 'id');
+                                        $stackName = $itemNames[$item->pivot->id];
+                                        $stackNameClean = htmlentities($stackName);
+                                        ?>
+                                        <a class="invchar" data-id="{{ $item->pivot->id }}" data-name="{!! $canName && $stackName ? htmlentities($stackNameClean) . ' [' : null !!}{{ $charaname }}'s {{ $item->name }}{!! $canName && $stackName ? ']' : null !!}" href="#">
+                                            Stack
+                                        </a>
+                                        of x{{ $item->pivot->count }} in {!! $charavisi !!}
+                                        <a href="{{ $charalink }}">
+                                            {{ $charaname }}
+                                        </a>'s inventory.
+                                        @if ($canName && $stackName)
+                                            <span class="text-info m-0" style="font-size:95%; margin:5px;" data-toggle="tooltip" data-placement="top" title='Named stack:<br />"{{ $stackName }}"'>
+                                                &nbsp;<i class="fas fa-tag"></i>
+                                            </span>
+                                        @endif
+                                    @endif
+                                </li>
+                            @endforeach
+                        </ul>
+                    </div>
+                @endforeach
+            </div>
+        </div>
+    @endforeach
+@endsection
+@section('scripts')
+    <script>
+        $(document).ready(function() {
+            $('.invuser').on('click', function(e) {
+                e.preventDefault();
+                var $parent = $(this);
+                loadModal("{{ url('items') }}/" + $parent.data('id'), $parent.data('name'));
+            });
+
+            $('.invchar').on('click', function(e) {
+                e.preventDefault();
+                var $parent = $(this);
+                loadModal("{{ url('items') }}/character/" + $parent.data('id'), $parent.data('name'));
+            });
+        });
+    </script>
+@endsection
diff --git a/resources/views/home/layout.blade.php b/resources/views/home/layout.blade.php
index 519e65fe38..b8eb77f170 100644
--- a/resources/views/home/layout.blade.php
+++ b/resources/views/home/layout.blade.php
@@ -1,7 +1,7 @@
 @extends('layouts.app')
 
-@section('title') 
-    Home :: 
+@section('title')
+    Home ::
     @yield('home-title')
 @endsection
 
@@ -14,5 +14,5 @@
 @endsection
 
 @section('scripts')
-@parent
-@endsection
\ No newline at end of file
+    @parent
+@endsection
diff --git a/resources/views/home/liked_comments.blade.php b/resources/views/home/liked_comments.blade.php
new file mode 100644
index 0000000000..4b1ea6364d
--- /dev/null
+++ b/resources/views/home/liked_comments.blade.php
@@ -0,0 +1,30 @@
+@extends('home.layout')
+
+@section('home-title')
+    My Liked Comments
+@endsection
+
+@section('home-content')
+    {!! breadcrumbs(['Liked Comments' => 'liked-comments']) !!}
+
+    <h1>
+        My Liked Comments
+    </h1>
+
+    <p>This is a list of comments you've liked or disliked. This list is not public, but users can see on the comment who has liked it.</p>
+    <div class="p-2">
+        {{-- Order user CommentLikes by when the comment was created inside the foreach --}}
+        @php
+            $comments = $user->commentLikes;
+            $comments = $comments->sortByDesc(function ($comment) {
+                return $comment->comment->created_at;
+            });
+        @endphp
+
+        @foreach ($comments as $comment)
+            <div class="card col-12 mb-2">
+                @include('comments._perma_comments', ['comment' => $comment->comment, ($limit = 0), ($depth = 0)])
+            </div>
+        @endforeach
+    </div>
+@endsection
diff --git a/resources/views/home/myos.blade.php b/resources/views/home/myos.blade.php
index 28a64a87d4..28126a76ca 100644
--- a/resources/views/home/myos.blade.php
+++ b/resources/views/home/myos.blade.php
@@ -1,25 +1,27 @@
 @extends('home.layout')
 
-@section('home-title') My MYO Slots @endsection
+@section('home-title')
+    My MYO Slots
+@endsection
 
 @section('home-content')
-{!! breadcrumbs(['Characters' => 'characters', 'My MYO Slots' => 'myos']) !!}
+    {!! breadcrumbs(['Characters' => 'characters', 'My MYO Slots' => 'myos']) !!}
 
-<h1>
-    My MYO Slots
-</h1>
+    <h1>
+        My MYO Slots
+    </h1>
 
-<p>This is a list of MYO slots you own - click on a slot to view details about it. MYO slots can be submitted for design approval from their respective pages.</p>
-<div class="row">
-    @foreach($slots as $slot)
-        <div class="col-md-3 col-6 text-center mb-2">
-            <div>
-                <a href="{{ $slot->url }}"><img src="{{ $slot->image->thumbnailUrl }}" class="img-thumbnail" alt="Thumbnail for {{ $slot->fullName }}" /></a>
-            </div>
-            <div class="mt-1 h5">
-                {!! $slot->displayName !!}
+    <p>This is a list of MYO slots you own - click on a slot to view details about it. MYO slots can be submitted for design approval from their respective pages.</p>
+    <div class="row">
+        @foreach ($slots as $slot)
+            <div class="col-md-3 col-6 text-center mb-2">
+                <div>
+                    <a href="{{ $slot->url }}"><img src="{{ $slot->image->thumbnailUrl }}" class="img-thumbnail" alt="Thumbnail for {{ $slot->fullName }}" /></a>
+                </div>
+                <div class="mt-1 h5">
+                    {!! $slot->displayName !!}
+                </div>
             </div>
-        </div>
-    @endforeach
-</div>
+        @endforeach
+    </div>
 @endsection
diff --git a/resources/views/home/report.blade.php b/resources/views/home/report.blade.php
index 5b0142dc91..0da3117d6f 100644
--- a/resources/views/home/report.blade.php
+++ b/resources/views/home/report.blade.php
@@ -1,14 +1,15 @@
-@extends('user.layout')
+@extends('home.layout')
 
-@section('profile-title') Report (#{{ $report->id }}) @endsection
+@section('home-title')
+    Report (#{{ $report->id }})
+@endsection
 
-@section('profile-content')
-{!! breadcrumbs(['Users' => 'users', $user->name => $user->url, 'Report (#' . $report->id . ')' => $report->viewUrl]) !!}
+@section('home-content')
+    {!! breadcrumbs(['Users' => 'users', $user->name => $user->url, 'Report (#' . $report->id . ')' => $report->viewUrl]) !!}
 
-@if(Auth::user()->id == $report->user->id || Auth::user()->hasPower('manage_reports') || ($report->is_br == 1 && ($report->status == 'Closed' || $report->error_type != 'exploit')))
-    @include('home._report_content', ['report' => $report]) 
-@else
-    <div class="alert alert-danger">Reports are private. Please contact support if you believe this is a mistake.</div>
-@endif
-
-@endsection
\ No newline at end of file
+    @if (Auth::user()->id == $report->user->id || Auth::user()->hasPower('manage_reports') || ($report->is_br == 1 && ($report->status == 'Closed' || $report->error_type != 'exploit')))
+        @include('home._report_content', ['report' => $report])
+    @else
+        <div class="alert alert-danger">Reports are private. Please contact support if you believe this is a mistake.</div>
+    @endif
+@endsection
diff --git a/resources/views/home/reports.blade.php b/resources/views/home/reports.blade.php
index 15749d2484..ea2e807339 100644
--- a/resources/views/home/reports.blade.php
+++ b/resources/views/home/reports.blade.php
@@ -1,45 +1,59 @@
 @extends('home.layout')
 
-@section('home-title') Reports @endsection
+@section('home-title')
+    Reports
+@endsection
 
 @section('home-content')
     {!! breadcrumbs(['Reports' => 'reports']) !!}
-<h1>
-My Reports
-</h1>
+    <h1>
+        My Reports
+    </h1>
 
-<div class="text-right">
+    <div class="text-right">
         <a href="{{ url('reports/new') }}" class="btn btn-success">New Report</a>
-</div>
+    </div>
 
-<ul class="nav nav-tabs mb-3">
-    <li class="nav-item">
-        <a class="nav-link {{ !Request::get('type') || Request::get('type') == 'pending' ? 'active' : '' }}" href="{{ url('reports') }}">Pending</a>
-    </li>
-    <li class="nav-item">
-        <a class="nav-link {{ Request::get('type') == 'approved'  }}" href="{{ url('reports') . '?type=assigned' }}">Assigned</a>
-    </li>
-    <li class="nav-item">
-        <a class="nav-link {{ Request::get('type') == 'closed'  }}" href="{{ url('reports') . '?type=closed' }}">Closed</a>
-    </li>
-</ul>
+    <ul class="nav nav-tabs mb-3">
+        <li class="nav-item">
+            <a class="nav-link {{ !Request::get('type') || Request::get('type') == 'pending' ? 'active' : '' }}" href="{{ url('reports') }}">Pending</a>
+        </li>
+        <li class="nav-item">
+            <a class="nav-link {{ Request::get('type') == 'approved' }}" href="{{ url('reports') . '?type=assigned' }}">Assigned</a>
+        </li>
+        <li class="nav-item">
+            <a class="nav-link {{ Request::get('type') == 'closed' }}" href="{{ url('reports') . '?type=closed' }}">Closed</a>
+        </li>
+    </ul>
 
-@if(count($reports))
-    {!! $reports->render() !!}
-    <div class="row ml-md-2">
-      <div class="d-flex row flex-wrap col-12 mt-1 pt-1 px-0 ubt-bottom">
-        <div class="col-6 col-md-4 font-weight-bold">Link/Title</div>
-        <div class="col-6 col-md-5 font-weight-bold">Submitted</div>
-        <div class="col-12 col-md-1 font-weight-bold">Status</div>
-      </div>
-            @foreach($reports as $report)
-                @include('home._report', ['report' => $report])
-            @endforeach
-      </div>
-    {!! $reports->render() !!}
-    <div class="text-center mt-4 small text-muted">{{ $reports->total() }} result{{ $reports->total() == 1 ? '' : 's' }} found.</div>
-@else 
-    <p>No reports found.</p>
-@endif
+    @if (count($reports))
+        {!! $reports->render() !!}
+        <div class="mb-4 logs-table">
+            <div class="logs-table-header">
+                <div class="row">
+                    <div class="col-6 col-md-4">
+                        <div class="logs-table-cell">Link/Title</div>
+                    </div>
+                    <div class="col-6 col-md-5">
+                        <div class="logs-table-cell">Submitted</div>
+                    </div>
+                    <div class="col-12 col-md-1">
+                        <div class="logs-table-cell">Status</div>
+                    </div>
+                </div>
+            </div>
+            <div class="logs-table-body">
+                @foreach ($reports as $report)
+                    <div class="logs-table-row">
+                        @include('home._report', ['report' => $report])
+                    </div>
+                @endforeach
+            </div>
+        </div>
+        {!! $reports->render() !!}
+        <div class="text-center mt-4 small text-muted">{{ $reports->total() }} result{{ $reports->total() == 1 ? '' : 's' }} found.</div>
+    @else
+        <p>No reports found.</p>
+    @endif
 
 @endsection
diff --git a/resources/views/home/submission.blade.php b/resources/views/home/submission.blade.php
index 5a76565189..6b9b4b615c 100644
--- a/resources/views/home/submission.blade.php
+++ b/resources/views/home/submission.blade.php
@@ -1,10 +1,65 @@
-@extends('user.layout')
+@extends('home.layout')
 
-@section('profile-title') {{ $submission->prompt_id ? 'Submission' : 'Claim' }} (#{{ $submission->id }}) @endsection
+@section('home-title')
+    {{ $submission->prompt_id ? 'Submission' : 'Claim' }} (#{{ $submission->id }})
+@endsection
+
+@section('home-content')
+    {!! breadcrumbs(['Users' => 'users', $user->name => $user->url, $submission->prompt_id ? 'Submission' : 'Claim (#' . $submission->id . ')' => $submission->viewUrl]) !!}
+
+    @include('home._submission_content', ['submission' => $submission, 'isClaim' => $isClaim])
+
+    @auth
+        @if ($submission->user_id == Auth::user()->id && $submission->status == 'Pending')
+            {!! Form::open(['url' => url()->current(), 'id' => 'submissionForm']) !!}
+            <div class="text-right">
+                <a href="#" class="btn btn-danger mr-2" id="cancellationButton">Cancel {{ $submission->prompt_id ? 'submission' : 'claim' }}</a>
+            </div>
+            <div class="modal fade" id="confirmationModal" tabindex="-1" role="dialog">
+                <div class="modal-dialog" role="document">
+                    <div class="modal-content hide" id="cancellationContent">
+                        <div class="modal-header">
+                            <span class="modal-title h5 mb-0">Confirm Cancellation</span>
+                            <button type="button" class="close" data-dismiss="modal">&times;</button>
+                        </div>
+                        <div class="modal-body">
+                            <p>
+                                Make a mistake?
+                                This will cancel this {{ $submission->prompt_id ? 'submission' : 'claim' }} and return it to your drafts.
+                            </p>
+                            <div class="text-right">
+                                <a href="#" id="cancellationSubmit" class="btn btn-danger">Cancel</a>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+
+            {!! Form::close() !!}
+        @endif
+    @endauth
+@endsection
+@section('scripts')
+    <script>
+        $(document).ready(function() {
+            var $confirmationModal = $('#confirmationModal');
+            var $submissionForm = $('#submissionForm');
 
-@section('profile-content')
-{!! breadcrumbs(['Users' => 'users', $user->name => $user->url, $submission->prompt_id ? 'Submission' : 'Claim (#' . $submission->id . ')' => $submission->viewUrl]) !!}
+            var $cancellationButton = $('#cancellationButton');
+            var $cancellationContent = $('#cancellationContent');
+            var $cancellationSubmit = $('#cancellationSubmit');
 
-@include('home._submission_content', ['submission' => $submission])
+            $cancellationButton.on('click', function(e) {
+                e.preventDefault();
+                $cancellationContent.removeClass('hide');
+                $confirmationModal.modal('show');
+            });
 
+            $cancellationSubmit.on('click', function(e) {
+                e.preventDefault();
+                $submissionForm.attr('action', '{{ url('/' . ($submission->prompt_id ? 'submissions' : 'claims') . '/draft/' . $submission->id) }}/cancel');
+                $submissionForm.submit();
+            });
+        });
+    </script>
 @endsection
diff --git a/resources/views/home/submissions.blade.php b/resources/views/home/submissions.blade.php
index e107e187ec..5270a4bfa5 100644
--- a/resources/views/home/submissions.blade.php
+++ b/resources/views/home/submissions.blade.php
@@ -1,70 +1,98 @@
 @extends('home.layout')
 
-@section('home-title') {{ $isClaims ? 'Claims' : 'Prompt Submissions' }} @endsection
-
-@section('home-content')
-@if($isClaims)
-    {!! breadcrumbs(['Claims' => 'claims']) !!}
-@else
-    {!! breadcrumbs(['Prompt Submissions' => 'submissions']) !!}
-@endif
-
-<h1>
+@section('home-title')
     {{ $isClaims ? 'Claims' : 'Prompt Submissions' }}
-</h1>
+@endsection
 
-<div class="text-right">
-    @if(!$isClaims)
-        <a href="{{ url('submissions/new') }}" class="btn btn-success">New Submission</a>
+@section('home-content')
+    @if ($isClaims)
+        {!! breadcrumbs(['Claims' => 'claims']) !!}
     @else
-        <a href="{{ url('claims/new') }}" class="btn btn-success">New Claim</a>
+        {!! breadcrumbs(['Prompt Submissions' => 'submissions']) !!}
     @endif
-</div>
 
-<ul class="nav nav-tabs mb-3">
-    <li class="nav-item">
-        <a class="nav-link {{ !Request::get('type') || Request::get('type') == 'pending' ? 'active' : '' }}" href="{{ url($isClaims ? 'claims' : 'submissions') }}">Pending</a>
-    </li>
-    <li class="nav-item">
-        <a class="nav-link {{ Request::get('type') == 'approved' ? 'active' : '' }}" href="{{ url($isClaims ? 'claims' : 'submissions') . '?type=approved' }}">Approved</a>
-    </li>
-    <li class="nav-item">
-        <a class="nav-link {{ Request::get('type') == 'rejected' ? 'active' : '' }}" href="{{ url($isClaims ? 'claims' : 'submissions') . '?type=rejected' }}">Rejected</a>
-    </li>
-</ul>
+    <h1>
+        {{ $isClaims ? 'Claims' : 'Prompt Submissions' }}
+    </h1>
 
-@if(count($submissions))
-    {!! $submissions->render() !!}
-    <div class="row ml-md-2">
-      <div class="d-flex row flex-wrap col-12 mt-1 pt-1 px-0 ubt-bottom">
-        @if(!$isClaims)
-          <div class="col-12 col-md-2 font-weight-bold">Prompt</div>
+    <div class="text-right">
+        @if (!$isClaims)
+            <a href="{{ url('submissions/new') }}" class="btn btn-success">New Submission</a>
+        @else
+            <a href="{{ url('claims/new') }}" class="btn btn-success">New Claim</a>
         @endif
-        <div class="col-6 {{ !$isClaims ? 'col-md-3' : 'col-md-4' }} font-weight-bold">Link</div>
-        <div class="col-6 {{ !$isClaims ? 'col-md-5' : 'col-md-6' }} font-weight-bold">Submitted</div>
-        <div class="col-12 col-md-1 font-weight-bold">Status</div>
-      </div>
+    </div>
+
+    <ul class="nav nav-tabs mb-3">
+        <li class="nav-item">
+            <a class="nav-link {{ Request::get('type') == 'draft' ? 'active' : '' }}" href="{{ url($isClaims ? 'claims' : 'submissions') . '?type=draft' }}">Drafts</a>
+        </li>
+        <li class="nav-item">
+            <a class="nav-link {{ !Request::get('type') || Request::get('type') == 'pending' ? 'active' : '' }}" href="{{ url($isClaims ? 'claims' : 'submissions') }}">Pending</a>
+        </li>
+        <li class="nav-item">
+            <a class="nav-link {{ Request::get('type') == 'approved' ? 'active' : '' }}" href="{{ url($isClaims ? 'claims' : 'submissions') . '?type=approved' }}">Approved</a>
+        </li>
+        <li class="nav-item">
+            <a class="nav-link {{ Request::get('type') == 'rejected' ? 'active' : '' }}" href="{{ url($isClaims ? 'claims' : 'submissions') . '?type=rejected' }}">Rejected</a>
+        </li>
+    </ul>
 
-      @foreach($submissions as $submission)
-        <div class="d-flex row flex-wrap col-12 mt-1 pt-1 px-0 ubt-top">
-          @if(!$isClaims)
-            <div class="col-12 col-md-2">{!! $submission->prompt->displayName !!}</div>
-          @endif
-          <div class="col-6 {{ !$isClaims ? 'col-md-3' : 'col-md-4' }}">
-            <span class="ubt-texthide"><a href="{{ $submission->url }}">{{ $submission->url }}</a></span>
-          </div>
-          <div class="col-6 {{ !$isClaims ? 'col-md-5' : 'col-md-6' }}">{!! pretty_date($submission->created_at) !!}</div>
-          <div class="col-6 col-md-1 text-right">
-            <span class="btn btn-{{ $submission->status == 'Pending' ? 'secondary' : ($submission->status == 'Approved' ? 'success' : 'danger') }} btn-sm py-0 px-1">{{ $submission->status }}</span>
-          </div>
-          <div class="col-6 col-md-1"><a href="{{ $submission->viewUrl }}" class="btn btn-primary btn-sm py-0 px-1">Details</a></div>
+    @if (count($submissions))
+        {!! $submissions->render() !!}
+        <div class="mb-4 logs-table">
+            <div class="logs-table-header">
+                <div class="row">
+                    @if (!$isClaims)
+                        <div class="col-12 col-md-2 font-weight-bold">
+                            <div class="logs-table-cell">Prompt</div>
+                        </div>
+                    @endif
+                    <div class="col-6 {{ !$isClaims ? 'col-md-3' : 'col-md-4' }} font-weight-bold">
+                        <div class="logs-table-cell">Link</div>
+                    </div>
+                    <div class="col-6 {{ !$isClaims ? 'col-md-5' : 'col-md-6' }} font-weight-bold">
+                        <div class="logs-table-cell">Last Action</div>
+                    </div>
+                    <div class="col-12 col-md-1 font-weight-bold">
+                        <div class="logs-table-cell">Status</div>
+                    </div>
+                </div>
+            </div>
+            <div class="logs-table-body">
+                @foreach ($submissions as $submission)
+                    <div class="logs-table-row">
+                        <div class="row flex-wrap">
+                            @if (!$isClaims)
+                                <div class="col-12 col-md-2">
+                                    <div class="logs-table-cell">{!! $submission->prompt->displayName !!}</div>
+                                </div>
+                            @endif
+                            <div class="col-6 {{ !$isClaims ? 'col-md-3' : 'col-md-4' }}">
+                                <div class="logs-table-cell">
+                                    <span class="ubt-texthide"><a href="{{ $submission->url }}">{{ $submission->url }}</a></span>
+                                </div>
+                            </div>
+                            <div class="col-6 {{ !$isClaims ? 'col-md-5' : 'col-md-6' }}">
+                                <div class="logs-table-cell">{!! pretty_date($submission->updated_at) !!}</div>
+                            </div>
+                            <div class="col-6 col-md-1 text-right">
+                                <div class="logs-table-cell">
+                                    <span class="btn btn-{{ $submission->status == 'Pending' ? 'secondary' : ($submission->status == 'Approved' ? 'success' : 'danger') }} btn-sm py-0 px-1">{{ $submission->status }}</span>
+                                </div>
+                            </div>
+                            <div class="col-6 col-md-1">
+                                <div class="logs-table-cell"><a href="{{ $submission->viewUrl }}" class="btn btn-primary btn-sm py-0 px-1">Details</a></div>
+                            </div>
+                        </div>
+                    </div>
+                @endforeach
+            </div>
         </div>
-      @endforeach
-      </div>
-    {!! $submissions->render() !!}
-    <div class="text-center mt-4 small text-muted">{{ $submissions->total() }} result{{ $submissions->total() == 1 ? '' : 's' }} found.</div>
-@else
-    <p>No {{ $isClaims ? 'claims' : 'submissions' }} found.</p>
-@endif
+        {!! $submissions->render() !!}
+        <div class="text-center mt-4 small text-muted">{{ $submissions->total() }} result{{ $submissions->total() == 1 ? '' : 's' }} found.</div>
+    @else
+        <p>No {{ $isClaims ? 'claims' : 'submissions' }} found.</p>
+    @endif
 
 @endsection
diff --git a/resources/views/home/submissions_closed.blade.php b/resources/views/home/submissions_closed.blade.php
index dfe7c200b7..a792226a20 100644
--- a/resources/views/home/submissions_closed.blade.php
+++ b/resources/views/home/submissions_closed.blade.php
@@ -1,35 +1,37 @@
 @extends('home.layout')
 
-@section('home-title') New Submission @endsection
+@section('home-title')
+    New Submission
+@endsection
 
 @section('home-content')
-@if($isClaim)
-    {!! breadcrumbs(['Claims' => 'claims', 'New Claim' => 'claims/new']) !!}
-@else
-    {!! breadcrumbs(['Prompt Submissions' => 'submissions', 'New Submission' => 'submissions/new']) !!}
-@endif
-
-<h1>
-    @if($isClaim)
-        Claims Closed
+    @if ($isClaim)
+        {!! breadcrumbs(['Claims' => 'claims', 'New Claim' => 'claims/new']) !!}
     @else
         {!! breadcrumbs(['Prompt Submissions' => 'submissions', 'New Submission' => 'submissions/new']) !!}
     @endif
-</h1>
 
-{!! Form::open(['url' => $isClaim ? 'claims/new' : 'submissions/new', 'id' => 'submissionForm']) !!}
-    @if(!$isClaim)
+    <h1>
+        @if ($isClaim)
+            Claims Closed
+        @else
+            {!! breadcrumbs(['Prompt Submissions' => 'submissions', 'New Submission' => 'submissions/new']) !!}
+        @endif
+    </h1>
+
+    {!! Form::open(['url' => $isClaim ? 'claims/new' : 'submissions/new', 'id' => 'submissionForm']) !!}
+    @if (!$isClaim)
         <div class="form-group">
             {!! Form::label('prompt_id', 'Prompt') !!}
             {!! Form::select('prompt_id', $prompts, null, ['class' => 'form-control selectize', 'id' => 'prompt', 'placeholder' => '']) !!}
         </div>
     @endif
     <div class="form-group">
-        {!! Form::label('url', $isClaim ? 'URL' : 'Submission URL') !!} 
-        @if($isClaim) 
-            {!! add_help('Enter a URL relevant to your claim (for example, a comment proving you may make this claim). This field cannot be left blank.') !!} 
-        @else 
-            {!! add_help('Enter the URL of your submission (whether uploaded to dA or some other hosting service). This field cannot be left blank.') !!} 
+        {!! Form::label('url', $isClaim ? 'URL' : 'Submission URL') !!}
+        @if ($isClaim)
+            {!! add_help('Enter a URL relevant to your claim (for example, a comment proving you may make this claim). This field cannot be left blank.') !!}
+        @else
+            {!! add_help('Enter the URL of your submission (whether uploaded to dA or some other hosting service). This field cannot be left blank.') !!}
         @endif
         {!! Form::text('url', null, ['class' => 'form-control', 'required']) !!}
     </div>
@@ -39,18 +41,18 @@
     </div>
 
     <h2>Rewards</h2>
-    @if($isClaim)
+    @if ($isClaim)
         <p>Select the rewards you would like to claim.</p>
-    @else 
+    @else
         <p>Note that any rewards added here are <u>in addition</u> to the default prompt rewards. If you do not require any additional rewards, you can leave this blank.</p>
     @endif
     @include('widgets._loot_select', ['loots' => null, 'showLootTables' => false])
-    @if(!$isClaim)
+    @if (!$isClaim)
         <div id="rewards" class="mb-3"></div>
     @endif
 
     <h2>Characters</h2>
-    @if($isClaim)
+    @if ($isClaim)
         <p>If there are character-specific rewards you would like to claim, attach them here. Otherwise, this section can be left blank.</p>
     @endif
     <div id="characters" class="mb-3">
@@ -62,27 +64,29 @@
     <div class="text-right">
         <a href="#" class="btn btn-primary" id="submitButton">Submit</a>
     </div>
-{!! Form::close() !!}
+    {!! Form::close() !!}
 
-@include('widgets._character_select', ['characterCurrencies' => $characterCurrencies])
-@include('widgets._loot_select_row', ['items' => $items, 'currencies' => $currencies, 'showLootTables' => false])
+    @include('widgets._character_select', [
+        'characterCurrencies' => \App\Models\Currency\Currency::where('is_character_owned', 1)->orderBy('sort_character', 'DESC')->pluck('name', 'id'),
+    ])
+    @include('widgets._loot_select_row', ['showLootTables' => false])
 
 
-<div class="modal fade" id="confirmationModal" tabindex="-1" role="dialog">
-    <div class="modal-dialog" role="document">
-        <div class="modal-content">
-            <div class="modal-header">
-                <span class="modal-title h5 mb-0">Confirm  {{ $isClaim ? 'Claim' : 'Submission' }}</span>
-                <button type="button" class="close" data-dismiss="modal">&times;</button>
-            </div>
-            <div class="modal-body">
-                <p>This will submit the form and put it into the {{ $isClaim ? 'claims' : 'prompt' }} approval queue. You will not be able to edit the contents after the  {{ $isClaim ? 'claim' : 'submission' }} has been made. Click the Confirm button to complete the  {{ $isClaim ? 'claim' : 'submission' }}.</p>
-                <div class="text-right">
-                    <a href="#" id="formSubmit" class="btn btn-primary">Confirm</a>
+    <div class="modal fade" id="confirmationModal" tabindex="-1" role="dialog">
+        <div class="modal-dialog" role="document">
+            <div class="modal-content">
+                <div class="modal-header">
+                    <span class="modal-title h5 mb-0">Confirm {{ $isClaim ? 'Claim' : 'Submission' }}</span>
+                    <button type="button" class="close" data-dismiss="modal">&times;</button>
+                </div>
+                <div class="modal-body">
+                    <p>This will submit the form and put it into the {{ $isClaim ? 'claims' : 'prompt' }} approval queue. You will not be able to edit the contents after the {{ $isClaim ? 'claim' : 'submission' }} has been made. Click the Confirm
+                        button to complete the {{ $isClaim ? 'claim' : 'submission' }}.</p>
+                    <div class="text-right">
+                        <a href="#" id="formSubmit" class="btn btn-primary">Confirm</a>
+                    </div>
                 </div>
             </div>
         </div>
     </div>
-</div>
-
-@endsection
\ No newline at end of file
+@endsection
diff --git a/resources/views/home/trades/_cancel_trade_modal.blade.php b/resources/views/home/trades/_cancel_trade_modal.blade.php
index a546e684ca..7f696eabf6 100644
--- a/resources/views/home/trades/_cancel_trade_modal.blade.php
+++ b/resources/views/home/trades/_cancel_trade_modal.blade.php
@@ -1,10 +1,10 @@
-@if($trade && $trade->status == 'Open')
+@if ($trade && $trade->status == 'Open')
     <p>This will cancel the entire trade and return all attachments to their owners. Are you sure you want to do this?</p>
-    {!! Form::open(['url' => 'trades/'.$trade->id.'/cancel-trade']) !!}
-        <div class="text-right">
-            {!! Form::submit('Cancel', ['class' => 'btn btn-danger']) !!}
-        </div>
+    {!! Form::open(['url' => 'trades/' . $trade->id . '/cancel-trade']) !!}
+    <div class="text-right">
+        {!! Form::submit('Cancel', ['class' => 'btn btn-danger']) !!}
+    </div>
     {!! Form::close() !!}
 @else
     <p>Invalid trade selected.</p>
-@endif
\ No newline at end of file
+@endif
diff --git a/resources/views/home/trades/_confirm_offer_modal.blade.php b/resources/views/home/trades/_confirm_offer_modal.blade.php
index 567d9bbc6c..39bf03abd9 100644
--- a/resources/views/home/trades/_confirm_offer_modal.blade.php
+++ b/resources/views/home/trades/_confirm_offer_modal.blade.php
@@ -1,34 +1,42 @@
-@if($trade)
-    @if($trade->sender_id == Auth::user()->id)
-        @if(!$trade->is_sender_confirmed)
+@if ($trade)
+    @if ($trade->sender_id == Auth::user()->id)
+        @if (!$trade->is_sender_confirmed)
             <p>
-                This will confirm your offer. @if(!$trade->is_recipient_confirmed) After your trade partner has confirmed their offer, you will be able to confirm the entire trade. @endif
+                This will confirm your offer. @if (!$trade->is_recipient_confirmed)
+                    After your trade partner has confirmed their offer, you will be able to confirm the entire trade.
+                @endif
             </p>
-        @else 
+        @else
             <p>
-                This will retract your offer confirmation, allowing you to edit the contents of your trade. @if($trade->is_sender_trade_confirmed || $trade->is_recipient_trade_confirmed) The trade will need to be confirmed again on both sides after you have reconfirmed your offer. @endif
+                This will retract your offer confirmation, allowing you to edit the contents of your trade. @if ($trade->is_sender_trade_confirmed || $trade->is_recipient_trade_confirmed)
+                    The trade will need to be confirmed again on both sides after you have reconfirmed your offer.
+                @endif
             </p>
         @endif
-        {!! Form::open(['url' => 'trades/'.$trade->id.'/confirm-offer']) !!}
-            <div class="text-right">
-                {!! Form::submit($trade->is_sender_confirmed ? 'Unconfirm' : 'Confirm', ['class' => 'btn btn-'.($trade->is_sender_confirmed ? 'danger' : 'primary')]) !!}
-            </div>
+        {!! Form::open(['url' => 'trades/' . $trade->id . '/confirm-offer']) !!}
+        <div class="text-right">
+            {!! Form::submit($trade->is_sender_confirmed ? 'Unconfirm' : 'Confirm', ['class' => 'btn btn-' . ($trade->is_sender_confirmed ? 'danger' : 'primary')]) !!}
+        </div>
         {!! Form::close() !!}
-    @else 
-        @if(!$trade->is_recipient_confirmed)
+    @else
+        @if (!$trade->is_recipient_confirmed)
             <p>
-                This will confirm your offer. @if(!$trade->is_sender_confirmed) After your trade partner has confirmed their offer, you will be able to confirm the entire trade. @endif
+                This will confirm your offer. @if (!$trade->is_sender_confirmed)
+                    After your trade partner has confirmed their offer, you will be able to confirm the entire trade.
+                @endif
             </p>
-        @else 
+        @else
             <p>
-                This will retract your offer confirmation, allowing you to edit the contents of your trade. @if($trade->is_recipient_trade_confirmed || $trade->is_sender_trade_confirmed) The trade will need to be confirmed again on both sides after you have reconfirmed your offer. @endif
+                This will retract your offer confirmation, allowing you to edit the contents of your trade. @if ($trade->is_recipient_trade_confirmed || $trade->is_sender_trade_confirmed)
+                    The trade will need to be confirmed again on both sides after you have reconfirmed your offer.
+                @endif
             </p>
         @endif
-        {!! Form::open(['url' => 'trades/'.$trade->id.'/confirm-offer']) !!}
-            <div class="text-right">
-                {!! Form::submit($trade->is_recipient_confirmed ? 'Unconfirm' : 'Confirm', ['class' => 'btn btn-'.($trade->is_recipient_confirmed ? 'danger' : 'primary')]) !!}
-            </div>
+        {!! Form::open(['url' => 'trades/' . $trade->id . '/confirm-offer']) !!}
+        <div class="text-right">
+            {!! Form::submit($trade->is_recipient_confirmed ? 'Unconfirm' : 'Confirm', ['class' => 'btn btn-' . ($trade->is_recipient_confirmed ? 'danger' : 'primary')]) !!}
+        </div>
         {!! Form::close() !!}
     @endif
 @else
-@endif
\ No newline at end of file
+@endif
diff --git a/resources/views/home/trades/_confirm_trade_modal.blade.php b/resources/views/home/trades/_confirm_trade_modal.blade.php
index eea808d87d..bd9eb8d030 100644
--- a/resources/views/home/trades/_confirm_trade_modal.blade.php
+++ b/resources/views/home/trades/_confirm_trade_modal.blade.php
@@ -1,34 +1,46 @@
-@if($trade)
-    @if($trade->sender_id == Auth::user()->id)
-        @if(!$trade->is_sender_trade_confirmed)
+@if ($trade)
+    @if ($trade->sender_id == Auth::user()->id)
+        @if (!$trade->is_sender_trade_confirmed)
             <p>
-                This will confirm your agreement to this trade. @if(!$trade->is_recipient_trade_confirmed) After your trade partner has also confirmed the trade, you will not be able to further edit the contents of this trade. @else You will not be able to further edit the contents of this trade. @endif
+                This will confirm your agreement to this trade. @if (!$trade->is_recipient_trade_confirmed)
+                    After your trade partner has also confirmed the trade, you will not be able to further edit the contents of this trade.
+                @else
+                    You will not be able to further edit the contents of this trade.
+                @endif
             </p>
-            {!! Form::open(['url' => 'trades/'.$trade->id.'/confirm-trade']) !!}
-                <div class="text-right">
-                    {!! Form::submit('Confirm', ['class' => 'btn btn-primary']) !!}
-                </div>
+            {!! Form::open(['url' => 'trades/' . $trade->id . '/confirm-trade']) !!}
+            <div class="text-right">
+                {!! Form::submit('Confirm', ['class' => 'btn btn-primary']) !!}
+            </div>
             {!! Form::close() !!}
-        @else 
+        @else
             <p>
-                You have already confirmed your agreement to this trade. @if(!$trade->is_recipient_trade_confirmed) Please wait for {!! $trade->recipient->displayName !!} to confirm the trade. @endif
+                You have already confirmed your agreement to this trade. @if (!$trade->is_recipient_trade_confirmed)
+                    Please wait for {!! $trade->recipient->displayName !!} to confirm the trade.
+                @endif
             </p>
         @endif
-    @else 
-        @if(!$trade->is_recipient_trade_confirmed)
+    @else
+        @if (!$trade->is_recipient_trade_confirmed)
             <p>
-                This will confirm your agreement to this trade. @if(!$trade->is_recipient_trade_confirmed) After your trade partner has also confirmed the trade, you will not be able to further edit the contents of this trade. @else You will not be able to further edit the contents of this trade. @endif
+                This will confirm your agreement to this trade. @if (!$trade->is_recipient_trade_confirmed)
+                    After your trade partner has also confirmed the trade, you will not be able to further edit the contents of this trade.
+                @else
+                    You will not be able to further edit the contents of this trade.
+                @endif
             </p>
-            {!! Form::open(['url' => 'trades/'.$trade->id.'/confirm-trade']) !!}
-                <div class="text-right">
-                    {!! Form::submit('Confirm', ['class' => 'btn btn-primary']) !!}
-                </div>
+            {!! Form::open(['url' => 'trades/' . $trade->id . '/confirm-trade']) !!}
+            <div class="text-right">
+                {!! Form::submit('Confirm', ['class' => 'btn btn-primary']) !!}
+            </div>
             {!! Form::close() !!}
-        @else 
+        @else
             <p>
-                You have already confirmed your agreement to this trade. @if(!$trade->is_sender_trade_confirmed) Please wait for {!! $trade->sender->displayName !!} to confirm the trade. @endif
+                You have already confirmed your agreement to this trade. @if (!$trade->is_sender_trade_confirmed)
+                    Please wait for {!! $trade->sender->displayName !!} to confirm the trade.
+                @endif
             </p>
         @endif
     @endif
 @else
-@endif
\ No newline at end of file
+@endif
diff --git a/resources/views/home/trades/_offer.blade.php b/resources/views/home/trades/_offer.blade.php
index e292c5388b..ca74422d01 100644
--- a/resources/views/home/trades/_offer.blade.php
+++ b/resources/views/home/trades/_offer.blade.php
@@ -1,17 +1,17 @@
-
 <h2>
     {!! $user->displayName !!}'s Offer
     <span class="float-right">
-        @if(Auth::user()->id == $user->id && $trade->status == 'Open')
-            @if($trade->{'is_'.$type.'_confirmed'})
-                <a href="#" class="btn btn-sm btn-outline-danger" id="confirmOfferButton" data-toggle="tooltip" title="This will unconfirm your offer and allow you to edit it. You will need to reconfirm your offer after you have edited it to proceed.">Unconfirm</a>
+        @if (Auth::user()->id == $user->id && $trade->status == 'Open')
+            @if ($trade->{'is_' . $type . '_confirmed'})
+                <a href="#" class="btn btn-sm btn-outline-danger" id="confirmOfferButton" data-toggle="tooltip"
+                    title="This will unconfirm your offer and allow you to edit it. You will need to reconfirm your offer after you have edited it to proceed.">Unconfirm</a>
             @else
-                <a href="{{ url('trades/'.$trade->id.'/edit') }}" class="btn btn-sm btn-primary">Edit</a> <a href="#" class="btn btn-sm btn-outline-primary" id="confirmOfferButton">Confirm</a>
+                <a href="{{ url('trades/' . $trade->id . '/edit') }}" class="btn btn-sm btn-primary">Edit</a> <a href="#" class="btn btn-sm btn-outline-primary" id="confirmOfferButton">Confirm</a>
             @endif
         @else
-            @if($trade->{'is_'.$type.'_confirmed'})
-                @if($trade->{'is_'.$type.'_trade_confirmed'})
-                    <small class="text-success">{!! add_help($user->name.' has reviewed your offer and confirmed the trade.') !!} Trade Confirmed</small>
+            @if ($trade->{'is_' . $type . '_confirmed'})
+                @if ($trade->{'is_' . $type . '_trade_confirmed'})
+                    <small class="text-success">{!! add_help($user->name . ' has reviewed your offer and confirmed the trade.') !!} Trade Confirmed</small>
                 @else
                     <small class="text-primary">{!! add_help('This offer has been confirmed.') !!} Offer Confirmed</small>
                 @endif
@@ -22,15 +22,14 @@
     </span>
 </h2>
 <div class="card mb-3 trade-offer
-        @if($trade->{'is_'.$type.'_confirmed'})
-            @if($trade->{'is_'.$type.'_trade_confirmed'})
+        @if ($trade->{'is_' . $type . '_confirmed'}) @if ($trade->{'is_' . $type . '_trade_confirmed'})
                 border-success
             @else
-                border-primary
-            @endif
+                border-primary @endif
         @endif
-">  @if($data)
-        @if($data['user_items'])
+">
+    @if ($data)
+        @if ($data['user_items'])
             <div class="card-header">
                 Items
             </div>
@@ -45,9 +44,12 @@
                         </tr>
                     </thead>
                     <tbody>
-                        @foreach($data['user_items'] as $itemRow)
+                        @foreach ($data['user_items'] as $itemRow)
                             <tr class="d-flex">
-                                <td class="col-2">@if(isset($items[$itemRow['asset']->item_id]->image_url)) <img class="small-icon" src="{{ $items[$itemRow['asset']->item_id]->image_url }}" alt="{{ $items[$itemRow['asset']->item_id]->name }}" > @endif {!! $items[$itemRow['asset']->item_id]->name !!}
+                                <td class="col-2">
+                                    @if (isset($items[$itemRow['asset']->item_id]->image_url))
+                                        <img class="small-icon" src="{{ $items[$itemRow['asset']->item_id]->image_url }}" alt="{{ $items[$itemRow['asset']->item_id]->name }}">
+                                    @endif {!! $items[$itemRow['asset']->item_id]->name !!}
                                 <td class="col-4">{!! array_key_exists('data', $itemRow['asset']->data) ? ($itemRow['asset']->data['data'] ? $itemRow['asset']->data['data'] : 'N/A') : 'N/A' !!}</td>
                                 <td class="col-4">{!! array_key_exists('notes', $itemRow['asset']->data) ? ($itemRow['asset']->data['notes'] ? $itemRow['asset']->data['notes'] : 'N/A') : 'N/A' !!}</td>
                                 <td class="col-2">{!! $itemRow['quantity'] !!}
@@ -57,13 +59,13 @@
                 </table>
             </div>
         @endif
-        @if($data['characters'])
+        @if ($data['characters'])
             <div class="card-header border-top">
                 Characters
             </div>
             <div class="card-body">
                 <div class="row">
-                    @foreach($data['characters'] as $character)
+                    @foreach ($data['characters'] as $character)
                         <div class="col-lg-2 col-sm-3 col-6 mb-3">
                             <div class="text-center inventory-item">
                                 <div class="mb-1">
@@ -78,19 +80,19 @@
                 </div>
             </div>
         @endif
-        @if($data['currencies'])
+        @if ($data['currencies'])
             <div class="card-header border-top border-bottom-0">
                 Currencies
             </div>
             <ul class="list-group list-group-flush">
-                @foreach($data['currencies'] as $currency)
+                @foreach ($data['currencies'] as $currency)
                     <li class="list-group-item border-bottom-0 border-top currency-item">
                         {!! $currency['asset']->display($currency['quantity']) !!}
                     </li>
                 @endforeach
             </ul>
         @endif
-        @if(!$data['user_items'] && !$data['currencies'] && !$data['characters'])
+        @if (!$data['user_items'] && !$data['currencies'] && !$data['characters'])
             <div class="card-body">{!! $user->displayName !!} has not added anything to their offer.</div>
         @endif
     @else
diff --git a/resources/views/home/trades/_offer_summary.blade.php b/resources/views/home/trades/_offer_summary.blade.php
index b08d80c82a..28ccda735c 100644
--- a/resources/views/home/trades/_offer_summary.blade.php
+++ b/resources/views/home/trades/_offer_summary.blade.php
@@ -1,11 +1,11 @@
-@if($data)
-    @if($data['user_items'])
+@if ($data)
+    @if ($data['user_items'])
         <div class="row">
-            @foreach($stacks as $stack)
+            @foreach ($stacks as $stack)
                 <div class="col-sm-3 col-4 mb-3" title="{{ $stack->first()->item->name }}" data-toggle="tooltip">
                     <div class="text-center inventory-item">
                         <div class="mb-1">
-                            @if(isset($stack->first()->item->imageUrl))
+                            @if (isset($stack->first()->item->imageUrl))
                                 <a class="inventory-stack"><img src="{{ $stack->first()->item->imageUrl }}" class="mw-100" alt="{{ $stack->first()->item->name }}" /></a>
                             @else
                                 {{ $stack->first()->item->name }}
@@ -17,22 +17,23 @@
             @endforeach
         </div>
     @endif
-    @if($data['characters'])
+    @if ($data['characters'])
         <div class="row">
-            @foreach($data['characters'] as $character)
+            @foreach ($data['characters'] as $character)
                 <div class="col-sm-3 col-4 mb-3">
                     <div class="text-center inventory-item">
                         <div class="mb-1">
-                            <a class="inventory-stack"><img src="{{ $character['asset']->image->thumbnailUrl }}" class="img-thumbnail" title="{{ $character['asset']->fullName }}" data-toggle="tooltip" alt="Thumbnail for {{ $character['asset']->fullName }}"/></a>
+                            <a class="inventory-stack"><img src="{{ $character['asset']->image->thumbnailUrl }}" class="img-thumbnail" title="{{ $character['asset']->fullName }}" data-toggle="tooltip"
+                                    alt="Thumbnail for {{ $character['asset']->fullName }}" /></a>
                         </div>
                     </div>
                 </div>
             @endforeach
         </div>
     @endif
-    @if($data['currencies'])
+    @if ($data['currencies'])
         <div>
-            @foreach($data['currencies'] as $currency)
+            @foreach ($data['currencies'] as $currency)
                 <div>
                     {!! $currency['asset']->display($currency['quantity']) !!}
                 </div>
diff --git a/resources/views/home/trades/_trade.blade.php b/resources/views/home/trades/_trade.blade.php
index 66907ee4c3..0fe57621c8 100644
--- a/resources/views/home/trades/_trade.blade.php
+++ b/resources/views/home/trades/_trade.blade.php
@@ -1,18 +1,21 @@
 <div class="card mb-3">
     <div class="card-header">
-        <h2 class="mb-0"><span class="float-right badge badge-{{ ($trade->status == 'Pending' || $trade->status == 'Open' || $trade->status == 'Canceled') ? 'secondary' : ($trade->status == 'Completed' ? 'success' : 'danger') }}">{{ $trade->status }}</span><a href="{{$trade->url}} ">Trade (#{{ $trade->id }})</a></h2>
+        <h2 class="mb-0"><span
+                class="float-right badge badge-{{ $trade->status == 'Pending' || $trade->status == 'Open' || $trade->status == 'Canceled' ? 'secondary' : ($trade->status == 'Completed' ? 'success' : 'danger') }}">{{ $trade->status }}</span><a
+                href="{{ $trade->url }} ">Trade (#{{ $trade->id }})</a></h2>
     </div>
     <div class="card-body">
-        @if($trade->comments)
-            <div>{!! nl2br(htmlentities($trade->comments)) !!}</div><hr />
+        @if ($trade->comments)
+            <div>{!! nl2br(htmlentities($trade->comments)) !!}</div>
+            <hr />
         @endif
         <div class="row">
             <div class="col-md-6">
                 <h3 class="card-heading">
                     {!! $trade->sender->id == Auth::user()->id ? 'Your Offer' : $trade->sender->displayName . '\'s Offer' !!}
                     <span class="float-right">
-                        @if($trade->{'is_sender_confirmed'})
-                            @if($trade->{'is_sender_trade_confirmed'})
+                        @if ($trade->{'is_sender_confirmed'})
+                            @if ($trade->{'is_sender_trade_confirmed'})
                                 <small class="text-success">Trade Confirmed</small>
                             @else
                                 <small class="text-primary">Offer Confirmed</small>
@@ -22,14 +25,19 @@
                         @endif
                     </span>
                 </h3>
-                @include('home.trades._offer_summary', ['user' => $trade->sender, 'data' => isset($trade->data['sender']) ? parseAssetData($trade->data['sender']) : null, 'trade' => $trade, 'stacks' => (isset($stacks[$trade->id]['sender']) ? $stacks[$trade->id]['sender'] : null)])
+                @include('home.trades._offer_summary', [
+                    'user' => $trade->sender,
+                    'data' => isset($trade->data['sender']) ? parseAssetData($trade->data['sender']) : null,
+                    'trade' => $trade,
+                    'stacks' => isset($stacks[$trade->id]['sender']) ? $stacks[$trade->id]['sender'] : null,
+                ])
             </div>
             <div class="col-md-6">
                 <h3 class="card-heading">
                     {!! $trade->recipient->id == Auth::user()->id ? 'Your Offer' : $trade->recipient->displayName . '\'s Offer' !!}
                     <span class="float-right">
-                        @if($trade->{'is_recipient_confirmed'})
-                            @if($trade->{'is_recipient_trade_confirmed'})
+                        @if ($trade->{'is_recipient_confirmed'})
+                            @if ($trade->{'is_recipient_trade_confirmed'})
                                 <small class="text-success">Trade Confirmed</small>
                             @else
                                 <small class="text-primary">Offer Confirmed</small>
@@ -39,20 +47,25 @@
                         @endif
                     </span>
                 </h3>
-                @include('home.trades._offer_summary', ['user' => $trade->recipient, 'data' => isset($trade->data['recipient']) ? parseAssetData($trade->data['recipient']) : null, 'trade' => $trade, 'stacks' => (isset($stacks[$trade->id]['recipient']) ? $stacks[$trade->id]['recipient'] : null)])
+                @include('home.trades._offer_summary', [
+                    'user' => $trade->recipient,
+                    'data' => isset($trade->data['recipient']) ? parseAssetData($trade->data['recipient']) : null,
+                    'trade' => $trade,
+                    'stacks' => isset($stacks[$trade->id]['recipient']) ? $stacks[$trade->id]['recipient'] : null,
+                ])
             </div>
         </div>
         <hr />
         <div class="text-right">
             <a href="{{ $trade->url }}" class="btn btn-outline-primary">View Details</a>
-            @if(isset($queueView) && $trade->status == 'Pending')
-                @if(!$trade->is_approved)
+            @if (isset($queueView) && $trade->status == 'Pending')
+                @if (!$trade->is_approved)
                     <a href="#" class="btn btn-outline-success trade-action-button" data-id="{{ $trade->id }}" data-action="approve">Approve</a>
                     <a href="#" class="btn btn-outline-danger trade-action-button" data-id="{{ $trade->id }}" data-action="reject">Reject</a>
-                @else 
+                @else
                     Currently awaiting mod approval
                 @endif
             @endif
         </div>
     </div>
-</div>
\ No newline at end of file
+</div>
diff --git a/resources/views/home/trades/create_trade.blade.php b/resources/views/home/trades/create_trade.blade.php
index d13148eed9..2381f1a102 100644
--- a/resources/views/home/trades/create_trade.blade.php
+++ b/resources/views/home/trades/create_trade.blade.php
@@ -1,19 +1,22 @@
 @extends('home.layout')
 
-@section('home-title') Trades @endsection
+@section('home-title')
+    Trades
+@endsection
 
 @section('home-content')
-{!! breadcrumbs(['Trades' => 'trades/open', 'New Trade' => 'trades/create']) !!}
+    {!! breadcrumbs(['Trades' => 'trades/open', 'New Trade' => 'trades/create']) !!}
 
-<h1>
-    New Trade
-</h1>
+    <h1>
+        New Trade
+    </h1>
 
-<p>
-    Create a new trade. You can modify the trade attachments after trade creation - this only sets up the trade, so you don't have to worry about having everything in place at the start. The recipient will be notified of the new trade and will be able to edit their attachments as well. Note that each person may only add up to <strong>{{ Config::get('lorekeeper.settings.trade_asset_limit') }} things to one trade - if necessary, please create a new trade to add more.</strong>
-</p>
+    <p>
+        Create a new trade. You can modify the trade attachments after trade creation - this only sets up the trade, so you don't have to worry about having everything in place at the start. The recipient will be notified of the new trade and will be
+        able to edit their attachments as well. Note that each person may only add up to <strong>{{ config('lorekeeper.settings.trade_asset_limit') }} things to one trade - if necessary, please create a new trade to add more.</strong>
+    </p>
 
-{!! Form::open(['url' => 'trades/create']) !!}
+    {!! Form::open(['url' => 'trades/create']) !!}
 
     <div class="form-group">
         {!! Form::label('recipient_id', 'Recipient') !!}
@@ -27,8 +30,7 @@
     @include('widgets._my_character_select', ['readOnly' => true, 'categories' => $characterCategories])
     @include('widgets._bank_select', ['owner' => Auth::user(), 'selected' => null, 'isTransferrable' => true])
     <div class="text-right">{!! Form::submit('Create Trade', ['class' => 'btn btn-primary']) !!}</div>
-{!! Form::close() !!}
-
+    {!! Form::close() !!}
 @endsection
 @section('scripts')
     @parent
@@ -39,4 +41,4 @@
     <script>
         $('.user-select').selectize();
     </script>
-@endsection
\ No newline at end of file
+@endsection
diff --git a/resources/views/home/trades/edit_trade.blade.php b/resources/views/home/trades/edit_trade.blade.php
index d8f10855fa..037113218d 100644
--- a/resources/views/home/trades/edit_trade.blade.php
+++ b/resources/views/home/trades/edit_trade.blade.php
@@ -1,21 +1,24 @@
 @extends('home.layout')
 
-@section('home-title') Trades @endsection
+@section('home-title')
+    Trades
+@endsection
 
 @section('home-content')
-{!! breadcrumbs(['Trades' => 'trades/open', 'Trade with '.$partner->name.' (#' . $trade->id . ')' => 'trades/'.$trade->id, 'Edit Trade' => 'trades/'.$trade->id.'/edit']) !!}
+    {!! breadcrumbs(['Trades' => 'trades/open', 'Trade with ' . $partner->name . ' (#' . $trade->id . ')' => 'trades/' . $trade->id, 'Edit Trade' => 'trades/' . $trade->id . '/edit']) !!}
 
-<h1>
-    Edit Trade
-</h1>
+    <h1>
+        Edit Trade
+    </h1>
 
-<p>
-    Edit the contents of this trade freely. Your trade partner will only be notified once you have confirmed your offer. Note that each person may only add up to <strong>{{ Config::get('lorekeeper.settings.trade_asset_limit') }} things to one trade - if necessary, please create a new trade to add more.</strong>
-</p>
+    <p>
+        Edit the contents of this trade freely. Your trade partner will only be notified once you have confirmed your offer. Note that each person may only add up to <strong>{{ config('lorekeeper.settings.trade_asset_limit') }} things to one trade
+            - if necessary, please create a new trade to add more.</strong>
+    </p>
 
-{!! Form::open(['url' => 'trades/'.$trade->id.'/edit']) !!}
+    {!! Form::open(['url' => 'trades/' . $trade->id . '/edit']) !!}
 
-    @if(Auth::user()->id == $trade->sender_id)
+    @if (Auth::user()->id == $trade->sender_id)
         <div class="form-group">
             {!! Form::label('comments', 'Comments (Optional)') !!} {!! add_help('This comment will be displayed on the trade index. You can write a helpful note here, for example to note down the purpose of the trade.') !!}
             {!! Form::textarea('comments', $trade->comments, ['class' => 'form-control']) !!}
@@ -25,8 +28,7 @@
     @include('widgets._my_character_select', ['readOnly' => true, 'categories' => $characterCategories, 'selected' => $trade->getCharacters(Auth::user())])
     @include('widgets._bank_select', ['owner' => Auth::user(), 'selected' => $trade->getCurrencies(Auth::user()), 'isTransferrable' => true])
     <div class="text-right">{!! Form::submit('Edit Trade', ['class' => 'btn btn-primary']) !!}</div>
-{!! Form::close() !!}
-
+    {!! Form::close() !!}
 @endsection
 @section('scripts')
     @parent
@@ -37,4 +39,4 @@
     <script>
         $('.user-select').selectize();
     </script>
-@endsection
\ No newline at end of file
+@endsection
diff --git a/resources/views/home/trades/index.blade.php b/resources/views/home/trades/index.blade.php
index 7d2cfb389f..fa97cf1632 100644
--- a/resources/views/home/trades/index.blade.php
+++ b/resources/views/home/trades/index.blade.php
@@ -1,38 +1,38 @@
 @extends('home.layout')
 
-@section('home-title') Trades @endsection
-
-@section('home-content')
-{!! breadcrumbs(['Trades' => 'trades/open']) !!}
-
-<h1>
+@section('home-title')
     Trades
-</h1>
-
-<div class="text-right">
-    <a href="{{ url('trades/create') }}" class="btn btn-primary">New Trade</a>
-</div>
-
-<ul class="nav nav-tabs mb-3">
-    <li class="nav-item">
-        <a class="nav-link {{ set_active('trades/open*') }}" href="{{ url('trades/open') }}">Open</a>
-    </li>
-    <li class="nav-item">
-        <a class="nav-link {{ set_active('trades/pending*') }}" href="{{ url('trades/pending') }}">Pending</a>
-    </li>
-    <li class="nav-item">
-        <a class="nav-link {{ set_active('trades/completed*') }}" href="{{ url('trades/completed') }}">Completed</a>
-    </li>
-    <li class="nav-item">
-        <a class="nav-link {{ set_active('trades/rejected*') }}" href="{{ url('trades/rejected') }}">Rejected</a>
-    </li>
-</ul>
-
-{!! $trades->render() !!}
-@foreach($trades as $trade)
-    @include('home.trades._trade', ['trade' => $trade])
-@endforeach
-{!! $trades->render() !!}
-
+@endsection
 
+@section('home-content')
+    {!! breadcrumbs(['Trades' => 'trades/open']) !!}
+
+    <h1>
+        Trades
+    </h1>
+
+    <div class="text-right">
+        <a href="{{ url('trades/create') }}" class="btn btn-primary">New Trade</a>
+    </div>
+
+    <ul class="nav nav-tabs mb-3">
+        <li class="nav-item">
+            <a class="nav-link {{ set_active('trades/open*') }}" href="{{ url('trades/open') }}">Open</a>
+        </li>
+        <li class="nav-item">
+            <a class="nav-link {{ set_active('trades/pending*') }}" href="{{ url('trades/pending') }}">Pending</a>
+        </li>
+        <li class="nav-item">
+            <a class="nav-link {{ set_active('trades/completed*') }}" href="{{ url('trades/completed') }}">Completed</a>
+        </li>
+        <li class="nav-item">
+            <a class="nav-link {{ set_active('trades/rejected*') }}" href="{{ url('trades/rejected') }}">Rejected</a>
+        </li>
+    </ul>
+
+    {!! $trades->render() !!}
+    @foreach ($trades as $trade)
+        @include('home.trades._trade', ['trade' => $trade])
+    @endforeach
+    {!! $trades->render() !!}
 @endsection
diff --git a/resources/views/home/trades/trade.blade.php b/resources/views/home/trades/trade.blade.php
index 4ff9c618ae..1299005707 100644
--- a/resources/views/home/trades/trade.blade.php
+++ b/resources/views/home/trades/trade.blade.php
@@ -1,104 +1,119 @@
 @extends('home.layout')
 
-@section('home-title') Trades @endsection
+@section('home-title')
+    Trades
+@endsection
 
 @section('home-content')
-{!! breadcrumbs(['Trades' => 'trades/open', 'Trade with '.$partner->name.' (#' . $trade->id . ')' => 'trades/'.$trade->id]) !!}
+    {!! breadcrumbs(['Trades' => 'trades/open', 'Trade with ' . $partner->name . ' (#' . $trade->id . ')' => 'trades/' . $trade->id]) !!}
 
-<h1>
-    Trade with {!! $partner->displayName !!} (#{{ $trade->id }})
-    <span class="float-right badge badge-{{ ($trade->status == 'Pending' || $trade->status == 'Open' || $trade->status == 'Canceled') ? 'secondary' : ($trade->status == 'Completed' ? 'success' : 'danger') }}">{{ $trade->status }}</span>
-</h1>
+    <h1>
+        Trade with {!! $partner->displayName !!} (#{{ $trade->id }})
+        <span class="float-right badge badge-{{ $trade->status == 'Pending' || $trade->status == 'Open' || $trade->status == 'Canceled' ? 'secondary' : ($trade->status == 'Completed' ? 'success' : 'danger') }}">{{ $trade->status }}</span>
+    </h1>
 
 
-<div class="mb-1">
-    <div class="row">
-        <div class="col-md-2 col-4"><h5>Sender</h5></div>
-        <div class="col-md-10 col-8">{!! $trade->sender->displayName !!}</div>
-    </div>
-    <div class="row">
-        <div class="col-md-2 col-4"><h5>Created</h5></div>
-        <div class="col-md-10 col-8">{!! format_date($trade->created_at) !!} ({{ $trade->created_at->diffForHumans() }})</div>
-    </div>
-    <div class="row">
-        <div class="col-md-2 col-4"><h5>{{ $trade->status == 'Rejected' || ($trade->status == 'Completed' && $trade->staff_id) ? 'Processed' : 'Last Updated' }}</h5></div>
-        <div class="col-md-10 col-8">{!! format_date($trade->updated_at) !!} ({{ $trade->updated_at->diffForHumans() }})</div>
-    </div>
-    <div>
-        <div><h5>Sender's Comments</h5></div>
-        <div class="card mb-3">
-            <div class="card-body">
-                @if($trade->comments)
-                    {!! nl2br(htmlentities($trade->comments)) !!}
-                @else 
-                    No comment given.
-                @endif
+    <div class="mb-1">
+        <div class="row">
+            <div class="col-md-2 col-4">
+                <h5>Sender</h5>
+            </div>
+            <div class="col-md-10 col-8">{!! $trade->sender->displayName !!}</div>
+        </div>
+        <div class="row">
+            <div class="col-md-2 col-4">
+                <h5>Created</h5>
+            </div>
+            <div class="col-md-10 col-8">{!! format_date($trade->created_at) !!} ({{ $trade->created_at->diffForHumans() }})</div>
+        </div>
+        <div class="row">
+            <div class="col-md-2 col-4">
+                <h5>{{ $trade->status == 'Rejected' || ($trade->status == 'Completed' && $trade->staff_id) ? 'Processed' : 'Last Updated' }}</h5>
+            </div>
+            <div class="col-md-10 col-8">{!! format_date($trade->updated_at) !!} ({{ $trade->updated_at->diffForHumans() }})</div>
+        </div>
+        <div>
+            <div>
+                <h5>Sender's Comments</h5>
+            </div>
+            <div class="card mb-3">
+                <div class="card-body">
+                    @if ($trade->comments)
+                        {!! nl2br(htmlentities($trade->comments)) !!}
+                    @else
+                        No comment given.
+                    @endif
+                </div>
             </div>
         </div>
     </div>
-</div>
-@if($trade->status == 'Open')
-    <div class="alert alert-info">
-        <p>
-            Please note that to complete a trade, both parties will need to confirm <strong>twice</strong> each. 
-        </p>
-        <p>
-            First, after you are done editing your offer, confirm your offer to indicate to your partner that you have finished. Next, after both parties have confirmed, you will receive the option to confirm the entire trade. <i>Please make sure that your partner has attached everything that you are expecting to receive!</i>
-        </p> 
-        <p>
-            After both parties have confirmed the entire trade, @if(Settings::get('open_transfers_queue')) if the trade contains a character, it will enter the transfer approval queue. Otherwise, @endif the transfers will be processed immediately.
-        </p>
-    </div>
-@elseif($trade->status == 'Pending')
-    <div class="alert alert-warning">This trade is currently in the character transfer approval queue. Please wait for it to be processed.</div>
-@elseif($trade->status == 'Rejected' && $trade->reason)
-
-    <h5 class="text-danger">Staff Comments ({!! $trade->staff->displayName !!})</h5>
-    <div class="card border-danger mb-3"><div class="card-body">{!! nl2br(htmlentities($trade->reason)) !!}</div></div>
-
-@endif
+    @if ($trade->status == 'Open')
+        <div class="alert alert-info">
+            <p>
+                Please note that to complete a trade, both parties will need to confirm <strong>twice</strong> each.
+            </p>
+            <p>
+                First, after you are done editing your offer, confirm your offer to indicate to your partner that you have finished. Next, after both parties have confirmed, you will receive the option to confirm the entire trade. <i>Please make sure
+                    that your partner has attached everything that you are expecting to receive!</i>
+            </p>
+            <p>
+                After both parties have confirmed the entire trade, @if (Settings::get('open_transfers_queue'))
+                    if the trade contains a character, it will enter the transfer approval queue. Otherwise,
+                @endif the transfers will be processed immediately.
+            </p>
+        </div>
+    @elseif($trade->status == 'Pending')
+        <div class="alert alert-warning">This trade is currently in the character transfer approval queue. Please wait for it to be processed.</div>
+    @elseif($trade->status == 'Rejected' && $trade->reason)
+        <h5 class="text-danger">Staff Comments ({!! $trade->staff->displayName !!})</h5>
+        <div class="card border-danger mb-3">
+            <div class="card-body">{!! nl2br(htmlentities($trade->reason)) !!}</div>
+        </div>
+    @endif
 
-@include('home.trades._offer', ['user' => $trade->sender, 'data' => $senderData, 'trade' => $trade, 'type' => 'sender'])
-@include('home.trades._offer', ['user' => $trade->recipient, 'data' => $recipientData, 'trade' => $trade, 'type' => 'recipient'])
+    @include('home.trades._offer', ['user' => $trade->sender, 'data' => $senderData, 'trade' => $trade, 'type' => 'sender'])
+    @include('home.trades._offer', ['user' => $trade->recipient, 'data' => $recipientData, 'trade' => $trade, 'type' => 'recipient'])
 
-@if((Auth::user()->id == $trade->sender_id || Auth::user()->id == $trade->recipient_id) && $trade->status == 'Open')
-    <div class="text-right">
-        @if(!$trade->isConfirmable)
+    @if ((Auth::user()->id == $trade->sender_id || Auth::user()->id == $trade->recipient_id) && $trade->status == 'Open')
+        <div class="text-right">
+            @if (!$trade->isConfirmable)
                 {!! add_help('Both parties must confirm their offers before you can confirm this trade.') !!}
                 <a href="#" class="btn btn-outline-primary disabled">Confirm Trade</a>
-        @else 
-            @if(Auth::user()->id == $trade->sender_id)
-                @if(!$trade->is_sender_trade_confirmed)
-                    <a href="#" class="btn btn-outline-primary" id="confirmTradeButton">Confirm Trade</a>
-                @endif
-            @elseif(Auth::user()->id == $trade->recipient_id)
-                @if(!$trade->is_recipient_trade_confirmed)
-                    <a href="#" class="btn btn-outline-primary" id="confirmTradeButton">Confirm Trade</a>
+            @else
+                @if (Auth::user()->id == $trade->sender_id)
+                    @if (!$trade->is_sender_trade_confirmed)
+                        <a href="#" class="btn btn-outline-primary" id="confirmTradeButton">Confirm Trade</a>
+                    @endif
+                @elseif(Auth::user()->id == $trade->recipient_id)
+                    @if (!$trade->is_recipient_trade_confirmed)
+                        <a href="#" class="btn btn-outline-primary" id="confirmTradeButton">Confirm Trade</a>
+                    @endif
                 @endif
             @endif
-        @endif
-        <a href="#" class="btn btn-outline-danger" id="cancelTradeButton">Cancel Trade</a>
-    </div>
-@endif
+            <a href="#" class="btn btn-outline-danger" id="cancelTradeButton">Cancel Trade</a>
+        </div>
+    @endif
 
 @endsection
 
 @section('scripts')
-@include('widgets._inventory_select_js', ['readOnly' => true])
-<script>
-    $(document).ready(function() {
-        $('#confirmOfferButton').on('click', function(e) {
-            e.preventDefault();
-            loadModal("{{ url('trades/'.$trade->id.'/confirm-offer') }}", '{{ (Auth::user()->id == $trade->sender_id ? ($trade->is_sender_confirmed ? 'Unconfirm' : 'Confirm') : ($trade->is_recipient_confirmed ? 'Unconfirm' : 'Confirm')) . ' Offer' }}');
-        });
-        $('#confirmTradeButton').on('click', function(e) {
-            e.preventDefault();
-            loadModal("{{ url('trades/'.$trade->id.'/confirm-trade') }}", '{{ (Auth::user()->id == $trade->sender_id ? ($trade->is_sender_trade_confirmed ? 'Unconfirm' : 'Confirm') : ($trade->is_recipient_trade_confirmed ? 'Unconfirm' : 'Confirm')) . ' Trade' }}');
+    @include('widgets._inventory_select_js', ['readOnly' => true])
+    <script>
+        $(document).ready(function() {
+            $('#confirmOfferButton').on('click', function(e) {
+                e.preventDefault();
+                loadModal("{{ url('trades/' . $trade->id . '/confirm-offer') }}",
+                    '{{ (Auth::user()->id == $trade->sender_id ? ($trade->is_sender_confirmed ? 'Unconfirm' : 'Confirm') : ($trade->is_recipient_confirmed ? 'Unconfirm' : 'Confirm')) . ' Offer' }}');
+            });
+            $('#confirmTradeButton').on('click', function(e) {
+                e.preventDefault();
+                loadModal("{{ url('trades/' . $trade->id . '/confirm-trade') }}",
+                    '{{ (Auth::user()->id == $trade->sender_id ? ($trade->is_sender_trade_confirmed ? 'Unconfirm' : 'Confirm') : ($trade->is_recipient_trade_confirmed ? 'Unconfirm' : 'Confirm')) . ' Trade' }}');
+            });
+            $('#cancelTradeButton').on('click', function(e) {
+                e.preventDefault();
+                loadModal("{{ url('trades/' . $trade->id . '/cancel-trade') }}", 'Cancel Trade');
+            });
         });
-        $('#cancelTradeButton').on('click', function(e) {
-            e.preventDefault();
-            loadModal("{{ url('trades/'.$trade->id.'/cancel-trade') }}", 'Cancel Trade');
-        });
-    });
-</script>
-@endsection
\ No newline at end of file
+    </script>
+@endsection
diff --git a/resources/views/inventory/_box.blade.php b/resources/views/inventory/_box.blade.php
index c609110794..97a336faf6 100644
--- a/resources/views/inventory/_box.blade.php
+++ b/resources/views/inventory/_box.blade.php
@@ -1,5 +1,5 @@
 <li class="list-group-item">
-    <a class="card-title h5 collapse-title"  data-toggle="collapse" href="#openBoxForm"> Open Box</a>
+    <a class="card-title h5 collapse-title" data-toggle="collapse" href="#openBoxForm"> Open Box</a>
     <div id="openBoxForm" class="collapse">
         {!! Form::hidden('tag', $tag->tag) !!}
         <p>This action is not reversible. Are you sure you want to open this box?</p>
diff --git a/resources/views/inventory/_slot.blade.php b/resources/views/inventory/_slot.blade.php
index 19dc68779f..6a57e89f39 100644
--- a/resources/views/inventory/_slot.blade.php
+++ b/resources/views/inventory/_slot.blade.php
@@ -1,5 +1,5 @@
 <li class="list-group-item">
-    <a class="card-title h5 collapse-title"  data-toggle="collapse" href="#openSlotForm"> Use Slot</a>
+    <a class="card-title h5 collapse-title" data-toggle="collapse" href="#openSlotForm"> Use Slot</a>
     <div id="openSlotForm" class="collapse">
         {!! Form::hidden('tag', $tag->tag) !!}
         <p>This action is not reversible. Are you sure you want to use this item?</p>
@@ -7,4 +7,4 @@
             {!! Form::button('Open', ['class' => 'btn btn-primary', 'name' => 'action', 'value' => 'act', 'type' => 'submit']) !!}
         </div>
     </div>
-</li>
\ No newline at end of file
+</li>
diff --git a/resources/views/js/_character_select_js.blade copy.php b/resources/views/js/_character_select_js.blade copy.php
index 2bcd54c3c1..a9c5f6e484 100644
--- a/resources/views/js/_character_select_js.blade copy.php	
+++ b/resources/views/js/_character_select_js.blade copy.php	
@@ -20,7 +20,7 @@
         });
 
         function attachListeners(node) {
-            node.find('.character-code').on('change', function(e) {
+            node.find('.character-code').on('input', function(e) {
                 var $parent = $(this).parent().parent().parent().parent();
                 $parent.find('.character-image-loaded').load('{{ url('submissions/new/character') }}/'+$(this).val(), function(response, status, xhr) {
                     $parent.find('.character-image-blank').addClass('hide');
diff --git a/resources/views/js/_character_select_js.blade.php b/resources/views/js/_character_select_js.blade.php
index 947c737a50..a33074a6df 100644
--- a/resources/views/js/_character_select_js.blade.php
+++ b/resources/views/js/_character_select_js.blade.php
@@ -16,13 +16,14 @@
             attachListeners($clone);
             attachRewardTypeListener($clone.find('.character-rewardable-type'));
             $characters.append($clone);
+            $clone.find('.character-code').selectize();
             count++;
         });
 
         function attachListeners(node) {
             node.find('.character-code').on('change', function(e) {
                 var $parent = $(this).parent().parent().parent().parent();
-                $parent.find('.character-image-loaded').load('{{ url('submissions/new/character') }}/'+$(this).val(), function(response, status, xhr) {
+                $parent.find('.character-image-loaded').load('{{ url('submissions/new/character') }}/' + $(this).val(), function(response, status, xhr) {
                     $parent.find('.character-image-blank').addClass('hide');
                     $parent.find('.character-image-loaded').removeClass('hide');
                     $parent.find('.character-rewards').removeClass('hide');
@@ -55,16 +56,14 @@ function attachRewardTypeListener(node) {
                 $cell.children().addClass('hide');
                 $cell.children().children().val(null);
 
-                if(val == 'Item') {
+                if (val == 'Item') {
                     $cell.children('.character-items').addClass('show');
                     $cell.children('.character-items').removeClass('hide');
                     $cell.children('.character-items');
-                }
-                else if (val == 'Currency'){
+                } else if (val == 'Currency') {
                     $cell.children('.character-currencies').addClass('show');
                     $cell.children('.character-currencies').removeClass('hide');
-                }
-                else if (val == 'LootTable'){
+                } else if (val == 'LootTable') {
                     $cell.children('.character-tables').addClass('show');
                     $cell.children('.character-tables').addClass('show');
                     $cell.children('.character-tables').removeClass('hide');
diff --git a/resources/views/js/_loot_js.blade.php b/resources/views/js/_loot_js.blade.php
index 968dd05ed7..ef3ed76889 100644
--- a/resources/views/js/_loot_js.blade.php
+++ b/resources/views/js/_loot_js.blade.php
@@ -1,74 +1,72 @@
-
 <script>
-$( document ).ready(function() {    
-    var $lootTable  = $('#lootTableBody');
-    var $lootRow = $('#lootRow').find('.loot-row');
-    var $itemSelect = $('#lootRowData').find('.item-select');
-    var $currencySelect = $('#lootRowData').find('.currency-select');
-    @if($showLootTables)
-        var $tableSelect = $('#lootRowData').find('.table-select');
-    @endif
-    @if($showRaffles)
-        var $raffleSelect = $('#lootRowData').find('.raffle-select');
-    @endif
-
-    $('#lootTableBody .selectize').selectize();
-    attachRemoveListener($('#lootTableBody .remove-loot-button'));
-
-    $('#addLoot').on('click', function(e) {
-        e.preventDefault();
-        var $clone = $lootRow.clone();
-        $lootTable.append($clone);
-        attachRewardTypeListener($clone.find('.reward-type'));
-        attachRemoveListener($clone.find('.remove-loot-button'));
-    });
-
-    $('.reward-type').on('change', function(e) {
-        var val = $(this).val();
-        var $cell = $(this).parent().find('.loot-row-select');
-
-        var $clone = null;
-        if(val == 'Item') $clone = $itemSelect.clone();
-        else if (val == 'Currency') $clone = $currencySelect.clone();
-        @if($showLootTables)
-            else if (val == 'LootTable') $clone = $tableSelect.clone();
+    $(document).ready(function() {
+        var $lootTable = $('#lootTableBody');
+        var $lootRow = $('#lootRow').find('.loot-row');
+        var $itemSelect = $('#lootRowData').find('.item-select');
+        var $currencySelect = $('#lootRowData').find('.currency-select');
+        @if ($showLootTables)
+            var $tableSelect = $('#lootRowData').find('.table-select');
         @endif
-        @if($showRaffles)
-            else if (val == 'Raffle') $clone = $raffleSelect.clone();
+        @if ($showRaffles)
+            var $raffleSelect = $('#lootRowData').find('.raffle-select');
         @endif
 
-        $cell.html('');
-        $cell.append($clone);
-    });
+        $('#lootTableBody .selectize').selectize();
+        attachRemoveListener($('#lootTableBody .remove-loot-button'));
+
+        $('#addLoot').on('click', function(e) {
+            e.preventDefault();
+            var $clone = $lootRow.clone();
+            $lootTable.append($clone);
+            attachRewardTypeListener($clone.find('.reward-type'));
+            attachRemoveListener($clone.find('.remove-loot-button'));
+        });
 
-    function attachRewardTypeListener(node) {
-        node.on('change', function(e) {
+        $('.reward-type').on('change', function(e) {
             var val = $(this).val();
             var $cell = $(this).parent().parent().find('.loot-row-select');
 
             var $clone = null;
-            if(val == 'Item') $clone = $itemSelect.clone();
+            if (val == 'Item') $clone = $itemSelect.clone();
             else if (val == 'Currency') $clone = $currencySelect.clone();
-            @if($showLootTables)
+            @if ($showLootTables)
                 else if (val == 'LootTable') $clone = $tableSelect.clone();
             @endif
-            @if($showRaffles)
+            @if ($showRaffles)
                 else if (val == 'Raffle') $clone = $raffleSelect.clone();
             @endif
 
             $cell.html('');
             $cell.append($clone);
-            $clone.selectize();
         });
-    }
 
-    function attachRemoveListener(node) {
-        node.on('click', function(e) {
-            e.preventDefault();
-            $(this).parent().parent().remove();
-        });
-    }
+        function attachRewardTypeListener(node) {
+            node.on('change', function(e) {
+                var val = $(this).val();
+                var $cell = $(this).parent().parent().find('.loot-row-select');
 
-});
-    
-</script>
\ No newline at end of file
+                var $clone = null;
+                if (val == 'Item') $clone = $itemSelect.clone();
+                else if (val == 'Currency') $clone = $currencySelect.clone();
+                @if ($showLootTables)
+                    else if (val == 'LootTable') $clone = $tableSelect.clone();
+                @endif
+                @if ($showRaffles)
+                    else if (val == 'Raffle') $clone = $raffleSelect.clone();
+                @endif
+
+                $cell.html('');
+                $cell.append($clone);
+                $clone.selectize();
+            });
+        }
+
+        function attachRemoveListener(node) {
+            node.on('click', function(e) {
+                e.preventDefault();
+                $(this).parent().parent().remove();
+            });
+        }
+
+    });
+</script>
diff --git a/resources/views/js/_modal_wysiwyg.blade.php b/resources/views/js/_modal_wysiwyg.blade.php
index c1bcc53e2b..91dcad20f9 100644
--- a/resources/views/js/_modal_wysiwyg.blade.php
+++ b/resources/views/js/_modal_wysiwyg.blade.php
@@ -1,16 +1,16 @@
 tinymce.init({
-    selector: '#modal .wysiwyg',
-    height: 500,
-    menubar: false,
-    plugins: [
-        'advlist autolink lists link image charmap print preview anchor',
-        'searchreplace visualblocks code fullscreen',
-        'insertdatetime media table paste code help wordcount'
-    ],
-    toolbar: 'undo redo | formatselect | bold italic backcolor | alignleft aligncenter alignright alignjustify | bullist numlist outdent indent | removeformat | code',
-    content_css: [
-        '//www.tiny.cloud/css/codepen.min.css',
-        '{{ asset('css/app.css') }}',
-        '{{ asset('css/lorekeeper.css') }}'
-    ]
-});
\ No newline at end of file
+selector: '#modal .wysiwyg',
+height: 500,
+menubar: false,
+plugins: [
+'advlist autolink lists link image charmap print preview anchor',
+'searchreplace visualblocks code fullscreen',
+'insertdatetime media table paste code help wordcount'
+],
+toolbar: 'undo redo | formatselect | bold italic backcolor | alignleft aligncenter alignright alignjustify | bullist numlist outdent indent | removeformat | code',
+content_css: [
+'//www.tiny.cloud/css/codepen.min.css',
+'{{ asset('css/app.css') }}',
+'{{ asset('css/lorekeeper.css') }}'
+]
+});
diff --git a/resources/views/js/admin_items/box.blade.php b/resources/views/js/admin_items/box.blade.php
index fc99be0da7..0546818441 100644
--- a/resources/views/js/admin_items/box.blade.php
+++ b/resources/views/js/admin_items/box.blade.php
@@ -1,2 +1 @@
-
-@include('js._loot_js', ['showLootTables' => true, 'showRaffles' => true])
\ No newline at end of file
+@include('js._loot_js', ['showLootTables' => true, 'showRaffles' => true])
diff --git a/resources/views/layouts/_footer.blade.php b/resources/views/layouts/_footer.blade.php
index 7d47885980..8982553506 100644
--- a/resources/views/layouts/_footer.blade.php
+++ b/resources/views/layouts/_footer.blade.php
@@ -8,6 +8,12 @@
         <li class="nav-item"><a href="http://deviantart.com/{{ env('DEVIANTART_ACCOUNT') }}" class="nav-link">deviantART</a></li>
         <li class="nav-item"><a href="https://github.com/corowne/lorekeeper" class="nav-link">Lorekeeper</a></li>
         <li class="nav-item"><a href="{{ url('credits') }}" class="nav-link">Credits</a></li>
+        <li class="nav-item"><a href="{{ url('feeds/news') }}" class="nav-link"><i class="fas fa-rss-square"></i> News</a></li>
+        <li class="nav-item"><a href="{{ url('feeds/sales') }}" class="nav-link"><i class="fas fa-rss-square"></i> Sales</a></li>
     </ul>
 </nav>
-<div class="copyright">&copy; {{ config('lorekeeper.settings.site_name', 'Lorekeeper') }} v{{ config('lorekeeper.settings.version') }} {{ Carbon\Carbon::now()->year }}</div>
\ No newline at end of file
+<div class="copyright">&copy; {{ config('lorekeeper.settings.site_name', 'Lorekeeper') }} v{{ config('lorekeeper.settings.version') }} {{ Carbon\Carbon::now()->year }}</div>
+
+@if (config('lorekeeper.extensions.scroll_to_top'))
+    @include('widgets/_scroll_to_top')
+@endif
diff --git a/resources/views/layouts/_nav.blade.php b/resources/views/layouts/_nav.blade.php
index 5f5d872613..ffd9aee3ab 100644
--- a/resources/views/layouts/_nav.blade.php
+++ b/resources/views/layouts/_nav.blade.php
@@ -11,20 +11,20 @@
             <!-- Left Side Of Navbar -->
             <ul class="navbar-nav mr-auto">
                 <li class="nav-item">
-                    @if(Auth::check() && Auth::user()->is_news_unread && Config::get('lorekeeper.extensions.navbar_news_notif'))
+                    @if (Auth::check() && Auth::user()->is_news_unread && config('lorekeeper.extensions.navbar_news_notif'))
                         <a class="nav-link d-flex text-warning" href="{{ url('news') }}"><strong>News</strong><i class="fas fa-bell"></i></a>
                     @else
                         <a class="nav-link" href="{{ url('news') }}">News</a>
                     @endif
                 </li>
                 <li class="nav-item">
-                    @if(Auth::check() && Auth::user()->is_sales_unread && Config::get('lorekeeper.extensions.navbar_news_notif'))
+                    @if (Auth::check() && Auth::user()->is_sales_unread && config('lorekeeper.extensions.navbar_news_notif'))
                         <a class="nav-link d-flex text-warning" href="{{ url('sales') }}"><strong>Sales</strong><i class="fas fa-bell"></i></a>
                     @else
                         <a class="nav-link" href="{{ url('sales') }}">Sales</a>
                     @endif
                 </li>
-                @if(Auth::check())
+                @if (Auth::check())
                     <li class="nav-item dropdown">
                         <a id="inventoryDropdown" class="nav-link dropdown-toggle" href="#" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false" v-pre>
                             Home
@@ -43,6 +43,10 @@
                             <a class="dropdown-item" href="{{ url('bank') }}">
                                 Bank
                             </a>
+                            <div class="dropdown-divider"></div>
+                            <a class="dropdown-item" href="{{ url('comments/liked') }}">
+                                Liked Comments
+                            </a>
                         </div>
                     </li>
                     <li class="nav-item dropdown">
@@ -57,7 +61,7 @@
                                 Claims
                             </a>
                             <a class="dropdown-item" href="{{ url('reports') }}">
-                                My Reports
+                                Reports
                             </a>
                             <a class="dropdown-item" href="{{ url('designs') }}">
                                 Design Approvals
@@ -132,17 +136,17 @@
                         </li>
                     @endif
                 @else
-                    @if(Auth::user()->isStaff)
+                    @if (Auth::user()->isStaff)
                         <li class="nav-item">
                             <a class="nav-link" href="{{ url('admin') }}"><i class="fas fa-crown"></i></a>
                         </li>
                     @endif
-                    @if(Auth::user()->notifications_unread)
+                    @if (Auth::user()->notifications_unread)
                         <li class="nav-item">
                             <a class="nav-link btn btn-secondary btn-sm" href="{{ url('notifications') }}"><span class="fas fa-envelope"></span> {{ Auth::user()->notifications_unread }}</a>
                         </li>
                     @endif
-                    
+
                     <li class="nav-item dropdown">
                         <a id="browseDropdown" class="nav-link dropdown-toggle" href="#" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false" v-pre>
                             Submit
@@ -160,7 +164,7 @@
                             </a>
                         </div>
                     </li>
-                    
+
                     <li class="nav-item dropdown">
                         <a id="navbarDropdown" class="nav-link dropdown-toggle" href="{{ Auth::user()->url }}" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false" v-pre>
                             {{ Auth::user()->name }} <span class="caret"></span>
@@ -179,8 +183,7 @@
                             <a class="dropdown-item" href="{{ url('account/settings') }}">
                                 Settings
                             </a>
-                            <a class="dropdown-item" href="{{ route('logout') }}"
-                                onclick="event.preventDefault();
+                            <a class="dropdown-item" href="{{ route('logout') }}" onclick="event.preventDefault();
                                                 document.getElementById('logout-form').submit();">
                                 {{ __('Logout') }}
                             </a>
@@ -194,4 +197,4 @@
             </ul>
         </div>
     </div>
-</nav>
\ No newline at end of file
+</nav>
diff --git a/resources/views/layouts/_pagination.blade.php b/resources/views/layouts/_pagination.blade.php
new file mode 100644
index 0000000000..77c4be4c11
--- /dev/null
+++ b/resources/views/layouts/_pagination.blade.php
@@ -0,0 +1,55 @@
+@if ($paginator->hasPages())
+    <nav>
+        <ul class="pagination">
+            {{-- Previous Page Link --}}
+            @if ($paginator->onFirstPage())
+                <li class="page-item disabled" aria-disabled="true" aria-label="@lang('pagination.previous')">
+                    <span class="page-link" aria-hidden="true">&lsaquo;</span>
+                </li>
+            @else
+                <li class="page-item">
+                    <a class="page-link" href="{{ $paginator->previousPageUrl() }}" rel="prev" aria-label="@lang('pagination.previous')">&lsaquo;</a>
+                </li>
+            @endif
+
+            {{-- Pagination Elements --}}
+            @foreach ($elements as $element)
+                {{-- "Three Dots" Separator --}}
+                @if (is_string($element))
+                    <li class="page-item pageSelectPopover" data-container="body" data-toggle="popover" data-placement="top" data-title="Jump to Page" data-html="true"
+                        data-content='
+                        <div class="pagination-popover d-flex align-items-center" style="gap: 10px;">
+                            <input type="range" class="form-control-range custom-range paginationPageRange" min="1" max="{{ $paginator->lastPage() }}" value="{{ $paginator->currentPage() }}" oninput="this.nextElementSibling.value = this.value">
+                            <input type="number" style="flex: 1 0 35px; height: 24px;" class="paginationPageText form-control form-control-sm py-0 px-1" min="1" max="{{ $paginator->lastPage() }}" value="{{ $paginator->currentPage() }}" oninput="this.previousElementSibling.value = this.value">
+                            <span class="badge badge-primary paginator-btn p-1 px-2" style="cursor: pointer; font-size: 14px">Go</span>
+                        </div>
+                    '>
+                        <span class="page-link">{{ $element }}</span>
+                    </li>
+                @endif
+
+                {{-- Array Of Links --}}
+                @if (is_array($element))
+                    @foreach ($element as $page => $url)
+                        @if ($page == $paginator->currentPage())
+                            <li class="page-item active" aria-current="page"><span class="page-link">{{ $page }}</span></li>
+                        @else
+                            <li class="page-item"><a class="page-link" href="{{ $url }}">{{ $page }}</a></li>
+                        @endif
+                    @endforeach
+                @endif
+            @endforeach
+
+            {{-- Next Page Link --}}
+            @if ($paginator->hasMorePages())
+                <li class="page-item">
+                    <a class="page-link" href="{{ $paginator->nextPageUrl() }}" rel="next" aria-label="@lang('pagination.next')">&rsaquo;</a>
+                </li>
+            @else
+                <li class="page-item disabled" aria-disabled="true" aria-label="@lang('pagination.next')">
+                    <span class="page-link" aria-hidden="true">&rsaquo;</span>
+                </li>
+            @endif
+        </ul>
+    </nav>
+@endif
diff --git a/resources/views/layouts/_pagination_js.blade.php b/resources/views/layouts/_pagination_js.blade.php
new file mode 100644
index 0000000000..d2bd040e83
--- /dev/null
+++ b/resources/views/layouts/_pagination_js.blade.php
@@ -0,0 +1,16 @@
+<script>
+    $('.pageSelectPopover').popover()
+
+    function onClick(e) {
+        const pageCurrent = new URL(window.location.href);
+        pageCurrent.searchParams.set("page", e.currentTarget.parentElement.querySelector('.paginationPageRange').value);
+        document.location.href = pageCurrent.href;
+    }
+
+    $('.pageSelectPopover').on('shown.bs.popover', function() {
+        $('.paginator-btn').on('click', onClick);
+        // so you can just hit enter after moving the range bar or entering a number
+        $('.paginationPageRange').on('keypress', (e) => e.which === 13 && onClick(e));
+        $('.paginationPageText').on('keypress', (e) => e.which === 13 ? onClick(e) : true);
+    });
+</script>
diff --git a/resources/views/layouts/_simple-pagination.blade.php b/resources/views/layouts/_simple-pagination.blade.php
new file mode 100644
index 0000000000..4bb491742a
--- /dev/null
+++ b/resources/views/layouts/_simple-pagination.blade.php
@@ -0,0 +1,27 @@
+@if ($paginator->hasPages())
+    <nav>
+        <ul class="pagination">
+            {{-- Previous Page Link --}}
+            @if ($paginator->onFirstPage())
+                <li class="page-item disabled" aria-disabled="true">
+                    <span class="page-link">@lang('pagination.previous')</span>
+                </li>
+            @else
+                <li class="page-item">
+                    <a class="page-link" href="{{ $paginator->previousPageUrl() }}" rel="prev">@lang('pagination.previous')</a>
+                </li>
+            @endif
+
+            {{-- Next Page Link --}}
+            @if ($paginator->hasMorePages())
+                <li class="page-item">
+                    <a class="page-link" href="{{ $paginator->nextPageUrl() }}" rel="next">@lang('pagination.next')</a>
+                </li>
+            @else
+                <li class="page-item disabled" aria-disabled="true">
+                    <span class="page-link">@lang('pagination.next')</span>
+                </li>
+            @endif
+        </ul>
+    </nav>
+@endif
diff --git a/resources/views/layouts/app.blade.php b/resources/views/layouts/app.blade.php
index 6335d5a692..808a88a8f9 100644
--- a/resources/views/layouts/app.blade.php
+++ b/resources/views/layouts/app.blade.php
@@ -1,35 +1,40 @@
 <!DOCTYPE html>
 <html lang="{{ str_replace('_', '-', app()->getLocale()) }}">
+
 <head>
     <meta charset="utf-8">
     <meta name="viewport" content="width=device-width, initial-scale=1">
 
     <?php
-        header("Permissions-Policy: interest-cohort=()");
+    header('Permissions-Policy: interest-cohort=()');
     ?>
 
     <!-- CSRF Token -->
     <meta name="csrf-token" content="{{ csrf_token() }}">
+    @if (config('lorekeeper.extensions.use_recaptcha'))
+        <!-- ReCaptcha v3 -->
+        {!! RecaptchaV3::initJs() !!}
+    @endif
 
     <title>{{ config('lorekeeper.settings.site_name', 'Lorekeeper') }} -@yield('title')</title>
 
     <!-- Primary Meta Tags -->
     <meta name="title" content="{{ config('lorekeeper.settings.site_name', 'Lorekeeper') }} -@yield('title')">
-    <meta name="description" content="@if(View::hasSection('meta-desc')) @yield('meta-desc') @else {{ config('lorekeeper.settings.site_desc', 'A Lorekeeper ARPG') }} @endif">
+    <meta name="description" content="@if (View::hasSection('meta-desc')) @yield('meta-desc') @else {{ config('lorekeeper.settings.site_desc', 'A Lorekeeper ARPG') }} @endif">
 
     <!-- Open Graph / Facebook -->
     <meta property="og:type" content="website">
     <meta property="og:url" content="{{ config('app.url', 'http://localhost') }}">
-    <meta property="og:image" content="@if(View::hasSection('meta-img')) @yield('meta-img') @else {{ asset('images/meta-image.png') }} @endif">
+    <meta property="og:image" content="@if (View::hasSection('meta-img')) @yield('meta-img') @else {{ asset('images/meta-image.png') }} @endif">
     <meta property="og:title" content="{{ config('lorekeeper.settings.site_name', 'Lorekeeper') }} -@yield('title')">
-    <meta property="og:description" content="@if(View::hasSection('meta-desc')) @yield('meta-desc') @else {{ config('lorekeeper.settings.site_desc', 'A Lorekeeper ARPG') }} @endif">
+    <meta property="og:description" content="@if (View::hasSection('meta-desc')) @yield('meta-desc') @else {{ config('lorekeeper.settings.site_desc', 'A Lorekeeper ARPG') }} @endif">
 
     <!-- Twitter -->
     <meta property="twitter:card" content="summary_large_image">
     <meta property="twitter:url" content="{{ config('app.url', 'http://localhost') }}">
-    <meta property="twitter:image" content="@if(View::hasSection('meta-img')) @yield('meta-img') @else {{ asset('images/meta-image.png') }} @endif">
+    <meta property="twitter:image" content="@if (View::hasSection('meta-img')) @yield('meta-img') @else {{ asset('images/meta-image.png') }} @endif">
     <meta property="twitter:title" content="{{ config('lorekeeper.settings.site_name', 'Lorekeeper') }} -@yield('title')">
-    <meta property="twitter:description" content="@if(View::hasSection('meta-desc')) @yield('meta-desc') @else {{ config('lorekeeper.settings.site_desc', 'A Lorekeeper ARPG') }} @endif">
+    <meta property="twitter:description" content="@if (View::hasSection('meta-desc')) @yield('meta-desc') @else {{ config('lorekeeper.settings.site_desc', 'A Lorekeeper ARPG') }} @endif">
 
     <!-- No AI scraping directives -->
     <meta name="robots" content="noai">
@@ -54,7 +59,7 @@
 
     <!-- Styles -->
     <link href="{{ asset('css/app.css') }}" rel="stylesheet">
-    <link href="{{ asset('css/lorekeeper.css') }}" rel="stylesheet">
+    <link href="{{ asset('css/lorekeeper.css?v=' . filemtime(public_path('css/lorekeeper.css'))) }}" rel="stylesheet">
 
     {{-- Font Awesome --}}
     <link href="{{ asset('css/all.min.css') }}" rel="stylesheet">
@@ -72,18 +77,20 @@
     <link href="{{ asset('css/croppie.css') }}" rel="stylesheet">
     <link href="{{ asset('css/selectize.bootstrap4.css') }}" rel="stylesheet">
 
-    @if(file_exists(public_path(). '/css/custom.css'))
-        <link href="{{ asset('css/custom.css') }}" rel="stylesheet">
+    @if (file_exists(public_path() . '/css/custom.css'))
+        <link href="{{ asset('css/custom.css') . '?v=' . filemtime(public_path('css/lorekeeper.css')) }}" rel="stylesheet">
     @endif
 
+    @include('feed::links')
 </head>
+
 <body>
     <div id="app">
         <div class="site-header-image" id="header" style="background-image: url('{{ asset('images/header.png') }}');"></div>
         @include('layouts._nav')
-        @if ( View::hasSection('sidebar') )
-			<div class="site-mobile-header bg-secondary"><a href="#" class="btn btn-sm btn-outline-light" id="mobileMenuButton">Menu <i class="fas fa-caret-right ml-1"></i></a></div>
-		@endif
+        @if (View::hasSection('sidebar'))
+            <div class="site-mobile-header bg-secondary"><a href="#" class="btn btn-sm btn-outline-light" id="mobileMenuButton">Menu <i class="fas fa-caret-right ml-1"></i></a></div>
+        @endif
 
         <main class="container-fluid">
             <div class="row">
@@ -93,11 +100,19 @@
                 </div>
                 <div class="main-content col-lg-8 p-4">
                     <div>
-                        @if(Auth::check() && !Config::get('lorekeeper.extensions.navbar_news_notif'))
-                            @if(Auth::user()->is_news_unread)
+                        @if (Settings::get('is_maintenance_mode'))
+                            <div class="alert alert-secondary">
+                                The site is currently in maintenance mode!
+                                @if (!Auth::check() || !Auth::user()->hasPower('maintenance_access'))
+                                    You can browse public content, but cannot make any submissions.
+                                @endif
+                            </div>
+                        @endif
+                        @if (Auth::check() && !config('lorekeeper.extensions.navbar_news_notif'))
+                            @if (Auth::user()->is_news_unread)
                                 <div class="alert alert-info"><a href="{{ url('news') }}">There is a new news post!</a></div>
                             @endif
-                            @if(Auth::user()->is_sales_unread)
+                            @if (Auth::user()->is_sales_unread)
                                 <div class="alert alert-info"><a href="{{ url('sales') }}">There is a new sales post!</a></div>
                             @endif
                         @endif
@@ -106,7 +121,7 @@
                     </div>
 
                     <div class="site-footer mt-4" id="footer">
-                            @include('layouts._footer')
+                        @include('layouts._footer')
                     </div>
                 </div>
             </div>
@@ -128,9 +143,12 @@
         </div>
 
         @yield('scripts')
+        @include('layouts._pagination_js')
         <script>
             $(function() {
-                $('[data-toggle="tooltip"]').tooltip({html: true});
+                $('[data-toggle="tooltip"]').tooltip({
+                    html: true
+                });
                 $('.cp').colorpicker();
                 tinymce.init({
                     selector: '.wysiwyg',
@@ -163,11 +181,12 @@
                 });
 
                 $('.spoiler-text').hide();
-                    $('.spoiler-toggle').click(function(){
-                        $(this).next().toggle();
-                    });
+                $('.spoiler-toggle').click(function() {
+                    $(this).next().toggle();
                 });
+            });
         </script>
     </div>
 </body>
+
 </html>
diff --git a/resources/views/news/_news.blade.php b/resources/views/news/_news.blade.php
index 4f34d2485a..57938f2bdb 100644
--- a/resources/views/news/_news.blade.php
+++ b/resources/views/news/_news.blade.php
@@ -1,5 +1,6 @@
 <div class="card mb-3">
     <div class="card-header">
+        <x-admin-edit title="News Post" :object="$news" />
         <h2 class="card-title mb-0">{!! $news->displayName !!}</h2>
         <small>
             Posted {!! $news->post_at ? pretty_date($news->post_at) : pretty_date($news->created_at) !!} :: Last edited {!! pretty_date($news->updated_at) !!} by {!! $news->user->displayName !!}
@@ -10,14 +11,16 @@
             {!! $news->parsed_text !!}
         </div>
     </div>
-    <?php $commentCount = App\Models\Comment::where('commentable_type', 'App\Models\News')->where('commentable_id', $news->id)->count(); ?>
-    @if(!$page)
+    <?php $commentCount = App\Models\Comment\Comment::where('commentable_type', 'App\Models\News')
+        ->where('commentable_id', $news->id)
+        ->count(); ?>
+    @if (!$page)
         <div class="text-right mb-2 mr-2">
-            <a class="btn" href="{{ $news->url }}"><i class="fas fa-comment"></i> {{ $commentCount }} Comment{{ $commentCount != 1 ? 's' : ''}}</a>
+            <a class="btn" href="{{ $news->url }}"><i class="fas fa-comment"></i> {{ $commentCount }} Comment{{ $commentCount != 1 ? 's' : '' }}</a>
         </div>
     @else
         <div class="text-right mb-2 mr-2">
-            <span class="btn"><i class="fas fa-comment"></i> {{ $commentCount }} Comment{{ $commentCount != 1 ? 's' : ''}}</span>
+            <span class="btn"><i class="fas fa-comment"></i> {{ $commentCount }} Comment{{ $commentCount != 1 ? 's' : '' }}</span>
         </div>
     @endif
 </div>
diff --git a/resources/views/news/_sidebar.blade.php b/resources/views/news/_sidebar.blade.php
new file mode 100644
index 0000000000..c6735b2c1c
--- /dev/null
+++ b/resources/views/news/_sidebar.blade.php
@@ -0,0 +1,20 @@
+<ul>
+    <li class="sidebar-header"><a href="{{ url('news') }}" class="card-link">News</a></li>
+    @if (isset($newses))
+        <li class="sidebar-section">
+            <div class="sidebar-section-header">On This Page</div>
+            @foreach ($newses as $news)
+                @php $newslink = 'news/'.$news->slug; @endphp
+                <div class="sidebar-item"><a href="{{ $news->url }}" class="{{ set_active($newslink) }}">{{ $news->title }}</a></div>
+            @endforeach
+        </li>
+    @else
+        <li class="sidebar-section">
+            <div class="sidebar-section-header">Recent News</div>
+            @foreach ($recentnews as $news)
+                @php $newslink = 'news/'.$news->slug; @endphp
+                <div class="sidebar-item"><a href="{{ $news->url }}" class="{{ set_active($newslink) }}">{{ $news->title }}</a></div>
+            @endforeach
+        </li>
+    @endif
+</ul>
diff --git a/resources/views/news/index.blade.php b/resources/views/news/index.blade.php
index 7fc352b5c9..439899dbf3 100644
--- a/resources/views/news/index.blade.php
+++ b/resources/views/news/index.blade.php
@@ -1,17 +1,19 @@
-@extends('layouts.app')
+@extends('news.layout')
 
-@section('title') Site News @endsection
+@section('title')
+    Site News
+@endsection
 
-@section('content')
-{!! breadcrumbs(['Site News' => 'news']) !!}
-<h1>Site News</h1>
-@if(count($newses))
-    {!! $newses->render() !!}
-    @foreach($newses as $news)
-        @include('news._news', ['news' => $news, 'page' => FALSE])
-    @endforeach
-    {!! $newses->render() !!}
-@else
-    <div>No news posts yet.</div>
-@endif
+@section('news-content')
+    {!! breadcrumbs(['Site News' => 'news']) !!}
+    <h1>Site News</h1>
+    @if (count($newses))
+        {!! $newses->render() !!}
+        @foreach ($newses as $news)
+            @include('news._news', ['news' => $news, 'page' => false])
+        @endforeach
+        {!! $newses->render() !!}
+    @else
+        <div>No news posts yet.</div>
+    @endif
 @endsection
diff --git a/resources/views/news/layout.blade.php b/resources/views/news/layout.blade.php
new file mode 100644
index 0000000000..10e7a52e5b
--- /dev/null
+++ b/resources/views/news/layout.blade.php
@@ -0,0 +1,13 @@
+@extends('layouts.app')
+
+@section('title')
+    Site News :: @yield('news-title')
+@endsection
+
+@section('sidebar')
+    @include('news._sidebar')
+@endsection
+
+@section('content')
+    @yield('news-content')
+@endsection
diff --git a/resources/views/news/news.blade.php b/resources/views/news/news.blade.php
index 2d9ed7970f..82452169da 100644
--- a/resources/views/news/news.blade.php
+++ b/resources/views/news/news.blade.php
@@ -1,16 +1,13 @@
-@extends('layouts.app')
+@extends('news.layout')
 
-@section('title') {{ $news->title }} @endsection
+@section('news-title')
+    {{ $news->title }}
+@endsection
 
-@section('content')
+@section('news-content')
     {!! breadcrumbs(['Site News' => 'news', $news->title => $news->url]) !!}
-    @include('news._news', ['news' => $news, 'page' => TRUE])
-<hr>
-<br><br>
-
-@comments(['model' => $news,
-        'perPage' => 5
-    ])
+    @include('news._news', ['news' => $news, 'page' => true])
+    <hr class="mb-5" />
 
+    @comments(['model' => $news, 'perPage' => 5])
 @endsection
-    
diff --git a/resources/views/pages/_dashboard.blade.php b/resources/views/pages/_dashboard.blade.php
index c865877568..ae335ab0c9 100644
--- a/resources/views/pages/_dashboard.blade.php
+++ b/resources/views/pages/_dashboard.blade.php
@@ -58,3 +58,5 @@
         </div>
     </div>
 </div>
+
+@include('widgets._recent_gallery_submissions', ['gallerySubmissions' => $gallerySubmissions])
diff --git a/resources/views/pages/_logged_out.blade.php b/resources/views/pages/_logged_out.blade.php
index 34c7c5abae..642aa3d913 100644
--- a/resources/views/pages/_logged_out.blade.php
+++ b/resources/views/pages/_logged_out.blade.php
@@ -1,2 +1,2 @@
 <h1>{{ config('lorekeeper.settings.site_name', 'Lorekeeper') }}</h1>
-{!! $about->parsed_text !!}
\ No newline at end of file
+{!! $about->parsed_text !!}
diff --git a/resources/views/pages/credits.blade.php b/resources/views/pages/credits.blade.php
index 53738a0d8c..b7603d2f28 100644
--- a/resources/views/pages/credits.blade.php
+++ b/resources/views/pages/credits.blade.php
@@ -1,107 +1,189 @@
 @extends('layouts.app')
 
-@section('title') Credits @endsection
+@section('title')
+    Credits
+@endsection
 
 @section('content')
-{!! breadcrumbs(['Credits' => url('credits') ]) !!}
-<h1>Credits</h1>
-
-<div class="site-page-content parsed-text">
-    {!! $credits->parsed_text !!}
-</div>
-
-<hr>
+    {!! breadcrumbs(['Credits' => url('credits')]) !!}
+    <h1>Credits</h1>
 
-<h4 class="mb-0">Core Extensions</h4>
-<p class="mb-2">These extensions were coded by the Lorekeeper community, and are now a part of core Lorekeeper.</p>
-<div class="extensions row no-gutters">
-    <p class="mb-0 col-md-4">
-        <a href="http://wiki.lorekeeper.me/index.php?title=Extensions:Stacked_Inventories"><strong>Stacked Inventories</strong></a> by <a href="https://github.com/Draginraptor">Draginraptor</a>
-    </p>
-    <p class="mb-0 col-md-4">
-        <a href="http://wiki.lorekeeper.me/index.php?title=Extensions:Submission_Addons"><strong>Submission Addons</strong></a> by <a href="https://github.com/itinerare">itinerare</a>
-    </p>
-    <p class="mb-0 col-md-4">
-        <a href="http://wiki.lorekeeper.me/index.php?title=Extensions:Character_Items"><strong>Character Items</strong></a> by <a href="https://github.com/itinerare">itinerare</a>
-    </p>
-    <p class="mb-0 col-md-4">
-        <a href="http://wiki.lorekeeper.me/index.php?title=Extensions:Bootstrap_Tables"><strong>Bootstrap Tables</strong></a> by <a href="https://github.com/preimpression">Preimpression</a>
-    </p>
-    <p class="mb-0 col-md-4">
-        <a href="http://wiki.lorekeeper.me/index.php?title=Extensions:Watermarking"><strong>Watermarking</strong></a> by <a href="https://github.com/itinerare">itinerare</a> with masterlist image automation by <a href="https://github.com/SpeedyD">Speedy</a>
-    </p>
-    <p class="mb-0 col-md-4">
-        <a href="http://wiki.lorekeeper.me/index.php?title=Extensions:Separate_Prompts"><strong>Separate Prompts</strong></a> by <a href="https://github.com/itinerare">itinerare</a>
-    </p>
-    <p class="mb-0 col-md-4">
-        <a href="http://wiki.lorekeeper.me/index.php?title=Extensions:Comments"><strong>Comments</strong></a> by <a href="https://github.com/preimpression">Preimpression</a> & <a href="https://github.com/Ne-wt">Ne-wt</a>
-    </p>
-    <p class="mb-0 col-md-4">
-        <a href="http://wiki.lorekeeper.me/index.php?title=Extensions:Reports"><strong>Reports</strong></a> by <a href="https://github.com/Ne-wt">Ne-wt</a>
-    </p>
-    <p class="mb-0 col-md-4">
-        <a href="http://wiki.lorekeeper.me/index.php?title=Extensions:Masterlist_Sublists"><strong>Masterlist Sublists</strong></a> by <a href="https://github.com/junijwi">Junijwi</a>
-    </p>
-    <p class="mb-0 col-md-4">
-        <a href="http://wiki.lorekeeper.me/index.php?title=Extensions:MYO_Item_Tag"><strong>MYO Item Tag</strong></a> by <a href="https://github.com/junijwi">Junijwi</a>
-    </p>
-    <p class="mb-0 col-md-4">
-        <a href="http://wiki.lorekeeper.me/index.php?title=Extensions:User_Transfer_Reasons"><strong>User Transfer Reasons</strong></a> by <a href="https://github.com/snupsplus">Snupsplus</a>
-    </p>
-    <p class="mb-0 col-md-4">
-        <strong>Extension Tracker</strong> by <a href="https://github.com/preimpression">Preimpression</a> (This page/the section below!)
-    </p>
-    <p class="mb-0 col-md-4">
-        <a href="http://wiki.lorekeeper.me/index.php?title=Extensions:Galleries"><strong>Galleries</strong></a> by <a href="https://github.com/itinerare">itinerare</a>
-    </p>
-    <p class="mb-0 col-md-4">
-        <a href="http://wiki.lorekeeper.me/index.php?title=Extensions:Navbar_News_Notif"><strong>Navbar News Notif</strong></a> by <a href="https://github.com/junijwi">Junijwi</a> ({{ Config::get('lorekeeper.extensions.navbar_news_notif') ? 'Enabled' : 'Disabled' }})
-    </p>
-    <p class="mb-0 col-md-4">
-        <a href="http://wiki.lorekeeper.me/index.php?title=Extensions:Species_Trait_Index"><strong>Species Trait Index</strong></a> by <a href="https://github.com/itinerare">itinerare</a> ({{ Config::get('lorekeeper.extensions.species_trait_index') ? 'Enabled' : 'Disabled' }})
-    </p>
-    <p class="mb-0 col-md-4">
-        <a href="http://wiki.lorekeeper.me/index.php?title=Extensions:Character_Status_Badges"><strong>Character Status Badges</strong></a> by <a href="https://github.com/junijwi">Junijwi</a> ({{ Config::get('lorekeeper.extensions.character_status_badges') ? 'Enabled' : 'Disabled' }})
-    </p>
-    <p class="mb-0 col-md-4">
-        <a href="http://wiki.lorekeeper.me/index.php?title=Extensions:Character_TH_Profile_Link"><strong>Character TH Profile Link</strong></a> by <a href="https://github.com/junijwi">Junijwi</a> ({{ Config::get('lorekeeper.extensions.character_TH_profile_link') ? 'Enabled' : 'Disabled' }})
-    </p>
-    <p class="mb-0 col-md-4">
-        <a href="http://wiki.lorekeeper.me/index.php?title=Extensions:Design_Update_Voting"><strong>Design Update Voting</strong></a> by <a href="https://github.com/itinerare">itinerare</a> ({{ Config::get('lorekeeper.extensions.design_update_voting') ? 'Enabled' : 'Disabled' }})
-    </p>
-    <p class="mb-0 col-md-4">
-        <a href="http://wiki.lorekeeper.me/index.php?title=Extensions:Item_Entry_Expansion"><strong>Item Entry Expansion</strong></a> by <a href="https://github.com/itinerare">itinerare</a> ({{ Config::get('lorekeeper.extensions.item_entry_expansion.extra_fields') ? 'Enabled' : 'Disabled' }}/{{ Config::get('lorekeeper.extensions.item_entry_expansion.resale_function') ? 'Enabled' : 'Disabled' }})
-    </p>
-    <p class="mb-0 col-md-4">
-        <strong>Group Traits by Category</strong> by <a href="https://github.com/preimpression">Preimpression</a> ({{ Config::get('lorekeeper.extensions.traits_by_category') ? 'Enabled' : 'Disabled' }})
-    </p>
-    <p class="mb-0 col-md-4">
-        <strong>Character Rewards</strong> by <a href="https://github.com/preimpression">Preimpression</a> ({{ Config::get('lorekeeper.extensions.character_reward_expansion.expanded') ? 'Enabled' : 'Disabled' }}/{{ Config::get('lorekeeper.extensions.character_reward_expansion.default_recipient') ? 'Submitter' : 'Character Owner' }})
-    </p>
-</div>
+    <div class="site-page-content parsed-text">
+        {!! $credits->parsed_text !!}
+    </div>
 
-<hr/>
-<h4 class="mb-0">Installed Extensions</h4>
-<p class="mb-2">These extensions have been added to this site.</p>
+    <hr>
 
-@if($extensions->count())
+    <h4 class="mb-0">Core Extensions</h4>
+    <p class="mb-2">These extensions were coded by the Lorekeeper community and are now a part of core Lorekeeper.</p>
     <div class="extensions row no-gutters">
-        @foreach($extensions as $extension)
-            <p class="mb-0 col-md-4">
-                <a href="http://wiki.lorekeeper.me/index.php?title=Extensions:{{ $extension->wiki_key }}">
-                    <strong>{{ str_replace('_',' ',$extension->wiki_key) }}</strong>
-                    <small>v. {{ $extension->version }}</small>
-                </a>
-                by
-                <?php $extension->array = json_decode($extension->creators,true); $extension->end = end($extension->array); ?>
-                @foreach(json_decode($extension->creators,true) as $name => $url)
-                    <a href="{{ $url }}">{{ $name }}</a>{{$extension->end != $extension->array[$name] ? ',' : '' }}
-                @endforeach
-            </p>
-        @endforeach
+        <p class="mb-0 col-md-4">
+            <a href="http://wiki.lorekeeper.me/index.php?title=Extensions:Admin_Edit_Button"><strong>Admin Edit Buttons</strong></a> by <a href="https://github.com/preimpression/">Preimpression</a>
+        </p>
+        <p class="mb-0 col-md-4">
+            <a href="http://wiki.lorekeeper.me/index.php?title=Extensions:Alias_Logins"><strong>Alias Logins</strong></a> by <a href="https://github.com/AW0005">Moif</a>
+        </p>
+        <p class="mb-0 col-md-4">
+            <a href="http://wiki.lorekeeper.me/index.php?title=Extensions:Bootstrap_Tables"><strong>Bootstrap Tables</strong></a> by <a href="https://github.com/preimpression">Preimpression</a>
+        </p>
+        <p class="mb-0 col-md-4">
+            <a href="http://wiki.lorekeeper.me/index.php?title=Extensions:Character_Items"><strong>Character Items</strong></a> by <a href="https://github.com/itinerare">itinerare</a>
+        </p>
+        <p class="mb-0 col-md-4">
+            <a href="http://wiki.lorekeeper.me/index.php?title=Extensions:Comments"><strong>Comments</strong></a> by <a href="https://github.com/preimpression">Preimpression</a> & <a href="https://github.com/Ne-wt">Ne-wt</a>
+        </p>
+        <p class="mb-0 col-md-4">
+            <a href="http://wiki.lorekeeper.me/index.php?title=Extensions:Deactivate_Account"><strong>Deactivate Account</strong></a> by <a href="https://github.com/preimpression">Preimpression</a>
+        </p>
+        <p class="mb-0 col-md-4">
+            <a href="http://wiki.lorekeeper.me/index.php?title=Extensions:Extended_Mentions"><strong>Extended Mentions</strong></a> by <a href="https://github.com/SpeedyD">Speedy</a>
+        </p>
+        <p class="mb-0 col-md-4">
+            <a href="http://wiki.lorekeeper.me/index.php?title=Extensions:Extension_Tracker"><strong>Extension Tracker</strong></a> by <a href="https://github.com/preimpression">Preimpression</a> (This page/the section below!)
+        </p>
+        <p class="mb-0 col-md-4">
+            <a href="http://wiki.lorekeeper.me/index.php?title=Extensions:Galleries"><strong>Galleries</strong></a> by <a href="https://github.com/itinerare">itinerare</a>
+        </p>
+        <p class="mb-0 col-md-4">
+            <a href="http://wiki.lorekeeper.me/index.php?title=Extensions:Masterlist_Sublists"><strong>Masterlist Sublists</strong></a> by <a href="https://github.com/junijwi">Junijwi</a>
+        </p>
+        <p class="mb-0 col-md-4">
+            <a href="http://wiki.lorekeeper.me/index.php?title=Extensions:MYO_Item_Tag"><strong>MYO Item Tag</strong></a> by <a href="https://github.com/junijwi">Junijwi</a>
+        </p>
+        <p class="mb-0 col-md-4">
+            <a href="http://wiki.lorekeeper.me/index.php?title=Extensions:Pagination_Page_Select"><strong>Pagination Page Selector</strong></a> by <a href="https://github.com/SpeedyD">Speedy</a> and <a href="https://github.com/AW0005">Moif</a>
+        </p>
+        <p class="mb-0 col-md-4">
+            <a href="http://wiki.lorekeeper.me/index.php?title=Extensions:Reports"><strong>Reports</strong></a> by <a href="https://github.com/Ne-wt">Ne-wt</a>
+        </p>
+        <p class="mb-0 col-md-4">
+            <a href="http://wiki.lorekeeper.me/index.php?title=Extensions:Separate_Prompts"><strong>Separate Prompts</strong></a> by <a href="https://github.com/itinerare">itinerare</a>
+        </p>
+        <p class="mb-0 col-md-4">
+            <a href="http://wiki.lorekeeper.me/index.php?title=Extensions:Stacked_Inventories"><strong>Stacked Inventories</strong></a> by <a href="https://github.com/Draginraptor">Draginraptor</a>
+        </p>
+        <p class="mb-0 col-md-4">
+            <a href="http://wiki.lorekeeper.me/index.php?title=Extensions:Submission_Addons"><strong>Submission Addons</strong></a> by <a href="https://github.com/itinerare">itinerare</a>
+        </p>
+        <p class="mb-0 col-md-4">
+            <a href="http://wiki.lorekeeper.me/index.php?title=Extensions:Submission_Drafts"><strong>Submission Drafts</strong></a> by <a href="https://github.com/preimpression/">Preimpression</a>
+        </p>
+        <p class="mb-0 col-md-4">
+            <a href="http://wiki.lorekeeper.me/index.php?title=Extensions:User_Transfer_Reasons"><strong>User Transfer Reasons</strong></a> by <a href="https://github.com/snupsplus">Snupsplus</a>
+        </p>
+        <p class="mb-0 col-md-4">
+            <a href="http://wiki.lorekeeper.me/index.php?title=Extensions:Aliases_on_Userpage"><strong>Aliases on Userpage</strong></a> by <a href="https://github.com/SpeedyD">Speedy</a>
+            ({{ config('lorekeeper.extensions.aliases_on_userpage') ? 'Enabled' : 'Disabled' }})
+        </p>
+        <p class="mb-0 col-md-4">
+            <a href="http://wiki.lorekeeper.me/index.php?title=Extensions:Autopopulate_New_Image_Traits"><strong>Auto-populate New Image Traits</strong></a> by <a href="https://github.com/itinerare">itinerare</a>
+            ({{ config('lorekeeper.extensions.autopopulate_image_features') ? 'Enabled' : 'Disabled' }})
+        </p>
+        <p class="mb-0 col-md-4">
+            <a href="http://wiki.lorekeeper.me/index.php?title=Extensions:Captcha"><strong>Captcha</strong> (v3)</a> by <a href="https://github.com/itinerare">itinerare</a>
+            ({{ config('lorekeeper.extensions.use_recaptcha') ? 'Enabled' : 'Disabled' }})
+        </p>
+        <p class="mb-0 col-md-4">
+            <a href="http://wiki.lorekeeper.me/index.php?title=Extensions:Character_Prev_and_Next"><strong>Character Prev and Next</strong></a> by <a href="https://github.com/SpeedyD">Speedy</a>
+            ({{ config('lorekeeper.extensions.previous_and_next_characters.display') ? 'Enabled' : 'Disabled' }})
+        </p>
+        <p class="mb-0 col-md-4">
+            <a href="http://wiki.lorekeeper.me/index.php?title=Extensions:Character_Rewards"><strong>Character Rewards</strong></a> by <a href="https://github.com/preimpression">Preimpression</a>
+            ({{ config('lorekeeper.extensions.character_reward_expansion.expanded') ? 'Enabled' : 'Disabled' }}/{{ config('lorekeeper.extensions.character_reward_expansion.default_recipient') ? 'Submitter' : 'Character Owner' }})
+        </p>
+        <p class="mb-0 col-md-4">
+            <a href="http://wiki.lorekeeper.me/index.php?title=Extensions:Character_Status_Badges"><strong>Character Status Badges</strong></a> by <a href="https://github.com/junijwi">Junijwi</a>
+            ({{ config('lorekeeper.extensions.character_status_badges') ? 'Enabled' : 'Disabled' }})
+        </p>
+        <p class="mb-0 col-md-4">
+            <a href="http://wiki.lorekeeper.me/index.php?title=Extensions:Character_TH_Profile_Link"><strong>Character TH Profile Link</strong></a> by <a href="https://github.com/junijwi">Junijwi</a>
+            ({{ config('lorekeeper.extensions.character_TH_profile_link') ? 'Enabled' : 'Disabled' }})
+        </p>
+        <p class="mb-0 col-md-4">
+            <a href="http://wiki.lorekeeper.me/index.php?title=Extensions:Collapsible_Admin_Sidebar"><strong>Collapsible Admin Sidebar</strong></a> by <a href="https://github.com/ScuffedNewt">ScuffedNewt</a>
+            ({{ config('lorekeeper.extensions.collapsible_admin_sidebar') ? 'Enabled' : 'Disabled' }})
+        </p>
+        <p class="mb-0 col-md-4">
+            <a href="http://wiki.lorekeeper.me/index.php?title=Extensions:Design_Update_Voting"><strong>Design Update Voting</strong></a> by <a href="https://github.com/itinerare">itinerare</a>
+            ({{ config('lorekeeper.extensions.design_update_voting') ? 'Enabled' : 'Disabled' }})
+        </p>
+        <p class="mb-0 col-md-4">
+            <a href="http://wiki.lorekeeper.me/index.php?title=Extensions:Gravatar"><strong>Gravatar</strong></a> by <a href="https://github.com/ScuffedNewt">ScuffedNewt</a>
+            ({{ config('lorekeeper.extensions.use_gravatar') ? 'Enabled' : 'Disabled' }})
+        </p>
+        <p class="mb-0 col-md-4">
+            <a href="http://wiki.lorekeeper.me/index.php?title=Extensions:Group_Traits_by_Category"><strong>Group Traits by Category</strong></a> by <a href="https://github.com/preimpression">Preimpression</a>
+            ({{ config('lorekeeper.extensions.traits_by_category') ? 'Enabled' : 'Disabled' }})
+        </p>
+        <p class="mb-0 col-md-4">
+            <a href="http://wiki.lorekeeper.me/index.php?title=Extensions:Item_Entry_Expansion"><strong>Item Entry Expansion</strong></a> by <a href="https://github.com/itinerare">itinerare</a>
+            ({{ config('lorekeeper.extensions.item_entry_expansion.extra_fields') ? 'Enabled' : 'Disabled' }}/{{ config('lorekeeper.extensions.item_entry_expansion.resale_function') ? 'Enabled' : 'Disabled' }})
+        </p>
+        <p class="mb-0 col-md-4">
+            <a href="http://wiki.lorekeeper.me/index.php?title=Extensions:MYO_Image_Removal"><strong>MYO Image Removal</strong></a> by <a href="https://github.com/itinerare">itinerare</a>
+            ({{ config('lorekeeper.extensions.remove_myo_image') ? 'Enabled' : 'Disabled' }})
+        </p>
+        <p class="mb-0 col-md-4">
+            <a href="http://wiki.lorekeeper.me/index.php?title=Extensions:Navbar_News_Notif"><strong>Navbar News Notif</strong></a> by <a href="https://github.com/junijwi">Junijwi</a>
+            ({{ config('lorekeeper.extensions.navbar_news_notif') ? 'Enabled' : 'Disabled' }})
+        </p>
+        <p class="mb-0 col-md-4">
+            <a href="http://wiki.lorekeeper.me/index.php?title=Extensions:Organised_Traits_Dropdown"><strong>Organised Traits Dropdown</strong></a> by <a href="https://github.com/draginraptor">Draginraptor</a>
+            ({{ config('lorekeeper.extensions.organised_traits_dropdown') ? 'Enabled' : 'Disabled' }})
+        </p>
+        <p class="mb-0 col-md-4">
+            <a href="http://wiki.lorekeeper.me/index.php?title=Extensions:Scroll_To_Top"><strong>Scroll to Top</strong></a> by <a href="https://github.com/preimpression">Preimpression</a>
+            ({{ config('lorekeeper.extensions.scroll_to_top') ? 'Enabled' : 'Disabled' }})
+        </p>
+        <p class="mb-0 col-md-4">
+            <a href="http://wiki.lorekeeper.me/index.php?title=Extensions:Gallery_Recent_Submissions"><strong>Show All Recent Submissions</strong></a> by <a href="https://github.com/SpeedyD">Speedy</a>
+            ({{ config('lorekeeper.extensions.show_all_recent_submissions.enable') ? 'Enabled' . ((config('lorekeeper.extensions.show_all_recent_submissions.links.sidebar') && config('lorekeeper.extensions.show_all_recent_submissions.links.indexbutton') ? '/Both' : (config('lorekeeper.extensions.show_all_recent_submissions.links.sidebar') ? '/Sidebar' : '') . (config('lorekeeper.extensions.show_all_recent_submissions.links.indexbutton') ? '/Button' : '')) . (config('lorekeeper.extensions.show_all_recent_submissions.section_on_front') ? '/Front' : '')) : 'Disabled' }})
+        </p>
+        <p class="mb-0 col-md-4">
+            <a href="http://wiki.lorekeeper.me/index.php?title=Extensions:Species_Trait_Index"><strong>Species Trait Index</strong></a> by <a href="https://github.com/itinerare">itinerare</a>
+            ({{ config('lorekeeper.extensions.species_trait_index.enable') ? 'Enabled' : 'Disabled' }})
+        </p>
+        <p class="mb-0 col-md-4">
+            <a href="http://wiki.lorekeeper.me/index.php?title=Extensions:Staff_Rewards"><strong>Staff Rewards</strong></a> by <a href="https://github.com/itinerare">itinerare</a>
+            ({{ config('lorekeeper.extensions.staff_rewards.enabled') ? 'Enabled' : 'Disabled' }})
+        </p>
+        <p class="mb-0 col-md-4">
+            <a href="http://wiki.lorekeeper.me/index.php?title=Extensions:Watermarking"><strong>Watermarking</strong></a> by <a href="https://github.com/itinerare">itinerare</a>
+            ({{ config('lorekeeper.settings.watermark_masterlist_images') ? 'Enabled' : 'Disabled' }})
+        </p>
+        <p class="mb-0 col-md-4">
+            <a href="http://wiki.lorekeeper.me/index.php?title=Extensions:Watermarking_Image_Automation"><strong>Watermarking - Image Automation</strong></a> by <a href="https://github.com/SpeedyD">Speedy</a>
+            ({{ config('lorekeeper.settings.masterlist_image_automation') ? 'Enabled' : 'Disabled' }})
+        </p>
+        <p class="mb-0 col-md-4">
+            <a href="http://wiki.lorekeeper.me/index.php?title=Extensions:90_Percent_Watermark"><strong>Watermark Resizing</strong></a> by <a href="https://github.com/SpeedyD">Speedy</a>
+            ({{ config('lorekeeper.settings.watermark_resizing') ? 'Enabled' : 'Disabled' }})/({{ config('lorekeeper.settings.watermark_resizing_thumb') ? 'Enabled' : 'Disabled' }})
+        </p>
     </div>
-@else
-    <p>No extensions found.</p>
-@endif
+
+    <hr />
+    <h4 class="mb-0">Installed Extensions</h4>
+    <p class="mb-2">These extensions have been added to this site.</p>
+
+    @if ($extensions->count())
+        <div class="extensions row no-gutters">
+            @foreach ($extensions as $extension)
+                <p class="mb-0 col-md-4">
+                    <a href="http://wiki.lorekeeper.me/index.php?title=Extensions:{{ $extension->wiki_key }}">
+                        <strong>{{ str_replace('_', ' ', $extension->wiki_key) }}</strong>
+                        <small>v. {{ $extension->version }}</small>
+                    </a>
+                    by
+                    <?php $extension->array = json_decode($extension->creators, true);
+                    $extension->end = end($extension->array); ?>
+                    @foreach (json_decode($extension->creators, true) as $name => $url)
+                        <a href="{{ $url }}">{{ $name }}</a>{{ $extension->end != $extension->array[$name] ? ',' : '' }}
+                    @endforeach
+                </p>
+            @endforeach
+        </div>
+    @else
+        <p>No extensions found.</p>
+    @endif
 
 @endsection
diff --git a/resources/views/pages/page.blade.php b/resources/views/pages/page.blade.php
index f0a7695eae..6d6eb4075b 100644
--- a/resources/views/pages/page.blade.php
+++ b/resources/views/pages/page.blade.php
@@ -1,25 +1,29 @@
 @extends('layouts.app')
 
-@section('title') {{ $page->title }} @endsection
+@section('title')
+    {{ $page->title }}
+@endsection
 
 @section('content')
-{!! breadcrumbs([$page->title => $page->url]) !!}
-<h1>{{ $page->title }}</h1>
-<div class="mb-4">
-    <div><strong>Created:</strong> {!! format_date($page->created_at) !!}</div>
-    <div><strong>Last updated:</strong> {!! format_date($page->updated_at) !!}</div>
-</div>  
-
-<div class="site-page-content parsed-text">
-    {!! $page->parsed_text !!}
-</div>
+    <x-admin-edit title="Page" :object="$page" />
+    {!! breadcrumbs([$page->title => $page->url]) !!}
+    <h1>{{ $page->title }}</h1>
+    <div class="mb-4">
+        <div><strong>Created:</strong> {!! format_date($page->created_at) !!}</div>
+        <div><strong>Last updated:</strong> {!! format_date($page->updated_at) !!}</div>
+    </div>
 
-@if($page->can_comment)
-    <div class="container">
-        @comments(['model' => $page,
-                'perPage' => 5
-            ])
+    <div class="site-page-content parsed-text">
+        {!! $page->parsed_text !!}
     </div>
-@endif
 
+    @if ($page->can_comment)
+        <div class="container">
+            @comments([
+                'model' => $page,
+                'perPage' => 5,
+                'allow_dislikes' => $page->allow_dislikes,
+            ])
+        </div>
+    @endif
 @endsection
diff --git a/resources/views/prompts/_entry.blade.php b/resources/views/prompts/_entry.blade.php
index 1c8314c955..958da2a050 100644
--- a/resources/views/prompts/_entry.blade.php
+++ b/resources/views/prompts/_entry.blade.php
@@ -1,9 +1,15 @@
 <div class="row world-entry">
-    @if($imageUrl)
+    @if ($imageUrl)
         <div class="col-md-3 world-entry-image"><a href="{{ $imageUrl }}" data-lightbox="entry" data-title="{{ $name }}"><img src="{{ $imageUrl }}" class="world-entry-image" alt="{{ $name }}" /></a></div>
     @endif
     <div class="{{ $imageUrl ? 'col-md-9' : 'col-12' }}">
-        <h3>{!! $name !!} @if(isset($searchUrl) && $searchUrl) <a href="{{ $searchUrl }}" class="world-entry-search text-muted"><i class="fas fa-search"></i></a>  @endif</h3>
+        @if (isset($edit))
+            <x-admin-edit title="{{ $edit['title'] }}" :object="$edit['object']" />
+        @endif
+        <h3>{!! $name !!} @if (isset($searchUrl) && $searchUrl)
+                <a href="{{ $searchUrl }}" class="world-entry-search text-muted"><i class="fas fa-search"></i></a>
+            @endif
+        </h3>
         <div class="world-entry-text">
             {!! $description !!}
         </div>
diff --git a/resources/views/prompts/_prompt_entry.blade.php b/resources/views/prompts/_prompt_entry.blade.php
index 011e3f90e1..5f344b2db9 100644
--- a/resources/views/prompts/_prompt_entry.blade.php
+++ b/resources/views/prompts/_prompt_entry.blade.php
@@ -1,38 +1,42 @@
 <div class="row world-entry">
-    @if($prompt->has_image)
+    @if ($prompt->has_image)
         <div class="col-md-3 world-entry-image"><a href="{{ $prompt->imageUrl }}" data-lightbox="entry" data-title="{{ $prompt->name }}"><img src="{{ $prompt->imageUrl }}" class="world-entry-image" alt="{{ $prompt->name }}" /></a></div>
     @endif
     <div class="{{ $prompt->has_image ? 'col-md-9' : 'col-12' }}">
+        <x-admin-edit title="Prompt" :object="$prompt" />
         <div class="mb-3">
-            <h3 class="mb-0">{!! $prompt->name !!}</h3>
-            @if($prompt->prompt_category_id)
+            @if (isset($isPage))
+                <h1 class="mb-0">{!! $prompt->name !!}</h1>
+            @else
+                <h2 class="mb-0"><a href="{{ url('prompts/' . $prompt->id) }}">{!! $prompt->name !!}</a></h2>
+            @endif
+            @if ($prompt->prompt_category_id)
                 <div><strong>Category: </strong>{!! $prompt->category->displayName !!}</div>
             @endif
-            @if($prompt->start_at && $prompt->start_at->isFuture())
+            @if ($prompt->start_at && $prompt->start_at->isFuture())
                 <div><strong>Starts: </strong>{!! format_date($prompt->start_at) !!} ({{ $prompt->start_at->diffForHumans() }})</div>
             @endif
-            @if($prompt->end_at)
+            @if ($prompt->end_at)
                 <div><strong>Ends: </strong>{!! format_date($prompt->end_at) !!} ({{ $prompt->end_at->diffForHumans() }})</div>
             @endif
         </div>
         <div class="world-entry-text">
             <p>{{ $prompt->summary }}</p>
-            <div class="text-right"><a data-toggle="collapse" href="#prompt-{{ $prompt->id }}" class="text-primary"><strong>Show details...</strong></a></div>
-            <div class="collapse" id="prompt-{{ $prompt->id }}">
-                <h4>Details</h4>
-                @if($prompt->parsed_description)
+            <h3 class="mb-3"><a data-toggle="collapse" href="#prompt-{{ $prompt->id }}" @if (isset($isPage)) aria-expanded="true" @endif)>Details <i class="fas fa-angle-down"></i></a></h3>
+            <div class="collapse @if (isset($isPage)) show @endif mb-5" id="prompt-{{ $prompt->id }}">
+                @if ($prompt->parsed_description)
                     {!! $prompt->parsed_description !!}
                 @else
                     <p>No further details.</p>
                 @endif
-                @if($prompt->hide_submissions == 1 && isset($prompt->end_at) && $prompt->end_at > Carbon\Carbon::now())
+                @if ($prompt->hide_submissions == 1 && isset($prompt->end_at) && $prompt->end_at > Carbon\Carbon::now())
                     <p class="text-info">Submissions to this prompt are hidden until this prompt ends.</p>
                 @elseif($prompt->hide_submissions == 2)
                     <p class="text-info">Submissions to this prompt are hidden.</p>
                 @endif
             </div>
-            <h4>Rewards</h4>
-            @if(!count($prompt->rewards))
+            <h3>Rewards</h3>
+            @if (!count($prompt->rewards))
                 No rewards.
             @else
                 <table class="table table-sm">
@@ -43,7 +47,7 @@
                         </tr>
                     </thead>
                     <tbody>
-                        @foreach($prompt->rewards as $reward)
+                        @foreach ($prompt->rewards as $reward)
                             <tr>
                                 <td>{!! $reward->reward->displayName !!}</td>
                                 <td>{{ $reward->quantity }}</td>
@@ -54,13 +58,13 @@
             @endif
         </div>
         <div class="text-right">
-            @if($prompt->end_at && $prompt->end_at->isPast())
+            @if ($prompt->end_at && $prompt->end_at->isPast())
                 <span class="text-secondary">This prompt has ended.</span>
             @elseif($prompt->start_at && $prompt->start_at->isFuture())
                 <span class="text-secondary">This prompt is not open for submissions yet.</span>
             @else
                 <a href="{{ url('submissions/new?prompt_id=' . $prompt->id) }}" class="btn btn-primary">Submit Prompt</a>
             @endunless
-        </div>
     </div>
 </div>
+</div>
diff --git a/resources/views/prompts/_sidebar.blade.php b/resources/views/prompts/_sidebar.blade.php
index 283c6c8680..a110424f2f 100644
--- a/resources/views/prompts/_sidebar.blade.php
+++ b/resources/views/prompts/_sidebar.blade.php
@@ -1,8 +1,10 @@
 <ul>
-    <li class="sidebar-header"><a =class="card-link"><a href="{{ url('prompts') }}">Prompts</a></a></li>
+    <li class="sidebar-header">
+        <a=class="card-link"><a href="{{ url('prompts') }}">Prompts</a></a>
+    </li>
     <li class="sidebar-section">
         <div class="sidebar-section-header">Prompts</div>
         <div class="sidebar-item"><a href="{{ url('prompts/prompt-categories') }}" class="{{ set_active('prompts/prompt-categories*') }}">Prompt Categories</a></div>
         <div class="sidebar-item"><a href="{{ url('prompts/prompts') }}" class="{{ set_active('prompts/prompts*') }}">All Prompts</a></div>
     </li>
-</ul>
\ No newline at end of file
+</ul>
diff --git a/resources/views/prompts/index.blade.php b/resources/views/prompts/index.blade.php
index 933ec97184..9b20099ef6 100644
--- a/resources/views/prompts/index.blade.php
+++ b/resources/views/prompts/index.blade.php
@@ -1,23 +1,25 @@
 @extends('prompts.layout')
 
-@section('title') Prompts @endsection
+@section('prompts-title')
+    Home
+@endsection
 
 @section('content')
-{!! breadcrumbs(['Prompts' => 'prompts']) !!}
+    {!! breadcrumbs(['Prompts' => 'prompts']) !!}
 
-<h1>Prompts</h1>
-<div class="row">
-    <div class="col-12">
-        <div class="card mb-4">
-            <div class="card-body text-center">
-                <img src="{{ asset('images/inventory.png') }}" alt="Prompts" />
-                <h5 class="card-title">Prompts</h5>
+    <h1>Prompts</h1>
+    <div class="row">
+        <div class="col-12">
+            <div class="card mb-4">
+                <div class="card-body text-center">
+                    <img src="{{ asset('images/inventory.png') }}" alt="Prompts" />
+                    <h5 class="card-title">Prompts</h5>
+                </div>
+                <ul class="list-group list-group-flush">
+                    <li class="list-group-item"><a href="{{ url('prompts/prompt-categories') }}">Prompts Categories</a></li>
+                    <li class="list-group-item"><a href="{{ url('prompts/prompts') }}">All Prompts</a></li>
+                </ul>
             </div>
-            <ul class="list-group list-group-flush">
-                <li class="list-group-item"><a href="{{ url('prompts/prompt-categories') }}">Prompts Categories</a></li>
-                <li class="list-group-item"><a href="{{ url('prompts/prompts') }}">All Prompts</a></li>
-            </ul>
         </div>
     </div>
-</div>
 @endsection
diff --git a/resources/views/prompts/layout.blade.php b/resources/views/prompts/layout.blade.php
index d97b0080d1..bb0d2d82ff 100644
--- a/resources/views/prompts/layout.blade.php
+++ b/resources/views/prompts/layout.blade.php
@@ -1,7 +1,7 @@
 @extends('layouts.app')
 
-@section('title') 
-    Prompts :: 
+@section('title')
+    Prompts ::
     @yield('prompts-title')
 @endsection
 
@@ -14,5 +14,5 @@
 @endsection
 
 @section('scripts')
-@parent
-@endsection
\ No newline at end of file
+    @parent
+@endsection
diff --git a/resources/views/prompts/prompt.blade.php b/resources/views/prompts/prompt.blade.php
new file mode 100644
index 0000000000..7866ba0e1c
--- /dev/null
+++ b/resources/views/prompts/prompt.blade.php
@@ -0,0 +1,10 @@
+@extends('prompts.layout')
+
+@section('title')
+    {{ $prompt->name }}
+@endsection
+
+@section('content')
+    {!! breadcrumbs(['Prompts' => 'prompts', 'All Prompts' => 'prompts/prompts', $prompt->name => 'prompts/' . $prompt->id]) !!}
+    @include('prompts._prompt_entry', ['prompt' => $prompt, 'isPage' => true])
+@endsection
diff --git a/resources/views/prompts/prompt_categories.blade.php b/resources/views/prompts/prompt_categories.blade.php
index 6798e72fa0..68d7cbbec4 100644
--- a/resources/views/prompts/prompt_categories.blade.php
+++ b/resources/views/prompts/prompt_categories.blade.php
@@ -1,32 +1,39 @@
 @extends('prompts.layout')
 
-@section('title') Prompt Categories @endsection
+@section('prompts-title')
+    Prompt Categories
+@endsection
 
 @section('content')
-{!! breadcrumbs(['Prompts' => 'prompts', 'Prompt Categories' => 'prompts/prompt-categories']) !!}
-<h1>Prompt Categories</h1>
+    {!! breadcrumbs(['Prompts' => 'prompts', 'Prompt Categories' => 'prompts/prompt-categories']) !!}
+    <h1>Prompt Categories</h1>
 
-<div>
-    {!! Form::open(['method' => 'GET', 'class' => 'form-inline justify-content-end']) !!}
+    <div>
+        {!! Form::open(['method' => 'GET', 'class' => 'form-inline justify-content-end']) !!}
         <div class="form-group mr-3 mb-3">
             {!! Form::text('name', Request::get('name'), ['class' => 'form-control']) !!}
         </div>
         <div class="form-group mb-3">
             {!! Form::submit('Search', ['class' => 'btn btn-primary']) !!}
         </div>
-    {!! Form::close() !!}
-</div>
-
-{!! $categories->render() !!}
-@foreach($categories as $category)
-    <div class="card mb-3">
-        <div class="card-body">
-        @include('prompts._entry', ['imageUrl' => $category->categoryImageUrl, 'name' => $category->displayName, 'description' => $category->parsed_description, 'searchUrl' => $category->searchUrl])
-        </div>
+        {!! Form::close() !!}
     </div>
-@endforeach
-{!! $categories->render() !!}
 
-<div class="text-center mt-4 small text-muted">{{ $categories->total() }} result{{ $categories->total() == 1 ? '' : 's' }} found.</div>
+    {!! $categories->render() !!}
+    @foreach ($categories as $category)
+        <div class="card mb-3">
+            <div class="card-body">
+                @include('prompts._entry', [
+                    'edit' => ['object' => $category, 'title' => 'Category'],
+                    'imageUrl' => $category->categoryImageUrl,
+                    'name' => $category->displayName,
+                    'description' => $category->parsed_description,
+                    'searchUrl' => $category->searchUrl,
+                ])
+            </div>
+        </div>
+    @endforeach
+    {!! $categories->render() !!}
 
+    <div class="text-center mt-4 small text-muted">{{ $categories->total() }} result{{ $categories->total() == 1 ? '' : 's' }} found.</div>
 @endsection
diff --git a/resources/views/prompts/prompts.blade.php b/resources/views/prompts/prompts.blade.php
index 70db3b9379..3572fcd54b 100644
--- a/resources/views/prompts/prompts.blade.php
+++ b/resources/views/prompts/prompts.blade.php
@@ -1,52 +1,60 @@
 @extends('prompts.layout')
 
-@section('title') All Prompts @endsection
+@section('prompts-title')
+    All Prompts
+@endsection
 
 @section('content')
-{!! breadcrumbs(['Prompts' => 'prompts', 'All Prompts' => 'prompts/prompts']) !!}
-<h1>All Prompts</h1>
+    {!! breadcrumbs(['Prompts' => 'prompts', 'All Prompts' => 'prompts/prompts']) !!}
+    <h1>All Prompts</h1>
 
-<div>
-    {!! Form::open(['method' => 'GET', 'class' => '']) !!}
+    <div>
+        {!! Form::open(['method' => 'GET', 'class' => '']) !!}
         <div class="form-inline justify-content-end">
             <div class="form-group ml-3 mb-3">
                 {!! Form::text('name', Request::get('name'), ['class' => 'form-control', 'placeholder' => 'Name']) !!}
             </div>
             <div class="form-group ml-3 mb-3">
-                {!! Form::select('prompt_category_id', $categories, Request::get('name'), ['class' => 'form-control']) !!}
+                {!! Form::select('prompt_category_id', $categories, Request::get('prompt_category_id'), ['class' => 'form-control']) !!}
             </div>
-        </div>
-        <div class="form-inline justify-content-end">
             <div class="form-group ml-3 mb-3">
-                {!! Form::select('sort', [
-                    'alpha'          => 'Sort Alphabetically (A-Z)',
-                    'alpha-reverse'  => 'Sort Alphabetically (Z-A)',
-                    'category'       => 'Sort by Category',
-                    'newest'         => 'Newest First',
-                    'oldest'         => 'Oldest First',
-                    'start'          => 'Starts Earliest',
-                    'start-reverse'  => 'Starts Latest',
-                    'end'            => 'Ends Earliest',
-                    'end-reverse'    => 'Ends Latest'      
-                ], Request::get('sort') ? : 'category', ['class' => 'form-control']) !!}
+                {!! Form::select('open_prompts', ['any' => 'Any Status', 'open' => 'Open Prompts', 'closed' => 'Closed Prompts'], Request::get('open_prompts') ?? 'any', ['class' => 'form-control selectize']) !!}
             </div>
-            <div class="form-group ml-3 mb-3">
-                {!! Form::submit('Search', ['class' => 'btn btn-primary']) !!}
+            <div class="form-inline justify-content-end">
+                <div class="form-group ml-3 mb-3">
+                    {!! Form::select(
+                        'sort',
+                        [
+                            'alpha' => 'Sort Alphabetically (A-Z)',
+                            'alpha-reverse' => 'Sort Alphabetically (Z-A)',
+                            'category' => 'Sort by Category',
+                            'newest' => 'Newest First',
+                            'oldest' => 'Oldest First',
+                            'start' => 'Starts Earliest',
+                            'start-reverse' => 'Starts Latest',
+                            'end' => 'Ends Earliest',
+                            'end-reverse' => 'Ends Latest',
+                        ],
+                        Request::get('sort') ?: 'category',
+                        ['class' => 'form-control'],
+                    ) !!}
+                </div>
+                <div class="form-group ml-3 mb-3">
+                    {!! Form::submit('Search', ['class' => 'btn btn-primary']) !!}
+                </div>
             </div>
+            {!! Form::close() !!}
         </div>
-    {!! Form::close() !!}
-</div>
 
-{!! $prompts->render() !!}
-@foreach($prompts as $prompt)
-    <div class="card mb-3">
-        <div class="card-body">
-            @include('prompts._prompt_entry', ['prompt' => $prompt])
-        </div>
-    </div>
-@endforeach
-{!! $prompts->render() !!}
-
-<div class="text-center mt-4 small text-muted">{{ $prompts->total() }} result{{ $prompts->total() == 1 ? '' : 's' }} found.</div>
+        {!! $prompts->render() !!}
+        @foreach ($prompts as $prompt)
+            <div class="card mb-3">
+                <div class="card-body">
+                    @include('prompts._prompt_entry', ['prompt' => $prompt])
+                </div>
+            </div>
+        @endforeach
+        {!! $prompts->render() !!}
 
-@endsection
+        <div class="text-center mt-4 small text-muted">{{ $prompts->total() }} result{{ $prompts->total() == 1 ? '' : 's' }} found.</div>
+    @endsection
diff --git a/resources/views/raffles/index.blade.php b/resources/views/raffles/index.blade.php
index 446695e3e6..a469366749 100644
--- a/resources/views/raffles/index.blade.php
+++ b/resources/views/raffles/index.blade.php
@@ -1,40 +1,42 @@
 @extends('layouts.app')
 
-@section('title') Raffles @endsection
+@section('title')
+    Raffles
+@endsection
 
 @section('content')
-{!! breadcrumbs(['Raffles' => 'raffles']) !!}
-<h1>Raffles</h1>
-<p>Click on the name of a raffle to view the tickets, and in the case of completed raffles, the winners. Raffles in a group with a title will be rolled consecutively starting from the top, and will not draw duplicate winners.</p>
-<ul class="nav nav-tabs mb-3">
-    <li class="nav-item"><a href="{{ url()->current() }}" class="nav-link {{ Request::get('view') ? '' : 'active' }}">Current Raffles</a></li>
-    <li class="nav-item"><a href="{{ url()->current() }}?view=completed" class="nav-link {{ Request::get('view') == 'completed' ? 'active' : '' }}">Completed Raffles</a></li>
-</ul>
-
-@if(count($raffles))
-    <?php $prevGroup = null; ?>
-    <ul class="list-group mb-3">
-    @foreach($raffles as $raffle)
+    {!! breadcrumbs(['Raffles' => 'raffles']) !!}
+    <h1>Raffles</h1>
+    <p>Click on the name of a raffle to view the tickets, and in the case of completed raffles, the winners. Raffles in a group with a title will be rolled consecutively starting from the top, and will not draw duplicate winners.</p>
+    <ul class="nav nav-tabs mb-3">
+        <li class="nav-item"><a href="{{ url()->current() }}" class="nav-link {{ Request::get('view') ? '' : 'active' }}">Current Raffles</a></li>
+        <li class="nav-item"><a href="{{ url()->current() }}?view=completed" class="nav-link {{ Request::get('view') == 'completed' ? 'active' : '' }}">Completed Raffles</a></li>
+    </ul>
 
-        @if($prevGroup != $raffle->group_id)
-            </ul>
-            @if($prevGroup)
-                </div>
-            @endif
-            <div class="card mb-3">
-                <div class="card-header h3">{{ $groups[$raffle->group_id]->name }}</div>
-                <ul class="list-group list-group-flush">
+    @if (count($raffles))
+        <?php $prevGroup = null; ?>
+        <ul class="list-group mb-3">
+            @foreach ($raffles as $raffle)
+                @if ($prevGroup != $raffle->group_id)
+        </ul>
+        @if ($prevGroup)
+            </div>
         @endif
+        <div class="card mb-3">
+            <div class="card-header h3">{{ $groups[$raffle->group_id]->name }}</div>
+            <ul class="list-group list-group-flush">
+    @endif
 
-        <li class="list-group-item">
-            <a href="{{ url('raffles/view/'.$raffle->id) }}">{{ $raffle->name }}</a>
-        </li>
-        <?php $prevGroup = $raffle->group_id; ?>
+    <li class="list-group-item">
+        <x-admin-edit title="Raffle" :object="$raffle" />
+        <a href="{{ url('raffles/view/' . $raffle->id) }}">{{ $raffle->name }}</a>
+    </li>
+    <?php $prevGroup = $raffle->group_id; ?>
     @endforeach
-@else 
+@else
     <p>No raffles found.</p>
-@endif
+    @endif
 @endsection
 @section('scripts')
-@parent
-@endsection
\ No newline at end of file
+    @parent
+@endsection
diff --git a/resources/views/raffles/ticket_index.blade.php b/resources/views/raffles/ticket_index.blade.php
index 80c1514fc0..96a489fd44 100644
--- a/resources/views/raffles/ticket_index.blade.php
+++ b/resources/views/raffles/ticket_index.blade.php
@@ -1,61 +1,85 @@
 @extends('layouts.app')
 
-@section('title') Raffle - {{ $raffle->name }} @endsection
+@section('title')
+    Raffle - {{ $raffle->name }}
+@endsection
 
 @section('content')
-{!! breadcrumbs(['Raffles' => 'raffles', 'Raffle: ' . $raffle->name => 'raffles/view/'.$raffle->id]) !!}
-<h1>Raffle: {{ $raffle->name }}</h1>
-@if($raffle->is_active == 1)
-    <div class="alert alert-success">This raffle is currently open. (Number of winners to be drawn: {{ $raffle->winner_count }})</div>
-@elseif($raffle->is_active == 2)
-    <div class="alert alert-danger">This raffle is closed. Rolled: {!! format_date($raffle->rolled_at) !!}</div>
-    <div class="card mb-3">
-        <div class="card-header h3">Winner(s)</div>
-        <div class="table-responsive">
-            <table class="table table-sm mb-0">
-                <thead><th class="col-xs-1 text-center" style="width: 100px;">#</th><th>User</th></thead>
-                <tbody>
-                    @foreach($raffle->tickets()->winners()->get() as $winner)
-                        <tr>
-                            <td class="text-center">{{ $winner->position }}</td>
-                            <td class="text-left">{!! $winner->displayHolderName !!}</td>
-                        </tr>
-                    @endforeach
-                </tbody>
-            </table>
+    <x-admin-edit title="Raffle" :object="$raffle" />
+    {!! breadcrumbs(['Raffles' => 'raffles', 'Raffle: ' . $raffle->name => 'raffles/view/' . $raffle->id]) !!}
+    <h1>Raffle: {{ $raffle->name }}</h1>
+    @if ($raffle->is_active == 1)
+        <div class="alert alert-success text-center">
+            This raffle is currently open.
+            ・ Number of winners to be drawn: {{ $raffle->winner_count }}
+            @if ($raffle->ticket_cap)
+                ・ This raffle has a cap of {{ $raffle->ticket_cap }} tickets per individual.
+            @endif
         </div>
-    </div>
-@endif
-<h3>Tickets</h3>
+    @elseif($raffle->is_active == 2)
+        <div class="alert alert-danger">This raffle is closed. Rolled: {!! format_date($raffle->rolled_at) !!}</div>
+        <div class="card mb-3">
+            <div class="card-header h3">Winner(s)</div>
+            <div class="table-responsive">
+                <table class="table table-sm mb-0">
+                    <thead>
+                        <th class="col-xs-1 text-center" style="width: 100px;">#</th>
+                        <th>User</th>
+                    </thead>
+                    <tbody>
+                        @foreach ($raffle->tickets()->winners()->get() as $winner)
+                            <tr>
+                                <td class="text-center">{{ $winner->position }}</td>
+                                <td class="text-left">{!! $winner->displayHolderName !!}</td>
+                            </tr>
+                        @endforeach
+                    </tbody>
+                </table>
+            </div>
+        </div>
+    @endif
 
-@if(Auth::check() && count($tickets))
-  <?php $chance = number_format((float)(($userCount/$count)*100), 1, '.', ''); //Change 1 to 0 if you want no decimal place. ?>
-  <p class="text-center mb-0">You {{ $raffle->is_active == 2 ? 'had' : 'have' }} <strong>{{ $userCount }}</strong> out of <strong>{{ $count }} tickets</strong> in this raffle.</p>
-  <p class="text-center"> That's a <strong>{{ $chance }}%</strong> chance! </p>
-@endif
+    <h3>Tickets</h3>
 
-<div class="text-right">{!! $tickets->render() !!}</div>
+    @if (Auth::check() && count($tickets))
+        <?php $chance = number_format((float) (($userCount / $count) * 100), 1, '.', ''); //Change 1 to 0 if you want no decimal place. ?>
+        <p class="text-center mb-0">You {{ $raffle->is_active == 2 ? 'had' : 'have' }} <strong>{{ $userCount }}</strong> out of <strong>{{ $count }} tickets</strong> in this raffle.</p>
+        <p class="text-center"> That's a <strong>{{ $chance }}%</strong> chance! </p>
+    @endif
 
-  <div class="row ml-md-2">
-    <div class="d-flex row flex-wrap col-12 mt-1 pt-1 px-0 ubt-bottom">
-      <div class="col-2 col-md-1 font-weight-bold">#</div>
-      <div class="col-10 col-md-11 font-weight-bold">User</div>
-    </div>
-        @foreach($tickets as $count=>$ticket)
-          <div class="d-flex row flex-wrap col-12 mt-1 pt-1 px-0 ubt-top">
-            <div class="col-2 col-md-1">
-              {{ $page * 100 + $count + 1 }}
-              @if (Auth::check() && $ticket->user_id && $ticket->user->name == Auth::user()->name)
-                <i class="fas fa-ticket-alt ml-2"></i>
-              @endif
+    <div class="text-right">{!! $tickets->render() !!}</div>
+
+    <div class="mb-4 logs-table">
+        <div class="logs-table-header">
+            <div class="row">
+                <div class="col-2 col-md-1 font-weight-bold">
+                    <div class="logs-table-cell">#</div>
+                </div>
+                <div class="col-10 col-md-11 font-weight-bold">
+                    <div class="logs-table-cell">User</div>
+                </div>
             </div>
-            <div class="col-10 col-md-11">{!! $ticket->displayHolderName !!}</div>
-          </div>
-        @endforeach
-  </div>
+        </div>
+        <div class="logs-table-body">
+            @foreach ($tickets as $count => $ticket)
+                <div class="logs-table-row">
+                    <div class="row flex-wrap">
+                        <div class="col-2 col-md-1">
+                            <div class="logs-table-cell">
+                                {{ $page * 100 + $count + 1 }}
+                                @if (Auth::check() && $ticket->user_id && $ticket->user->name == Auth::user()->name)
+                                    <i class="fas fa-ticket-alt ml-2"></i>
+                                @endif
+                            </div>
+                        </div>
+                        <div class="col-10 col-md-11">
+                            <div class="logs-table-cell">{!! $ticket->displayHolderName !!}</div>
+                        </div>
+                    </div>
+                </div>
+            @endforeach
+        </div>
+    </div>
 
-<div class="text-right">{!! $tickets->render() !!}</div>
-@endsection
-@section('scripts')
-@parent
+    <div class="text-right">{!! $tickets->render() !!}</div>
 @endsection
diff --git a/resources/views/sales/_character.blade.php b/resources/views/sales/_character.blade.php
index 35cbe99490..4d6f0158cb 100644
--- a/resources/views/sales/_character.blade.php
+++ b/resources/views/sales/_character.blade.php
@@ -7,35 +7,43 @@
             <div class="col-md text-center">
                 <div class="mt-2">
                     <h5>
-                        {{ $character->displayType }}: <a href="{{ $character->character->url }}">{!! $character->character->slug !!}</a> ・ <span class="{{ $character->is_open && $character->sales->is_open ? 'text-success' : '' }}">[{{ $character->is_open && $character->sales->is_open ? 'Open' : 'Closed' }}]</span><br/>
+                        {{ $character->displayType }}: <a href="{{ $character->character->url }}">{!! $character->character->slug !!}</a> ・ <span
+                            class="{{ $character->is_open && $character->sales->is_open ? 'text-success' : '' }}">[{{ $character->is_open && $character->sales->is_open ? 'Open' : 'Closed' }}]</span><br />
                         <small>
-                            {!! $character->image->species->displayName !!} ・ {!! $character->image->rarity->displayName !!}<br/>
+                            {!! $character->image->species->displayName !!} ・ {!! $character->image->rarity->displayName !!}<br />
                         </small>
                     </h5>
 
-                    @if($loop->count == 1)
+                    @if ($loop->count == 1)
                         <div class="mb-2">
-                            @if(Config::get('lorekeeper.extensions.traits_by_category'))
+                            @if (config('lorekeeper.extensions.traits_by_category'))
                                 <div>
-                                    @php $traitgroup = $character->image->features()->get()->groupBy('feature_category_id') @endphp
-                                    @if($character->image->features()->count())
-                                        @foreach($traitgroup as $key => $group)
-                                        <div>
-                                            @if($group->count() > 1)
-                                                <div>
+                                    @php
+                                        $traitgroup = $character->image
+                                            ->features()
+                                            ->get()
+                                            ->groupBy('feature_category_id');
+                                    @endphp
+                                    @if ($character->image->features()->count())
+                                        @foreach ($traitgroup as $key => $group)
+                                            <div>
+                                                @if ($group->count() > 1)
+                                                    <div>
+                                                        <strong>{!! $key ? $group->first()->feature->category->displayName : 'Miscellaneous' !!}:</strong>
+                                                        @foreach ($group as $feature)
+                                                            {!! $feature->feature->displayName !!}@if ($feature->data)
+                                                                ({{ $feature->data }})
+                                                            @endif{{ !$loop->last ? ', ' : '' }}
+                                                        @endforeach
+                                                    </div>
+                                                @else
                                                     <strong>{!! $key ? $group->first()->feature->category->displayName : 'Miscellaneous' !!}:</strong>
-                                                    @foreach($group as $feature)
-                                                        {!! $feature->feature->displayName !!}@if($feature->data) ({{ $feature->data }})@endif{{ !$loop->last ? ', ' : '' }}
-                                                    @endforeach
-                                                </div>
-                                            @else
-                                                <strong>{!! $key ? $group->first()->feature->category->displayName : 'Miscellaneous' !!}:</strong>
-                                                {!! $group->first()->feature->displayName !!}
-                                                    @if($group->first()->data)
+                                                    {!! $group->first()->feature->displayName !!}
+                                                    @if ($group->first()->data)
                                                         ({{ $group->first()->data }})
                                                     @endif
-                                            @endif
-                                        </div>
+                                                @endif
+                                            </div>
                                         @endforeach
                                     @else
                                         <div>No traits listed.</div>
@@ -43,10 +51,19 @@
                                 </div>
                             @else
                                 <div>
-                                    <?php $features = $character->image->features()->with('feature.category')->get(); ?>
-                                    @if($features->count())
-                                        @foreach($features as $feature)
-                                            <div>@if($feature->feature->feature_category_id) <strong>{!! $feature->feature->category->displayName !!}:</strong> @endif {!! $feature->feature->displayName !!} @if($feature->data) ({{ $feature->data }}) @endif</div>
+                                    <?php $features = $character->image
+                                        ->features()
+                                        ->with('feature.category')
+                                        ->get(); ?>
+                                    @if ($features->count())
+                                        @foreach ($features as $feature)
+                                            <div>
+                                                @if ($feature->feature->feature_category_id)
+                                                    <strong>{!! $feature->feature->category->displayName !!}:</strong>
+                                                    @endif {!! $feature->feature->displayName !!} @if ($feature->data)
+                                                        ({{ $feature->data }})
+                                                    @endif
+                                            </div>
                                         @endforeach
                                     @else
                                         <div>No traits listed.</div>
@@ -59,22 +76,22 @@
                     <h6>
                         <div class="mb-2">
                             Design:
-                            @foreach($character->image->designers as $designer)
+                            @foreach ($character->image->designers as $designer)
                                 {!! $designer->displayLink() !!}{{ !$loop->last ? ', ' : '' }}
                             @endforeach ・
                             Art:
-                            @foreach($character->image->artists as $artist)
+                            @foreach ($character->image->artists as $artist)
                                 {!! $artist->displayLink() !!}{{ !$loop->last ? ', ' : '' }}
                             @endforeach
                         </div>
 
                         {!! $character->price !!}
                         {!! isset($character->link) || isset($character->data['end_point']) ? '<br/>' : '' !!}
-                        @if(isset($character->data['end_point']))
+                        @if (isset($character->data['end_point']))
                             {{ $character->data['end_point'] }}
                         @endif
-                        {{ (isset($character->link) && ((!isset($character->sales->comments_open_at) || Auth::check() && Auth::user()->hasPower('edit_pages')) || $character->sales->comments_open_at < Carbon\Carbon::now())) && isset($character->data['end_point']) ? ' ・ ' : '' }}
-                        @if(isset($character->link) && ((!isset($character->sales->comments_open_at) || Auth::check() && Auth::user()->hasPower('edit_pages')) || $character->sales->comments_open_at < Carbon\Carbon::now()))
+                        {{ isset($character->link) && (!isset($character->sales->comments_open_at) || (Auth::check() && Auth::user()->hasPower('edit_pages')) || $character->sales->comments_open_at < Carbon\Carbon::now()) && isset($character->data['end_point']) ? ' ・ ' : '' }}
+                        @if (isset($character->link) && (!isset($character->sales->comments_open_at) || (Auth::check() && Auth::user()->hasPower('edit_pages')) || $character->sales->comments_open_at < Carbon\Carbon::now()))
                             <a href="{{ $character->link }}">{{ $character->typeLink }}</a>
                         @endif
                     </h6>
diff --git a/resources/views/sales/_sales.blade.php b/resources/views/sales/_sales.blade.php
index 646b7e18d7..fa2132a0fd 100644
--- a/resources/views/sales/_sales.blade.php
+++ b/resources/views/sales/_sales.blade.php
@@ -1,5 +1,6 @@
 <div class="card mb-3">
     <div class="card-header">
+        <x-admin-edit title="Sale" :object="$sales" />
         <h2 class="card-title mb-0">{!! $sales->displayName !!}</h2>
         <small>
             Posted {!! $sales->post_at ? pretty_date($sales->post_at) : pretty_date($sales->created_at) !!} :: Last edited {!! pretty_date($sales->updated_at) !!} by {!! $sales->user->displayName !!}
@@ -7,20 +8,30 @@
     </div>
 
 
-@if($sales->characters()->count())
+    @if ($sales->characters()->count())
 </div>
 
-    <div class="row mb-2">
-        @foreach($sales->characters as $character)
+<div class="row mb-2">
+    @foreach ($sales->characters as $character)
+        @if ($character->character->deleted_at)
+            <div class="col-lg mb-2">
+                <div class="card h-100">
+                    <div class="alert alert-warning my-auto mx-2">
+                        <i class="fas fa-exclamation-triangle"></i> This character has been deleted.
+                    </div>
+                </div>
+            </div>
+        @else
             <div class="col-lg mb-2">
                 @include('sales._character', ['character' => $character, 'loop' => $loop])
             </div>
-            {!! $loop->even ? '<div class="w-100"></div>' : '' !!}
-        @endforeach
-    </div>
+        @endif
+        {!! $loop->even ? '<div class="w-100"></div>' : '' !!}
+    @endforeach
+</div>
 
 <div class="card mb-3">
-@endif
+    @endif
 
     <div class="card-body">
         <div class="parsed-text">
@@ -28,17 +39,17 @@
         </div>
     </div>
 
-    @if((isset($sales->comments_open_at) && $sales->comments_open_at < Carbon\Carbon::now() ||
-    (Auth::check() && Auth::user()->hasPower('edit_pages'))) ||
-    !isset($sales->comments_open_at))
-        <?php $commentCount = App\Models\Comment::where('commentable_type', 'App\Models\Sales\Sales')->where('commentable_id', $sales->id)->count(); ?>
-        @if(!$page)
+    @if ((isset($sales->comments_open_at) && $sales->comments_open_at < Carbon\Carbon::now()) || (Auth::check() && (Auth::user()->hasPower('manage_sales') || Auth::user()->hasPower('comment_on_sales'))) || !isset($sales->comments_open_at))
+        <?php $commentCount = App\Models\Comment\Comment::where('commentable_type', 'App\Models\Sales\Sales')
+            ->where('commentable_id', $sales->id)
+            ->count(); ?>
+        @if (!$page)
             <div class="text-right mb-2 mr-2">
-                <a class="btn" href="{{ $sales->url }}"><i class="fas fa-comment"></i> {{ $commentCount }} Comment{{ $commentCount != 1 ? 's' : ''}}</a>
+                <a class="btn" href="{{ $sales->url }}#commentsSection"><i class="fas fa-comment"></i> {{ $commentCount }} Comment{{ $commentCount != 1 ? 's' : '' }}</a>
             </div>
         @else
             <div class="text-right mb-2 mr-2">
-                <span class="btn"><i class="fas fa-comment"></i> {{ $commentCount }} Comment{{ $commentCount != 1 ? 's' : ''}}</span>
+                <a class="btn" href="#commentsSection"><i class="fas fa-comment"></i> {{ $commentCount }} Comment{{ $commentCount != 1 ? 's' : '' }}</a>
             </div>
         @endif
     @endif
diff --git a/resources/views/sales/_sidebar.blade.php b/resources/views/sales/_sidebar.blade.php
new file mode 100644
index 0000000000..720e53026f
--- /dev/null
+++ b/resources/views/sales/_sidebar.blade.php
@@ -0,0 +1,26 @@
+<ul>
+    <li class="sidebar-header"><a href="{{ url('sales') }}" class="card-link">Sales</a></li>
+    <li class="sidebar-section">
+        <div class="sidebar-section-header">For Sale</div>
+        @foreach ($forsale as $sales)
+            @php $salelink = 'sales/'.$sales->slug; @endphp
+            <div class="sidebar-item"><a href="{{ $sales->url }}" class="{{ set_active($salelink) }}">{{ $sales->title }}</a></div>
+        @endforeach
+        @if (isset($saleses))
+    <li class="sidebar-section">
+        <div class="sidebar-section-header">On This Page</div>
+        @foreach ($saleses as $sales)
+            @php $salelink = 'sales/'.$sales->slug; @endphp
+            <div class="sidebar-item"><a href="{{ $sales->url }}" class="{{ set_active($salelink) }}">{{ '[' . ($sales->is_open ? 'OPEN' : 'CLOSED') . '] ' . $sales->title }}</a></div>
+        @endforeach
+    </li>
+@else
+    <li class="sidebar-section">
+        <div class="sidebar-section-header">Recent Sales</div>
+        @foreach ($recentsales as $sales)
+            @php $salelink = 'sales/'.$sales->slug; @endphp
+            <div class="sidebar-item"><a href="{{ $sales->url }}" class="{{ set_active($salelink) }}">{{ '[' . ($sales->is_open ? 'OPEN' : 'CLOSED') . '] ' . $sales->title }}</a></div>
+        @endforeach
+    </li>
+    @endif
+</ul>
diff --git a/resources/views/sales/index.blade.php b/resources/views/sales/index.blade.php
index 3664747780..0eeee20284 100644
--- a/resources/views/sales/index.blade.php
+++ b/resources/views/sales/index.blade.php
@@ -1,17 +1,53 @@
-@extends('layouts.app')
+@extends('sales.layout')
 
-@section('title') Site Sales @endsection
+@section('title')
+    Site Sales
+@endsection
+
+@section('sales-content')
+    {!! breadcrumbs(['Site Sales' => 'sales']) !!}
+    <h1>Site Sales</h1>
+
+    <div>
+        {!! Form::open(['method' => 'GET', 'class' => '']) !!}
+        <div class="form-inline justify-content-end">
+            <div class="form-group ml-3 mb-3">
+                {!! Form::text('title', Request::get('title'), ['class' => 'form-control', 'placeholder' => 'Name']) !!}
+            </div>
+            <div class="form-group ml-3 mb-3">
+                {!! Form::select('is_open', ['1' => 'Open', '0' => 'Closed'], Request::get('is_open'), ['class' => 'form-control', 'placeholder' => 'Status']) !!}
+            </div>
+        </div>
+        <div class="form-inline justify-content-end">
+            <div class="form-group ml-3 mb-3">
+                {!! Form::select(
+                    'sort',
+                    [
+                        'bump-reverse' => 'Updated Newest',
+                        'bump' => 'Updated Oldest',
+                        'newest' => 'Created Newest',
+                        'oldest' => 'Created Oldest',
+                        'alpha' => 'Sort Alphabetically (A-Z)',
+                        'alpha-reverse' => 'Sort Alphabetically (Z-A)',
+                    ],
+                    Request::get('sort') ?: 'Updated Newest',
+                    ['class' => 'form-control'],
+                ) !!}
+            </div>
+            <div class="form-group ml-3 mb-3">
+                {!! Form::submit('Search', ['class' => 'btn btn-primary']) !!}
+            </div>
+        </div>
+        {!! Form::close() !!}
+    </div>
 
-@section('content')
-{!! breadcrumbs(['Site Sales' => 'sales']) !!}
-<h1>Site Sales</h1>
-@if(count($saleses))
-    {!! $saleses->render() !!}
-    @foreach($saleses as $sales)
-        @include('sales._sales', ['sales' => $sales, 'page' => FALSE])
-    @endforeach
-    {!! $saleses->render() !!}
-@else
-    <div>No sales posts yet.</div>
-@endif
+    @if (count($saleses))
+        {!! $saleses->render() !!}
+        @foreach ($saleses as $sales)
+            @include('sales._sales', ['sales' => $sales, 'page' => false])
+        @endforeach
+        {!! $saleses->render() !!}
+    @else
+        <div>No sales posts yet.</div>
+    @endif
 @endsection
diff --git a/resources/views/sales/layout.blade.php b/resources/views/sales/layout.blade.php
new file mode 100644
index 0000000000..2e2463f13a
--- /dev/null
+++ b/resources/views/sales/layout.blade.php
@@ -0,0 +1,13 @@
+@extends('layouts.app')
+
+@section('title')
+    Site Sales :: @yield('sales-title')
+@endsection
+
+@section('sidebar')
+    @include('sales._sidebar')
+@endsection
+
+@section('content')
+    @yield('sales-content')
+@endsection
diff --git a/resources/views/sales/sales.blade.php b/resources/views/sales/sales.blade.php
index 9812702290..66232a0372 100644
--- a/resources/views/sales/sales.blade.php
+++ b/resources/views/sales/sales.blade.php
@@ -1,23 +1,19 @@
-@extends('layouts.app')
+@extends('sales.layout')
 
-@section('title') {{ $sales->title }} @endsection
+@section('sales-title')
+    {{ $sales->title }}
+@endsection
 
-@section('content')
+@section('sales-content')
     {!! breadcrumbs(['Site Sales' => 'sales', $sales->title => $sales->url]) !!}
-    @include('sales._sales', ['sales' => $sales, 'page' => TRUE])
-
-@if((isset($sales->comments_open_at) && $sales->comments_open_at < Carbon\Carbon::now() || 
-    (Auth::check() && Auth::user()->hasPower('edit_pages'))) || 
-    !isset($sales->comments_open_at))
-        <hr>
-        <br><br>
-        @comments(['model' => $sales,
-                'perPage' => 5
-            ])
-@else
-    <div class="alert alert-warning text-center">
-        <p>Comments for this sale aren't open yet! They will open {!! pretty_date($sales->comments_open_at) !!}.</p>
-    </div>
-@endif
+    @include('sales._sales', ['sales' => $sales, 'page' => true])
 
+    <hr class="mb-5" id="commentsSection" />
+    @if ((isset($sales->comments_open_at) && $sales->comments_open_at < Carbon\Carbon::now()) || (Auth::check() && (Auth::user()->hasPower('manage_sales') || Auth::user()->hasPower('comment_on_sales'))) || !isset($sales->comments_open_at))
+        @comments(['model' => $sales, 'perPage' => 5])
+    @else
+        <div class="alert alert-warning text-center">
+            <p>Comments for this sale aren't open yet! They will open {!! pretty_date($sales->comments_open_at) !!}.</p>
+        </div>
+    @endif
 @endsection
diff --git a/resources/views/shops/_purchase_history_row.blade.php b/resources/views/shops/_purchase_history_row.blade.php
index aa58c2b089..789464051c 100644
--- a/resources/views/shops/_purchase_history_row.blade.php
+++ b/resources/views/shops/_purchase_history_row.blade.php
@@ -1,8 +1,20 @@
-<div class="d-flex row flex-wrap col-12 mt-1 pt-1 px-0 ubt-top">
-  <div class="col-12 col-md-2">{!! $log->item ? $log->item->displayName : '(Deleted Item)' !!}</div>
-  <div class="col-12 col-md-2">{!! $log->quantity !!}</div>
-  <div class="col-12 col-md-2">{!! $log->shop ? $log->shop->displayName : '(Deleted Shop)' !!}</div>
-  <div class="col-12 col-md-2">{!! $log->character_id ? $log->character->displayName : '' !!}</div>
-  <div class="col-12 col-md-2">{!! $log->currency ? $log->currency->display($log->cost) : $log->cost . ' (Deleted Currency)' !!}</div>
-  <div class="col-12 col-md-2">{!! pretty_date($log->created_at) !!}</div>
+<div class="row flex-wrap">
+    <div class="col-12 col-md-2">
+        <div class="logs-table-cell">{!! $log->item ? $log->item->displayName : '(Deleted Item)' !!}</div>
+    </div>
+    <div class="col-12 col-md-2">
+        <div class="logs-table-cell">{!! $log->quantity !!}</div>
+    </div>
+    <div class="col-12 col-md-2">
+        <div class="logs-table-cell">{!! $log->shop ? $log->shop->displayName : '(Deleted Shop)' !!}</div>
+    </div>
+    <div class="col-12 col-md-2">
+        <div class="logs-table-cell">{!! $log->character_id ? $log->character->displayName : '' !!}</div>
+    </div>
+    <div class="col-12 col-md-2">
+        <div class="logs-table-cell">{!! $log->currency ? $log->currency->display($log->cost) : $log->cost . ' (Deleted Currency)' !!}</div>
+    </div>
+    <div class="col-12 col-md-2">
+        <div class="logs-table-cell">{!! pretty_date($log->created_at) !!}</div>
+    </div>
 </div>
diff --git a/resources/views/shops/_sidebar.blade.php b/resources/views/shops/_sidebar.blade.php
index 6dc0de02d5..68fc90e7d9 100644
--- a/resources/views/shops/_sidebar.blade.php
+++ b/resources/views/shops/_sidebar.blade.php
@@ -1,12 +1,12 @@
 <ul>
     <li class="sidebar-header"><a href="{{ url('shops') }}" class="card-link">Shops</a></li>
 
-    @if(Auth::check())
+    @if (Auth::check())
         <li class="sidebar-section">
             <div class="sidebar-section-header">History</div>
             <div class="sidebar-item"><a href="{{ url('shops/history') }}" class="{{ set_active('shops/history') }}">My Purchase History</a></div>
             <div class="sidebar-section-header">My Currencies</div>
-            @foreach(Auth::user()->getCurrencies(true) as $currency)
+            @foreach (Auth::user()->getCurrencies(true) as $currency)
                 <div class="sidebar-item pr-3">{!! $currency->display($currency->quantity) !!}</div>
             @endforeach
         </li>
@@ -14,8 +14,8 @@
 
     <li class="sidebar-section">
         <div class="sidebar-section-header">Shops</div>
-        @foreach($shops as $shop)
-            <div class="sidebar-item"><a href="{{ $shop->url }}" class="{{ set_active('shops/'.$shop->id) }}">{{ $shop->name }}</a></div>
+        @foreach ($shops as $shop)
+            <div class="sidebar-item"><a href="{{ $shop->url }}" class="{{ set_active('shops/' . $shop->id) }}">{{ $shop->name }}</a></div>
         @endforeach
     </li>
 </ul>
diff --git a/resources/views/shops/_stock_modal.blade.php b/resources/views/shops/_stock_modal.blade.php
index 88deca4d8f..8fe4535ec3 100644
--- a/resources/views/shops/_stock_modal.blade.php
+++ b/resources/views/shops/_stock_modal.blade.php
@@ -1,15 +1,19 @@
-@if(!$stock)
+@if (!$stock)
     <div class="text-center">Invalid item selected.</div>
 @else
     <div class="text-center mb-3">
-        <div class="mb-1"><a href="{{ $stock->item->idUrl }}"><img src="{{ $stock->item->imageUrl }}" alt="{{ $stock->item->name }}" /></a></div>
+        <div class="mb-1"><a href="{{ $stock->item->idUrl }}"><img class="img-fluid" src="{{ $stock->item->imageUrl }}" alt="{{ $stock->item->name }}" /></a></div>
         <div><a href="{{ $stock->item->idUrl }}"><strong>{{ $stock->item->name }}</strong></a></div>
         <div><strong>Cost: </strong> {!! $stock->currency->display($stock->cost) !!}</div>
-        @if($stock->is_limited_stock) <div>Stock: {{ $stock->quantity }}</div> @endif
-        @if($stock->purchase_limit) <div class="text-danger">Max {{ $stock->purchase_limit }} per user</div> @endif
+        @if ($stock->is_limited_stock)
+            <div>Stock: {{ $stock->quantity }}</div>
+        @endif
+        @if ($stock->purchase_limit)
+            <div class="text-danger">Max {{ $stock->purchase_limit }} per user</div>
+        @endif
     </div>
 
-    @if($stock->item->parsed_description)
+    @if ($stock->item->parsed_description)
         <div class="mb-2">
             <a data-toggle="collapse" href="#itemDescription" class="h5">Description <i class="fas fa-caret-down"></i></a>
             <div class="card collapse show mt-1" id="itemDescription">
@@ -20,57 +24,59 @@
         </div>
     @endif
 
-    @if(Auth::check())
+    @if (Auth::check())
         <h5>
             Purchase
             <span class="float-right">
                 In Inventory: {{ $userOwned->pluck('count')->sum() }}
             </span>
         </h5>
-        @if($stock->is_limited_stock && $stock->quantity == 0)
+        @if ($stock->is_limited_stock && $stock->quantity == 0)
             <div class="alert alert-warning mb-0">This item is out of stock.</div>
         @elseif($purchaseLimitReached)
             <div class="alert alert-warning mb-0">You have already purchased the limit of {{ $stock->purchase_limit }} of this item.</div>
         @else
-            @if($stock->purchase_limit) <div class="alert alert-warning mb-3">You have purchased this item {{ $userPurchaseCount }} times.</div>@endif
+            @if ($stock->purchase_limit)
+                <div class="alert alert-warning mb-3">You have purchased this item {{ $userPurchaseCount }} times.</div>
+            @endif
             {!! Form::open(['url' => 'shops/buy']) !!}
-                {!! Form::hidden('shop_id', $shop->id) !!}
-                {!! Form::hidden('stock_id', $stock->id) !!}
-                {!! Form::label('quantity', 'Quantity') !!}
-                {!! Form::selectRange('quantity', 1, $quantityLimit, 1, ['class' => 'form-control mb-3']) !!}
-                @if($stock->use_user_bank && $stock->use_character_bank)
-                    <p>This item can be paid for with either your user account bank, or a character's bank. Please choose which you would like to use.</p>
-                    <div class="form-group">
-                        <div>
-                            <label class="h5">{{ Form::radio('bank', 'user' , true, ['class' => 'bank-select mr-1']) }} User Bank</label>
-                        </div>
-                        <div>
-                            <label class="h5">{{ Form::radio('bank', 'character' , false, ['class' => 'bank-select mr-1']) }} Character Bank</label>
-                            <div class="card use-character-bank hide">
-                                <div class="card-body">
-                                    <p>Enter the code of the character you would like to use to purchase the item.</p>
-                                    <div class="form-group">
-                                        {!! Form::label('slug', 'Character Code') !!}
-                                        {!! Form::text('slug', null, ['class' => 'form-control']) !!}
-                                    </div>
+            {!! Form::hidden('shop_id', $shop->id) !!}
+            {!! Form::hidden('stock_id', $stock->id) !!}
+            {!! Form::label('quantity', 'Quantity') !!}
+            {!! Form::selectRange('quantity', 1, $quantityLimit, 1, ['class' => 'form-control mb-3']) !!}
+            @if ($stock->use_user_bank && $stock->use_character_bank)
+                <p>This item can be paid for with either your user account bank, or a character's bank. Please choose which you would like to use.</p>
+                <div class="form-group">
+                    <div>
+                        <label class="h5">{{ Form::radio('bank', 'user', true, ['class' => 'bank-select mr-1']) }} User Bank</label>
+                    </div>
+                    <div>
+                        <label class="h5">{{ Form::radio('bank', 'character', false, ['class' => 'bank-select mr-1']) }} Character Bank</label>
+                        <div class="card use-character-bank hide">
+                            <div class="card-body">
+                                <p>Enter the code of the character you would like to use to purchase the item.</p>
+                                <div class="form-group">
+                                    {!! Form::label('slug', 'Character Code') !!}
+                                    {!! Form::text('slug', null, ['class' => 'form-control']) !!}
                                 </div>
                             </div>
                         </div>
                     </div>
-                @elseif($stock->use_user_bank)
-                    <p>This item will be paid for using your user account bank.</p>
-                    {!! Form::hidden('bank', 'user') !!}
-                @elseif($stock->use_character_bank)
-                    <p>This item must be paid for using a character's bank. Enter the code of the character whose bank you would like to use to purchase the item.</p>
-                    {!! Form::hidden('bank', 'character') !!}
-                    <div class="form-group">
-                        {!! Form::label('slug', 'Character Code') !!}
-                        {!! Form::text('slug', null, ['class' => 'form-control']) !!}
-                    </div>
-                @endif
-                <div class="text-right">
-                    {!! Form::submit('Purchase', ['class' => 'btn btn-primary']) !!}
                 </div>
+            @elseif($stock->use_user_bank)
+                <p>This item will be paid for using your user account bank.</p>
+                {!! Form::hidden('bank', 'user') !!}
+            @elseif($stock->use_character_bank)
+                <p>This item must be paid for using a character's bank. Enter the code of the character whose bank you would like to use to purchase the item.</p>
+                {!! Form::hidden('bank', 'character') !!}
+                <div class="form-group">
+                    {!! Form::label('slug', 'Character Code') !!}
+                    {!! Form::text('slug', null, ['class' => 'form-control']) !!}
+                </div>
+            @endif
+            <div class="text-right">
+                {!! Form::submit('Purchase', ['class' => 'btn btn-primary']) !!}
+            </div>
             {!! Form::close() !!}
         @endif
     @else
@@ -78,15 +84,14 @@
     @endif
 @endif
 
-@if(Auth::check())
+@if (Auth::check())
     <script>
         var $useCharacterBank = $('.use-character-bank');
         $('.bank-select').on('click', function(e) {
-            if($('input[name=bank]:checked').val() == 'character')
+            if ($('input[name=bank]:checked').val() == 'character')
                 $useCharacterBank.removeClass('hide');
             else
                 $useCharacterBank.addClass('hide');
         });
-
     </script>
 @endif
diff --git a/resources/views/shops/index.blade.php b/resources/views/shops/index.blade.php
index 908c50d8d0..b58e477f65 100644
--- a/resources/views/shops/index.blade.php
+++ b/resources/views/shops/index.blade.php
@@ -1,25 +1,28 @@
 @extends('shops.layout')
 
-@section('shops-title') Shop Index @endsection
+@section('shops-title')
+    Shop Index
+@endsection
 
 @section('shops-content')
-{!! breadcrumbs(['Shops' => 'shops']) !!}
+    {!! breadcrumbs(['Shops' => 'shops']) !!}
 
-<h1>
-    Shops
-</h1>
+    <h1>
+        Shops
+    </h1>
 
-<div class="row shops-row">
-    @foreach($shops as $shop)
-        <div class="col-md-3 col-6 mb-3 text-center">
-            <div class="shop-image">
-                <a href="{{ $shop->url }}"><img src="{{ $shop->shopImageUrl }}" alt="{{ $shop->name }}" /></a>
-            </div>
-            <div class="shop-name mt-1">
-                <a href="{{ $shop->url }}" class="h5 mb-0">{{ $shop->name }}</a>
+    <div class="row shops-row">
+        @foreach ($shops as $shop)
+            <div class="col-md-3 col-6 mb-3 text-center">
+                @if ($shop->has_image)
+                    <div class="shop-image">
+                        <a href="{{ $shop->url }}"><img src="{{ $shop->shopImageUrl }}" alt="{{ $shop->name }}" /></a>
+                    </div>
+                @endif
+                <div class="shop-name mt-1">
+                    <a href="{{ $shop->url }}" class="h5 mb-0">{{ $shop->name }}</a>
+                </div>
             </div>
-        </div>
-    @endforeach
-</div>
-
+        @endforeach
+    </div>
 @endsection
diff --git a/resources/views/shops/layout.blade.php b/resources/views/shops/layout.blade.php
index 0921f1a2a8..3a31a43c4e 100644
--- a/resources/views/shops/layout.blade.php
+++ b/resources/views/shops/layout.blade.php
@@ -1,7 +1,7 @@
 @extends('layouts.app')
 
-@section('title') 
-    Shops :: 
+@section('title')
+    Shops ::
     @yield('shops-title')
 @endsection
 
@@ -14,5 +14,5 @@
 @endsection
 
 @section('scripts')
-@parent
-@endsection
\ No newline at end of file
+    @parent
+@endsection
diff --git a/resources/views/shops/purchase_history.blade.php b/resources/views/shops/purchase_history.blade.php
index 845a30c966..acd8d6cce5 100644
--- a/resources/views/shops/purchase_history.blade.php
+++ b/resources/views/shops/purchase_history.blade.php
@@ -1,30 +1,48 @@
 @extends('shops.layout')
 
-@section('shops-title') My Purchase History @endsection
-
-@section('shops-content')
-{!! breadcrumbs(['Shops' => 'shops', 'My Purchase History' => 'history']) !!}
-
-<h1>
+@section('shops-title')
     My Purchase History
-</h1>
+@endsection
 
-{!! $logs->render() !!}
+@section('shops-content')
+    {!! breadcrumbs(['Shops' => 'shops', 'My Purchase History' => 'history']) !!}
 
+    <h1>
+        My Purchase History
+    </h1>
 
-<div class="row ml-md-2">
-  <div class="d-flex row flex-wrap col-12 mt-1 pt-1 px-0 ubt-bottom">
-    <div class="col-12 col-md-2 font-weight-bold">Item</div>
-    <div class="col-6 col-md-2 font-weight-bold">Quantity</div>
-    <div class="col-6 col-md-2 font-weight-bold">Shop</div>
-    <div class="col-6 col-md-2 font-weight-bold">Character</div>
-    <div class="col-6 col-md-2 font-weight-bold">Cost</div>
-    <div class="col-6 col-md-2 font-weight-bold">Date</div>
-  </div>
-    @foreach($logs as $log)
-        @include('shops._purchase_history_row', ['log' => $log])
-    @endforeach
-</div>
-{!! $logs->render() !!}
+    {!! $logs->render() !!}
 
+    <div class="mb-4 logs-table">
+        <div class="logs-table-header">
+            <div class="row">
+                <div class="col-12 col-md-2">
+                    <div class="logs-table-cell">Item</div>
+                </div>
+                <div class="col-6 col-md-2">
+                    <div class="logs-table-cell">Quantity</div>
+                </div>
+                <div class="col-6 col-md-2">
+                    <div class="logs-table-cell">Shop</div>
+                </div>
+                <div class="col-6 col-md-2">
+                    <div class="logs-table-cell">Character</div>
+                </div>
+                <div class="col-6 col-md-2">
+                    <div class="logs-table-cell">Cost</div>
+                </div>
+                <div class="col-6 col-md-2">
+                    <div class="logs-table-cell">Date</div>
+                </div>
+            </div>
+        </div>
+        <div class="logs-table-body">
+            @foreach ($logs as $log)
+                <div class="logs-table-row">
+                    @include('shops._purchase_history_row', ['log' => $log])
+                </div>
+            @endforeach
+        </div>
+    </div>
+    {!! $logs->render() !!}
 @endsection
diff --git a/resources/views/shops/shop.blade.php b/resources/views/shops/shop.blade.php
index c9769bfa0d..dcb903b983 100644
--- a/resources/views/shops/shop.blade.php
+++ b/resources/views/shops/shop.blade.php
@@ -1,57 +1,80 @@
 @extends('shops.layout')
 
-@section('shops-title') {{ $shop->name }} @endsection
+@section('shops-title')
+    {{ $shop->name }}
+@endsection
 
 @section('shops-content')
-{!! breadcrumbs(['Shops' => 'shops', $shop->name => $shop->url]) !!}
+    <x-admin-edit title="Shop" :object="$shop" />
+    {!! breadcrumbs(['Shops' => 'shops', $shop->name => $shop->url]) !!}
 
-<h1>
-    {{ $shop->name }}
-</h1>
+    <h1>
+        {{ $shop->name }}
+    </h1>
 
-<div class="text-center">
-    <img src="{{ $shop->shopImageUrl }}" style="max-width:100%" alt="{{ $shop->name }}" />
-    <p>{!! $shop->parsed_description !!}</p>
-</div>
+    <div class="text-center">
+        @if ($shop->has_image)
+            <img src="{{ $shop->shopImageUrl }}" style="max-width:100%" alt="{{ $shop->name }}" />
+        @endif
+        <p>{!! $shop->parsed_description !!}</p>
+    </div>
 
-@foreach($items as $categoryId=>$categoryItems)
-    <div class="card mb-3 inventory-category">
-        <h5 class="card-header inventory-header">
-            {!! isset($categories[$categoryId]) ? '<a href="'.$categories[$categoryId]->searchUrl.'">'.$categories[$categoryId]->name.'</a>' : 'Miscellaneous' !!}
-        </h5>
-        <div class="card-body inventory-body">
-            @foreach($categoryItems->chunk(4) as $chunk)
-                <div class="row mb-3">
-                    @foreach($chunk as $item)
-                        <div class="col-sm-3 col-6 text-center inventory-item" data-id="{{ $item->pivot->id }}">
-                            <div class="mb-1">
-                                <a href="#" class="inventory-stack"><img src="{{ $item->imageUrl }}" alt="{{ $item->name }}" /></a>
+    @foreach ($items as $categoryId => $categoryItems)
+        @php
+            $visible = '';
+            if ($categoryId && !$categories[$categoryId]->is_visible) {
+                $visible = '<i class="fas fa-eye-slash mr-1"></i>';
+            }
+        @endphp
+        <div class="card mb-3 inventory-category">
+            <h5 class="card-header inventory-header">
+                {!! isset($categories[$categoryId]) ? '<a href="' . $categories[$categoryId]->searchUrl . '">' . $visible . $categories[$categoryId]->name . '</a>' : 'Miscellaneous' !!}
+            </h5>
+            <div class="card-body inventory-body">
+                @foreach ($categoryItems->chunk(4) as $chunk)
+                    <div class="row mb-3">
+                        @foreach ($chunk as $item)
+                            <div class="col-sm-3 col-6 text-center inventory-item" data-id="{{ $item->pivot->id }}">
+                                <div class="mb-1">
+                                    <a href="#" class="inventory-stack">
+                                        <img src="{{ $item->imageUrl }}" alt="{{ $item->name }}" />
+                                    </a>
+                                </div>
+                                <div>
+                                    <a href="#" class="inventory-stack inventory-stack-name">
+                                        <strong>{{ $item->name }}</strong>
+                                    </a>
+                                    <div>
+                                        <strong>Cost: </strong> {!! $currencies[$item->pivot->currency_id]->display($item->pivot->cost) !!}
+                                    </div>
+                                    @if ($item->pivot->is_limited_stock)
+                                        <div>
+                                            Stock: {{ $item->pivot->quantity }}
+                                        </div>
+                                    @endif
+                                    @if ($item->pivot->purchase_limit)
+                                        <div class="text-danger">
+                                            Max {{ $item->pivot->purchase_limit }} per user
+                                        </div>
+                                    @endif
+                                </div>
                             </div>
-                            <div>
-                                <a href="#" class="inventory-stack inventory-stack-name"><strong>{{ $item->name }}</strong></a>
-                                <div><strong>Cost: </strong> {!! $currencies[$item->pivot->currency_id]->display($item->pivot->cost) !!}</div>
-                                @if($item->pivot->is_limited_stock) <div>Stock: {{ $item->pivot->quantity }}</div> @endif
-                                @if($item->pivot->purchase_limit) <div class="text-danger">Max {{ $item->pivot->purchase_limit }} per user</div> @endif
-                            </div>
-                        </div>
-                    @endforeach
-                </div>
-            @endforeach
+                        @endforeach
+                    </div>
+                @endforeach
+            </div>
         </div>
-    </div>
-@endforeach
-
+    @endforeach
 @endsection
 
 @section('scripts')
-<script>
-    $(document).ready(function() {
-        $('.inventory-item').on('click', function(e) {
-            e.preventDefault();
+    <script>
+        $(document).ready(function() {
+            $('.inventory-item').on('click', function(e) {
+                e.preventDefault();
 
-            loadModal("{{ url('shops/'.$shop->id) }}/" + $(this).data('id'), 'Purchase Item');
+                loadModal("{{ url('shops/' . $shop->id) }}/" + $(this).data('id'), 'Purchase Item');
+            });
         });
-    });
-
-</script>
+    </script>
 @endsection
diff --git a/resources/views/user/_characters.blade.php b/resources/views/user/_characters.blade.php
new file mode 100644
index 0000000000..d032aee517
--- /dev/null
+++ b/resources/views/user/_characters.blade.php
@@ -0,0 +1,23 @@
+@if ($characters->count())
+    <div class="row">
+        @foreach ($characters as $character)
+            <div class="col-md-3 col-6 text-center mb-2">
+                <div>
+                    <a href="{{ $character->url }}"><img src="{{ $character->image->thumbnailUrl }}" class="img-thumbnail" alt="Thumbnail for {{ $character->fullName }}" /></a>
+                </div>
+                <div class="mt-1">
+                    <a href="{{ $character->url }}" class="h5 mb-0">
+                        @if (!$character->is_visible)
+                            <i class="fas fa-eye-slash"></i>
+                        @endif {{ Illuminate\Support\Str::limit($character->fullName, 20, $end = '...') }}
+                    </a>
+                </div>
+                <div class="small">
+                    {!! $character->image->species_id ? $character->image->species->displayName : 'No Species' !!} ・ {!! $character->image->rarity_id ? $character->image->rarity->displayName : 'No Rarity' !!}
+                </div>
+            </div>
+        @endforeach
+    </div>
+@else
+    <p>No {{ $myo ? 'MYO slots' : 'characters' }} found.</p>
+@endif
diff --git a/resources/views/user/_currency_log_row.blade.php b/resources/views/user/_currency_log_row.blade.php
index 8b4df083b4..e190777366 100644
--- a/resources/views/user/_currency_log_row.blade.php
+++ b/resources/views/user/_currency_log_row.blade.php
@@ -1,10 +1,29 @@
-<div class="d-flex row flex-wrap col-12 mt-1 pt-1 px-0 ubt-top">
-  <div class="col-6 col-md-2">
-    <i class="btn py-1 m-0 px-2 btn-{{ ($log->recipient_id == $owner->id && $log->recipient_type == $owner->logType) ? 'success' : 'danger' }} fas {{ ($log->recipient_id == $owner->id && $log->recipient_type == $owner->logType) ? 'fa-arrow-up' : 'fa-arrow-down' }} mr-2"></i>
-    {!! $log->sender ? $log->sender->displayName : '' !!}
-  </div>
-  <div class="col-6 col-md-2">{!! $log->recipient ? $log->recipient->displayName : '' !!}</div>
-  <div class="col-6 col-md-2">    {{ ($log->recipient_id == $owner->id && $log->recipient_type == $owner->logType && ($log->quantity > 0)) ? '+' : '-' }} {!! $log->currency ? $log->currency->display(abs($log->quantity)) : $log->cost . ' (Deleted Currency)' !!}</div>
-  <div class="col-6 col-md-4">{!! $log->log !!}</div>
-  <div class="col-6 col-md-2">{!! pretty_date($log->created_at) !!}</div>
+<div class="row flex-wrap">
+    <div class="col-6 col-md-2">
+        <div class="logs-table-cell">
+            <i
+                class="{{ $log->recipient_id == $owner->id && $log->recipient_type == $owner->logType ? 'in' : 'out' }}flow bg-{{ $log->recipient_id == $owner->id && $log->recipient_type == $owner->logType ? 'success' : 'danger' }} fas {{ $log->recipient_id == $owner->id && $log->recipient_type == $owner->logType ? 'fa-arrow-up' : 'fa-arrow-down' }} mr-2"></i>
+            {!! $log->sender ? $log->sender->displayName : '' !!}
+        </div>
+    </div>
+    <div class="col-6 col-md-2">
+        <div class="logs-table-cell">
+            {!! $log->recipient ? $log->recipient->displayName : '' !!}
+        </div>
+    </div>
+    <div class="col-6 col-md-2">
+        <div class="logs-table-cell">
+            {{ $log->recipient_id == $owner->id && $log->recipient_type == $owner->logType && $log->quantity > 0 ? '+' : '-' }} {!! $log->currency ? $log->currency->display(abs($log->quantity)) : $log->cost . ' (Deleted Currency)' !!}
+        </div>
+    </div>
+    <div class="col-6 col-md-4">
+        <div class="logs-table-cell">
+            {!! $log->log !!}
+        </div>
+    </div>
+    <div class="col-6 col-md-2">
+        <div class="logs-table-cell">
+            {!! pretty_date($log->created_at) !!}
+        </div>
+    </div>
 </div>
diff --git a/resources/views/user/_deactivated_sidebar.blade.php b/resources/views/user/_deactivated_sidebar.blade.php
new file mode 100644
index 0000000000..57552e62f6
--- /dev/null
+++ b/resources/views/user/_deactivated_sidebar.blade.php
@@ -0,0 +1,6 @@
+<ul>
+    <li class="sidebar-header"><a href="{{ $user->url }}" class="card-link">{{ Illuminate\Support\Str::limit($user->name, 10, $end = '...') }}</a></li>
+    <li class="sidebar-section">
+        <div class="sidebar-item px-2">This account has been deactivated</div>
+    </li>
+</ul>
diff --git a/resources/views/user/_item_log_row.blade.php b/resources/views/user/_item_log_row.blade.php
index 66bf801174..998e7bb70f 100644
--- a/resources/views/user/_item_log_row.blade.php
+++ b/resources/views/user/_item_log_row.blade.php
@@ -1,10 +1,29 @@
-<div class="d-flex row flex-wrap col-12 mt-1 pt-1 px-0 ubt-top">
-  <div class="col-6 col-md-2">
-    <i class="btn py-1 m-0 px-2 btn-{{ ($log->recipient_id == $owner->id && $log->recipient_type == $owner->logType) ? 'success' : 'danger' }} fas {{ ($log->recipient_id == $owner->id && $log->recipient_type == $owner->logType) ? 'fa-arrow-up' : 'fa-arrow-down' }} mr-2"></i>
-    {!! $log->sender ? $log->sender->displayName : '' !!}
-  </div>
-  <div class="col-6 col-md-2">{!! $log->recipient ? $log->recipient->displayName : '' !!}</div>
-  <div class="col-6 col-md-2">{!! $log->item ? $log->item->displayName : '(Deleted Item)' !!} (×{!! $log->quantity !!})</div>
-  <div class="col-6 col-md-4">{!! $log->log !!}</div>
-  <div class="col-6 col-md-2">{!! pretty_date($log->created_at) !!}</div>
+<div class="row flex-wrap">
+    <div class="col-6 col-md-2">
+        <div class="logs-table-cell">
+            <i
+                class="{{ $log->recipient_id == $owner->id && $log->recipient_type == $owner->logType ? 'in' : 'out' }}flow bg-{{ $log->recipient_id == $owner->id && $log->recipient_type == $owner->logType ? 'success' : 'danger' }} fas {{ $log->recipient_id == $owner->id && $log->recipient_type == $owner->logType ? 'fa-arrow-up' : 'fa-arrow-down' }} mr-2"></i>
+            {!! $log->sender ? $log->sender->displayName : '' !!}
+        </div>
+    </div>
+    <div class="col-6 col-md-2">
+        <div class="logs-table-cell">
+            {!! $log->recipient ? $log->recipient->displayName : '' !!}
+        </div>
+    </div>
+    <div class="col-6 col-md-2">
+        <div class="logs-table-cell">
+            {!! $log->item ? $log->item->displayName : '(Deleted Item)' !!} (×{!! $log->quantity !!})
+        </div>
+    </div>
+    <div class="col-6 col-md-4">
+        <div class="logs-table-cell">
+            {!! $log->log !!}
+        </div>
+    </div>
+    <div class="col-6 col-md-2">
+        <div class="logs-table-cell">
+            {!! pretty_date($log->created_at) !!}
+        </div>
+    </div>
 </div>
diff --git a/resources/views/user/_ownership_log_row.blade.php b/resources/views/user/_ownership_log_row.blade.php
index 8ac46643c5..40452b77d5 100644
--- a/resources/views/user/_ownership_log_row.blade.php
+++ b/resources/views/user/_ownership_log_row.blade.php
@@ -1,16 +1,33 @@
-@if($log->character && $log->character->is_visible == 1)
-<div class="d-flex row flex-wrap col-12 mt-1 pt-1 px-0 ubt-top">
-  <div class="col-6 col-md">
-    <i class="btn py-1 m-0 px-2 btn-{{ (!$user || $log->recipient_id == $user->id) ? 'success' : 'danger' }} fas {{ (!$user || $log->recipient_id == $user->id) ? 'fa-arrow-up' : 'fa-arrow-down' }} mr-2"></i>
-    {!! $log->sender ? $log->sender->displayName : $log->displaySenderAlias !!}
-  </div>
-  <div class="col-6 col-md">{!! $log->recipient ? $log->recipient->displayName : $log->displayRecipientAlias !!}</div>
-  @if(isset($showCharacter))
-  <div class="col-6 col-md">
-          <td>{!! $log->character ? $log->character->displayName : '---' !!}</td>
+@if ($log->character && $log->character->is_visible == 1)
+    <div class="row flex-wrap">
+        <div class="col-6 col-md">
+            <div class="logs-table-cell">
+                <i
+                    class="{{ !$user || $log->recipient_id == $user->id ? 'in' : 'out' }}flow bg-{{ !$user || $log->recipient_id == $user->id ? 'success' : 'danger' }} fas {{ !$user || $log->recipient_id == $user->id ? 'fa-arrow-up' : 'fa-arrow-down' }} mr-2"></i>
+                {!! $log->sender ? $log->sender->displayName : $log->displaySenderAlias !!}
+            </div>
+        </div>
+        <div class="col-6 col-md">
+            <div class="logs-table-cell">
+                {!! $log->recipient ? $log->recipient->displayName : $log->displayRecipientAlias !!}
+            </div>
+        </div>
+        @if (isset($showCharacter))
+            <div class="col-6 col-md">
+                <div class="logs-table-cell">
+                    {!! $log->character ? $log->character->displayName : '---' !!}
+                </div>
+            </div>
+        @endif
+        <div class="col-6 col-md-4">
+            <div class="logs-table-cell">
+                {!! $log->log !!}
+            </div>
+        </div>
+        <div class="col-6 col-md">
+            <div class="logs-table-cell">
+                {!! pretty_date($log->created_at) !!}
+            </div>
+        </div>
     </div>
-  @endif
-  <div class="col-6 col-md-4">{!! $log->log !!}</div>
-  <div class="col-6 col-md">{!! pretty_date($log->created_at) !!}</div>
-</div>
 @endif
diff --git a/resources/views/user/_profile_content.blade.php b/resources/views/user/_profile_content.blade.php
new file mode 100644
index 0000000000..d6824f3cb9
--- /dev/null
+++ b/resources/views/user/_profile_content.blade.php
@@ -0,0 +1,199 @@
+@if ($deactivated)
+    <div style="filter:grayscale(1); opacity:0.75">
+@endif
+
+<div class="row mb-3">
+    <div class="col-md-2 text-center">
+        <!-- User Icon -->
+        <img src="{{ $user->avatarUrl }}" class="img-fluid rounded-circle" style="max-height: 125px;" alt="{{ $user->name }}'s Avatar">
+    </div>
+
+    <div class="col">
+        <!-- Username & optional FTO Badge -->
+        <div class="row no-gutters">
+            <div class="col h2 text-center text-md-left">
+                {!! $user->displayName !!}
+                @if ($user->previousUsername)
+                    <small>{!! add_help('Previously known as ' . $user->previousUsername) !!}</small>
+                @endif
+                <a href="{{ url('reports/new?url=') . $user->url }}"><i class="fas fa-exclamation-triangle fa-xs text-danger" data-toggle="tooltip" title="Click here to report this user." style="opacity: 50%;"></i></a>
+            </div>
+
+            @if ($user->settings->is_fto)
+                <div class="col-md-1 text-center">
+                    <span class="btn badge-success float-md-right" data-toggle="tooltip" title="This user has not owned any characters from this world before.">FTO</span>
+                </div>
+            @endif
+        </div>
+
+        <!-- User Information -->
+        <div class="row no-gutters">
+            <div class="row col-sm-5">
+                <div class="col-lg-2 col-md-3 col-4">
+                    <h5>Alias</h5>
+                </div>
+                <div class="col-lg-10 col-md-9 col-8">
+                    {!! $user->displayAlias !!}
+                    @if (count($aliases) > 1 && config('lorekeeper.extensions.aliases_on_userpage'))
+                        <a class="small collapse-toggle collapsed" href="#otherUserAliases" data-toggle="collapse">&nbsp;</a>
+                        <p class="collapse mb-0" id="otherUserAliases">
+                            @foreach ($aliases as $alias)
+                                @if ($alias != $user->primaryAlias)
+                                    <a href="{{ $alias->url }}"><i class="{{ $alias->config['icon'] }} fa-fw mr-1" data-toggle="tooltip" title="{{ $alias->alias . '@' . $alias->siteDisplayName }}"></i></a>
+                                @endif
+                            @endforeach
+                        </p>
+                    @endif
+                </div>
+            </div>
+            <div class="row col-sm-7">
+                <div class="col-md-3 col-4">
+                    <h5>Joined</h5>
+                </div>
+                <div class="col-md-9 col-8">{!! format_date($user->created_at, false) !!} ({{ $user->created_at->diffForHumans() }})</div>
+            </div>
+            <div class="row col-sm-5">
+                <div class="col-lg-2 col-md-3 col-4">
+                    <h5>Rank</h5>
+                </div>
+                <div class="col-lg-10 col-md-9 col-8">{!! $user->rank->displayName !!} {!! add_help($user->rank->parsed_description) !!}</div>
+            </div>
+            @if ($user->birthdayDisplay && isset($user->birthday))
+                <div class="row col-sm-7">
+                    <div class="col-md-3 col-4">
+                        <h5>Birthday</h5>
+                    </div>
+                    <div class="col-md-9 col-8">{!! $user->birthdayDisplay !!}</div>
+                </div>
+            @endif
+        </div>
+    </div>
+</div>
+
+@if (isset($user->profile->parsed_text))
+    <div class="card mb-3" style="clear:both;">
+        <div class="card-body">
+            {!! $user->profile->parsed_text !!}
+        </div>
+    </div>
+@endif
+
+<div class="card-deck mb-4 profile-assets" style="clear:both;">
+    <div class="card profile-currencies profile-assets-card">
+        <div class="card-body text-center">
+            <h5 class="card-title">Bank</h5>
+            <div class="profile-assets-content">
+                @foreach ($user->getCurrencies(false) as $currency)
+                    <div>{!! $currency->display($currency->quantity) !!}</div>
+                @endforeach
+            </div>
+            <div class="text-right"><a href="{{ $user->url . '/bank' }}">View all...</a></div>
+        </div>
+    </div>
+    <div class="card profile-inventory profile-assets-card">
+        <div class="card-body text-center">
+            <h5 class="card-title">Inventory</h5>
+            <div class="profile-assets-content">
+                @if (count($items))
+                    <div class="row">
+                        @foreach ($items as $item)
+                            <div class="col-md-3 col-6 profile-inventory-item">
+                                @if ($item->imageUrl)
+                                    <img src="{{ $item->imageUrl }}" data-toggle="tooltip" title="{{ $item->name }}" alt="{{ $item->name }}" />
+                                @else
+                                    <p>{{ $item->name }}</p>
+                                @endif
+                            </div>
+                        @endforeach
+                    </div>
+                @else
+                    <div>No items owned.</div>
+                @endif
+            </div>
+            <div class="text-right"><a href="{{ $user->url . '/inventory' }}">View all...</a></div>
+        </div>
+    </div>
+</div>
+
+<h2>
+    <a href="{{ $user->url . '/characters' }}">Characters</a>
+    @if (isset($sublists) && $sublists->count() > 0)
+        @foreach ($sublists as $sublist)
+            / <a href="{{ $user->url . '/sublist/' . $sublist->key }}">{{ $sublist->name }}</a>
+        @endforeach
+    @endif
+</h2>
+
+@foreach ($characters->take(4)->get()->chunk(4) as $chunk)
+    <div class="row mb-4">
+        @foreach ($chunk as $character)
+            <div class="col-md-3 col-6 text-center">
+                <div>
+                    <a href="{{ $character->url }}"><img src="{{ $character->image->thumbnailUrl }}" class="img-thumbnail" alt="{{ $character->fullName }}" /></a>
+                </div>
+                <div class="mt-1">
+                    <a href="{{ $character->url }}" class="h5 mb-0">
+                        @if (!$character->is_visible)
+                            <i class="fas fa-eye-slash"></i>
+                        @endif {{ Illuminate\Support\Str::limit($character->fullName, 20, $end = '...') }}
+                    </a>
+                </div>
+            </div>
+        @endforeach
+    </div>
+@endforeach
+
+<div class="text-right"><a href="{{ $user->url . '/characters' }}">View all...</a></div>
+<hr class="mb-5" />
+
+<div class="row col-12">
+    <div class="col-md-8">
+
+        @comments(['model' => $user->profile, 'perPage' => 5])
+
+    </div>
+    <div class="col-md-4">
+        <div class="card mb-4">
+            <div class="card-header">
+                <h5>Mention This User</h5>
+            </div>
+            <div class="card-body">
+                In the rich text editor:
+                <div class="alert alert-secondary">
+                    {{ '@' . $user->name }}
+                </div>
+                In a comment:
+                <div class="alert alert-secondary">
+                    [{{ $user->name }}]({{ $user->url }})
+                </div>
+                <hr>
+                <div class="my-2"><strong>For Names and Avatars:</strong></div>
+                In the rich text editor:
+                <div class="alert alert-secondary">
+                    {{ '%' . $user->name }}
+                </div>
+                In a comment:
+                <div class="alert alert-secondary">
+                    [![{{ $user->name }}'s Avatar]({{ $user->avatarUrl }})]({{ $user->url }}) [{{ $user->name }}]({{ $user->url }})
+                </div>
+            </div>
+            @if (Auth::check() && Auth::user()->isStaff)
+                <div class="card-footer">
+                    <h5>[ADMIN]</h5>
+                    Permalinking to this user, in the rich text editor:
+                    <div class="alert alert-secondary">
+                        [user={{ $user->id }}]
+                    </div>
+                    Permalinking to this user's avatar, in the rich text editor:
+                    <div class="alert alert-secondary">
+                        [userav={{ $user->id }}]
+                    </div>
+                </div>
+            @endif
+        </div>
+    </div>
+</div>
+
+@if ($deactivated)
+    </div>
+@endif
diff --git a/resources/views/user/_sidebar.blade.php b/resources/views/user/_sidebar.blade.php
index b1c91259b1..fd6f4cb666 100644
--- a/resources/views/user/_sidebar.blade.php
+++ b/resources/views/user/_sidebar.blade.php
@@ -1,33 +1,33 @@
 <ul>
-    <li class="sidebar-header"><a href="{{ $user->url }}" class="card-link">{{ Illuminate\Support\Str::limit($user->name, 10, $end='...') }}</a></li>
+    <li class="sidebar-header"><a href="{{ $user->url }}" class="card-link">{{ Illuminate\Support\Str::limit($user->name, 10, $end = '...') }}</a></li>
     <li class="sidebar-section">
         <div class="sidebar-section-header">Gallery</div>
-        <div class="sidebar-item"><a href="{{ $user->url.'/gallery' }}" class="{{ set_active('user/'.$user->name.'/gallery*') }}">Gallery</a></div>
-        <div class="sidebar-item"><a href="{{ $user->url.'/favorites' }}" class="{{ set_active('user/'.$user->name.'/favorites*') }}">Favorites</a></div>
-        <div class="sidebar-item"><a href="{{ $user->url.'/favorites/own-characters' }}" class="{{ set_active('user/'.$user->name.'/favorites/own-characters*') }}">Own Character Favorites</a></div>
+        <div class="sidebar-item"><a href="{{ $user->url . '/gallery' }}" class="{{ set_active('user/' . $user->name . '/gallery*') }}">Gallery</a></div>
+        <div class="sidebar-item"><a href="{{ $user->url . '/favorites' }}" class="{{ set_active('user/' . $user->name . '/favorites*') }}">Favorites</a></div>
+        <div class="sidebar-item"><a href="{{ $user->url . '/favorites/own-characters' }}" class="{{ set_active('user/' . $user->name . '/favorites/own-characters*') }}">Own Character Favorites</a></div>
     </li>
     <li class="sidebar-section">
         <div class="sidebar-section-header">User</div>
-        <div class="sidebar-item"><a href="{{ $user->url.'/aliases' }}" class="{{ set_active('user/'.$user->name.'/aliases*') }}">Aliases</a></div>
-        <div class="sidebar-item"><a href="{{ $user->url.'/characters' }}" class="{{ set_active('user/'.$user->name.'/characters*') }}">Characters</a></div>
-        @if(isset($sublists) && $sublists->count() > 0)
-                @foreach($sublists as $sublist)
-                <div class="sidebar-item"><a href="{{ $user->url.'/sublist/'.$sublist->key }}" class="{{ set_active('user/'.$user->name.'/sublist/'.$sublist->key) }}">{{ $sublist->name }}</a></div>
-                @endforeach
+        <div class="sidebar-item"><a href="{{ $user->url . '/aliases' }}" class="{{ set_active('user/' . $user->name . '/aliases*') }}">Aliases</a></div>
+        <div class="sidebar-item"><a href="{{ $user->url . '/characters' }}" class="{{ set_active('user/' . $user->name . '/characters*') }}">Characters</a></div>
+        @if (isset($sublists) && $sublists->count() > 0)
+            @foreach ($sublists as $sublist)
+                <div class="sidebar-item"><a href="{{ $user->url . '/sublist/' . $sublist->key }}" class="{{ set_active('user/' . $user->name . '/sublist/' . $sublist->key) }}">{{ $sublist->name }}</a></div>
+            @endforeach
         @endif
-        <div class="sidebar-item"><a href="{{ $user->url.'/myos' }}" class="{{ set_active('user/'.$user->name.'/myos*') }}">MYO Slots</a></div>
-        <div class="sidebar-item"><a href="{{ $user->url.'/inventory' }}" class="{{ set_active('user/'.$user->name.'/inventory*') }}">Inventory</a></div>
-        <div class="sidebar-item"><a href="{{ $user->url.'/bank' }}" class="{{ set_active('user/'.$user->name.'/bank*') }}">Bank</a></div>
+        <div class="sidebar-item"><a href="{{ $user->url . '/myos' }}" class="{{ set_active('user/' . $user->name . '/myos*') }}">MYO Slots</a></div>
+        <div class="sidebar-item"><a href="{{ $user->url . '/inventory' }}" class="{{ set_active('user/' . $user->name . '/inventory*') }}">Inventory</a></div>
+        <div class="sidebar-item"><a href="{{ $user->url . '/bank' }}" class="{{ set_active('user/' . $user->name . '/bank*') }}">Bank</a></div>
     </li>
     <li class="sidebar-section">
         <div class="sidebar-section-header">History</div>
-        <div class="sidebar-item"><a href="{{ $user->url.'/ownership' }}" class="{{ $user->url.'/ownership*' }}">Ownership History</a></div>
-        <div class="sidebar-item"><a href="{{ $user->url.'/item-logs' }}" class="{{ $user->url.'/currency-logs*' }}">Item Logs</a></div>
-        <div class="sidebar-item"><a href="{{ $user->url.'/currency-logs' }}" class="{{ set_active($user->url.'/currency-logs*') }}">Currency Logs</a></div>
-        <div class="sidebar-item"><a href="{{ $user->url.'/submissions' }}" class="{{ set_active($user->url.'/submissions*') }}">Submissions</a></div>
+        <div class="sidebar-item"><a href="{{ $user->url . '/ownership' }}" class="{{ set_active('user/' . $user->name . '/ownership*') }}">Ownership History</a></div>
+        <div class="sidebar-item"><a href="{{ $user->url . '/item-logs' }}" class="{{ set_active('user/' . $user->name . '/item-logs*') }}">Item Logs</a></div>
+        <div class="sidebar-item"><a href="{{ $user->url . '/currency-logs' }}" class="{{ set_active('user/' . $user->name . '/currency-logs*') }}">Currency Logs</a></div>
+        <div class="sidebar-item"><a href="{{ $user->url . '/submissions' }}" class="{{ set_active('user/' . $user->name . '/submissions*') }}">Submissions</a></div>
     </li>
 
-    @if(Auth::check() && Auth::user()->hasPower('edit_user_info'))
+    @if (Auth::check() && Auth::user()->hasPower('edit_user_info'))
         <li class="sidebar-section">
             <div class="sidebar-section-header">Admin</div>
             <div class="sidebar-item"><a href="{{ $user->adminUrl }}">Edit User</a></div>
diff --git a/resources/views/user/aliases.blade.php b/resources/views/user/aliases.blade.php
index dd75fbb2e5..14a6efc46b 100644
--- a/resources/views/user/aliases.blade.php
+++ b/resources/views/user/aliases.blade.php
@@ -1,30 +1,53 @@
 @extends('user.layout')
 
-@section('profile-title') {{ $user->name }}'s Aliases @endsection
+@section('profile-title')
+    {{ $user->name }}'s Aliases
+@endsection
 
 @section('profile-content')
-{!! breadcrumbs(['Users' => 'users', $user->name => $user->url, 'Aliases' => $user->url.'/aliases']) !!}
+    {!! breadcrumbs(['Users' => 'users', $user->name => $user->url, 'Aliases' => $user->url . '/aliases']) !!}
 
-<h1>
-    {!! $user->displayName !!}'s Aliases
-</h1>
+    <h1>
+        {!! $user->displayName !!}'s Aliases
+    </h1>
 
-<div class="row ml-md-2 mb-4">
-    <div class="d-flex row flex-wrap col-12 mt-1 pt-1 px-0 ubt-bottom">
-        <div class="col-4 font-weight-bold">Alias</div>
-        <div class="col-3 font-weight-bold">Site</div>
-        <div class="col-5 font-weight-bold"></div>
-    </div>
-    @foreach($aliases as $alias)
-        <div class="d-flex row flex-wrap col-12 mt-1 pt-1 px-0 ubt-top">
-            <div class="col-4">{!! $alias->displayAlias !!}</div>
-            <div class="col-3"><i class="{{ $alias->config['icon'] }} fa-fw mr-1"></i> {{ $alias->config['full_name'] }}</div>
-            <div class="col-5">
-                @if($alias->is_primary_alias)<span class="badge badge-success">Primary</span>@endif
-                @if(!$alias->is_visible) <i class="fas fa-eye-slash" data-toggle="tooltip" title="This alias is hidden from public view."></i> @endif
+    <div class="mb-4 logs-table">
+        <div class="logs-table-header">
+            <div class="row">
+                <div class="col-4">
+                    <div class="logs-table-cell">Alias</div>
+                </div>
+                <div class="col-3">
+                    <div class="logs-table-cell">Site</div>
+                </div>
+                <div class="col-5">
+                    <div class="logs-table-cell"></div>
+                </div>
             </div>
         </div>
-    @endforeach
-</div>
-
+        <div class="logs-table-body">
+            @foreach ($aliases as $alias)
+                <div class="logs-table-row">
+                    <div class="row flex-wrap">
+                        <div class="col-4">
+                            <div class="logs-table-cell">{!! $alias->displayAlias !!}</div>
+                        </div>
+                        <div class="col-3">
+                            <div class="logs-table-cell"><i class="{{ $alias->config['icon'] }} fa-fw mr-1"></i> {{ $alias->config['full_name'] }}</div>
+                        </div>
+                        <div class="col-5">
+                            <div class="logs-table-cell">
+                                @if ($alias->is_primary_alias)
+                                    <span class="badge badge-success">Primary</span>
+                                @endif
+                                @if (!$alias->is_visible)
+                                    <i class="fas fa-eye-slash" data-toggle="tooltip" title="This alias is hidden from public view."></i>
+                                @endif
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            @endforeach
+        </div>
+    </div>
 @endsection
diff --git a/resources/views/user/bank.blade.php b/resources/views/user/bank.blade.php
index f8fda4db99..f844625eca 100644
--- a/resources/views/user/bank.blade.php
+++ b/resources/views/user/bank.blade.php
@@ -1,53 +1,74 @@
 @extends('user.layout')
 
-@section('profile-title') {{ $user->name }}'s Bank @endsection
+@section('profile-title')
+    {{ $user->name }}'s Bank
+@endsection
 
 @section('profile-content')
-{!! breadcrumbs(['Users' => 'users', $user->name => $user->url, 'Bank' => $user->url . '/bank']) !!}
+    {!! breadcrumbs(['Users' => 'users', $user->name => $user->url, 'Bank' => $user->url . '/bank']) !!}
 
-<h1>
-    {!! $user->displayName !!}'s Bank
-</h1>
+    <h1>
+        {!! $user->displayName !!}'s Bank
+    </h1>
 
-<h3>Currencies</h3>
-<div class="card mb-4">
-    <ul class="list-group list-group-flush">
+    <h3>Currencies</h3>
+    <div class="card mb-4">
+        <ul class="list-group list-group-flush">
 
-        @foreach($user->getCurrencies(true) as $currency)
-            <li class="list-group-item">
-                <div class="row">
-                    <div class="col-lg-2 col-md-3 col-6 text-right">
-                        <strong>
-                            <a href="{{ $currency->url }}">
-                                {{ $currency->name }}
-                                @if($currency->abbreviation) ({{ $currency->abbreviation }}) @endif
-                            </a>
-                        </strong>
-                    </div>
-                    <div class="col-lg-10 col-md-9 col-6">
-                        {{ $currency->quantity }} @if($currency->has_icon) {!! $currency->displayIcon !!} @endif
+            @foreach ($user->getCurrencies(true) as $currency)
+                <li class="list-group-item">
+                    <div class="row">
+                        <div class="col-lg-2 col-md-3 col-6 text-right">
+                            <strong>
+                                <a href="{{ $currency->url }}">
+                                    {{ $currency->name }}
+                                    @if ($currency->abbreviation)
+                                        ({{ $currency->abbreviation }})
+                                    @endif
+                                </a>
+                            </strong>
+                        </div>
+                        <div class="col-lg-10 col-md-9 col-6">
+                            {{ $currency->quantity }} @if ($currency->has_icon)
+                                {!! $currency->displayIcon !!}
+                            @endif
+                        </div>
                     </div>
-                </div>
-            </li>
-        @endforeach
-    </ul>
-</div>
-
-<h3>Latest Activity</h3>
-<div class="row ml-md-2 mb-4">
-  <div class="d-flex row flex-wrap col-12 mt-1 pt-1 px-0 ubt-bottom">
-    <div class="col-6 col-md-2 font-weight-bold">Sender</div>
-    <div class="col-6 col-md-2 font-weight-bold">Recipient</div>
-    <div class="col-6 col-md-2 font-weight-bold">Currency</div>
-    <div class="col-6 col-md-4 font-weight-bold">Log</div>
-    <div class="col-6 col-md-2 font-weight-bold">Date</div>
-  </div>
-  @foreach($logs as $log)
-      @include('user._currency_log_row', ['log' => $log, 'owner' => $user])
-  @endforeach
-</div>
-<div class="text-right">
-    <a href="{{ url($user->url.'/currency-logs') }}">View all...</a>
-</div>
+                </li>
+            @endforeach
+        </ul>
+    </div>
 
+    <h3>Latest Activity</h3>
+    <div class="mb-4 logs-table">
+        <div class="logs-table-header">
+            <div class="row">
+                <div class="col-6 col-md-2">
+                    <div class="logs-table-cell">Sender</div>
+                </div>
+                <div class="col-6 col-md-2">
+                    <div class="logs-table-cell">Recipient</div>
+                </div>
+                <div class="col-6 col-md-2">
+                    <div class="logs-table-cell">Currency</div>
+                </div>
+                <div class="col-6 col-md-4">
+                    <div class="logs-table-cell">Log</div>
+                </div>
+                <div class="col-6 col-md-2">
+                    <div class="logs-table-cell">Date</div>
+                </div>
+            </div>
+        </div>
+        <div class="logs-table-body">
+            @foreach ($logs as $log)
+                <div class="logs-table-row">
+                    @include('user._currency_log_row', ['log' => $log, 'owner' => $user])
+                </div>
+            @endforeach
+        </div>
+    </div>
+    <div class="text-right">
+        <a href="{{ url($user->url . '/currency-logs') }}">View all...</a>
+    </div>
 @endsection
diff --git a/resources/views/user/characters.blade.php b/resources/views/user/characters.blade.php
index 0b4cf8d9e3..5c697c4cdd 100644
--- a/resources/views/user/characters.blade.php
+++ b/resources/views/user/characters.blade.php
@@ -1,29 +1,15 @@
 @extends('user.layout')
 
-@section('profile-title') {{ $user->name }}'s Characters @endsection
+@section('profile-title')
+    {{ $user->name }}'s Characters
+@endsection
 
 @section('profile-content')
-{!! breadcrumbs(['Users' => 'users', $user->name => $user->url, 'Characters' => $user->url . '/characters']) !!}
-
-<h1>
-    {!! $user->displayName !!}'s Characters
-</h1>
+    {!! breadcrumbs(['Users' => 'users', $user->name => $user->url, 'Characters' => $user->url . '/characters']) !!}
 
-@if($characters->count())
-    <div class="row">
-        @foreach($characters as $character)
-            <div class="col-md-3 col-6 text-center mb-2">
-                <div>
-                    <a href="{{ $character->url }}"><img src="{{ $character->image->thumbnailUrl }}" class="img-thumbnail" alt="Thumbnail for {{ $character->fullName }}" /></a>
-                </div>
-                <div class="mt-1 h5">
-                    @if(!$character->is_visible) <i class="fas fa-eye-slash"></i> @endif {!! $character->displayName !!}
-                </div>
-            </div>
-        @endforeach
-    </div>
-@else
-    <p>No characters found.</p>
-@endif
+    <h1>
+        {!! $user->displayName !!}'s Characters
+    </h1>
 
+    @include('user._characters', ['characters' => $characters, 'myo' => false])
 @endsection
diff --git a/resources/views/user/currency_logs.blade.php b/resources/views/user/currency_logs.blade.php
index 8b6f27fdfa..df431131ed 100644
--- a/resources/views/user/currency_logs.blade.php
+++ b/resources/views/user/currency_logs.blade.php
@@ -1,27 +1,44 @@
 @extends('user.layout')
 
-@section('profile-title') {{ $user->name }}'s Currency Logs @endsection
+@section('profile-title')
+    {{ $user->name }}'s Currency Logs
+@endsection
 
 @section('profile-content')
-{!! breadcrumbs(['Users' => 'users', $user->name => $user->url, 'Bank' => $user->url . '/bank', 'Logs' => $user->url.'/currency-logs']) !!}
-
-<h1>
-    {!! $user->displayName !!}'s Currency Logs
-</h1>
+    {!! breadcrumbs(['Users' => 'users', $user->name => $user->url, 'Bank' => $user->url . '/bank', 'Logs' => $user->url . '/currency-logs']) !!}
 
-{!! $logs->render() !!}
-<div class="row ml-md-2 mb-4">
-  <div class="d-flex row flex-wrap col-12 mt-1 pt-1 px-0 ubt-bottom">
-    <div class="col-6 col-md-2 font-weight-bold">Sender</div>
-    <div class="col-6 col-md-2 font-weight-bold">Recipient</div>
-    <div class="col-6 col-md-2 font-weight-bold">Currency</div>
-    <div class="col-6 col-md-4 font-weight-bold">Log</div>
-    <div class="col-6 col-md-2 font-weight-bold">Date</div>
-  </div>
-  @foreach($logs as $log)
-      @include('user._currency_log_row', ['log' => $log, 'owner' => $user])
-  @endforeach
-</div>
-{!! $logs->render() !!}
+    <h1>
+        {!! $user->displayName !!}'s Currency Logs
+    </h1>
 
+    {!! $logs->render() !!}
+    <div class="mb-4 logs-table">
+        <div class="logs-table-header">
+            <div class="row">
+                <div class="col-6 col-md-2">
+                    <div class="logs-table-cell">Sender</div>
+                </div>
+                <div class="col-6 col-md-2">
+                    <div class="logs-table-cell">Recipient</div>
+                </div>
+                <div class="col-6 col-md-2">
+                    <div class="logs-table-cell">Currency</div>
+                </div>
+                <div class="col-6 col-md-4">
+                    <div class="logs-table-cell">Log</div>
+                </div>
+                <div class="col-6 col-md-2">
+                    <div class="logs-table-cell">Date</div>
+                </div>
+            </div>
+        </div>
+        <div class="logs-table-body">
+            @foreach ($logs as $log)
+                <div class="logs-table-row">
+                    @include('user._currency_log_row', ['log' => $log, 'owner' => $user])
+                </div>
+            @endforeach
+        </div>
+    </div>
+    {!! $logs->render() !!}
 @endsection
diff --git a/resources/views/user/favorites.blade.php b/resources/views/user/favorites.blade.php
index 47eded7e6c..c488e0da82 100644
--- a/resources/views/user/favorites.blade.php
+++ b/resources/views/user/favorites.blade.php
@@ -1,35 +1,37 @@
 @extends('user.layout')
 
-@section('profile-title') {{ $user->name }}'s Favorites @endsection
+@section('profile-title')
+    {{ $user->name }}'s Favorites
+@endsection
 
 @section('profile-content')
-@if($characters)
-{!! breadcrumbs(['Users' => 'users', $user->name => $user->url, 'Favorites' => $user->url . '/favorites', 'Own Characters' => $user->url . '/favorites/own-characters']) !!}
-@else
-{!! breadcrumbs(['Users' => 'users', $user->name => $user->url, 'Favorites' => $user->url . '/favorites']) !!}
-@endif
-
-<h1>
-    {{ $characters ? 'Own Character ' : '' }}Favorites
-</h1>
-
-@if($characters)
-    <p>These are {{ Auth::check() && Auth::user()->id == $user->id ? 'your' : $user->name.'\'s' }} favorites which feature <a href="{{ url($user->url . '/characters') }}">characters {{ Auth::check() && Auth::user()->id == $user->id ? 'you' : 'they' }} own</a>.</p>
-@endif
-
-@if(isset($favorites) && $favorites->count())
-
-    {!! $favorites->render() !!}
-
-<div class="d-flex align-content-around flex-wrap mb-2">
-    @foreach($favorites as $submission)
-        @include('galleries._thumb', ['submission' => $submission, 'gallery' => false])
-    @endforeach
-</div>
-
-    {!! $favorites->render() !!}
-@else
-    <p>No favorites found!</p>
-@endif
+    @if ($characters)
+        {!! breadcrumbs(['Users' => 'users', $user->name => $user->url, 'Favorites' => $user->url . '/favorites', 'Own Characters' => $user->url . '/favorites/own-characters']) !!}
+    @else
+        {!! breadcrumbs(['Users' => 'users', $user->name => $user->url, 'Favorites' => $user->url . '/favorites']) !!}
+    @endif
+
+    <h1>
+        {{ $characters ? 'Own Character ' : '' }}Favorites
+    </h1>
+
+    @if ($characters)
+        <p>These are {{ Auth::check() && Auth::user()->id == $user->id ? 'your' : $user->name . '\'s' }} favorites which feature <a href="{{ url($user->url . '/characters') }}">characters
+                {{ Auth::check() && Auth::user()->id == $user->id ? 'you' : 'they' }} own</a>.</p>
+    @endif
+
+    @if (isset($favorites) && $favorites->count())
+        {!! $favorites->render() !!}
+
+        <div class="d-flex align-content-around flex-wrap mb-2">
+            @foreach ($favorites as $submission)
+                @include('galleries._thumb', ['submission' => $submission, 'gallery' => false])
+            @endforeach
+        </div>
+
+        {!! $favorites->render() !!}
+    @else
+        <p>No favorites found!</p>
+    @endif
 
 @endsection
diff --git a/resources/views/user/gallery.blade.php b/resources/views/user/gallery.blade.php
index d0245e8957..0d2de499df 100644
--- a/resources/views/user/gallery.blade.php
+++ b/resources/views/user/gallery.blade.php
@@ -1,26 +1,28 @@
 @extends('user.layout')
 
-@section('profile-title') {{ $user->name }}'s Gallery @endsection
+@section('profile-title')
+    {{ $user->name }}'s Gallery
+@endsection
 
 @section('profile-content')
-{!! breadcrumbs(['Users' => 'users', $user->name => $user->url, 'Gallery' => $user->url . '/gallery']) !!}
+    {!! breadcrumbs(['Users' => 'users', $user->name => $user->url, 'Gallery' => $user->url . '/gallery']) !!}
 
-<h1>
-    Gallery
-</h1>
+    <h1>
+        Gallery
+    </h1>
 
-@if($user->gallerySubmissions->count())
-    {!! $submissions->render() !!}
+    @if ($user->gallerySubmissions->count())
+        {!! $submissions->render() !!}
 
-<div class="d-flex align-content-around flex-wrap mb-2">
-    @foreach($submissions as $submission)
-        @include('galleries._thumb', ['submission' => $submission, 'gallery' => false])
-    @endforeach
-</div>
+        <div class="d-flex align-content-around flex-wrap mb-2">
+            @foreach ($submissions as $submission)
+                @include('galleries._thumb', ['submission' => $submission, 'gallery' => false])
+            @endforeach
+        </div>
 
-    {!! $submissions->render() !!}
-@else
-    <p>No submissions found!</p>
-@endif
+        {!! $submissions->render() !!}
+    @else
+        <p>No submissions found!</p>
+    @endif
 
 @endsection
diff --git a/resources/views/user/inventory.blade.php b/resources/views/user/inventory.blade.php
index e26ce012c1..e7ed42e49d 100644
--- a/resources/views/user/inventory.blade.php
+++ b/resources/views/user/inventory.blade.php
@@ -1,69 +1,136 @@
 @extends('user.layout')
 
-@section('profile-title') {{ $user->name }}'s Inventory @endsection
+@section('profile-title')
+    {{ $user->name }}'s Inventory
+@endsection
 
 @section('profile-content')
-{!! breadcrumbs(['Users' => 'users', $user->name => $user->url, 'Inventory' => $user->url . '/inventory']) !!}
+    {!! breadcrumbs(['Users' => 'users', $user->name => $user->url, 'Inventory' => $user->url . '/inventory']) !!}
+
+    <h1>
+        Inventory
+    </h1>
 
-<h1>
-    Inventory
-</h1>
+    <div class="text-right mb-3">
+        <div class="btn-group">
+            <button type="button" class="btn btn-secondary active def-view-button" data-toggle="tooltip" title="Default View" alt="Default View"><i class="fas fa-th"></i></button>
+            <button type="button" class="btn btn-secondary sum-view-button" data-toggle="tooltip" title="Summarized View" alt="Summarized View"><i class="fas fa-bars"></i></button>
+        </div>
+    </div>
 
-@foreach($items as $categoryId=>$categoryItems)
-    <div class="card mb-3 inventory-category">
-        <h5 class="card-header inventory-header">
-            {!! isset($categories[$categoryId]) ? '<a href="'.$categories[$categoryId]->searchUrl.'">'.$categories[$categoryId]->name.'</a>' : 'Miscellaneous' !!}
-            <a class="small inventory-collapse-toggle collapse-toggle collapsed" href="#{!! isset($categories[$categoryId]) ? str_replace(' ', '', $categories[$categoryId]->name) : 'miscellaneous' !!}" data-toggle="collapse">Show</a></h3>
-        </h5>
-        <div class="card-body inventory-body collapse show" id="{!! isset($categories[$categoryId]) ? str_replace(' ', '', $categories[$categoryId]->name) : 'miscellaneous' !!}">
-            @foreach($categoryItems->chunk(4) as $chunk)
-                <div class="row mb-3">
-                    @foreach($chunk as $itemId=>$stack)
-                        <div class="col-sm-3 col-6 text-center inventory-item" data-id="{{ $stack->first()->pivot->id }}" data-name="{{ $user->name }}'s {{ $stack->first()->name }}">
-                            <div class="mb-1">
-                                <a href="#" class="inventory-stack"><img src="{{ $stack->first()->imageUrl }}" alt="{{ $stack->first()->name }}" /></a>
-                            </div>
-                            <div>
-                                <a href="#" class="inventory-stack inventory-stack-name">{{ $stack->first()->name }} x{{ $stack->sum('pivot.count') }}</a>
-                            </div>
+    <div id="defView" class="hide">
+        @foreach ($items as $categoryId => $categoryItems)
+            <div class="card mb-3 inventory-category">
+                <h5 class="card-header inventory-header">
+                    {!! isset($categories[$categoryId]) ? '<a href="' . $categories[$categoryId]->searchUrl . '">' . $categories[$categoryId]->name . '</a>' : 'Miscellaneous' !!}
+                    <a class="small inventory-collapse-toggle collapse-toggle" href="#categoryId_{!! isset($categories[$categoryId]) ? $categories[$categoryId]->id : 'miscellaneous' !!}" data-toggle="collapse">
+                        Show
+                    </a>
+                </h5>
+                <div class="card-body inventory-body collapse show" id="categoryId_{!! isset($categories[$categoryId]) ? $categories[$categoryId]->id : 'miscellaneous' !!}">
+                    @foreach ($categoryItems->chunk(4) as $chunk)
+                        <div class="row mb-3">
+                            @foreach ($chunk as $itemId => $stack)
+                                <div class="col-sm-3 col-6 text-center inventory-item" data-id="{{ $stack->first()->pivot->id }}" data-name="{{ $user->name }}'s {{ $stack->first()->name }}">
+                                    @if ($stack->first()->has_image)
+                                        <div class="mb-1">
+                                            <a href="#" class="inventory-stack">
+                                                <img src="{{ $stack->first()->imageUrl }}" alt="{{ $stack->first()->name }}" />
+                                            </a>
+                                        </div>
+                                    @endif
+                                    <div>
+                                        <a href="#" class="inventory-stack inventory-stack-name">
+                                            {{ $stack->first()->name }} x{{ $stack->sum('pivot.count') }}
+                                        </a>
+                                    </div>
+                                </div>
+                            @endforeach
                         </div>
                     @endforeach
                 </div>
-            @endforeach
-        </div>
+            </div>
+        @endforeach
     </div>
-@endforeach
 
+    <div id="sumView" class="hide">
+        @foreach ($items as $categoryId => $categoryItems)
+            <div class="card mb-2">
+                <h5 class="card-header">
+                    {!! isset($categories[$categoryId]) ? '<a href="' . $categories[$categoryId]->searchUrl . '">' . $categories[$categoryId]->name . '</a>' : 'Miscellaneous' !!}
+                    <a class="small inventory-collapse-toggle collapse-toggle" href="#categoryId_{!! isset($categories[$categoryId]) ? $categories[$categoryId]->id : 'miscellaneous' !!}" data-toggle="collapse">
+                        Show
+                    </a>
+                </h5>
+                <div class="card-body p-2 collapse show row" id="categoryId_{!! isset($categories[$categoryId]) ? $categories[$categoryId]->id : 'miscellaneous' !!}">
+                    @foreach ($categoryItems as $itemtype)
+                        <div class="col-lg-3 col-sm-4 col-12">
+                            @if ($itemtype->first()->has_image)
+                                <img src="{{ $itemtype->first()->imageUrl }}" style="height: 25px;" alt="{{ $itemtype->first()->name }}" />
+                            @endif
+                            <a href="{{ $itemtype->first()->idUrl }}">
+                                {{ $itemtype->first()->name }}
+                            </a>
+                            <ul class="mb-0" data-id="{{ $itemtype->first()->pivot->id }}" data-name="{{ $user->name }}'s {{ $itemtype->first()->name }}">
+                                @foreach ($itemtype as $item)
+                                    <li>
+                                        <a class="inventory-stack" href="#">
+                                            Stack of x{{ $item->pivot->count }}
+                                        </a>.
+                                    </li>
+                                @endforeach
+                            </ul>
+                        </div>
+                    @endforeach
+                </div>
+            </div>
+        @endforeach
+    </div>
 
-<h3>Latest Activity</h3>
-<div class="row ml-md-2 mb-4">
-  <div class="d-flex row flex-wrap col-12 mt-1 pt-1 px-0 ubt-bottom">
-    <div class="col-6 col-md-2 font-weight-bold">Sender</div>
-    <div class="col-6 col-md-2 font-weight-bold">Recipient</div>
-    <div class="col-6 col-md-2 font-weight-bold">Item</div>
-    <div class="col-6 col-md-4 font-weight-bold">Log</div>
-    <div class="col-6 col-md-2 font-weight-bold">Date</div>
-  </div>
-      @foreach($logs as $log)
-          @include('user._item_log_row', ['log' => $log, 'owner' => $user])
-      @endforeach
-</div>
-<div class="text-right">
-    <a href="{{ url($user->url.'/item-logs') }}">View all...</a>
-</div>
+    <h3>Latest Activity</h3>
+    <div class="mb-4 logs-table">
+        <div class="logs-table-header">
+            <div class="row">
+                <div class="col-6 col-md-2">
+                    <div class="logs-table-cell">Sender</div>
+                </div>
+                <div class="col-6 col-md-2">
+                    <div class="logs-table-cell">Recipient</div>
+                </div>
+                <div class="col-6 col-md-2">
+                    <div class="logs-table-cell">Item</div>
+                </div>
+                <div class="col-6 col-md-4">
+                    <div class="logs-table-cell">Log</div>
+                </div>
+                <div class="col-6 col-md-2">
+                    <div class="logs-table-cell">Date</div>
+                </div>
+            </div>
+        </div>
+        <div class="logs-table-body">
+            @foreach ($logs as $log)
+                <div class="logs-table-row">
+                    @include('user._item_log_row', ['log' => $log, 'owner' => $user])
+                </div>
+            @endforeach
+        </div>
+    </div>
 
+    <div class="text-right">
+        <a href="{{ url($user->url . '/item-logs') }}">View all...</a>
+    </div>
 @endsection
 
 @section('scripts')
-<script>
-
-$( document ).ready(function() {
-    $('.inventory-stack').on('click', function(e) {
-        e.preventDefault();
-        var $parent = $(this).parent().parent();
-        loadModal("{{ url('items') }}/" + $parent.data('id'), $parent.data('name'));
-    });
-});
-
-</script>
+    @include('widgets._inventory_view_js')
+    <script>
+        $(document).ready(function() {
+            $('.inventory-stack').on('click', function(e) {
+                e.preventDefault();
+                var $parent = $(this).parent().parent();
+                loadModal("{{ url('items') }}/" + $parent.data('id'), $parent.data('name'));
+            });
+        });
+    </script>
 @endsection
diff --git a/resources/views/user/item_logs.blade.php b/resources/views/user/item_logs.blade.php
index f8304e5d15..d8bbb29bd5 100644
--- a/resources/views/user/item_logs.blade.php
+++ b/resources/views/user/item_logs.blade.php
@@ -1,27 +1,44 @@
 @extends('user.layout')
 
-@section('profile-title') {{ $user->name }}'s Item Logs @endsection
+@section('profile-title')
+    {{ $user->name }}'s Item Logs
+@endsection
 
 @section('profile-content')
-{!! breadcrumbs(['Users' => 'users', $user->name => $user->url, 'Inventory' => $user->url . '/inventory', 'Logs' => $user->url.'/item-logs']) !!}
-
-<h1>
-    {!! $user->displayName !!}'s Item Logs
-</h1>
+    {!! breadcrumbs(['Users' => 'users', $user->name => $user->url, 'Inventory' => $user->url . '/inventory', 'Logs' => $user->url . '/item-logs']) !!}
 
-{!! $logs->render() !!}
-<div class="row ml-md-2 mb-4">
-  <div class="d-flex row flex-wrap col-12 mt-1 pt-1 px-0 ubt-bottom">
-    <div class="col-6 col-md-2 font-weight-bold">Sender</div>
-    <div class="col-6 col-md-2 font-weight-bold">Recipient</div>
-    <div class="col-6 col-md-2 font-weight-bold">Item</div>
-    <div class="col-6 col-md-4 font-weight-bold">Log</div>
-    <div class="col-6 col-md-2 font-weight-bold">Date</div>
-  </div>
-    @foreach($logs as $log)
-        @include('user._item_log_row', ['log' => $log, 'owner' => $user])
-    @endforeach
-</div>
-{!! $logs->render() !!}
+    <h1>
+        {!! $user->displayName !!}'s Item Logs
+    </h1>
 
+    {!! $logs->render() !!}
+    <div class="mb-4 logs-table">
+        <div class="logs-table-header">
+            <div class="row">
+                <div class="col-6 col-md-2">
+                    <div class="logs-table-cell">Sender</div>
+                </div>
+                <div class="col-6 col-md-2">
+                    <div class="logs-table-cell">Recipient</div>
+                </div>
+                <div class="col-6 col-md-2">
+                    <div class="logs-table-cell">Item</div>
+                </div>
+                <div class="col-6 col-md-4">
+                    <div class="logs-table-cell">Log</div>
+                </div>
+                <div class="col-6 col-md-2">
+                    <div class="logs-table-cell">Date</div>
+                </div>
+            </div>
+        </div>
+        <div class="logs-table-body">
+            @foreach ($logs as $log)
+                <div class="logs-table-row">
+                    @include('user._item_log_row', ['log' => $log, 'owner' => $user])
+                </div>
+            @endforeach
+        </div>
+    </div>
+    {!! $logs->render() !!}
 @endsection
diff --git a/resources/views/user/layout.blade.php b/resources/views/user/layout.blade.php
index 97bdc0644e..6901e14c10 100644
--- a/resources/views/user/layout.blade.php
+++ b/resources/views/user/layout.blade.php
@@ -1,9 +1,22 @@
 @extends('layouts.app')
 
-@section('title') User ::@yield('profile-title')@endsection
+@section('title')
+    User ::@yield('profile-title')
+@endsection
 
 @section('sidebar')
-    @include('user._sidebar')
+    @if (isset($user) && $user->is_deactivated)
+        @include('user._deactivated_sidebar')
+        @if (Auth::check() && Auth::user()->isStaff)
+            <ul class="my-0 py-0">
+                <li class="sidebar-header my-0 h4"><a href="{{ $user->url }}" class="card-link">ADMIN VIEW</a></li>
+            </ul>
+
+            @include('user._sidebar')
+        @endif
+    @else
+        @include('user._sidebar')
+    @endif
 @endsection
 
 @section('content')
@@ -11,5 +24,5 @@
 @endsection
 
 @section('scripts')
-@parent
-@endsection
\ No newline at end of file
+    @parent
+@endsection
diff --git a/resources/views/user/myo_slots.blade.php b/resources/views/user/myo_slots.blade.php
index fc86534200..1a0e80e9ab 100644
--- a/resources/views/user/myo_slots.blade.php
+++ b/resources/views/user/myo_slots.blade.php
@@ -1,29 +1,15 @@
 @extends('user.layout')
 
-@section('profile-title') {{ $user->name }}'s MYO Slots @endsection
+@section('profile-title')
+    {{ $user->name }}'s MYO Slots
+@endsection
 
 @section('profile-content')
-{!! breadcrumbs(['Users' => 'users', $user->name => $user->url, 'MYO Slots' => $user->url . '/myos']) !!}
-
-<h1>
-    {!! $user->displayName !!}'s MYO Slots
-</h1>
+    {!! breadcrumbs(['Users' => 'users', $user->name => $user->url, 'MYO Slots' => $user->url . '/myos']) !!}
 
-@if($myos->count())
-    <div class="row">
-        @foreach($myos as $myo)
-            <div class="col-md-3 col-6 text-center mb-2">
-                <div>
-                    <a href="{{ $myo->url }}"><img src="{{ $myo->image->thumbnailUrl }}" class="img-thumbnail" alt="{{ $myo->fullName }}" /></a>
-                </div>
-                <div class="mt-1 h5">
-                    @if(!$myo->is_visible) <i class="fas fa-eye-slash"></i> @endif {!! $myo->displayName !!}
-                </div>
-            </div>
-        @endforeach
-    </div>
-@else
-    <p>No MYO slots found.</p>
-@endif
+    <h1>
+        {!! $user->displayName !!}'s MYO Slots
+    </h1>
 
+    @include('user._characters', ['characters' => $myos, 'myo' => true])
 @endsection
diff --git a/resources/views/user/ownership_logs.blade.php b/resources/views/user/ownership_logs.blade.php
index 49288bba9d..0d8c0f8696 100644
--- a/resources/views/user/ownership_logs.blade.php
+++ b/resources/views/user/ownership_logs.blade.php
@@ -1,27 +1,44 @@
 @extends('user.layout')
 
-@section('profile-title') {{ $user->name }}'s Character History @endsection
+@section('profile-title')
+    {{ $user->name }}'s Character History
+@endsection
 
 @section('profile-content')
-{!! breadcrumbs(['Users' => 'users', $user->name => $user->url, 'Logs' => $user->url.'/ownership']) !!}
-
-<h1>
-    {!! $user->displayName !!}'s Character History
-</h1>
+    {!! breadcrumbs(['Users' => 'users', $user->name => $user->url, 'Logs' => $user->url . '/ownership']) !!}
 
-{!! $logs->render() !!}
-<div class="row ml-md-2 mb-4">
-  <div class="d-flex row flex-wrap col-12 mt-1 pt-1 px-0 ubt-bottom">
-    <div class="col-6 col-md-2 font-weight-bold">Sender</div>
-    <div class="col-6 col-md-2 font-weight-bold">Recipient</div>
-    <div class="col-6 col-md-2 font-weight-bold">Character</div>
-    <div class="col-6 col-md-4 font-weight-bold">Log</div>
-    <div class="col-6 col-md-2 font-weight-bold">Date</div>
-  </div>
-  @foreach($logs as $log)
-      @include('user._ownership_log_row', ['log' => $log, 'user' => $user, 'showCharacter' => true])
-  @endforeach
-</div>
-{!! $logs->render() !!}
+    <h1>
+        {!! $user->displayName !!}'s Character History
+    </h1>
 
+    {!! $logs->render() !!}
+    <div class="mb-4 logs-table">
+        <div class="logs-table-header">
+            <div class="row">
+                <div class="col-6 col-md-2">
+                    <div class="logs-table-cell">Sender</div>
+                </div>
+                <div class="col-6 col-md-2">
+                    <div class="logs-table-cell">Recipient</div>
+                </div>
+                <div class="col-6 col-md-2">
+                    <div class="logs-table-cell">Character</div>
+                </div>
+                <div class="col-6 col-md-4">
+                    <div class="logs-table-cell">Log</div>
+                </div>
+                <div class="col-6 col-md-2">
+                    <div class="logs-table-cell">Date</div>
+                </div>
+            </div>
+        </div>
+        <div class="logs-table-body">
+            @foreach ($logs as $log)
+                <div class="logs-table-row">
+                    @include('user._ownership_log_row', ['log' => $log, 'user' => $user, 'showCharacter' => true])
+                </div>
+            @endforeach
+        </div>
+    </div>
+    {!! $logs->render() !!}
 @endsection
diff --git a/resources/views/user/profile.blade.php b/resources/views/user/profile.blade.php
index 8b8d01e07c..fc3f4a18a1 100644
--- a/resources/views/user/profile.blade.php
+++ b/resources/views/user/profile.blade.php
@@ -1,121 +1,36 @@
-@extends('user.layout')
+@extends('user.layout', ['user' => isset($user) ? $user : null])
 
-@section('profile-title') {{ $user->name }}'s Profile @endsection
+@section('profile-title')
+    {{ $user->name }}'s Profile
+@endsection
 
-@section('meta-img') {{ asset('/images/avatars/'.$user->avatar) }} @endsection
+@section('meta-img')
+    {{ $user->avatarUrl }}
+@endsection
 
 @section('profile-content')
-{!! breadcrumbs(['Users' => 'users', $user->name => $user->url]) !!}
-
-@if($user->is_banned)
-    <div class="alert alert-danger">This user has been banned.</div>
-@endif
-<h1>
-    <img src="/images/avatars/{{ $user->avatar }}" style="width:125px; height:125px; float:left; border-radius:50%; margin-right:25px;" alt="{{ $user->name }}" >
-    {!! $user->displayName !!}
-    <a href="{{ url('reports/new?url=') . $user->url }}"><i class="fas fa-exclamation-triangle fa-xs" data-toggle="tooltip" title="Click here to report this user." style="opacity: 50%; font-size:0.5em;"></i></a>
+    {!! breadcrumbs(['Users' => 'users', $user->name => $user->url]) !!}
 
-    @if($user->settings->is_fto)
-        <span class="badge badge-success float-right" data-toggle="tooltip" title="This user has not owned any characters from this world before.">FTO</span>
+    @if (mb_strtolower($user->name) != mb_strtolower($name))
+        <div class="alert alert-info">This user has changed their name to <strong>{{ $user->name }}</strong>.</div>
     @endif
-</h1>
-<div class="mb-4">
-    <div class="row">
-        <div class="row col-md-6">
-            <div class="col-md-2 col-4"><h5>Alias</h5></div>
-            <div class="col-md-10 col-8">{!! $user->displayAlias !!}</div>
-        </div>
-        <div class="row col-md-6">
-            <div class="col-md-2 col-4"><h5>Joined</h5></div>
-            <div class="col-md-10 col-8">{!! format_date($user->created_at, false) !!} ({{ $user->created_at->diffForHumans() }})</div>
-        </div>
-        <div class="row col-md-6">
-            <div class="col-md-2 col-4"><h5>Rank</h5></div>
-            <div class="col-md-10 col-8">{!! $user->rank->displayName !!} {!! add_help($user->rank->parsed_description) !!}</div>
-        </div>
-        @if($user->birthdayDisplay && isset($user->birthday))
-            <div class="row col-md-6">
-                <div class="col-md-2 col-4"><h5>Birthday</h5></div>
-                <div class="col-md-10 col-8">{!! $user->birthdayDisplay !!}</div>
-            </div>
-        @endif
-    </div>
-</div>
 
-@if(isset($user->profile->parsed_text))
-    <div class="card mb-3" style="clear:both;">
-        <div class="card-body">
-            {!! $user->profile->parsed_text !!}
-        </div>
-    </div>
-@endif
+    @if ($user->is_banned)
+        <div class="alert alert-danger">This user has been banned.</div>
+    @endif
 
-<div class="card-deck mb-4 profile-assets" style="clear:both;">
-    <div class="card profile-currencies profile-assets-card">
-        <div class="card-body text-center">
-            <h5 class="card-title">Bank</h5>
-            <div class="profile-assets-content">
-                @foreach($user->getCurrencies(false) as $currency)
-                    <div>{!! $currency->display($currency->quantity) !!}</div>
-                @endforeach
-            </div>
-            <div class="text-right"><a href="{{ $user->url.'/bank' }}">View all...</a></div>
-        </div>
-    </div>
-    <div class="card profile-inventory profile-assets-card">
-        <div class="card-body text-center">
-            <h5 class="card-title">Inventory</h5>
-            <div class="profile-assets-content">
-                @if(count($items))
-                    <div class="row">
-                        @foreach($items as $item)
-                            <div class="col-md-3 col-6 profile-inventory-item">
-                                @if($item->imageUrl)
-                                    <img src="{{ $item->imageUrl }}" data-toggle="tooltip" title="{{ $item->name }}" alt="{{ $item->name }}"/>
-                                @else
-                                    <p>{{ $item->name }}</p>
-                                @endif
-                            </div>
-                        @endforeach
-                    </div>
-                @else
-                    <div>No items owned.</div>
-                @endif
-            </div>
-            <div class="text-right"><a href="{{ $user->url.'/inventory' }}">View all...</a></div>
+    @if ($user->is_deactivated)
+        <div class="alert alert-info text-center">
+            <h1>{!! $user->displayName !!}</h1>
+            <p>This account is currently deactivated, be it by staff or the user's own action. All information herein is hidden until the account is reactivated.</p>
+            @if (Auth::check() && Auth::user()->isStaff)
+                <p class="mb-0">As you are staff, you can see the profile contents below and the sidebar contents.</p>
+            @endif
         </div>
-    </div>
-</div>
-
-<h2>
-    <a href="{{ $user->url.'/characters' }}">Characters</a>
-    @if(isset($sublists) && $sublists->count() > 0)
-        @foreach($sublists as $sublist)
-        / <a href="{{ $user->url.'/sublist/'.$sublist->key }}">{{ $sublist->name }}</a>
-        @endforeach
     @endif
-</h2>
-
-@foreach($characters->take(4)->get()->chunk(4) as $chunk)
-    <div class="row mb-4">
-        @foreach($chunk as $character)
-            <div class="col-md-3 col-6 text-center">
-                <div>
-                    <a href="{{ $character->url }}"><img src="{{ $character->image->thumbnailUrl }}" class="img-thumbnail" alt="{{ $character->fullName }}" /></a>
-                </div>
-                <div class="mt-1">
-                    <a href="{{ $character->url }}" class="h5 mb-0"> @if(!$character->is_visible) <i class="fas fa-eye-slash"></i> @endif {{ $character->fullName }}</a>
-                </div>
-            </div>
-        @endforeach
-    </div>
-@endforeach
 
-<div class="text-right"><a href="{{ $user->url.'/characters' }}">View all...</a></div>
-<hr>
-<br><br>
+    @if (!$user->is_deactivated || (Auth::check() && Auth::user()->isStaff))
+        @include('user._profile_content', ['user' => $user, 'deactivated' => $user->is_deactivated])
+    @endif
 
-@comments(['model' => $user->profile,
-        'perPage' => 5
-    ])
 @endsection
diff --git a/resources/views/user/sublist.blade.php b/resources/views/user/sublist.blade.php
index 3f070d3c0a..95fc5b629e 100644
--- a/resources/views/user/sublist.blade.php
+++ b/resources/views/user/sublist.blade.php
@@ -1,30 +1,15 @@
 @extends('user.layout')
 
-@section('profile-title') {{ $user->name }}'s {{ $sublist->name }} @endsection
+@section('profile-title')
+    {{ $user->name }}'s {{ $sublist->name }}
+@endsection
 
 @section('profile-content')
-{!! breadcrumbs(['Users' => 'users', $user->name => $user->url, $sublist->name => $user->url . '/sublist/'.$sublist->key]) !!}
-
-<h1>
-    {!! $user->displayName !!}'s {{ $sublist->name }}
-</h1>
-
+    {!! breadcrumbs(['Users' => 'users', $user->name => $user->url, $sublist->name => $user->url . '/sublist/' . $sublist->key]) !!}
 
-@if($characters->count())
-    <div class="row">
-        @foreach($characters as $character)
-            <div class="col-md-3 col-6 text-center mb-2">
-                <div>
-                    <a href="{{ $character->url }}"><img src="{{ $character->image->thumbnailUrl }}" class="img-thumbnail" alt="{{ $character->fullName }}" /></a>
-                </div>
-                <div class="mt-1 h5">
-                    @if(!$character->is_visible) <i class="fas fa-eye-slash"></i> @endif {!! $character->displayName !!}
-                </div>
-            </div>
-        @endforeach
-    </div>
-@else
-    <p>No characters found.</p>
-@endif
+    <h1>
+        {!! $user->displayName !!}'s {{ $sublist->name }}
+    </h1>
 
+    @include('user._characters', ['characters' => $characters, 'myo' => false])
 @endsection
diff --git a/resources/views/user/submission_logs.blade.php b/resources/views/user/submission_logs.blade.php
index 60f0a2f4c0..b28afbf914 100644
--- a/resources/views/user/submission_logs.blade.php
+++ b/resources/views/user/submission_logs.blade.php
@@ -1,33 +1,59 @@
 @extends('user.layout')
 
-@section('profile-title') {{ $user->name }}'s Submissions @endsection
+@section('profile-title')
+    {{ $user->name }}'s Submissions
+@endsection
 
 @section('profile-content')
-{!! breadcrumbs(['Users' => 'users', $user->name => $user->url, 'Submissions' => $user->url.'/submissions']) !!}
-
-<h1>
-    {!! $user->displayName !!}'s Submissions
-</h1>
+    {!! breadcrumbs(['Users' => 'users', $user->name => $user->url, 'Submissions' => $user->url . '/submissions']) !!}
 
-{!! $logs->render() !!}
-<div class="row ml-md-2">
-  <div class="d-flex row flex-wrap col-12 mt-1 pt-1 px-0 ubt-bottom">
-    <div class="col-12 col-md-2 font-weight-bold">Prompt</div>
-    <div class="col-6 col-md-4 font-weight-bold">Link</div>
-    <div class="col-6 col-md-5 font-weight-bold">Date</div>
-  </div>
+    <h1>
+        {!! $user->displayName !!}'s Submissions
+    </h1>
 
-  @foreach($logs as $log)
-    <div class="d-flex row flex-wrap col-12 mt-1 pt-1 px-0 ubt-top">
-      <div class="col-12 col-md-2">{!! $log->prompt_id ? $log->prompt->displayName : '---' !!}</div>
-      <div class="col-6 col-md-4">
-        <span class="ubt-texthide"><a href="{{ $log->url }}">{{ $log->url }}</a></span>
-      </div>
-      <div class="col-6 col-md-5">{!! pretty_date($log->created_at) !!}</div>
-      <div class="col-6 col-md-1"><a href="{{ $log->viewUrl }}" class="btn btn-primary btn-sm py-0 px-1">Details</a></div>
+    {!! $logs->render() !!}
+    <div class="mb-4 logs-table">
+        <div class="logs-table-header">
+            <div class="row">
+                <div class="col-12 col-md-2">
+                    <div class="logs-table-cell">Prompt</div>
+                </div>
+                <div class="col-6 col-md-4">
+                    <div class="logs-table-cell">Link</div>
+                </div>
+                <div class="col-6 col-md-5">
+                    <div class="logs-table-cell">Date</div>
+                </div>
+            </div>
+        </div>
+        <div class="logs-table-body">
+            @foreach ($logs as $log)
+                <div class="logs-table-row">
+                    <div class="row flex-wrap">
+                        <div class="col-12 col-md-2">
+                            <div class="logs-table-cell">
+                                {!! $log->prompt_id ? $log->prompt->displayName : '---' !!}
+                            </div>
+                        </div>
+                        <div class="col-6 col-md-4">
+                            <div class="logs-table-cell">
+                                <span class="ubt-texthide"><a href="{{ $log->url }}">{{ $log->url }}</a></span>
+                            </div>
+                        </div>
+                        <div class="col-6 col-md-5">
+                            <div class="logs-table-cell">
+                                {!! pretty_date($log->created_at) !!}
+                            </div>
+                        </div>
+                        <div class="col-6 col-md-1">
+                            <div class="logs-table-cell">
+                                <a href="{{ $log->viewUrl }}" class="btn btn-primary btn-sm py-0 px-1">Details</a>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            @endforeach
+        </div>
     </div>
-  @endforeach
-  </div>
-{!! $logs->render() !!}
-
+    {!! $logs->render() !!}
 @endsection
diff --git a/resources/views/welcome.blade.php b/resources/views/welcome.blade.php
index 91afb78e3f..1cbd7875e1 100644
--- a/resources/views/welcome.blade.php
+++ b/resources/views/welcome.blade.php
@@ -1,9 +1,11 @@
 @extends('layouts.app')
 
-@section('title') Home @endsection
+@section('title')
+    Home
+@endsection
 
 @section('content')
-    @if(Auth::check())
+    @if (Auth::check())
         @include('pages._dashboard')
     @else
         @include('pages._logged_out')
diff --git a/resources/views/widgets/_bank_select.blade.php b/resources/views/widgets/_bank_select.blade.php
index 7941f55d6c..e88552845a 100644
--- a/resources/views/widgets/_bank_select.blade.php
+++ b/resources/views/widgets/_bank_select.blade.php
@@ -1,9 +1,10 @@
-<h3>{{ $owner->logType == 'User' && $owner->id == Auth::user()->id ? 'Your' : $owner->name . '\'s' }} Bank <a class="small inventory-collapse-toggle collapse-toggle collapsed" href="#{{ strtolower($owner->logType) }}Bank-{{ $owner->id }}" data-toggle="collapse">Show</a></h3>
-<div class="collapse" id="{{ strtolower($owner->logType) }}Bank-{{ $owner->id }}">
+<h3>{{ $owner->logType == 'User' && $owner->id == Auth::user()->id ? 'Your' : ($owner->logType == 'Character' ? $owner->fullName : $owner->name) . '\'s' }} Bank <a class="small inventory-collapse-toggle collapse-toggle collapsed"
+        href="#{{ strtolower($owner->logType) }}Bank-{{ $owner->id }}" data-toggle="collapse">Show</a></h3>
+<div class="{{ isset($selected) && count($selected) ? '' : 'collapse' }}" id="{{ strtolower($owner->logType) }}Bank-{{ $owner->id }}">
     <div class="text-right mb-3">
         <a href="#" class="btn btn-outline-info add-currency-button" data-type="{{ strtolower($owner->logType) }}" data-id="{{ $owner->id }}">Add Currency</a>
     </div>
-    <table class="table table-sm collapse show currency-table">
+    <table class="table table-sm show currency-table">
         <thead>
             <tr>
                 <th width="70%">Currency</th>
@@ -12,16 +13,16 @@
             </tr>
         </thead>
         <tbody id="{{ strtolower($owner->logType) }}Body-{{ $owner->id }}">
-            @if($selected)
+            @if ($selected)
                 <?php $currencySelect = $owner->getCurrencySelect(isset($isTransferrable) ? $isTransferrable : false); ?>
-                @foreach($selected as $currencyId=>$quantity)
+                @foreach ($selected as $currencyId => $quantity)
                     <tr class="bank-row">
-                        <td>{!! Form::select('currency_id['.strtolower($owner->logType).'-'.$owner->id.'][]', $currencySelect, $currencyId, ['class' => 'form-control selectize', 'placeholder' => 'Select Currency    ']) !!}</td>
-                        <td>{!! Form::text('currency_quantity['.strtolower($owner->logType).'-'.$owner->id.'][]', $quantity, ['class' => 'form-control']) !!}</td>
+                        <td>{!! Form::select('currency_id[' . strtolower($owner->logType) . '-' . $owner->id . '][]', $currencySelect, $currencyId, ['class' => 'form-control selectize', 'placeholder' => 'Select Currency    ']) !!}</td>
+                        <td>{!! Form::text('currency_quantity[' . strtolower($owner->logType) . '-' . $owner->id . '][]', $quantity, ['class' => 'form-control']) !!}</td>
                         <td class="text-right"><a href="#" class="btn btn-danger remove-currency-button">Remove</a></td>
                     </tr>
                 @endforeach
             @endif
         </tbody>
     </table>
-</div>
\ No newline at end of file
+</div>
diff --git a/resources/views/widgets/_bank_select_js.blade.php b/resources/views/widgets/_bank_select_js.blade.php
index 86c3f94e07..5b685de1ca 100644
--- a/resources/views/widgets/_bank_select_js.blade.php
+++ b/resources/views/widgets/_bank_select_js.blade.php
@@ -20,4 +20,4 @@ function attachRemoveListener(node) {
             });
         }
     });
-</script>
\ No newline at end of file
+</script>
diff --git a/resources/views/widgets/_bank_select_row.blade.php b/resources/views/widgets/_bank_select_row.blade.php
index 47dd35909c..1385520b95 100644
--- a/resources/views/widgets/_bank_select_row.blade.php
+++ b/resources/views/widgets/_bank_select_row.blade.php
@@ -1,15 +1,18 @@
 <div id="bankRowData" class="hide">
     <table class="table table-sm">
-        @foreach($owners as $owner)
-            @if($owner)
+        @foreach ($owners as $owner)
+            @if ($owner)
                 <tbody id="{{ strtolower($owner->logType) }}Row-{{ $owner->id }}">
                     <tr class="bank-row">
-                        <td>{!! Form::select('currency_id['.strtolower($owner->logType).'-'.$owner->id.'][]', $owner->getCurrencySelect(isset($isTransferrable) ? $isTransferrable : false), null, ['class' => 'form-control selectize', 'placeholder' => 'Select Currency    ']) !!}</td>
-                        <td>{!! Form::text('currency_quantity['.strtolower($owner->logType).'-'.$owner->id.'][]', 0, ['class' => 'form-control']) !!}</td>
+                        <td>{!! Form::select('currency_id[' . strtolower($owner->logType) . '-' . $owner->id . '][]', $owner->getCurrencySelect(isset($isTransferrable) ? $isTransferrable : false), null, [
+                            'class' => 'form-control selectize',
+                            'placeholder' => 'Select Currency    ',
+                        ]) !!}</td>
+                        <td>{!! Form::text('currency_quantity[' . strtolower($owner->logType) . '-' . $owner->id . '][]', 0, ['class' => 'form-control']) !!}</td>
                         <td class="text-right"><a href="#" class="btn btn-danger remove-currency-button">Remove</a></td>
                     </tr>
                 </tbody>
             @endif
         @endforeach
     </table>
-</div>
\ No newline at end of file
+</div>
diff --git a/resources/views/widgets/_character_code_js.blade.php b/resources/views/widgets/_character_code_js.blade.php
index 4c01e3ea3a..26a538bfd9 100644
--- a/resources/views/widgets/_character_code_js.blade.php
+++ b/resources/views/widgets/_character_code_js.blade.php
@@ -2,7 +2,7 @@
     $(document).ready(function() {
         // Code generation ////////////////////////////////////////////////////////////////////////////
 
-        var codeFormat = "{{ Config::get('lorekeeper.settings.character_codes') }}";
+        var codeFormat = "{{ config('lorekeeper.settings.character_codes') }}";
         var $code = $('#code');
         var $number = $('#number');
         var $category = $('#category');
@@ -18,6 +18,7 @@ function updateCode() {
             var str = codeFormat;
             str = str.replace('{category}', $category.find(':selected').data('code'));
             str = str.replace('{number}', $number.val());
+            str = str.replace('{year}', (new Date()).getFullYear());
             $code.val(str);
         }
 
@@ -27,11 +28,11 @@ function updateCode() {
         $pullNumber.on('click', function(e) {
             e.preventDefault();
             $pullNumber.prop('disabled', true);
-            $.get( "{{ url('admin/masterlist/get-number') }}?category=" + $category.val(), function( data ) {
-                $number.val( data );
+            $.get("{{ url('admin/masterlist/get-number') }}?category=" + $category.val(), function(data) {
+                $number.val(data);
                 $pullNumber.prop('disabled', false);
                 updateCode();
             });
         });
     });
-</script>
\ No newline at end of file
+</script>
diff --git a/resources/views/widgets/_character_create_options_js.blade.php b/resources/views/widgets/_character_create_options_js.blade.php
index 937c294d8a..0dd960388c 100644
--- a/resources/views/widgets/_character_create_options_js.blade.php
+++ b/resources/views/widgets/_character_create_options_js.blade.php
@@ -1,10 +1,6 @@
 <script>
     $(document).ready(function() {
         $('#userSelect').selectize();
-        $( "#datepicker" ).datetimepicker({
-            dateFormat: "yy-mm-dd",
-            timeFormat: 'HH:mm:ss',
-        });
         // Resell options /////////////////////////////////////////////////////////////////////////////
 
         var $resellable = $('#resellable');
@@ -21,7 +17,7 @@
         });
 
         function updateOptions() {
-            if(resellable) $resellOptions.removeClass('hide');
+            if (resellable) $resellOptions.removeClass('hide');
             else $resellOptions.addClass('hide');
         }
 
diff --git a/resources/views/widgets/_character_select.blade.php b/resources/views/widgets/_character_select.blade.php
index 0b7d516591..d2a69bab41 100644
--- a/resources/views/widgets/_character_select.blade.php
+++ b/resources/views/widgets/_character_select.blade.php
@@ -1,3 +1,13 @@
+@php
+    $characters = \App\Models\Character\Character::visible(Auth::check() ? Auth::user() : null)
+        ->myo(0)
+        ->orderBy('slug', 'DESC')
+        ->get()
+        ->pluck('fullName', 'slug')
+        ->toArray();
+    $tables = \App\Models\Loot\LootTable::orderBy('name')->pluck('name', 'id');
+@endphp
+
 <div id="characterComponents" class="hide">
     <div class="submission-character mb-3 card">
         <div class="card-body">
@@ -10,17 +20,16 @@
                     </div>
                 </div>
                 <div class="col-md-10">
-                    <a href="#" class="float-right fas fa-close"></a>
                     <div class="form-group">
                         {!! Form::label('slug[]', 'Character Code') !!}
-                        {!! Form::text('slug[]', null, ['class' => 'form-control character-code']) !!}
+                        {!! Form::select('slug[]', $characters, null, ['class' => 'form-control character-code', 'placeholder' => 'Select Character']) !!}
                     </div>
                     <div class="character-rewards hide">
                         <h4>Character Rewards</h4>
                         <table class="table table-sm">
                             <thead>
                                 <tr>
-                                    @if($expanded_rewards)
+                                    @if ($expanded_rewards)
                                         <th width="35%">Reward Type</th>
                                         <th width="35%">Reward</th>
                                     @else
@@ -43,14 +52,19 @@
     <table>
         <tr class="character-reward-row">
 
-            @if($expanded_rewards)
+            @if ($expanded_rewards)
                 <td>
-                    {!! Form::select('character_rewardable_type[]', ['Item' => 'Item', 'Currency' => 'Currency'] + (isset($showLootTables) && $showLootTables ? ['LootTable' => 'Loot Table'] : []), null, ['class' => 'form-control character-rewardable-type', 'placeholder' => 'Select Reward Type']) !!}
+                    {!! Form::select('character_rewardable_type[]', ['Item' => 'Item', 'Currency' => 'Currency'] + (isset($showLootTables) && $showLootTables ? ['LootTable' => 'Loot Table'] : []), null, [
+                        'class' => 'form-control character-rewardable-type',
+                        'placeholder' => 'Select Reward Type',
+                    ]) !!}
                 </td>
                 <td class="lootDivs">
                     <div class="character-currencies hide">{!! Form::select('character_currency_id[]', $characterCurrencies, 0, ['class' => 'form-control character-currency-id', 'placeholder' => 'Select Currency']) !!}</div>
                     <div class="character-items hide">{!! Form::select('character_item_id[]', $items, 0, ['class' => 'form-control character-item-id', 'placeholder' => 'Select Item']) !!}</div>
-                    @if(isset($showLootTables) && $showLootTables) <div class="character-loots hide">{!! Form::select('character_rewardable_id[]', $tables, 0, ['class' => 'form-control character-rtable-id', 'placeholder' => 'Select Loot Table']) !!}</div> @endif
+                    @if (isset($showLootTables) && $showLootTables)
+                        <div class="character-loots hide">{!! Form::select('character_rewardable_id[]', $tables, 0, ['class' => 'form-control character-rtable-id', 'placeholder' => 'Select Loot Table']) !!}</div>
+                    @endif
                 </td>
             @else
                 <td class="lootDivs">
@@ -60,7 +74,7 @@
             @endif
 
             <td class="d-flex align-items-center">
-                {!! Form::text('character_quantity[]', 0, ['class' => 'form-control mr-2  character-rewardable-quantity']) !!}
+                {!! Form::number('character_rewardable_quantity[]', 1, ['class' => 'form-control mr-2 character-rewardable-quantity']) !!}
                 <a href="#" class="remove-reward d-block"><i class="fas fa-times text-muted"></i></a>
             </td>
         </tr>
diff --git a/resources/views/widgets/_character_select_entry.blade.php b/resources/views/widgets/_character_select_entry.blade.php
index 4db9271399..6cb3ff422e 100644
--- a/resources/views/widgets/_character_select_entry.blade.php
+++ b/resources/views/widgets/_character_select_entry.blade.php
@@ -1,3 +1,13 @@
+@php
+    $characters = \App\Models\Character\Character::visible(Auth::check() ? Auth::user() : null)
+        ->myo(0)
+        ->orderBy('slug', 'DESC')
+        ->get()
+        ->pluck('fullName', 'slug')
+        ->toArray();
+    $tables = \App\Models\Loot\LootTable::orderBy('name')->pluck('name', 'id');
+@endphp
+
 <div class="submission-character mb-3 card">
     <div class="card-body">
         <div class="text-right"><a href="#" class="remove-character text-muted"><i class="fas fa-times"></i></a></div>
@@ -6,50 +16,61 @@
                 <div class="d-flex text-center align-items-center">
                     <div class="character-image-blank hide">Enter character code.</div>
                     <div class="character-image-loaded">
-                        @include('home._character', ['character' => $character->character])
+                        @include('home._character', ['character' => $character->character ? $character->character : $character])
                     </div>
                 </div>
             </div>
             <div class="col-md-10">
-                <a href="#" class="float-right fas fa-close"></a>
                 <div class="form-group">
                     {!! Form::label('slug[]', 'Character Code') !!}
-                    {!! Form::text('slug[]', $character->character->slug, ['class' => 'form-control character-code']) !!}
+                    {!! Form::select('slug[]', $characters, $character->character ? $character->character->slug : $character->slug, ['class' => 'form-control character-code', 'placeholder' => 'Select Character']) !!}
                 </div>
                 <div class="character-rewards">
                     <h4>Character Rewards</h4>
                     <table class="table table-sm">
                         <thead>
                             <tr>
-                                @if($expanded_rewards)
-                                <th width="35%">Reward Type</th>
-                                <th width="35%">Reward</th>
+                                @if ($expanded_rewards)
+                                    <th width="35%">Reward Type</th>
+                                    <th width="35%">Reward</th>
                                 @else
-                                <th width="70%">Reward</th>
+                                    <th width="70%">Reward</th>
                                 @endif
                                 <th width="30%">Amount</th>
                             </tr>
                         </thead>
                         <tbody class="character-rewards">
-                            @foreach($character->rewards as $reward)
+                            @foreach ($character->rewards ?? [] as $reward)
                                 <tr class="character-reward-row">
-                                    @if($expanded_rewards)
+                                    @if ($expanded_rewards)
                                         <td>
-                                            {!! Form::select('character_rewardable_type['.$character->character_id.'][]', ['Item' => 'Item', 'Currency' => 'Currency', 'LootTable' => 'Loot Table'], $reward->rewardable_type, ['class' => 'form-control character-rewardable-type', 'placeholder' => 'Select Reward Type']) !!}
+                                            {!! Form::select('character_rewardable_type[' . $character->character_id . '][]', ['Item' => 'Item', 'Currency' => 'Currency', 'LootTable' => 'Loot Table'], $reward->rewardable_type, [
+                                                'class' => 'form-control character-rewardable-type',
+                                                'placeholder' => 'Select Reward Type',
+                                            ]) !!}
                                         </td>
                                         <td class="lootDivs">
-                                            <div class="character-currencies  {{ $reward->rewardable_type == 'Currency' ? 'show' : 'hide'}}">{!! Form::select('character_rewardable_id['.$character->character_id.'][]', $characterCurrencies, ($reward->rewardable_type == 'Currency' ? $reward->rewardable_id : null) , ['class' => 'form-control character-currency-id', 'placeholder' => 'Select Currency']) !!}</div>
-                                            <div class="character-items  {{ $reward->rewardable_type == 'Item' ? 'show' : 'hide'}}">{!! Form::select('character_rewardable_id['.$character->character_id.'][]', $items, ($reward->rewardable_type == 'Item' ? $reward->rewardable_id : null) , ['class' => 'form-control character-item-id', 'placeholder' => 'Select Item']) !!}</div>
-                                            <div class="character-tables {{ $reward->rewardable_type == 'Loot Table' ? 'show' : 'hide'}}">{!! Form::select('character_rewardable_id['.$character->character_id.'][]', $tables, ($reward->rewardable_type == 'Loot Table' ? $reward->rewardable_id : null) , ['class' => 'form-control character-table-id', 'placeholder' => 'Select Loot Table']) !!}</div>
+                                            <div class="character-currencies  {{ $reward->rewardable_type == 'Currency' ? 'show' : 'hide' }}">{!! Form::select('character_rewardable_id[' . $character->character_id . '][]', $characterCurrencies, $reward->rewardable_type == 'Currency' ? $reward->rewardable_id : null, [
+                                                'class' => 'form-control character-currency-id',
+                                                'placeholder' => 'Select Currency',
+                                            ]) !!}</div>
+                                            <div class="character-items  {{ $reward->rewardable_type == 'Item' ? 'show' : 'hide' }}">{!! Form::select('character_rewardable_id[' . $character->character_id . '][]', $items, $reward->rewardable_type == 'Item' ? $reward->rewardable_id : null, ['class' => 'form-control character-item-id', 'placeholder' => 'Select Item']) !!}</div>
+                                            <div class="character-tables {{ $reward->rewardable_type == 'Loot Table' ? 'show' : 'hide' }}">{!! Form::select('character_rewardable_id[' . $character->character_id . '][]', $tables, $reward->rewardable_type == 'Loot Table' ? $reward->rewardable_id : null, [
+                                                'class' => 'form-control character-table-id',
+                                                'placeholder' => 'Select Loot Table',
+                                            ]) !!}</div>
                                         </td>
-                                        @else
+                                    @else
                                         <td class="lootDivs">
-                                            {!! Form::hidden('character_rewardable_type['.$character->character_id.'][]', 'Currency', ['class' => 'character-rewardable-type']) !!}
-                                            {!! Form::select('character_rewardable_id['.$character->character_id.'][]', $characterCurrencies, ($reward->rewardable_type == 'Currency' ? $reward->rewardable_id : null) , ['class' => 'form-control character-currency-id', 'placeholder' => 'Select Currency']) !!}
+                                            {!! Form::hidden('character_rewardable_type[' . $character->character_id . '][]', 'Currency', ['class' => 'character-rewardable-type']) !!}
+                                            {!! Form::select('character_rewardable_id[' . $character->character_id . '][]', $characterCurrencies, $reward->rewardable_type == 'Currency' ? $reward->rewardable_id : null, [
+                                                'class' => 'form-control character-currency-id',
+                                                'placeholder' => 'Select Currency',
+                                            ]) !!}
                                         </td>
                                     @endif
                                     <td class="d-flex align-items-center">
-                                        {!! Form::text('character_rewardable_quantity['.$character->character_id.'][]', $reward->quantity, ['class' => 'form-control mr-2 character-rewardable-quantity']) !!}
+                                        {!! Form::number('character_rewardable_quantity[' . $character->character_id . '][]', $reward->quantity, ['class' => 'form-control mr-2 character-rewardable-quantity']) !!}
                                         <a href="#" class="remove-reward d-block"><i class="fas fa-times text-muted"></i></a>
                                     </td>
                                 </tr>
@@ -64,4 +85,3 @@
         </div>
     </div>
 </div>
-
diff --git a/resources/views/widgets/_datetimepicker_js.blade.php b/resources/views/widgets/_datetimepicker_js.blade.php
new file mode 100644
index 0000000000..fa0eeed278
--- /dev/null
+++ b/resources/views/widgets/_datetimepicker_js.blade.php
@@ -0,0 +1,15 @@
+<script>
+    $(document).ready(function() {
+        $(".datepicker").datetimepicker({
+            dateFormat: "yy-mm-dd",
+            timeFormat: 'HH:mm:ss',
+            changeMonth: true,
+            changeYear: true,
+            timezone: '{!! Carbon\Carbon::now()->utcOffset() !!}',
+            {!! isset($dtinline) ? "altField: '." . $dtinline . "', altFieldTimeOnly: false," : null !!}
+        });
+        @if (isset($dtvalue))
+            $(".datepicker").datetimepicker("setDate", "{!! Carbon\Carbon::parse($dtvalue) !!} {!! Carbon\Carbon::now()->utcOffset() !!}}");
+        @endif
+    });
+</script>
diff --git a/resources/views/widgets/_gallery_thumb.blade.php b/resources/views/widgets/_gallery_thumb.blade.php
index c9cbb14cb6..cb52dcadac 100644
--- a/resources/views/widgets/_gallery_thumb.blade.php
+++ b/resources/views/widgets/_gallery_thumb.blade.php
@@ -1,16 +1,24 @@
-@if(isset($submission->content_warning))
-    <img class="img-thumbnail" src="{{ asset('/images/content_warning.png') }}" alt="Content Warning"/>
+@if (isset($submission->content_warning))
+    <img class="img-thumbnail" src="{{ asset('/images/content_warning.png') }}" alt="Content Warning" />
 @elseif(isset($submission->hash))
-    <img class="img-thumbnail" src="{{ $submission->thumbnailUrl }}" alt="Submission thumbnail"/>
+    <img class="img-thumbnail" src="{{ $submission->thumbnailUrl }}" alt="Submission thumbnail" />
 @else
-    <div class="mx-auto img-thumbnail text-left" style="height:{{ (Config::get('lorekeeper.settings.masterlist_thumbnails.height')+8) }}px; width:{{ (Config::get('lorekeeper.settings.masterlist_thumbnails.width')+4) }}px;">
+    <div class="mx-auto img-thumbnail text-left" style="height:{{ config('lorekeeper.settings.masterlist_thumbnails.height') + 8 }}px; width:{{ config('lorekeeper.settings.masterlist_thumbnails.width') + 4 }}px;">
         <span class="badge-primary px-2 py-1" style="border-radius:0 0 .5em 0; position:absolute; z-index:5;">Literature</span>
-        <div class="container-{{ $submission->id }} parsed-text pb-2 pr-2" style="height:{{ Config::get('lorekeeper.settings.masterlist_thumbnails.height') }}px; width:{{ Config::get('lorekeeper.settings.masterlist_thumbnails.width') }}px; overflow:hidden; max-width:fit-content;">
+        <div class="container-{{ $submission->id }} parsed-text pb-2 pr-2"
+            style="height:{{ config('lorekeeper.settings.masterlist_thumbnails.height') }}px; width:{{ config('lorekeeper.settings.masterlist_thumbnails.width') }}px; overflow:hidden; max-width:fit-content;">
             <div class="content-{{ $submission->id }} text-body">{!! $submission->excerpt !!}</div>
         </div>
     </div>
     <style>
-        .content-{{ $submission->id }} {transition-duration: {{ (strlen(substr($submission->parsed_text, 0, 500))/1000) }}s;}
-        .content-{{ $submission->id }}:hover, .content-{{ $submission->id }}:focus-within {transform: translateY(calc({{ (Config::get('lorekeeper.settings.masterlist_thumbnails.height')) }}px - 100%)); transition-duration: {{ strlen(substr($submission->parsed_text, 0, 500))/100 }}s;}
+        .content-{{ $submission->id }} {
+            transition-duration: {{ strlen(substr($submission->parsed_text, 0, 500)) / 1000 }}s;
+        }
+
+        .content-{{ $submission->id }}:hover,
+        .content-{{ $submission->id }}:focus-within {
+            transform: translateY(calc({{ config('lorekeeper.settings.masterlist_thumbnails.height') }}px - 100%));
+            transition-duration: {{ strlen(substr($submission->parsed_text, 0, 500)) / 100 }}s;
+        }
     </style>
 @endif
diff --git a/resources/views/widgets/_image_upload_js.blade.php b/resources/views/widgets/_image_upload_js.blade.php
index 7aca4b967a..c53f221aa4 100644
--- a/resources/views/widgets/_image_upload_js.blade.php
+++ b/resources/views/widgets/_image_upload_js.blade.php
@@ -1,167 +1,200 @@
 <script>
-$( document ).ready(function() {
+    $(document).ready(function() {
 
-    // Cropper ////////////////////////////////////////////////////////////////////////////////////
+        // Cropper ////////////////////////////////////////////////////////////////////////////////////
 
-    var $useCropper = $('#useCropper');
-    var $thumbnailCrop = $('#thumbnailCrop');
-    var $thumbnailUpload = $('#thumbnailUpload');
+        var $useCropper = $('#useCropper');
+        var $thumbnailCrop = $('#thumbnailCrop');
+        var $thumbnailUpload = $('#thumbnailUpload');
 
-    var useCropper = $useCropper.is(':checked');
+        var useCropper = $useCropper.is(':checked');
 
-    updateCropper();
+        updateCropper();
 
-    $useCropper.on('change', function(e) {
-        useCropper = $useCropper.is(':checked');
+        $useCropper.on('change', function(e) {
+            useCropper = $useCropper.is(':checked');
 
-        updateCropper();
-    });
+            updateCropper();
+        });
 
-    function updateCropper() {
-        if(useCropper) {
-            $thumbnailUpload.addClass('hide');
-            $thumbnailCrop.removeClass('hide');
-        }
-        else {
-            $thumbnailCrop.addClass('hide');
-            $thumbnailUpload.removeClass('hide');
+        function updateCropper() {
+            if (useCropper) {
+                $thumbnailUpload.addClass('hide');
+                $thumbnailCrop.removeClass('hide');
+            } else {
+                $thumbnailCrop.addClass('hide');
+                $thumbnailUpload.removeClass('hide');
+            }
         }
-    }
 
-    // Designers and artists //////////////////////////////////////////////////////////////////////
+        // Designers and artists //////////////////////////////////////////////////////////////////////
 
-    $('.selectize').selectize();
-    $('.add-designer').on('click', function(e) {
-        e.preventDefault();
-        addDesignerRow($(this));
-    });
-    function addDesignerRow($trigger) {
-        var $clone = $('.designer-row').clone();
-        $('#designerList').append($clone);
-        $clone.removeClass('hide designer-row');
-        $clone.addClass('d-flex');
-        $clone.find('.add-designer').on('click', function(e) {
+        $('.selectize').selectize();
+        $('.add-designer').on('click', function(e) {
             e.preventDefault();
             addDesignerRow($(this));
-        })
-        $trigger.css({ visibility: 'hidden' });
-        $clone.find('.designer-select').selectize();
-    }
-    
-    $('.add-artist').on('click', function(e) {
-        e.preventDefault();
-        addArtistRow($(this));
-    });
-    function addArtistRow($trigger) {
-        var $clone = $('.artist-row').clone();
-        $('#artistList').append($clone);
-        $clone.removeClass('hide artist-row');
-        $clone.addClass('d-flex');
-        $clone.find('.add-artist').on('click', function(e) {
+        });
+
+        function addDesignerRow($trigger) {
+            var $clone = $('.designer-row').clone();
+            $('#designerList').append($clone);
+            $clone.removeClass('hide designer-row');
+            $clone.addClass('d-flex');
+            $clone.find('.add-designer').on('click', function(e) {
+                e.preventDefault();
+                addDesignerRow($(this));
+            })
+            $trigger.css({
+                visibility: 'hidden'
+            });
+            $clone.find('.designer-select').selectize();
+        }
+
+        $('.add-artist').on('click', function(e) {
             e.preventDefault();
             addArtistRow($(this));
-        })
-        $trigger.css({ visibility: 'hidden' });
-        $clone.find('.artist-select').selectize();
-    }
-
-    // Traits /////////////////////////////////////////////////////////////////////////////////////
-    
-    $('#add-feature').on('click', function(e) {
-        e.preventDefault();
-        addFeatureRow();
-    });
-    $('.remove-feature').on('click', function(e) {
-        e.preventDefault();
-        removeFeatureRow($(this));
-    })
-    function addFeatureRow() {
-        var $clone = $('.feature-row').clone();
-        $('#featureList').append($clone);
-        $clone.removeClass('hide feature-row');
-        $clone.addClass('d-flex');
-        $clone.find('.remove-feature').on('click', function(e) {
+        });
+
+        function addArtistRow($trigger) {
+            var $clone = $('.artist-row').clone();
+            $('#artistList').append($clone);
+            $clone.removeClass('hide artist-row');
+            $clone.addClass('d-flex');
+            $clone.find('.add-artist').on('click', function(e) {
+                e.preventDefault();
+                addArtistRow($(this));
+            })
+            $trigger.css({
+                visibility: 'hidden'
+            });
+            $clone.find('.artist-select').selectize();
+        }
+
+        // Traits /////////////////////////////////////////////////////////////////////////////////////
+
+        @if (config('lorekeeper.extensions.organised_traits_dropdown'))
+            $('.initial.feature-select').selectize({
+                render: {
+                    item: featureSelectedRender
+                }
+            });
+        @else
+            $('.initial.feature-select').selectize();
+        @endif
+        $('#add-feature').on('click', function(e) {
+            e.preventDefault();
+            addFeatureRow();
+        });
+        $('.remove-feature').on('click', function(e) {
             e.preventDefault();
             removeFeatureRow($(this));
         })
-        $clone.find('.feature-select').selectize();
-    }
-    function removeFeatureRow($trigger) {
-        $trigger.parent().remove();
-    }
-
-    // Croppie ////////////////////////////////////////////////////////////////////////////////////
-
-    var thumbnailWidth = {{ Config::get('lorekeeper.settings.masterlist_thumbnails.width') }};
-    var thumbnailHeight = {{ Config::get('lorekeeper.settings.masterlist_thumbnails.height') }};
-    var $cropper = $('#cropper');
-    var c = null;
-    var $x0 = $('#cropX0');
-    var $y0 = $('#cropY0');
-    var $x1 = $('#cropX1');
-    var $y1 = $('#cropY1');
-    var zoom = 0;
-
-    @if(isset($useUploaded) && $useUploaded)
-        // This is for modification of an existing image:
-        c = new Croppie($cropper[0], {
-            viewport: {
-                width: thumbnailWidth,
-                height: thumbnailHeight
-            },
-            boundary: { width: thumbnailWidth + 100, height: thumbnailHeight + 100 },
-            update: function() {
-                updateCropValues();
-            }
-        });
-        c.bind({
-            url: $cropper.data('url'),
-            // points: [$x0.val(),$x1.val(),$y0.val(),$y1.val()], // this does not work
-        }).then(function() {
-            updateCropValues();
-        });
-        console.log(($x1.val() - $x0.val()) / thumbnailWidth);
-    @else
-        function readURL(input) {
-            if (input.files && input.files[0]) {
-                var reader = new FileReader();
-                reader.onload = function(e) {
-                    $cropper.attr('src', e.target.result);
-                    c = new Croppie($cropper[0], {
-                        viewport: {
-                            width: thumbnailWidth,
-                            height: thumbnailHeight
-                        },
-                        boundary: { width: thumbnailWidth + 100, height: thumbnailHeight + 100 },
-                        update: function() {
-                            updateCropValues();
-                        }
-                    });
-        console.log(c);
+
+        function addFeatureRow() {
+            var $clone = $('.feature-row').clone();
+            $('#featureList').append($clone);
+            $clone.removeClass('hide feature-row');
+            $clone.addClass('d-flex');
+            $clone.find('.remove-feature').on('click', function(e) {
+                e.preventDefault();
+                removeFeatureRow($(this));
+            })
+            @if (config('lorekeeper.extensions.organised_traits_dropdown'))
+                $clone.find('.feature-select').selectize({
+                    render: {
+                        item: featureSelectedRender
+                    }
+                });
+            @else
+                $clone.find('.feature-select').selectize();
+            @endif
+        }
+
+        function removeFeatureRow($trigger) {
+            $trigger.parent().remove();
+        }
+
+        function featureSelectedRender(item, escape) {
+            return '<div><span>' + escape(item["text"].trim()) + ' (' + escape(item["optgroup"].trim()) + ')' + '</span></div>';
+        }
+
+        // Croppie ////////////////////////////////////////////////////////////////////////////////////
+
+        var thumbnailWidth = {{ config('lorekeeper.settings.masterlist_thumbnails.width') }};
+        var thumbnailHeight = {{ config('lorekeeper.settings.masterlist_thumbnails.height') }};
+        var $cropper = $('#cropper');
+        var c = null;
+        var $x0 = $('#cropX0');
+        var $y0 = $('#cropY0');
+        var $x1 = $('#cropX1');
+        var $y1 = $('#cropY1');
+        var zoom = 0;
+
+        @if (isset($useUploaded) && $useUploaded)
+            // This is for modification of an existing image:
+            c = new Croppie($cropper[0], {
+                viewport: {
+                    width: thumbnailWidth,
+                    height: thumbnailHeight
+                },
+                boundary: {
+                    width: thumbnailWidth + 100,
+                    height: thumbnailHeight + 100
+                },
+                update: function() {
                     updateCropValues();
-                    $('#cropSelect').addClass('hide');
-                    $cropper.removeClass('hide');
                 }
-                reader.readAsDataURL(input.files[0]);
+            });
+            c.bind({
+                url: $cropper.data('url'),
+                // points: [$x0.val(),$x1.val(),$y0.val(),$y1.val()], // this does not work
+            }).then(function() {
+                updateCropValues();
+            });
+            console.log(($x1.val() - $x0.val()) / thumbnailWidth);
+        @else
+            function readURL(input) {
+                if (input.files && input.files[0]) {
+                    var reader = new FileReader();
+                    reader.onload = function(e) {
+                        $cropper.attr('src', e.target.result);
+                        c = new Croppie($cropper[0], {
+                            viewport: {
+                                width: thumbnailWidth,
+                                height: thumbnailHeight
+                            },
+                            boundary: {
+                                width: thumbnailWidth + 100,
+                                height: thumbnailHeight + 100
+                            },
+                            update: function() {
+                                updateCropValues();
+                            }
+                        });
+                        console.log(c);
+                        updateCropValues();
+                        $('#cropSelect').addClass('hide');
+                        $cropper.removeClass('hide');
+                    }
+                    reader.readAsDataURL(input.files[0]);
+                }
             }
+
+            $("#mainImage").change(function() {
+                readURL(this);
+            });
+        @endif
+
+        function updateCropValues() {
+            var values = c.get();
+            console.log(values);
+            //console.log([$x0.val(),$x1.val(),$y0.val(),$y1.val()]);
+            $x0.val(values.points[0]);
+            $y0.val(values.points[1]);
+            $x1.val(values.points[2]);
+            $y1.val(values.points[3]);
         }
 
-        $("#mainImage").change(function() {
-            readURL(this);
-        });
-    @endif
-
-    function updateCropValues() {
-        var values = c.get();
-        console.log(values);
-        //console.log([$x0.val(),$x1.val(),$y0.val(),$y1.val()]);
-        $x0.val(values.points[0]);
-        $y0.val(values.points[1]);
-        $x1.val(values.points[2]);
-        $y1.val(values.points[3]);
-    }
-
-    
-});
-    
-</script>
\ No newline at end of file
+
+    });
+</script>
diff --git a/resources/views/widgets/_inventory_select.blade.php b/resources/views/widgets/_inventory_select.blade.php
index 6c2c5f6112..bdb77adbc1 100644
--- a/resources/views/widgets/_inventory_select.blade.php
+++ b/resources/views/widgets/_inventory_select.blade.php
@@ -1,9 +1,12 @@
 @php
-    if(old('stack_id')) $old_selection = array_combine(old('stack_id'), old('stack_quantity'));
+    if (old('stack_id') && old('stack_quantity')) {
+        $old_selection = array_combine(old('stack_id'), old('stack_quantity'));
+    }
 @endphp
-<h3>Your Inventory <a class="small inventory-collapse-toggle collapse-toggle collapsed" href="#userInventory" data-toggle="collapse">Show</a></h3>
+<h3>
+    Your Inventory <a class="small inventory-collapse-toggle collapse-toggle collapsed" href="#userInventory" data-toggle="collapse">Show</a></h3>
 <hr>
-<div class="collapse" id="userInventory">
+<div class="{{ isset($selected) && count($selected) ? '' : 'collapse' }}" id="userInventory">
     <div class="card mb-3">
         <div class="card-body">
             <div class="text-left mb-3">
@@ -21,7 +24,7 @@
                         <option value="selected">Selected Items</option>
                         <option disabled>&#9472;&#9472;&#9472;&#9472;&#9472;&#9472;&#9472;&#9472;&#9472;&#9472;</option>
                         <option value="0">Miscellaneous</option>
-                        @foreach($categories as $category)
+                        @foreach ($categories as $category)
                             <option value="{{ $category->id }}">{{ $category->name }}</option>
                         @endforeach
                     </select>
@@ -44,52 +47,64 @@
                         </tr>
                     </thead>
                     <tbody>
-                        @foreach($inventory as $itemRow)
-                            <tr id ="itemRow{{ $itemRow->id }}" class="d-flex {{ $itemRow->isTransferrable ? '' : 'accountbound' }} user-item select-item-row item-all category-all item-{{ $itemRow->item->id }} category-{{ $itemRow->item->item_category_id ? : 0 }} {{ (isset($selected) && in_array($itemRow->id, array_keys($selected))) || (isset($old_selection) && isset($old_selection[$itemRow->id])) ? 'category-selected' : '' }}">
-                                <td class="col-1">{!! Form::checkbox((isset($fieldName) && $fieldName ? $fieldName : 'stack_id[]'), $itemRow->id, isset($selected) && in_array($itemRow->id, array_keys($selected)) ? true : false, ['class' => 'inventory-checkbox']) !!}</td>
-                                <td class="col-2">@if(isset($itemRow->item->image_url)) <img class="small-icon" src="{{ $itemRow->item->image_url }}" alt="{{ $itemRow->item->name }}"> @endif {!! $itemRow->item->name !!}
+                        @foreach ($inventory as $itemRow)
+                            <tr id="itemRow{{ $itemRow->id }}"
+                                class="d-flex {{ $itemRow->isTransferrable ? '' : 'accountbound' }} user-item select-item-row item-all category-all item-{{ $itemRow->item->id }} category-{{ $itemRow->item->item_category_id ?: 0 }} {{ (isset($selected) && in_array($itemRow->id, array_keys($selected))) || (isset($old_selection) && isset($old_selection[$itemRow->id])) ? 'category-selected' : '' }}">
+                                <td class="col-1">{!! Form::checkbox(isset($fieldName) && $fieldName ? $fieldName : 'stack_id[]', $itemRow->id, isset($selected) && in_array($itemRow->id, array_keys($selected)) ? true : false, ['class' => 'inventory-checkbox']) !!}</td>
+                                <td class="col-2">
+                                    @if (isset($itemRow->item->image_url))
+                                        <img class="small-icon" src="{{ $itemRow->item->image_url }}" alt="{{ $itemRow->item->name }}">
+                                    @endif {!! $itemRow->item->name !!}
                                 <td class="col-4">{!! array_key_exists('data', $itemRow->data) ? ($itemRow->data['data'] ? $itemRow->data['data'] : 'N/A') : 'N/A' !!}</td>
                                 <td class="col-3">{!! array_key_exists('notes', $itemRow->data) ? ($itemRow->data['notes'] ? $itemRow->data['notes'] : 'N/A') : 'N/A' !!}</td>
-                                @if($itemRow->availableQuantity || in_array($itemRow->id, array_keys($selected)))
-                                    @if(isset($old_selection) && isset($old_selection[$itemRow->id]))
-                                        <td class="col-2">{!! Form::selectRange(
-                                            'stack_quantity['.$itemRow->id.']',
-                                            1,
-                                            $itemRow->getAvailableContextQuantity($selected[$itemRow->id] ?? 0),
-                                            $old_selection[$itemRow->id],
-                                            ['class' => 'quantity-select', 'type' => 'number', 'style' => 'min-width:40px;']) !!}
+                                @if ($itemRow->availableQuantity || in_array($itemRow->id, array_keys($selected)))
+                                    @if (isset($old_selection) && isset($old_selection[$itemRow->id]))
+                                        <td class="col-2">{!! Form::selectRange('stack_quantity[' . $itemRow->id . ']', 1, $itemRow->getAvailableContextQuantity($selected[$itemRow->id] ?? 0), $old_selection[$itemRow->id], [
+                                            'class' => 'quantity-select',
+                                            'type' => 'number',
+                                            'style' => 'min-width:40px;',
+                                        ]) !!}
                                             /
                                             {{ $itemRow->getAvailableContextQuantity($selected[$itemRow->id] ?? 0) }}
-                                            @if($page == 'trade')
-                                                @if($itemRow->getOthers($selected[$itemRow->id], 0)) {{ $itemRow->getOthers($selected[$itemRow->id], 0) }} @endif
+                                            @if ($page == 'trade')
+                                                @if ($itemRow->getOthers($selected[$itemRow->id], 0))
+                                                    {{ $itemRow->getOthers($selected[$itemRow->id], 0) }}
+                                                @endif
                                             @elseif($page == 'update')
-                                                @if($itemRow->getOthers(0, $selected[$itemRow->id])) {{ $itemRow->getOthers(0, $selected[$itemRow->id]) }} @endif
+                                                @if ($itemRow->getOthers(0, $selected[$itemRow->id]))
+                                                    {{ $itemRow->getOthers(0, $selected[$itemRow->id]) }}
+                                                @endif
                                             @elseif($itemRow->getOthers())
                                                 {{ $itemRow->getOthers() }}
                                             @endif
                                         </td>
                                     @elseif(in_array($itemRow->id, array_keys($selected)))
-                                        <td class="col-2">{!! Form::selectRange(
-                                            'stack_quantity['.$itemRow->id.']',
-                                            1,
-                                            $itemRow->getAvailableContextQuantity($selected[$itemRow->id]),
-                                            $selected[$itemRow->id],
-                                            ['class' => 'quantity-select', 'type' => 'number', 'style' => 'min-width:40px;']) !!}
+                                        <td class="col-2">{!! Form::selectRange('stack_quantity[' . $itemRow->id . ']', 1, $itemRow->getAvailableContextQuantity($selected[$itemRow->id]), $selected[$itemRow->id], ['class' => 'quantity-select', 'type' => 'number', 'style' => 'min-width:40px;']) !!}
                                             /
                                             {{ $itemRow->getAvailableContextQuantity($selected[$itemRow->id]) }}
-                                            @if($page == 'trade')
-                                                @if($itemRow->getOthers($selected[$itemRow->id], 0)) {{ $itemRow->getOthers($selected[$itemRow->id], 0) }} @endif
+                                            @if ($page == 'trade')
+                                                @if ($itemRow->getOthers($selected[$itemRow->id], 0))
+                                                    {{ $itemRow->getOthers($selected[$itemRow->id], 0) }}
+                                                @endif
                                             @elseif($page == 'update')
-                                                @if($itemRow->getOthers(0, $selected[$itemRow->id])) {{ $itemRow->getOthers(0, $selected[$itemRow->id]) }} @endif
+                                                @if ($itemRow->getOthers(0, $selected[$itemRow->id]))
+                                                    {{ $itemRow->getOthers(0, $selected[$itemRow->id]) }}
+                                                @endif
                                             @elseif($itemRow->getOthers())
                                                 {{ $itemRow->getOthers() }}
                                             @endif
                                         </td>
                                     @else
-                                        <td class="col-2">{!! Form::selectRange('', 1, $itemRow->availableQuantity, 1, ['class' => 'quantity-select', 'type' => 'number', 'style' => 'min-width:40px;']) !!} /{{ $itemRow->availableQuantity }} @if($itemRow->getOthers()) {{ $itemRow->getOthers() }} @endif</td>
+                                        <td class="col-2">{!! Form::selectRange('', 1, $itemRow->availableQuantity, 1, ['class' => 'quantity-select', 'type' => 'number', 'style' => 'min-width:40px;']) !!} /{{ $itemRow->availableQuantity }} @if ($itemRow->getOthers())
+                                                {{ $itemRow->getOthers() }}
+                                            @endif
+                                        </td>
                                     @endif
                                 @else
-                                    <td class="col-2">{!! Form::selectRange('', 0, 0, 0, ['class' => 'quantity-select', 'type' => 'number', 'style' => 'min-width:40px;', 'disabled']) !!} /{{ $itemRow->availableQuantity }} @if($itemRow->getOthers()) {{ $itemRow->getOthers() }} @endif</td>
+                                    <td class="col-2">{!! Form::selectRange('', 0, 0, 0, ['class' => 'quantity-select', 'type' => 'number', 'style' => 'min-width:40px;', 'disabled']) !!} /{{ $itemRow->availableQuantity }} @if ($itemRow->getOthers())
+                                            {{ $itemRow->getOthers() }}
+                                        @endif
+                                    </td>
                                 @endif
                             </tr>
                         @endforeach
diff --git a/resources/views/widgets/_inventory_select_js.blade.php b/resources/views/widgets/_inventory_select_js.blade.php
index bdf90cf358..f9829df94b 100644
--- a/resources/views/widgets/_inventory_select_js.blade.php
+++ b/resources/views/widgets/_inventory_select_js.blade.php
@@ -31,17 +31,16 @@
         $('.inventory-checkbox').on('change', function() {
             $checkbox = $(this);
             var rowId = "#itemRow" + $checkbox.val()
-            if($checkbox.is(":checked")) {
+            if ($checkbox.is(":checked")) {
                 $(rowId).addClass('category-selected');
-                $(rowId).find('.quantity-select').prop('name', 'stack_quantity['+$checkbox.val()+']')
-            }
-            else {
+                $(rowId).find('.quantity-select').prop('name', 'stack_quantity[' + $checkbox.val() + ']')
+            } else {
                 $(rowId).removeClass('category-selected');
                 $(rowId).find('.quantity-select').prop('name', '')
             }
         });
         $('#toggle-checks').on('click', function() {
-            ($(this).is(":checked")) ? selectVisible() : deselectVisible();
+            ($(this).is(":checked")) ? selectVisible(): deselectVisible();
         });
 
         function refreshFilter() {
@@ -51,12 +50,14 @@ function refreshFilter() {
             $('.user-item.category-' + display + '.item-' + (itemId ? itemId : 'all')).removeClass('hide');
             $('#toggle-checks').prop('checked', false);
         }
+
         function selectVisible() {
             var $target = $('.user-item:not(.hide)');
             $target.find('.inventory-checkbox').prop('checked', true);
             $target.find('.inventory-checkbox').trigger('change');
             $('#toggle-checks').prop('checked', true);
         }
+
         function deselectVisible() {
             var $target = $('.user-item:not(.hide)');
             $target.find('.inventory-checkbox').prop('checked', false);
@@ -64,11 +65,12 @@ function deselectVisible() {
             $('#toggle-checks').prop('checked', false);
             $target.find('.quantity-select').prop('name', '');
         }
+
         function customItemSelectizeRender(item, escape) {
             item = JSON.parse(item.text);
             option_render = '<div class="option">';
-            if(item['image_url']) {
-                option_render += '<div class="d-inline mr-1"><img class="small-icon" alt="'+ escape(item['name']) +'" src="' + escape(item['image_url']) + '"></div>';
+            if (item['image_url']) {
+                option_render += '<div class="d-inline mr-1"><img class="small-icon" alt="' + escape(item['name']) + '" src="' + escape(item['image_url']) + '"></div>';
             }
             option_render += '<span>' + escape(item['name']) + '</span></div>';
             return option_render;
diff --git a/resources/views/widgets/_inventory_view_js.blade.php b/resources/views/widgets/_inventory_view_js.blade.php
new file mode 100644
index 0000000000..84f387bb10
--- /dev/null
+++ b/resources/views/widgets/_inventory_view_js.blade.php
@@ -0,0 +1,46 @@
+<script>
+    $(document).ready(function() {
+
+        var $defButton = $('.def-view-button');
+        var $defView = $('#defView');
+        var $sumButton = $('.sum-view-button');
+        var $sumView = $('#sumView');
+
+        var view = null;
+
+        initView();
+
+        $defButton.on('click', function(e) {
+            e.preventDefault();
+            setView('def');
+        });
+        $sumButton.on('click', function(e) {
+            e.preventDefault();
+            setView('sum');
+        });
+
+        function initView() {
+            view = window.localStorage.getItem('lorekeeper_inventory_view');
+            if (!view) view = 'def';
+            setView(view);
+        }
+
+        function setView(status) {
+            view = status;
+
+            if (view == 'def') {
+                $defView.removeClass('hide');
+                $defButton.addClass('active');
+                $sumView.addClass('hide');
+                $sumButton.removeClass('active');
+                window.localStorage.setItem('lorekeeper_inventory_view', 'def');
+            } else if (view == 'sum') {
+                $sumView.removeClass('hide');
+                $sumButton.addClass('active');
+                $defView.addClass('hide');
+                $defButton.removeClass('active');
+                window.localStorage.setItem('lorekeeper_inventory_view', 'sum');
+            }
+        }
+    });
+</script>
diff --git a/resources/views/widgets/_loot_select.blade.php b/resources/views/widgets/_loot_select.blade.php
index cbd9624081..0ecf88c43c 100644
--- a/resources/views/widgets/_loot_select.blade.php
+++ b/resources/views/widgets/_loot_select.blade.php
@@ -1,3 +1,25 @@
+@php
+    // This file represents a common source and definition for assets used in loot_select
+    // While it is not per se as tidy as defining these in the controller(s),
+    // doing so this way enables better compatibility across disparate extensions
+    $characterCurrencies = \App\Models\Currency\Currency::where('is_character_owned', 1)
+        ->orderBy('sort_character', 'DESC')
+        ->pluck('name', 'id');
+    $items = \App\Models\Item\Item::orderBy('name')->pluck('name', 'id');
+    $currencies = \App\Models\Currency\Currency::where('is_user_owned', 1)
+        ->orderBy('name')
+        ->pluck('name', 'id');
+    if ($showLootTables) {
+        $tables = \App\Models\Loot\LootTable::orderBy('name')->pluck('name', 'id');
+    }
+    if ($showRaffles) {
+        $raffles = \App\Models\Raffle\Raffle::where('rolled_at', null)
+            ->where('is_active', 1)
+            ->orderBy('name')
+            ->pluck('name', 'id');
+    }
+@endphp
+
 <div class="text-right mb-3">
     <a href="#" class="btn btn-outline-info" id="addLoot">Add Reward</a>
 </div>
@@ -11,12 +33,15 @@
         </tr>
     </thead>
     <tbody id="lootTableBody">
-        @if($loots)
-            @foreach($loots as $loot)
+        @if ($loots)
+            @foreach ($loots as $loot)
                 <tr class="loot-row">
-                    <td>{!! Form::select('rewardable_type[]', ['Item' => 'Item', 'Currency' => 'Currency'] + ($showLootTables ? ['LootTable' => 'Loot Table'] : []) + ($showRaffles ? ['Raffle' => 'Raffle Ticket'] : []), $loot->rewardable_type, ['class' => 'form-control reward-type', 'placeholder' => 'Select Reward Type']) !!}</td>
+                    <td>{!! Form::select('rewardable_type[]', ['Item' => 'Item', 'Currency' => 'Currency'] + ($showLootTables ? ['LootTable' => 'Loot Table'] : []) + ($showRaffles ? ['Raffle' => 'Raffle Ticket'] : []), $loot->rewardable_type, [
+                        'class' => 'form-control reward-type',
+                        'placeholder' => 'Select Reward Type',
+                    ]) !!}</td>
                     <td class="loot-row-select">
-                        @if($loot->rewardable_type == 'Item')
+                        @if ($loot->rewardable_type == 'Item')
                             {!! Form::select('rewardable_id[]', $items, $loot->rewardable_id, ['class' => 'form-control item-select selectize', 'placeholder' => 'Select Item']) !!}
                         @elseif($loot->rewardable_type == 'Currency')
                             {!! Form::select('rewardable_id[]', $currencies, $loot->rewardable_id, ['class' => 'form-control currency-select selectize', 'placeholder' => 'Select Currency']) !!}
@@ -32,4 +57,4 @@
             @endforeach
         @endif
     </tbody>
-</table>
\ No newline at end of file
+</table>
diff --git a/resources/views/widgets/_loot_select_row.blade.php b/resources/views/widgets/_loot_select_row.blade.php
index 9da3098d8c..a6b006f5aa 100644
--- a/resources/views/widgets/_loot_select_row.blade.php
+++ b/resources/views/widgets/_loot_select_row.blade.php
@@ -1,8 +1,33 @@
+@php
+    // This file represents a common source and definition for assets used in loot_select
+    // While it is not per se as tidy as defining these in the controller(s),
+    // doing so this way enables better compatibility across disparate extensions
+    $characterCurrencies = \App\Models\Currency\Currency::where('is_character_owned', 1)
+        ->orderBy('sort_character', 'DESC')
+        ->pluck('name', 'id');
+    $items = \App\Models\Item\Item::orderBy('name')->pluck('name', 'id');
+    $currencies = \App\Models\Currency\Currency::where('is_user_owned', 1)
+        ->orderBy('name')
+        ->pluck('name', 'id');
+    if ($showLootTables) {
+        $tables = \App\Models\Loot\LootTable::orderBy('name')->pluck('name', 'id');
+    }
+    if ($showRaffles) {
+        $raffles = \App\Models\Raffle\Raffle::where('rolled_at', null)
+            ->where('is_active', 1)
+            ->orderBy('name')
+            ->pluck('name', 'id');
+    }
+@endphp
+
 <div id="lootRowData" class="hide">
     <table class="table table-sm">
         <tbody id="lootRow">
             <tr class="loot-row">
-                <td>{!! Form::select('rewardable_type[]', ['Item' => 'Item', 'Currency' => 'Currency'] + ($showLootTables ? ['LootTable' => 'Loot Table'] : []) + ($showRaffles ? ['Raffle' => 'Raffle Ticket'] : []), null, ['class' => 'form-control reward-type', 'placeholder' => 'Select Reward Type']) !!}</td>
+                <td>{!! Form::select('rewardable_type[]', ['Item' => 'Item', 'Currency' => 'Currency'] + ($showLootTables ? ['LootTable' => 'Loot Table'] : []) + ($showRaffles ? ['Raffle' => 'Raffle Ticket'] : []), null, [
+                    'class' => 'form-control reward-type',
+                    'placeholder' => 'Select Reward Type',
+                ]) !!}</td>
                 <td class="loot-row-select"></td>
                 <td>{!! Form::text('quantity[]', 1, ['class' => 'form-control']) !!}</td>
                 <td class="text-right"><a href="#" class="btn btn-danger remove-loot-button">Remove</a></td>
@@ -11,10 +36,10 @@
     </table>
     {!! Form::select('rewardable_id[]', $items, null, ['class' => 'form-control item-select', 'placeholder' => 'Select Item']) !!}
     {!! Form::select('rewardable_id[]', $currencies, null, ['class' => 'form-control currency-select', 'placeholder' => 'Select Currency']) !!}
-    @if($showLootTables)
+    @if ($showLootTables)
         {!! Form::select('rewardable_id[]', $tables, null, ['class' => 'form-control table-select', 'placeholder' => 'Select Loot Table']) !!}
     @endif
-    @if($showRaffles)
+    @if ($showRaffles)
         {!! Form::select('rewardable_id[]', $raffles, null, ['class' => 'form-control raffle-select', 'placeholder' => 'Select Raffle']) !!}
     @endif
-</div>
\ No newline at end of file
+</div>
diff --git a/resources/views/widgets/_my_character_select.blade.php b/resources/views/widgets/_my_character_select.blade.php
index f22502496e..dadd47cabb 100644
--- a/resources/views/widgets/_my_character_select.blade.php
+++ b/resources/views/widgets/_my_character_select.blade.php
@@ -8,7 +8,7 @@
                     <option value="all">All Categories</option>
                     <option value="selected">Selected Characters</option>
                     <option disabled>&#9472;&#9472;&#9472;&#9472;&#9472;&#9472;&#9472;&#9472;&#9472;&#9472;</option>
-                    @foreach($categories as $category)
+                    @foreach ($categories as $category)
                         <option value="{{ $category->id }}">{{ $category->name }}</option>
                     @endforeach
                 </select>
@@ -21,15 +21,17 @@
         </div>
         <div class="user-characters">
             <div class="row">
-                @foreach($characters as $character)
-                    <div class="col-lg-2 col-sm-3 col-6 mb-3 user-character category-all category-{{ $character->character_category_id ? : 0 }} {{ isset($selected) && in_array($character->id, $selected) ? 'category-selected' : '' }} {{ (isset($selected) && in_array($character->id, $selected)) || $character->isAvailable ? '' : 'select-disabled' }}" data-id="{{ $character->id }}">
-                        <div class="text-center character-item {{ (isset($selected) && in_array($character->id, $selected)) || $character->isAvailable ? '' : 'disabled' }}" @if(!(isset($selected) && in_array($character->id, $selected)) && !$character->isAvailable) data-toggle="tooltip" title="{{ $character->trade_id ? 'This character is in a trade.' : 'This character has an active design update.' }}" @endif>
+                @foreach ($characters as $character)
+                    <div class="col-lg-2 col-sm-3 col-6 mb-3 user-character category-all category-{{ $character->character_category_id ?: 0 }} {{ isset($selected) && in_array($character->id, $selected) ? 'category-selected' : '' }} {{ (isset($selected) && in_array($character->id, $selected)) || $character->isAvailable ? '' : 'select-disabled' }}"
+                        data-id="{{ $character->id }}">
+                        <div class="text-center character-item {{ (isset($selected) && in_array($character->id, $selected)) || $character->isAvailable ? '' : 'disabled' }}"
+                            @if (!(isset($selected) && in_array($character->id, $selected)) && !$character->isAvailable) data-toggle="tooltip" title="{{ $character->trade_id ? 'This character is in a trade.' : 'This character has an active design update.' }}" @endif>
                             <div class="mb-1">
                                 <a class="character-stack"><img src="{{ $character->image->thumbnailUrl }}" class="img-thumbnail" alt="Thumbnail for {{ $character->fullName }}" /></a>
                             </div>
                             <div>
                                 <a class="character-stack character-stack-name">{{ $character->slug }}</a>
-                                {!! Form::checkbox((isset($fieldName) && $fieldName ? $fieldName : 'character_id[]'), $character->id, isset($selected) && in_array($character->id, $selected) ? true : false, ['class' => 'character-checkbox hide']) !!}
+                                {!! Form::checkbox(isset($fieldName) && $fieldName ? $fieldName : 'character_id[]', $character->id, isset($selected) && in_array($character->id, $selected) ? true : false, ['class' => 'character-checkbox hide']) !!}
                             </div>
                         </div>
                     </div>
diff --git a/resources/views/widgets/_my_character_select_js.blade.php b/resources/views/widgets/_my_character_select_js.blade.php
index b0d20b6696..fe72004e08 100644
--- a/resources/views/widgets/_my_character_select_js.blade.php
+++ b/resources/views/widgets/_my_character_select_js.blade.php
@@ -5,7 +5,7 @@
             refreshCharacterCategory();
         });
         $('.character-stack').on('click', function(e) {
-            if(!$(this).parent().parent().hasClass('disabled')) {
+            if (!$(this).parent().parent().hasClass('disabled')) {
                 var $parent = $(this).parent().parent().parent();
                 $parent.toggleClass('category-selected');
                 $parent.find('.character-checkbox').prop('checked', $parent.hasClass('category-selected'));
@@ -31,4 +31,4 @@ function refreshCharacterCategory() {
             $('.user-characters .category-' + display).removeClass('hide');
         }
     });
-</script>
\ No newline at end of file
+</script>
diff --git a/resources/views/widgets/_recent_gallery_submissions.blade.php b/resources/views/widgets/_recent_gallery_submissions.blade.php
new file mode 100644
index 0000000000..a0414de268
--- /dev/null
+++ b/resources/views/widgets/_recent_gallery_submissions.blade.php
@@ -0,0 +1,21 @@
+@if (config('lorekeeper.extensions.show_all_recent_submissions.enable') && config('lorekeeper.extensions.show_all_recent_submissions.section_on_front'))
+    <div class="card my-2 text-center">
+        <div class="card-header">
+            <h5>Recent Gallery Submissions</h5>
+        </div>
+        <div class="card-body">
+            <div class="row">
+                @if (count($gallerySubmissions))
+                    @foreach ($gallerySubmissions as $gallerySubmission)
+                        <div class="col-md-3 col-6 profile-inventory-item">
+                            @include('galleries._thumb', ['submission' => $gallerySubmission, 'gallery' => false])
+                        </div>
+                    @endforeach
+                @else
+                    <div class="col-12">No Gallery Submissions.</div>
+                @endif
+                <div class="col-12"><a class="float-right" href="gallery/all">View all Recent Submissions...</a></div>
+            </div>
+        </div>
+    </div>
+@endif
diff --git a/resources/views/widgets/_scroll_to_top.blade.php b/resources/views/widgets/_scroll_to_top.blade.php
new file mode 100644
index 0000000000..4b69c7835b
--- /dev/null
+++ b/resources/views/widgets/_scroll_to_top.blade.php
@@ -0,0 +1,47 @@
+<a id="backToTop" data-toggle="tooltip" data-title="Scroll to Top" title="Scroll to Top"><i class="fas fa-angle-double-up"></i></a>
+
+<script>
+    $(document).ready(function() {
+        // Code from https://stackoverflow.com/questions/8218159/javascript-check-if-page-is-at-the-top
+        var goToTop = document.querySelector('#backToTop');
+        goToTop.addEventListener("click", function(e) {
+            window.scroll({
+                top: 0,
+                left: 0,
+                behavior: 'smooth'
+            });
+            //scroll smoothly back to the top of the page
+        });
+        window.addEventListener("scroll", function() {
+            if (window.scrollY == 0) {
+                //user is at the top of the page; no need to show the back to top button
+                goToTop.style.display = "";
+            } else {
+                goToTop.style.display = "block";
+            }
+        });
+    });
+</script>
+
+<style>
+    #backToTop {
+        color: #eee;
+        cursor: pointer;
+        padding: 0.25em 0.75em;
+        position: fixed;
+        bottom: 1em;
+        right: 0.75em;
+        display: none;
+        transition: all 0.5s ease;
+        opacity: 0.75;
+        background-color: rgba(0, 0, 0, .5);
+        font-size: 1.5em;
+        border-radius: 50%;
+    }
+
+    #backToTop:hover {
+        color: #fff;
+        opacity: 1;
+        transition: all 0.5s ease;
+    }
+</style>
diff --git a/resources/views/world/_currency_entry.blade.php b/resources/views/world/_currency_entry.blade.php
index 64cf6abeb6..2b105ff08b 100644
--- a/resources/views/world/_currency_entry.blade.php
+++ b/resources/views/world/_currency_entry.blade.php
@@ -1,9 +1,14 @@
 <div class="row world-entry">
-    @if($currency->has_image)
-        <div class="col-md-3 world-entry-image"><a href="{{ $currency->currencyImageUrl }}" data-lightbox="entry" data-title="{{ $currency->name }}"><img src="{{ $currency->currencyImageUrl }}" class="world-entry-image" alt="{{ $currency->name }}" /></a></div>
+    @if ($currency->has_image)
+        <div class="col-md-3 world-entry-image"><a href="{{ $currency->currencyImageUrl }}" data-lightbox="entry" data-title="{{ $currency->name }}"><img src="{{ $currency->currencyImageUrl }}" class="world-entry-image" alt="{{ $currency->name }}" /></a>
+        </div>
     @endif
     <div class="{{ $currency->has_image ? 'col-md-9' : 'col-12' }}">
-        <h3>{{ $currency->name }} @if($currency->abbreviation) ({{ $currency->abbreviation }}) @endif</h3>
+        <x-admin-edit title="Currency" :object="$currency" />
+        <h3>{{ $currency->name }} @if ($currency->abbreviation)
+                ({{ $currency->abbreviation }})
+            @endif
+        </h3>
         <div><strong>Displays as:</strong> {!! $currency->display(0) !!}</div>
         <div><strong>Held by:</strong> <?php echo ucfirst(implode(' and ', ($currency->is_user_owned ? ['users'] : []) + ($currency->is_character_owned ? ['characters'] : []))); ?></div>
         <div class="world-entry-text parsed-text">
diff --git a/resources/views/world/_entry.blade.php b/resources/views/world/_entry.blade.php
index eb7c439b42..9513442276 100644
--- a/resources/views/world/_entry.blade.php
+++ b/resources/views/world/_entry.blade.php
@@ -1,11 +1,26 @@
 <div class="row world-entry">
-    @if($imageUrl)
-        <div class="col-md-3 world-entry-image"><a href="{{ $imageUrl }}" data-lightbox="entry" data-title="{{ $name }}">
-            <img src="{{ $imageUrl }}" class="world-entry-image" alt="{{ $name }}" />
-        </a></div>
+    @if ($imageUrl)
+        <div class="col-md-3 world-entry-image">
+            <a href="{{ $imageUrl }}" data-lightbox="entry" data-title="{{ $name }}">
+                <img src="{{ $imageUrl }}" class="world-entry-image" alt="{{ $name }}" />
+            </a>
+        </div>
     @endif
     <div class="{{ $imageUrl ? 'col-md-9' : 'col-12' }}">
-        <h3>{!! $name !!} @if(isset($searchUrl) && $searchUrl) <a href="{{ $searchUrl }}" class="world-entry-search text-muted"><i class="fas fa-search"></i></a>  @endif</h3>
+        @if (isset($edit))
+            <x-admin-edit title="{{ $edit['title'] }}" :object="$edit['object']" />
+        @endif
+        <h3>
+            @if (!$visible)
+                <i class="fas fa-eye-slash mr-1"></i>
+            @endif
+            {!! $name !!}
+            @if (isset($searchUrl) && $searchUrl)
+                <a href="{{ $searchUrl }}" class="world-entry-search text-muted">
+                    <i class="fas fa-search"></i>
+                </a>
+            @endif
+        </h3>
         <div class="world-entry-text">
             {!! $description !!}
         </div>
diff --git a/resources/views/world/_feature_entry.blade.php b/resources/views/world/_feature_entry.blade.php
index 69c0ab3a6f..71eee4909a 100644
--- a/resources/views/world/_feature_entry.blade.php
+++ b/resources/views/world/_feature_entry.blade.php
@@ -1,14 +1,34 @@
 <div class="row world-entry">
-    @if($feature->has_image)
-        <div class="col-md-3 world-entry-image"><a href="{{ $feature->imageUrl }}" data-lightbox="entry" data-title="{{ $feature->name }}"><img src="{{ $feature->imageUrl }}" class="world-entry-image" alt="{{ $feature->name }}" /></a></div>
+    @if ($feature->has_image)
+        <div class="col-md-3 world-entry-image">
+            <a href="{{ $feature->imageUrl }}" data-lightbox="entry" data-title="{{ $feature->name }}">
+                <img src="{{ $feature->imageUrl }}" class="world-entry-image" alt="{{ $feature->name }}" />
+            </a>
+        </div>
     @endif
     <div class="{{ $feature->has_image ? 'col-md-9' : 'col-12' }}">
-        <h3>{!! $feature->displayName !!} <a href="{{ $feature->searchUrl }}" class="world-entry-search text-muted"><i class="fas fa-search"></i></a></h3>
-        @if($feature->feature_category_id)
-            <div><strong>Category:</strong> {!! $feature->category->displayName !!}</div>
+        <x-admin-edit title="Trait" :object="$feature" />
+        <h3>
+            @if (!$feature->is_visible)
+                <i class="fas fa-eye-slash mr-1"></i>
+            @endif
+            {!! $feature->displayName !!}
+            <a href="{{ $feature->searchUrl }}" class="world-entry-search text-muted">
+                <i class="fas fa-search"></i>
+            </a>
+        </h3>
+        @if ($feature->feature_category_id)
+            <div>
+                <strong>Category:</strong> {!! $feature->category->displayName !!}
+            </div>
         @endif
-        @if($feature->species_id)
-            <div><strong>Species:</strong> {!! $feature->species->displayName !!} @if($feature->subtype_id) ({!! $feature->subtype->displayName !!} subtype) @endif</div>
+        @if ($feature->species_id)
+            <div>
+                <strong>Species:</strong> {!! $feature->species->displayName !!}
+                @if ($feature->subtype_id)
+                    ({!! $feature->subtype->displayName !!} subtype)
+                @endif
+            </div>
         @endif
         <div class="world-entry-text parsed-text">
             {!! $feature->parsed_description !!}
diff --git a/resources/views/world/_item_category_entry.blade.php b/resources/views/world/_item_category_entry.blade.php
index 07d5ab2751..eb4f935bb8 100644
--- a/resources/views/world/_item_category_entry.blade.php
+++ b/resources/views/world/_item_category_entry.blade.php
@@ -1,11 +1,28 @@
 <div class="row world-entry">
-    @if($imageUrl)
-        <div class="col-md-3 world-entry-image"><a href="{{ $imageUrl }}" data-lightbox="entry" data-title="{{ $name }}"><img src="{{ $imageUrl }}" class="world-entry-image" alt="{{ $name }}" /></a></div>
+    @if ($imageUrl)
+        <div class="col-md-3 world-entry-image">
+            <a href="{{ $imageUrl }}" data-lightbox="entry" data-title="{{ $name }}">
+                <img src="{{ $imageUrl }}" class="world-entry-image" alt="{{ $name }}" />
+            </a>
+        </div>
     @endif
     <div class="{{ $imageUrl ? 'col-md-9' : 'col-12' }}">
-        <h3>{!! $name !!} @if(isset($searchUrl) && $searchUrl) <a href="{{ $searchUrl }}" class="world-entry-search text-muted"><i class="fas fa-search"></i></a>  @endif</h3>
-        @if($category->is_character_owned == 1)
-        <div><strong>Characters can own {{ $category->character_limit != 0 ? $category->character_limit : '' }} items in this category{{ $category->can_name != 0 ? ', as well as name them' : '' }}!</strong></div>
+        <x-admin-edit title="Category" :object="$category" />
+        <h3>
+            @if (!$category->is_visible)
+                <i class="fas fa-eye-slash mr-1"></i>
+            @endif
+            {!! $name !!}
+            @if (isset($searchUrl) && $searchUrl)
+                <a href="{{ $searchUrl }}" class="world-entry-search text-muted">
+                    <i class="fas fa-search"></i>
+                </a>
+            @endif
+        </h3>
+        @if ($category->is_character_owned == 1)
+            <div>
+                <strong>Characters can own {{ $category->character_limit != 0 ? $category->character_limit : '' }} items in this category{{ $category->can_name != 0 ? ', as well as name them' : '' }}!</strong>
+            </div>
         @endif
         <div class="world-entry-text">
             {!! $description !!}
diff --git a/resources/views/world/_item_entry.blade.php b/resources/views/world/_item_entry.blade.php
index 704612c155..62fcde7ca5 100644
--- a/resources/views/world/_item_entry.blade.php
+++ b/resources/views/world/_item_entry.blade.php
@@ -1,79 +1,133 @@
 <div class="row world-entry">
-    @if($imageUrl)
-        <div class="col-md-3 world-entry-image"><a href="{{ $imageUrl }}" data-lightbox="entry" data-title="{{ $name }}"><img src="{{ $imageUrl }}" class="world-entry-image" alt="{{ $name }}"/></a></div>
+    @if ($imageUrl)
+        <div class="col-md-3 world-entry-image"><a href="{{ $imageUrl }}" data-lightbox="entry" data-title="{{ $name }}"><img src="{{ $imageUrl }}" class="world-entry-image" alt="{{ $name }}" /></a></div>
     @endif
     <div class="{{ $imageUrl ? 'col-md-9' : 'col-12' }}">
-        <h3>{!! $name !!} @if(isset($idUrl) && $idUrl) <a href="{{ $idUrl }}" class="world-entry-search text-muted"><i class="fas fa-search"></i></a>  @endif</h3>
+        <x-admin-edit title="Item" :object="$item" />
+        <h3>
+            @if (!$item->is_released)
+                <i class="fas fa-eye-slash mr-1"></i>
+            @endif
+            {!! $name !!}
+            @if (isset($idUrl) && $idUrl)
+                <a href="{{ $idUrl }}" class="world-entry-search text-muted">
+                    <i class="fas fa-search"></i>
+                </a>
+            @endif
+        </h3>
         <div class="row">
-            @if(isset($item->category) && $item->category)
+            @if (isset($item->category) && $item->category)
                 <div class="col-md">
-                    <p><strong>Category:</strong> {!! $item->category->name !!}</p>
+                    <p>
+                        <strong>Category:</strong>
+                        @if (!$item->category->is_visible)
+                            <i class="fas fa-eye-slash mx-1 text-danger"></i>
+                        @endif
+                        <a href="{!! $item->category->url !!}">
+                            {!! $item->category->name !!}
+                        </a>
+                    </p>
                 </div>
             @endif
-            @if(Config::get('lorekeeper.extensions.item_entry_expansion.extra_fields'))
-                @if(isset($item->rarity) && $item->rarity)
+            @if (config('lorekeeper.extensions.item_entry_expansion.extra_fields'))
+                @if (isset($item->rarity) && $item->rarity)
                     <div class="col-md">
                         <p><strong>Rarity:</strong> {!! $item->rarity !!}</p>
                     </div>
                 @endif
-                @if(isset($item->itemArtist) && $item->itemArtist)
+                @if (isset($item->itemArtist) && $item->itemArtist)
                     <div class="col-md">
                         <p><strong>Artist:</strong> {!! $item->itemArtist !!}</p>
                     </div>
                 @endif
             @endif
-            @if(isset($item->data['resell']) && $item->data['resell'] && App\Models\Currency\Currency::where('id', $item->resell->flip()->pop())->first() && Config::get('lorekeeper.extensions.item_entry_expansion.resale_function'))
+            @if (isset($item->data['resell']) && $item->data['resell'] && App\Models\Currency\Currency::where('id', $item->resell->flip()->pop())->first() && config('lorekeeper.extensions.item_entry_expansion.resale_function'))
                 <div class="col-md">
                     <p><strong>Resale Value:</strong> {!! App\Models\Currency\Currency::find($item->resell->flip()->pop())->display($item->resell->pop()) !!}</p>
                 </div>
             @endif
             <div class="col-md-6 col-md">
                 <div class="row">
-                    @foreach($item->tags as $tag)
-                        @if($tag->is_active)
-                        <div class="col">
-                            {!! $tag->displayTag !!}
-                        </div>
+                    @foreach ($item->tags as $tag)
+                        @if ($tag->is_active)
+                            <div class="col">
+                                {!! $tag->displayTag !!}
+                            </div>
                         @endif
                     @endforeach
                 </div>
             </div>
         </div>
         <div class="world-entry-text">
-            @if(isset($item->reference) && $item->reference && Config::get('lorekeeper.extensions.item_entry_expansion.extra_fields'))  <p><strong>Reference Link:</strong> <a href="{{ $item->reference }}">{{ $item->reference }}</a></p> @endif
+            @if (isset($item->reference) && $item->reference && config('lorekeeper.extensions.item_entry_expansion.extra_fields'))
+                <p>
+                    <strong>Reference Link:</strong>
+                    <a href="{{ $item->reference }}">
+                        {{ $item->reference }}
+                    </a>
+                </p>
+            @endif
             {!! $description !!}
-            @if((isset($item->uses) && $item->uses || isset($item->source) && $item->source || $shops->count() || isset($item->data['prompts']) && $item->data['prompts']) && Config::get('lorekeeper.extensions.item_entry_expansion.extra_fields'))
-            <div class="text-right"><a data-toggle="collapse" href="#item-{{ $item->id }}" class="text-primary"><strong>Show details...</strong></a></div>
-            <div class="collapse" id="item-{{ $item->id }}">
-                @if(isset($item->uses) && $item->uses)  <p><strong>Uses:</strong> {{ $item->uses }}</p> @endif
-                @if(isset($item->source) && $item->source || $shops->count() || isset($item->data['prompts']) && $item->data['prompts'])
-                <h5>Availability</h5>
-                <div class="row">
-                    @if(isset($item->source) && $item->source)
-                        <div class="col">
-                            <p><strong>Source:</strong></p>
-                            <p>{!! $item->source !!}</p>
-                        </div>
+            @if (((isset($item->uses) && $item->uses) || (isset($item->source) && $item->source) || $shops->count() || (isset($item->data['prompts']) && $item->data['prompts'])) && config('lorekeeper.extensions.item_entry_expansion.extra_fields'))
+                <div class="text-right">
+                    <a data-toggle="collapse" href="#item-{{ $item->id }}" class="text-primary">
+                        <strong>Show details...</strong>
+                    </a>
+                </div>
+                <div class="collapse" id="item-{{ $item->id }}">
+                    @if (isset($item->uses) && $item->uses)
+                        <p>
+                            <strong>Uses:</strong> {{ $item->uses }}
+                        </p>
                     @endif
-                    @if($shops->count())
-                        <div class="col">
-                            <p><strong>Purchaseable At:</strong></p>
-                                <div class="row">
-                                    @foreach($shops as $shop) <div class="col"><a href="{{ $shop->url }}">{{ $shop->name }}</a></div> @endforeach
+                    @if ((isset($item->source) && $item->source) || $shops->count() || (isset($item->data['prompts']) && $item->data['prompts']))
+                        <h5>Availability</h5>
+                        <div class="row">
+                            @if (isset($item->source) && $item->source)
+                                <div class="col">
+                                    <p>
+                                        <strong>Source:</strong>
+                                    </p>
+                                    <p>
+                                        {!! $item->source !!}
+                                    </p>
                                 </div>
-                        </div>
-                    @endif
-                    @if(isset($item->data['prompts']) && $item->data['prompts'])
-                        <div class="col">
-                            <p><strong>Drops From:</strong></p>
-                                <div class="row">
-                                    @foreach($item->prompts as $prompt) <div class="col"><a href="{{ $prompt->url }}">{{ $prompt->name }}</a></div> @endforeach
+                            @endif
+                            @if ($shops->count())
+                                <div class="col">
+                                    <p>
+                                        <strong>Purchaseable At:</strong>
+                                    </p>
+                                    <div class="row">
+                                        @foreach ($shops as $shop)
+                                            <div class="col">
+                                                <a href="{{ $shop->url }}">
+                                                    {{ $shop->name }}
+                                                </a>
+                                            </div>
+                                        @endforeach
+                                    </div>
                                 </div>
+                            @endif
+                            @if (isset($item->data['prompts']) && $item->data['prompts'])
+                                <div class="col">
+                                    <p>
+                                        <strong>Drops From:</strong>
+                                    </p>
+                                    <div class="row">
+                                        @foreach ($item->prompts as $prompt)
+                                            <div class="col">
+                                                <a href="{{ $prompt->url }}">
+                                                    {{ $prompt->name }}
+                                                </a>
+                                            </div>
+                                        @endforeach
+                                    </div>
+                                </div>
+                            @endif
                         </div>
                     @endif
                 </div>
-                @endif
-            </div>
             @endif
         </div>
     </div>
diff --git a/resources/views/world/_prompt_entry.blade.php b/resources/views/world/_prompt_entry.blade.php
deleted file mode 100644
index cd54276497..0000000000
--- a/resources/views/world/_prompt_entry.blade.php
+++ /dev/null
@@ -1,66 +0,0 @@
-<div class="row world-entry">
-    @if($prompt->has_image)
-        <div class="col-md-3 world-entry-image"><a href="{{ $prompt->imageUrl }}" data-lightbox="entry" data-title="{{ $prompt->name }}"><img src="{{ $prompt->imageUrl }}" class="world-entry-image" alt="{{ $prompt->name }}"/></a></div>
-    @endif
-    <div class="{{ $prompt->has_image ? 'col-md-9' : 'col-12' }}">
-        <div class="mb-3">
-            <h3 class="mb-0">{!! $prompt->name !!}</h3>
-            @if($prompt->prompt_category_id)
-                <div><strong>Category: </strong>{!! $prompt->category->displayName !!}</div>
-            @endif
-            @if($prompt->start_at && $prompt->start_at->isFuture())
-                <div><strong>Starts: </strong>{!! format_date($prompt->start_at) !!} ({{ $prompt->start_at->diffForHumans() }})</div>
-            @endif
-            @if($prompt->end_at)
-                <div><strong>Ends: </strong>{!! format_date($prompt->end_at) !!} ({{ $prompt->end_at->diffForHumans() }})</div>
-            @endif
-        </div>
-        <div class="world-entry-text">
-            <p>{{ $prompt->summary }}</p>
-            <div class="text-right"><a data-toggle="collapse" href="#prompt-{{ $prompt->id }}" class="text-primary"><strong>Show details...</strong></a></div>
-            <div class="collapse" id="prompt-{{ $prompt->id }}">
-                <h4>Details</h4>
-                @if($prompt->parsed_description)
-                    {!! $prompt->parsed_description !!}
-                @else
-                    <p>No further details.</p>
-                @endif
-                @if($prompt->hide_submissions == 1 && isset($prompt->end_at) && $prompt->end_at > Carbon\Carbon::now())
-                    <p class="text-info">Submissions to this prompt are hidden until this prompt ends.</p>
-                @elseif($prompt->hide_submissions == 2)
-                    <p class="text-info">Submissions to this prompt are hidden.</p>
-                @endif
-            </div>
-            <h4>Rewards</h4>
-            @if(!count($prompt->rewards))
-                No rewards.
-            @else
-                <table class="table table-sm">
-                    <thead>
-                        <tr>
-                            <th width="70%">Reward</th>
-                            <th width="30%">Amount</th>
-                        </tr>
-                    </thead>
-                    <tbody>
-                        @foreach($prompt->rewards as $reward)
-                            <tr>
-                                <td>{!! $reward->reward->displayName !!}</td>
-                                <td>{{ $reward->quantity }}</td>
-                            </tr>
-                        @endforeach
-                    </tbody>
-                </table>
-            @endif
-        </div>
-        <div class="text-right">
-            @if($prompt->end_at && $prompt->end_at->isPast())
-                <span class="text-secondary">This prompt has ended.</span>
-            @elseif($prompt->start_at && $prompt->start_at->isFuture())
-                <span class="text-secondary">This prompt is not open for submissions yet.</span>
-            @else
-                <a href="{{ url('submissions/new?prompt_id=' . $prompt->id) }}" class="btn btn-primary">Submit Prompt</a>
-            @endunless
-        </div>
-    </div>
-</div>
diff --git a/resources/views/world/_rarity_entry.blade.php b/resources/views/world/_rarity_entry.blade.php
index 4633858a01..db2954f362 100644
--- a/resources/views/world/_rarity_entry.blade.php
+++ b/resources/views/world/_rarity_entry.blade.php
@@ -1,14 +1,21 @@
 <div class="row world-entry">
-    @if($imageUrl)
+    @if ($imageUrl)
         <div class="col-md-3 world-entry-image"><a href="{{ $imageUrl }}" data-lightbox="entry" data-title="{{ $name }}"><img src="{{ $imageUrl }}" class="world-entry-image" alt="{{ $name }}" /></a></div>
     @endif
     <div class="{{ $imageUrl ? 'col-md-9' : 'col-12' }}">
         <h3>{!! $name !!}
 
-        <div class="float-right small">
-            @if(isset($searchFeaturesUrl) && $searchFeaturesUrl) <a href="{{ $searchFeaturesUrl }}" class="world-entry-search text-muted small"><i class="fas fa-search"></i> Traits</a>  @endif
-            @if(isset($searchCharactersUrl) && $searchCharactersUrl) <a href="{{ $searchCharactersUrl }}" class="world-entry-search text-muted small ml-4"><i class="fas fa-search"></i> Characters</a>  @endif
-        </div>
+            <div class="float-right small">
+                @if (isset($searchFeaturesUrl) && $searchFeaturesUrl)
+                    <a href="{{ $searchFeaturesUrl }}" class="world-entry-search text-muted small"><i class="fas fa-search"></i> Traits</a>
+                @endif
+                @if (isset($searchCharactersUrl) && $searchCharactersUrl)
+                    <a href="{{ $searchCharactersUrl }}" class="world-entry-search text-muted small ml-4"><i class="fas fa-search"></i> Characters</a>
+                @endif
+                @if (isset($edit))
+                    <x-admin-edit title="{{ $edit['title'] }}" :object="$edit['object']" />
+                @endif
+            </div>
 
         </h3>
         <div class="world-entry-text">
diff --git a/resources/views/world/_species_entry.blade.php b/resources/views/world/_species_entry.blade.php
index 5e38fe2564..b5f2215326 100644
--- a/resources/views/world/_species_entry.blade.php
+++ b/resources/views/world/_species_entry.blade.php
@@ -1,15 +1,31 @@
 <div class="row world-entry">
-    @if($species->speciesImageUrl)
-        <div class="col-md-3 world-entry-image"><a href="{{ $species->speciesImageUrl }}" data-lightbox="entry" data-title="{{ $species->name }}"><img src="{{ $species->speciesImageUrl }}" class="world-entry-image" alt="{{ $species->name }}" /></a></div>
+    @if ($species->speciesImageUrl)
+        <div class="col-md-3 world-entry-image">
+            <a href="{{ $species->speciesImageUrl }}" data-lightbox="entry" data-title="{{ $species->name }}">
+                <img src="{{ $species->speciesImageUrl }}" class="world-entry-image" alt="{{ $species->name }}" />
+            </a>
+        </div>
     @endif
     <div class="{{ $species->speciesImageUrl ? 'col-md-9' : 'col-12' }}">
-        <h3>{!! $species->displayName !!} <a href="{{ $species->searchUrl }}" class="world-entry-search text-muted"><i class="fas fa-search"></i></a></h3>
-        @if(count($species->features) && Config::get('lorekeeper.extensions.species_trait_index'))
-            <a href="{{ $species->visualTraitsUrl }}"><strong>Visual Trait Index</strong></a>
+        <x-admin-edit title="Species" :object="$species" />
+        <h3>
+            @if (!$species->is_visible)
+                <i class="fas fa-eye-slash mr-1"></i>
+            @endif
+            {!! $species->displayName !!}
+            <a href="{{ $species->searchUrl }}" class="world-entry-search text-muted">
+                <i class="fas fa-search"></i>
+            </a>
+        </h3>
+        @if (count($species->features) && config('lorekeeper.extensions.species_trait_index.enable'))
+            <a href="{{ $species->visualTraitsUrl }}">
+                <strong>Visual Trait Index</strong>
+            </a>
         @endif
-        @if(count($species->subtypes))
-            <div><strong>Subtypes: </strong>
-                @foreach($species->subtypes as $count=>$subtype)
+        @if (count($species->subtypes))
+            <div>
+                <strong>Subtypes: </strong>
+                @foreach ($species->subtypes as $count => $subtype)
                     {!! $subtype->displayName !!}{{ $count < $species->subtypes->count() - 1 ? ', ' : '' }}
                 @endforeach
             </div>
diff --git a/resources/views/world/_subtype_entry.blade.php b/resources/views/world/_subtype_entry.blade.php
index 30e398601e..67981e0a14 100644
--- a/resources/views/world/_subtype_entry.blade.php
+++ b/resources/views/world/_subtype_entry.blade.php
@@ -1,9 +1,22 @@
 <div class="row world-entry">
-    @if($subtype->subtypeImageUrl)
-        <div class="col-md-3 world-entry-image"><a href="{{ $subtype->subtypeImageUrl }}" data-lightbox="entry" data-title="{{ $subtype->name }}"><img src="{{ $subtype->subtypeImageUrl }}" class="world-entry-image" alt="{{ $subtype->name }}" /></a></div>
+    @if ($subtype->subtypeImageUrl)
+        <div class="col-md-3 world-entry-image">
+            <a href="{{ $subtype->subtypeImageUrl }}" data-lightbox="entry" data-title="{{ $subtype->name }}">
+                <img src="{{ $subtype->subtypeImageUrl }}" class="world-entry-image" alt="{{ $subtype->name }}" />
+            </a>
+        </div>
     @endif
     <div class="{{ $subtype->subtypeImageUrl ? 'col-md-9' : 'col-12' }}">
-        <h3>{!! $subtype->displayName !!} ({!! $subtype->species->displayName !!} Subtype) <a href="{{ $subtype->searchUrl }}" class="world-entry-search text-muted"><i class="fas fa-search"></i></a></h3>
+        <x-admin-edit title="Subtype" :object="$subtype" />
+        <h3>
+            @if (!$subtype->is_visible)
+                <i class="fas fa-eye-slash mr-1"></i>
+            @endif
+            {!! $subtype->displayName !!} ({!! $subtype->species->displayName !!} Subtype)
+            <a href="{{ $subtype->searchUrl }}" class="world-entry-search text-muted">
+                <i class="fas fa-search"></i>
+            </a>
+        </h3>
         <div class="world-entry-text">
             {!! $subtype->parsed_description !!}
         </div>
diff --git a/resources/views/world/character_categories.blade.php b/resources/views/world/character_categories.blade.php
index 4d1910588e..a1dab3dd4e 100644
--- a/resources/views/world/character_categories.blade.php
+++ b/resources/views/world/character_categories.blade.php
@@ -1,32 +1,43 @@
 @extends('world.layout')
 
-@section('title') Character Categories @endsection
+@section('world-title')
+    Character Categories
+@endsection
 
 @section('content')
-{!! breadcrumbs(['World' => 'world', 'Character Categories' => 'world/character-categories']) !!}
-<h1>Character Categories</h1>
+    {!! breadcrumbs(['World' => 'world', 'Character Categories' => 'world/character-categories']) !!}
+    <h1>Character Categories</h1>
 
-<div>
-    {!! Form::open(['method' => 'GET', 'class' => 'form-inline justify-content-end']) !!}
+    <div>
+        {!! Form::open(['method' => 'GET', 'class' => 'form-inline justify-content-end']) !!}
         <div class="form-group mr-3 mb-3">
             {!! Form::text('name', Request::get('name'), ['class' => 'form-control']) !!}
         </div>
         <div class="form-group mb-3">
             {!! Form::submit('Search', ['class' => 'btn btn-primary']) !!}
         </div>
-    {!! Form::close() !!}
-</div>
-
-{!! $categories->render() !!}
-@foreach($categories as $category)
-    <div class="card mb-3">
-        <div class="card-body">
-        @include('world._entry', ['imageUrl' => $category->categoryImageUrl, 'name' => $category->displayName, 'description' => $category->parsed_description, 'searchUrl' => $category->searchUrl])
-        </div>
+        {!! Form::close() !!}
     </div>
-@endforeach
-{!! $categories->render() !!}
 
-<div class="text-center mt-4 small text-muted">{{ $categories->total() }} result{{ $categories->total() == 1 ? '' : 's' }} found.</div>
+    {!! $categories->render() !!}
+    @foreach ($categories as $category)
+        <div class="card mb-3">
+            <div class="card-body">
+                @include('world._entry', [
+                    'edit' => [
+                        'object' => $category,
+                        'title' => 'Category',
+                    ],
+                    'imageUrl' => $category->categoryImageUrl,
+                    'name' => $category->displayName,
+                    'description' => $category->parsed_description,
+                    'searchUrl' => $category->searchUrl,
+                    'visible' => $category->is_visible,
+                ])
+            </div>
+        </div>
+    @endforeach
+    {!! $categories->render() !!}
 
+    <div class="text-center mt-4 small text-muted">{{ $categories->total() }} result{{ $categories->total() == 1 ? '' : 's' }} found.</div>
 @endsection
diff --git a/resources/views/world/currencies.blade.php b/resources/views/world/currencies.blade.php
index 4c342d11c2..abbd3257c3 100644
--- a/resources/views/world/currencies.blade.php
+++ b/resources/views/world/currencies.blade.php
@@ -1,32 +1,33 @@
 @extends('world.layout')
 
-@section('title') Currencies @endsection
+@section('world-title')
+    Currencies
+@endsection
 
 @section('content')
-{!! breadcrumbs(['World' => 'world', 'Currencies' => 'world/currencies']) !!}
-<h1>Currencies</h1>
+    {!! breadcrumbs(['World' => 'world', 'Currencies' => 'world/currencies']) !!}
+    <h1>Currencies</h1>
 
-<div>
-    {!! Form::open(['method' => 'GET', 'class' => 'form-inline justify-content-end']) !!}
+    <div>
+        {!! Form::open(['method' => 'GET', 'class' => 'form-inline justify-content-end']) !!}
         <div class="form-group mr-3 mb-3">
             {!! Form::text('name', Request::get('name'), ['class' => 'form-control']) !!}
         </div>
         <div class="form-group mb-3">
             {!! Form::submit('Search', ['class' => 'btn btn-primary']) !!}
         </div>
-    {!! Form::close() !!}
-</div>
-
-{!! $currencies->render() !!}
-@foreach($currencies as $currency)
-    <div class="card mb-3">
-        <div class="card-body">
-            @include('world._currency_entry', ['currency' => $currency])
-        </div>
+        {!! Form::close() !!}
     </div>
-@endforeach
-{!! $currencies->render() !!}
 
-<div class="text-center mt-4 small text-muted">{{ $currencies->total() }} result{{ $currencies->total() == 1 ? '' : 's' }} found.</div>
+    {!! $currencies->render() !!}
+    @foreach ($currencies as $currency)
+        <div class="card mb-3">
+            <div class="card-body">
+                @include('world._currency_entry', ['currency' => $currency])
+            </div>
+        </div>
+    @endforeach
+    {!! $currencies->render() !!}
 
+    <div class="text-center mt-4 small text-muted">{{ $currencies->total() }} result{{ $currencies->total() == 1 ? '' : 's' }} found.</div>
 @endsection
diff --git a/resources/views/world/feature_categories.blade.php b/resources/views/world/feature_categories.blade.php
index e26078866d..6b20dbc96f 100644
--- a/resources/views/world/feature_categories.blade.php
+++ b/resources/views/world/feature_categories.blade.php
@@ -1,32 +1,43 @@
 @extends('world.layout')
 
-@section('title') Trait Categories @endsection
+@section('world-title')
+    Trait Categories
+@endsection
 
 @section('content')
-{!! breadcrumbs(['World' => 'world', 'Trait Categories' => 'world/trait-categories']) !!}
-<h1>Trait Categories</h1>
+    {!! breadcrumbs(['World' => 'world', 'Trait Categories' => 'world/trait-categories']) !!}
+    <h1>Trait Categories</h1>
 
-<div>
-    {!! Form::open(['method' => 'GET', 'class' => 'form-inline justify-content-end']) !!}
+    <div>
+        {!! Form::open(['method' => 'GET', 'class' => 'form-inline justify-content-end']) !!}
         <div class="form-group mr-3 mb-3">
             {!! Form::text('name', Request::get('name'), ['class' => 'form-control']) !!}
         </div>
         <div class="form-group mb-3">
             {!! Form::submit('Search', ['class' => 'btn btn-primary']) !!}
         </div>
-    {!! Form::close() !!}
-</div>
-
-{!! $categories->render() !!}
-@foreach($categories as $category)
-    <div class="card mb-3">
-        <div class="card-body">
-        @include('world._entry', ['imageUrl' => $category->categoryImageUrl, 'name' => $category->displayName, 'description' => $category->parsed_description, 'searchUrl' => $category->searchUrl])
-        </div>
+        {!! Form::close() !!}
     </div>
-@endforeach
-{!! $categories->render() !!}
 
-<div class="text-center mt-4 small text-muted">{{ $categories->total() }} result{{ $categories->total() == 1 ? '' : 's' }} found.</div>
+    {!! $categories->render() !!}
+    @foreach ($categories as $category)
+        <div class="card mb-3">
+            <div class="card-body">
+                @include('world._entry', [
+                    'edit' => [
+                        'object' => $category,
+                        'title' => 'Category',
+                    ],
+                    'imageUrl' => $category->categoryImageUrl,
+                    'name' => $category->displayName,
+                    'description' => $category->parsed_description,
+                    'searchUrl' => $category->searchUrl,
+                    'visible' => $category->is_visible,
+                ])
+            </div>
+        </div>
+    @endforeach
+    {!! $categories->render() !!}
 
+    <div class="text-center mt-4 small text-muted">{{ $categories->total() }} result{{ $categories->total() == 1 ? '' : 's' }} found.</div>
 @endsection
diff --git a/resources/views/world/features.blade.php b/resources/views/world/features.blade.php
index 1e6e295c98..1af43478c5 100644
--- a/resources/views/world/features.blade.php
+++ b/resources/views/world/features.blade.php
@@ -1,13 +1,15 @@
 @extends('world.layout')
 
-@section('title') Traits @endsection
+@section('world-title')
+    Traits
+@endsection
 
 @section('content')
-{!! breadcrumbs(['World' => 'world', 'Traits' => 'world/traits']) !!}
-<h1>Traits</h1>
+    {!! breadcrumbs(['World' => 'world', 'Traits' => 'world/traits']) !!}
+    <h1>Traits</h1>
 
-<div>
-    {!! Form::open(['method' => 'GET', 'class' => '']) !!}
+    <div>
+        {!! Form::open(['method' => 'GET', 'class' => '']) !!}
         <div class="form-inline justify-content-end">
             <div class="form-group ml-3 mb-3">
                 {!! Form::text('name', Request::get('name'), ['class' => 'form-control', 'placeholder' => 'Name']) !!}
@@ -15,43 +17,51 @@
             <div class="form-group ml-3 mb-3">
                 {!! Form::select('species_id', $specieses, Request::get('species_id'), ['class' => 'form-control']) !!}
             </div>
+            <div class="form-group ml-3 mb-3">
+                {!! Form::select('subtype_id', $subtypes, Request::get('subtype_id'), ['class' => 'form-control']) !!}
+            </div>
             <div class="form-group ml-3 mb-3">
                 {!! Form::select('rarity_id', $rarities, Request::get('rarity_id'), ['class' => 'form-control']) !!}
             </div>
             <div class="form-group ml-3 mb-3">
-                {!! Form::select('feature_category_id', $categories, Request::get('name'), ['class' => 'form-control']) !!}
+                {!! Form::select('feature_category_id', $categories, Request::get('feature_category_id'), ['class' => 'form-control']) !!}
             </div>
         </div>
         <div class="form-inline justify-content-end">
             <div class="form-group ml-3 mb-3">
-                {!! Form::select('sort', [
-                    'alpha'          => 'Sort Alphabetically (A-Z)',
-                    'alpha-reverse'  => 'Sort Alphabetically (Z-A)',
-                    'category'       => 'Sort by Category',
-                    'rarity-reverse' => 'Sort by Rarity (Common to Rare)',
-                    'rarity'         => 'Sort by Rarity (Rare to Common)',
-                    'species'        => 'Sort by Species',
-                    'newest'         => 'Newest First',
-                    'oldest'         => 'Oldest First'    
-                ], Request::get('sort') ? : 'category', ['class' => 'form-control']) !!}
+                {!! Form::select(
+                    'sort',
+                    [
+                        'alpha' => 'Sort Alphabetically (A-Z)',
+                        'alpha-reverse' => 'Sort Alphabetically (Z-A)',
+                        'category' => 'Sort by Category',
+                        'rarity-reverse' => 'Sort by Rarity (Common to Rare)',
+                        'rarity' => 'Sort by Rarity (Rare to Common)',
+                        'species' => 'Sort by Species',
+                        'subtypes' => 'Sort by Subtype',
+                        'newest' => 'Newest First',
+                        'oldest' => 'Oldest First',
+                    ],
+                    Request::get('sort') ?: 'category',
+                    ['class' => 'form-control'],
+                ) !!}
             </div>
             <div class="form-group ml-3 mb-3">
                 {!! Form::submit('Search', ['class' => 'btn btn-primary']) !!}
             </div>
         </div>
-    {!! Form::close() !!}
-</div>
-
-{!! $features->render() !!}
-@foreach($features as $feature)
-    <div class="card mb-3">
-        <div class="card-body">
-        @include('world._feature_entry', ['feature' => $feature])
-        </div>
+        {!! Form::close() !!}
     </div>
-@endforeach
-{!! $features->render() !!}
 
-<div class="text-center mt-4 small text-muted">{{ $features->total() }} result{{ $features->total() == 1 ? '' : 's' }} found.</div>
+    {!! $features->render() !!}
+    @foreach ($features as $feature)
+        <div class="card mb-3">
+            <div class="card-body">
+                @include('world._feature_entry', ['feature' => $feature])
+            </div>
+        </div>
+    @endforeach
+    {!! $features->render() !!}
 
+    <div class="text-center mt-4 small text-muted">{{ $features->total() }} result{{ $features->total() == 1 ? '' : 's' }} found.</div>
 @endsection
diff --git a/resources/views/world/index.blade.php b/resources/views/world/index.blade.php
index 9b2f3a1981..a1400d1cee 100644
--- a/resources/views/world/index.blade.php
+++ b/resources/views/world/index.blade.php
@@ -1,40 +1,42 @@
 @extends('world.layout')
 
-@section('title') Home @endsection
+@section('world-title')
+    Home
+@endsection
 
 @section('content')
-{!! breadcrumbs(['Encyclopedia' => 'world']) !!}
+    {!! breadcrumbs(['Encyclopedia' => 'world']) !!}
 
-<h1>World</h1>
-<div class="row">
-    <div class="col-md-6">
-        <div class="card mb-4">
-            <div class="card-body text-center">
-                <img src="{{ asset('images/characters.png') }}" alt="Characters" />
-                <h5 class="card-title">Characters</h5>
+    <h1>World</h1>
+    <div class="row">
+        <div class="col-md-6">
+            <div class="card mb-4">
+                <div class="card-body text-center">
+                    <img src="{{ asset('images/characters.png') }}" alt="Characters" />
+                    <h5 class="card-title">Characters</h5>
+                </div>
+                <ul class="list-group list-group-flush">
+                    <li class="list-group-item"><a href="{{ url('world/species') }}">Species</a></li>
+                    <li class="list-group-item"><a href="{{ url('world/subtypes') }}">Subtypes</a></li>
+                    <li class="list-group-item"><a href="{{ url('world/rarities') }}">Rarities</a></li>
+                    <li class="list-group-item"><a href="{{ url('world/trait-categories') }}">Trait Categories</a></li>
+                    <li class="list-group-item"><a href="{{ url('world/traits') }}">All Traits</a></li>
+                    <li class="list-group-item"><a href="{{ url('world/character-categories') }}">Character Categories</a></li>
+                </ul>
             </div>
-            <ul class="list-group list-group-flush">
-                <li class="list-group-item"><a href="{{ url('world/species') }}">Species</a></li>
-				<li class="list-group-item"><a href="{{ url('world/subtypes') }}">Subtypes</a></li>
-                <li class="list-group-item"><a href="{{ url('world/rarities') }}">Rarities</a></li>
-                <li class="list-group-item"><a href="{{ url('world/trait-categories') }}">Trait Categories</a></li>
-                <li class="list-group-item"><a href="{{ url('world/traits') }}">All Traits</a></li>
-                <li class="list-group-item"><a href="{{ url('world/character-categories') }}">Character Categories</a></li>
-            </ul>
         </div>
-    </div>
-    <div class="col-md-6">
-        <div class="card mb-4">
-            <div class="card-body text-center">
-                <img src="{{ asset('images/inventory.png') }}" alt="Items" />
-                <h5 class="card-title">Items</h5>
+        <div class="col-md-6">
+            <div class="card mb-4">
+                <div class="card-body text-center">
+                    <img src="{{ asset('images/inventory.png') }}" alt="Items" />
+                    <h5 class="card-title">Items</h5>
+                </div>
+                <ul class="list-group list-group-flush">
+                    <li class="list-group-item"><a href="{{ url('world/item-categories') }}">Item Categories</a></li>
+                    <li class="list-group-item"><a href="{{ url('world/items') }}">All Items</a></li>
+                    <li class="list-group-item"><a href="{{ url('world/currencies') }}">Currencies</a></li>
+                </ul>
             </div>
-            <ul class="list-group list-group-flush">
-                <li class="list-group-item"><a href="{{ url('world/item-categories') }}">Item Categories</a></li>
-                <li class="list-group-item"><a href="{{ url('world/items') }}">All Items</a></li>
-                <li class="list-group-item"><a href="{{ url('world/currencies') }}">Currencies</a></li>
-            </ul>
         </div>
     </div>
-</div>
 @endsection
diff --git a/resources/views/world/item_categories.blade.php b/resources/views/world/item_categories.blade.php
index 3fa8087c1b..9c03d4ac8e 100644
--- a/resources/views/world/item_categories.blade.php
+++ b/resources/views/world/item_categories.blade.php
@@ -1,32 +1,39 @@
 @extends('world.layout')
 
-@section('title') Item Categories @endsection
+@section('world-title')
+    Item Categories
+@endsection
 
 @section('content')
-{!! breadcrumbs(['World' => 'world', 'Item Categories' => 'world/item-categories']) !!}
-<h1>Item Categories</h1>
+    {!! breadcrumbs(['World' => 'world', 'Item Categories' => 'world/item-categories']) !!}
+    <h1>Item Categories</h1>
 
-<div>
-    {!! Form::open(['method' => 'GET', 'class' => 'form-inline justify-content-end']) !!}
+    <div>
+        {!! Form::open(['method' => 'GET', 'class' => 'form-inline justify-content-end']) !!}
         <div class="form-group mr-3 mb-3">
             {!! Form::text('name', Request::get('name'), ['class' => 'form-control']) !!}
         </div>
         <div class="form-group mb-3">
             {!! Form::submit('Search', ['class' => 'btn btn-primary']) !!}
         </div>
-    {!! Form::close() !!}
-</div>
-
-{!! $categories->render() !!}
-@foreach($categories as $category)
-    <div class="card mb-3">
-        <div class="card-body">
-        @include('world._item_category_entry', ['imageUrl' => $category->categoryImageUrl, 'name' => $category->displayName, 'description' => $category->parsed_description, 'searchUrl' => $category->searchUrl, 'category' => $category])
-        </div>
+        {!! Form::close() !!}
     </div>
-@endforeach
-{!! $categories->render() !!}
 
-<div class="text-center mt-4 small text-muted">{{ $categories->total() }} result{{ $categories->total() == 1 ? '' : 's' }} found.</div>
+    {!! $categories->render() !!}
+    @foreach ($categories as $category)
+        <div class="card mb-3">
+            <div class="card-body">
+                @include('world._item_category_entry', [
+                    'imageUrl' => $category->categoryImageUrl,
+                    'name' => $category->displayName,
+                    'description' => $category->parsed_description,
+                    'searchUrl' => $category->searchUrl,
+                    'category' => $category,
+                ])
+            </div>
+        </div>
+    @endforeach
+    {!! $categories->render() !!}
 
+    <div class="text-center mt-4 small text-muted">{{ $categories->total() }} result{{ $categories->total() == 1 ? '' : 's' }} found.</div>
 @endsection
diff --git a/resources/views/world/item_page.blade.php b/resources/views/world/item_page.blade.php
index 25216ff999..1fe9a9c974 100644
--- a/resources/views/world/item_page.blade.php
+++ b/resources/views/world/item_page.blade.php
@@ -1,108 +1,156 @@
 @extends('world.layout')
 
-@section('title') {{ $item->name }} @endsection
+@section('world-title')
+    {{ $item->name }}
+@endsection
 
-@section('meta-img') {{ $imageUrl }} @endsection
+@section('meta-img')
+    {{ $imageUrl }}
+@endsection
 
 @section('meta-desc')
-@if(isset($item->category) && $item->category) <p><strong>Category:</strong> {{ $item->category->name }}</p> @endif
-@if(isset($item->rarity) && $item->rarity) :: <p><strong>Rarity:</strong> {{ $item->rarity }}: {{ $item->rarityName }}</p> @endif
- :: {!! substr(str_replace('"','&#39;',$item->description),0,69) !!}
-@if(isset($item->uses) && $item->uses) :: <p><strong>Uses:</strong> {!! $item->uses !!}</p> @endif
+    @if (isset($item->category) && $item->category)
+        <p><strong>Category:</strong> {{ $item->category->name }}</p>
+    @endif
+    @if (isset($item->rarity) && $item->rarity)
+        :: <p><strong>Rarity:</strong> {{ $item->rarity }}: {{ $item->rarityName }}</p>
+    @endif
+    :: {!! substr(str_replace('"', '&#39;', $item->description), 0, 69) !!}
+    @if (isset($item->uses) && $item->uses)
+        :: <p><strong>Uses:</strong> {!! $item->uses !!}</p>
+    @endif
 @endsection
 
 @section('content')
-{!! breadcrumbs(['World' => 'world', 'Items' => 'world/items', $item->name => $item->idUrl]) !!}
+    <x-admin-edit title="Item" :object="$item" />
+    {!! breadcrumbs(['World' => 'world', 'Items' => 'world/items', $item->name => $item->idUrl]) !!}
 
-<div class="row">
-    <div class="col-sm">
-    </div>
-    <div class="col-lg-6 col-lg-10">
-        <div class="card mb-3">
-            <div class="card-body">
-                <div class="row world-entry">
-                    @if($imageUrl)
-                        <div class="col-md-3 world-entry-image"><a href="{{ $imageUrl }}" data-lightbox="entry" data-title="{{ $name }}"><img src="{{ $imageUrl }}" class="world-entry-image" alt="{{ $name }}" /></a></div>
-                    @endif
-                    <div class="{{ $imageUrl ? 'col-md-9' : 'col-12' }}">
-                        <h1>{!! $name !!}</h1>
-                        <div class="row">
-                        @if(isset($item->category) && $item->category)
-                            <div class="col-md">
-                                <p><strong>Category:</strong> {!! $item->category->name !!}</p>
-                            </div>
-                        @endif
-                        @if(Config::get('lorekeeper.extensions.item_entry_expansion.extra_fields'))
-                            @if(isset($item->rarity) && $item->rarity)
-                                <div class="col-md">
-                                    <p><strong>Rarity:</strong> {!! $item->rarity !!}</p>
-                                </div>
-                            @endif
-                            @if(isset($item->itemArtist) && $item->itemArtist)
-                                <div class="col-md">
-                                    <p><strong>Artist:</strong> {!! $item->itemArtist !!}</p>
-                                </div>
-                            @endif
-                        @endif
-                        @if(isset($item->data['resell']) && $item->data['resell'] && Config::get('lorekeeper.extensions.item_entry_expansion.resale_function'))
-                            <div class="col-md">
-                                <p><strong>Resale Value:</strong> {!! App\Models\Currency\Currency::find($item->resell->flip()->pop())->display($item->resell->pop()) !!}</p>
-                            </div>
+    <div class="row">
+        <div class="col-sm">
+        </div>
+        <div class="col-lg-6 col-lg-10">
+            <div class="card mb-3">
+                <div class="card-body">
+                    <div class="row world-entry">
+                        @if ($imageUrl)
+                            <div class="col-md-3 world-entry-image"><a href="{{ $imageUrl }}" data-lightbox="entry" data-title="{{ $name }}"><img src="{{ $imageUrl }}" class="world-entry-image" alt="{{ $name }}" /></a></div>
                         @endif
-                            <div class="col-md-5 col-md">
-                                <div class="row">
-                                    @foreach($item->tags as $tag)
-                                        @if($tag->is_active)
-                                        <div class="col">
-                                            {!! $tag->displayTag !!}
+                        <div class="{{ $imageUrl ? 'col-md-9' : 'col-12' }}">
+                            <h1>
+                                @if (!$item->is_released)
+                                    <i class="fas fa-eye-slash mr-1"></i>
+                                @endif
+                                {!! $name !!}
+                            </h1>
+                            <div class="row">
+                                @if (isset($item->category) && $item->category)
+                                    <div class="col-md">
+                                        <p>
+                                            <strong>Category:</strong>
+                                            @if (!$item->category->is_visible)
+                                                <i class="fas fa-eye-slash mx-1 text-danger"></i>
+                                            @endif
+                                            <a href="{!! $item->category->url !!}">
+                                                {!! $item->category->name !!}
+                                            </a>
+                                        </p>
+                                    </div>
+                                @endif
+                                @if (config('lorekeeper.extensions.item_entry_expansion.extra_fields'))
+                                    @if (isset($item->rarity) && $item->rarity)
+                                        <div class="col-md">
+                                            <p><strong>Rarity:</strong> {!! $item->rarity !!}</p>
+                                        </div>
+                                    @endif
+                                    @if (isset($item->itemArtist) && $item->itemArtist)
+                                        <div class="col-md">
+                                            <p><strong>Artist:</strong> {!! $item->itemArtist !!}</p>
                                         </div>
-                                        @endif
-                                    @endforeach
+                                    @endif
+                                @endif
+                                @if (isset($item->data['resell']) && $item->data['resell'] && config('lorekeeper.extensions.item_entry_expansion.resale_function'))
+                                    <div class="col-md">
+                                        <p><strong>Resale Value:</strong> {!! App\Models\Currency\Currency::find($item->resell->flip()->pop())->display($item->resell->pop()) !!}</p>
+                                    </div>
+                                @endif
+                                <div class="col-md-5 col-md">
+                                    <div class="row">
+                                        @foreach ($item->tags as $tag)
+                                            @if ($tag->is_active)
+                                                <div class="col">
+                                                    {!! $tag->displayTag !!}
+                                                </div>
+                                            @endif
+                                        @endforeach
+                                    </div>
                                 </div>
                             </div>
-                        </div>
-                        <div class="world-entry-text">
-                            @if(isset($item->reference) && $item->reference && Config::get('lorekeeper.extensions.item_entry_expansion.extra_fields'))  <p><strong>Reference Link:</strong> <a href="{{ $item->reference }}">{{ $item->reference }}</a></p> @endif
-                            {!! $description !!}
-                            @if((isset($item->uses) && $item->uses || isset($item->source) && $item->source || $shops->count() || isset($item->data['prompts']) && $item->data['prompts']) && Config::get('lorekeeper.extensions.item_entry_expansion.extra_fields'))
+                            <div class="world-entry-text">
+                                @if (isset($item->reference) && $item->reference && config('lorekeeper.extensions.item_entry_expansion.extra_fields'))
+                                    <p>
+                                        <strong>Reference Link:</strong>
+                                        <a href="{{ $item->reference }}">
+                                            {{ $item->reference }}
+                                        </a>
+                                    </p>
+                                @endif
+                                {!! $description !!}
+                                @if (((isset($item->uses) && $item->uses) || (isset($item->source) && $item->source) || $shops->count() || (isset($item->data['prompts']) && $item->data['prompts'])) && config('lorekeeper.extensions.item_entry_expansion.extra_fields'))
 
-                                @if(isset($item->uses) && $item->uses)  <p><strong>Uses:</strong> {!! $item->uses !!}</p> @endif
-                                @if(isset($item->source) && $item->source || $shops->count() || isset($item->data['prompts']) && $item->data['prompts'])
-                                <h5>Availability</h5>
-                                <div class="row">
-                                    @if(isset($item->data['release']) && $item->data['release'])
-                                        <div class="col">
-                                            <p><strong>Source:</strong></p>
-                                            <p>{!! $item->data['release'] !!}</p>
-                                        </div>
+                                    @if (isset($item->uses) && $item->uses)
+                                        <p>
+                                            <strong>Uses:</strong> {!! $item->uses !!}
+                                        </p>
                                     @endif
-                                    @if($shops->count())
-                                        <div class="col">
-                                            <p><strong>Purchaseable At:</strong></p>
-                                                <div class="row">
-                                                    @foreach($shops as $shop) <span class="badge" style="font-size:95%; margin:5px;"><a href="{{ $shop->url }}">{{ $shop->name }}</a></span>
-                                                    @endforeach
+                                    @if ((isset($item->source) && $item->source) || $shops->count() || (isset($item->data['prompts']) && $item->data['prompts']))
+                                        <h5>Availability</h5>
+                                        <div class="row">
+                                            @if (isset($item->data['release']) && $item->data['release'])
+                                                <div class="col">
+                                                    <p><strong>Source:</strong></p>
+                                                    <p>{!! $item->data['release'] !!}</p>
                                                 </div>
-                                        </div>
-                                    @endif
-                                    @if(isset($item->data['prompts']) && $item->data['prompts'])
-                                        <div class="col">
-                                            <p><strong>Drops From:</strong></p>
-                                                <div class="row">
-                                                    @foreach($item->prompts as $prompt) <span class="badge" style="font-size:95%; background-color: #fefcf6; margin:5px;"><a href="{{ $prompt->url }}">{{ $prompt->name }}</a></span> @endforeach
+                                            @endif
+                                            @if ($shops->count())
+                                                <div class="col">
+                                                    <p>
+                                                        <strong>Purchaseable At:</strong>
+                                                    </p>
+                                                    <div class="row">
+                                                        @foreach ($shops as $shop)
+                                                            <span class="badge" style="font-size:95%; margin:5px;">
+                                                                <a href="{{ $shop->url }}">
+                                                                    {{ $shop->name }}
+                                                                </a>
+                                                            </span>
+                                                        @endforeach
+                                                    </div>
                                                 </div>
+                                            @endif
+                                            @if (isset($item->data['prompts']) && $item->data['prompts'])
+                                                <div class="col">
+                                                    <p><strong>Drops From:</strong></p>
+                                                    <div class="row">
+                                                        @foreach ($item->prompts as $prompt)
+                                                            <span class="badge" style="font-size:95%; background-color: #fefcf6; margin:5px;">
+                                                                <a href="{{ $prompt->url }}">
+                                                                    {{ $prompt->name }}
+                                                                </a>
+                                                            </span>
+                                                        @endforeach
+                                                    </div>
+                                                </div>
+                                            @endif
                                         </div>
                                     @endif
-                                </div>
                                 @endif
-                            @endif
+                            </div>
                         </div>
                     </div>
                 </div>
             </div>
         </div>
+        <div class="col-sm">
+        </div>
     </div>
-    <div class="col-sm">
-    </div>
-</div>
 @endsection
diff --git a/resources/views/world/items.blade.php b/resources/views/world/items.blade.php
index f0f37379c9..8dbc06b65f 100644
--- a/resources/views/world/items.blade.php
+++ b/resources/views/world/items.blade.php
@@ -1,13 +1,15 @@
 @extends('world.layout')
 
-@section('title') Items @endsection
+@section('world-title')
+    Items
+@endsection
 
 @section('content')
-{!! breadcrumbs(['World' => 'world', 'Items' => 'world/items']) !!}
-<h1>Items</h1>
+    {!! breadcrumbs(['World' => 'world', 'Items' => 'world/items']) !!}
+    <h1>Items</h1>
 
-<div>
-    {!! Form::open(['method' => 'GET', 'class' => '']) !!}
+    <div>
+        {!! Form::open(['method' => 'GET', 'class' => '']) !!}
         <div class="form-inline justify-content-end">
             <div class="form-group ml-3 mb-3">
                 {!! Form::text('name', Request::get('name'), ['class' => 'form-control', 'placeholder' => 'Name']) !!}
@@ -15,7 +17,7 @@
             <div class="form-group ml-3 mb-3">
                 {!! Form::select('item_category_id', $categories, Request::get('item_category_id'), ['class' => 'form-control']) !!}
             </div>
-            @if(Config::get('lorekeeper.extensions.item_entry_expansion.extra_fields'))
+            @if (config('lorekeeper.extensions.item_entry_expansion.extra_fields'))
                 <div class="form-group ml-3 mb-3">
                     {!! Form::select('artist', $artists, Request::get('artist'), ['class' => 'form-control']) !!}
                 </div>
@@ -23,34 +25,45 @@
         </div>
         <div class="form-inline justify-content-end">
             <div class="form-group ml-3 mb-3">
-                {!! Form::select('sort', [
-                    'alpha'          => 'Sort Alphabetically (A-Z)',
-                    'alpha-reverse'  => 'Sort Alphabetically (Z-A)',
-                    'category'       => 'Sort by Category',
-                    'newest'         => 'Newest First',
-                    'oldest'         => 'Oldest First'
-                ], Request::get('sort') ? : 'category', ['class' => 'form-control']) !!}
+                {!! Form::select(
+                    'sort',
+                    [
+                        'alpha' => 'Sort Alphabetically (A-Z)',
+                        'alpha-reverse' => 'Sort Alphabetically (Z-A)',
+                        'category' => 'Sort by Category',
+                        'newest' => 'Newest First',
+                        'oldest' => 'Oldest First',
+                    ],
+                    Request::get('sort') ?: 'category',
+                    ['class' => 'form-control'],
+                ) !!}
             </div>
             <div class="form-group ml-3 mb-3">
                 {!! Form::submit('Search', ['class' => 'btn btn-primary']) !!}
             </div>
         </div>
-    {!! Form::close() !!}
-</div>
-
-{!! $items->render() !!}
-@foreach($items as $item)
-    <div class="card mb-3">
-        <div class="card-body">
-        <?php
-        $shops = App\Models\Shop\Shop::whereIn('id', App\Models\Shop\ShopStock::where('item_id', $item->id)->pluck('shop_id')->toArray())->orderBy('sort', 'DESC')->get();
-        ?>
-        @include('world._item_entry', ['imageUrl' => $item->imageUrl, 'name' => $item->displayName, 'description' => $item->parsed_description, 'idUrl' => $item->idUrl, 'shops' => $shops])
-        </div>
+        {!! Form::close() !!}
     </div>
-@endforeach
-{!! $items->render() !!}
 
-<div class="text-center mt-4 small text-muted">{{ $items->total() }} result{{ $items->total() == 1 ? '' : 's' }} found.</div>
+    {!! $items->render() !!}
+    @foreach ($items as $item)
+        <div class="card mb-3">
+            <div class="card-body">
+                <?php
+                $shops = App\Models\Shop\Shop::whereIn(
+                    'id',
+                    App\Models\Shop\ShopStock::where('item_id', $item->id)
+                        ->pluck('shop_id')
+                        ->toArray(),
+                )
+                    ->orderBy('sort', 'DESC')
+                    ->get();
+                ?>
+                @include('world._item_entry', ['imageUrl' => $item->imageUrl, 'name' => $item->displayName, 'description' => $item->parsed_description, 'idUrl' => $item->idUrl, 'shops' => $shops])
+            </div>
+        </div>
+    @endforeach
+    {!! $items->render() !!}
 
+    <div class="text-center mt-4 small text-muted">{{ $items->total() }} result{{ $items->total() == 1 ? '' : 's' }} found.</div>
 @endsection
diff --git a/resources/views/world/layout.blade.php b/resources/views/world/layout.blade.php
index 16ef1db6a5..7140e7b70c 100644
--- a/resources/views/world/layout.blade.php
+++ b/resources/views/world/layout.blade.php
@@ -1,7 +1,7 @@
 @extends('layouts.app')
 
-@section('title') 
-    World :: 
+@section('title')
+    World ::
     @yield('world-title')
 @endsection
 
@@ -14,5 +14,5 @@
 @endsection
 
 @section('scripts')
-@parent
-@endsection
\ No newline at end of file
+    @parent
+@endsection
diff --git a/resources/views/world/prompt_categories.blade.php b/resources/views/world/prompt_categories.blade.php
deleted file mode 100644
index 734dcb50d5..0000000000
--- a/resources/views/world/prompt_categories.blade.php
+++ /dev/null
@@ -1,32 +0,0 @@
-@extends('world.layout')
-
-@section('title') Prompt Categories @endsection
-
-@section('content')
-{!! breadcrumbs(['World' => 'world', 'Prompt Categories' => 'world/prompt-categories']) !!}
-<h1>Prompt Categories</h1>
-
-<div>
-    {!! Form::open(['method' => 'GET', 'class' => 'form-inline justify-content-end']) !!}
-        <div class="form-group mr-3 mb-3">
-            {!! Form::text('name', Request::get('name'), ['class' => 'form-control']) !!}
-        </div>
-        <div class="form-group mb-3">
-            {!! Form::submit('Search', ['class' => 'btn btn-primary']) !!}
-        </div>
-    {!! Form::close() !!}
-</div>
-
-{!! $categories->render() !!}
-@foreach($categories as $category)
-    <div class="card mb-3">
-        <div class="card-body">
-        @include('world._entry', ['imageUrl' => $category->categoryImageUrl, 'name' => $category->displayName, 'description' => $category->parsed_description, 'searchUrl' => $category->searchUrl])
-        </div>
-    </div>
-@endforeach
-{!! $categories->render() !!}
-
-<div class="text-center mt-4 small text-muted">{{ $categories->total() }} result{{ $categories->total() == 1 ? '' : 's' }} found.</div>
-
-@endsection
diff --git a/resources/views/world/prompts.blade.php b/resources/views/world/prompts.blade.php
deleted file mode 100644
index a831d212b5..0000000000
--- a/resources/views/world/prompts.blade.php
+++ /dev/null
@@ -1,52 +0,0 @@
-@extends('world.layout')
-
-@section('title') Prompts @endsection
-
-@section('content')
-{!! breadcrumbs(['World' => 'world', 'Prompts' => 'world/prompts']) !!}
-<h1>Prompts</h1>
-
-<div>
-    {!! Form::open(['method' => 'GET', 'class' => '']) !!}
-        <div class="form-inline justify-content-end">
-            <div class="form-group ml-3 mb-3">
-                {!! Form::text('name', Request::get('name'), ['class' => 'form-control', 'placeholder' => 'Name']) !!}
-            </div>
-            <div class="form-group ml-3 mb-3">
-                {!! Form::select('prompt_category_id', $categories, Request::get('name'), ['class' => 'form-control']) !!}
-            </div>
-        </div>
-        <div class="form-inline justify-content-end">
-            <div class="form-group ml-3 mb-3">
-                {!! Form::select('sort', [
-                    'alpha'          => 'Sort Alphabetically (A-Z)',
-                    'alpha-reverse'  => 'Sort Alphabetically (Z-A)',
-                    'category'       => 'Sort by Category',
-                    'newest'         => 'Newest First',
-                    'oldest'         => 'Oldest First',
-                    'start'          => 'Starts Earliest',
-                    'start-reverse'  => 'Starts Latest',
-                    'end'            => 'Ends Earliest',
-                    'end-reverse'    => 'Ends Latest'      
-                ], Request::get('sort') ? : 'category', ['class' => 'form-control']) !!}
-            </div>
-            <div class="form-group ml-3 mb-3">
-                {!! Form::submit('Search', ['class' => 'btn btn-primary']) !!}
-            </div>
-        </div>
-    {!! Form::close() !!}
-</div>
-
-{!! $prompts->render() !!}
-@foreach($prompts as $prompt)
-    <div class="card mb-3">
-        <div class="card-body">
-            @include('world._prompt_entry', ['prompt' => $prompt])
-        </div>
-    </div>
-@endforeach
-{!! $prompts->render() !!}
-
-<div class="text-center mt-4 small text-muted">{{ $prompts->total() }} result{{ $prompts->total() == 1 ? '' : 's' }} found.</div>
-
-@endsection
diff --git a/resources/views/world/rarities.blade.php b/resources/views/world/rarities.blade.php
index 5d0935e4aa..bca0b179ec 100644
--- a/resources/views/world/rarities.blade.php
+++ b/resources/views/world/rarities.blade.php
@@ -1,32 +1,43 @@
 @extends('world.layout')
 
-@section('title') Rarities @endsection
+@section('world-title')
+    Rarities
+@endsection
 
 @section('content')
-{!! breadcrumbs(['World' => 'world', 'Rarities' => 'world/rarities']) !!}
-<h1>Rarities</h1>
+    {!! breadcrumbs(['World' => 'world', 'Rarities' => 'world/rarities']) !!}
+    <h1>Rarities</h1>
 
-<div>
-    {!! Form::open(['method' => 'GET', 'class' => 'form-inline justify-content-end']) !!}
+    <div>
+        {!! Form::open(['method' => 'GET', 'class' => 'form-inline justify-content-end']) !!}
         <div class="form-group mr-3 mb-3">
             {!! Form::text('name', Request::get('name'), ['class' => 'form-control']) !!}
         </div>
         <div class="form-group mb-3">
             {!! Form::submit('Search', ['class' => 'btn btn-primary']) !!}
         </div>
-    {!! Form::close() !!}
-</div>
-
-{!! $rarities->render() !!}
-@foreach($rarities as $rarity)
-    <div class="card mb-3">
-        <div class="card-body">
-        @include('world._rarity_entry', ['imageUrl' => $rarity->rarityImageUrl, 'name' => $rarity->displayName, 'description' => $rarity->parsed_description, 'searchFeaturesUrl' => $rarity->searchFeaturesUrl, 'searchCharactersUrl' => $rarity->searchCharactersUrl])
-        </div>
+        {!! Form::close() !!}
     </div>
-@endforeach
-{!! $rarities->render() !!}
 
-<div class="text-center mt-4 small text-muted">{{ $rarities->total() }} result{{ $rarities->total() == 1 ? '' : 's' }} found.</div>
+    {!! $rarities->render() !!}
+    @foreach ($rarities as $rarity)
+        <div class="card mb-3">
+            <div class="card-body">
+                @include('world._rarity_entry', [
+                    'edit' => [
+                        'object' => $rarity,
+                        'title' => 'Rarity',
+                    ],
+                    'imageUrl' => $rarity->rarityImageUrl,
+                    'name' => $rarity->displayName,
+                    'description' => $rarity->parsed_description,
+                    'searchFeaturesUrl' => $rarity->searchFeaturesUrl,
+                    'searchCharactersUrl' => $rarity->searchCharactersUrl,
+                ])
+            </div>
+        </div>
+    @endforeach
+    {!! $rarities->render() !!}
 
+    <div class="text-center mt-4 small text-muted">{{ $rarities->total() }} result{{ $rarities->total() == 1 ? '' : 's' }} found.</div>
 @endsection
diff --git a/resources/views/world/species_features.blade.php b/resources/views/world/species_features.blade.php
index cbe5e2f606..3d05723f02 100644
--- a/resources/views/world/species_features.blade.php
+++ b/resources/views/world/species_features.blade.php
@@ -1,40 +1,63 @@
 @extends('world.layout')
 
-@section('title') {{ $species->name }} Traits @endsection
+@section('world-title')
+    {{ $species->name }} Traits
+@endsection
 
 @section('content')
-{!! breadcrumbs(['World' => 'world', 'Species' => 'world/species', $species->name => $species->url, 'Traits' => 'world/species/'.$species->id.'traits']) !!}
-<h1>{{ $species->name }} Traits</h1>
+    {!! breadcrumbs(['World' => 'world', 'Species' => 'world/species', $species->name => $species->url, 'Traits' => 'world/species/' . $species->id . 'traits']) !!}
+    <h1>{{ $species->name }} Traits</h1>
 
-<p>This is a visual index of all {!! $species->displayName !!}-specific traits. Click a trait to view more info on it!</p>
+    <p>This is a visual index of all {!! $species->displayName !!}-specific traits. Click a trait to view more info on it!</p>
 
-@foreach($features as $categoryId=>$categoryFeatures)
-    <div class="card mb-3 inventory-category">
-        <h5 class="card-header inventory-header">
-            {!! isset($categories[$categoryId]) ? '<a href="'.$categories[$categoryId]->searchUrl.'">'.$categories[$categoryId]->name.'</a>' : 'Miscellaneous' !!}
-        </h5>
-        <div class="card-body inventory-body">
-            @foreach($categoryFeatures->chunk(4) as $chunk)
-                <div class="row mb-3">
-                    @foreach($chunk as $featureId=>$feature)
-                        <div class="col-sm-3 col-6 text-center align-self-center inventory-item">
-                            @if($feature->first()->has_image)
-                                <a class="badge" style="border-radius:.5em; {{ $feature->first()->rarity->color ? 'background-color:#'.$feature->first()->rarity->color : '' }}" href="{{ $feature->first()->url }}">
-                                    <img class="my-1" style="max-height:100%; height:150px; border-radius:.5em;" src="{{ $feature->first()->imageUrl }}" alt="{{ $feature->first()->name }}" />
-                                </a>
-                            @endif
-                            <p>
-                                {!! $feature->first()->displayName !!}
-                            @if($feature->first()->subtype)
-                                <br/>({!! $feature->first()->subtype->displayName !!} Subtype)
-                            @endif
-                            </p>
+    @foreach ($features as $categoryId => $categoryFeatures)
+        @if (!isset($categories[$categoryId]) || (Auth::check() && Auth::user()->hasPower('edit_data')) || $categories[$categoryId]->is_visible)
+            <div class="card mb-3 inventory-category">
+                <h5 class="card-header inventory-header">
+                    @if (isset($categories[$categoryId]) && !$categories[$categoryId]->is_visible)
+                        <i class="fas fa-eye-slash mr-1"></i>
+                    @endif
+                    {!! isset($categories[$categoryId]) ? '<a href="' . $categories[$categoryId]->searchUrl . '">' . $categories[$categoryId]->name . '</a>' : 'Miscellaneous' !!}
+                </h5>
+                <div class="card-body inventory-body">
+                    @foreach ($categoryFeatures->chunk(4) as $chunk)
+                        <div class="row mb-3">
+                            @foreach ($chunk as $featureId => $feature)
+                                <div class="col-md-3 col-6 text-center align-self-center inventory-item">
+                                    @if ($feature->first()->has_image)
+                                        <a class="badge" style="border-radius:.5em; {{ $feature->first()->rarity->color ? 'background-color:#' . $feature->first()->rarity->color : '' }}" href="{{ $feature->first()->url }}">
+                                            <img class="my-1 modal-image" style="max-height:150px; border-radius:.5em;" src="{{ $feature->first()->imageUrl }}" alt="{{ $feature->first()->name }}" data-id="{{ $feature->first()->id }}" />
+                                        </a>
+                                    @endif
+                                    <p>
+                                        @if (!$feature->first()->is_visible)
+                                            <i class="fas fa-eye-slash mr-1"></i>
+                                        @endif
+                                        {!! $feature->first()->displayName !!}
+                                        @if ($feature->first()->subtype)
+                                            <br />({!! $feature->first()->subtype->displayName !!} Subtype)
+                                        @endif
+                                    </p>
+                                </div>
+                            @endforeach
                         </div>
                     @endforeach
                 </div>
-            @endforeach
-        </div>
-    </div>
-@endforeach
+            </div>
+        @endif
+    @endforeach
+@endsection
+
+@section('scripts')
+    @if (config('lorekeeper.extensions.species_trait_index.trait_modals'))
+        <script>
+            $(document).ready(function() {
+                $('.modal-image').on('click', function(e) {
+                    e.preventDefault();
 
+                    loadModal("{{ url('world/species/' . $species->id . '/trait') }}/" + $(this).data('id'), 'Trait Detail');
+                });
+            })
+        </script>
+    @endif
 @endsection
diff --git a/resources/views/world/specieses.blade.php b/resources/views/world/specieses.blade.php
index 647d8632e2..549bd9af00 100644
--- a/resources/views/world/specieses.blade.php
+++ b/resources/views/world/specieses.blade.php
@@ -1,32 +1,33 @@
 @extends('world.layout')
 
-@section('title') Species @endsection
+@section('world-title')
+    Species
+@endsection
 
 @section('content')
-{!! breadcrumbs(['World' => 'world', 'Species' => 'world/species']) !!}
-<h1>Species</h1>
+    {!! breadcrumbs(['World' => 'world', 'Species' => 'world/species']) !!}
+    <h1>Species</h1>
 
-<div>
-    {!! Form::open(['method' => 'GET', 'class' => 'form-inline justify-content-end']) !!}
+    <div>
+        {!! Form::open(['method' => 'GET', 'class' => 'form-inline justify-content-end']) !!}
         <div class="form-group mr-3 mb-3">
             {!! Form::text('name', Request::get('name'), ['class' => 'form-control']) !!}
         </div>
         <div class="form-group mb-3">
             {!! Form::submit('Search', ['class' => 'btn btn-primary']) !!}
         </div>
-    {!! Form::close() !!}
-</div>
-
-{!! $specieses->render() !!}
-@foreach($specieses as $species)
-    <div class="card mb-3">
-        <div class="card-body">
-        @include('world._species_entry', ['species' => $species])
-        </div>
+        {!! Form::close() !!}
     </div>
-@endforeach
-{!! $specieses->render() !!}
 
-<div class="text-center mt-4 small text-muted">{{ $specieses->total() }} result{{ $specieses->total() == 1 ? '' : 's' }} found.</div>
+    {!! $specieses->render() !!}
+    @foreach ($specieses as $species)
+        <div class="card mb-3">
+            <div class="card-body">
+                @include('world._species_entry', ['species' => $species])
+            </div>
+        </div>
+    @endforeach
+    {!! $specieses->render() !!}
 
+    <div class="text-center mt-4 small text-muted">{{ $specieses->total() }} result{{ $specieses->total() == 1 ? '' : 's' }} found.</div>
 @endsection
diff --git a/resources/views/world/subtypes.blade.php b/resources/views/world/subtypes.blade.php
index 4b69140ffe..0f2df2ab32 100644
--- a/resources/views/world/subtypes.blade.php
+++ b/resources/views/world/subtypes.blade.php
@@ -1,32 +1,33 @@
 @extends('world.layout')
 
-@section('title') Subtypes @endsection
+@section('world-title')
+    Subtypes
+@endsection
 
 @section('content')
-{!! breadcrumbs(['World' => 'world', 'Subtypes' => 'world/subtypes']) !!}
-<h1>Subtypes</h1>
+    {!! breadcrumbs(['World' => 'world', 'Subtypes' => 'world/subtypes']) !!}
+    <h1>Subtypes</h1>
 
-<div>
-    {!! Form::open(['method' => 'GET', 'class' => 'form-inline justify-content-end']) !!}
+    <div>
+        {!! Form::open(['method' => 'GET', 'class' => 'form-inline justify-content-end']) !!}
         <div class="form-group mr-3 mb-3">
             {!! Form::text('name', Request::get('name'), ['class' => 'form-control']) !!}
         </div>
         <div class="form-group mb-3">
             {!! Form::submit('Search', ['class' => 'btn btn-primary']) !!}
         </div>
-    {!! Form::close() !!}
-</div>
-
-{!! $subtypes->render() !!}
-@foreach($subtypes as $subtype)
-    <div class="card mb-3">
-        <div class="card-body">
-            @include('world._subtype_entry', ['subtype' => $subtype])
-        </div>
+        {!! Form::close() !!}
     </div>
-@endforeach
-{!! $subtypes->render() !!}
 
-<div class="text-center mt-4 small text-muted">{{ $subtypes->total() }} result{{ $subtypes->total() == 1 ? '' : 's' }} found.</div>
+    {!! $subtypes->render() !!}
+    @foreach ($subtypes as $subtype)
+        <div class="card mb-3">
+            <div class="card-body">
+                @include('world._subtype_entry', ['subtype' => $subtype])
+            </div>
+        </div>
+    @endforeach
+    {!! $subtypes->render() !!}
 
+    <div class="text-center mt-4 small text-muted">{{ $subtypes->total() }} result{{ $subtypes->total() == 1 ? '' : 's' }} found.</div>
 @endsection
diff --git a/routes/fortify.php b/routes/fortify.php
new file mode 100644
index 0000000000..e3711290ee
--- /dev/null
+++ b/routes/fortify.php
@@ -0,0 +1,147 @@
+<?php
+
+use Illuminate\Support\Facades\Route;
+use Laravel\Fortify\Features;
+use Laravel\Fortify\Http\Controllers\AuthenticatedSessionController;
+use Laravel\Fortify\Http\Controllers\ConfirmablePasswordController;
+use Laravel\Fortify\Http\Controllers\ConfirmedPasswordStatusController;
+use Laravel\Fortify\Http\Controllers\EmailVerificationNotificationController;
+use Laravel\Fortify\Http\Controllers\EmailVerificationPromptController;
+use Laravel\Fortify\Http\Controllers\NewPasswordController;
+use Laravel\Fortify\Http\Controllers\PasswordController;
+use Laravel\Fortify\Http\Controllers\PasswordResetLinkController;
+use Laravel\Fortify\Http\Controllers\ProfileInformationController;
+use Laravel\Fortify\Http\Controllers\RecoveryCodeController;
+use Laravel\Fortify\Http\Controllers\RegisteredUserController;
+use Laravel\Fortify\Http\Controllers\TwoFactorAuthenticatedSessionController;
+use Laravel\Fortify\Http\Controllers\TwoFactorQrCodeController;
+use Laravel\Fortify\Http\Controllers\VerifyEmailController;
+
+Route::group(['middleware' => config('fortify.middleware', ['web'])], function () {
+    $enableViews = config('fortify.views', true);
+
+    // Authentication...
+    if ($enableViews) {
+        Route::get('/login', [AuthenticatedSessionController::class, 'create'])
+            ->middleware(['guest'])
+            ->name('login');
+    }
+
+    $limiter = config('fortify.limiters.login');
+    $twoFactorLimiter = config('fortify.limiters.two-factor');
+
+    Route::post('/login', [AuthenticatedSessionController::class, 'store'])
+        ->middleware(array_filter([
+            'guest',
+            $limiter ? 'throttle:'.$limiter : null,
+        ]));
+
+    Route::post('/logout', [AuthenticatedSessionController::class, 'destroy'])
+        ->name('logout');
+
+    // Password Reset...
+    if (Features::enabled(Features::resetPasswords())) {
+        if ($enableViews) {
+            Route::get('/forgot-password', [PasswordResetLinkController::class, 'create'])
+                ->middleware(['guest'])
+                ->name('password.request');
+
+            Route::get('/reset-password/{token}', [NewPasswordController::class, 'create'])
+                ->middleware(['guest'])
+                ->name('password.reset');
+        }
+
+        Route::post('/forgot-password', [PasswordResetLinkController::class, 'store'])
+            ->middleware(['guest'])
+            ->name('password.email');
+
+        Route::post('/reset-password', [NewPasswordController::class, 'store'])
+            ->middleware(['guest'])
+            ->name('password.update');
+    }
+
+    // Registration...
+    if (Features::enabled(Features::registration())) {
+        if ($enableViews) {
+            Route::get('/register', [RegisteredUserController::class, 'create'])
+                ->middleware(['guest'])
+                ->name('register');
+        }
+
+        Route::post('/register', [RegisteredUserController::class, 'store'])
+            ->middleware(['guest']);
+    }
+
+    // Email Verification...
+    if (Features::enabled(Features::emailVerification())) {
+        if ($enableViews) {
+            Route::get('/email/verify', [EmailVerificationPromptController::class, '__invoke'])
+                ->middleware(['auth'])
+                ->name('verification.notice');
+        }
+
+        Route::get('/email/verify/{id}/{hash}', [VerifyEmailController::class, '__invoke'])
+            ->middleware(['auth', 'signed', 'throttle:6,1'])
+            ->name('verification.verify');
+
+        Route::post('/email/verification-notification', [EmailVerificationNotificationController::class, 'store'])
+            ->middleware(['auth', 'throttle:6,1'])
+            ->name('verification.send');
+    }
+
+    // Profile Information...
+    if (Features::enabled(Features::updateProfileInformation())) {
+        Route::put('/user/profile-information', [ProfileInformationController::class, 'update'])
+            ->middleware(['auth'])
+            ->name('user-profile-information.update');
+    }
+
+    // Passwords...
+    if (Features::enabled(Features::updatePasswords())) {
+        Route::put('/user/password', [PasswordController::class, 'update'])
+            ->middleware(['auth'])
+            ->name('user-password.update');
+    }
+
+    // Password Confirmation...
+    if ($enableViews) {
+        Route::get('/user/confirm-password', [ConfirmablePasswordController::class, 'show'])
+            ->middleware(['auth'])
+            ->name('password.confirm');
+    }
+
+    Route::get('/user/confirmed-password-status', [ConfirmedPasswordStatusController::class, 'show'])
+        ->middleware(['auth'])
+        ->name('password.confirmation');
+
+    Route::post('/user/confirm-password', [ConfirmablePasswordController::class, 'store'])
+        ->middleware(['auth']);
+
+    // Two Factor Authentication...
+    if (Features::enabled(Features::twoFactorAuthentication())) {
+        if ($enableViews) {
+            Route::get('/two-factor-challenge', [TwoFactorAuthenticatedSessionController::class, 'create'])
+                ->middleware(['guest'])
+                ->name('two-factor.login');
+        }
+
+        Route::post('/two-factor-challenge', [TwoFactorAuthenticatedSessionController::class, 'store'])
+            ->middleware(array_filter([
+                'guest',
+                $twoFactorLimiter ? 'throttle:'.$twoFactorLimiter : null,
+            ]));
+
+        $twoFactorMiddleware = Features::optionEnabled(Features::twoFactorAuthentication(), 'confirmPassword')
+            ? ['auth', 'password.confirm']
+            : ['auth'];
+
+        Route::get('/user/two-factor-qr-code', [TwoFactorQrCodeController::class, 'show'])
+            ->middleware($twoFactorMiddleware);
+
+        Route::get('/user/two-factor-recovery-codes', [RecoveryCodeController::class, 'index'])
+            ->middleware($twoFactorMiddleware);
+
+        Route::post('/user/two-factor-recovery-codes', [RecoveryCodeController::class, 'store'])
+            ->middleware($twoFactorMiddleware);
+    }
+});
diff --git a/routes/lorekeeper/admin.php b/routes/lorekeeper/admin.php
index d1050e4604..1dde34f6c5 100644
--- a/routes/lorekeeper/admin.php
+++ b/routes/lorekeeper/admin.php
@@ -11,10 +11,15 @@
 
 Route::get('/', 'HomeController@getIndex');
 
-Route::group(['prefix' => 'users', 'namespace' => 'Users'], function() {
+Route::get('logs', 'HomeController@getLogs');
+Route::group(['middleware' => 'admin'], function () {
+    Route::get('staff-reward-settings', 'HomeController@getStaffRewardSettings');
+    Route::post('staff-reward-settings/{key}', 'HomeController@postEditStaffRewardSetting');
+});
 
-    # USER LIST
-    Route::group(['middleware' => 'power:edit_user_info'], function() {
+Route::group(['prefix' => 'users', 'namespace' => 'Users'], function () {
+    // USER LIST
+    Route::group(['middleware' => 'power:edit_user_info'], function () {
         Route::get('/', 'UserController@getIndex');
 
         Route::get('{name}/edit', 'UserController@getUser');
@@ -23,15 +28,22 @@
         Route::post('{name}/account', 'UserController@postUserAccount');
         Route::post('{name}/birthday', 'UserController@postUserBirthday');
         Route::get('{name}/updates', 'UserController@getUserUpdates');
+
         Route::get('{name}/ban', 'UserController@getBan');
         Route::get('{name}/ban-confirm', 'UserController@getBanConfirmation');
         Route::post('{name}/ban', 'UserController@postBan');
         Route::get('{name}/unban-confirm', 'UserController@getUnbanConfirmation');
         Route::post('{name}/unban', 'UserController@postUnban');
+
+        Route::get('{name}/deactivate', 'UserController@getDeactivate');
+        Route::get('{name}/deactivate-confirm', 'UserController@getDeactivateConfirmation');
+        Route::post('{name}/deactivate', 'UserController@postDeactivate');
+        Route::get('{name}/reactivate-confirm', 'UserController@getReactivateConfirmation');
+        Route::post('{name}/reactivate', 'UserController@postReactivate');
     });
 
-    # RANKS
-    Route::group(['middleware' => 'admin'], function() {
+    // RANKS
+    Route::group(['middleware' => 'admin'], function () {
         Route::get('ranks', 'RankController@getIndex');
         Route::get('ranks/create', 'RankController@getCreateRank');
         Route::get('ranks/edit/{id}', 'RankController@getEditRank');
@@ -43,16 +55,16 @@
     });
 });
 
-# SETTINGS
-Route::group(['prefix' => 'invitations', 'middleware' => 'power:edit_site_settings'], function() {
+// SETTINGS
+Route::group(['prefix' => 'invitations', 'middleware' => 'power:edit_site_settings'], function () {
     Route::get('/', 'InvitationController@getIndex');
 
     Route::post('create', 'InvitationController@postGenerateKey');
     Route::post('delete/{id}', 'InvitationController@postDeleteKey');
 });
 
-# FILE MANAGER
-Route::group(['prefix' => 'files', 'middleware' => 'power:edit_site_settings'], function() {
+// FILE MANAGER
+Route::group(['prefix' => 'files', 'middleware' => 'power:edit_site_settings'], function () {
     Route::get('/{folder?}', 'FileController@getIndex');
 
     Route::post('upload', 'FileController@postUploadFile');
@@ -64,8 +76,8 @@
     Route::post('folder/rename', 'FileController@postRenameFolder');
 });
 
-# SITE IMAGES
-Route::group(['prefix' => 'images', 'middleware' => 'power:edit_site_settings'], function() {
+// SITE IMAGES
+Route::group(['prefix' => 'images', 'middleware' => 'power:edit_site_settings'], function () {
     Route::get('/', 'FileController@getSiteImages');
 
     Route::post('upload/css', 'FileController@postUploadCss');
@@ -73,10 +85,9 @@
     Route::post('reset', 'FileController@postResetFile');
 });
 
-# DATA
-Route::group(['prefix' => 'data', 'namespace' => 'Data', 'middleware' => 'power:edit_data'], function() {
-
-    # GALLERIES
+// DATA
+Route::group(['prefix' => 'data', 'namespace' => 'Data', 'middleware' => 'power:edit_data'], function () {
+    // GALLERIES
     Route::get('galleries', 'GalleryController@getIndex');
     Route::get('galleries/create', 'GalleryController@getCreateGallery');
     Route::get('galleries/edit/{id}', 'GalleryController@getEditGallery');
@@ -86,7 +97,7 @@
     Route::post('galleries/delete/{id}', 'GalleryController@postDeleteGallery');
     Route::post('galleries/sort', 'GalleryController@postSortGallery');
 
-    # CURRENCIES
+    // CURRENCIES
     Route::get('currencies', 'CurrencyController@getIndex');
     Route::get('currencies/sort', 'CurrencyController@getSort');
     Route::get('currencies/create', 'CurrencyController@getCreateCurrency');
@@ -97,7 +108,7 @@
     Route::post('currencies/delete/{id}', 'CurrencyController@postDeleteCurrency');
     Route::post('currencies/sort/{type}', 'CurrencyController@postSortCurrency')->where('type', 'user|character');
 
-    # RARITIES
+    // RARITIES
     Route::get('rarities', 'RarityController@getIndex');
     Route::get('rarities/create', 'RarityController@getCreateRarity');
     Route::get('rarities/edit/{id}', 'RarityController@getEditRarity');
@@ -117,7 +128,7 @@
     Route::post('character-titles/delete/{id}', 'CharacterTitleController@postDeleteTitle');
     Route::post('character-titles/sort', 'CharacterTitleController@postSortTitle');
 
-    # SPECIES
+    // SPECIES
     Route::get('species', 'SpeciesController@getIndex');
     Route::get('species/create', 'SpeciesController@getCreateSpecies');
     Route::get('species/edit/{id}', 'SpeciesController@getEditSpecies');
@@ -135,7 +146,7 @@
     Route::post('subtypes/delete/{id}', 'SpeciesController@postDeleteSubtype');
     Route::post('subtypes/sort', 'SpeciesController@postSortSubtypes');
 
-    # ITEMS
+    // ITEMS
     Route::get('item-categories', 'ItemController@getIndex');
     Route::get('item-categories/create', 'ItemController@getCreateItemCategory');
     Route::get('item-categories/edit/{id}', 'ItemController@getEditItemCategory');
@@ -160,7 +171,7 @@
     Route::get('items/tag/{id}', 'ItemController@getAddItemTag');
     Route::post('items/tag/{id}', 'ItemController@postAddItemTag');
 
-    # SHOPS
+    // SHOPS
     Route::get('shops', 'ShopController@getIndex');
     Route::get('shops/create', 'ShopController@getCreateShop');
     Route::get('shops/edit/{id}', 'ShopController@getEditShop');
@@ -171,7 +182,7 @@
     Route::post('shops/delete/{id}', 'ShopController@postDeleteShop');
     Route::post('shops/sort', 'ShopController@postSortShop');
 
-    # FEATURES (TRAITS)
+    // FEATURES (TRAITS)
     Route::get('trait-categories', 'FeatureController@getIndex');
     Route::get('trait-categories/create', 'FeatureController@getCreateFeatureCategory');
     Route::get('trait-categories/edit/{id}', 'FeatureController@getEditFeatureCategory');
@@ -185,11 +196,12 @@
     Route::get('traits/create', 'FeatureController@getCreateFeature');
     Route::get('traits/edit/{id}', 'FeatureController@getEditFeature');
     Route::get('traits/delete/{id}', 'FeatureController@getDeleteFeature');
+    Route::get('traits/check-subtype', 'FeatureController@getCreateEditFeatureSubtype');
     Route::post('traits/create', 'FeatureController@postCreateEditFeature');
     Route::post('traits/edit/{id?}', 'FeatureController@postCreateEditFeature');
     Route::post('traits/delete/{id}', 'FeatureController@postDeleteFeature');
 
-    # CHARACTER CATEGORIES
+    // CHARACTER CATEGORIES
     Route::get('character-categories', 'CharacterCategoryController@getIndex');
     Route::get('character-categories/create', 'CharacterCategoryController@getCreateCharacterCategory');
     Route::get('character-categories/edit/{id}', 'CharacterCategoryController@getEditCharacterCategory');
@@ -199,7 +211,7 @@
     Route::post('character-categories/delete/{id}', 'CharacterCategoryController@postDeleteCharacterCategory');
     Route::post('character-categories/sort', 'CharacterCategoryController@postSortCharacterCategory');
 
-    # SUB MASTERLISTS
+    // SUB MASTERLISTS
     Route::get('sublists', 'SublistController@getIndex');
     Route::get('sublists/create', 'SublistController@getCreateSublist');
     Route::get('sublists/edit/{id}', 'SublistController@getEditSublist');
@@ -209,7 +221,7 @@
     Route::post('sublists/delete/{id}', 'SublistController@postDeleteSublist');
     Route::post('sublists/sort', 'SublistController@postSortSublist');
 
-    # LOOT TABLES
+    // LOOT TABLES
     Route::get('loot-tables', 'LootTableController@getIndex');
     Route::get('loot-tables/create', 'LootTableController@getCreateLootTable');
     Route::get('loot-tables/edit/{id}', 'LootTableController@getEditLootTable');
@@ -219,7 +231,7 @@
     Route::post('loot-tables/edit/{id?}', 'LootTableController@postCreateEditLootTable');
     Route::post('loot-tables/delete/{id}', 'LootTableController@postDeleteLootTable');
 
-    # PROMPTS
+    // PROMPTS
     Route::get('prompt-categories', 'PromptController@getIndex');
     Route::get('prompt-categories/create', 'PromptController@getCreatePromptCategory');
     Route::get('prompt-categories/edit/{id}', 'PromptController@getEditPromptCategory');
@@ -238,10 +250,8 @@
     Route::post('prompts/delete/{id}', 'PromptController@postDeletePrompt');
 });
 
-
-# PAGES
-Route::group(['prefix' => 'pages', 'middleware' => 'power:edit_pages'], function() {
-
+// PAGES
+Route::group(['prefix' => 'pages', 'middleware' => 'power:edit_pages'], function () {
     Route::get('/', 'PageController@getIndex');
     Route::get('create', 'PageController@getCreatePage');
     Route::get('edit/{id}', 'PageController@getEditPage');
@@ -251,10 +261,8 @@
     Route::post('delete/{id}', 'PageController@postDeletePage');
 });
 
-
-# NEWS
-Route::group(['prefix' => 'news', 'middleware' => 'power:edit_pages'], function() {
-
+// NEWS
+Route::group(['prefix' => 'news', 'middleware' => 'power:manage_news'], function () {
     Route::get('/', 'NewsController@getIndex');
     Route::get('create', 'NewsController@getCreateNews');
     Route::get('edit/{id}', 'NewsController@getEditNews');
@@ -264,9 +272,8 @@
     Route::post('delete/{id}', 'NewsController@postDeleteNews');
 });
 
-# SALES
-Route::group(['prefix' => 'sales', 'middleware' => 'power:edit_pages'], function() {
-
+// SALES
+Route::group(['prefix' => 'sales', 'middleware' => 'power:manage_sales'], function () {
     Route::get('/', 'SalesController@getIndex');
     Route::get('create', 'SalesController@getCreateSales');
     Route::get('edit/{id}', 'SalesController@getEditSales');
@@ -278,14 +285,14 @@
     Route::get('character/{slug}', 'SalesController@getCharacterInfo');
 });
 
-# SITE SETTINGS
-Route::group(['prefix' => 'settings', 'middleware' => 'power:edit_site_settings'], function() {
+// SITE SETTINGS
+Route::group(['prefix' => 'settings', 'middleware' => 'power:edit_site_settings'], function () {
     Route::get('/', 'SettingsController@getIndex');
     Route::post('{key}', 'SettingsController@postEditSetting');
 });
 
-# GRANTS
-Route::group(['prefix' => 'grants', 'namespace' => 'Users', 'middleware' => 'power:edit_inventories'], function() {
+// GRANTS
+Route::group(['prefix' => 'grants', 'namespace' => 'Users', 'middleware' => 'power:edit_inventories'], function () {
     Route::get('user-currency', 'GrantController@getUserCurrency');
     Route::post('user-currency', 'GrantController@postUserCurrency');
 
@@ -295,9 +302,8 @@
     Route::get('item-search', 'GrantController@getItemSearch');
 });
 
-
-# MASTERLIST
-Route::group(['prefix' => 'masterlist', 'namespace' => 'Characters', 'middleware' => 'power:manage_characters'], function() {
+// MASTERLIST
+Route::group(['prefix' => 'masterlist', 'namespace' => 'Characters', 'middleware' => 'power:manage_characters'], function () {
     Route::get('create-character', 'CharacterController@getCreateCharacter');
     Route::post('create-character', 'CharacterController@postCreateCharacter');
 
@@ -318,13 +324,12 @@
 
     Route::get('check-subtype', 'CharacterController@getCreateCharacterMyoSubtype');
 });
-Route::group(['prefix' => 'character', 'namespace' => 'Characters', 'middleware' => 'power:edit_inventories'], function() {
+Route::group(['prefix' => 'character', 'namespace' => 'Characters', 'middleware' => 'power:edit_inventories'], function () {
     Route::post('{slug}/grant', 'GrantController@postCharacterCurrency');
     Route::post('{slug}/grant-items', 'GrantController@postCharacterItems');
 });
-Route::group(['prefix' => 'character', 'namespace' => 'Characters', 'middleware' => 'power:manage_characters'], function() {
-
-    # IMAGES
+Route::group(['prefix' => 'character', 'namespace' => 'Characters', 'middleware' => 'power:manage_characters'], function () {
+    // IMAGES
     Route::get('{slug}/image', 'CharacterImageController@getNewImage');
     Route::post('{slug}/image', 'CharacterImageController@postNewImage');
     Route::get('image/subtype', 'CharacterImageController@getNewImageSubtype');
@@ -352,7 +357,7 @@
 
     Route::post('{slug}/images/sort', 'CharacterImageController@postSortImages');
 
-    # CHARACTER
+    // CHARACTER
     Route::get('{slug}/stats', 'CharacterController@getEditCharacterStats');
     Route::post('{slug}/stats', 'CharacterController@postEditCharacterStats');
 
@@ -370,8 +375,8 @@
     Route::post('{slug}/transfer', 'CharacterController@postTransfer');
 });
 // Might rewrite these parts eventually so there's less code duplication...
-Route::group(['prefix' => 'myo', 'namespace' => 'Characters', 'middleware' => 'power:manage_characters'], function() {
-    # CHARACTER
+Route::group(['prefix' => 'myo', 'namespace' => 'Characters', 'middleware' => 'power:manage_characters'], function () {
+    // CHARACTER
     Route::get('{id}/stats', 'CharacterController@getEditMyoStats');
     Route::post('{id}/stats', 'CharacterController@postEditMyoStats');
 
@@ -389,8 +394,8 @@
     Route::post('{id}/transfer', 'CharacterController@postMyoTransfer');
 });
 
-# RAFFLES
-Route::group(['prefix' => 'raffles', 'middleware' => 'power:manage_raffles'], function() {
+// RAFFLES
+Route::group(['prefix' => 'raffles', 'middleware' => 'power:manage_raffles'], function () {
     Route::get('/', 'RaffleController@getRaffleIndex');
     Route::get('edit/group/{id?}', 'RaffleController@getCreateEditRaffleGroup');
     Route::post('edit/group/{id?}', 'RaffleController@postCreateEditRaffleGroup');
@@ -407,24 +412,24 @@
     Route::post('roll/group/{id}', 'RaffleController@postRollRaffleGroup');
 });
 
-# SUBMISSIONS
-Route::group(['prefix' => 'submissions', 'middleware' => 'power:manage_submissions'], function() {
+// SUBMISSIONS
+Route::group(['prefix' => 'submissions', 'middleware' => 'power:manage_submissions'], function () {
     Route::get('/', 'SubmissionController@getSubmissionIndex');
     Route::get('/{status}', 'SubmissionController@getSubmissionIndex')->where('status', 'pending|approved|rejected');
     Route::get('edit/{id}', 'SubmissionController@getSubmission');
-    Route::post('edit/{id}/{action}', 'SubmissionController@postSubmission')->where('action', 'approve|reject');
+    Route::post('edit/{id}/{action}', 'SubmissionController@postSubmission')->where('action', 'approve|reject|cancel');
 });
 
-# CLAIMS
-Route::group(['prefix' => 'claims', 'middleware' => 'power:manage_submissions'], function() {
+// CLAIMS
+Route::group(['prefix' => 'claims', 'middleware' => 'power:manage_submissions'], function () {
     Route::get('/', 'SubmissionController@getClaimIndex');
     Route::get('/{status}', 'SubmissionController@getClaimIndex')->where('status', 'pending|approved|rejected');
     Route::get('edit/{id}', 'SubmissionController@getClaim');
-    Route::post('edit/{id}/{action}', 'SubmissionController@postSubmission')->where('action', 'approve|reject');
+    Route::post('edit/{id}/{action}', 'SubmissionController@postSubmission')->where('action', 'approve|reject|cancel');
 });
 
-# SUBMISSIONS
-Route::group(['prefix' => 'gallery', 'middleware' => 'power:manage_submissions'], function() {
+// SUBMISSIONS
+Route::group(['prefix' => 'gallery', 'middleware' => 'power:manage_submissions'], function () {
     Route::get('/submissions', 'GalleryController@getSubmissionIndex');
     Route::get('/submissions/{status}', 'GalleryController@getSubmissionIndex')->where('status', 'pending|accepted|rejected');
     Route::get('/currency', 'GalleryController@getCurrencyIndex');
@@ -432,16 +437,16 @@
     Route::post('edit/{id}/{action}', 'GalleryController@postEditSubmission')->where('action', 'accept|reject|comment|move|value');
 });
 
-# REPORTS
-Route::group(['prefix' => 'reports', 'middleware' => 'power:manage_reports'], function() {
+// REPORTS
+Route::group(['prefix' => 'reports', 'middleware' => 'power:manage_reports'], function () {
     Route::get('/', 'ReportController@getReportIndex');
     Route::get('/{status}', 'ReportController@getReportIndex')->where('status', 'pending|assigned|assigned-to-me|closed');
     Route::get('edit/{id}', 'ReportController@getReport');
     Route::post('edit/{id}/{action}', 'ReportController@postReport')->where('action', 'assign|close');
 });
 
-# DESIGN APPROVALS
-Route::group(['prefix' => 'designs', 'middleware' => 'power:manage_characters'], function() {
+// DESIGN APPROVALS
+Route::group(['prefix' => 'designs', 'middleware' => 'power:manage_characters'], function () {
     Route::get('edit/{id}/{action}', 'DesignController@getDesignConfirmation')->where('action', 'cancel|approve|reject');
     Route::post('edit/{id}/{action}', 'DesignController@postDesign')->where('action', 'cancel|approve|reject');
     Route::post('vote/{id}/{action}', 'DesignController@postVote')->where('action', 'approve|reject');
diff --git a/routes/lorekeeper/browse.php b/routes/lorekeeper/browse.php
index 1f7919afd2..650605e83f 100644
--- a/routes/lorekeeper/browse.php
+++ b/routes/lorekeeper/browse.php
@@ -20,8 +20,8 @@
 /**************************************************************************************************
     News
 **************************************************************************************************/
-# PROFILES
-Route::group(['prefix' => 'news'], function() {
+// PROFILES
+Route::group(['prefix' => 'news'], function () {
     Route::get('/', 'NewsController@getIndex');
     Route::get('{id}.{slug?}', 'NewsController@getNews');
     Route::get('{id}.', 'NewsController@getNews');
@@ -30,8 +30,8 @@
 /**************************************************************************************************
     Sales
 **************************************************************************************************/
-# PROFILES
-Route::group(['prefix' => 'sales'], function() {
+// PROFILES
+Route::group(['prefix' => 'sales'], function () {
     Route::get('/', 'SalesController@getIndex');
     Route::get('{id}.{slug?}', 'SalesController@getSales');
     Route::get('{id}.', 'SalesController@getSales');
@@ -42,9 +42,10 @@
 **************************************************************************************************/
 Route::get('/users', 'BrowseController@getUsers');
 Route::get('/blacklist', 'BrowseController@getBlacklist');
+Route::get('/deactivated-list', 'BrowseController@getDeactivated');
 
-# PROFILES
-Route::group(['prefix' => 'user', 'namespace' => 'Users'], function() {
+// PROFILES
+Route::group(['prefix' => 'user', 'namespace' => 'Users'], function () {
     Route::get('{name}/gallery', 'UserController@getUserGallery');
     Route::get('{name}/favorites', 'UserController@getUserFavorites');
     Route::get('{name}/favorites/own-characters', 'UserController@getUserOwnCharacterFavorites');
@@ -69,7 +70,7 @@
 Route::get('/masterlist', 'BrowseController@getCharacters');
 Route::get('/myos', 'BrowseController@getMyos');
 Route::get('/sublist/{key}', 'BrowseController@getSublist');
-Route::group(['prefix' => 'character', 'namespace' => 'Characters'], function() {
+Route::group(['prefix' => 'character', 'namespace' => 'Characters'], function () {
     Route::get('{slug}', 'CharacterController@getCharacter');
     Route::get('{slug}/profile', 'CharacterController@getCharacterProfile');
     Route::get('{slug}/bank', 'CharacterController@getCharacterBank');
@@ -84,19 +85,18 @@
 
     Route::get('{slug}/gallery', 'CharacterController@getCharacterGallery');
 });
-Route::group(['prefix' => 'myo', 'namespace' => 'Characters'], function() {
+Route::group(['prefix' => 'myo', 'namespace' => 'Characters'], function () {
     Route::get('{id}', 'MyoController@getCharacter');
     Route::get('{id}/profile', 'MyoController@getCharacterProfile');
     Route::get('{id}/ownership', 'MyoController@getCharacterOwnershipLogs');
     Route::get('{id}/change-log', 'MyoController@getCharacterLogs');
 });
 
-
 /**************************************************************************************************
     World
 **************************************************************************************************/
 
-Route::group(['prefix' => 'world'], function() {
+Route::group(['prefix' => 'world'], function () {
     Route::get('/', 'WorldController@getIndex');
 
     Route::get('currencies', 'WorldController@getCurrencies');
@@ -104,6 +104,7 @@
     Route::get('species', 'WorldController@getSpecieses');
     Route::get('subtypes', 'WorldController@getSubtypes');
     Route::get('species/{id}/traits', 'WorldController@getSpeciesFeatures');
+    Route::get('species/{speciesId}/trait/{id}', 'WorldController@getSpeciesFeatureDetail')->where(['id' => '[0-9]+', 'speciesId' => '[0-9]+']);
     Route::get('item-categories', 'WorldController@getItemCategories');
     Route::get('items', 'WorldController@getItems');
     Route::get('items/{id}', 'WorldController@getItem');
@@ -113,13 +114,14 @@
     Route::get('character-titles', 'WorldController@getCharacterTitles');
 });
 
-Route::group(['prefix' => 'prompts'], function() {
+Route::group(['prefix' => 'prompts'], function () {
     Route::get('/', 'PromptsController@getIndex');
     Route::get('prompt-categories', 'PromptsController@getPromptCategories');
     Route::get('prompts', 'PromptsController@getPrompts');
+    Route::get('{id}', 'PromptsController@getPrompt');
 });
 
-Route::group(['prefix' => 'shops'], function() {
+Route::group(['prefix' => 'shops'], function () {
     Route::get('/', 'ShopController@getIndex');
     Route::get('{id}', 'ShopController@getShop')->where(['id' => '[0-9]+']);
     Route::get('{id}/{stockId}', 'ShopController@getShopStock')->where(['id' => '[0-9]+', 'stockId' => '[0-9]+']);
@@ -142,10 +144,10 @@
 /**************************************************************************************************
     Submissions
 **************************************************************************************************/
-Route::group(['prefix' => 'submissions', 'namespace' => 'Users'], function() {
+Route::group(['prefix' => 'submissions', 'namespace' => 'Users'], function () {
     Route::get('view/{id}', 'SubmissionController@getSubmission');
 });
-Route::group(['prefix' => 'claims', 'namespace' => 'Users'], function() {
+Route::group(['prefix' => 'claims', 'namespace' => 'Users'], function () {
     Route::get('view/{id}', 'SubmissionController@getClaim');
 });
 
@@ -157,8 +159,9 @@
 /**************************************************************************************************
     Galleries
 **************************************************************************************************/
-Route::group(['prefix' => 'gallery'], function() {
+Route::group(['prefix' => 'gallery'], function () {
     Route::get('/', 'GalleryController@getGalleryIndex');
+    Route::get('all', 'GalleryController@getAll');
     Route::get('{id}', 'GalleryController@getGallery');
     Route::get('view/{id}', 'GalleryController@getSubmission');
     Route::get('view/favorites/{id}', 'GalleryController@getSubmissionFavorites');
@@ -167,8 +170,6 @@
 /**************************************************************************************************
     Reports
 **************************************************************************************************/
-Route::group(['prefix' => 'reports', 'namespace' => 'Users'], function() {
+Route::group(['prefix' => 'reports', 'namespace' => 'Users'], function () {
     Route::get('/bug-reports', 'ReportController@getBugIndex');
 });
-
-
diff --git a/routes/lorekeeper/members.php b/routes/lorekeeper/members.php
index cbffc43de2..ae70c9473a 100644
--- a/routes/lorekeeper/members.php
+++ b/routes/lorekeeper/members.php
@@ -13,19 +13,20 @@
     Users
 **************************************************************************************************/
 
-Route::group(['prefix' => 'notifications', 'namespace' => 'Users'], function() {
+Route::group(['prefix' => 'notifications', 'namespace' => 'Users'], function () {
     Route::get('/', 'AccountController@getNotifications');
     Route::get('delete/{id}', 'AccountController@getDeleteNotification');
     Route::post('clear', 'AccountController@postClearNotifications');
     Route::post('clear/{type}', 'AccountController@postClearNotifications');
 });
 
-Route::group(['prefix' => 'account', 'namespace' => 'Users'], function() {
+Route::group(['prefix' => 'account', 'namespace' => 'Users'], function () {
     Route::get('settings', 'AccountController@getSettings');
     Route::post('profile', 'AccountController@postProfile');
     Route::post('password', 'AccountController@postPassword');
     Route::post('email', 'AccountController@postEmail');
     Route::post('avatar', 'AccountController@postAvatar');
+    Route::post('username', 'AccountController@postUsername');
     Route::get('aliases', 'AccountController@getAliases');
     Route::get('make-primary/{id}', 'AccountController@getMakePrimary');
     Route::post('make-primary/{id}', 'AccountController@postMakePrimary');
@@ -35,6 +36,15 @@
     Route::post('remove-alias/{id}', 'AccountController@postRemoveAlias');
     Route::post('dob', 'AccountController@postBirthday');
 
+    Route::get('two-factor/confirm', 'AccountController@getConfirmTwoFactor');
+    Route::post('two-factor/enable', 'AccountController@postEnableTwoFactor');
+    Route::post('two-factor/confirm', 'AccountController@postConfirmTwoFactor');
+    Route::post('two-factor/disable', 'AccountController@postDisableTwoFactor');
+
+    Route::get('deactivate', 'AccountController@getDeactivate');
+    Route::get('deactivate-confirm', 'AccountController@getDeactivateConfirmation');
+    Route::post('deactivate', 'AccountController@postDeactivate');
+
     Route::get('bookmarks', 'BookmarkController@getBookmarks');
     Route::get('bookmarks/create', 'BookmarkController@getCreateBookmark');
     Route::get('bookmarks/edit/{id}', 'BookmarkController@getEditBookmark');
@@ -44,15 +54,18 @@
     Route::post('bookmarks/delete/{id}', 'BookmarkController@postDeleteBookmark');
 });
 
-Route::group(['prefix' => 'inventory', 'namespace' => 'Users'], function() {
+Route::group(['prefix' => 'inventory', 'namespace' => 'Users'], function () {
     Route::get('/', 'InventoryController@getIndex');
     Route::post('edit', 'InventoryController@postEdit');
     Route::get('account-search', 'InventoryController@getAccountSearch');
+    Route::get('full-inventory', 'InventoryController@getFullInventory');
+    Route::get('consolidate-inventory', 'InventoryController@getConsolidateInventory');
+    Route::post('consolidate', 'InventoryController@postConsolidateInventory');
 
     Route::get('selector', 'InventoryController@getSelector');
 });
 
-Route::group(['prefix' => 'characters', 'namespace' => 'Users'], function() {
+Route::group(['prefix' => 'characters', 'namespace' => 'Users'], function () {
     Route::get('/', 'CharacterController@getIndex');
     Route::post('sort', 'CharacterController@postSortCharacters');
 
@@ -62,12 +75,12 @@
     Route::get('myos', 'CharacterController@getMyos');
 });
 
-Route::group(['prefix' => 'bank', 'namespace' => 'Users'], function() {
+Route::group(['prefix' => 'bank', 'namespace' => 'Users'], function () {
     Route::get('/', 'BankController@getIndex');
     Route::post('transfer', 'BankController@postTransfer');
 });
 
-Route::group(['prefix' => 'trades', 'namespace' => 'Users'], function() {
+Route::group(['prefix' => 'trades', 'namespace' => 'Users'], function () {
     Route::get('{status}', 'TradeController@getIndex')->where('status', 'open|pending|completed|rejected|canceled');
     Route::get('create', 'TradeController@getCreateTrade');
     Route::get('{id}/edit', 'TradeController@getEditTrade')->where('id', '[0-9]+');
@@ -86,7 +99,7 @@
 /**************************************************************************************************
     Characters
 **************************************************************************************************/
-Route::group(['prefix' => 'character', 'namespace' => 'Characters'], function() {
+Route::group(['prefix' => 'character', 'namespace' => 'Characters'], function () {
     Route::get('{slug}/profile/edit', 'CharacterController@getEditCharacterProfile');
     Route::post('{slug}/profile/edit', 'CharacterController@postEditCharacterProfile');
 
@@ -100,7 +113,7 @@
     Route::post('{slug}/approval', 'CharacterController@postCharacterApproval');
     Route::get('{slug}/approval', 'CharacterController@getCharacterApproval');
 });
-Route::group(['prefix' => 'myo', 'namespace' => 'Characters'], function() {
+Route::group(['prefix' => 'myo', 'namespace' => 'Characters'], function () {
     Route::get('{id}/profile/edit', 'MyoController@getEditCharacterProfile');
     Route::post('{id}/profile/edit', 'MyoController@postEditCharacterProfile');
 
@@ -116,8 +129,8 @@
     Submissions
 **************************************************************************************************/
 
-Route::group(['prefix' => 'gallery'], function() {
-    Route::get('submissions/{type}', 'GalleryController@getUserSubmissions')->where('type', 'pending|accepted|rejected');
+Route::group(['prefix' => 'gallery'], function () {
+    Route::get('submissions/{type}', 'GalleryController@getUserSubmissions')->where('type', 'draft|pending|accepted|rejected');
 
     Route::post('favorite/{id}', 'GalleryController@postFavoriteSubmission');
 
@@ -134,29 +147,41 @@
     Route::post('archive/{id}', 'GalleryController@postArchiveSubmission');
 });
 
-Route::group(['prefix' => 'submissions', 'namespace' => 'Users'], function() {
+Route::group(['prefix' => 'submissions', 'namespace' => 'Users'], function () {
     Route::get('/', 'SubmissionController@getIndex');
     Route::get('new', 'SubmissionController@getNewSubmission');
     Route::get('new/character/{slug}', 'SubmissionController@getCharacterInfo');
     Route::get('new/prompt/{id}', 'SubmissionController@getPromptInfo');
     Route::post('new', 'SubmissionController@postNewSubmission');
+    Route::post('new/{draft}', 'SubmissionController@postNewSubmission')->where('draft', 'draft');
+    Route::get('draft/{id}', 'SubmissionController@getEditSubmission');
+    Route::post('draft/{id}', 'SubmissionController@postEditSubmission');
+    Route::post('draft/{id}/{submit}', 'SubmissionController@postEditSubmission')->where('submit', 'submit');
+    Route::post('draft/{id}/delete', 'SubmissionController@postDeleteSubmission');
+    Route::post('draft/{id}/cancel', 'SubmissionController@postCancelSubmission');
 });
 
-Route::group(['prefix' => 'claims', 'namespace' => 'Users'], function() {
+Route::group(['prefix' => 'claims', 'namespace' => 'Users'], function () {
     Route::get('/', 'SubmissionController@getClaimsIndex');
     Route::get('new', 'SubmissionController@getNewClaim');
     Route::post('new', 'SubmissionController@postNewClaim');
+    Route::post('new/{draft}', 'SubmissionController@postNewClaim')->where('draft', 'draft');
+    Route::get('draft/{id}', 'SubmissionController@getEditClaim');
+    Route::post('draft/{id}', 'SubmissionController@postEditClaim');
+    Route::post('draft/{id}/{submit}', 'SubmissionController@postEditClaim')->where('submit', 'submit');
+    Route::post('draft/{id}/delete', 'SubmissionController@postDeleteClaim');
+    Route::post('draft/{id}/cancel', 'SubmissionController@postCancelClaim');
 });
 
-Route::group(['prefix' => 'reports', 'namespace' => 'Users'], function() {
+Route::group(['prefix' => 'reports', 'namespace' => 'Users'], function () {
     Route::get('/', 'ReportController@getReportsIndex');
     Route::get('new', 'ReportController@getNewReport');
     Route::post('new', 'ReportController@postNewReport');
     Route::get('view/{id}', 'ReportController@getReport');
 });
 
-Route::group(['prefix' => 'designs', 'namespace' => 'Characters'], function() {
-    Route::get('{type?}', 'DesignController@getDesignUpdateIndex')->where('type', 'pending|approved|rejected');
+Route::group(['prefix' => 'designs', 'namespace' => 'Characters'], function () {
+    Route::get('{type?}', 'DesignController@getDesignUpdateIndex')->where('type', 'draft|pending|approved|rejected');
     Route::get('{id}', 'DesignController@getDesignUpdate');
 
     Route::get('{id}/comments', 'DesignController@getComments');
@@ -183,7 +208,7 @@
     Shops
 **************************************************************************************************/
 
-Route::group(['prefix' => 'shops'], function() {
+Route::group(['prefix' => 'shops'], function () {
     Route::post('buy', 'ShopController@postBuy');
     Route::get('history', 'ShopController@getPurchaseHistory');
 });
@@ -191,10 +216,12 @@
 /**************************************************************************************************
     Comments
 **************************************************************************************************/
-Route::group(['prefix' => 'comments', 'namespace' => 'Comments'], function() {
-    Route::post('/', 'CommentController@store')->name('comments.store');
+Route::group(['prefix' => 'comments', 'namespace' => 'Comments'], function () {
+    Route::post('make/{model}/{id}', 'CommentController@store');
     Route::delete('/{comment}', 'CommentController@destroy')->name('comments.destroy');
-    Route::put('/{comment}', 'CommentController@update')->name('comments.update');
+    Route::post('edit/{comment}', 'CommentController@update')->name('comments.update');
     Route::post('/{comment}', 'CommentController@reply')->name('comments.reply');
     Route::post('/{id}/feature', 'CommentController@feature')->name('comments.feature');
+    Route::post('/{id}/like/{action}', 'CommentController@like')->name('comments.like');
+    Route::get('/liked', 'CommentController@getLikedComments');
 });
diff --git a/routes/web.php b/routes/web.php
index b7569dfd73..6c5ef0c631 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -13,45 +13,55 @@
 
 Route::get('/', 'HomeController@getIndex')->name('home');
 Route::get('login', 'Auth\LoginController@getNewReply');
-Auth::routes(['verify' => true]);
 
-# BROWSE
+// Logging in with Aliases
+Route::get('/login/redirect/{driver}', 'Auth\LoginController@getAuthRedirect');
+Route::get('/login/callback/{driver}', 'Auth\LoginController@getAuthCallback');
+
+// Registering with Aliases
+Route::get('register/{driver}', 'Auth\RegisterController@getRegisterWithDriver');
+Route::post('register/{driver}', 'Auth\RegisterController@postRegisterWithDriver');
+
+// BROWSE
 require_once __DIR__.'/lorekeeper/browse.php';
 
+Route::feeds('feeds');
+
 /**************************************************************************************************
     Routes that require login
 **************************************************************************************************/
-Route::group(['middleware' => ['auth', 'verified']], function() {
-
-    # LINK DA ACCOUNT
+Route::group(['middleware' => ['auth', 'verified']], function () {
+    // LINK DA ACCOUNT
     Route::get('/link', 'HomeController@getLink')->name('link');
-    
+
     Route::get('/auth/redirect/{driver}', 'HomeController@getAuthRedirect');
     Route::get('/auth/callback/{driver}', 'HomeController@getAuthCallback');
 
-    # SET BIRTHDATE
+    // SET BIRTHDATE
     Route::get('/birthday', 'HomeController@getBirthday')->name('birthday');
     Route::post('/birthday', 'HomeController@postBirthday');
 
     Route::get('/blocked', 'HomeController@getBirthdayBlocked')->name('blocked');
 
-    # BANNED
+    // BANNED
     Route::get('banned', 'Users\AccountController@getBanned');
 
+    // DEACTIVATED
+    Route::get('deactivated', 'Users\AccountController@getDeactivated');
+    Route::get('reactivate', 'Users\AccountController@getReactivateConfirmation');
+    Route::post('reactivate', 'Users\AccountController@postReactivate');
+
     /**********************************************************************************************
-        Routes that require having a linked dA account (also includes blocked routes when banned)
+        Routes that require having a linked account (also includes blocked routes when banned)
     **********************************************************************************************/
-    Route::group(['middleware' => ['alias']], function() {
-
+    Route::group(['middleware' => ['alias']], function () {
         require_once __DIR__.'/lorekeeper/members.php';
 
         /**********************************************************************************************
             Admin panel routes
         **********************************************************************************************/
-        Route::group(['prefix' => 'admin', 'namespace' => 'Admin', 'middleware' => ['staff']], function() {
-
+        Route::group(['prefix' => 'admin', 'namespace' => 'Admin', 'middleware' => ['staff']], function () {
             require_once __DIR__.'/lorekeeper/admin.php';
-
         });
     });
 });
diff --git a/server.php b/server.php
index 5fb6379e71..20bc389f0b 100644
--- a/server.php
+++ b/server.php
@@ -1,12 +1,10 @@
 <?php
 
 /**
- * Laravel - A PHP Framework For Web Artisans
+ * Laravel - A PHP Framework For Web Artisans.
  *
- * @package  Laravel
  * @author   Taylor Otwell <taylor@laravel.com>
  */
-
 $uri = urldecode(
     parse_url($_SERVER['REQUEST_URI'], PHP_URL_PATH)
 );
diff --git a/tests/CreatesApplication.php b/tests/CreatesApplication.php
index 547152f6a9..6795a74bb6 100644
--- a/tests/CreatesApplication.php
+++ b/tests/CreatesApplication.php
@@ -4,15 +4,13 @@
 
 use Illuminate\Contracts\Console\Kernel;
 
-trait CreatesApplication
-{
+trait CreatesApplication {
     /**
      * Creates the application.
      *
      * @return \Illuminate\Foundation\Application
      */
-    public function createApplication()
-    {
+    public function createApplication() {
         $app = require __DIR__.'/../bootstrap/app.php';
 
         $app->make(Kernel::class)->bootstrap();
diff --git a/tests/Feature/ExampleTest.php b/tests/Feature/ExampleTest.php
index f31e495ca3..0aaa988db0 100644
--- a/tests/Feature/ExampleTest.php
+++ b/tests/Feature/ExampleTest.php
@@ -3,17 +3,12 @@
 namespace Tests\Feature;
 
 use Tests\TestCase;
-use Illuminate\Foundation\Testing\RefreshDatabase;
 
-class ExampleTest extends TestCase
-{
+class ExampleTest extends TestCase {
     /**
      * A basic test example.
-     *
-     * @return void
      */
-    public function testBasicTest()
-    {
+    public function testBasicTest() {
         $response = $this->get('/');
 
         $response->assertStatus(200);
diff --git a/tests/TestCase.php b/tests/TestCase.php
index 2932d4a69d..74bf669972 100644
--- a/tests/TestCase.php
+++ b/tests/TestCase.php
@@ -4,7 +4,6 @@
 
 use Illuminate\Foundation\Testing\TestCase as BaseTestCase;
 
-abstract class TestCase extends BaseTestCase
-{
+abstract class TestCase extends BaseTestCase {
     use CreatesApplication;
 }
diff --git a/tests/Unit/ExampleTest.php b/tests/Unit/ExampleTest.php
index e9fe19c664..dd024df7b1 100644
--- a/tests/Unit/ExampleTest.php
+++ b/tests/Unit/ExampleTest.php
@@ -3,17 +3,12 @@
 namespace Tests\Unit;
 
 use Tests\TestCase;
-use Illuminate\Foundation\Testing\RefreshDatabase;
 
-class ExampleTest extends TestCase
-{
+class ExampleTest extends TestCase {
     /**
      * A basic test example.
-     *
-     * @return void
      */
-    public function testBasicTest()
-    {
+    public function testBasicTest() {
         $this->assertTrue(true);
     }
 }
diff --git a/yarn.lock b/yarn.lock
index f4bb112123..86597b772d 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2,5794 +2,5991 @@
 # yarn lockfile v1
 
 
-"@babel/code-frame@^7.0.0":
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.0.0.tgz#06e2ab19bdb535385559aabb5ba59729482800f8"
-  dependencies:
-    "@babel/highlight" "^7.0.0"
-
-"@babel/core@^7.0.0-beta.49", "@babel/core@^7.2.0":
-  version "7.3.4"
-  resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.3.4.tgz#921a5a13746c21e32445bf0798680e9d11a6530b"
-  dependencies:
-    "@babel/code-frame" "^7.0.0"
-    "@babel/generator" "^7.3.4"
-    "@babel/helpers" "^7.2.0"
-    "@babel/parser" "^7.3.4"
-    "@babel/template" "^7.2.2"
-    "@babel/traverse" "^7.3.4"
-    "@babel/types" "^7.3.4"
-    convert-source-map "^1.1.0"
-    debug "^4.1.0"
-    json5 "^2.1.0"
-    lodash "^4.17.11"
-    resolve "^1.3.2"
-    semver "^5.4.1"
-    source-map "^0.5.0"
-
-"@babel/generator@^7.3.4":
-  version "7.3.4"
-  resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.3.4.tgz#9aa48c1989257877a9d971296e5b73bfe72e446e"
-  dependencies:
-    "@babel/types" "^7.3.4"
-    jsesc "^2.5.1"
-    lodash "^4.17.11"
-    source-map "^0.5.0"
-    trim-right "^1.0.1"
-
-"@babel/helper-annotate-as-pure@^7.0.0":
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.0.0.tgz#323d39dd0b50e10c7c06ca7d7638e6864d8c5c32"
-  dependencies:
-    "@babel/types" "^7.0.0"
-
-"@babel/helper-builder-binary-assignment-operator-visitor@^7.1.0":
-  version "7.1.0"
-  resolved "https://registry.yarnpkg.com/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.1.0.tgz#6b69628dfe4087798e0c4ed98e3d4a6b2fbd2f5f"
-  dependencies:
-    "@babel/helper-explode-assignable-expression" "^7.1.0"
-    "@babel/types" "^7.0.0"
-
-"@babel/helper-call-delegate@^7.1.0":
-  version "7.1.0"
-  resolved "https://registry.yarnpkg.com/@babel/helper-call-delegate/-/helper-call-delegate-7.1.0.tgz#6a957f105f37755e8645343d3038a22e1449cc4a"
-  dependencies:
-    "@babel/helper-hoist-variables" "^7.0.0"
-    "@babel/traverse" "^7.1.0"
-    "@babel/types" "^7.0.0"
-
-"@babel/helper-define-map@^7.1.0":
-  version "7.1.0"
-  resolved "https://registry.yarnpkg.com/@babel/helper-define-map/-/helper-define-map-7.1.0.tgz#3b74caec329b3c80c116290887c0dd9ae468c20c"
-  dependencies:
-    "@babel/helper-function-name" "^7.1.0"
-    "@babel/types" "^7.0.0"
-    lodash "^4.17.10"
-
-"@babel/helper-explode-assignable-expression@^7.1.0":
-  version "7.1.0"
-  resolved "https://registry.yarnpkg.com/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.1.0.tgz#537fa13f6f1674df745b0c00ec8fe4e99681c8f6"
-  dependencies:
-    "@babel/traverse" "^7.1.0"
-    "@babel/types" "^7.0.0"
+"@alloc/quick-lru@^5.2.0":
+  "integrity" "sha512-UrcABB+4bUrFABwbluTIBErXwvbsU/V7TZWfmbgJfbkwiBuziS9gxdODUyuiecfdGQ85jglMW6juS3+z5TsKLw=="
+  "resolved" "https://registry.npmjs.org/@alloc/quick-lru/-/quick-lru-5.2.0.tgz"
+  "version" "5.2.0"
+
+"@ampproject/remapping@^2.1.0":
+  "integrity" "sha512-qRmjj8nj9qmLTQXXmaR1cck3UXSRMPrbsLJAasZpF+t3riI71BXed5ebIOYwQntykeZuhjsdweEc9BxH5Jc26w=="
+  "resolved" "https://registry.npmjs.org/@ampproject/remapping/-/remapping-2.2.0.tgz"
+  "version" "2.2.0"
+  dependencies:
+    "@jridgewell/gen-mapping" "^0.1.0"
+    "@jridgewell/trace-mapping" "^0.3.9"
+
+"@babel/code-frame@^7.0.0", "@babel/code-frame@^7.18.6", "@babel/code-frame@^7.22.13":
+  "integrity" "sha512-XktuhWlJ5g+3TJXc5upd9Ks1HutSArik6jf2eAjYFyIOf4ej3RN+184cZbzDvbPnuTJIUhPKKJE3cIsYTiAT3w=="
+  "resolved" "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.22.13.tgz"
+  "version" "7.22.13"
+  dependencies:
+    "@babel/highlight" "^7.22.13"
+    "chalk" "^2.4.2"
+
+"@babel/compat-data@^7.13.11", "@babel/compat-data@^7.18.6":
+  "integrity" "sha512-HSmX4WZPPK3FUxYp7g2T6EyO8j96HlZJlxmKPSh6KAcqwyDrfx7hKjXpAW/0FhFfTJsR0Yt4lAjLI2coMptIHQ=="
+  "resolved" "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.18.8.tgz"
+  "version" "7.18.8"
+
+"@babel/core@^7.0.0", "@babel/core@^7.0.0-0", "@babel/core@^7.12.0", "@babel/core@^7.13.0", "@babel/core@^7.15.8", "@babel/core@^7.4.0-0":
+  "integrity" "sha512-cQbWBpxcbbs/IUredIPkHiAGULLV8iwgNRMFzvbhEXISp4f3rUUXE5+TIw6KwUWUR3DwyI6gmBRnmAtYaWehwQ=="
+  "resolved" "https://registry.npmjs.org/@babel/core/-/core-7.18.6.tgz"
+  "version" "7.18.6"
+  dependencies:
+    "@ampproject/remapping" "^2.1.0"
+    "@babel/code-frame" "^7.18.6"
+    "@babel/generator" "^7.18.6"
+    "@babel/helper-compilation-targets" "^7.18.6"
+    "@babel/helper-module-transforms" "^7.18.6"
+    "@babel/helpers" "^7.18.6"
+    "@babel/parser" "^7.18.6"
+    "@babel/template" "^7.18.6"
+    "@babel/traverse" "^7.18.6"
+    "@babel/types" "^7.18.6"
+    "convert-source-map" "^1.7.0"
+    "debug" "^4.1.0"
+    "gensync" "^1.0.0-beta.2"
+    "json5" "^2.2.1"
+    "semver" "^6.3.0"
+
+"@babel/generator@^7.18.6", "@babel/generator@^7.23.0":
+  "integrity" "sha512-lN85QRR+5IbYrMWM6Y4pE/noaQtg4pNiqeNGX60eqOfo6gtEj6uw/JagelB8vVztSd7R6M5n1+PQkDbHbBRU4g=="
+  "resolved" "https://registry.npmjs.org/@babel/generator/-/generator-7.23.0.tgz"
+  "version" "7.23.0"
+  dependencies:
+    "@babel/types" "^7.23.0"
+    "@jridgewell/gen-mapping" "^0.3.2"
+    "@jridgewell/trace-mapping" "^0.3.17"
+    "jsesc" "^2.5.1"
+
+"@babel/helper-annotate-as-pure@^7.18.6":
+  "integrity" "sha512-duORpUiYrEpzKIop6iNbjnwKLAKnJ47csTyRACyEmWj0QdUrm5aqNJGHSSEQSUAvNW0ojX0dOmK9dZduvkfeXA=="
+  "resolved" "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.18.6.tgz"
+  "version" "7.18.6"
+  dependencies:
+    "@babel/types" "^7.18.6"
+
+"@babel/helper-builder-binary-assignment-operator-visitor@^7.18.6":
+  "integrity" "sha512-KT10c1oWEpmrIRYnthbzHgoOf6B+Xd6a5yhdbNtdhtG7aO1or5HViuf1TQR36xY/QprXA5nvxO6nAjhJ4y38jw=="
+  "resolved" "https://registry.npmjs.org/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.18.6.tgz"
+  "version" "7.18.6"
+  dependencies:
+    "@babel/helper-explode-assignable-expression" "^7.18.6"
+    "@babel/types" "^7.18.6"
+
+"@babel/helper-compilation-targets@^7.13.0", "@babel/helper-compilation-targets@^7.18.6":
+  "integrity" "sha512-vFjbfhNCzqdeAtZflUFrG5YIFqGTqsctrtkZ1D/NB0mDW9TwW3GmmUepYY4G9wCET5rY5ugz4OGTcLd614IzQg=="
+  "resolved" "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.18.6.tgz"
+  "version" "7.18.6"
+  dependencies:
+    "@babel/compat-data" "^7.18.6"
+    "@babel/helper-validator-option" "^7.18.6"
+    "browserslist" "^4.20.2"
+    "semver" "^6.3.0"
+
+"@babel/helper-create-class-features-plugin@^7.18.6":
+  "integrity" "sha512-YfDzdnoxHGV8CzqHGyCbFvXg5QESPFkXlHtvdCkesLjjVMT2Adxe4FGUR5ChIb3DxSaXO12iIOCWoXdsUVwnqw=="
+  "resolved" "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.18.6.tgz"
+  "version" "7.18.6"
+  dependencies:
+    "@babel/helper-annotate-as-pure" "^7.18.6"
+    "@babel/helper-environment-visitor" "^7.18.6"
+    "@babel/helper-function-name" "^7.18.6"
+    "@babel/helper-member-expression-to-functions" "^7.18.6"
+    "@babel/helper-optimise-call-expression" "^7.18.6"
+    "@babel/helper-replace-supers" "^7.18.6"
+    "@babel/helper-split-export-declaration" "^7.18.6"
+
+"@babel/helper-create-regexp-features-plugin@^7.18.6":
+  "integrity" "sha512-7LcpH1wnQLGrI+4v+nPp+zUvIkF9x0ddv1Hkdue10tg3gmRnLy97DXh4STiOf1qeIInyD69Qv5kKSZzKD8B/7A=="
+  "resolved" "https://registry.npmjs.org/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.18.6.tgz"
+  "version" "7.18.6"
+  dependencies:
+    "@babel/helper-annotate-as-pure" "^7.18.6"
+    "regexpu-core" "^5.1.0"
+
+"@babel/helper-define-polyfill-provider@^0.3.1":
+  "integrity" "sha512-J9hGMpJQmtWmj46B3kBHmL38UhJGhYX7eqkcq+2gsstyYt341HmPeWspihX43yVRA0mS+8GGk2Gckc7bY/HCmA=="
+  "resolved" "https://registry.npmjs.org/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.3.1.tgz"
+  "version" "0.3.1"
+  dependencies:
+    "@babel/helper-compilation-targets" "^7.13.0"
+    "@babel/helper-module-imports" "^7.12.13"
+    "@babel/helper-plugin-utils" "^7.13.0"
+    "@babel/traverse" "^7.13.0"
+    "debug" "^4.1.1"
+    "lodash.debounce" "^4.0.8"
+    "resolve" "^1.14.2"
+    "semver" "^6.1.2"
+
+"@babel/helper-environment-visitor@^7.18.6", "@babel/helper-environment-visitor@^7.22.20":
+  "integrity" "sha512-zfedSIzFhat/gFhWfHtgWvlec0nqB9YEIVrpuwjruLlXfUSnA8cJB0miHKwqDnQ7d32aKo2xt88/xZptwxbfhA=="
+  "resolved" "https://registry.npmjs.org/@babel/helper-environment-visitor/-/helper-environment-visitor-7.22.20.tgz"
+  "version" "7.22.20"
+
+"@babel/helper-explode-assignable-expression@^7.18.6":
+  "integrity" "sha512-eyAYAsQmB80jNfg4baAtLeWAQHfHFiR483rzFK+BhETlGZaQC9bsfrugfXDCbRHLQbIA7U5NxhhOxN7p/dWIcg=="
+  "resolved" "https://registry.npmjs.org/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.18.6.tgz"
+  "version" "7.18.6"
+  dependencies:
+    "@babel/types" "^7.18.6"
+
+"@babel/helper-function-name@^7.18.6", "@babel/helper-function-name@^7.23.0":
+  "integrity" "sha512-OErEqsrxjZTJciZ4Oo+eoZqeW9UIiOcuYKRJA4ZAgV9myA+pOXhhmpfNCKjEH/auVfEYVFJ6y1Tc4r0eIApqiw=="
+  "resolved" "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.23.0.tgz"
+  "version" "7.23.0"
+  dependencies:
+    "@babel/template" "^7.22.15"
+    "@babel/types" "^7.23.0"
+
+"@babel/helper-hoist-variables@^7.18.6", "@babel/helper-hoist-variables@^7.22.5":
+  "integrity" "sha512-wGjk9QZVzvknA6yKIUURb8zY3grXCcOZt+/7Wcy8O2uctxhplmUPkOdlgoNhmdVee2c92JXbf1xpMtVNbfoxRw=="
+  "resolved" "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.22.5.tgz"
+  "version" "7.22.5"
+  dependencies:
+    "@babel/types" "^7.22.5"
+
+"@babel/helper-member-expression-to-functions@^7.18.6":
+  "integrity" "sha512-CeHxqwwipekotzPDUuJOfIMtcIHBuc7WAzLmTYWctVigqS5RktNMQ5bEwQSuGewzYnCtTWa3BARXeiLxDTv+Ng=="
+  "resolved" "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.18.6.tgz"
+  "version" "7.18.6"
+  dependencies:
+    "@babel/types" "^7.18.6"
+
+"@babel/helper-module-imports@^7.12.13", "@babel/helper-module-imports@^7.18.6":
+  "integrity" "sha512-0NFvs3VkuSYbFi1x2Vd6tKrywq+z/cLeYC/RJNFrIX/30Bf5aiGYbtvGXolEktzJH8o5E5KJ3tT+nkxuuZFVlA=="
+  "resolved" "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.18.6.tgz"
+  "version" "7.18.6"
+  dependencies:
+    "@babel/types" "^7.18.6"
+
+"@babel/helper-module-transforms@^7.18.6":
+  "integrity" "sha512-che3jvZwIcZxrwh63VfnFTUzcAM9v/lznYkkRxIBGMPt1SudOKHAEec0SIRCfiuIzTcF7VGj/CaTT6gY4eWxvA=="
+  "resolved" "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.18.8.tgz"
+  "version" "7.18.8"
+  dependencies:
+    "@babel/helper-environment-visitor" "^7.18.6"
+    "@babel/helper-module-imports" "^7.18.6"
+    "@babel/helper-simple-access" "^7.18.6"
+    "@babel/helper-split-export-declaration" "^7.18.6"
+    "@babel/helper-validator-identifier" "^7.18.6"
+    "@babel/template" "^7.18.6"
+    "@babel/traverse" "^7.18.8"
+    "@babel/types" "^7.18.8"
+
+"@babel/helper-optimise-call-expression@^7.18.6":
+  "integrity" "sha512-HP59oD9/fEHQkdcbgFCnbmgH5vIQTJbxh2yf+CdM89/glUNnuzr87Q8GIjGEnOktTROemO0Pe0iPAYbqZuOUiA=="
+  "resolved" "https://registry.npmjs.org/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.18.6.tgz"
+  "version" "7.18.6"
+  dependencies:
+    "@babel/types" "^7.18.6"
+
+"@babel/helper-plugin-utils@^7.0.0", "@babel/helper-plugin-utils@^7.10.4", "@babel/helper-plugin-utils@^7.12.13", "@babel/helper-plugin-utils@^7.13.0", "@babel/helper-plugin-utils@^7.14.5", "@babel/helper-plugin-utils@^7.18.6", "@babel/helper-plugin-utils@^7.8.0", "@babel/helper-plugin-utils@^7.8.3":
+  "integrity" "sha512-gvZnm1YAAxh13eJdkb9EWHBnF3eAub3XTLCZEehHT2kWxiKVRL64+ae5Y6Ivne0mVHmMYKT+xWgZO+gQhuLUBg=="
+  "resolved" "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.18.6.tgz"
+  "version" "7.18.6"
+
+"@babel/helper-remap-async-to-generator@^7.18.6":
+  "integrity" "sha512-z5wbmV55TveUPZlCLZvxWHtrjuJd+8inFhk7DG0WW87/oJuGDcjDiu7HIvGcpf5464L6xKCg3vNkmlVVz9hwyQ=="
+  "resolved" "https://registry.npmjs.org/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.18.6.tgz"
+  "version" "7.18.6"
+  dependencies:
+    "@babel/helper-annotate-as-pure" "^7.18.6"
+    "@babel/helper-environment-visitor" "^7.18.6"
+    "@babel/helper-wrap-function" "^7.18.6"
+    "@babel/types" "^7.18.6"
+
+"@babel/helper-replace-supers@^7.18.6":
+  "integrity" "sha512-fTf7zoXnUGl9gF25fXCWE26t7Tvtyn6H4hkLSYhATwJvw2uYxd3aoXplMSe0g9XbwK7bmxNes7+FGO0rB/xC0g=="
+  "resolved" "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.18.6.tgz"
+  "version" "7.18.6"
+  dependencies:
+    "@babel/helper-environment-visitor" "^7.18.6"
+    "@babel/helper-member-expression-to-functions" "^7.18.6"
+    "@babel/helper-optimise-call-expression" "^7.18.6"
+    "@babel/traverse" "^7.18.6"
+    "@babel/types" "^7.18.6"
+
+"@babel/helper-simple-access@^7.18.6":
+  "integrity" "sha512-iNpIgTgyAvDQpDj76POqg+YEt8fPxx3yaNBg3S30dxNKm2SWfYhD0TGrK/Eu9wHpUW63VQU894TsTg+GLbUa1g=="
+  "resolved" "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.18.6.tgz"
+  "version" "7.18.6"
+  dependencies:
+    "@babel/types" "^7.18.6"
+
+"@babel/helper-skip-transparent-expression-wrappers@^7.18.6":
+  "integrity" "sha512-4KoLhwGS9vGethZpAhYnMejWkX64wsnHPDwvOsKWU6Fg4+AlK2Jz3TyjQLMEPvz+1zemi/WBdkYxCD0bAfIkiw=="
+  "resolved" "https://registry.npmjs.org/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.18.6.tgz"
+  "version" "7.18.6"
+  dependencies:
+    "@babel/types" "^7.18.6"
+
+"@babel/helper-split-export-declaration@^7.18.6", "@babel/helper-split-export-declaration@^7.22.6":
+  "integrity" "sha512-AsUnxuLhRYsisFiaJwvp1QF+I3KjD5FOxut14q/GzovUe6orHLesW2C7d754kRm53h5gqrz6sFl6sxc4BVtE/g=="
+  "resolved" "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.22.6.tgz"
+  "version" "7.22.6"
+  dependencies:
+    "@babel/types" "^7.22.5"
+
+"@babel/helper-string-parser@^7.22.5":
+  "integrity" "sha512-mM4COjgZox8U+JcXQwPijIZLElkgEpO5rsERVDJTc2qfCDfERyob6k5WegS14SX18IIjv+XD+GrqNumY5JRCDw=="
+  "resolved" "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.22.5.tgz"
+  "version" "7.22.5"
+
+"@babel/helper-validator-identifier@^7.18.6", "@babel/helper-validator-identifier@^7.22.20":
+  "integrity" "sha512-Y4OZ+ytlatR8AI+8KZfKuL5urKp7qey08ha31L8b3BwewJAoJamTzyvxPR/5D+KkdJCGPq/+8TukHBlY10FX9A=="
+  "resolved" "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.22.20.tgz"
+  "version" "7.22.20"
+
+"@babel/helper-validator-option@^7.18.6":
+  "integrity" "sha512-XO7gESt5ouv/LRJdrVjkShckw6STTaB7l9BrpBaAHDeF5YZT+01PCwmR0SJHnkW6i8OwW/EVWRShfi4j2x+KQw=="
+  "resolved" "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.18.6.tgz"
+  "version" "7.18.6"
+
+"@babel/helper-wrap-function@^7.18.6":
+  "integrity" "sha512-I5/LZfozwMNbwr/b1vhhuYD+J/mU+gfGAj5td7l5Rv9WYmH6i3Om69WGKNmlIpsVW/mF6O5bvTKbvDQZVgjqOw=="
+  "resolved" "https://registry.npmjs.org/@babel/helper-wrap-function/-/helper-wrap-function-7.18.6.tgz"
+  "version" "7.18.6"
+  dependencies:
+    "@babel/helper-function-name" "^7.18.6"
+    "@babel/template" "^7.18.6"
+    "@babel/traverse" "^7.18.6"
+    "@babel/types" "^7.18.6"
+
+"@babel/helpers@^7.18.6":
+  "integrity" "sha512-vzSiiqbQOghPngUYt/zWGvK3LAsPhz55vc9XNN0xAl2gV4ieShI2OQli5duxWHD+72PZPTKAcfcZDE1Cwc5zsQ=="
+  "resolved" "https://registry.npmjs.org/@babel/helpers/-/helpers-7.18.6.tgz"
+  "version" "7.18.6"
+  dependencies:
+    "@babel/template" "^7.18.6"
+    "@babel/traverse" "^7.18.6"
+    "@babel/types" "^7.18.6"
+
+"@babel/highlight@^7.22.13":
+  "integrity" "sha512-dkdMCN3py0+ksCgYmGG8jKeGA/8Tk+gJwSYYlFGxG5lmhfKNoAy004YpLxpS1W2J8m/EK2Ew+yOs9pVRwO89mg=="
+  "resolved" "https://registry.npmjs.org/@babel/highlight/-/highlight-7.22.20.tgz"
+  "version" "7.22.20"
+  dependencies:
+    "@babel/helper-validator-identifier" "^7.22.20"
+    "chalk" "^2.4.2"
+    "js-tokens" "^4.0.0"
+
+"@babel/parser@^7.1.0", "@babel/parser@^7.18.6", "@babel/parser@^7.20.7", "@babel/parser@^7.22.15", "@babel/parser@^7.23.0", "@babel/parser@^7.23.5":
+  "integrity" "sha512-hOOqoiNXrmGdFbhgCzu6GiURxUgM27Xwd/aPuu8RfHEZPBzL1Z54okAHAQjXfcQNwvrlkAmAp4SlRTZ45vlthQ=="
+  "resolved" "https://registry.npmjs.org/@babel/parser/-/parser-7.23.5.tgz"
+  "version" "7.23.5"
+
+"@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression@^7.18.6":
+  "integrity" "sha512-Dgxsyg54Fx1d4Nge8UnvTrED63vrwOdPmyvPzlNN/boaliRP54pm3pGzZD1SJUwrBA+Cs/xdG8kXX6Mn/RfISQ=="
+  "resolved" "https://registry.npmjs.org/@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression/-/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.18.6.tgz"
+  "version" "7.18.6"
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.18.6"
+
+"@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining@^7.18.6":
+  "integrity" "sha512-Udgu8ZRgrBrttVz6A0EVL0SJ1z+RLbIeqsu632SA1hf0awEppD6TvdznoH+orIF8wtFFAV/Enmw9Y+9oV8TQcw=="
+  "resolved" "https://registry.npmjs.org/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining/-/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.18.6.tgz"
+  "version" "7.18.6"
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.18.6"
+    "@babel/helper-skip-transparent-expression-wrappers" "^7.18.6"
+    "@babel/plugin-proposal-optional-chaining" "^7.18.6"
+
+"@babel/plugin-proposal-async-generator-functions@^7.18.6":
+  "integrity" "sha512-WAz4R9bvozx4qwf74M+sfqPMKfSqwM0phxPTR6iJIi8robgzXwkEgmeJG1gEKhm6sDqT/U9aV3lfcqybIpev8w=="
+  "resolved" "https://registry.npmjs.org/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.18.6.tgz"
+  "version" "7.18.6"
+  dependencies:
+    "@babel/helper-environment-visitor" "^7.18.6"
+    "@babel/helper-plugin-utils" "^7.18.6"
+    "@babel/helper-remap-async-to-generator" "^7.18.6"
+    "@babel/plugin-syntax-async-generators" "^7.8.4"
+
+"@babel/plugin-proposal-class-properties@^7.18.6":
+  "integrity" "sha512-cumfXOF0+nzZrrN8Rf0t7M+tF6sZc7vhQwYQck9q1/5w2OExlD+b4v4RpMJFaV1Z7WcDRgO6FqvxqxGlwo+RHQ=="
+  "resolved" "https://registry.npmjs.org/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.18.6.tgz"
+  "version" "7.18.6"
+  dependencies:
+    "@babel/helper-create-class-features-plugin" "^7.18.6"
+    "@babel/helper-plugin-utils" "^7.18.6"
+
+"@babel/plugin-proposal-class-static-block@^7.18.6":
+  "integrity" "sha512-+I3oIiNxrCpup3Gi8n5IGMwj0gOCAjcJUSQEcotNnCCPMEnixawOQ+KeJPlgfjzx+FKQ1QSyZOWe7wmoJp7vhw=="
+  "resolved" "https://registry.npmjs.org/@babel/plugin-proposal-class-static-block/-/plugin-proposal-class-static-block-7.18.6.tgz"
+  "version" "7.18.6"
+  dependencies:
+    "@babel/helper-create-class-features-plugin" "^7.18.6"
+    "@babel/helper-plugin-utils" "^7.18.6"
+    "@babel/plugin-syntax-class-static-block" "^7.14.5"
+
+"@babel/plugin-proposal-dynamic-import@^7.18.6":
+  "integrity" "sha512-1auuwmK+Rz13SJj36R+jqFPMJWyKEDd7lLSdOj4oJK0UTgGueSAtkrCvz9ewmgyU/P941Rv2fQwZJN8s6QruXw=="
+  "resolved" "https://registry.npmjs.org/@babel/plugin-proposal-dynamic-import/-/plugin-proposal-dynamic-import-7.18.6.tgz"
+  "version" "7.18.6"
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.18.6"
+    "@babel/plugin-syntax-dynamic-import" "^7.8.3"
+
+"@babel/plugin-proposal-export-namespace-from@^7.18.6":
+  "integrity" "sha512-zr/QcUlUo7GPo6+X1wC98NJADqmy5QTFWWhqeQWiki4XHafJtLl/YMGkmRB2szDD2IYJCCdBTd4ElwhId9T7Xw=="
+  "resolved" "https://registry.npmjs.org/@babel/plugin-proposal-export-namespace-from/-/plugin-proposal-export-namespace-from-7.18.6.tgz"
+  "version" "7.18.6"
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.18.6"
+    "@babel/plugin-syntax-export-namespace-from" "^7.8.3"
+
+"@babel/plugin-proposal-json-strings@^7.18.6":
+  "integrity" "sha512-lr1peyn9kOdbYc0xr0OdHTZ5FMqS6Di+H0Fz2I/JwMzGmzJETNeOFq2pBySw6X/KFL5EWDjlJuMsUGRFb8fQgQ=="
+  "resolved" "https://registry.npmjs.org/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.18.6.tgz"
+  "version" "7.18.6"
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.18.6"
+    "@babel/plugin-syntax-json-strings" "^7.8.3"
+
+"@babel/plugin-proposal-logical-assignment-operators@^7.18.6":
+  "integrity" "sha512-zMo66azZth/0tVd7gmkxOkOjs2rpHyhpcFo565PUP37hSp6hSd9uUKIfTDFMz58BwqgQKhJ9YxtM5XddjXVn+Q=="
+  "resolved" "https://registry.npmjs.org/@babel/plugin-proposal-logical-assignment-operators/-/plugin-proposal-logical-assignment-operators-7.18.6.tgz"
+  "version" "7.18.6"
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.18.6"
+    "@babel/plugin-syntax-logical-assignment-operators" "^7.10.4"
+
+"@babel/plugin-proposal-nullish-coalescing-operator@^7.18.6":
+  "integrity" "sha512-wQxQzxYeJqHcfppzBDnm1yAY0jSRkUXR2z8RePZYrKwMKgMlE8+Z6LUno+bd6LvbGh8Gltvy74+9pIYkr+XkKA=="
+  "resolved" "https://registry.npmjs.org/@babel/plugin-proposal-nullish-coalescing-operator/-/plugin-proposal-nullish-coalescing-operator-7.18.6.tgz"
+  "version" "7.18.6"
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.18.6"
+    "@babel/plugin-syntax-nullish-coalescing-operator" "^7.8.3"
+
+"@babel/plugin-proposal-numeric-separator@^7.18.6":
+  "integrity" "sha512-ozlZFogPqoLm8WBr5Z8UckIoE4YQ5KESVcNudyXOR8uqIkliTEgJ3RoketfG6pmzLdeZF0H/wjE9/cCEitBl7Q=="
+  "resolved" "https://registry.npmjs.org/@babel/plugin-proposal-numeric-separator/-/plugin-proposal-numeric-separator-7.18.6.tgz"
+  "version" "7.18.6"
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.18.6"
+    "@babel/plugin-syntax-numeric-separator" "^7.10.4"
+
+"@babel/plugin-proposal-object-rest-spread@^7.15.6", "@babel/plugin-proposal-object-rest-spread@^7.18.6":
+  "integrity" "sha512-9yuM6wr4rIsKa1wlUAbZEazkCrgw2sMPEXCr4Rnwetu7cEW1NydkCWytLuYletbf8vFxdJxFhwEZqMpOx2eZyw=="
+  "resolved" "https://registry.npmjs.org/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.18.6.tgz"
+  "version" "7.18.6"
+  dependencies:
+    "@babel/compat-data" "^7.18.6"
+    "@babel/helper-compilation-targets" "^7.18.6"
+    "@babel/helper-plugin-utils" "^7.18.6"
+    "@babel/plugin-syntax-object-rest-spread" "^7.8.3"
+    "@babel/plugin-transform-parameters" "^7.18.6"
 
-"@babel/helper-function-name@^7.1.0":
-  version "7.1.0"
-  resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.1.0.tgz#a0ceb01685f73355d4360c1247f582bfafc8ff53"
+"@babel/plugin-proposal-optional-catch-binding@^7.18.6":
+  "integrity" "sha512-Q40HEhs9DJQyaZfUjjn6vE8Cv4GmMHCYuMGIWUnlxH6400VGxOuwWsPt4FxXxJkC/5eOzgn0z21M9gMT4MOhbw=="
+  "resolved" "https://registry.npmjs.org/@babel/plugin-proposal-optional-catch-binding/-/plugin-proposal-optional-catch-binding-7.18.6.tgz"
+  "version" "7.18.6"
   dependencies:
-    "@babel/helper-get-function-arity" "^7.0.0"
-    "@babel/template" "^7.1.0"
-    "@babel/types" "^7.0.0"
+    "@babel/helper-plugin-utils" "^7.18.6"
+    "@babel/plugin-syntax-optional-catch-binding" "^7.8.3"
 
-"@babel/helper-get-function-arity@^7.0.0":
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/@babel/helper-get-function-arity/-/helper-get-function-arity-7.0.0.tgz#83572d4320e2a4657263734113c42868b64e49c3"
+"@babel/plugin-proposal-optional-chaining@^7.18.6":
+  "integrity" "sha512-PatI6elL5eMzoypFAiYDpYQyMtXTn+iMhuxxQt5mAXD4fEmKorpSI3PHd+i3JXBJN3xyA6MvJv7at23HffFHwA=="
+  "resolved" "https://registry.npmjs.org/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.18.6.tgz"
+  "version" "7.18.6"
   dependencies:
-    "@babel/types" "^7.0.0"
+    "@babel/helper-plugin-utils" "^7.18.6"
+    "@babel/helper-skip-transparent-expression-wrappers" "^7.18.6"
+    "@babel/plugin-syntax-optional-chaining" "^7.8.3"
 
-"@babel/helper-hoist-variables@^7.0.0":
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/@babel/helper-hoist-variables/-/helper-hoist-variables-7.0.0.tgz#46adc4c5e758645ae7a45deb92bab0918c23bb88"
+"@babel/plugin-proposal-private-methods@^7.18.6":
+  "integrity" "sha512-nutsvktDItsNn4rpGItSNV2sz1XwS+nfU0Rg8aCx3W3NOKVzdMjJRu0O5OkgDp3ZGICSTbgRpxZoWsxoKRvbeA=="
+  "resolved" "https://registry.npmjs.org/@babel/plugin-proposal-private-methods/-/plugin-proposal-private-methods-7.18.6.tgz"
+  "version" "7.18.6"
   dependencies:
-    "@babel/types" "^7.0.0"
+    "@babel/helper-create-class-features-plugin" "^7.18.6"
+    "@babel/helper-plugin-utils" "^7.18.6"
 
-"@babel/helper-member-expression-to-functions@^7.0.0":
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.0.0.tgz#8cd14b0a0df7ff00f009e7d7a436945f47c7a16f"
+"@babel/plugin-proposal-private-property-in-object@^7.18.6":
+  "integrity" "sha512-9Rysx7FOctvT5ouj5JODjAFAkgGoudQuLPamZb0v1TGLpapdNaftzifU8NTWQm0IRjqoYypdrSmyWgkocDQ8Dw=="
+  "resolved" "https://registry.npmjs.org/@babel/plugin-proposal-private-property-in-object/-/plugin-proposal-private-property-in-object-7.18.6.tgz"
+  "version" "7.18.6"
   dependencies:
-    "@babel/types" "^7.0.0"
+    "@babel/helper-annotate-as-pure" "^7.18.6"
+    "@babel/helper-create-class-features-plugin" "^7.18.6"
+    "@babel/helper-plugin-utils" "^7.18.6"
+    "@babel/plugin-syntax-private-property-in-object" "^7.14.5"
 
-"@babel/helper-module-imports@^7.0.0":
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.0.0.tgz#96081b7111e486da4d2cd971ad1a4fe216cc2e3d"
+"@babel/plugin-proposal-unicode-property-regex@^7.18.6", "@babel/plugin-proposal-unicode-property-regex@^7.4.4":
+  "integrity" "sha512-2BShG/d5yoZyXZfVePH91urL5wTG6ASZU9M4o03lKK8u8UW1y08OMttBSOADTcJrnPMpvDXRG3G8fyLh4ovs8w=="
+  "resolved" "https://registry.npmjs.org/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.18.6.tgz"
+  "version" "7.18.6"
   dependencies:
-    "@babel/types" "^7.0.0"
+    "@babel/helper-create-regexp-features-plugin" "^7.18.6"
+    "@babel/helper-plugin-utils" "^7.18.6"
 
-"@babel/helper-module-transforms@^7.1.0":
-  version "7.2.2"
-  resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.2.2.tgz#ab2f8e8d231409f8370c883d20c335190284b963"
+"@babel/plugin-syntax-async-generators@^7.8.4":
+  "integrity" "sha512-tycmZxkGfZaxhMRbXlPXuVFpdWlXpir2W4AMhSJgRKzk/eDlIXOhb2LHWoLpDF7TEHylV5zNhykX6KAgHJmTNw=="
+  "resolved" "https://registry.npmjs.org/@babel/plugin-syntax-async-generators/-/plugin-syntax-async-generators-7.8.4.tgz"
+  "version" "7.8.4"
   dependencies:
-    "@babel/helper-module-imports" "^7.0.0"
-    "@babel/helper-simple-access" "^7.1.0"
-    "@babel/helper-split-export-declaration" "^7.0.0"
-    "@babel/template" "^7.2.2"
-    "@babel/types" "^7.2.2"
-    lodash "^4.17.10"
+    "@babel/helper-plugin-utils" "^7.8.0"
 
-"@babel/helper-optimise-call-expression@^7.0.0":
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.0.0.tgz#a2920c5702b073c15de51106200aa8cad20497d5"
+"@babel/plugin-syntax-class-properties@^7.12.13":
+  "integrity" "sha512-fm4idjKla0YahUNgFNLCB0qySdsoPiZP3iQE3rky0mBUtMZ23yDJ9SJdg6dXTSDnulOVqiF3Hgr9nbXvXTQZYA=="
+  "resolved" "https://registry.npmjs.org/@babel/plugin-syntax-class-properties/-/plugin-syntax-class-properties-7.12.13.tgz"
+  "version" "7.12.13"
   dependencies:
-    "@babel/types" "^7.0.0"
+    "@babel/helper-plugin-utils" "^7.12.13"
 
-"@babel/helper-plugin-utils@^7.0.0":
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.0.0.tgz#bbb3fbee98661c569034237cc03967ba99b4f250"
-
-"@babel/helper-regex@^7.0.0":
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/@babel/helper-regex/-/helper-regex-7.0.0.tgz#2c1718923b57f9bbe64705ffe5640ac64d9bdb27"
+"@babel/plugin-syntax-class-static-block@^7.14.5":
+  "integrity" "sha512-b+YyPmr6ldyNnM6sqYeMWE+bgJcJpO6yS4QD7ymxgH34GBPNDM/THBh8iunyvKIZztiwLH4CJZ0RxTk9emgpjw=="
+  "resolved" "https://registry.npmjs.org/@babel/plugin-syntax-class-static-block/-/plugin-syntax-class-static-block-7.14.5.tgz"
+  "version" "7.14.5"
   dependencies:
-    lodash "^4.17.10"
+    "@babel/helper-plugin-utils" "^7.14.5"
 
-"@babel/helper-remap-async-to-generator@^7.1.0":
-  version "7.1.0"
-  resolved "https://registry.yarnpkg.com/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.1.0.tgz#361d80821b6f38da75bd3f0785ece20a88c5fe7f"
+"@babel/plugin-syntax-dynamic-import@^7.8.3":
+  "integrity" "sha512-5gdGbFon+PszYzqs83S3E5mpi7/y/8M9eC90MRTZfduQOYW76ig6SOSPNe41IG5LoP3FGBn2N0RjVDSQiS94kQ=="
+  "resolved" "https://registry.npmjs.org/@babel/plugin-syntax-dynamic-import/-/plugin-syntax-dynamic-import-7.8.3.tgz"
+  "version" "7.8.3"
   dependencies:
-    "@babel/helper-annotate-as-pure" "^7.0.0"
-    "@babel/helper-wrap-function" "^7.1.0"
-    "@babel/template" "^7.1.0"
-    "@babel/traverse" "^7.1.0"
-    "@babel/types" "^7.0.0"
+    "@babel/helper-plugin-utils" "^7.8.0"
 
-"@babel/helper-replace-supers@^7.1.0", "@babel/helper-replace-supers@^7.3.4":
-  version "7.3.4"
-  resolved "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.3.4.tgz#a795208e9b911a6eeb08e5891faacf06e7013e13"
+"@babel/plugin-syntax-export-namespace-from@^7.8.3":
+  "integrity" "sha512-MXf5laXo6c1IbEbegDmzGPwGNTsHZmEy6QGznu5Sh2UCWvueywb2ee+CCE4zQiZstxU9BMoQO9i6zUFSY0Kj0Q=="
+  "resolved" "https://registry.npmjs.org/@babel/plugin-syntax-export-namespace-from/-/plugin-syntax-export-namespace-from-7.8.3.tgz"
+  "version" "7.8.3"
   dependencies:
-    "@babel/helper-member-expression-to-functions" "^7.0.0"
-    "@babel/helper-optimise-call-expression" "^7.0.0"
-    "@babel/traverse" "^7.3.4"
-    "@babel/types" "^7.3.4"
+    "@babel/helper-plugin-utils" "^7.8.3"
 
-"@babel/helper-simple-access@^7.1.0":
-  version "7.1.0"
-  resolved "https://registry.yarnpkg.com/@babel/helper-simple-access/-/helper-simple-access-7.1.0.tgz#65eeb954c8c245beaa4e859da6188f39d71e585c"
+"@babel/plugin-syntax-import-assertions@^7.18.6":
+  "integrity" "sha512-/DU3RXad9+bZwrgWJQKbr39gYbJpLJHezqEzRzi/BHRlJ9zsQb4CK2CA/5apllXNomwA1qHwzvHl+AdEmC5krQ=="
+  "resolved" "https://registry.npmjs.org/@babel/plugin-syntax-import-assertions/-/plugin-syntax-import-assertions-7.18.6.tgz"
+  "version" "7.18.6"
   dependencies:
-    "@babel/template" "^7.1.0"
-    "@babel/types" "^7.0.0"
+    "@babel/helper-plugin-utils" "^7.18.6"
 
-"@babel/helper-split-export-declaration@^7.0.0":
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.0.0.tgz#3aae285c0311c2ab095d997b8c9a94cad547d813"
+"@babel/plugin-syntax-json-strings@^7.8.3":
+  "integrity" "sha512-lY6kdGpWHvjoe2vk4WrAapEuBR69EMxZl+RoGRhrFGNYVK8mOPAW8VfbT/ZgrFbXlDNiiaxQnAtgVCZ6jv30EA=="
+  "resolved" "https://registry.npmjs.org/@babel/plugin-syntax-json-strings/-/plugin-syntax-json-strings-7.8.3.tgz"
+  "version" "7.8.3"
   dependencies:
-    "@babel/types" "^7.0.0"
+    "@babel/helper-plugin-utils" "^7.8.0"
 
-"@babel/helper-wrap-function@^7.1.0":
-  version "7.2.0"
-  resolved "https://registry.yarnpkg.com/@babel/helper-wrap-function/-/helper-wrap-function-7.2.0.tgz#c4e0012445769e2815b55296ead43a958549f6fa"
+"@babel/plugin-syntax-logical-assignment-operators@^7.10.4":
+  "integrity" "sha512-d8waShlpFDinQ5MtvGU9xDAOzKH47+FFoney2baFIoMr952hKOLp1HR7VszoZvOsV/4+RRszNY7D17ba0te0ig=="
+  "resolved" "https://registry.npmjs.org/@babel/plugin-syntax-logical-assignment-operators/-/plugin-syntax-logical-assignment-operators-7.10.4.tgz"
+  "version" "7.10.4"
   dependencies:
-    "@babel/helper-function-name" "^7.1.0"
-    "@babel/template" "^7.1.0"
-    "@babel/traverse" "^7.1.0"
-    "@babel/types" "^7.2.0"
+    "@babel/helper-plugin-utils" "^7.10.4"
 
-"@babel/helpers@^7.2.0":
-  version "7.3.1"
-  resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.3.1.tgz#949eec9ea4b45d3210feb7dc1c22db664c9e44b9"
+"@babel/plugin-syntax-nullish-coalescing-operator@^7.8.3":
+  "integrity" "sha512-aSff4zPII1u2QD7y+F8oDsz19ew4IGEJg9SVW+bqwpwtfFleiQDMdzA/R+UlWDzfnHFCxxleFT0PMIrR36XLNQ=="
+  "resolved" "https://registry.npmjs.org/@babel/plugin-syntax-nullish-coalescing-operator/-/plugin-syntax-nullish-coalescing-operator-7.8.3.tgz"
+  "version" "7.8.3"
   dependencies:
-    "@babel/template" "^7.1.2"
-    "@babel/traverse" "^7.1.5"
-    "@babel/types" "^7.3.0"
+    "@babel/helper-plugin-utils" "^7.8.0"
 
-"@babel/highlight@^7.0.0":
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.0.0.tgz#f710c38c8d458e6dd9a201afb637fcb781ce99e4"
+"@babel/plugin-syntax-numeric-separator@^7.10.4":
+  "integrity" "sha512-9H6YdfkcK/uOnY/K7/aA2xpzaAgkQn37yzWUMRK7OaPOqOpGS1+n0H5hxT9AUw9EsSjPW8SVyMJwYRtWs3X3ug=="
+  "resolved" "https://registry.npmjs.org/@babel/plugin-syntax-numeric-separator/-/plugin-syntax-numeric-separator-7.10.4.tgz"
+  "version" "7.10.4"
   dependencies:
-    chalk "^2.0.0"
-    esutils "^2.0.2"
-    js-tokens "^4.0.0"
+    "@babel/helper-plugin-utils" "^7.10.4"
 
-"@babel/parser@^7.2.2", "@babel/parser@^7.3.4":
-  version "7.3.4"
-  resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.3.4.tgz#a43357e4bbf4b92a437fb9e465c192848287f27c"
-
-"@babel/plugin-proposal-async-generator-functions@^7.2.0":
-  version "7.2.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.2.0.tgz#b289b306669dce4ad20b0252889a15768c9d417e"
+"@babel/plugin-syntax-object-rest-spread@^7.8.3":
+  "integrity" "sha512-XoqMijGZb9y3y2XskN+P1wUGiVwWZ5JmoDRwx5+3GmEplNyVM2s2Dg8ILFQm8rWM48orGy5YpI5Bl8U1y7ydlA=="
+  "resolved" "https://registry.npmjs.org/@babel/plugin-syntax-object-rest-spread/-/plugin-syntax-object-rest-spread-7.8.3.tgz"
+  "version" "7.8.3"
   dependencies:
-    "@babel/helper-plugin-utils" "^7.0.0"
-    "@babel/helper-remap-async-to-generator" "^7.1.0"
-    "@babel/plugin-syntax-async-generators" "^7.2.0"
+    "@babel/helper-plugin-utils" "^7.8.0"
 
-"@babel/plugin-proposal-json-strings@^7.2.0":
-  version "7.2.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.2.0.tgz#568ecc446c6148ae6b267f02551130891e29f317"
+"@babel/plugin-syntax-optional-catch-binding@^7.8.3":
+  "integrity" "sha512-6VPD0Pc1lpTqw0aKoeRTMiB+kWhAoT24PA+ksWSBrFtl5SIRVpZlwN3NNPQjehA2E/91FV3RjLWoVTglWcSV3Q=="
+  "resolved" "https://registry.npmjs.org/@babel/plugin-syntax-optional-catch-binding/-/plugin-syntax-optional-catch-binding-7.8.3.tgz"
+  "version" "7.8.3"
   dependencies:
-    "@babel/helper-plugin-utils" "^7.0.0"
-    "@babel/plugin-syntax-json-strings" "^7.2.0"
+    "@babel/helper-plugin-utils" "^7.8.0"
 
-"@babel/plugin-proposal-object-rest-spread@^7.2.0", "@babel/plugin-proposal-object-rest-spread@^7.3.4":
-  version "7.3.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.3.4.tgz#47f73cf7f2a721aad5c0261205405c642e424654"
+"@babel/plugin-syntax-optional-chaining@^7.8.3":
+  "integrity" "sha512-KoK9ErH1MBlCPxV0VANkXW2/dw4vlbGDrFgz8bmUsBGYkFRcbRwMh6cIJubdPrkxRwuGdtCk0v/wPTKbQgBjkg=="
+  "resolved" "https://registry.npmjs.org/@babel/plugin-syntax-optional-chaining/-/plugin-syntax-optional-chaining-7.8.3.tgz"
+  "version" "7.8.3"
   dependencies:
-    "@babel/helper-plugin-utils" "^7.0.0"
-    "@babel/plugin-syntax-object-rest-spread" "^7.2.0"
+    "@babel/helper-plugin-utils" "^7.8.0"
 
-"@babel/plugin-proposal-optional-catch-binding@^7.2.0":
-  version "7.2.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-catch-binding/-/plugin-proposal-optional-catch-binding-7.2.0.tgz#135d81edb68a081e55e56ec48541ece8065c38f5"
+"@babel/plugin-syntax-private-property-in-object@^7.14.5":
+  "integrity" "sha512-0wVnp9dxJ72ZUJDV27ZfbSj6iHLoytYZmh3rFcxNnvsJF3ktkzLDZPy/mA17HGsaQT3/DQsWYX1f1QGWkCoVUg=="
+  "resolved" "https://registry.npmjs.org/@babel/plugin-syntax-private-property-in-object/-/plugin-syntax-private-property-in-object-7.14.5.tgz"
+  "version" "7.14.5"
   dependencies:
-    "@babel/helper-plugin-utils" "^7.0.0"
-    "@babel/plugin-syntax-optional-catch-binding" "^7.2.0"
+    "@babel/helper-plugin-utils" "^7.14.5"
 
-"@babel/plugin-proposal-unicode-property-regex@^7.2.0":
-  version "7.2.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.2.0.tgz#abe7281fe46c95ddc143a65e5358647792039520"
+"@babel/plugin-syntax-top-level-await@^7.14.5":
+  "integrity" "sha512-hx++upLv5U1rgYfwe1xBQUhRmU41NEvpUvrp8jkrSCdvGSnM5/qdRMtylJ6PG5OFkBaHkbTAKTnd3/YyESRHFw=="
+  "resolved" "https://registry.npmjs.org/@babel/plugin-syntax-top-level-await/-/plugin-syntax-top-level-await-7.14.5.tgz"
+  "version" "7.14.5"
   dependencies:
-    "@babel/helper-plugin-utils" "^7.0.0"
-    "@babel/helper-regex" "^7.0.0"
-    regexpu-core "^4.2.0"
+    "@babel/helper-plugin-utils" "^7.14.5"
 
-"@babel/plugin-syntax-async-generators@^7.2.0":
-  version "7.2.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-async-generators/-/plugin-syntax-async-generators-7.2.0.tgz#69e1f0db34c6f5a0cf7e2b3323bf159a76c8cb7f"
+"@babel/plugin-transform-arrow-functions@^7.18.6":
+  "integrity" "sha512-9S9X9RUefzrsHZmKMbDXxweEH+YlE8JJEuat9FdvW9Qh1cw7W64jELCtWNkPBPX5En45uy28KGvA/AySqUh8CQ=="
+  "resolved" "https://registry.npmjs.org/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.18.6.tgz"
+  "version" "7.18.6"
   dependencies:
-    "@babel/helper-plugin-utils" "^7.0.0"
+    "@babel/helper-plugin-utils" "^7.18.6"
 
-"@babel/plugin-syntax-json-strings@^7.2.0":
-  version "7.2.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-json-strings/-/plugin-syntax-json-strings-7.2.0.tgz#72bd13f6ffe1d25938129d2a186b11fd62951470"
+"@babel/plugin-transform-async-to-generator@^7.18.6":
+  "integrity" "sha512-ARE5wZLKnTgPW7/1ftQmSi1CmkqqHo2DNmtztFhvgtOWSDfq0Cq9/9L+KnZNYSNrydBekhW3rwShduf59RoXag=="
+  "resolved" "https://registry.npmjs.org/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.18.6.tgz"
+  "version" "7.18.6"
   dependencies:
-    "@babel/helper-plugin-utils" "^7.0.0"
+    "@babel/helper-module-imports" "^7.18.6"
+    "@babel/helper-plugin-utils" "^7.18.6"
+    "@babel/helper-remap-async-to-generator" "^7.18.6"
 
-"@babel/plugin-syntax-object-rest-spread@^7.2.0":
-  version "7.2.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-object-rest-spread/-/plugin-syntax-object-rest-spread-7.2.0.tgz#3b7a3e733510c57e820b9142a6579ac8b0dfad2e"
+"@babel/plugin-transform-block-scoped-functions@^7.18.6":
+  "integrity" "sha512-ExUcOqpPWnliRcPqves5HJcJOvHvIIWfuS4sroBUenPuMdmW+SMHDakmtS7qOo13sVppmUijqeTv7qqGsvURpQ=="
+  "resolved" "https://registry.npmjs.org/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.18.6.tgz"
+  "version" "7.18.6"
   dependencies:
-    "@babel/helper-plugin-utils" "^7.0.0"
+    "@babel/helper-plugin-utils" "^7.18.6"
 
-"@babel/plugin-syntax-optional-catch-binding@^7.2.0":
-  version "7.2.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-optional-catch-binding/-/plugin-syntax-optional-catch-binding-7.2.0.tgz#a94013d6eda8908dfe6a477e7f9eda85656ecf5c"
+"@babel/plugin-transform-block-scoping@^7.18.6":
+  "integrity" "sha512-pRqwb91C42vs1ahSAWJkxOxU1RHWDn16XAa6ggQ72wjLlWyYeAcLvTtE0aM8ph3KNydy9CQF2nLYcjq1WysgxQ=="
+  "resolved" "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.18.6.tgz"
+  "version" "7.18.6"
   dependencies:
-    "@babel/helper-plugin-utils" "^7.0.0"
+    "@babel/helper-plugin-utils" "^7.18.6"
 
-"@babel/plugin-transform-arrow-functions@^7.2.0":
-  version "7.2.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.2.0.tgz#9aeafbe4d6ffc6563bf8f8372091628f00779550"
+"@babel/plugin-transform-classes@^7.18.6":
+  "integrity" "sha512-RySDoXdF6hgHSHuAW4aLGyVQdmvEX/iJtjVre52k0pxRq4hzqze+rAVP++NmNv596brBpYmaiKgTZby7ziBnVg=="
+  "resolved" "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.18.8.tgz"
+  "version" "7.18.8"
   dependencies:
-    "@babel/helper-plugin-utils" "^7.0.0"
+    "@babel/helper-annotate-as-pure" "^7.18.6"
+    "@babel/helper-environment-visitor" "^7.18.6"
+    "@babel/helper-function-name" "^7.18.6"
+    "@babel/helper-optimise-call-expression" "^7.18.6"
+    "@babel/helper-plugin-utils" "^7.18.6"
+    "@babel/helper-replace-supers" "^7.18.6"
+    "@babel/helper-split-export-declaration" "^7.18.6"
+    "globals" "^11.1.0"
 
-"@babel/plugin-transform-async-to-generator@^7.3.4":
-  version "7.3.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.3.4.tgz#4e45408d3c3da231c0e7b823f407a53a7eb3048c"
+"@babel/plugin-transform-computed-properties@^7.18.6":
+  "integrity" "sha512-9repI4BhNrR0KenoR9vm3/cIc1tSBIo+u1WVjKCAynahj25O8zfbiE6JtAtHPGQSs4yZ+bA8mRasRP+qc+2R5A=="
+  "resolved" "https://registry.npmjs.org/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.18.6.tgz"
+  "version" "7.18.6"
   dependencies:
-    "@babel/helper-module-imports" "^7.0.0"
-    "@babel/helper-plugin-utils" "^7.0.0"
-    "@babel/helper-remap-async-to-generator" "^7.1.0"
+    "@babel/helper-plugin-utils" "^7.18.6"
 
-"@babel/plugin-transform-block-scoped-functions@^7.2.0":
-  version "7.2.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.2.0.tgz#5d3cc11e8d5ddd752aa64c9148d0db6cb79fd190"
+"@babel/plugin-transform-destructuring@^7.18.6":
+  "integrity" "sha512-tgy3u6lRp17ilY8r1kP4i2+HDUwxlVqq3RTc943eAWSzGgpU1qhiKpqZ5CMyHReIYPHdo3Kg8v8edKtDqSVEyQ=="
+  "resolved" "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.18.6.tgz"
+  "version" "7.18.6"
   dependencies:
-    "@babel/helper-plugin-utils" "^7.0.0"
+    "@babel/helper-plugin-utils" "^7.18.6"
 
-"@babel/plugin-transform-block-scoping@^7.3.4":
-  version "7.3.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.3.4.tgz#5c22c339de234076eee96c8783b2fed61202c5c4"
+"@babel/plugin-transform-dotall-regex@^7.18.6", "@babel/plugin-transform-dotall-regex@^7.4.4":
+  "integrity" "sha512-6S3jpun1eEbAxq7TdjLotAsl4WpQI9DxfkycRcKrjhQYzU87qpXdknpBg/e+TdcMehqGnLFi7tnFUBR02Vq6wg=="
+  "resolved" "https://registry.npmjs.org/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.18.6.tgz"
+  "version" "7.18.6"
   dependencies:
-    "@babel/helper-plugin-utils" "^7.0.0"
-    lodash "^4.17.11"
+    "@babel/helper-create-regexp-features-plugin" "^7.18.6"
+    "@babel/helper-plugin-utils" "^7.18.6"
 
-"@babel/plugin-transform-classes@^7.3.4":
-  version "7.3.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-classes/-/plugin-transform-classes-7.3.4.tgz#dc173cb999c6c5297e0b5f2277fdaaec3739d0cc"
+"@babel/plugin-transform-duplicate-keys@^7.18.6":
+  "integrity" "sha512-NJU26U/208+sxYszf82nmGYqVF9QN8py2HFTblPT9hbawi8+1C5a9JubODLTGFuT0qlkqVinmkwOD13s0sZktg=="
+  "resolved" "https://registry.npmjs.org/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.18.6.tgz"
+  "version" "7.18.6"
   dependencies:
-    "@babel/helper-annotate-as-pure" "^7.0.0"
-    "@babel/helper-define-map" "^7.1.0"
-    "@babel/helper-function-name" "^7.1.0"
-    "@babel/helper-optimise-call-expression" "^7.0.0"
-    "@babel/helper-plugin-utils" "^7.0.0"
-    "@babel/helper-replace-supers" "^7.3.4"
-    "@babel/helper-split-export-declaration" "^7.0.0"
-    globals "^11.1.0"
+    "@babel/helper-plugin-utils" "^7.18.6"
 
-"@babel/plugin-transform-computed-properties@^7.2.0":
-  version "7.2.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.2.0.tgz#83a7df6a658865b1c8f641d510c6f3af220216da"
+"@babel/plugin-transform-exponentiation-operator@^7.18.6":
+  "integrity" "sha512-wzEtc0+2c88FVR34aQmiz56dxEkxr2g8DQb/KfaFa1JYXOFVsbhvAonFN6PwVWj++fKmku8NP80plJ5Et4wqHw=="
+  "resolved" "https://registry.npmjs.org/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.18.6.tgz"
+  "version" "7.18.6"
   dependencies:
-    "@babel/helper-plugin-utils" "^7.0.0"
+    "@babel/helper-builder-binary-assignment-operator-visitor" "^7.18.6"
+    "@babel/helper-plugin-utils" "^7.18.6"
 
-"@babel/plugin-transform-destructuring@^7.2.0":
-  version "7.3.2"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.3.2.tgz#f2f5520be055ba1c38c41c0e094d8a461dd78f2d"
+"@babel/plugin-transform-for-of@^7.18.6":
+  "integrity" "sha512-yEfTRnjuskWYo0k1mHUqrVWaZwrdq8AYbfrpqULOJOaucGSp4mNMVps+YtA8byoevxS/urwU75vyhQIxcCgiBQ=="
+  "resolved" "https://registry.npmjs.org/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.18.8.tgz"
+  "version" "7.18.8"
   dependencies:
-    "@babel/helper-plugin-utils" "^7.0.0"
+    "@babel/helper-plugin-utils" "^7.18.6"
 
-"@babel/plugin-transform-dotall-regex@^7.2.0":
-  version "7.2.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.2.0.tgz#f0aabb93d120a8ac61e925ea0ba440812dbe0e49"
+"@babel/plugin-transform-function-name@^7.18.6":
+  "integrity" "sha512-kJha/Gbs5RjzIu0CxZwf5e3aTTSlhZnHMT8zPWnJMjNpLOUgqevg+PN5oMH68nMCXnfiMo4Bhgxqj59KHTlAnA=="
+  "resolved" "https://registry.npmjs.org/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.18.6.tgz"
+  "version" "7.18.6"
   dependencies:
-    "@babel/helper-plugin-utils" "^7.0.0"
-    "@babel/helper-regex" "^7.0.0"
-    regexpu-core "^4.1.3"
+    "@babel/helper-compilation-targets" "^7.18.6"
+    "@babel/helper-function-name" "^7.18.6"
+    "@babel/helper-plugin-utils" "^7.18.6"
 
-"@babel/plugin-transform-duplicate-keys@^7.2.0":
-  version "7.2.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.2.0.tgz#d952c4930f312a4dbfff18f0b2914e60c35530b3"
+"@babel/plugin-transform-literals@^7.18.6":
+  "integrity" "sha512-x3HEw0cJZVDoENXOp20HlypIHfl0zMIhMVZEBVTfmqbObIpsMxMbmU5nOEO8R7LYT+z5RORKPlTI5Hj4OsO9/Q=="
+  "resolved" "https://registry.npmjs.org/@babel/plugin-transform-literals/-/plugin-transform-literals-7.18.6.tgz"
+  "version" "7.18.6"
   dependencies:
-    "@babel/helper-plugin-utils" "^7.0.0"
+    "@babel/helper-plugin-utils" "^7.18.6"
 
-"@babel/plugin-transform-exponentiation-operator@^7.2.0":
-  version "7.2.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.2.0.tgz#a63868289e5b4007f7054d46491af51435766008"
-  dependencies:
-    "@babel/helper-builder-binary-assignment-operator-visitor" "^7.1.0"
-    "@babel/helper-plugin-utils" "^7.0.0"
+"@babel/plugin-transform-member-expression-literals@^7.18.6":
+  "integrity" "sha512-qSF1ihLGO3q+/g48k85tUjD033C29TNTVB2paCwZPVmOsjn9pClvYYrM2VeJpBY2bcNkuny0YUyTNRyRxJ54KA=="
+  "resolved" "https://registry.npmjs.org/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.18.6.tgz"
+  "version" "7.18.6"
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.18.6"
+
+"@babel/plugin-transform-modules-amd@^7.18.6":
+  "integrity" "sha512-Pra5aXsmTsOnjM3IajS8rTaLCy++nGM4v3YR4esk5PCsyg9z8NA5oQLwxzMUtDBd8F+UmVza3VxoAaWCbzH1rg=="
+  "resolved" "https://registry.npmjs.org/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.18.6.tgz"
+  "version" "7.18.6"
+  dependencies:
+    "@babel/helper-module-transforms" "^7.18.6"
+    "@babel/helper-plugin-utils" "^7.18.6"
+    "babel-plugin-dynamic-import-node" "^2.3.3"
 
-"@babel/plugin-transform-for-of@^7.2.0":
-  version "7.2.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.2.0.tgz#ab7468befa80f764bb03d3cb5eef8cc998e1cad9"
+"@babel/plugin-transform-modules-commonjs@^7.18.6":
+  "integrity" "sha512-Qfv2ZOWikpvmedXQJDSbxNqy7Xr/j2Y8/KfijM0iJyKkBTmWuvCA1yeH1yDM7NJhBW/2aXxeucLj6i80/LAJ/Q=="
+  "resolved" "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.18.6.tgz"
+  "version" "7.18.6"
+  dependencies:
+    "@babel/helper-module-transforms" "^7.18.6"
+    "@babel/helper-plugin-utils" "^7.18.6"
+    "@babel/helper-simple-access" "^7.18.6"
+    "babel-plugin-dynamic-import-node" "^2.3.3"
+
+"@babel/plugin-transform-modules-systemjs@^7.18.6":
+  "integrity" "sha512-UbPYpXxLjTw6w6yXX2BYNxF3p6QY225wcTkfQCy3OMnSlS/C3xGtwUjEzGkldb/sy6PWLiCQ3NbYfjWUTI3t4g=="
+  "resolved" "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.18.6.tgz"
+  "version" "7.18.6"
   dependencies:
-    "@babel/helper-plugin-utils" "^7.0.0"
+    "@babel/helper-hoist-variables" "^7.18.6"
+    "@babel/helper-module-transforms" "^7.18.6"
+    "@babel/helper-plugin-utils" "^7.18.6"
+    "@babel/helper-validator-identifier" "^7.18.6"
+    "babel-plugin-dynamic-import-node" "^2.3.3"
 
-"@babel/plugin-transform-function-name@^7.2.0":
-  version "7.2.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.2.0.tgz#f7930362829ff99a3174c39f0afcc024ef59731a"
+"@babel/plugin-transform-modules-umd@^7.18.6":
+  "integrity" "sha512-dcegErExVeXcRqNtkRU/z8WlBLnvD4MRnHgNs3MytRO1Mn1sHRyhbcpYbVMGclAqOjdW+9cfkdZno9dFdfKLfQ=="
+  "resolved" "https://registry.npmjs.org/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.18.6.tgz"
+  "version" "7.18.6"
   dependencies:
-    "@babel/helper-function-name" "^7.1.0"
-    "@babel/helper-plugin-utils" "^7.0.0"
+    "@babel/helper-module-transforms" "^7.18.6"
+    "@babel/helper-plugin-utils" "^7.18.6"
 
-"@babel/plugin-transform-literals@^7.2.0":
-  version "7.2.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-literals/-/plugin-transform-literals-7.2.0.tgz#690353e81f9267dad4fd8cfd77eafa86aba53ea1"
+"@babel/plugin-transform-named-capturing-groups-regex@^7.18.6":
+  "integrity" "sha512-UmEOGF8XgaIqD74bC8g7iV3RYj8lMf0Bw7NJzvnS9qQhM4mg+1WHKotUIdjxgD2RGrgFLZZPCFPFj3P/kVDYhg=="
+  "resolved" "https://registry.npmjs.org/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.18.6.tgz"
+  "version" "7.18.6"
   dependencies:
-    "@babel/helper-plugin-utils" "^7.0.0"
+    "@babel/helper-create-regexp-features-plugin" "^7.18.6"
+    "@babel/helper-plugin-utils" "^7.18.6"
 
-"@babel/plugin-transform-modules-amd@^7.2.0":
-  version "7.2.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.2.0.tgz#82a9bce45b95441f617a24011dc89d12da7f4ee6"
+"@babel/plugin-transform-new-target@^7.18.6":
+  "integrity" "sha512-DjwFA/9Iu3Z+vrAn+8pBUGcjhxKguSMlsFqeCKbhb9BAV756v0krzVK04CRDi/4aqmk8BsHb4a/gFcaA5joXRw=="
+  "resolved" "https://registry.npmjs.org/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.18.6.tgz"
+  "version" "7.18.6"
   dependencies:
-    "@babel/helper-module-transforms" "^7.1.0"
-    "@babel/helper-plugin-utils" "^7.0.0"
+    "@babel/helper-plugin-utils" "^7.18.6"
 
-"@babel/plugin-transform-modules-commonjs@^7.2.0":
-  version "7.2.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.2.0.tgz#c4f1933f5991d5145e9cfad1dfd848ea1727f404"
+"@babel/plugin-transform-object-super@^7.18.6":
+  "integrity" "sha512-uvGz6zk+pZoS1aTZrOvrbj6Pp/kK2mp45t2B+bTDre2UgsZZ8EZLSJtUg7m/no0zOJUWgFONpB7Zv9W2tSaFlA=="
+  "resolved" "https://registry.npmjs.org/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.18.6.tgz"
+  "version" "7.18.6"
   dependencies:
-    "@babel/helper-module-transforms" "^7.1.0"
-    "@babel/helper-plugin-utils" "^7.0.0"
-    "@babel/helper-simple-access" "^7.1.0"
+    "@babel/helper-plugin-utils" "^7.18.6"
+    "@babel/helper-replace-supers" "^7.18.6"
 
-"@babel/plugin-transform-modules-systemjs@^7.3.4":
-  version "7.3.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.3.4.tgz#813b34cd9acb6ba70a84939f3680be0eb2e58861"
+"@babel/plugin-transform-parameters@^7.18.6":
+  "integrity" "sha512-ivfbE3X2Ss+Fj8nnXvKJS6sjRG4gzwPMsP+taZC+ZzEGjAYlvENixmt1sZ5Ca6tWls+BlKSGKPJ6OOXvXCbkFg=="
+  "resolved" "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.18.8.tgz"
+  "version" "7.18.8"
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.18.6"
+
+"@babel/plugin-transform-property-literals@^7.18.6":
+  "integrity" "sha512-cYcs6qlgafTud3PAzrrRNbQtfpQ8+y/+M5tKmksS9+M1ckbH6kzY8MrexEM9mcA6JDsukE19iIRvAyYl463sMg=="
+  "resolved" "https://registry.npmjs.org/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.18.6.tgz"
+  "version" "7.18.6"
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.18.6"
+
+"@babel/plugin-transform-regenerator@^7.18.6":
+  "integrity" "sha512-poqRI2+qiSdeldcz4wTSTXBRryoq3Gc70ye7m7UD5Ww0nE29IXqMl6r7Nd15WBgRd74vloEMlShtH6CKxVzfmQ=="
+  "resolved" "https://registry.npmjs.org/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.18.6.tgz"
+  "version" "7.18.6"
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.18.6"
+    "regenerator-transform" "^0.15.0"
+
+"@babel/plugin-transform-reserved-words@^7.18.6":
+  "integrity" "sha512-oX/4MyMoypzHjFrT1CdivfKZ+XvIPMFXwwxHp/r0Ddy2Vuomt4HDFGmft1TAY2yiTKiNSsh3kjBAzcM8kSdsjA=="
+  "resolved" "https://registry.npmjs.org/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.18.6.tgz"
+  "version" "7.18.6"
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.18.6"
+
+"@babel/plugin-transform-runtime@^7.15.8":
+  "integrity" "sha512-8uRHk9ZmRSnWqUgyae249EJZ94b0yAGLBIqzZzl+0iEdbno55Pmlt/32JZsHwXD9k/uZj18Aqqk35wBX4CBTXA=="
+  "resolved" "https://registry.npmjs.org/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.18.6.tgz"
+  "version" "7.18.6"
+  dependencies:
+    "@babel/helper-module-imports" "^7.18.6"
+    "@babel/helper-plugin-utils" "^7.18.6"
+    "babel-plugin-polyfill-corejs2" "^0.3.1"
+    "babel-plugin-polyfill-corejs3" "^0.5.2"
+    "babel-plugin-polyfill-regenerator" "^0.3.1"
+    "semver" "^6.3.0"
+
+"@babel/plugin-transform-shorthand-properties@^7.18.6":
+  "integrity" "sha512-eCLXXJqv8okzg86ywZJbRn19YJHU4XUa55oz2wbHhaQVn/MM+XhukiT7SYqp/7o00dg52Rj51Ny+Ecw4oyoygw=="
+  "resolved" "https://registry.npmjs.org/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.18.6.tgz"
+  "version" "7.18.6"
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.18.6"
+
+"@babel/plugin-transform-spread@^7.18.6":
+  "integrity" "sha512-ayT53rT/ENF8WWexIRg9AiV9h0aIteyWn5ptfZTZQrjk/+f3WdrJGCY4c9wcgl2+MKkKPhzbYp97FTsquZpDCw=="
+  "resolved" "https://registry.npmjs.org/@babel/plugin-transform-spread/-/plugin-transform-spread-7.18.6.tgz"
+  "version" "7.18.6"
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.18.6"
+    "@babel/helper-skip-transparent-expression-wrappers" "^7.18.6"
+
+"@babel/plugin-transform-sticky-regex@^7.18.6":
+  "integrity" "sha512-kfiDrDQ+PBsQDO85yj1icueWMfGfJFKN1KCkndygtu/C9+XUfydLC8Iv5UYJqRwy4zk8EcplRxEOeLyjq1gm6Q=="
+  "resolved" "https://registry.npmjs.org/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.18.6.tgz"
+  "version" "7.18.6"
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.18.6"
+
+"@babel/plugin-transform-template-literals@^7.18.6":
+  "integrity" "sha512-UuqlRrQmT2SWRvahW46cGSany0uTlcj8NYOS5sRGYi8FxPYPoLd5DDmMd32ZXEj2Jq+06uGVQKHxa/hJx2EzKw=="
+  "resolved" "https://registry.npmjs.org/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.18.6.tgz"
+  "version" "7.18.6"
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.18.6"
+
+"@babel/plugin-transform-typeof-symbol@^7.18.6":
+  "integrity" "sha512-7m71iS/QhsPk85xSjFPovHPcH3H9qeyzsujhTc+vcdnsXavoWYJ74zx0lP5RhpC5+iDnVLO+PPMHzC11qels1g=="
+  "resolved" "https://registry.npmjs.org/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.18.6.tgz"
+  "version" "7.18.6"
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.18.6"
+
+"@babel/plugin-transform-unicode-escapes@^7.18.6":
+  "integrity" "sha512-XNRwQUXYMP7VLuy54cr/KS/WeL3AZeORhrmeZ7iewgu+X2eBqmpaLI/hzqr9ZxCeUoq0ASK4GUzSM0BDhZkLFw=="
+  "resolved" "https://registry.npmjs.org/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.18.6.tgz"
+  "version" "7.18.6"
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.18.6"
+
+"@babel/plugin-transform-unicode-regex@^7.18.6":
+  "integrity" "sha512-gE7A6Lt7YLnNOL3Pb9BNeZvi+d8l7tcRrG4+pwJjK9hD2xX4mEvjlQW60G9EEmfXVYRPv9VRQcyegIVHCql/AA=="
+  "resolved" "https://registry.npmjs.org/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.18.6.tgz"
+  "version" "7.18.6"
+  dependencies:
+    "@babel/helper-create-regexp-features-plugin" "^7.18.6"
+    "@babel/helper-plugin-utils" "^7.18.6"
+
+"@babel/preset-env@^7.15.8":
+  "integrity" "sha512-WrthhuIIYKrEFAwttYzgRNQ5hULGmwTj+D6l7Zdfsv5M7IWV/OZbUfbeL++Qrzx1nVJwWROIFhCHRYQV4xbPNw=="
+  "resolved" "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.18.6.tgz"
+  "version" "7.18.6"
+  dependencies:
+    "@babel/compat-data" "^7.18.6"
+    "@babel/helper-compilation-targets" "^7.18.6"
+    "@babel/helper-plugin-utils" "^7.18.6"
+    "@babel/helper-validator-option" "^7.18.6"
+    "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression" "^7.18.6"
+    "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining" "^7.18.6"
+    "@babel/plugin-proposal-async-generator-functions" "^7.18.6"
+    "@babel/plugin-proposal-class-properties" "^7.18.6"
+    "@babel/plugin-proposal-class-static-block" "^7.18.6"
+    "@babel/plugin-proposal-dynamic-import" "^7.18.6"
+    "@babel/plugin-proposal-export-namespace-from" "^7.18.6"
+    "@babel/plugin-proposal-json-strings" "^7.18.6"
+    "@babel/plugin-proposal-logical-assignment-operators" "^7.18.6"
+    "@babel/plugin-proposal-nullish-coalescing-operator" "^7.18.6"
+    "@babel/plugin-proposal-numeric-separator" "^7.18.6"
+    "@babel/plugin-proposal-object-rest-spread" "^7.18.6"
+    "@babel/plugin-proposal-optional-catch-binding" "^7.18.6"
+    "@babel/plugin-proposal-optional-chaining" "^7.18.6"
+    "@babel/plugin-proposal-private-methods" "^7.18.6"
+    "@babel/plugin-proposal-private-property-in-object" "^7.18.6"
+    "@babel/plugin-proposal-unicode-property-regex" "^7.18.6"
+    "@babel/plugin-syntax-async-generators" "^7.8.4"
+    "@babel/plugin-syntax-class-properties" "^7.12.13"
+    "@babel/plugin-syntax-class-static-block" "^7.14.5"
+    "@babel/plugin-syntax-dynamic-import" "^7.8.3"
+    "@babel/plugin-syntax-export-namespace-from" "^7.8.3"
+    "@babel/plugin-syntax-import-assertions" "^7.18.6"
+    "@babel/plugin-syntax-json-strings" "^7.8.3"
+    "@babel/plugin-syntax-logical-assignment-operators" "^7.10.4"
+    "@babel/plugin-syntax-nullish-coalescing-operator" "^7.8.3"
+    "@babel/plugin-syntax-numeric-separator" "^7.10.4"
+    "@babel/plugin-syntax-object-rest-spread" "^7.8.3"
+    "@babel/plugin-syntax-optional-catch-binding" "^7.8.3"
+    "@babel/plugin-syntax-optional-chaining" "^7.8.3"
+    "@babel/plugin-syntax-private-property-in-object" "^7.14.5"
+    "@babel/plugin-syntax-top-level-await" "^7.14.5"
+    "@babel/plugin-transform-arrow-functions" "^7.18.6"
+    "@babel/plugin-transform-async-to-generator" "^7.18.6"
+    "@babel/plugin-transform-block-scoped-functions" "^7.18.6"
+    "@babel/plugin-transform-block-scoping" "^7.18.6"
+    "@babel/plugin-transform-classes" "^7.18.6"
+    "@babel/plugin-transform-computed-properties" "^7.18.6"
+    "@babel/plugin-transform-destructuring" "^7.18.6"
+    "@babel/plugin-transform-dotall-regex" "^7.18.6"
+    "@babel/plugin-transform-duplicate-keys" "^7.18.6"
+    "@babel/plugin-transform-exponentiation-operator" "^7.18.6"
+    "@babel/plugin-transform-for-of" "^7.18.6"
+    "@babel/plugin-transform-function-name" "^7.18.6"
+    "@babel/plugin-transform-literals" "^7.18.6"
+    "@babel/plugin-transform-member-expression-literals" "^7.18.6"
+    "@babel/plugin-transform-modules-amd" "^7.18.6"
+    "@babel/plugin-transform-modules-commonjs" "^7.18.6"
+    "@babel/plugin-transform-modules-systemjs" "^7.18.6"
+    "@babel/plugin-transform-modules-umd" "^7.18.6"
+    "@babel/plugin-transform-named-capturing-groups-regex" "^7.18.6"
+    "@babel/plugin-transform-new-target" "^7.18.6"
+    "@babel/plugin-transform-object-super" "^7.18.6"
+    "@babel/plugin-transform-parameters" "^7.18.6"
+    "@babel/plugin-transform-property-literals" "^7.18.6"
+    "@babel/plugin-transform-regenerator" "^7.18.6"
+    "@babel/plugin-transform-reserved-words" "^7.18.6"
+    "@babel/plugin-transform-shorthand-properties" "^7.18.6"
+    "@babel/plugin-transform-spread" "^7.18.6"
+    "@babel/plugin-transform-sticky-regex" "^7.18.6"
+    "@babel/plugin-transform-template-literals" "^7.18.6"
+    "@babel/plugin-transform-typeof-symbol" "^7.18.6"
+    "@babel/plugin-transform-unicode-escapes" "^7.18.6"
+    "@babel/plugin-transform-unicode-regex" "^7.18.6"
+    "@babel/preset-modules" "^0.1.5"
+    "@babel/types" "^7.18.6"
+    "babel-plugin-polyfill-corejs2" "^0.3.1"
+    "babel-plugin-polyfill-corejs3" "^0.5.2"
+    "babel-plugin-polyfill-regenerator" "^0.3.1"
+    "core-js-compat" "^3.22.1"
+    "semver" "^6.3.0"
+
+"@babel/preset-modules@^0.1.5":
+  "integrity" "sha512-A57th6YRG7oR3cq/yt/Y84MvGgE0eJG2F1JLhKuyG+jFxEgrd/HAMJatiFtmOiZurz+0DkrvbheCLaV5f2JfjA=="
+  "resolved" "https://registry.npmjs.org/@babel/preset-modules/-/preset-modules-0.1.5.tgz"
+  "version" "0.1.5"
   dependencies:
-    "@babel/helper-hoist-variables" "^7.0.0"
     "@babel/helper-plugin-utils" "^7.0.0"
-
-"@babel/plugin-transform-modules-umd@^7.2.0":
-  version "7.2.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.2.0.tgz#7678ce75169f0877b8eb2235538c074268dd01ae"
+    "@babel/plugin-proposal-unicode-property-regex" "^7.4.4"
+    "@babel/plugin-transform-dotall-regex" "^7.4.4"
+    "@babel/types" "^7.4.4"
+    "esutils" "^2.0.2"
+
+"@babel/runtime-corejs3@^7.16.5":
+  "integrity" "sha512-cOu5wH2JFBgMjje+a+fz2JNIWU4GzYpl05oSob3UDvBEh6EuIn+TXFHMmBbhSb+k/4HMzgKCQfEEDArAWNF9Cw=="
+  "resolved" "https://registry.npmjs.org/@babel/runtime-corejs3/-/runtime-corejs3-7.18.6.tgz"
+  "version" "7.18.6"
+  dependencies:
+    "core-js-pure" "^3.20.2"
+    "regenerator-runtime" "^0.13.4"
+
+"@babel/runtime@^7.15.4", "@babel/runtime@^7.8.4":
+  "integrity" "sha512-t9wi7/AW6XtKahAe20Yw0/mMljKq0B1r2fPdvaAdV/KPDZewFXdaaa6K7lxmZBZ8FBNpCiAT6iHPmd6QO9bKfQ=="
+  "resolved" "https://registry.npmjs.org/@babel/runtime/-/runtime-7.18.6.tgz"
+  "version" "7.18.6"
+  dependencies:
+    "regenerator-runtime" "^0.13.4"
+
+"@babel/template@^7.18.6", "@babel/template@^7.22.15":
+  "integrity" "sha512-QPErUVm4uyJa60rkI73qneDacvdvzxshT3kksGqlGWYdOTIUOwJ7RDUL8sGqslY1uXWSL6xMFKEXDS3ox2uF0w=="
+  "resolved" "https://registry.npmjs.org/@babel/template/-/template-7.22.15.tgz"
+  "version" "7.22.15"
+  dependencies:
+    "@babel/code-frame" "^7.22.13"
+    "@babel/parser" "^7.22.15"
+    "@babel/types" "^7.22.15"
+
+"@babel/traverse@^7.13.0", "@babel/traverse@^7.18.6", "@babel/traverse@^7.18.8":
+  "integrity" "sha512-azpe59SQ48qG6nu2CzcMLbxUudtN+dOM9kDbUqGq3HXUJRlo7i8fvPoxQUzYgLZ4cMVmuZgm8vvBpNeRhd6XSw=="
+  "resolved" "https://registry.npmjs.org/@babel/traverse/-/traverse-7.23.2.tgz"
+  "version" "7.23.2"
+  dependencies:
+    "@babel/code-frame" "^7.22.13"
+    "@babel/generator" "^7.23.0"
+    "@babel/helper-environment-visitor" "^7.22.20"
+    "@babel/helper-function-name" "^7.23.0"
+    "@babel/helper-hoist-variables" "^7.22.5"
+    "@babel/helper-split-export-declaration" "^7.22.6"
+    "@babel/parser" "^7.23.0"
+    "@babel/types" "^7.23.0"
+    "debug" "^4.1.0"
+    "globals" "^11.1.0"
+
+"@babel/types@^7.0.0", "@babel/types@^7.18.6", "@babel/types@^7.18.8", "@babel/types@^7.20.7", "@babel/types@^7.22.15", "@babel/types@^7.22.5", "@babel/types@^7.23.0", "@babel/types@^7.4.4":
+  "integrity" "sha512-0oIyUfKoI3mSqMvsxBdclDwxXKXAUA8v/apZbc+iSyARYou1o8ZGDxbUYyLFoW2arqS2jDGqJuZvv1d/io1axg=="
+  "resolved" "https://registry.npmjs.org/@babel/types/-/types-7.23.0.tgz"
+  "version" "7.23.0"
+  dependencies:
+    "@babel/helper-string-parser" "^7.22.5"
+    "@babel/helper-validator-identifier" "^7.22.20"
+    "to-fast-properties" "^2.0.0"
+
+"@colors/colors@1.5.0":
+  "integrity" "sha512-ooWCrlZP11i8GImSjTHYHLkvFDP48nS4+204nGb1RiX/WXYHmJA2III9/e2DWVabCESdW7hBAEzHRqUn9OUVvQ=="
+  "resolved" "https://registry.npmjs.org/@colors/colors/-/colors-1.5.0.tgz"
+  "version" "1.5.0"
+
+"@discoveryjs/json-ext@^0.5.0":
+  "integrity" "sha512-dBVuXR082gk3jsFp7Rd/JI4kytwGHecnCoTtXFb7DB6CNHp4rg5k1bhg0nWdLGLnOV71lmDzGQaLMy8iPLY0pw=="
+  "resolved" "https://registry.npmjs.org/@discoveryjs/json-ext/-/json-ext-0.5.7.tgz"
+  "version" "0.5.7"
+
+"@jridgewell/gen-mapping@^0.1.0":
+  "integrity" "sha512-sQXCasFk+U8lWYEe66WxRDOE9PjVz4vSM51fTu3Hw+ClTpUSQb718772vH3pyS5pShp6lvQM7SxgIDXXXmOX7w=="
+  "resolved" "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.1.1.tgz"
+  "version" "0.1.1"
+  dependencies:
+    "@jridgewell/set-array" "^1.0.0"
+    "@jridgewell/sourcemap-codec" "^1.4.10"
+
+"@jridgewell/gen-mapping@^0.3.0":
+  "integrity" "sha512-HLhSWOLRi875zjjMG/r+Nv0oCW8umGb0BgEhyX3dDX3egwZtB8PqLnjz3yedt8R5StBrzcg4aBpnh8UA9D1BoQ=="
+  "resolved" "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.3.tgz"
+  "version" "0.3.3"
+  dependencies:
+    "@jridgewell/set-array" "^1.0.1"
+    "@jridgewell/sourcemap-codec" "^1.4.10"
+    "@jridgewell/trace-mapping" "^0.3.9"
+
+"@jridgewell/gen-mapping@^0.3.2":
+  "integrity" "sha512-mh65xKQAzI6iBcFzwv28KVWSmCkdRBWoOh+bYQGW3+6OZvbbN3TqMGo5hqYxQniRcH9F2VZIoJCm4pa3BPDK/A=="
+  "resolved" "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.2.tgz"
+  "version" "0.3.2"
+  dependencies:
+    "@jridgewell/set-array" "^1.0.1"
+    "@jridgewell/sourcemap-codec" "^1.4.10"
+    "@jridgewell/trace-mapping" "^0.3.9"
+
+"@jridgewell/resolve-uri@^3.1.0":
+  "integrity" "sha512-F2msla3tad+Mfht5cJq7LSXcdudKTWCVYUgw6pLFOOHSTtZlj6SWNYAp+AhuqLmWdBO2X5hPrLcu8cVP8fy28w=="
+  "resolved" "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.1.0.tgz"
+  "version" "3.1.0"
+
+"@jridgewell/set-array@^1.0.0", "@jridgewell/set-array@^1.0.1":
+  "integrity" "sha512-xnkseuNADM0gt2bs+BvhO0p78Mk762YnZdsuzFV018NoG1Sj1SCQvpSqa7XUaTam5vAGasABV9qXASMKnFMwMw=="
+  "resolved" "https://registry.npmjs.org/@jridgewell/set-array/-/set-array-1.1.2.tgz"
+  "version" "1.1.2"
+
+"@jridgewell/source-map@^0.3.3":
+  "integrity" "sha512-UTYAUj/wviwdsMfzoSJspJxbkH5o1snzwX0//0ENX1u/55kkZZkcTZP6u9bwKGkv+dkk9at4m1Cpt0uY80kcpQ=="
+  "resolved" "https://registry.npmjs.org/@jridgewell/source-map/-/source-map-0.3.5.tgz"
+  "version" "0.3.5"
+  dependencies:
+    "@jridgewell/gen-mapping" "^0.3.0"
+    "@jridgewell/trace-mapping" "^0.3.9"
+
+"@jridgewell/sourcemap-codec@^1.4.10", "@jridgewell/sourcemap-codec@^1.4.14", "@jridgewell/sourcemap-codec@^1.4.15":
+  "integrity" "sha512-eF2rxCRulEKXHTRiDrDy6erMYWqNw4LPdQ8UQA4huuxaQsVeRPFl2oM8oDGxMFhJUWZf9McpLtJasDDZb/Bpeg=="
+  "resolved" "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.15.tgz"
+  "version" "1.4.15"
+
+"@jridgewell/trace-mapping@^0.3.17", "@jridgewell/trace-mapping@^0.3.9":
+  "integrity" "sha512-R8LcPeWZol2zR8mmH3JeKQ6QRCFb7XgUhV9ZlGhHLGyg4wpPiPZNQOOWhFZhxKw8u//yTbNGI42Bx/3paXEQ+Q=="
+  "resolved" "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.20.tgz"
+  "version" "0.3.20"
+  dependencies:
+    "@jridgewell/resolve-uri" "^3.1.0"
+    "@jridgewell/sourcemap-codec" "^1.4.14"
+
+"@leichtgewicht/ip-codec@^2.0.1":
+  "integrity" "sha512-Hcv+nVC0kZnQ3tD9GVu5xSMR4VVYOteQIr/hwFPVEvPdlXqgGEuRjiheChHgdM+JyqdgNcmzZOX/tnl0JOiI7A=="
+  "resolved" "https://registry.npmjs.org/@leichtgewicht/ip-codec/-/ip-codec-2.0.4.tgz"
+  "version" "2.0.4"
+
+"@nodelib/fs.scandir@2.1.5":
+  "integrity" "sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g=="
+  "resolved" "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz"
+  "version" "2.1.5"
+  dependencies:
+    "@nodelib/fs.stat" "2.0.5"
+    "run-parallel" "^1.1.9"
+
+"@nodelib/fs.stat@^2.0.2", "@nodelib/fs.stat@2.0.5":
+  "integrity" "sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A=="
+  "resolved" "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz"
+  "version" "2.0.5"
+
+"@nodelib/fs.walk@^1.2.3":
+  "integrity" "sha512-oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg=="
+  "resolved" "https://registry.npmjs.org/@nodelib/fs.walk/-/fs.walk-1.2.8.tgz"
+  "version" "1.2.8"
+  dependencies:
+    "@nodelib/fs.scandir" "2.1.5"
+    "fastq" "^1.6.0"
+
+"@one-ini/wasm@0.1.1":
+  "integrity" "sha512-XuySG1E38YScSJoMlqovLru4KTUNSjgVTIjyh7qMX6aNN5HY5Ct5LhRJdxO79JtTzKfzV/bnWpz+zquYrISsvw=="
+  "resolved" "https://registry.npmjs.org/@one-ini/wasm/-/wasm-0.1.1.tgz"
+  "version" "0.1.1"
+
+"@prettier/plugin-php@^0.19.7":
+  "integrity" "sha512-QOzBs05nwuR92uak7xBHf7RCZCFXml+6Sk3cjTp2ahQlilBtupqlNjitlTXsOfPIAYwlFgLP1oSfyapS6DN00w=="
+  "resolved" "https://registry.npmjs.org/@prettier/plugin-php/-/plugin-php-0.19.7.tgz"
+  "version" "0.19.7"
+  dependencies:
+    "linguist-languages" "^7.21.0"
+    "mem" "^8.0.0"
+    "php-parser" "^3.1.5"
+
+"@shufo/tailwindcss-class-sorter@3.0.1":
+  "integrity" "sha512-y9SMobvwElX2G6vdg4odJ6UL6hu/o5RlMsdwEeDLGaqHU3BLSw9CeitGgBus6kadjjDdT2wseG0Tl5yXWdc4UQ=="
+  "resolved" "https://registry.npmjs.org/@shufo/tailwindcss-class-sorter/-/tailwindcss-class-sorter-3.0.1.tgz"
+  "version" "3.0.1"
+  dependencies:
+    "escalade" "^3.1.1"
+    "object-hash" "^3.0.0"
+    "tailwindcss" "^3.3.2"
+
+"@trysound/sax@0.2.0":
+  "integrity" "sha512-L7z9BgrNEcYyUYtF+HaEfiS5ebkh9jXqbszz7pC0hRBPaatV0XjSD3+eHrpqFemQfgwiFF0QPIarnIihIDn7OA=="
+  "resolved" "https://registry.npmjs.org/@trysound/sax/-/sax-0.2.0.tgz"
+  "version" "0.2.0"
+
+"@types/babel__core@^7.1.16":
+  "integrity" "sha512-54fjTSeSHwfan8AyHWrKbfBWiEUrNTZsUwPTDSNaaP1QDQIZbeNUg3a59E9D+375MzUw/x1vx2/0F5LBz+AeYA=="
+  "resolved" "https://registry.npmjs.org/@types/babel__core/-/babel__core-7.20.3.tgz"
+  "version" "7.20.3"
+  dependencies:
+    "@babel/parser" "^7.20.7"
+    "@babel/types" "^7.20.7"
+    "@types/babel__generator" "*"
+    "@types/babel__template" "*"
+    "@types/babel__traverse" "*"
+
+"@types/babel__generator@*":
+  "integrity" "sha512-66BXMKb/sUWbMdBNdMvajU7i/44RkrA3z/Yt1c7R5xejt8qh84iU54yUWCtm0QwGJlDcf/gg4zd/x4mpLAlb/w=="
+  "resolved" "https://registry.npmjs.org/@types/babel__generator/-/babel__generator-7.6.6.tgz"
+  "version" "7.6.6"
   dependencies:
-    "@babel/helper-module-transforms" "^7.1.0"
-    "@babel/helper-plugin-utils" "^7.0.0"
+    "@babel/types" "^7.0.0"
 
-"@babel/plugin-transform-named-capturing-groups-regex@^7.3.0":
-  version "7.3.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.3.0.tgz#140b52985b2d6ef0cb092ef3b29502b990f9cd50"
+"@types/babel__template@*":
+  "integrity" "sha512-ciwyCLeuRfxboZ4isgdNZi/tkt06m8Tw6uGbBSBgWrnnZGNXiEyM27xc/PjXGQLqlZ6ylbgHMnm7ccF9tCkOeQ=="
+  "resolved" "https://registry.npmjs.org/@types/babel__template/-/babel__template-7.4.3.tgz"
+  "version" "7.4.3"
   dependencies:
-    regexp-tree "^0.1.0"
+    "@babel/parser" "^7.1.0"
+    "@babel/types" "^7.0.0"
 
-"@babel/plugin-transform-new-target@^7.0.0":
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.0.0.tgz#ae8fbd89517fa7892d20e6564e641e8770c3aa4a"
+"@types/babel__traverse@*":
+  "integrity" "sha512-Lsh766rGEFbaxMIDH7Qa+Yha8cMVI3qAK6CHt3OR0YfxOIn5Z54iHiyDRycHrBqeIiqGa20Kpsv1cavfBKkRSw=="
+  "resolved" "https://registry.npmjs.org/@types/babel__traverse/-/babel__traverse-7.20.3.tgz"
+  "version" "7.20.3"
   dependencies:
-    "@babel/helper-plugin-utils" "^7.0.0"
+    "@babel/types" "^7.20.7"
 
-"@babel/plugin-transform-object-super@^7.2.0":
-  version "7.2.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.2.0.tgz#b35d4c10f56bab5d650047dad0f1d8e8814b6598"
+"@types/body-parser@*":
+  "integrity" "sha512-N7UDG0/xiPQa2D/XrVJXjkWbpqHCd2sBaB32ggRF2l83RhPfamgKGF8gwwqyksS95qUS5ZYF9aF+lLPRlwI2UA=="
+  "resolved" "https://registry.npmjs.org/@types/body-parser/-/body-parser-1.19.4.tgz"
+  "version" "1.19.4"
   dependencies:
-    "@babel/helper-plugin-utils" "^7.0.0"
-    "@babel/helper-replace-supers" "^7.1.0"
+    "@types/connect" "*"
+    "@types/node" "*"
 
-"@babel/plugin-transform-parameters@^7.2.0":
-  version "7.3.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.3.3.tgz#3a873e07114e1a5bee17d04815662c8317f10e30"
+"@types/bonjour@^3.5.9":
+  "integrity" "sha512-ky0kWSqXVxSqgqJvPIkgFkcn4C8MnRog308Ou8xBBIVo39OmUFy+jqNe0nPwLCDFxUpmT9EvT91YzOJgkDRcFg=="
+  "resolved" "https://registry.npmjs.org/@types/bonjour/-/bonjour-3.5.12.tgz"
+  "version" "3.5.12"
   dependencies:
-    "@babel/helper-call-delegate" "^7.1.0"
-    "@babel/helper-get-function-arity" "^7.0.0"
-    "@babel/helper-plugin-utils" "^7.0.0"
+    "@types/node" "*"
 
-"@babel/plugin-transform-regenerator@^7.3.4":
-  version "7.3.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.3.4.tgz#1601655c362f5b38eead6a52631f5106b29fa46a"
+"@types/clean-css@^4.2.5":
+  "integrity" "sha512-pjzJ4n5eAXAz/L5Zur4ZymuJUvyo0Uh0iRnRI/1kADFLs76skDky0K0dX1rlv4iXXrJXNk3sxRWVJR7CMDroWA=="
+  "resolved" "https://registry.npmjs.org/@types/clean-css/-/clean-css-4.2.9.tgz"
+  "version" "4.2.9"
   dependencies:
-    regenerator-transform "^0.13.4"
+    "@types/node" "*"
+    "source-map" "^0.6.0"
 
-"@babel/plugin-transform-runtime@^7.2.0":
-  version "7.3.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.3.4.tgz#57805ac8c1798d102ecd75c03b024a5b3ea9b431"
+"@types/connect-history-api-fallback@^1.3.5":
+  "integrity" "sha512-gX2j9x+NzSh4zOhnRPSdPPmTepS4DfxES0AvIFv3jGv5QyeAJf6u6dY5/BAoAJU9Qq1uTvwOku8SSC2GnCRl6Q=="
+  "resolved" "https://registry.npmjs.org/@types/connect-history-api-fallback/-/connect-history-api-fallback-1.5.2.tgz"
+  "version" "1.5.2"
   dependencies:
-    "@babel/helper-module-imports" "^7.0.0"
-    "@babel/helper-plugin-utils" "^7.0.0"
-    resolve "^1.8.1"
-    semver "^5.5.1"
+    "@types/express-serve-static-core" "*"
+    "@types/node" "*"
 
-"@babel/plugin-transform-shorthand-properties@^7.2.0":
-  version "7.2.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.2.0.tgz#6333aee2f8d6ee7e28615457298934a3b46198f0"
+"@types/connect@*":
+  "integrity" "sha512-zBUSRqkfZ59OcwXon4HVxhx5oWCJmc0OtBTK05M+p0dYjgN6iTwIL2T/WbsQZrEsdnwaF9cWQ+azOnpPvIqY3Q=="
+  "resolved" "https://registry.npmjs.org/@types/connect/-/connect-3.4.37.tgz"
+  "version" "3.4.37"
   dependencies:
-    "@babel/helper-plugin-utils" "^7.0.0"
+    "@types/node" "*"
 
-"@babel/plugin-transform-spread@^7.2.0":
-  version "7.2.2"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-spread/-/plugin-transform-spread-7.2.2.tgz#3103a9abe22f742b6d406ecd3cd49b774919b406"
+"@types/eslint-scope@^3.7.3":
+  "integrity" "sha512-9K4zoImiZc3HlIp6AVUDE4CWYx22a+lhSZMYNpbjW04+YF0KWj4pJXnEMjdnFTiQibFFmElcsasJXDbdI/EPhA=="
+  "resolved" "https://registry.npmjs.org/@types/eslint-scope/-/eslint-scope-3.7.4.tgz"
+  "version" "3.7.4"
   dependencies:
-    "@babel/helper-plugin-utils" "^7.0.0"
+    "@types/eslint" "*"
+    "@types/estree" "*"
 
-"@babel/plugin-transform-sticky-regex@^7.2.0":
-  version "7.2.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.2.0.tgz#a1e454b5995560a9c1e0d537dfc15061fd2687e1"
+"@types/eslint@*":
+  "integrity" "sha512-dhsC09y1gpJWnK+Ff4SGvCuSnk9DaU0BJZSzOwa6GVSg65XtTugLBITDAAzRU5duGBoXBHpdR/9jHGxJjNflJQ=="
+  "resolved" "https://registry.npmjs.org/@types/eslint/-/eslint-8.4.5.tgz"
+  "version" "8.4.5"
   dependencies:
-    "@babel/helper-plugin-utils" "^7.0.0"
-    "@babel/helper-regex" "^7.0.0"
+    "@types/estree" "*"
+    "@types/json-schema" "*"
 
-"@babel/plugin-transform-template-literals@^7.2.0":
-  version "7.2.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.2.0.tgz#d87ed01b8eaac7a92473f608c97c089de2ba1e5b"
-  dependencies:
-    "@babel/helper-annotate-as-pure" "^7.0.0"
-    "@babel/helper-plugin-utils" "^7.0.0"
+"@types/estree@*", "@types/estree@^1.0.0":
+  "integrity" "sha512-CS2rOaoQ/eAgAfcTfq6amKG7bsN+EMcgGY4FAFQdvSj2y1ixvOZTUA9mOtCai7E1SYu283XNw7urKK30nP3wkQ=="
+  "resolved" "https://registry.npmjs.org/@types/estree/-/estree-1.0.3.tgz"
+  "version" "1.0.3"
 
-"@babel/plugin-transform-typeof-symbol@^7.2.0":
-  version "7.2.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.2.0.tgz#117d2bcec2fbf64b4b59d1f9819894682d29f2b2"
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.0.0"
+"@types/express-serve-static-core@*", "@types/express-serve-static-core@^4.17.33":
+  "integrity" "sha512-BiEUfAiGCOllomsRAZOiMFP7LAnrifHpt56pc4Z7l9K6ACyN06Ns1JLMBxwkfLOjJRlSf06NwWsT7yzfpaVpyQ=="
+  "resolved" "https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-4.17.39.tgz"
+  "version" "4.17.39"
+  dependencies:
+    "@types/node" "*"
+    "@types/qs" "*"
+    "@types/range-parser" "*"
+    "@types/send" "*"
+
+"@types/express@*", "@types/express@^4.17.13":
+  "integrity" "sha512-rOaqlkgEvOW495xErXMsmyX3WKBInbhG5eqojXYi3cGUaLoRDlXa5d52fkfWZT963AZ3v2eZ4MbKE6WpDAGVsw=="
+  "resolved" "https://registry.npmjs.org/@types/express/-/express-4.17.20.tgz"
+  "version" "4.17.20"
+  dependencies:
+    "@types/body-parser" "*"
+    "@types/express-serve-static-core" "^4.17.33"
+    "@types/qs" "*"
+    "@types/serve-static" "*"
+
+"@types/glob@^7.1.1":
+  "integrity" "sha512-ZUxbzKl0IfJILTS6t7ip5fQQM/J3TJYubDm3nMbgubNNYS62eXeUpoLUC8/7fJNiFYHTrGPQn7hspDUzIHX3UA=="
+  "resolved" "https://registry.npmjs.org/@types/glob/-/glob-7.2.0.tgz"
+  "version" "7.2.0"
+  dependencies:
+    "@types/minimatch" "*"
+    "@types/node" "*"
+
+"@types/http-errors@*":
+  "integrity" "sha512-pP0P/9BnCj1OVvQR2lF41EkDG/lWWnDyA203b/4Fmi2eTyORnBtcDoKDwjWQthELrBvWkMOrvSOnZ8OVlW6tXA=="
+  "resolved" "https://registry.npmjs.org/@types/http-errors/-/http-errors-2.0.3.tgz"
+  "version" "2.0.3"
+
+"@types/http-proxy@^1.17.8":
+  "integrity" "sha512-GkhdWcMNiR5QSQRYnJ+/oXzu0+7JJEPC8vkWXK351BkhjraZF+1W13CUYARUvX9+NqIU2n6YHA4iwywsc/M6Sw=="
+  "resolved" "https://registry.npmjs.org/@types/http-proxy/-/http-proxy-1.17.13.tgz"
+  "version" "1.17.13"
+  dependencies:
+    "@types/node" "*"
+
+"@types/imagemin-gifsicle@^7.0.1":
+  "integrity" "sha512-GQBKOk9doOd0Xp7OvO4QDl7U0Vkwk2Ps7J0rxafdAa7wG9lu7idvZTm8TtSZiRtHENdkW88Kz8OjmjMlgeeC5w=="
+  "resolved" "https://registry.npmjs.org/@types/imagemin-gifsicle/-/imagemin-gifsicle-7.0.3.tgz"
+  "version" "7.0.3"
+  dependencies:
+    "@types/imagemin" "*"
+
+"@types/imagemin-mozjpeg@^8.0.1":
+  "integrity" "sha512-+U/ibETP2/oRqeuaaXa67dEpKHfzmfK0OBVC09AR4c1CIFAKjQ5xY+dxH+fjoMQRlwdcRQLkn/ALtnxSl3Xsqw=="
+  "resolved" "https://registry.npmjs.org/@types/imagemin-mozjpeg/-/imagemin-mozjpeg-8.0.3.tgz"
+  "version" "8.0.3"
+  dependencies:
+    "@types/imagemin" "*"
+
+"@types/imagemin-optipng@^5.2.1":
+  "integrity" "sha512-Q80ANbJYn+WgKkWVfx9f7/q4LR6qun4NIiuV1eRWCg8KCAmNrU7ZH16a2hGs9kfkFqyJlhBv6oV9SDXe1vL3aQ=="
+  "resolved" "https://registry.npmjs.org/@types/imagemin-optipng/-/imagemin-optipng-5.2.3.tgz"
+  "version" "5.2.3"
+  dependencies:
+    "@types/imagemin" "*"
+
+"@types/imagemin-svgo@^8.0.0":
+  "integrity" "sha512-YafkdrVAcr38U0Ln1C+L1n4SIZqC47VBHTyxCq7gTUSd1R9MdIvMcrljWlgU1M9O68WZDeQWUrKipKYfEOCOvQ=="
+  "resolved" "https://registry.npmjs.org/@types/imagemin-svgo/-/imagemin-svgo-8.0.1.tgz"
+  "version" "8.0.1"
+  dependencies:
+    "@types/imagemin" "*"
+    "@types/svgo" "^1"
+
+"@types/imagemin@*":
+  "integrity" "sha512-se/hpaYxu5DyvPqmUEwbupmbQSx6JNislk0dkoIgWSmArkj+Ow9pGG9pGz8MRmbQDfGNYNzqwPQKHCUy+K+jpQ=="
+  "resolved" "https://registry.npmjs.org/@types/imagemin/-/imagemin-8.0.3.tgz"
+  "version" "8.0.3"
+  dependencies:
+    "@types/node" "*"
+
+"@types/json-schema@*", "@types/json-schema@^7.0.5", "@types/json-schema@^7.0.8", "@types/json-schema@^7.0.9":
+  "integrity" "sha512-qcUXuemtEu+E5wZSJHNxUXeCZhAfXKQ41D+duX+VYPde7xyEVZci+/oXKJL13tnRs9lR2pr4fod59GT6/X1/yQ=="
+  "resolved" "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.9.tgz"
+  "version" "7.0.9"
+
+"@types/mime@*", "@types/mime@^1":
+  "integrity" "sha512-1Gjee59G25MrQGk8bsNvC6fxNiRgUlGn2wlhGf95a59DrprnnHk80FIMMFG9XHMdrfsuA119ht06QPDXA1Z7tw=="
+  "resolved" "https://registry.npmjs.org/@types/mime/-/mime-1.3.4.tgz"
+  "version" "1.3.4"
+
+"@types/minimatch@*":
+  "integrity" "sha512-K0VQKziLUWkVKiRVrx4a40iPaxTUefQmjtkQofBkYRcoaaL/8rhwDWww9qWbrgicNOgnpIsMxyNIUM4+n6dUIA=="
+  "resolved" "https://registry.npmjs.org/@types/minimatch/-/minimatch-5.1.2.tgz"
+  "version" "5.1.2"
+
+"@types/node@*":
+  "integrity" "sha512-En7tneq+j0qAiVwysBD79y86MT3ModuoIJbe7JXp+sb5UAjInSShmK3nXXMioBzfF7rXC12hv12d4IyCVwN4dA=="
+  "resolved" "https://registry.npmjs.org/@types/node/-/node-18.0.5.tgz"
+  "version" "18.0.5"
+
+"@types/parse-json@^4.0.0":
+  "integrity" "sha512-3YmXzzPAdOTVljVMkTMBdBEvlOLg2cDQaDhnnhT3nT9uDbnJzjWhKlzb+desT12Y7tGqaN6d+AbozcKzyL36Ng=="
+  "resolved" "https://registry.npmjs.org/@types/parse-json/-/parse-json-4.0.1.tgz"
+  "version" "4.0.1"
+
+"@types/qs@*":
+  "integrity" "sha512-wYLxw35euwqGvTDx6zfY1vokBFnsK0HNrzc6xNHchxfO2hpuRg74GbkEW7e3sSmPvj0TjCDT1VCa6OtHXnubsg=="
+  "resolved" "https://registry.npmjs.org/@types/qs/-/qs-6.9.9.tgz"
+  "version" "6.9.9"
+
+"@types/range-parser@*":
+  "integrity" "sha512-+0autS93xyXizIYiyL02FCY8N+KkKPhILhcUSA276HxzreZ16kl+cmwvV2qAM/PuCCwPXzOXOWhiPcw20uSFcA=="
+  "resolved" "https://registry.npmjs.org/@types/range-parser/-/range-parser-1.2.6.tgz"
+  "version" "1.2.6"
+
+"@types/retry@0.12.0":
+  "integrity" "sha512-wWKOClTTiizcZhXnPY4wikVAwmdYHp8q6DmC+EJUzAMsycb7HB32Kh9RN4+0gExjmPmZSAQjgURXIGATPegAvA=="
+  "resolved" "https://registry.npmjs.org/@types/retry/-/retry-0.12.0.tgz"
+  "version" "0.12.0"
+
+"@types/send@*":
+  "integrity" "sha512-/7fKxvKUoETxjFUsuFlPB9YndePpxxRAOfGC/yJdc9kTjTeP5kRCTzfnE8kPUKCeyiyIZu0YQ76s50hCedI1ug=="
+  "resolved" "https://registry.npmjs.org/@types/send/-/send-0.17.3.tgz"
+  "version" "0.17.3"
+  dependencies:
+    "@types/mime" "^1"
+    "@types/node" "*"
+
+"@types/serve-index@^1.9.1":
+  "integrity" "sha512-4KG+yMEuvDPRrYq5fyVm/I2uqAJSAwZK9VSa+Zf+zUq9/oxSSvy3kkIqyL+jjStv6UCVi8/Aho0NHtB1Fwosrg=="
+  "resolved" "https://registry.npmjs.org/@types/serve-index/-/serve-index-1.9.3.tgz"
+  "version" "1.9.3"
+  dependencies:
+    "@types/express" "*"
+
+"@types/serve-static@*", "@types/serve-static@^1.13.10":
+  "integrity" "sha512-aqqNfs1XTF0HDrFdlY//+SGUxmdSUbjeRXb5iaZc3x0/vMbYmdw9qvOgHWOyyLFxSSRnUuP5+724zBgfw8/WAw=="
+  "resolved" "https://registry.npmjs.org/@types/serve-static/-/serve-static-1.15.4.tgz"
+  "version" "1.15.4"
+  dependencies:
+    "@types/http-errors" "*"
+    "@types/mime" "*"
+    "@types/node" "*"
+
+"@types/sockjs@^0.3.33":
+  "integrity" "sha512-tIF57KB+ZvOBpAQwSaACfEu7htponHXaFzP7RfKYgsOS0NoYnn+9+jzp7bbq4fWerizI3dTB4NfAZoyeQKWJLw=="
+  "resolved" "https://registry.npmjs.org/@types/sockjs/-/sockjs-0.3.35.tgz"
+  "version" "0.3.35"
+  dependencies:
+    "@types/node" "*"
+
+"@types/svgo@^1":
+  "integrity" "sha512-AZU7vQcy/4WFEuwnwsNsJnFwupIpbllH1++LXScN6uxT1Z4zPzdrWG97w4/I7eFKFTvfy/bHFStWjdBAg2Vjug=="
+  "resolved" "https://registry.npmjs.org/@types/svgo/-/svgo-1.3.6.tgz"
+  "version" "1.3.6"
+
+"@types/ws@^8.5.5":
+  "integrity" "sha512-flUksGIQCnJd6sZ1l5dqCEG/ksaoAg/eUwiLAGTJQcfgvZJKF++Ta4bJA6A5aPSJmsr+xlseHn4KLgVlNnvPTg=="
+  "resolved" "https://registry.npmjs.org/@types/ws/-/ws-8.5.8.tgz"
+  "version" "8.5.8"
+  dependencies:
+    "@types/node" "*"
+
+"@vue/compiler-core@3.3.13":
+  "integrity" "sha512-bwi9HShGu7uaZLOErZgsH2+ojsEdsjerbf2cMXPwmvcgZfVPZ2BVZzCVnwZBxTAYd6Mzbmf6izcUNDkWnBBQ6A=="
+  "resolved" "https://registry.npmjs.org/@vue/compiler-core/-/compiler-core-3.3.13.tgz"
+  "version" "3.3.13"
+  dependencies:
+    "@babel/parser" "^7.23.5"
+    "@vue/shared" "3.3.13"
+    "estree-walker" "^2.0.2"
+    "source-map-js" "^1.0.2"
+
+"@vue/compiler-dom@3.3.13":
+  "integrity" "sha512-EYRDpbLadGtNL0Gph+HoKiYqXLqZ0xSSpR5Dvnu/Ep7ggaCbjRDIus1MMxTS2Qm0koXED4xSlvTZaTnI8cYAsw=="
+  "resolved" "https://registry.npmjs.org/@vue/compiler-dom/-/compiler-dom-3.3.13.tgz"
+  "version" "3.3.13"
+  dependencies:
+    "@vue/compiler-core" "3.3.13"
+    "@vue/shared" "3.3.13"
+
+"@vue/compiler-sfc@3.3.13":
+  "integrity" "sha512-DQVmHEy/EKIgggvnGRLx21hSqnr1smUS9Aq8tfxiiot8UR0/pXKHN9k78/qQ7etyQTFj5em5nruODON7dBeumw=="
+  "resolved" "https://registry.npmjs.org/@vue/compiler-sfc/-/compiler-sfc-3.3.13.tgz"
+  "version" "3.3.13"
+  dependencies:
+    "@babel/parser" "^7.23.5"
+    "@vue/compiler-core" "3.3.13"
+    "@vue/compiler-dom" "3.3.13"
+    "@vue/compiler-ssr" "3.3.13"
+    "@vue/reactivity-transform" "3.3.13"
+    "@vue/shared" "3.3.13"
+    "estree-walker" "^2.0.2"
+    "magic-string" "^0.30.5"
+    "postcss" "^8.4.32"
+    "source-map-js" "^1.0.2"
+
+"@vue/compiler-ssr@3.3.13":
+  "integrity" "sha512-d/P3bCeUGmkJNS1QUZSAvoCIW4fkOKK3l2deE7zrp0ypJEy+En2AcypIkqvcFQOcw3F0zt2VfMvNsA9JmExTaw=="
+  "resolved" "https://registry.npmjs.org/@vue/compiler-ssr/-/compiler-ssr-3.3.13.tgz"
+  "version" "3.3.13"
+  dependencies:
+    "@vue/compiler-dom" "3.3.13"
+    "@vue/shared" "3.3.13"
+
+"@vue/reactivity-transform@3.3.13":
+  "integrity" "sha512-oWnydGH0bBauhXvh5KXUy61xr9gKaMbtsMHk40IK9M4gMuKPJ342tKFarY0eQ6jef8906m35q37wwA8DMZOm5Q=="
+  "resolved" "https://registry.npmjs.org/@vue/reactivity-transform/-/reactivity-transform-3.3.13.tgz"
+  "version" "3.3.13"
+  dependencies:
+    "@babel/parser" "^7.23.5"
+    "@vue/compiler-core" "3.3.13"
+    "@vue/shared" "3.3.13"
+    "estree-walker" "^2.0.2"
+    "magic-string" "^0.30.5"
+
+"@vue/reactivity@3.3.13":
+  "integrity" "sha512-fjzCxceMahHhi4AxUBzQqqVhuA21RJ0COaWTbIBl1PruGW1CeY97louZzLi4smpYx+CHfFPPU/CS8NybbGvPKQ=="
+  "resolved" "https://registry.npmjs.org/@vue/reactivity/-/reactivity-3.3.13.tgz"
+  "version" "3.3.13"
+  dependencies:
+    "@vue/shared" "3.3.13"
+
+"@vue/runtime-core@3.3.13":
+  "integrity" "sha512-1TzA5TvGuh2zUwMJgdfvrBABWZ7y8kBwBhm7BXk8rvdx2SsgcGfz2ruv2GzuGZNvL1aKnK8CQMV/jFOrxNQUMA=="
+  "resolved" "https://registry.npmjs.org/@vue/runtime-core/-/runtime-core-3.3.13.tgz"
+  "version" "3.3.13"
+  dependencies:
+    "@vue/reactivity" "3.3.13"
+    "@vue/shared" "3.3.13"
+
+"@vue/runtime-dom@3.3.13":
+  "integrity" "sha512-JJkpE8R/hJKXqVTgUoODwS5wqKtOsmJPEqmp90PDVGygtJ4C0PtOkcEYXwhiVEmef6xeXcIlrT3Yo5aQ4qkHhQ=="
+  "resolved" "https://registry.npmjs.org/@vue/runtime-dom/-/runtime-dom-3.3.13.tgz"
+  "version" "3.3.13"
+  dependencies:
+    "@vue/runtime-core" "3.3.13"
+    "@vue/shared" "3.3.13"
+    "csstype" "^3.1.3"
+
+"@vue/server-renderer@3.3.13":
+  "integrity" "sha512-vSnN+nuf6iSqTL3Qgx/9A+BT+0Zf/VJOgF5uMZrKjYPs38GMYyAU1coDyBNHauehXDaP+zl73VhwWv0vBRBHcg=="
+  "resolved" "https://registry.npmjs.org/@vue/server-renderer/-/server-renderer-3.3.13.tgz"
+  "version" "3.3.13"
+  dependencies:
+    "@vue/compiler-ssr" "3.3.13"
+    "@vue/shared" "3.3.13"
+
+"@vue/shared@3.3.13":
+  "integrity" "sha512-/zYUwiHD8j7gKx2argXEMCUXVST6q/21DFU0sTfNX0URJroCe3b1UF6vLJ3lQDfLNIiiRl2ONp7Nh5UVWS6QnA=="
+  "resolved" "https://registry.npmjs.org/@vue/shared/-/shared-3.3.13.tgz"
+  "version" "3.3.13"
+
+"@webassemblyjs/ast@^1.11.5", "@webassemblyjs/ast@1.11.6":
+  "integrity" "sha512-IN1xI7PwOvLPgjcf180gC1bqn3q/QaOCwYUahIOhbYUu8KA/3tw2RT/T0Gidi1l7Hhj5D/INhJxiICObqpMu4Q=="
+  "resolved" "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.11.6.tgz"
+  "version" "1.11.6"
+  dependencies:
+    "@webassemblyjs/helper-numbers" "1.11.6"
+    "@webassemblyjs/helper-wasm-bytecode" "1.11.6"
+
+"@webassemblyjs/floating-point-hex-parser@1.11.6":
+  "integrity" "sha512-ejAj9hfRJ2XMsNHk/v6Fu2dGS+i4UaXBXGemOfQ/JfQ6mdQg/WXtwleQRLLS4OvfDhv8rYnVwH27YJLMyYsxhw=="
+  "resolved" "https://registry.npmjs.org/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.11.6.tgz"
+  "version" "1.11.6"
+
+"@webassemblyjs/helper-api-error@1.11.6":
+  "integrity" "sha512-o0YkoP4pVu4rN8aTJgAyj9hC2Sv5UlkzCHhxqWj8butaLvnpdc2jOwh4ewE6CX0txSfLn/UYaV/pheS2Txg//Q=="
+  "resolved" "https://registry.npmjs.org/@webassemblyjs/helper-api-error/-/helper-api-error-1.11.6.tgz"
+  "version" "1.11.6"
+
+"@webassemblyjs/helper-buffer@1.11.6":
+  "integrity" "sha512-z3nFzdcp1mb8nEOFFk8DrYLpHvhKC3grJD2ardfKOzmbmJvEf/tPIqCY+sNcwZIY8ZD7IkB2l7/pqhUhqm7hLA=="
+  "resolved" "https://registry.npmjs.org/@webassemblyjs/helper-buffer/-/helper-buffer-1.11.6.tgz"
+  "version" "1.11.6"
+
+"@webassemblyjs/helper-numbers@1.11.6":
+  "integrity" "sha512-vUIhZ8LZoIWHBohiEObxVm6hwP034jwmc9kuq5GdHZH0wiLVLIPcMCdpJzG4C11cHoQ25TFIQj9kaVADVX7N3g=="
+  "resolved" "https://registry.npmjs.org/@webassemblyjs/helper-numbers/-/helper-numbers-1.11.6.tgz"
+  "version" "1.11.6"
+  dependencies:
+    "@webassemblyjs/floating-point-hex-parser" "1.11.6"
+    "@webassemblyjs/helper-api-error" "1.11.6"
+    "@xtuc/long" "4.2.2"
 
-"@babel/plugin-transform-unicode-regex@^7.2.0":
-  version "7.2.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.2.0.tgz#4eb8db16f972f8abb5062c161b8b115546ade08b"
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.0.0"
-    "@babel/helper-regex" "^7.0.0"
-    regexpu-core "^4.1.3"
+"@webassemblyjs/helper-wasm-bytecode@1.11.6":
+  "integrity" "sha512-sFFHKwcmBprO9e7Icf0+gddyWYDViL8bpPjJJl0WHxCdETktXdmtWLGVzoHbqUcY4Be1LkNfwTmXOJUFZYSJdA=="
+  "resolved" "https://registry.npmjs.org/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.11.6.tgz"
+  "version" "1.11.6"
 
-"@babel/preset-env@^7.2.0":
-  version "7.3.4"
-  resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.3.4.tgz#887cf38b6d23c82f19b5135298bdb160062e33e1"
+"@webassemblyjs/helper-wasm-section@1.11.6":
+  "integrity" "sha512-LPpZbSOwTpEC2cgn4hTydySy1Ke+XEu+ETXuoyvuyezHO3Kjdu90KK95Sh9xTbmjrCsUwvWwCOQQNta37VrS9g=="
+  "resolved" "https://registry.npmjs.org/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.11.6.tgz"
+  "version" "1.11.6"
   dependencies:
-    "@babel/helper-module-imports" "^7.0.0"
-    "@babel/helper-plugin-utils" "^7.0.0"
-    "@babel/plugin-proposal-async-generator-functions" "^7.2.0"
-    "@babel/plugin-proposal-json-strings" "^7.2.0"
-    "@babel/plugin-proposal-object-rest-spread" "^7.3.4"
-    "@babel/plugin-proposal-optional-catch-binding" "^7.2.0"
-    "@babel/plugin-proposal-unicode-property-regex" "^7.2.0"
-    "@babel/plugin-syntax-async-generators" "^7.2.0"
-    "@babel/plugin-syntax-json-strings" "^7.2.0"
-    "@babel/plugin-syntax-object-rest-spread" "^7.2.0"
-    "@babel/plugin-syntax-optional-catch-binding" "^7.2.0"
-    "@babel/plugin-transform-arrow-functions" "^7.2.0"
-    "@babel/plugin-transform-async-to-generator" "^7.3.4"
-    "@babel/plugin-transform-block-scoped-functions" "^7.2.0"
-    "@babel/plugin-transform-block-scoping" "^7.3.4"
-    "@babel/plugin-transform-classes" "^7.3.4"
-    "@babel/plugin-transform-computed-properties" "^7.2.0"
-    "@babel/plugin-transform-destructuring" "^7.2.0"
-    "@babel/plugin-transform-dotall-regex" "^7.2.0"
-    "@babel/plugin-transform-duplicate-keys" "^7.2.0"
-    "@babel/plugin-transform-exponentiation-operator" "^7.2.0"
-    "@babel/plugin-transform-for-of" "^7.2.0"
-    "@babel/plugin-transform-function-name" "^7.2.0"
-    "@babel/plugin-transform-literals" "^7.2.0"
-    "@babel/plugin-transform-modules-amd" "^7.2.0"
-    "@babel/plugin-transform-modules-commonjs" "^7.2.0"
-    "@babel/plugin-transform-modules-systemjs" "^7.3.4"
-    "@babel/plugin-transform-modules-umd" "^7.2.0"
-    "@babel/plugin-transform-named-capturing-groups-regex" "^7.3.0"
-    "@babel/plugin-transform-new-target" "^7.0.0"
-    "@babel/plugin-transform-object-super" "^7.2.0"
-    "@babel/plugin-transform-parameters" "^7.2.0"
-    "@babel/plugin-transform-regenerator" "^7.3.4"
-    "@babel/plugin-transform-shorthand-properties" "^7.2.0"
-    "@babel/plugin-transform-spread" "^7.2.0"
-    "@babel/plugin-transform-sticky-regex" "^7.2.0"
-    "@babel/plugin-transform-template-literals" "^7.2.0"
-    "@babel/plugin-transform-typeof-symbol" "^7.2.0"
-    "@babel/plugin-transform-unicode-regex" "^7.2.0"
-    browserslist "^4.3.4"
-    invariant "^2.2.2"
-    js-levenshtein "^1.1.3"
-    semver "^5.3.0"
-
-"@babel/runtime@^7.2.0":
-  version "7.3.4"
-  resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.3.4.tgz#73d12ba819e365fcf7fd152aed56d6df97d21c83"
-  dependencies:
-    regenerator-runtime "^0.12.0"
-
-"@babel/template@^7.1.0", "@babel/template@^7.1.2", "@babel/template@^7.2.2":
-  version "7.2.2"
-  resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.2.2.tgz#005b3fdf0ed96e88041330379e0da9a708eb2907"
-  dependencies:
-    "@babel/code-frame" "^7.0.0"
-    "@babel/parser" "^7.2.2"
-    "@babel/types" "^7.2.2"
+    "@webassemblyjs/ast" "1.11.6"
+    "@webassemblyjs/helper-buffer" "1.11.6"
+    "@webassemblyjs/helper-wasm-bytecode" "1.11.6"
+    "@webassemblyjs/wasm-gen" "1.11.6"
 
-"@babel/traverse@^7.1.0", "@babel/traverse@^7.1.5", "@babel/traverse@^7.3.4":
-  version "7.3.4"
-  resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.3.4.tgz#1330aab72234f8dea091b08c4f8b9d05c7119e06"
-  dependencies:
-    "@babel/code-frame" "^7.0.0"
-    "@babel/generator" "^7.3.4"
-    "@babel/helper-function-name" "^7.1.0"
-    "@babel/helper-split-export-declaration" "^7.0.0"
-    "@babel/parser" "^7.3.4"
-    "@babel/types" "^7.3.4"
-    debug "^4.1.0"
-    globals "^11.1.0"
-    lodash "^4.17.11"
-
-"@babel/types@^7.0.0", "@babel/types@^7.2.0", "@babel/types@^7.2.2", "@babel/types@^7.3.0", "@babel/types@^7.3.4":
-  version "7.3.4"
-  resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.3.4.tgz#bf482eaeaffb367a28abbf9357a94963235d90ed"
-  dependencies:
-    esutils "^2.0.2"
-    lodash "^4.17.11"
-    to-fast-properties "^2.0.0"
-
-"@mrmlnc/readdir-enhanced@^2.2.1":
-  version "2.2.1"
-  resolved "https://registry.yarnpkg.com/@mrmlnc/readdir-enhanced/-/readdir-enhanced-2.2.1.tgz#524af240d1a360527b730475ecfa1344aa540dde"
-  dependencies:
-    call-me-maybe "^1.0.1"
-    glob-to-regexp "^0.3.0"
-
-"@nodelib/fs.stat@^1.1.2":
-  version "1.1.3"
-  resolved "https://registry.yarnpkg.com/@nodelib/fs.stat/-/fs.stat-1.1.3.tgz#2b5a3ab3f918cca48a8c754c08168e3f03eba61b"
-
-"@types/q@^1.5.1":
-  version "1.5.1"
-  resolved "https://registry.yarnpkg.com/@types/q/-/q-1.5.1.tgz#48fd98c1561fe718b61733daed46ff115b496e18"
-
-"@vue/component-compiler-utils@^2.5.1":
-  version "2.6.0"
-  resolved "https://registry.yarnpkg.com/@vue/component-compiler-utils/-/component-compiler-utils-2.6.0.tgz#aa46d2a6f7647440b0b8932434d22f12371e543b"
-  dependencies:
-    consolidate "^0.15.1"
-    hash-sum "^1.0.2"
-    lru-cache "^4.1.2"
-    merge-source-map "^1.1.0"
-    postcss "^7.0.14"
-    postcss-selector-parser "^5.0.0"
-    prettier "1.16.3"
-    source-map "~0.6.1"
-    vue-template-es2015-compiler "^1.9.0"
-
-"@webassemblyjs/ast@1.8.3":
-  version "1.8.3"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/ast/-/ast-1.8.3.tgz#63a741bd715a6b6783f2ea5c6ab707516aa215eb"
-  dependencies:
-    "@webassemblyjs/helper-module-context" "1.8.3"
-    "@webassemblyjs/helper-wasm-bytecode" "1.8.3"
-    "@webassemblyjs/wast-parser" "1.8.3"
-
-"@webassemblyjs/floating-point-hex-parser@1.8.3":
-  version "1.8.3"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.8.3.tgz#f198a2d203b3c50846a064f5addd6a133ef9bc0e"
-
-"@webassemblyjs/helper-api-error@1.8.3":
-  version "1.8.3"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-api-error/-/helper-api-error-1.8.3.tgz#3b708f6926accd64dcbaa7ba5b63db5660ff4f66"
-
-"@webassemblyjs/helper-buffer@1.8.3":
-  version "1.8.3"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-buffer/-/helper-buffer-1.8.3.tgz#f3150a23ffaba68621e1f094c8a14bebfd53dd48"
-
-"@webassemblyjs/helper-code-frame@1.8.3":
-  version "1.8.3"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-code-frame/-/helper-code-frame-1.8.3.tgz#f43ac605789b519d95784ef350fd2968aebdd3ef"
-  dependencies:
-    "@webassemblyjs/wast-printer" "1.8.3"
-
-"@webassemblyjs/helper-fsm@1.8.3":
-  version "1.8.3"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-fsm/-/helper-fsm-1.8.3.tgz#46aaa03f41082a916850ebcb97e9fc198ef36a9c"
-
-"@webassemblyjs/helper-module-context@1.8.3":
-  version "1.8.3"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-module-context/-/helper-module-context-1.8.3.tgz#150da405d90c8ea81ae0b0e1965b7b64e585634f"
-  dependencies:
-    "@webassemblyjs/ast" "1.8.3"
-    mamacro "^0.0.3"
-
-"@webassemblyjs/helper-wasm-bytecode@1.8.3":
-  version "1.8.3"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.8.3.tgz#12f55bbafbbc7ddf9d8059a072cb7b0c17987901"
-
-"@webassemblyjs/helper-wasm-section@1.8.3":
-  version "1.8.3"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.8.3.tgz#9e79456d9719e116f4f8998ee62ab54ba69a6cf3"
-  dependencies:
-    "@webassemblyjs/ast" "1.8.3"
-    "@webassemblyjs/helper-buffer" "1.8.3"
-    "@webassemblyjs/helper-wasm-bytecode" "1.8.3"
-    "@webassemblyjs/wasm-gen" "1.8.3"
-
-"@webassemblyjs/ieee754@1.8.3":
-  version "1.8.3"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/ieee754/-/ieee754-1.8.3.tgz#0a89355b1f6c9d08d0605c2acbc2a6fe3141f5b4"
+"@webassemblyjs/ieee754@1.11.6":
+  "integrity" "sha512-LM4p2csPNvbij6U1f19v6WR56QZ8JcHg3QIJTlSwzFcmx6WSORicYj6I63f9yU1kEUtrpG+kjkiIAkevHpDXrg=="
+  "resolved" "https://registry.npmjs.org/@webassemblyjs/ieee754/-/ieee754-1.11.6.tgz"
+  "version" "1.11.6"
   dependencies:
     "@xtuc/ieee754" "^1.2.0"
 
-"@webassemblyjs/leb128@1.8.3":
-  version "1.8.3"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/leb128/-/leb128-1.8.3.tgz#b7fd9d7c039e34e375c4473bd4dc89ce8228b920"
+"@webassemblyjs/leb128@1.11.6":
+  "integrity" "sha512-m7a0FhE67DQXgouf1tbN5XQcdWoNgaAuoULHIfGFIEVKA6tu/edls6XnIlkmS6FrXAquJRPni3ZZKjw6FSPjPQ=="
+  "resolved" "https://registry.npmjs.org/@webassemblyjs/leb128/-/leb128-1.11.6.tgz"
+  "version" "1.11.6"
   dependencies:
     "@xtuc/long" "4.2.2"
 
-"@webassemblyjs/utf8@1.8.3":
-  version "1.8.3"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/utf8/-/utf8-1.8.3.tgz#75712db52cfdda868731569ddfe11046f1f1e7a2"
-
-"@webassemblyjs/wasm-edit@1.8.3":
-  version "1.8.3"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-edit/-/wasm-edit-1.8.3.tgz#23c3c6206b096f9f6aa49623a5310a102ef0fb87"
-  dependencies:
-    "@webassemblyjs/ast" "1.8.3"
-    "@webassemblyjs/helper-buffer" "1.8.3"
-    "@webassemblyjs/helper-wasm-bytecode" "1.8.3"
-    "@webassemblyjs/helper-wasm-section" "1.8.3"
-    "@webassemblyjs/wasm-gen" "1.8.3"
-    "@webassemblyjs/wasm-opt" "1.8.3"
-    "@webassemblyjs/wasm-parser" "1.8.3"
-    "@webassemblyjs/wast-printer" "1.8.3"
-
-"@webassemblyjs/wasm-gen@1.8.3":
-  version "1.8.3"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-gen/-/wasm-gen-1.8.3.tgz#1a433b8ab97e074e6ac2e25fcbc8cb6125400813"
-  dependencies:
-    "@webassemblyjs/ast" "1.8.3"
-    "@webassemblyjs/helper-wasm-bytecode" "1.8.3"
-    "@webassemblyjs/ieee754" "1.8.3"
-    "@webassemblyjs/leb128" "1.8.3"
-    "@webassemblyjs/utf8" "1.8.3"
-
-"@webassemblyjs/wasm-opt@1.8.3":
-  version "1.8.3"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-opt/-/wasm-opt-1.8.3.tgz#54754bcf88f88e92b909416a91125301cc81419c"
-  dependencies:
-    "@webassemblyjs/ast" "1.8.3"
-    "@webassemblyjs/helper-buffer" "1.8.3"
-    "@webassemblyjs/wasm-gen" "1.8.3"
-    "@webassemblyjs/wasm-parser" "1.8.3"
-
-"@webassemblyjs/wasm-parser@1.8.3":
-  version "1.8.3"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-parser/-/wasm-parser-1.8.3.tgz#d12ed19d1b8e8667a7bee040d2245aaaf215340b"
-  dependencies:
-    "@webassemblyjs/ast" "1.8.3"
-    "@webassemblyjs/helper-api-error" "1.8.3"
-    "@webassemblyjs/helper-wasm-bytecode" "1.8.3"
-    "@webassemblyjs/ieee754" "1.8.3"
-    "@webassemblyjs/leb128" "1.8.3"
-    "@webassemblyjs/utf8" "1.8.3"
-
-"@webassemblyjs/wast-parser@1.8.3":
-  version "1.8.3"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/wast-parser/-/wast-parser-1.8.3.tgz#44aa123e145503e995045dc3e5e2770069da117b"
-  dependencies:
-    "@webassemblyjs/ast" "1.8.3"
-    "@webassemblyjs/floating-point-hex-parser" "1.8.3"
-    "@webassemblyjs/helper-api-error" "1.8.3"
-    "@webassemblyjs/helper-code-frame" "1.8.3"
-    "@webassemblyjs/helper-fsm" "1.8.3"
-    "@xtuc/long" "4.2.2"
-
-"@webassemblyjs/wast-printer@1.8.3":
-  version "1.8.3"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/wast-printer/-/wast-printer-1.8.3.tgz#b1177780b266b1305f2eeba87c4d6aa732352060"
-  dependencies:
-    "@webassemblyjs/ast" "1.8.3"
-    "@webassemblyjs/wast-parser" "1.8.3"
+"@webassemblyjs/utf8@1.11.6":
+  "integrity" "sha512-vtXf2wTQ3+up9Zsg8sa2yWiQpzSsMyXj0qViVP6xKGCUT8p8YJ6HqI7l5eCnWx1T/FYdsv07HQs2wTFbbof/RA=="
+  "resolved" "https://registry.npmjs.org/@webassemblyjs/utf8/-/utf8-1.11.6.tgz"
+  "version" "1.11.6"
+
+"@webassemblyjs/wasm-edit@^1.11.5":
+  "integrity" "sha512-Ybn2I6fnfIGuCR+Faaz7YcvtBKxvoLV3Lebn1tM4o/IAJzmi9AWYIPWpyBfU8cC+JxAO57bk4+zdsTjJR+VTOw=="
+  "resolved" "https://registry.npmjs.org/@webassemblyjs/wasm-edit/-/wasm-edit-1.11.6.tgz"
+  "version" "1.11.6"
+  dependencies:
+    "@webassemblyjs/ast" "1.11.6"
+    "@webassemblyjs/helper-buffer" "1.11.6"
+    "@webassemblyjs/helper-wasm-bytecode" "1.11.6"
+    "@webassemblyjs/helper-wasm-section" "1.11.6"
+    "@webassemblyjs/wasm-gen" "1.11.6"
+    "@webassemblyjs/wasm-opt" "1.11.6"
+    "@webassemblyjs/wasm-parser" "1.11.6"
+    "@webassemblyjs/wast-printer" "1.11.6"
+
+"@webassemblyjs/wasm-gen@1.11.6":
+  "integrity" "sha512-3XOqkZP/y6B4F0PBAXvI1/bky7GryoogUtfwExeP/v7Nzwo1QLcq5oQmpKlftZLbT+ERUOAZVQjuNVak6UXjPA=="
+  "resolved" "https://registry.npmjs.org/@webassemblyjs/wasm-gen/-/wasm-gen-1.11.6.tgz"
+  "version" "1.11.6"
+  dependencies:
+    "@webassemblyjs/ast" "1.11.6"
+    "@webassemblyjs/helper-wasm-bytecode" "1.11.6"
+    "@webassemblyjs/ieee754" "1.11.6"
+    "@webassemblyjs/leb128" "1.11.6"
+    "@webassemblyjs/utf8" "1.11.6"
+
+"@webassemblyjs/wasm-opt@1.11.6":
+  "integrity" "sha512-cOrKuLRE7PCe6AsOVl7WasYf3wbSo4CeOk6PkrjS7g57MFfVUF9u6ysQBBODX0LdgSvQqRiGz3CXvIDKcPNy4g=="
+  "resolved" "https://registry.npmjs.org/@webassemblyjs/wasm-opt/-/wasm-opt-1.11.6.tgz"
+  "version" "1.11.6"
+  dependencies:
+    "@webassemblyjs/ast" "1.11.6"
+    "@webassemblyjs/helper-buffer" "1.11.6"
+    "@webassemblyjs/wasm-gen" "1.11.6"
+    "@webassemblyjs/wasm-parser" "1.11.6"
+
+"@webassemblyjs/wasm-parser@^1.11.5", "@webassemblyjs/wasm-parser@1.11.6":
+  "integrity" "sha512-6ZwPeGzMJM3Dqp3hCsLgESxBGtT/OeCvCZ4TA1JUPYgmhAx38tTPR9JaKy0S5H3evQpO/h2uWs2j6Yc/fjkpTQ=="
+  "resolved" "https://registry.npmjs.org/@webassemblyjs/wasm-parser/-/wasm-parser-1.11.6.tgz"
+  "version" "1.11.6"
+  dependencies:
+    "@webassemblyjs/ast" "1.11.6"
+    "@webassemblyjs/helper-api-error" "1.11.6"
+    "@webassemblyjs/helper-wasm-bytecode" "1.11.6"
+    "@webassemblyjs/ieee754" "1.11.6"
+    "@webassemblyjs/leb128" "1.11.6"
+    "@webassemblyjs/utf8" "1.11.6"
+
+"@webassemblyjs/wast-printer@1.11.6":
+  "integrity" "sha512-JM7AhRcE+yW2GWYaKeHL5vt4xqee5N2WcezptmgyhNS+ScggqcT1OtXykhAb13Sn5Yas0j2uv9tHgrjwvzAP4A=="
+  "resolved" "https://registry.npmjs.org/@webassemblyjs/wast-printer/-/wast-printer-1.11.6.tgz"
+  "version" "1.11.6"
+  dependencies:
+    "@webassemblyjs/ast" "1.11.6"
     "@xtuc/long" "4.2.2"
 
-"@xtuc/ieee754@^1.2.0":
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/@xtuc/ieee754/-/ieee754-1.2.0.tgz#eef014a3145ae477a1cbc00cd1e552336dceb790"
-
-"@xtuc/long@4.2.2":
-  version "4.2.2"
-  resolved "https://registry.yarnpkg.com/@xtuc/long/-/long-4.2.2.tgz#d291c6a4e97989b5c61d9acf396ae4fe133a718d"
-
-abbrev@1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/abbrev/-/abbrev-1.1.1.tgz#f8f2c887ad10bf67f634f005b6987fed3179aac8"
-
-accepts@~1.3.4, accepts@~1.3.5, accepts@~1.3.8:
-  version "1.3.8"
-  resolved "https://registry.yarnpkg.com/accepts/-/accepts-1.3.8.tgz#0bf0be125b67014adcb0b0921e62db7bffe16b2e"
-  integrity sha512-PYAthTa2m2VKxuvSD3DPC/Gy+U+sOA1LAuT8mkmRuvw+NACSaeXEQ+NHcVF7rONl6qcaxV3Uuemwawk+7+SJLw==
-  dependencies:
-    mime-types "~2.1.34"
-    negotiator "0.6.3"
-
-acorn-dynamic-import@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/acorn-dynamic-import/-/acorn-dynamic-import-4.0.0.tgz#482210140582a36b83c3e342e1cfebcaa9240948"
-
-acorn@^6.0.5:
-  version "6.4.1"
-  resolved "https://registry.yarnpkg.com/acorn/-/acorn-6.4.1.tgz#531e58ba3f51b9dacb9a6646ca4debf5b14ca474"
-  integrity sha512-ZVA9k326Nwrj3Cj9jlh3wGFutC2ZornPNARZwsNYqQYgN0EsV2d53w5RN/co65Ohn4sUAUtb1rSUAOD6XN9idA==
-
-adjust-sourcemap-loader@^1.1.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/adjust-sourcemap-loader/-/adjust-sourcemap-loader-1.2.0.tgz#e33fde95e50db9f2a802e3647e311d2fc5000c69"
-  dependencies:
-    assert "^1.3.0"
-    camelcase "^1.2.1"
-    loader-utils "^1.1.0"
-    lodash.assign "^4.0.1"
-    lodash.defaults "^3.1.2"
-    object-path "^0.9.2"
-    regex-parser "^2.2.9"
-
-ajv-errors@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/ajv-errors/-/ajv-errors-1.0.1.tgz#f35986aceb91afadec4102fbd85014950cefa64d"
-
-ajv-keywords@^3.1.0:
-  version "3.4.0"
-  resolved "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-3.4.0.tgz#4b831e7b531415a7cc518cd404e73f6193c6349d"
-
-ajv@^6.1.0:
-  version "6.9.2"
-  resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.9.2.tgz#4927adb83e7f48e5a32b45729744c71ec39c9c7b"
-  dependencies:
-    fast-deep-equal "^2.0.1"
-    fast-json-stable-stringify "^2.0.0"
-    json-schema-traverse "^0.4.1"
-    uri-js "^4.2.2"
-
-alphanum-sort@^1.0.0:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/alphanum-sort/-/alphanum-sort-1.0.2.tgz#97a1119649b211ad33691d9f9f486a8ec9fbe0a3"
-
-ansi-colors@^3.0.0:
-  version "3.2.3"
-  resolved "https://registry.yarnpkg.com/ansi-colors/-/ansi-colors-3.2.3.tgz#57d35b8686e851e2cc04c403f1c00203976a1813"
-
-ansi-html@0.0.7:
-  version "0.0.7"
-  resolved "https://registry.yarnpkg.com/ansi-html/-/ansi-html-0.0.7.tgz#813584021962a9e9e6fd039f940d12f56ca7859e"
-
-ansi-regex@^2.0.0:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-2.1.1.tgz#c3b33ab5ee360d86e0e628f0468ae7ef27d654df"
+"@webpack-cli/configtest@^1.2.0":
+  "integrity" "sha512-4FB8Tj6xyVkyqjj1OaTqCjXYULB9FMkqQ8yGrZjRDrYh0nOE+7Lhs45WioWQQMV+ceFlE368Ukhe6xdvJM9Egg=="
+  "resolved" "https://registry.npmjs.org/@webpack-cli/configtest/-/configtest-1.2.0.tgz"
+  "version" "1.2.0"
 
-ansi-regex@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-3.0.0.tgz#ed0317c322064f79466c02966bddb605ab37d998"
-
-ansi-styles@^2.2.1:
-  version "2.2.1"
-  resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-2.2.1.tgz#b432dd3358b634cf75e1e4664368240533c1ddbe"
-
-ansi-styles@^3.2.1:
-  version "3.2.1"
-  resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-3.2.1.tgz#41fbb20243e50b12be0f04b8dedbf07520ce841d"
-  dependencies:
-    color-convert "^1.9.0"
-
-anymatch@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/anymatch/-/anymatch-2.0.0.tgz#bcb24b4f37934d9aa7ac17b4adaf89e7c76ef2eb"
-  dependencies:
-    micromatch "^3.1.4"
-    normalize-path "^2.1.1"
-
-aproba@^1.0.3, aproba@^1.1.1:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/aproba/-/aproba-1.2.0.tgz#6802e6264efd18c790a1b0d517f0f2627bf2c94a"
-
-are-we-there-yet@~1.1.2:
-  version "1.1.5"
-  resolved "https://registry.yarnpkg.com/are-we-there-yet/-/are-we-there-yet-1.1.5.tgz#4b35c2944f062a8bfcda66410760350fe9ddfc21"
-  dependencies:
-    delegates "^1.0.0"
-    readable-stream "^2.0.6"
-
-argparse@^1.0.7:
-  version "1.0.10"
-  resolved "https://registry.yarnpkg.com/argparse/-/argparse-1.0.10.tgz#bcd6791ea5ae09725e17e5ad988134cd40b3d911"
-  integrity sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==
-  dependencies:
-    sprintf-js "~1.0.2"
-
-arr-diff@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/arr-diff/-/arr-diff-4.0.0.tgz#d6461074febfec71e7e15235761a329a5dc7c520"
-
-arr-flatten@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/arr-flatten/-/arr-flatten-1.1.0.tgz#36048bbff4e7b47e136644316c99669ea5ae91f1"
-
-arr-union@^3.1.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/arr-union/-/arr-union-3.1.0.tgz#e39b09aea9def866a8f206e288af63919bae39c4"
-
-array-flatten@1.1.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/array-flatten/-/array-flatten-1.1.1.tgz#9a5f699051b1e7073328f2a008968b64ea2955d2"
-  integrity sha512-PCVAQswWemu6UdxsDFFX/+gVeYqKAod3D3UVm91jHwynguOwAvYPhx8nNlM++NqRcK6CxxpUafjmhIdKiHibqg==
-
-array-flatten@^2.1.0:
-  version "2.1.2"
-  resolved "https://registry.yarnpkg.com/array-flatten/-/array-flatten-2.1.2.tgz#24ef80a28c1a893617e2149b0c6d0d788293b099"
-
-array-union@^1.0.1:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/array-union/-/array-union-1.0.2.tgz#9a34410e4f4e3da23dea375be5be70f24778ec39"
+"@webpack-cli/info@^1.5.0":
+  "integrity" "sha512-e8tSXZpw2hPl2uMJY6fsMswaok5FdlGNRTktvFk2sD8RjH0hE2+XistawJx1vmKteh4NmGmNUrp+Tb2w+udPcQ=="
+  "resolved" "https://registry.npmjs.org/@webpack-cli/info/-/info-1.5.0.tgz"
+  "version" "1.5.0"
   dependencies:
-    array-uniq "^1.0.1"
+    "envinfo" "^7.7.3"
 
-array-uniq@^1.0.1:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/array-uniq/-/array-uniq-1.0.3.tgz#af6ac877a25cc7f74e058894753858dfdb24fdb6"
+"@webpack-cli/serve@^1.7.0":
+  "integrity" "sha512-oxnCNGj88fL+xzV+dacXs44HcDwf1ovs3AuEzvP7mqXw7fQntqIhQ1BRmynh4qEKQSSSRSWVyXRjmTbZIX9V2Q=="
+  "resolved" "https://registry.npmjs.org/@webpack-cli/serve/-/serve-1.7.0.tgz"
+  "version" "1.7.0"
 
-array-unique@^0.3.2:
-  version "0.3.2"
-  resolved "https://registry.yarnpkg.com/array-unique/-/array-unique-0.3.2.tgz#a894b75d4bc4f6cd679ef3244a9fd8f46ae2d428"
-
-arrify@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/arrify/-/arrify-1.0.1.tgz#898508da2226f380df904728456849c1501a4b0d"
-
-asn1.js@^4.0.0:
-  version "4.10.1"
-  resolved "https://registry.yarnpkg.com/asn1.js/-/asn1.js-4.10.1.tgz#b9c2bf5805f1e64aadeed6df3a2bfafb5a73f5a0"
-  dependencies:
-    bn.js "^4.0.0"
-    inherits "^2.0.1"
-    minimalistic-assert "^1.0.0"
-
-assert@^1.1.1, assert@^1.3.0:
-  version "1.4.1"
-  resolved "https://registry.yarnpkg.com/assert/-/assert-1.4.1.tgz#99912d591836b5a6f5b345c0f07eefc08fc65d91"
-  dependencies:
-    util "0.10.3"
-
-assign-symbols@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/assign-symbols/-/assign-symbols-1.0.0.tgz#59667f41fadd4f20ccbc2bb96b8d4f7f78ec0367"
-
-ast-types@0.9.6:
-  version "0.9.6"
-  resolved "https://registry.yarnpkg.com/ast-types/-/ast-types-0.9.6.tgz#102c9e9e9005d3e7e3829bf0c4fa24ee862ee9b9"
-
-async-each@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/async-each/-/async-each-1.0.1.tgz#19d386a1d9edc6e7c1c85d388aedbcc56d33602d"
-
-async@^1.5.2:
-  version "1.5.2"
-  resolved "https://registry.yarnpkg.com/async/-/async-1.5.2.tgz#ec6a61ae56480c0c3cb241c95618e20892f9672a"
+"@xtuc/ieee754@^1.2.0":
+  "integrity" "sha512-DX8nKgqcGwsc0eJSqYt5lwP4DH5FlHnmuWWBRy7X0NcaGR0ZtuyeESgMwTYVEtxmsNGY+qit4QYT/MIYTOTPeA=="
+  "resolved" "https://registry.npmjs.org/@xtuc/ieee754/-/ieee754-1.2.0.tgz"
+  "version" "1.2.0"
 
-async@^2.4.1:
-  version "2.6.2"
-  resolved "https://registry.yarnpkg.com/async/-/async-2.6.2.tgz#18330ea7e6e313887f5d2f2a904bac6fe4dd5381"
-  dependencies:
-    lodash "^4.17.11"
-
-atob@^2.1.1:
-  version "2.1.2"
-  resolved "https://registry.yarnpkg.com/atob/-/atob-2.1.2.tgz#6d9517eb9e030d2436666651e86bd9f6f13533c9"
-
-autoprefixer@^9.4.2:
-  version "9.4.9"
-  resolved "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-9.4.9.tgz#0d3eb86bc1d1228551abcf55220d6fd246b6cb31"
-  dependencies:
-    browserslist "^4.4.2"
-    caniuse-lite "^1.0.30000939"
-    normalize-range "^0.1.2"
-    num2fraction "^1.2.2"
-    postcss "^7.0.14"
-    postcss-value-parser "^3.3.1"
-
-axios@^0.21.2:
-  version "0.21.2"
-  resolved "https://registry.yarnpkg.com/axios/-/axios-0.21.2.tgz#21297d5084b2aeeb422f5d38e7be4fbb82239017"
-  integrity sha512-87otirqUw3e8CzHTMO+/9kh/FSgXt/eVDvipijwDtEuwbkySWZ9SBm6VEubmJ/kLKEoLQV/POhxXFb66bfekfg==
-  dependencies:
-    follow-redirects "^1.14.0"
-
-babel-code-frame@^6.26.0:
-  version "6.26.0"
-  resolved "https://registry.yarnpkg.com/babel-code-frame/-/babel-code-frame-6.26.0.tgz#63fd43f7dc1e3bb7ce35947db8fe369a3f58c74b"
-  dependencies:
-    chalk "^1.1.3"
-    esutils "^2.0.2"
-    js-tokens "^3.0.2"
-
-babel-loader@^8.0.4:
-  version "8.0.5"
-  resolved "https://registry.yarnpkg.com/babel-loader/-/babel-loader-8.0.5.tgz#225322d7509c2157655840bba52e46b6c2f2fe33"
-  dependencies:
-    find-cache-dir "^2.0.0"
-    loader-utils "^1.0.2"
-    mkdirp "^0.5.1"
-    util.promisify "^1.0.0"
-
-babel-merge@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/babel-merge/-/babel-merge-2.0.1.tgz#6b2dfad78a655df66e3418eb37b1c3c5e676ad1a"
-  dependencies:
-    "@babel/core" "^7.0.0-beta.49"
-    deepmerge "^2.1.0"
-    object.omit "^3.0.0"
-
-balanced-match@^1.0.0:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.2.tgz#e83e3a7e3f300b34cb9d87f615fa0cbf357690ee"
-  integrity sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==
-
-base64-js@^1.0.2:
-  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/base64-js/-/base64-js-1.3.0.tgz#cab1e6118f051095e58b5281aea8c1cd22bfc0e3"
-
-base@^0.11.1:
-  version "0.11.2"
-  resolved "https://registry.yarnpkg.com/base/-/base-0.11.2.tgz#7bde5ced145b6d551a90db87f83c558b4eb48a8f"
-  dependencies:
-    cache-base "^1.0.1"
-    class-utils "^0.3.5"
-    component-emitter "^1.2.1"
-    define-property "^1.0.0"
-    isobject "^3.0.1"
-    mixin-deep "^1.2.0"
-    pascalcase "^0.1.1"
-
-batch@0.6.1:
-  version "0.6.1"
-  resolved "https://registry.yarnpkg.com/batch/-/batch-0.6.1.tgz#dc34314f4e679318093fc760272525f94bf25c16"
-
-big.js@^5.2.2:
-  version "5.2.2"
-  resolved "https://registry.yarnpkg.com/big.js/-/big.js-5.2.2.tgz#65f0af382f578bcdc742bd9c281e9cb2d7768328"
-  integrity sha512-vyL2OymJxmarO8gxMr0mhChsO9QGwhynfuu4+MHTAW6czfq9humCB7rKpUjDd9YUiDPU4mzpyupFSvOClAwbmQ==
-
-binary-extensions@^1.0.0:
-  version "1.13.0"
-  resolved "https://registry.yarnpkg.com/binary-extensions/-/binary-extensions-1.13.0.tgz#9523e001306a32444b907423f1de2164222f6ab1"
-
-bluebird@^3.1.1, bluebird@^3.5.3:
-  version "3.5.3"
-  resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.5.3.tgz#7d01c6f9616c9a51ab0f8c549a79dfe6ec33efa7"
-
-bn.js@^4.0.0, bn.js@^4.1.0, bn.js@^4.1.1, bn.js@^4.11.9:
-  version "4.12.0"
-  resolved "https://registry.yarnpkg.com/bn.js/-/bn.js-4.12.0.tgz#775b3f278efbb9718eec7361f483fb36fbbfea88"
-  integrity sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA==
-
-body-parser@1.20.1:
-  version "1.20.1"
-  resolved "https://registry.yarnpkg.com/body-parser/-/body-parser-1.20.1.tgz#b1812a8912c195cd371a3ee5e66faa2338a5c668"
-  integrity sha512-jWi7abTbYwajOytWCQc37VulmWiRae5RyTpaCyDcS5/lMdtwSz5lOpDE67srw/HYe35f1z3fDQw+3txg7gNtWw==
-  dependencies:
-    bytes "3.1.2"
-    content-type "~1.0.4"
-    debug "2.6.9"
-    depd "2.0.0"
-    destroy "1.2.0"
-    http-errors "2.0.0"
-    iconv-lite "0.4.24"
-    on-finished "2.4.1"
-    qs "6.11.0"
-    raw-body "2.5.1"
-    type-is "~1.6.18"
-    unpipe "1.0.0"
-
-bonjour@^3.5.0:
-  version "3.5.0"
-  resolved "https://registry.yarnpkg.com/bonjour/-/bonjour-3.5.0.tgz#8e890a183d8ee9a2393b3844c691a42bcf7bc9f5"
-  dependencies:
-    array-flatten "^2.1.0"
-    deep-equal "^1.0.1"
-    dns-equal "^1.0.0"
-    dns-txt "^2.0.2"
-    multicast-dns "^6.0.1"
-    multicast-dns-service-types "^1.1.0"
-
-boolbase@^1.0.0, boolbase@~1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/boolbase/-/boolbase-1.0.0.tgz#68dff5fbe60c51eb37725ea9e3ed310dcc1e776e"
-
-bootstrap@^4.0.0:
-  version "4.3.1"
-  resolved "https://registry.yarnpkg.com/bootstrap/-/bootstrap-4.3.1.tgz#280ca8f610504d99d7b6b4bfc4b68cec601704ac"
-
-brace-expansion@^1.1.7:
-  version "1.1.11"
-  resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.11.tgz#3c7fcbf529d87226f3d2f52b966ff5271eb441dd"
-  integrity sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==
-  dependencies:
-    balanced-match "^1.0.0"
-    concat-map "0.0.1"
-
-braces@^2.3.1, braces@^2.3.2:
-  version "2.3.2"
-  resolved "https://registry.yarnpkg.com/braces/-/braces-2.3.2.tgz#5979fd3f14cd531565e5fa2df1abfff1dfaee729"
-  dependencies:
-    arr-flatten "^1.1.0"
-    array-unique "^0.3.2"
-    extend-shallow "^2.0.1"
-    fill-range "^4.0.0"
-    isobject "^3.0.1"
-    repeat-element "^1.1.2"
-    snapdragon "^0.8.1"
-    snapdragon-node "^2.0.1"
-    split-string "^3.0.2"
-    to-regex "^3.0.1"
-
-brorand@^1.0.1, brorand@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/brorand/-/brorand-1.1.0.tgz#12c25efe40a45e3c323eb8675a0a0ce57b22371f"
-  integrity sha1-EsJe/kCkXjwyPrhnWgoM5XsiNx8=
-
-browserify-aes@^1.0.0, browserify-aes@^1.0.4:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/browserify-aes/-/browserify-aes-1.2.0.tgz#326734642f403dabc3003209853bb70ad428ef48"
-  dependencies:
-    buffer-xor "^1.0.3"
-    cipher-base "^1.0.0"
-    create-hash "^1.1.0"
-    evp_bytestokey "^1.0.3"
-    inherits "^2.0.1"
-    safe-buffer "^5.0.1"
-
-browserify-cipher@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/browserify-cipher/-/browserify-cipher-1.0.1.tgz#8d6474c1b870bfdabcd3bcfcc1934a10e94f15f0"
-  dependencies:
-    browserify-aes "^1.0.4"
-    browserify-des "^1.0.0"
-    evp_bytestokey "^1.0.0"
-
-browserify-des@^1.0.0:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/browserify-des/-/browserify-des-1.0.2.tgz#3af4f1f59839403572f1c66204375f7a7f703e9c"
-  dependencies:
-    cipher-base "^1.0.1"
-    des.js "^1.0.0"
-    inherits "^2.0.1"
-    safe-buffer "^5.1.2"
-
-browserify-rsa@^4.0.0:
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/browserify-rsa/-/browserify-rsa-4.0.1.tgz#21e0abfaf6f2029cf2fafb133567a701d4135524"
-  dependencies:
-    bn.js "^4.1.0"
-    randombytes "^2.0.1"
-
-browserify-sign@^4.0.0:
-  version "4.0.4"
-  resolved "https://registry.yarnpkg.com/browserify-sign/-/browserify-sign-4.0.4.tgz#aa4eb68e5d7b658baa6bf6a57e630cbd7a93d298"
-  dependencies:
-    bn.js "^4.1.1"
-    browserify-rsa "^4.0.0"
-    create-hash "^1.1.0"
-    create-hmac "^1.1.2"
-    elliptic "^6.0.0"
-    inherits "^2.0.1"
-    parse-asn1 "^5.0.0"
-
-browserify-zlib@^0.2.0:
-  version "0.2.0"
-  resolved "https://registry.yarnpkg.com/browserify-zlib/-/browserify-zlib-0.2.0.tgz#2869459d9aa3be245fe8fe2ca1f46e2e7f54d73f"
-  dependencies:
-    pako "~1.0.5"
-
-browserslist@^4.0.0, browserslist@^4.3.4, browserslist@^4.4.2:
-  version "4.4.2"
-  resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.4.2.tgz#6ea8a74d6464bb0bd549105f659b41197d8f0ba2"
-  dependencies:
-    caniuse-lite "^1.0.30000939"
-    electron-to-chromium "^1.3.113"
-    node-releases "^1.1.8"
-
-buffer-from@^1.0.0:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/buffer-from/-/buffer-from-1.1.1.tgz#32713bc028f75c02fdb710d7c7bcec1f2c6070ef"
-
-buffer-indexof@^1.0.0:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/buffer-indexof/-/buffer-indexof-1.1.1.tgz#52fabcc6a606d1a00302802648ef68f639da268c"
-
-buffer-xor@^1.0.3:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/buffer-xor/-/buffer-xor-1.0.3.tgz#26e61ed1422fb70dd42e6e36729ed51d855fe8d9"
-
-buffer@^4.3.0:
-  version "4.9.1"
-  resolved "https://registry.yarnpkg.com/buffer/-/buffer-4.9.1.tgz#6d1bb601b07a4efced97094132093027c95bc298"
-  dependencies:
-    base64-js "^1.0.2"
-    ieee754 "^1.1.4"
-    isarray "^1.0.0"
-
-builtin-status-codes@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/builtin-status-codes/-/builtin-status-codes-3.0.0.tgz#85982878e21b98e1c66425e03d0174788f569ee8"
-
-bytes@3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/bytes/-/bytes-3.0.0.tgz#d32815404d689699f85a4ea4fa8755dd13a96048"
-
-bytes@3.1.2:
-  version "3.1.2"
-  resolved "https://registry.yarnpkg.com/bytes/-/bytes-3.1.2.tgz#8b0beeb98605adf1b128fa4386403c009e0221a5"
-  integrity sha512-/Nf7TyzTx6S3yRJObOAV7956r8cr2+Oj8AC5dt8wSP3BQAoeX58NoHyCU8P8zGkNXStjTSi6fzO6F0pBdcYbEg==
-
-cacache@^11.0.2:
-  version "11.3.2"
-  resolved "https://registry.yarnpkg.com/cacache/-/cacache-11.3.2.tgz#2d81e308e3d258ca38125b676b98b2ac9ce69bfa"
-  dependencies:
-    bluebird "^3.5.3"
-    chownr "^1.1.1"
-    figgy-pudding "^3.5.1"
-    glob "^7.1.3"
-    graceful-fs "^4.1.15"
-    lru-cache "^5.1.1"
-    mississippi "^3.0.0"
-    mkdirp "^0.5.1"
-    move-concurrently "^1.0.1"
-    promise-inflight "^1.0.1"
-    rimraf "^2.6.2"
-    ssri "^6.0.1"
-    unique-filename "^1.1.1"
-    y18n "^4.0.0"
-
-cache-base@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/cache-base/-/cache-base-1.0.1.tgz#0a7f46416831c8b662ee36fe4e7c59d76f666ab2"
-  dependencies:
-    collection-visit "^1.0.0"
-    component-emitter "^1.2.1"
-    get-value "^2.0.6"
-    has-value "^1.0.0"
-    isobject "^3.0.1"
-    set-value "^2.0.0"
-    to-object-path "^0.3.0"
-    union-value "^1.0.0"
-    unset-value "^1.0.0"
-
-call-bind@^1.0.0:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/call-bind/-/call-bind-1.0.2.tgz#b1d4e89e688119c3c9a903ad30abb2f6a919be3c"
-  integrity sha512-7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA==
-  dependencies:
-    function-bind "^1.1.1"
-    get-intrinsic "^1.0.2"
-
-call-me-maybe@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/call-me-maybe/-/call-me-maybe-1.0.1.tgz#26d208ea89e37b5cbde60250a15f031c16a4d66b"
-
-caller-callsite@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/caller-callsite/-/caller-callsite-2.0.0.tgz#847e0fce0a223750a9a027c54b33731ad3154134"
-  dependencies:
-    callsites "^2.0.0"
-
-caller-path@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/caller-path/-/caller-path-2.0.0.tgz#468f83044e369ab2010fac5f06ceee15bb2cb1f4"
-  dependencies:
-    caller-callsite "^2.0.0"
-
-callsites@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/callsites/-/callsites-2.0.0.tgz#06eb84f00eea413da86affefacbffb36093b3c50"
-
-camel-case@3.0.x:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/camel-case/-/camel-case-3.0.0.tgz#ca3c3688a4e9cf3a4cda777dc4dcbc713249cf73"
-  dependencies:
-    no-case "^2.2.0"
-    upper-case "^1.1.1"
-
-camelcase@^1.2.1:
-  version "1.2.1"
-  resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-1.2.1.tgz#9bb5304d2e0b56698b2c758b08a3eaa9daa58a39"
-
-camelcase@^4.1.0:
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-4.1.0.tgz#d545635be1e33c542649c69173e5de6acfae34dd"
-
-camelcase@^5.0.0:
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-5.0.0.tgz#03295527d58bd3cd4aa75363f35b2e8d97be2f42"
-
-caniuse-api@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/caniuse-api/-/caniuse-api-3.0.0.tgz#5e4d90e2274961d46291997df599e3ed008ee4c0"
-  dependencies:
-    browserslist "^4.0.0"
-    caniuse-lite "^1.0.0"
-    lodash.memoize "^4.1.2"
-    lodash.uniq "^4.5.0"
-
-caniuse-lite@^1.0.0, caniuse-lite@^1.0.30000939:
-  version "1.0.30000939"
-  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30000939.tgz#b9ab7ac9e861bf78840b80c5dfbc471a5cd7e679"
-
-chalk@^1.1.3:
-  version "1.1.3"
-  resolved "https://registry.yarnpkg.com/chalk/-/chalk-1.1.3.tgz#a8115c55e4a702fe4d150abd3872822a7e09fc98"
-  dependencies:
-    ansi-styles "^2.2.1"
-    escape-string-regexp "^1.0.2"
-    has-ansi "^2.0.0"
-    strip-ansi "^3.0.0"
-    supports-color "^2.0.0"
-
-chalk@^2.0.0, chalk@^2.4.1, chalk@^2.4.2:
-  version "2.4.2"
-  resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.4.2.tgz#cd42541677a54333cf541a49108c1432b44c9424"
-  dependencies:
-    ansi-styles "^3.2.1"
-    escape-string-regexp "^1.0.5"
-    supports-color "^5.3.0"
-
-charenc@~0.0.1:
-  version "0.0.2"
-  resolved "https://registry.yarnpkg.com/charenc/-/charenc-0.0.2.tgz#c0a1d2f3a7092e03774bfa83f14c0fc5790a8667"
-
-chokidar@^2.0.0, chokidar@^2.0.2, chokidar@^2.0.3:
-  version "2.1.2"
-  resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-2.1.2.tgz#9c23ea40b01638439e0513864d362aeacc5ad058"
-  dependencies:
-    anymatch "^2.0.0"
-    async-each "^1.0.1"
-    braces "^2.3.2"
-    glob-parent "^3.1.0"
-    inherits "^2.0.3"
-    is-binary-path "^1.0.0"
-    is-glob "^4.0.0"
-    normalize-path "^3.0.0"
-    path-is-absolute "^1.0.0"
-    readdirp "^2.2.1"
-    upath "^1.1.0"
+"@xtuc/long@4.2.2":
+  "integrity" "sha512-NuHqBY1PB/D8xU6s/thBgOAiAP7HOYDQ32+BFZILJ8ivkUkAHQnWfn6WhL79Owj1qmUnoN/YPhktdIoucipkAQ=="
+  "resolved" "https://registry.npmjs.org/@xtuc/long/-/long-4.2.2.tgz"
+  "version" "4.2.2"
+
+"abbrev@^1.0.0":
+  "integrity" "sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q=="
+  "resolved" "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz"
+  "version" "1.1.1"
+
+"accepts@~1.3.4", "accepts@~1.3.5", "accepts@~1.3.8":
+  "integrity" "sha512-PYAthTa2m2VKxuvSD3DPC/Gy+U+sOA1LAuT8mkmRuvw+NACSaeXEQ+NHcVF7rONl6qcaxV3Uuemwawk+7+SJLw=="
+  "resolved" "https://registry.npmjs.org/accepts/-/accepts-1.3.8.tgz"
+  "version" "1.3.8"
+  dependencies:
+    "mime-types" "~2.1.34"
+    "negotiator" "0.6.3"
+
+"acorn-import-assertions@^1.9.0":
+  "integrity" "sha512-cmMwop9x+8KFhxvKrKfPYmN6/pKTYYHBqLa0DfvVZcKMJWNyWLnaqND7dx/qn66R7ewM1UX5XMaDVP5wlVTaVA=="
+  "resolved" "https://registry.npmjs.org/acorn-import-assertions/-/acorn-import-assertions-1.9.0.tgz"
+  "version" "1.9.0"
+
+"acorn@^8", "acorn@^8.7.1", "acorn@^8.8.2":
+  "integrity" "sha512-F0SAmZ8iUtS//m8DmCTA0jlh6TDKkHQyK6xc6V4KDTyZKA9dnvX9/3sRTVQrWm79glUAZbnmmNcdYwUIHWVybw=="
+  "resolved" "https://registry.npmjs.org/acorn/-/acorn-8.10.0.tgz"
+  "version" "8.10.0"
+
+"adjust-sourcemap-loader@^4.0.0":
+  "integrity" "sha512-OXwN5b9pCUXNQHJpwwD2qP40byEmSgzj8B4ydSN0uMNYWiFmJ6x6KwUllMmfk8Rwu/HJDFR7U8ubsWBoN0Xp0A=="
+  "resolved" "https://registry.npmjs.org/adjust-sourcemap-loader/-/adjust-sourcemap-loader-4.0.0.tgz"
+  "version" "4.0.0"
+  dependencies:
+    "loader-utils" "^2.0.0"
+    "regex-parser" "^2.2.11"
+
+"aigle-core@^1.0.0":
+  "integrity" "sha512-uGFWPumk5DLvYnUphNnff+kWC8VeAnjPbbU8ovsSHflKXGX77SD7cAN/aSBCLX3xnoJAM9KdtRgxUygRnSSu7A=="
+  "resolved" "https://registry.npmjs.org/aigle-core/-/aigle-core-1.0.0.tgz"
+  "version" "1.0.0"
+
+"aigle@^1.14.1":
+  "integrity" "sha512-bCmQ65CEebspmpbWFs6ab3S27TNyVH1b5MledX8KoiGxUhsJmPUUGpaoSijhwawNnq5Lt8jbcq7Z7gUAD0nuTw=="
+  "resolved" "https://registry.npmjs.org/aigle/-/aigle-1.14.1.tgz"
+  "version" "1.14.1"
+  dependencies:
+    "aigle-core" "^1.0.0"
+
+"ajv-formats@^2.1.1":
+  "integrity" "sha512-Wx0Kx52hxE7C18hkMEggYlEifqWZtYaRgouJor+WMdPnQyEK13vgEWyVNup7SoeeoLMsr4kf5h6dOW11I15MUA=="
+  "resolved" "https://registry.npmjs.org/ajv-formats/-/ajv-formats-2.1.1.tgz"
+  "version" "2.1.1"
+  dependencies:
+    "ajv" "^8.0.0"
+
+"ajv-keywords@^3.5.2":
+  "integrity" "sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ=="
+  "resolved" "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.5.2.tgz"
+  "version" "3.5.2"
+
+"ajv-keywords@^5.1.0":
+  "integrity" "sha512-YCS/JNFAUyr5vAuhk1DWm1CBxRHW9LbJ2ozWeemrIqpbsqKjHVxYPyi5GC0rjZIT5JxJ3virVTS8wk4i/Z+krw=="
+  "resolved" "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-5.1.0.tgz"
+  "version" "5.1.0"
+  dependencies:
+    "fast-deep-equal" "^3.1.3"
+
+"ajv@^6.12.4", "ajv@^6.12.5", "ajv@^6.9.1":
+  "integrity" "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g=="
+  "resolved" "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz"
+  "version" "6.12.6"
+  dependencies:
+    "fast-deep-equal" "^3.1.1"
+    "fast-json-stable-stringify" "^2.0.0"
+    "json-schema-traverse" "^0.4.1"
+    "uri-js" "^4.2.2"
+
+"ajv@^8.0.0":
+  "integrity" "sha512-sRu1kpcO9yLtYxBKvqfTeh9KzZEwO3STyX1HT+4CaDzC6HpTGYhIhPIzj9XuKU7KYDwnaeh5hcOwjy1QuJzBPA=="
+  "resolved" "https://registry.npmjs.org/ajv/-/ajv-8.12.0.tgz"
+  "version" "8.12.0"
+  dependencies:
+    "fast-deep-equal" "^3.1.1"
+    "json-schema-traverse" "^1.0.0"
+    "require-from-string" "^2.0.2"
+    "uri-js" "^4.2.2"
+
+"ajv@^8.8.2":
+  "integrity" "sha512-sRu1kpcO9yLtYxBKvqfTeh9KzZEwO3STyX1HT+4CaDzC6HpTGYhIhPIzj9XuKU7KYDwnaeh5hcOwjy1QuJzBPA=="
+  "resolved" "https://registry.npmjs.org/ajv/-/ajv-8.12.0.tgz"
+  "version" "8.12.0"
+  dependencies:
+    "fast-deep-equal" "^3.1.1"
+    "json-schema-traverse" "^1.0.0"
+    "require-from-string" "^2.0.2"
+    "uri-js" "^4.2.2"
+
+"ajv@^8.9.0":
+  "integrity" "sha512-wGgprdCvMalC0BztXvitD2hC04YffAvtsUn93JbGXYLAtCUO4xd17mCCZQxUOItiBwZvJScWo8NIvQMQ71rdpg=="
+  "resolved" "https://registry.npmjs.org/ajv/-/ajv-8.11.0.tgz"
+  "version" "8.11.0"
+  dependencies:
+    "fast-deep-equal" "^3.1.1"
+    "json-schema-traverse" "^1.0.0"
+    "require-from-string" "^2.0.2"
+    "uri-js" "^4.2.2"
+
+"ansi-html-community@^0.0.8":
+  "integrity" "sha512-1APHAyr3+PCamwNw3bXCPp4HFLONZt/yIH0sZp0/469KWNTEy+qN5jQ3GVX6DMZ1UXAi34yVwtTeaG/HpBuuzw=="
+  "resolved" "https://registry.npmjs.org/ansi-html-community/-/ansi-html-community-0.0.8.tgz"
+  "version" "0.0.8"
+
+"ansi-regex@^5.0.1":
+  "integrity" "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ=="
+  "resolved" "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz"
+  "version" "5.0.1"
+
+"ansi-styles@^3.2.1":
+  "integrity" "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA=="
+  "resolved" "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz"
+  "version" "3.2.1"
+  dependencies:
+    "color-convert" "^1.9.0"
+
+"ansi-styles@^4.0.0", "ansi-styles@^4.1.0":
+  "integrity" "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg=="
+  "resolved" "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz"
+  "version" "4.3.0"
+  dependencies:
+    "color-convert" "^2.0.1"
+
+"any-promise@^1.0.0":
+  "integrity" "sha512-7UvmKalWRt1wgjL1RrGxoSJW/0QZFIegpeGvZG9kjp8vrRu55XTHbwnqq2GpXm9uLbcuhxm3IqX9OB4MZR1b2A=="
+  "resolved" "https://registry.npmjs.org/any-promise/-/any-promise-1.3.0.tgz"
+  "version" "1.3.0"
+
+"anymatch@~3.1.2":
+  "integrity" "sha512-P43ePfOAIupkguHUycrc4qJ9kz8ZiuOUijaETwX7THt0Y/GNK7v0aa8rY816xWjZ7rJdA5XdMcpVFTKMq+RvWg=="
+  "resolved" "https://registry.npmjs.org/anymatch/-/anymatch-3.1.2.tgz"
+  "version" "3.1.2"
+  dependencies:
+    "normalize-path" "^3.0.0"
+    "picomatch" "^2.0.4"
+
+"arg@^5.0.2":
+  "integrity" "sha512-PYjyFOLKQ9y57JvQ6QLo8dAgNqswh8M1RMJYdQduT6xbWSgK36P/Z/v+p888pM69jMMfS8Xd8F6I1kQ/I9HUGg=="
+  "resolved" "https://registry.npmjs.org/arg/-/arg-5.0.2.tgz"
+  "version" "5.0.2"
+
+"array-flatten@^2.1.2":
+  "integrity" "sha512-hNfzcOV8W4NdualtqBFPyVO+54DSJuZGY9qT4pRroB6S9e3iiido2ISIC5h9R2sPJ8H3FHCIiEnsv1lPXO3KtQ=="
+  "resolved" "https://registry.npmjs.org/array-flatten/-/array-flatten-2.1.2.tgz"
+  "version" "2.1.2"
+
+"array-flatten@1.1.1":
+  "integrity" "sha512-PCVAQswWemu6UdxsDFFX/+gVeYqKAod3D3UVm91jHwynguOwAvYPhx8nNlM++NqRcK6CxxpUafjmhIdKiHibqg=="
+  "resolved" "https://registry.npmjs.org/array-flatten/-/array-flatten-1.1.1.tgz"
+  "version" "1.1.1"
+
+"array-union@^2.1.0":
+  "integrity" "sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw=="
+  "resolved" "https://registry.npmjs.org/array-union/-/array-union-2.1.0.tgz"
+  "version" "2.1.0"
+
+"asn1.js@^5.2.0":
+  "integrity" "sha512-+I//4cYPccV8LdmBLiX8CYvf9Sp3vQsrqu2QNXRcrbiWvcx/UdlFiqUJJzxRQxgsZmvhXhn4cSKeSmoFjVdupA=="
+  "resolved" "https://registry.npmjs.org/asn1.js/-/asn1.js-5.4.1.tgz"
+  "version" "5.4.1"
+  dependencies:
+    "bn.js" "^4.0.0"
+    "inherits" "^2.0.1"
+    "minimalistic-assert" "^1.0.0"
+    "safer-buffer" "^2.1.0"
+
+"assert@^1.1.1":
+  "integrity" "sha512-zzw1uCAgLbsKwBfFc8CX78DDg+xZeBksSO3vwVIDDN5i94eOrPsSSyiVhmsSABFDM/OcpE2aagCat9dnWQLG1A=="
+  "resolved" "https://registry.npmjs.org/assert/-/assert-1.5.1.tgz"
+  "version" "1.5.1"
+  dependencies:
+    "object.assign" "^4.1.4"
+    "util" "^0.10.4"
+
+"asynckit@^0.4.0":
+  "integrity" "sha1-x57Zf380y48robyXkLzDZkdLS3k= sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q=="
+  "resolved" "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz"
+  "version" "0.4.0"
+
+"autoprefixer@^10.4.0":
+  "integrity" "sha512-7vd3UC6xKp0HLfua5IjZlcXvGAGy7cBAXTg2lyQ/8WpNhd6SiZ8Be+xm3FyBSYJx5GKcpRCzBh7RH4/0dnY+uQ=="
+  "resolved" "https://registry.npmjs.org/autoprefixer/-/autoprefixer-10.4.16.tgz"
+  "version" "10.4.16"
+  dependencies:
+    "browserslist" "^4.21.10"
+    "caniuse-lite" "^1.0.30001538"
+    "fraction.js" "^4.3.6"
+    "normalize-range" "^0.1.2"
+    "picocolors" "^1.0.0"
+    "postcss-value-parser" "^4.2.0"
+
+"axios@^1.6.2":
+  "integrity" "sha512-7i24Ri4pmDRfJTR7LDBhsOTtcm+9kjX5WiY1X3wIisx6G9So3pfMkEiU7emUBe46oceVImccTEM3k6C5dbVW8A=="
+  "resolved" "https://registry.npmjs.org/axios/-/axios-1.6.2.tgz"
+  "version" "1.6.2"
+  dependencies:
+    "follow-redirects" "^1.15.0"
+    "form-data" "^4.0.0"
+    "proxy-from-env" "^1.1.0"
+
+"babel-loader@^8.2.3":
+  "integrity" "sha512-OSiFfH89LrEMiWd4pLNqGz4CwJDtbs2ZVc+iGu2HrkRfPxId9F2anQj38IxWpmRfsUY0aBZYi1EFcd3mhtRMLQ=="
+  "resolved" "https://registry.npmjs.org/babel-loader/-/babel-loader-8.2.5.tgz"
+  "version" "8.2.5"
+  dependencies:
+    "find-cache-dir" "^3.3.1"
+    "loader-utils" "^2.0.0"
+    "make-dir" "^3.1.0"
+    "schema-utils" "^2.6.5"
+
+"babel-plugin-dynamic-import-node@^2.3.3":
+  "integrity" "sha512-jZVI+s9Zg3IqA/kdi0i6UDCybUI3aSBLnglhYbSSjKlV7yF1F/5LWv8MakQmvYpnbJDS6fcBL2KzHSxNCMtWSQ=="
+  "resolved" "https://registry.npmjs.org/babel-plugin-dynamic-import-node/-/babel-plugin-dynamic-import-node-2.3.3.tgz"
+  "version" "2.3.3"
+  dependencies:
+    "object.assign" "^4.1.0"
+
+"babel-plugin-polyfill-corejs2@^0.3.1":
+  "integrity" "sha512-v7/T6EQcNfVLfcN2X8Lulb7DjprieyLWJK/zOWH5DUYcAgex9sP3h25Q+DLsX9TloXe3y1O8l2q2Jv9q8UVB9w=="
+  "resolved" "https://registry.npmjs.org/babel-plugin-polyfill-corejs2/-/babel-plugin-polyfill-corejs2-0.3.1.tgz"
+  "version" "0.3.1"
+  dependencies:
+    "@babel/compat-data" "^7.13.11"
+    "@babel/helper-define-polyfill-provider" "^0.3.1"
+    "semver" "^6.1.1"
+
+"babel-plugin-polyfill-corejs3@^0.5.2":
+  "integrity" "sha512-G3uJih0XWiID451fpeFaYGVuxHEjzKTHtc9uGFEjR6hHrvNzeS/PX+LLLcetJcytsB5m4j+K3o/EpXJNb/5IEQ=="
+  "resolved" "https://registry.npmjs.org/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.5.2.tgz"
+  "version" "0.5.2"
+  dependencies:
+    "@babel/helper-define-polyfill-provider" "^0.3.1"
+    "core-js-compat" "^3.21.0"
+
+"babel-plugin-polyfill-regenerator@^0.3.1":
+  "integrity" "sha512-Y2B06tvgHYt1x0yz17jGkGeeMr5FeKUu+ASJ+N6nB5lQ8Dapfg42i0OVrf8PNGJ3zKL4A23snMi1IRwrqqND7A=="
+  "resolved" "https://registry.npmjs.org/babel-plugin-polyfill-regenerator/-/babel-plugin-polyfill-regenerator-0.3.1.tgz"
+  "version" "0.3.1"
+  dependencies:
+    "@babel/helper-define-polyfill-provider" "^0.3.1"
+
+"balanced-match@^1.0.0":
+  "integrity" "sha512-9Y0g0Q8rmSt+H33DfKv7FOc3v+iRI+o1lbzt8jGcIosYW37IIW/2XVYq5NPdmaD5NQ59Nk26Kl/vZbwW9Fr8vg=="
+  "resolved" "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz"
+  "version" "1.0.0"
+
+"base64-js@^1.0.2":
+  "integrity" "sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA=="
+  "resolved" "https://registry.npmjs.org/base64-js/-/base64-js-1.5.1.tgz"
+  "version" "1.5.1"
+
+"batch@0.6.1":
+  "integrity" "sha512-x+VAiMRL6UPkx+kudNvxTl6hB2XNNCG2r+7wixVfIYwu/2HKRXimwQyaumLjMveWvT2Hkd/cAJw+QBMfJ/EKVw=="
+  "resolved" "https://registry.npmjs.org/batch/-/batch-0.6.1.tgz"
+  "version" "0.6.1"
+
+"big.js@^5.2.2":
+  "integrity" "sha512-vyL2OymJxmarO8gxMr0mhChsO9QGwhynfuu4+MHTAW6czfq9humCB7rKpUjDd9YUiDPU4mzpyupFSvOClAwbmQ=="
+  "resolved" "https://registry.npmjs.org/big.js/-/big.js-5.2.2.tgz"
+  "version" "5.2.2"
+
+"binary-extensions@^2.0.0":
+  "integrity" "sha512-jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA=="
+  "resolved" "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.2.0.tgz"
+  "version" "2.2.0"
+
+"blade-formatter@^1.38.6":
+  "integrity" "sha512-XwW1A4G7GPXjCG7oPKkvBp8UVb/YS/zoS8FbuuUbrnwzzmoVEe29oSqh1JpCVj9+SI2ye/qohRuXNkwHjcq/Ww=="
+  "resolved" "https://registry.npmjs.org/blade-formatter/-/blade-formatter-1.38.6.tgz"
+  "version" "1.38.6"
+  dependencies:
+    "@prettier/plugin-php" "^0.19.7"
+    "@shufo/tailwindcss-class-sorter" "3.0.1"
+    "aigle" "^1.14.1"
+    "ajv" "^8.9.0"
+    "chalk" "^4.1.0"
+    "concat-stream" "^2.0.0"
+    "detect-indent" "^6.0.0"
+    "find-config" "^1.0.0"
+    "glob" "^8.0.1"
+    "html-attribute-sorter" "^0.4.3"
+    "ignore" "^5.1.8"
+    "js-beautify" "^1.14.8"
+    "lodash" "^4.17.19"
+    "php-parser" "3.1.5"
+    "prettier" "^2.2.0"
+    "tailwindcss" "^3.1.8"
+    "vscode-oniguruma" "1.7.0"
+    "vscode-textmate" "^7.0.1"
+    "xregexp" "^5.0.1"
+    "yargs" "^17.3.1"
+
+"bn.js@^4.0.0":
+  "integrity" "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA=="
+  "resolved" "https://registry.npmjs.org/bn.js/-/bn.js-4.12.0.tgz"
+  "version" "4.12.0"
+
+"bn.js@^4.1.0":
+  "integrity" "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA=="
+  "resolved" "https://registry.npmjs.org/bn.js/-/bn.js-4.12.0.tgz"
+  "version" "4.12.0"
+
+"bn.js@^4.11.9":
+  "integrity" "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA=="
+  "resolved" "https://registry.npmjs.org/bn.js/-/bn.js-4.12.0.tgz"
+  "version" "4.12.0"
+
+"bn.js@^5.0.0", "bn.js@^5.2.1":
+  "integrity" "sha512-eXRvHzWyYPBuB4NBy0cmYQjGitUrtqwbvlzP3G6VFnNRbsZQIxQ10PbKKHt8gZ/HW/D/747aDl+QkDqg3KQLMQ=="
+  "resolved" "https://registry.npmjs.org/bn.js/-/bn.js-5.2.1.tgz"
+  "version" "5.2.1"
+
+"body-parser@1.20.1":
+  "integrity" "sha512-jWi7abTbYwajOytWCQc37VulmWiRae5RyTpaCyDcS5/lMdtwSz5lOpDE67srw/HYe35f1z3fDQw+3txg7gNtWw=="
+  "resolved" "https://registry.npmjs.org/body-parser/-/body-parser-1.20.1.tgz"
+  "version" "1.20.1"
+  dependencies:
+    "bytes" "3.1.2"
+    "content-type" "~1.0.4"
+    "debug" "2.6.9"
+    "depd" "2.0.0"
+    "destroy" "1.2.0"
+    "http-errors" "2.0.0"
+    "iconv-lite" "0.4.24"
+    "on-finished" "2.4.1"
+    "qs" "6.11.0"
+    "raw-body" "2.5.1"
+    "type-is" "~1.6.18"
+    "unpipe" "1.0.0"
+
+"bonjour-service@^1.0.11":
+  "integrity" "sha512-Z/5lQRMOG9k7W+FkeGTNjh7htqn/2LMnfOvBZ8pynNZCM9MwkQkI3zeI4oz09uWdcgmgHugVvBqxGg4VQJ5PCg=="
+  "resolved" "https://registry.npmjs.org/bonjour-service/-/bonjour-service-1.1.1.tgz"
+  "version" "1.1.1"
+  dependencies:
+    "array-flatten" "^2.1.2"
+    "dns-equal" "^1.0.0"
+    "fast-deep-equal" "^3.1.3"
+    "multicast-dns" "^7.2.5"
+
+"boolbase@^1.0.0":
+  "integrity" "sha512-JZOSA7Mo9sNGB8+UjSgzdLtokWAky1zbztM3WRLCbZ70/3cTANmQmOdR7y2g+J0e2WXywy1yS468tY+IruqEww=="
+  "resolved" "https://registry.npmjs.org/boolbase/-/boolbase-1.0.0.tgz"
+  "version" "1.0.0"
+
+"bootstrap@^4.6":
+  "integrity" "sha512-51Bbp/Uxr9aTuy6ca/8FbFloBUJZLHwnhTcnjIeRn2suQWsWzcuJhGjKDB5eppVte/8oCdOL3VuwxvZDUggwGQ=="
+  "resolved" "https://registry.npmjs.org/bootstrap/-/bootstrap-4.6.2.tgz"
+  "version" "4.6.2"
+
+"brace-expansion@^1.1.7":
+  "integrity" "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA=="
+  "resolved" "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz"
+  "version" "1.1.11"
+  dependencies:
+    "balanced-match" "^1.0.0"
+    "concat-map" "0.0.1"
+
+"brace-expansion@^2.0.1":
+  "integrity" "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA=="
+  "resolved" "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz"
+  "version" "2.0.1"
+  dependencies:
+    "balanced-match" "^1.0.0"
+
+"braces@^3.0.2", "braces@~3.0.2":
+  "integrity" "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A=="
+  "resolved" "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz"
+  "version" "3.0.2"
+  dependencies:
+    "fill-range" "^7.0.1"
+
+"brorand@^1.0.1", "brorand@^1.1.0":
+  "integrity" "sha512-cKV8tMCEpQs4hK/ik71d6LrPOnpkpGBR0wzxqr68g2m/LB2GxVYQroAjMJZRVM1Y4BCjCKc3vAamxSzOY2RP+w=="
+  "resolved" "https://registry.npmjs.org/brorand/-/brorand-1.1.0.tgz"
+  "version" "1.1.0"
+
+"browserify-aes@^1.0.0", "browserify-aes@^1.0.4":
+  "integrity" "sha512-+7CHXqGuspUn/Sl5aO7Ea0xWGAtETPXNSAjHo48JfLdPWcMng33Xe4znFvQweqc/uzk5zSOI3H52CYnjCfb5hA=="
+  "resolved" "https://registry.npmjs.org/browserify-aes/-/browserify-aes-1.2.0.tgz"
+  "version" "1.2.0"
+  dependencies:
+    "buffer-xor" "^1.0.3"
+    "cipher-base" "^1.0.0"
+    "create-hash" "^1.1.0"
+    "evp_bytestokey" "^1.0.3"
+    "inherits" "^2.0.1"
+    "safe-buffer" "^5.0.1"
+
+"browserify-cipher@^1.0.0":
+  "integrity" "sha512-sPhkz0ARKbf4rRQt2hTpAHqn47X3llLkUGn+xEJzLjwY8LRs2p0v7ljvI5EyoRO/mexrNunNECisZs+gw2zz1w=="
+  "resolved" "https://registry.npmjs.org/browserify-cipher/-/browserify-cipher-1.0.1.tgz"
+  "version" "1.0.1"
+  dependencies:
+    "browserify-aes" "^1.0.4"
+    "browserify-des" "^1.0.0"
+    "evp_bytestokey" "^1.0.0"
+
+"browserify-des@^1.0.0":
+  "integrity" "sha512-BioO1xf3hFwz4kc6iBhI3ieDFompMhrMlnDFC4/0/vd5MokpuAc3R+LYbwTA9A5Yc9pq9UYPqffKpW2ObuwX5A=="
+  "resolved" "https://registry.npmjs.org/browserify-des/-/browserify-des-1.0.2.tgz"
+  "version" "1.0.2"
+  dependencies:
+    "cipher-base" "^1.0.1"
+    "des.js" "^1.0.0"
+    "inherits" "^2.0.1"
+    "safe-buffer" "^5.1.2"
+
+"browserify-rsa@^4.0.0", "browserify-rsa@^4.1.0":
+  "integrity" "sha512-AdEER0Hkspgno2aR97SAf6vi0y0k8NuOpGnVH3O99rcA5Q6sh8QxcngtHuJ6uXwnfAXNM4Gn1Gb7/MV1+Ymbog=="
+  "resolved" "https://registry.npmjs.org/browserify-rsa/-/browserify-rsa-4.1.0.tgz"
+  "version" "4.1.0"
+  dependencies:
+    "bn.js" "^5.0.0"
+    "randombytes" "^2.0.1"
+
+"browserify-sign@^4.0.0":
+  "integrity" "sha512-1rudGyeYY42Dk6texmv7c4VcQ0EsvVbLwZkA+AQB7SxvXxmcD93jcHie8bzecJ+ChDlmAm2Qyu0+Ccg5uhZXCg=="
+  "resolved" "https://registry.npmjs.org/browserify-sign/-/browserify-sign-4.2.2.tgz"
+  "version" "4.2.2"
+  dependencies:
+    "bn.js" "^5.2.1"
+    "browserify-rsa" "^4.1.0"
+    "create-hash" "^1.2.0"
+    "create-hmac" "^1.1.7"
+    "elliptic" "^6.5.4"
+    "inherits" "^2.0.4"
+    "parse-asn1" "^5.1.6"
+    "readable-stream" "^3.6.2"
+    "safe-buffer" "^5.2.1"
+
+"browserify-zlib@^0.2.0":
+  "integrity" "sha512-Z942RysHXmJrhqk88FmKBVq/v5tqmSkDz7p54G/MGyjMnCFFnC79XWNbg+Vta8W6Wb2qtSZTSxIGkJrRpCFEiA=="
+  "resolved" "https://registry.npmjs.org/browserify-zlib/-/browserify-zlib-0.2.0.tgz"
+  "version" "0.2.0"
+  dependencies:
+    "pako" "~1.0.5"
+
+"browserslist@^4.0.0", "browserslist@^4.14.5", "browserslist@^4.20.2", "browserslist@^4.21.10", "browserslist@^4.21.4", "browserslist@^4.22.1", "browserslist@>= 4.21.0":
+  "integrity" "sha512-FEVc202+2iuClEhZhrWy6ZiAcRLvNMyYcxZ8raemul1DYVOVdFsbqckWLdsixQZCpJlwe77Z3UTalE7jsjnKfQ=="
+  "resolved" "https://registry.npmjs.org/browserslist/-/browserslist-4.22.1.tgz"
+  "version" "4.22.1"
+  dependencies:
+    "caniuse-lite" "^1.0.30001541"
+    "electron-to-chromium" "^1.4.535"
+    "node-releases" "^2.0.13"
+    "update-browserslist-db" "^1.0.13"
+
+"buffer-from@^1.0.0":
+  "integrity" "sha512-MQcXEUbCKtEo7bhqEs6560Hyd4XaovZlO/k9V3hjVUF/zwW7KBVdSK4gIt/bzwS9MbR5qob+F5jusZsb0YQK2A=="
+  "resolved" "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.1.tgz"
+  "version" "1.1.1"
+
+"buffer-xor@^1.0.3":
+  "integrity" "sha512-571s0T7nZWK6vB67HI5dyUF7wXiNcfaPPPTl6zYCNApANjIvYJTg7hlud/+cJpdAhS7dVzqMLmfhfHR3rAcOjQ=="
+  "resolved" "https://registry.npmjs.org/buffer-xor/-/buffer-xor-1.0.3.tgz"
+  "version" "1.0.3"
+
+"buffer@^4.3.0":
+  "integrity" "sha512-xq+q3SRMOxGivLhBNaUdC64hDTQwejJ+H0T/NB1XMtTVEwNTrfFF3gAxiyW0Bu/xWEGhjVKgUcMhCrUy2+uCWg=="
+  "resolved" "https://registry.npmjs.org/buffer/-/buffer-4.9.2.tgz"
+  "version" "4.9.2"
+  dependencies:
+    "base64-js" "^1.0.2"
+    "ieee754" "^1.1.4"
+    "isarray" "^1.0.0"
+
+"builtin-status-codes@^3.0.0":
+  "integrity" "sha512-HpGFw18DgFWlncDfjTa2rcQ4W88O1mC8e8yZ2AvQY5KDaktSTwo+KRf6nHK6FRI5FyRyb/5T6+TSxfP7QyGsmQ=="
+  "resolved" "https://registry.npmjs.org/builtin-status-codes/-/builtin-status-codes-3.0.0.tgz"
+  "version" "3.0.0"
+
+"bytes@3.0.0":
+  "integrity" "sha512-pMhOfFDPiv9t5jjIXkHosWmkSyQbvsgEVNkz0ERHbuLh2T/7j4Mqqpz523Fe8MVY89KC6Sh/QfS2sM+SjgFDcw=="
+  "resolved" "https://registry.npmjs.org/bytes/-/bytes-3.0.0.tgz"
+  "version" "3.0.0"
+
+"bytes@3.1.2":
+  "integrity" "sha512-/Nf7TyzTx6S3yRJObOAV7956r8cr2+Oj8AC5dt8wSP3BQAoeX58NoHyCU8P8zGkNXStjTSi6fzO6F0pBdcYbEg=="
+  "resolved" "https://registry.npmjs.org/bytes/-/bytes-3.1.2.tgz"
+  "version" "3.1.2"
+
+"call-bind@^1.0.0", "call-bind@^1.0.2":
+  "integrity" "sha512-7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA=="
+  "resolved" "https://registry.npmjs.org/call-bind/-/call-bind-1.0.2.tgz"
+  "version" "1.0.2"
+  dependencies:
+    "function-bind" "^1.1.1"
+    "get-intrinsic" "^1.0.2"
+
+"callsites@^3.0.0":
+  "integrity" "sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ=="
+  "resolved" "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz"
+  "version" "3.1.0"
+
+"camel-case@^4.1.1":
+  "integrity" "sha512-gxGWBrTT1JuMx6R+o5PTXMmUnhnVzLQ9SNutD4YqKtI6ap897t3tKECYla6gCWEkplXnlNybEkZg9GEGxKFCgw=="
+  "resolved" "https://registry.npmjs.org/camel-case/-/camel-case-4.1.2.tgz"
+  "version" "4.1.2"
+  dependencies:
+    "pascal-case" "^3.1.2"
+    "tslib" "^2.0.3"
+
+"camelcase-css@^2.0.1":
+  "integrity" "sha512-QOSvevhslijgYwRx6Rv7zKdMF8lbRmx+uQGx2+vDc+KI/eBnsy9kit5aj23AgGu3pa4t9AgwbnXWqS+iOY+2aA=="
+  "resolved" "https://registry.npmjs.org/camelcase-css/-/camelcase-css-2.0.1.tgz"
+  "version" "2.0.1"
+
+"caniuse-api@^3.0.0":
+  "integrity" "sha512-bsTwuIg/BZZK/vreVTYYbSWoe2F+71P7K5QGEX+pT250DZbfU1MQ5prOKpPR+LL6uWKK3KMwMCAS74QB3Um1uw=="
+  "resolved" "https://registry.npmjs.org/caniuse-api/-/caniuse-api-3.0.0.tgz"
+  "version" "3.0.0"
+  dependencies:
+    "browserslist" "^4.0.0"
+    "caniuse-lite" "^1.0.0"
+    "lodash.memoize" "^4.1.2"
+    "lodash.uniq" "^4.5.0"
+
+"caniuse-lite@^1.0.0", "caniuse-lite@^1.0.30001538", "caniuse-lite@^1.0.30001541":
+  "integrity" "sha512-vtBAez47BoGMMzlbYhfXrMV1kvRF2WP/lqiMuDu1Sb4EE4LKEgjopFDSRtZfdVnslNRpOqV/woE+Xgrwj6VQlg=="
+  "resolved" "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001551.tgz"
+  "version" "1.0.30001551"
+
+"chalk@^2.4.2":
+  "integrity" "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ=="
+  "resolved" "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz"
+  "version" "2.4.2"
+  dependencies:
+    "ansi-styles" "^3.2.1"
+    "escape-string-regexp" "^1.0.5"
+    "supports-color" "^5.3.0"
+
+"chalk@^4.1.0", "chalk@^4.1.2":
+  "integrity" "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA=="
+  "resolved" "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz"
+  "version" "4.1.2"
+  dependencies:
+    "ansi-styles" "^4.1.0"
+    "supports-color" "^7.1.0"
+
+"charenc@0.0.2":
+  "integrity" "sha512-yrLQ/yVUFXkzg7EDQsPieE/53+0RlaWTs+wBrvW36cyilJ2SaDWfl4Yj7MtLTXleV9uEKefbAGUPv2/iWSooRA=="
+  "resolved" "https://registry.npmjs.org/charenc/-/charenc-0.0.2.tgz"
+  "version" "0.0.2"
+
+"chokidar@^3.5.2", "chokidar@^3.5.3", "chokidar@>=3.0.0 <4.0.0":
+  "integrity" "sha512-Dr3sfKRP6oTcjf2JmUmFJfeVMvXBdegxB0iVQ5eb2V10uFJUCAS8OByZdVAyVb8xXNz3GjjTgj9kLWsZTqE6kw=="
+  "resolved" "https://registry.npmjs.org/chokidar/-/chokidar-3.5.3.tgz"
+  "version" "3.5.3"
+  dependencies:
+    "anymatch" "~3.1.2"
+    "braces" "~3.0.2"
+    "glob-parent" "~5.1.2"
+    "is-binary-path" "~2.1.0"
+    "is-glob" "~4.0.1"
+    "normalize-path" "~3.0.0"
+    "readdirp" "~3.6.0"
   optionalDependencies:
-    fsevents "^1.2.7"
-
-chownr@^1.1.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/chownr/-/chownr-1.1.1.tgz#54726b8b8fff4df053c42187e801fb4412df1494"
-
-chrome-trace-event@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/chrome-trace-event/-/chrome-trace-event-1.0.0.tgz#45a91bd2c20c9411f0963b5aaeb9a1b95e09cc48"
-  dependencies:
-    tslib "^1.9.0"
-
-cipher-base@^1.0.0, cipher-base@^1.0.1, cipher-base@^1.0.3:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/cipher-base/-/cipher-base-1.0.4.tgz#8760e4ecc272f4c363532f926d874aae2c1397de"
-  dependencies:
-    inherits "^2.0.1"
-    safe-buffer "^5.0.1"
-
-class-utils@^0.3.5:
-  version "0.3.6"
-  resolved "https://registry.yarnpkg.com/class-utils/-/class-utils-0.3.6.tgz#f93369ae8b9a7ce02fd41faad0ca83033190c463"
-  dependencies:
-    arr-union "^3.1.0"
-    define-property "^0.2.5"
-    isobject "^3.0.0"
-    static-extend "^0.1.1"
-
-clean-css@4.2.x, clean-css@^4.1.3:
-  version "4.2.1"
-  resolved "https://registry.yarnpkg.com/clean-css/-/clean-css-4.2.1.tgz#2d411ef76b8569b6d0c84068dabe85b0aa5e5c17"
-  dependencies:
-    source-map "~0.6.0"
-
-cliui@^4.0.0:
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/cliui/-/cliui-4.1.0.tgz#348422dbe82d800b3022eef4f6ac10bf2e4d1b49"
-  dependencies:
-    string-width "^2.1.1"
-    strip-ansi "^4.0.0"
-    wrap-ansi "^2.0.0"
-
-clone-deep@^2.0.1:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/clone-deep/-/clone-deep-2.0.2.tgz#00db3a1e173656730d1188c3d6aced6d7ea97713"
-  dependencies:
-    for-own "^1.0.0"
-    is-plain-object "^2.0.4"
-    kind-of "^6.0.0"
-    shallow-clone "^1.0.0"
-
-coa@^2.0.2:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/coa/-/coa-2.0.2.tgz#43f6c21151b4ef2bf57187db0d73de229e3e7ec3"
-  dependencies:
-    "@types/q" "^1.5.1"
-    chalk "^2.4.1"
-    q "^1.1.2"
-
-code-point-at@^1.0.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/code-point-at/-/code-point-at-1.1.0.tgz#0d070b4d043a5bea33a2f1a40e2edb3d9a4ccf77"
-
-collection-visit@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/collection-visit/-/collection-visit-1.0.0.tgz#4bc0373c164bc3291b4d368c829cf1a80a59dca0"
-  dependencies:
-    map-visit "^1.0.0"
-    object-visit "^1.0.0"
-
-color-convert@^1.9.0, color-convert@^1.9.1:
-  version "1.9.3"
-  resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-1.9.3.tgz#bb71850690e1f136567de629d2d5471deda4c1e8"
-  dependencies:
-    color-name "1.1.3"
-
-color-name@1.1.3, color-name@^1.0.0:
-  version "1.1.3"
-  resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.3.tgz#a7d0558bd89c42f795dd42328f740831ca53bc25"
-
-color-string@^1.5.2:
-  version "1.5.3"
-  resolved "https://registry.yarnpkg.com/color-string/-/color-string-1.5.3.tgz#c9bbc5f01b58b5492f3d6857459cb6590ce204cc"
-  dependencies:
-    color-name "^1.0.0"
-    simple-swizzle "^0.2.2"
-
-color@^3.0.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/color/-/color-3.1.0.tgz#d8e9fb096732875774c84bf922815df0308d0ffc"
-  dependencies:
-    color-convert "^1.9.1"
-    color-string "^1.5.2"
-
-commander@2.17.x, commander@~2.17.1:
-  version "2.17.1"
-  resolved "https://registry.yarnpkg.com/commander/-/commander-2.17.1.tgz#bd77ab7de6de94205ceacc72f1716d29f20a77bf"
-
-commondir@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/commondir/-/commondir-1.0.1.tgz#ddd800da0c66127393cca5950ea968a3aaf1253b"
-
-component-emitter@^1.2.1:
-  version "1.2.1"
-  resolved "https://registry.yarnpkg.com/component-emitter/-/component-emitter-1.2.1.tgz#137918d6d78283f7df7a6b7c5a63e140e69425e6"
-
-compressible@~2.0.14:
-  version "2.0.16"
-  resolved "https://registry.yarnpkg.com/compressible/-/compressible-2.0.16.tgz#a49bf9858f3821b64ce1be0296afc7380466a77f"
-  dependencies:
-    mime-db ">= 1.38.0 < 2"
-
-compression@^1.5.2:
-  version "1.7.3"
-  resolved "https://registry.yarnpkg.com/compression/-/compression-1.7.3.tgz#27e0e176aaf260f7f2c2813c3e440adb9f1993db"
-  dependencies:
-    accepts "~1.3.5"
-    bytes "3.0.0"
-    compressible "~2.0.14"
-    debug "2.6.9"
-    on-headers "~1.0.1"
-    safe-buffer "5.1.2"
-    vary "~1.1.2"
-
-concat-map@0.0.1:
-  version "0.0.1"
-  resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b"
-  integrity sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==
-
-concat-stream@^1.5.0:
-  version "1.6.2"
-  resolved "https://registry.yarnpkg.com/concat-stream/-/concat-stream-1.6.2.tgz#904bdf194cd3122fc675c77fc4ac3d4ff0fd1a34"
-  dependencies:
-    buffer-from "^1.0.0"
-    inherits "^2.0.3"
-    readable-stream "^2.2.2"
-    typedarray "^0.0.6"
-
-concatenate@0.0.2:
-  version "0.0.2"
-  resolved "https://registry.yarnpkg.com/concatenate/-/concatenate-0.0.2.tgz#0b49d6e8c41047d7728cdc8d62a086623397b49f"
-  dependencies:
-    globs "^0.1.2"
-
-connect-history-api-fallback@^1.3.0:
-  version "1.6.0"
-  resolved "https://registry.yarnpkg.com/connect-history-api-fallback/-/connect-history-api-fallback-1.6.0.tgz#8b32089359308d111115d81cad3fceab888f97bc"
-
-console-browserify@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/console-browserify/-/console-browserify-1.1.0.tgz#f0241c45730a9fc6323b206dbf38edc741d0bb10"
-  dependencies:
-    date-now "^0.1.4"
-
-console-control-strings@^1.0.0, console-control-strings@~1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/console-control-strings/-/console-control-strings-1.1.0.tgz#3d7cf4464db6446ea644bf4b39507f9851008e8e"
-
-consolidate@^0.15.1:
-  version "0.15.1"
-  resolved "https://registry.yarnpkg.com/consolidate/-/consolidate-0.15.1.tgz#21ab043235c71a07d45d9aad98593b0dba56bab7"
-  dependencies:
-    bluebird "^3.1.1"
-
-constants-browserify@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/constants-browserify/-/constants-browserify-1.0.0.tgz#c20b96d8c617748aaf1c16021760cd27fcb8cb75"
-
-content-disposition@0.5.4:
-  version "0.5.4"
-  resolved "https://registry.yarnpkg.com/content-disposition/-/content-disposition-0.5.4.tgz#8b82b4efac82512a02bb0b1dcec9d2c5e8eb5bfe"
-  integrity sha512-FveZTNuGw04cxlAiWbzi6zTAL/lhehaWbTtgluJh4/E95DqMwTmha3KZN1aAWA8cFIhHzMZUvLevkw5Rqk+tSQ==
-  dependencies:
-    safe-buffer "5.2.1"
-
-content-type@~1.0.4:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/content-type/-/content-type-1.0.4.tgz#e138cc75e040c727b1966fe5e5f8c9aee256fe3b"
-  integrity sha512-hIP3EEPs8tB9AT1L+NUqtwOAps4mk2Zob89MWXMHjHWg9milF/j4osnnQLXBCBFBk/tvIG/tUc9mOUJiPBhPXA==
-
-convert-source-map@^0.3.3:
-  version "0.3.5"
-  resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-0.3.5.tgz#f1d802950af7dd2631a1febe0596550c86ab3190"
-
-convert-source-map@^1.1.0, convert-source-map@^1.5.1:
-  version "1.6.0"
-  resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-1.6.0.tgz#51b537a8c43e0f04dec1993bffcdd504e758ac20"
-  dependencies:
-    safe-buffer "~5.1.1"
-
-cookie-signature@1.0.6:
-  version "1.0.6"
-  resolved "https://registry.yarnpkg.com/cookie-signature/-/cookie-signature-1.0.6.tgz#e303a882b342cc3ee8ca513a79999734dab3ae2c"
-  integrity sha512-QADzlaHc8icV8I7vbaJXJwod9HWYp8uCqf1xa4OfNu1T7JVxQIrUgOWtHdNDtPiywmFbiS12VjotIXLrKM3orQ==
-
-cookie@0.5.0:
-  version "0.5.0"
-  resolved "https://registry.yarnpkg.com/cookie/-/cookie-0.5.0.tgz#d1f5d71adec6558c58f389987c366aa47e994f8b"
-  integrity sha512-YZ3GUyn/o8gfKJlnlX7g7xq4gyO6OSuhGPKaaGssGB2qgDUS0gPgtTvoyZLTt9Ab6dC4hfc9dV5arkvc/OCmrw==
-
-copy-concurrently@^1.0.0:
-  version "1.0.5"
-  resolved "https://registry.yarnpkg.com/copy-concurrently/-/copy-concurrently-1.0.5.tgz#92297398cae34937fcafd6ec8139c18051f0b5e0"
-  dependencies:
-    aproba "^1.1.1"
-    fs-write-stream-atomic "^1.0.8"
-    iferr "^0.1.5"
-    mkdirp "^0.5.1"
-    rimraf "^2.5.4"
-    run-queue "^1.0.0"
-
-copy-descriptor@^0.1.0:
-  version "0.1.1"
-  resolved "https://registry.yarnpkg.com/copy-descriptor/-/copy-descriptor-0.1.1.tgz#676f6eb3c39997c2ee1ac3a924fd6124748f578d"
-
-core-util-is@~1.0.0:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.2.tgz#b5fd54220aa2bc5ab57aab7140c940754503c1a7"
-
-cosmiconfig@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/cosmiconfig/-/cosmiconfig-4.0.0.tgz#760391549580bbd2df1e562bc177b13c290972dc"
-  dependencies:
-    is-directory "^0.3.1"
-    js-yaml "^3.9.0"
-    parse-json "^4.0.0"
-    require-from-string "^2.0.1"
-
-cosmiconfig@^5.0.0:
-  version "5.1.0"
-  resolved "https://registry.yarnpkg.com/cosmiconfig/-/cosmiconfig-5.1.0.tgz#6c5c35e97f37f985061cdf653f114784231185cf"
-  dependencies:
-    import-fresh "^2.0.0"
-    is-directory "^0.3.1"
-    js-yaml "^3.9.0"
-    lodash.get "^4.4.2"
-    parse-json "^4.0.0"
-
-create-ecdh@^4.0.0:
-  version "4.0.3"
-  resolved "https://registry.yarnpkg.com/create-ecdh/-/create-ecdh-4.0.3.tgz#c9111b6f33045c4697f144787f9254cdc77c45ff"
-  dependencies:
-    bn.js "^4.1.0"
-    elliptic "^6.0.0"
-
-create-hash@^1.1.0, create-hash@^1.1.2:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/create-hash/-/create-hash-1.2.0.tgz#889078af11a63756bcfb59bd221996be3a9ef196"
-  dependencies:
-    cipher-base "^1.0.1"
-    inherits "^2.0.1"
-    md5.js "^1.3.4"
-    ripemd160 "^2.0.1"
-    sha.js "^2.4.0"
-
-create-hmac@^1.1.0, create-hmac@^1.1.2, create-hmac@^1.1.4:
-  version "1.1.7"
-  resolved "https://registry.yarnpkg.com/create-hmac/-/create-hmac-1.1.7.tgz#69170c78b3ab957147b2b8b04572e47ead2243ff"
-  dependencies:
-    cipher-base "^1.0.3"
-    create-hash "^1.1.0"
-    inherits "^2.0.1"
-    ripemd160 "^2.0.0"
-    safe-buffer "^5.0.1"
-    sha.js "^2.4.8"
-
-cross-env@^5.1:
-  version "5.2.0"
-  resolved "https://registry.yarnpkg.com/cross-env/-/cross-env-5.2.0.tgz#6ecd4c015d5773e614039ee529076669b9d126f2"
-  dependencies:
-    cross-spawn "^6.0.5"
-    is-windows "^1.0.0"
-
-cross-spawn@^6.0.0, cross-spawn@^6.0.5:
-  version "6.0.5"
-  resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-6.0.5.tgz#4a5ec7c64dfae22c3a14124dbacdee846d80cbc4"
-  dependencies:
-    nice-try "^1.0.4"
-    path-key "^2.0.1"
-    semver "^5.5.0"
-    shebang-command "^1.2.0"
-    which "^1.2.9"
-
-crypt@~0.0.1:
-  version "0.0.2"
-  resolved "https://registry.yarnpkg.com/crypt/-/crypt-0.0.2.tgz#88d7ff7ec0dfb86f713dc87bbb42d044d3e6c41b"
-
-crypto-browserify@^3.11.0:
-  version "3.12.0"
-  resolved "https://registry.yarnpkg.com/crypto-browserify/-/crypto-browserify-3.12.0.tgz#396cf9f3137f03e4b8e532c58f698254e00f80ec"
-  dependencies:
-    browserify-cipher "^1.0.0"
-    browserify-sign "^4.0.0"
-    create-ecdh "^4.0.0"
-    create-hash "^1.1.0"
-    create-hmac "^1.1.0"
-    diffie-hellman "^5.0.0"
-    inherits "^2.0.1"
-    pbkdf2 "^3.0.3"
-    public-encrypt "^4.0.0"
-    randombytes "^2.0.0"
-    randomfill "^1.0.3"
-
-css-color-names@0.0.4, css-color-names@^0.0.4:
-  version "0.0.4"
-  resolved "https://registry.yarnpkg.com/css-color-names/-/css-color-names-0.0.4.tgz#808adc2e79cf84738069b646cb20ec27beb629e0"
-
-css-declaration-sorter@^4.0.1:
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/css-declaration-sorter/-/css-declaration-sorter-4.0.1.tgz#c198940f63a76d7e36c1e71018b001721054cb22"
-  dependencies:
-    postcss "^7.0.1"
-    timsort "^0.3.0"
-
-css-loader@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/css-loader/-/css-loader-1.0.1.tgz#6885bb5233b35ec47b006057da01cc640b6b79fe"
-  dependencies:
-    babel-code-frame "^6.26.0"
-    css-selector-tokenizer "^0.7.0"
-    icss-utils "^2.1.0"
-    loader-utils "^1.0.2"
-    lodash "^4.17.11"
-    postcss "^6.0.23"
-    postcss-modules-extract-imports "^1.2.0"
-    postcss-modules-local-by-default "^1.2.0"
-    postcss-modules-scope "^1.1.0"
-    postcss-modules-values "^1.3.0"
-    postcss-value-parser "^3.3.0"
-    source-list-map "^2.0.0"
-
-css-select-base-adapter@^0.1.1:
-  version "0.1.1"
-  resolved "https://registry.yarnpkg.com/css-select-base-adapter/-/css-select-base-adapter-0.1.1.tgz#3b2ff4972cc362ab88561507a95408a1432135d7"
-
-css-select@^2.0.0:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/css-select/-/css-select-2.0.2.tgz#ab4386cec9e1f668855564b17c3733b43b2a5ede"
-  dependencies:
-    boolbase "^1.0.0"
-    css-what "^2.1.2"
-    domutils "^1.7.0"
-    nth-check "^1.0.2"
-
-css-selector-tokenizer@^0.7.0:
-  version "0.7.1"
-  resolved "https://registry.yarnpkg.com/css-selector-tokenizer/-/css-selector-tokenizer-0.7.1.tgz#a177271a8bca5019172f4f891fc6eed9cbf68d5d"
-  dependencies:
-    cssesc "^0.1.0"
-    fastparse "^1.1.1"
-    regexpu-core "^1.0.0"
-
-css-tree@1.0.0-alpha.28:
-  version "1.0.0-alpha.28"
-  resolved "https://registry.yarnpkg.com/css-tree/-/css-tree-1.0.0-alpha.28.tgz#8e8968190d886c9477bc8d61e96f61af3f7ffa7f"
-  dependencies:
-    mdn-data "~1.1.0"
-    source-map "^0.5.3"
-
-css-tree@1.0.0-alpha.29:
-  version "1.0.0-alpha.29"
-  resolved "https://registry.yarnpkg.com/css-tree/-/css-tree-1.0.0-alpha.29.tgz#3fa9d4ef3142cbd1c301e7664c1f352bd82f5a39"
-  dependencies:
-    mdn-data "~1.1.0"
-    source-map "^0.5.3"
-
-css-unit-converter@^1.1.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/css-unit-converter/-/css-unit-converter-1.1.1.tgz#d9b9281adcfd8ced935bdbaba83786897f64e996"
-
-css-url-regex@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/css-url-regex/-/css-url-regex-1.1.0.tgz#83834230cc9f74c457de59eebd1543feeb83b7ec"
-
-css-what@^2.1.2:
-  version "2.1.3"
-  resolved "https://registry.yarnpkg.com/css-what/-/css-what-2.1.3.tgz#a6d7604573365fe74686c3f311c56513d88285f2"
-
-css@^2.0.0:
-  version "2.2.4"
-  resolved "https://registry.yarnpkg.com/css/-/css-2.2.4.tgz#c646755c73971f2bba6a601e2cf2fd71b1298929"
-  dependencies:
-    inherits "^2.0.3"
-    source-map "^0.6.1"
-    source-map-resolve "^0.5.2"
-    urix "^0.1.0"
-
-cssesc@^0.1.0:
-  version "0.1.0"
-  resolved "https://registry.yarnpkg.com/cssesc/-/cssesc-0.1.0.tgz#c814903e45623371a0477b40109aaafbeeaddbb4"
-
-cssesc@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/cssesc/-/cssesc-2.0.0.tgz#3b13bd1bb1cb36e1bcb5a4dcd27f54c5dcb35703"
-
-cssnano-preset-default@^4.0.7:
-  version "4.0.7"
-  resolved "https://registry.yarnpkg.com/cssnano-preset-default/-/cssnano-preset-default-4.0.7.tgz#51ec662ccfca0f88b396dcd9679cdb931be17f76"
-  dependencies:
-    css-declaration-sorter "^4.0.1"
-    cssnano-util-raw-cache "^4.0.1"
-    postcss "^7.0.0"
-    postcss-calc "^7.0.1"
-    postcss-colormin "^4.0.3"
-    postcss-convert-values "^4.0.1"
-    postcss-discard-comments "^4.0.2"
-    postcss-discard-duplicates "^4.0.2"
-    postcss-discard-empty "^4.0.1"
-    postcss-discard-overridden "^4.0.1"
-    postcss-merge-longhand "^4.0.11"
-    postcss-merge-rules "^4.0.3"
-    postcss-minify-font-values "^4.0.2"
-    postcss-minify-gradients "^4.0.2"
-    postcss-minify-params "^4.0.2"
-    postcss-minify-selectors "^4.0.2"
-    postcss-normalize-charset "^4.0.1"
-    postcss-normalize-display-values "^4.0.2"
-    postcss-normalize-positions "^4.0.2"
-    postcss-normalize-repeat-style "^4.0.2"
-    postcss-normalize-string "^4.0.2"
-    postcss-normalize-timing-functions "^4.0.2"
-    postcss-normalize-unicode "^4.0.1"
-    postcss-normalize-url "^4.0.1"
-    postcss-normalize-whitespace "^4.0.2"
-    postcss-ordered-values "^4.1.2"
-    postcss-reduce-initial "^4.0.3"
-    postcss-reduce-transforms "^4.0.2"
-    postcss-svgo "^4.0.2"
-    postcss-unique-selectors "^4.0.1"
-
-cssnano-util-get-arguments@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/cssnano-util-get-arguments/-/cssnano-util-get-arguments-4.0.0.tgz#ed3a08299f21d75741b20f3b81f194ed49cc150f"
-
-cssnano-util-get-match@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/cssnano-util-get-match/-/cssnano-util-get-match-4.0.0.tgz#c0e4ca07f5386bb17ec5e52250b4f5961365156d"
-
-cssnano-util-raw-cache@^4.0.1:
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/cssnano-util-raw-cache/-/cssnano-util-raw-cache-4.0.1.tgz#b26d5fd5f72a11dfe7a7846fb4c67260f96bf282"
-  dependencies:
-    postcss "^7.0.0"
-
-cssnano-util-same-parent@^4.0.0:
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/cssnano-util-same-parent/-/cssnano-util-same-parent-4.0.1.tgz#574082fb2859d2db433855835d9a8456ea18bbf3"
-
-cssnano@^4.1.0:
-  version "4.1.10"
-  resolved "https://registry.yarnpkg.com/cssnano/-/cssnano-4.1.10.tgz#0ac41f0b13d13d465487e111b778d42da631b8b2"
-  dependencies:
-    cosmiconfig "^5.0.0"
-    cssnano-preset-default "^4.0.7"
-    is-resolvable "^1.0.0"
-    postcss "^7.0.0"
-
-csso@^3.5.1:
-  version "3.5.1"
-  resolved "https://registry.yarnpkg.com/csso/-/csso-3.5.1.tgz#7b9eb8be61628973c1b261e169d2f024008e758b"
-  dependencies:
-    css-tree "1.0.0-alpha.29"
-
-cyclist@~0.2.2:
-  version "0.2.2"
-  resolved "https://registry.yarnpkg.com/cyclist/-/cyclist-0.2.2.tgz#1b33792e11e914a2fd6d6ed6447464444e5fa640"
-
-date-now@^0.1.4:
-  version "0.1.4"
-  resolved "https://registry.yarnpkg.com/date-now/-/date-now-0.1.4.tgz#eaf439fd4d4848ad74e5cc7dbef200672b9e345b"
-
-debug@2.6.9, debug@^2.1.2, debug@^2.2.0, debug@^2.3.3:
-  version "2.6.9"
-  resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.9.tgz#5d128515df134ff327e90a4c93f4e077a536341f"
-  integrity sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==
-  dependencies:
-    ms "2.0.0"
-
-debug@^3.2.5:
-  version "3.2.6"
-  resolved "https://registry.yarnpkg.com/debug/-/debug-3.2.6.tgz#e83d17de16d8a7efb7717edbe5fb10135eee629b"
-  dependencies:
-    ms "^2.1.1"
-
-debug@^4.1.0, debug@^4.1.1:
-  version "4.1.1"
-  resolved "https://registry.yarnpkg.com/debug/-/debug-4.1.1.tgz#3b72260255109c6b589cee050f1d516139664791"
-  dependencies:
-    ms "^2.1.1"
-
-decamelize@^1.2.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/decamelize/-/decamelize-1.2.0.tgz#f6534d15148269b20352e7bee26f501f9a191290"
-
-decamelize@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/decamelize/-/decamelize-2.0.0.tgz#656d7bbc8094c4c788ea53c5840908c9c7d063c7"
-  dependencies:
-    xregexp "4.0.0"
-
-decode-uri-component@^0.2.0:
-  version "0.2.2"
-  resolved "https://registry.yarnpkg.com/decode-uri-component/-/decode-uri-component-0.2.2.tgz#e69dbe25d37941171dd540e024c444cd5188e1e9"
-  integrity sha512-FqUYQ+8o158GyGTrMFJms9qh3CqTKvAqgqsTnkLI8sKu0028orqBhxNMFkFen0zGyg6epACD32pjVk58ngIErQ==
-
-deep-equal@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/deep-equal/-/deep-equal-1.0.1.tgz#f5d260292b660e084eff4cdbc9f08ad3247448b5"
-
-deep-extend@^0.6.0:
-  version "0.6.0"
-  resolved "https://registry.yarnpkg.com/deep-extend/-/deep-extend-0.6.0.tgz#c4fa7c95404a17a9c3e8ca7e1537312b736330ac"
-
-deepmerge@^2.1.0:
-  version "2.2.1"
-  resolved "https://registry.yarnpkg.com/deepmerge/-/deepmerge-2.2.1.tgz#5d3ff22a01c00f645405a2fbc17d0778a1801170"
-
-default-gateway@^4.0.1:
-  version "4.1.2"
-  resolved "https://registry.yarnpkg.com/default-gateway/-/default-gateway-4.1.2.tgz#b49196b51b26609e5d1af636287517a11a9aaf42"
-  dependencies:
-    execa "^1.0.0"
-    ip-regex "^2.1.0"
-
-define-properties@^1.1.2, define-properties@^1.1.3:
-  version "1.1.3"
-  resolved "https://registry.yarnpkg.com/define-properties/-/define-properties-1.1.3.tgz#cf88da6cbee26fe6db7094f61d870cbd84cee9f1"
-  dependencies:
-    object-keys "^1.0.12"
-
-define-property@^0.2.5:
-  version "0.2.5"
-  resolved "https://registry.yarnpkg.com/define-property/-/define-property-0.2.5.tgz#c35b1ef918ec3c990f9a5bc57be04aacec5c8116"
-  dependencies:
-    is-descriptor "^0.1.0"
-
-define-property@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/define-property/-/define-property-1.0.0.tgz#769ebaaf3f4a63aad3af9e8d304c9bbe79bfb0e6"
-  dependencies:
-    is-descriptor "^1.0.0"
-
-define-property@^2.0.2:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/define-property/-/define-property-2.0.2.tgz#d459689e8d654ba77e02a817f8710d702cb16e9d"
-  dependencies:
-    is-descriptor "^1.0.2"
-    isobject "^3.0.1"
-
-del@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/del/-/del-3.0.0.tgz#53ecf699ffcbcb39637691ab13baf160819766e5"
-  dependencies:
-    globby "^6.1.0"
-    is-path-cwd "^1.0.0"
-    is-path-in-cwd "^1.0.0"
-    p-map "^1.1.1"
-    pify "^3.0.0"
-    rimraf "^2.2.8"
-
-delegates@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/delegates/-/delegates-1.0.0.tgz#84c6e159b81904fdca59a0ef44cd870d31250f9a"
-
-depd@2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/depd/-/depd-2.0.0.tgz#b696163cc757560d09cf22cc8fad1571b79e76df"
-  integrity sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw==
-
-depd@~1.1.2:
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/depd/-/depd-1.1.2.tgz#9bcd52e14c097763e749b274c4346ed2e560b5a9"
-
-des.js@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/des.js/-/des.js-1.0.0.tgz#c074d2e2aa6a8a9a07dbd61f9a15c2cd83ec8ecc"
-  dependencies:
-    inherits "^2.0.1"
-    minimalistic-assert "^1.0.0"
-
-destroy@1.2.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/destroy/-/destroy-1.2.0.tgz#4803735509ad8be552934c67df614f94e66fa015"
-  integrity sha512-2sJGJTaXIIaR1w4iJSNoN0hnMY7Gpc/n8D4qSCJw8QqFWXf7cuAgnEHxBpweaVcPevC2l3KpjYCx3NypQQgaJg==
-
-detect-file@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/detect-file/-/detect-file-1.0.0.tgz#f0d66d03672a825cb1b73bdb3fe62310c8e552b7"
-
-detect-libc@^1.0.2:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/detect-libc/-/detect-libc-1.0.3.tgz#fa137c4bd698edf55cd5cd02ac559f91a4c4ba9b"
-
-detect-node@^2.0.4:
-  version "2.0.4"
-  resolved "https://registry.yarnpkg.com/detect-node/-/detect-node-2.0.4.tgz#014ee8f8f669c5c58023da64b8179c083a28c46c"
-
-diffie-hellman@^5.0.0:
-  version "5.0.3"
-  resolved "https://registry.yarnpkg.com/diffie-hellman/-/diffie-hellman-5.0.3.tgz#40e8ee98f55a2149607146921c63e1ae5f3d2875"
-  dependencies:
-    bn.js "^4.1.0"
-    miller-rabin "^4.0.0"
-    randombytes "^2.0.0"
+    "fsevents" "~2.3.2"
 
-dir-glob@2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/dir-glob/-/dir-glob-2.0.0.tgz#0b205d2b6aef98238ca286598a8204d29d0a0034"
-  dependencies:
-    arrify "^1.0.1"
-    path-type "^3.0.0"
-
-dns-equal@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/dns-equal/-/dns-equal-1.0.0.tgz#b39e7f1da6eb0a75ba9c17324b34753c47e0654d"
-
-dns-packet@^1.3.1:
-  version "1.3.1"
-  resolved "https://registry.yarnpkg.com/dns-packet/-/dns-packet-1.3.1.tgz#12aa426981075be500b910eedcd0b47dd7deda5a"
-  dependencies:
-    ip "^1.1.0"
-    safe-buffer "^5.0.1"
-
-dns-txt@^2.0.2:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/dns-txt/-/dns-txt-2.0.2.tgz#b91d806f5d27188e4ab3e7d107d881a1cc4642b6"
-  dependencies:
-    buffer-indexof "^1.0.0"
-
-dom-serializer@0:
-  version "0.1.1"
-  resolved "https://registry.yarnpkg.com/dom-serializer/-/dom-serializer-0.1.1.tgz#1ec4059e284babed36eec2941d4a970a189ce7c0"
-  dependencies:
-    domelementtype "^1.3.0"
-    entities "^1.1.1"
-
-domain-browser@^1.1.1:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/domain-browser/-/domain-browser-1.2.0.tgz#3d31f50191a6749dd1375a7f522e823d42e54eda"
-
-domelementtype@1, domelementtype@^1.3.0:
-  version "1.3.1"
-  resolved "https://registry.yarnpkg.com/domelementtype/-/domelementtype-1.3.1.tgz#d048c44b37b0d10a7f2a3d5fee3f4333d790481f"
-
-domutils@^1.7.0:
-  version "1.7.0"
-  resolved "https://registry.yarnpkg.com/domutils/-/domutils-1.7.0.tgz#56ea341e834e06e6748af7a1cb25da67ea9f8c2a"
-  dependencies:
-    dom-serializer "0"
-    domelementtype "1"
-
-dot-prop@^4.1.1:
-  version "4.2.1"
-  resolved "https://registry.yarnpkg.com/dot-prop/-/dot-prop-4.2.1.tgz#45884194a71fc2cda71cbb4bceb3a4dd2f433ba4"
-  integrity sha512-l0p4+mIuJIua0mhxGoh4a+iNL9bmeK5DvnSVQa6T0OhrVmaEa1XScX5Etc673FePCJOArq/4Pa2cLGODUWTPOQ==
-  dependencies:
-    is-obj "^1.0.0"
-
-dotenv-expand@^4.2.0:
-  version "4.2.0"
-  resolved "https://registry.yarnpkg.com/dotenv-expand/-/dotenv-expand-4.2.0.tgz#def1f1ca5d6059d24a766e587942c21106ce1275"
-
-dotenv@^6.2.0:
-  version "6.2.0"
-  resolved "https://registry.yarnpkg.com/dotenv/-/dotenv-6.2.0.tgz#941c0410535d942c8becf28d3f357dbd9d476064"
+"chrome-trace-event@^1.0.2":
+  "integrity" "sha512-p3KULyQg4S7NIHixdwbGX+nFHkoBiA4YQmyWtjb8XngSKV124nJmRysgAeujbUVb15vh+RvFUfCPqU7rXk+hZg=="
+  "resolved" "https://registry.npmjs.org/chrome-trace-event/-/chrome-trace-event-1.0.3.tgz"
+  "version" "1.0.3"
 
-duplexify@^3.4.2, duplexify@^3.6.0:
-  version "3.7.1"
-  resolved "https://registry.yarnpkg.com/duplexify/-/duplexify-3.7.1.tgz#2a4df5317f6ccfd91f86d6fd25d8d8a103b88309"
+"cipher-base@^1.0.0", "cipher-base@^1.0.1", "cipher-base@^1.0.3":
+  "integrity" "sha512-Kkht5ye6ZGmwv40uUDZztayT2ThLQGfnj/T71N/XzeZeo3nf8foyW7zGTsPYkEya3m5f3cAypH+qe7YOrM1U2Q=="
+  "resolved" "https://registry.npmjs.org/cipher-base/-/cipher-base-1.0.4.tgz"
+  "version" "1.0.4"
   dependencies:
-    end-of-stream "^1.0.0"
-    inherits "^2.0.1"
-    readable-stream "^2.0.0"
-    stream-shift "^1.0.0"
+    "inherits" "^2.0.1"
+    "safe-buffer" "^5.0.1"
 
-ee-first@1.1.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/ee-first/-/ee-first-1.1.1.tgz#590c61156b0ae2f4f0255732a158b266bc56b21d"
-  integrity sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow==
-
-electron-to-chromium@^1.3.113:
-  version "1.3.113"
-  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.113.tgz#b1ccf619df7295aea17bc6951dc689632629e4a9"
-
-elliptic@^6.0.0:
-  version "6.5.4"
-  resolved "https://registry.yarnpkg.com/elliptic/-/elliptic-6.5.4.tgz#da37cebd31e79a1367e941b592ed1fbebd58abbb"
-  integrity sha512-iLhC6ULemrljPZb+QutR5TQGB+pdW6KGD5RSegS+8sorOZT+rdQFbsQFJgvN3eRqNALqJer4oQ16YvJHlU8hzQ==
-  dependencies:
-    bn.js "^4.11.9"
-    brorand "^1.1.0"
-    hash.js "^1.0.0"
-    hmac-drbg "^1.0.1"
-    inherits "^2.0.4"
-    minimalistic-assert "^1.0.1"
-    minimalistic-crypto-utils "^1.0.1"
-
-emojis-list@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/emojis-list/-/emojis-list-3.0.0.tgz#5570662046ad29e2e916e71aae260abdff4f6a78"
-  integrity sha512-/kyM18EfinwXZbno9FyUGeFh87KC8HRQBQGildHZbEuRyWFOmv1U10o9BBp8XVZDVNNuQKyIGIu5ZYAAXJ0V2Q==
-
-encodeurl@~1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/encodeurl/-/encodeurl-1.0.2.tgz#ad3ff4c86ec2d029322f5a02c3a9a606c95b3f59"
-  integrity sha512-TPJXq8JqFaVYm2CWmPvnP2Iyo4ZSM7/QKcSmuMLDObfpH5fi7RUGmd/rTDf+rut/saiDiQEeVTNgAmJEdAOx0w==
-
-end-of-stream@^1.0.0, end-of-stream@^1.1.0:
-  version "1.4.1"
-  resolved "https://registry.yarnpkg.com/end-of-stream/-/end-of-stream-1.4.1.tgz#ed29634d19baba463b6ce6b80a37213eab71ec43"
-  dependencies:
-    once "^1.4.0"
-
-enhanced-resolve@^4.1.0:
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-4.1.0.tgz#41c7e0bfdfe74ac1ffe1e57ad6a5c6c9f3742a7f"
+"clean-css@^4.2.3":
+  "integrity" "sha512-EJUDT7nDVFDvaQgAo2G/PJvxmp1o/c6iXLbswsBbUFXi1Nr+AjA2cKmfbKDMjMvzEe75g3P6JkaDDAKk96A85A=="
+  "resolved" "https://registry.npmjs.org/clean-css/-/clean-css-4.2.4.tgz"
+  "version" "4.2.4"
   dependencies:
-    graceful-fs "^4.1.2"
-    memory-fs "^0.4.0"
-    tapable "^1.0.0"
+    "source-map" "~0.6.0"
 
-entities@^1.1.1:
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/entities/-/entities-1.1.2.tgz#bdfa735299664dfafd34529ed4f8522a275fea56"
-
-errno@^0.1.3, errno@~0.1.7:
-  version "0.1.7"
-  resolved "https://registry.yarnpkg.com/errno/-/errno-0.1.7.tgz#4684d71779ad39af177e3f007996f7c67c852618"
-  dependencies:
-    prr "~1.0.1"
-
-error-ex@^1.3.1:
-  version "1.3.2"
-  resolved "https://registry.yarnpkg.com/error-ex/-/error-ex-1.3.2.tgz#b4ac40648107fdcdcfae242f428bea8a14d4f1bf"
-  dependencies:
-    is-arrayish "^0.2.1"
-
-error-stack-parser@^2.0.0:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/error-stack-parser/-/error-stack-parser-2.0.2.tgz#4ae8dbaa2bf90a8b450707b9149dcabca135520d"
+"clean-css@^5.2.4":
+  "integrity" "sha512-JVJbM+f3d3Q704rF4bqQ5UUyTtuJ0JRKNbTKVEeujCCBoMdkEi+V+e8oktO9qGQNSvHrFTM6JZRXrUvGR1czww=="
+  "resolved" "https://registry.npmjs.org/clean-css/-/clean-css-5.3.2.tgz"
+  "version" "5.3.2"
   dependencies:
-    stackframe "^1.0.4"
+    "source-map" "~0.6.0"
 
-es-abstract@^1.12.0, es-abstract@^1.5.1:
-  version "1.13.0"
-  resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.13.0.tgz#ac86145fdd5099d8dd49558ccba2eaf9b88e24e9"
-  dependencies:
-    es-to-primitive "^1.2.0"
-    function-bind "^1.1.1"
-    has "^1.0.3"
-    is-callable "^1.1.4"
-    is-regex "^1.0.4"
-    object-keys "^1.0.12"
-
-es-to-primitive@^1.2.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/es-to-primitive/-/es-to-primitive-1.2.0.tgz#edf72478033456e8dda8ef09e00ad9650707f377"
-  dependencies:
-    is-callable "^1.1.4"
-    is-date-object "^1.0.1"
-    is-symbol "^1.0.2"
-
-es6-templates@^0.2.3:
-  version "0.2.3"
-  resolved "https://registry.yarnpkg.com/es6-templates/-/es6-templates-0.2.3.tgz#5cb9ac9fb1ded6eb1239342b81d792bbb4078ee4"
-  dependencies:
-    recast "~0.11.12"
-    through "~2.3.6"
-
-escape-html@~1.0.3:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/escape-html/-/escape-html-1.0.3.tgz#0258eae4d3d0c0974de1c169188ef0051d1d1988"
-  integrity sha512-NiSupZ4OeuGwr68lGIeym/ksIZMJodUGOSCZ/FSnTxcrekbvqrgdUxlJOMpijaKZVjAJrWrGs/6Jy8OMuyj9ow==
-
-escape-string-regexp@^1.0.2, escape-string-regexp@^1.0.5:
-  version "1.0.5"
-  resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4"
-
-eslint-scope@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-4.0.0.tgz#50bf3071e9338bcdc43331794a0cb533f0136172"
-  dependencies:
-    esrecurse "^4.1.0"
-    estraverse "^4.1.1"
-
-esprima@^4.0.0:
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/esprima/-/esprima-4.0.1.tgz#13b04cdb3e6c5d19df91ab6987a8695619b0aa71"
-  integrity sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==
-
-esprima@~3.1.0:
-  version "3.1.3"
-  resolved "https://registry.yarnpkg.com/esprima/-/esprima-3.1.3.tgz#fdca51cee6133895e3c88d535ce49dbff62a4633"
-
-esrecurse@^4.1.0:
-  version "4.2.1"
-  resolved "https://registry.yarnpkg.com/esrecurse/-/esrecurse-4.2.1.tgz#007a3b9fdbc2b3bb87e4879ea19c92fdbd3942cf"
-  dependencies:
-    estraverse "^4.1.0"
-
-estraverse@^4.1.0, estraverse@^4.1.1:
-  version "4.2.0"
-  resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-4.2.0.tgz#0dee3fed31fcd469618ce7342099fc1afa0bdb13"
-
-esutils@^2.0.2:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/esutils/-/esutils-2.0.2.tgz#0abf4f1caa5bcb1f7a9d8acc6dea4faaa04bac9b"
-
-etag@~1.8.1:
-  version "1.8.1"
-  resolved "https://registry.yarnpkg.com/etag/-/etag-1.8.1.tgz#41ae2eeb65efa62268aebfea83ac7d79299b0887"
-  integrity sha512-aIL5Fx7mawVa300al2BnEE4iNvo1qETxLrPI/o05L7z6go7fCw1J6EQmbK4FmJ2AS7kgVF/KEZWufBfdClMcPg==
-
-eventemitter3@^4.0.0:
-  version "4.0.7"
-  resolved "https://registry.yarnpkg.com/eventemitter3/-/eventemitter3-4.0.7.tgz#2de9b68f6528d5644ef5c59526a1b4a07306169f"
-  integrity sha512-8guHBZCwKnFhYdHr2ysuRWErTwhoN2X8XELRlrRwpmfeY2jjuUN4taQMsULKUVo1K4DvZl+0pgfyoysHxvmvEw==
-
-events@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/events/-/events-3.0.0.tgz#9a0a0dfaf62893d92b875b8f2698ca4114973e88"
-
-eventsource@^1.0.7:
-  version "1.0.7"
-  resolved "https://registry.yarnpkg.com/eventsource/-/eventsource-1.0.7.tgz#8fbc72c93fcd34088090bc0a4e64f4b5cee6d8d0"
-  dependencies:
-    original "^1.0.0"
-
-evp_bytestokey@^1.0.0, evp_bytestokey@^1.0.3:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/evp_bytestokey/-/evp_bytestokey-1.0.3.tgz#7fcbdb198dc71959432efe13842684e0525acb02"
-  dependencies:
-    md5.js "^1.3.4"
-    safe-buffer "^5.1.1"
-
-execa@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/execa/-/execa-1.0.0.tgz#c6236a5bb4df6d6f15e88e7f017798216749ddd8"
-  dependencies:
-    cross-spawn "^6.0.0"
-    get-stream "^4.0.0"
-    is-stream "^1.1.0"
-    npm-run-path "^2.0.0"
-    p-finally "^1.0.0"
-    signal-exit "^3.0.0"
-    strip-eof "^1.0.0"
-
-expand-brackets@^2.1.4:
-  version "2.1.4"
-  resolved "https://registry.yarnpkg.com/expand-brackets/-/expand-brackets-2.1.4.tgz#b77735e315ce30f6b6eff0f83b04151a22449622"
-  dependencies:
-    debug "^2.3.3"
-    define-property "^0.2.5"
-    extend-shallow "^2.0.1"
-    posix-character-classes "^0.1.0"
-    regex-not "^1.0.0"
-    snapdragon "^0.8.1"
-    to-regex "^3.0.1"
-
-expand-tilde@^2.0.0, expand-tilde@^2.0.2:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/expand-tilde/-/expand-tilde-2.0.2.tgz#97e801aa052df02454de46b02bf621642cdc8502"
-  dependencies:
-    homedir-polyfill "^1.0.1"
-
-express@^4.16.2:
-  version "4.18.2"
-  resolved "https://registry.yarnpkg.com/express/-/express-4.18.2.tgz#3fabe08296e930c796c19e3c516979386ba9fd59"
-  integrity sha512-5/PsL6iGPdfQ/lKM1UuielYgv3BUoJfz1aUwU9vHZ+J7gyvwdQXFEBIEIaxeGf0GIcreATNyBExtalisDbuMqQ==
-  dependencies:
-    accepts "~1.3.8"
-    array-flatten "1.1.1"
-    body-parser "1.20.1"
-    content-disposition "0.5.4"
-    content-type "~1.0.4"
-    cookie "0.5.0"
-    cookie-signature "1.0.6"
-    debug "2.6.9"
-    depd "2.0.0"
-    encodeurl "~1.0.2"
-    escape-html "~1.0.3"
-    etag "~1.8.1"
-    finalhandler "1.2.0"
-    fresh "0.5.2"
-    http-errors "2.0.0"
-    merge-descriptors "1.0.1"
-    methods "~1.1.2"
-    on-finished "2.4.1"
-    parseurl "~1.3.3"
-    path-to-regexp "0.1.7"
-    proxy-addr "~2.0.7"
-    qs "6.11.0"
-    range-parser "~1.2.1"
-    safe-buffer "5.2.1"
-    send "0.18.0"
-    serve-static "1.15.0"
-    setprototypeof "1.2.0"
-    statuses "2.0.1"
-    type-is "~1.6.18"
-    utils-merge "1.0.1"
-    vary "~1.1.2"
-
-extend-shallow@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/extend-shallow/-/extend-shallow-2.0.1.tgz#51af7d614ad9a9f610ea1bafbb989d6b1c56890f"
-  dependencies:
-    is-extendable "^0.1.0"
-
-extend-shallow@^3.0.0, extend-shallow@^3.0.2:
-  version "3.0.2"
-  resolved "https://registry.yarnpkg.com/extend-shallow/-/extend-shallow-3.0.2.tgz#26a71aaf073b39fb2127172746131c2704028db8"
-  dependencies:
-    assign-symbols "^1.0.0"
-    is-extendable "^1.0.1"
-
-extglob@^2.0.4:
-  version "2.0.4"
-  resolved "https://registry.yarnpkg.com/extglob/-/extglob-2.0.4.tgz#ad00fe4dc612a9232e8718711dc5cb5ab0285543"
-  dependencies:
-    array-unique "^0.3.2"
-    define-property "^1.0.0"
-    expand-brackets "^2.1.4"
-    extend-shallow "^2.0.1"
-    fragment-cache "^0.2.1"
-    regex-not "^1.0.0"
-    snapdragon "^0.8.1"
-    to-regex "^3.0.1"
-
-extract-text-webpack-plugin@v4.0.0-beta.0:
-  version "4.0.0-beta.0"
-  resolved "https://registry.yarnpkg.com/extract-text-webpack-plugin/-/extract-text-webpack-plugin-4.0.0-beta.0.tgz#f7361d7ff430b42961f8d1321ba8c1757b5d4c42"
-  dependencies:
-    async "^2.4.1"
-    loader-utils "^1.1.0"
-    schema-utils "^0.4.5"
-    webpack-sources "^1.1.0"
-
-fast-deep-equal@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-2.0.1.tgz#7b05218ddf9667bf7f370bf7fdb2cb15fdd0aa49"
-
-fast-glob@^2.0.2:
-  version "2.2.6"
-  resolved "https://registry.yarnpkg.com/fast-glob/-/fast-glob-2.2.6.tgz#a5d5b697ec8deda468d85a74035290a025a95295"
-  dependencies:
-    "@mrmlnc/readdir-enhanced" "^2.2.1"
-    "@nodelib/fs.stat" "^1.1.2"
-    glob-parent "^3.1.0"
-    is-glob "^4.0.0"
-    merge2 "^1.2.3"
-    micromatch "^3.1.10"
-
-fast-json-stable-stringify@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/fast-json-stable-stringify/-/fast-json-stable-stringify-2.0.0.tgz#d5142c0caee6b1189f87d3a76111064f86c8bbf2"
-
-fastparse@^1.1.1:
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/fastparse/-/fastparse-1.1.2.tgz#91728c5a5942eced8531283c79441ee4122c35a9"
-
-faye-websocket@^0.10.0:
-  version "0.10.0"
-  resolved "https://registry.yarnpkg.com/faye-websocket/-/faye-websocket-0.10.0.tgz#4e492f8d04dfb6f89003507f6edbf2d501e7c6f4"
-  dependencies:
-    websocket-driver ">=0.5.1"
-
-faye-websocket@~0.11.1:
-  version "0.11.1"
-  resolved "https://registry.yarnpkg.com/faye-websocket/-/faye-websocket-0.11.1.tgz#f0efe18c4f56e4f40afc7e06c719fd5ee6188f38"
-  dependencies:
-    websocket-driver ">=0.5.1"
-
-figgy-pudding@^3.5.1:
-  version "3.5.2"
-  resolved "https://registry.yarnpkg.com/figgy-pudding/-/figgy-pudding-3.5.2.tgz#b4eee8148abb01dcf1d1ac34367d59e12fa61d6e"
-  integrity sha512-0btnI/H8f2pavGMN8w40mlSKOfTK2SVJmBfBeVIj3kNw0swwgzyRq0d5TJVOwodFmtvpPeWPN/MCcfuWF0Ezbw==
-
-file-loader@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/file-loader/-/file-loader-2.0.0.tgz#39749c82f020b9e85901dcff98e8004e6401cfde"
-  dependencies:
-    loader-utils "^1.0.2"
-    schema-utils "^1.0.0"
-
-file-type@^10.7.0:
-  version "10.8.0"
-  resolved "https://registry.yarnpkg.com/file-type/-/file-type-10.8.0.tgz#676dfd43fdb75d8ccdba1cff53351b71190c25ff"
-
-fill-range@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-4.0.0.tgz#d544811d428f98eb06a63dc402d2403c328c38f7"
-  dependencies:
-    extend-shallow "^2.0.1"
-    is-number "^3.0.0"
-    repeat-string "^1.6.1"
-    to-regex-range "^2.1.0"
-
-finalhandler@1.2.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/finalhandler/-/finalhandler-1.2.0.tgz#7d23fe5731b207b4640e4fcd00aec1f9207a7b32"
-  integrity sha512-5uXcUVftlQMFnWC9qu/svkWv3GTd2PfUhK/3PLkYNAe7FbqJMt3515HaxE6eRL74GdsriiwujiawdaB1BpEISg==
-  dependencies:
-    debug "2.6.9"
-    encodeurl "~1.0.2"
-    escape-html "~1.0.3"
-    on-finished "2.4.1"
-    parseurl "~1.3.3"
-    statuses "2.0.1"
-    unpipe "~1.0.0"
-
-find-cache-dir@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/find-cache-dir/-/find-cache-dir-2.0.0.tgz#4c1faed59f45184530fb9d7fa123a4d04a98472d"
-  dependencies:
-    commondir "^1.0.1"
-    make-dir "^1.0.0"
-    pkg-dir "^3.0.0"
-
-find-up@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/find-up/-/find-up-3.0.0.tgz#49169f1d7993430646da61ecc5ae355c21c97b73"
-  dependencies:
-    locate-path "^3.0.0"
-
-findup-sync@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/findup-sync/-/findup-sync-2.0.0.tgz#9326b1488c22d1a6088650a86901b2d9a90a2cbc"
+"cli-table3@^0.6.0":
+  "integrity" "sha512-w5Jac5SykAeZJKntOxJCrm63Eg5/4dhMWIcuTbo9rpE+brgaSZo0RuNJZeOyMgsUdhDeojvgyQLmjI+K50ZGyg=="
+  "resolved" "https://registry.npmjs.org/cli-table3/-/cli-table3-0.6.3.tgz"
+  "version" "0.6.3"
   dependencies:
-    detect-file "^1.0.0"
-    is-glob "^3.1.0"
-    micromatch "^3.0.4"
-    resolve-dir "^1.0.1"
-
-flush-write-stream@^1.0.0:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/flush-write-stream/-/flush-write-stream-1.1.1.tgz#8dd7d873a1babc207d94ead0c2e0e44276ebf2e8"
+    "string-width" "^4.2.0"
+  optionalDependencies:
+    "@colors/colors" "1.5.0"
+
+"cliui@^7.0.2":
+  "integrity" "sha512-OcRE68cOsVMXp1Yvonl/fzkQOyjLSu/8bhPDfQt0e0/Eb283TKP20Fs2MqoPsr9SwA595rRCA+QMzYc9nBP+JQ=="
+  "resolved" "https://registry.npmjs.org/cliui/-/cliui-7.0.4.tgz"
+  "version" "7.0.4"
+  dependencies:
+    "string-width" "^4.2.0"
+    "strip-ansi" "^6.0.0"
+    "wrap-ansi" "^7.0.0"
+
+"clone-deep@^4.0.1":
+  "integrity" "sha512-neHB9xuzh/wk0dIHweyAXv2aPGZIVk3pLMe+/RNzINf17fe0OG96QroktYAUm7SM1PBnzTabaLboqqxDyMU+SQ=="
+  "resolved" "https://registry.npmjs.org/clone-deep/-/clone-deep-4.0.1.tgz"
+  "version" "4.0.1"
+  dependencies:
+    "is-plain-object" "^2.0.4"
+    "kind-of" "^6.0.2"
+    "shallow-clone" "^3.0.0"
+
+"collect.js@^4.28.5":
+  "integrity" "sha512-aFr67xDazPwthsGm729mnClgNuh15JEagU6McKBKqxuHOkWL7vMFzGbhsXDdPZ+H6ia5QKIMGYuGOMENBHnVpg=="
+  "resolved" "https://registry.npmjs.org/collect.js/-/collect.js-4.34.3.tgz"
+  "version" "4.34.3"
+
+"color-convert@^1.9.0":
+  "integrity" "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg=="
+  "resolved" "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz"
+  "version" "1.9.3"
+  dependencies:
+    "color-name" "1.1.3"
+
+"color-convert@^2.0.1":
+  "integrity" "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ=="
+  "resolved" "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz"
+  "version" "2.0.1"
+  dependencies:
+    "color-name" "~1.1.4"
+
+"color-name@~1.1.4":
+  "integrity" "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="
+  "resolved" "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz"
+  "version" "1.1.4"
+
+"color-name@1.1.3":
+  "integrity" "sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw=="
+  "resolved" "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz"
+  "version" "1.1.3"
+
+"colord@^2.9.1":
+  "integrity" "sha512-jeC1axXpnb0/2nn/Y1LPuLdgXBLH7aDcHu4KEKfqw3CUhX7ZpfBSlPKyqXE6btIgEzfWtrX3/tyBCaCvXvMkOw=="
+  "resolved" "https://registry.npmjs.org/colord/-/colord-2.9.3.tgz"
+  "version" "2.9.3"
+
+"colorette@^2.0.10", "colorette@^2.0.14":
+  "integrity" "sha512-IfEDxwoWIjkeXL1eXcDiow4UbKjhLdq6/EuSVR9GMN7KVH3r9gQ83e73hsz1Nd1T3ijd5xv1wcWRYO+D6kCI2w=="
+  "resolved" "https://registry.npmjs.org/colorette/-/colorette-2.0.20.tgz"
+  "version" "2.0.20"
+
+"combined-stream@^1.0.8":
+  "integrity" "sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg=="
+  "resolved" "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz"
+  "version" "1.0.8"
+  dependencies:
+    "delayed-stream" "~1.0.0"
+
+"commander@^10.0.0":
+  "integrity" "sha512-y4Mg2tXshplEbSGzx7amzPwKKOCGuoSRP/CjEdwwk0FOGlUbq6lKuoyDZTNZkmxHdJtp54hdfY/JUrdL7Xfdug=="
+  "resolved" "https://registry.npmjs.org/commander/-/commander-10.0.1.tgz"
+  "version" "10.0.1"
+
+"commander@^2.20.0":
+  "integrity" "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ=="
+  "resolved" "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz"
+  "version" "2.20.3"
+
+"commander@^2.9.0":
+  "integrity" "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ=="
+  "resolved" "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz"
+  "version" "2.20.3"
+
+"commander@^4.0.0":
+  "integrity" "sha512-NOKm8xhkzAjzFx8B2v5OAHT+u5pRQc2UCa2Vq9jYL/31o2wi9mxBA7LIFs3sV5VSC49z6pEhfbMULvShKj26WA=="
+  "resolved" "https://registry.npmjs.org/commander/-/commander-4.1.1.tgz"
+  "version" "4.1.1"
+
+"commander@^4.1.1":
+  "integrity" "sha512-NOKm8xhkzAjzFx8B2v5OAHT+u5pRQc2UCa2Vq9jYL/31o2wi9mxBA7LIFs3sV5VSC49z6pEhfbMULvShKj26WA=="
+  "resolved" "https://registry.npmjs.org/commander/-/commander-4.1.1.tgz"
+  "version" "4.1.1"
+
+"commander@^7.0.0", "commander@^7.2.0":
+  "integrity" "sha512-QrWXB+ZQSVPmIWIhtEO9H+gwHaMGYiF5ChvoJ+K9ZGHG/sVsa6yiesAD1GC/x46sET00Xlwo1u49RVVVzvcSkw=="
+  "resolved" "https://registry.npmjs.org/commander/-/commander-7.2.0.tgz"
+  "version" "7.2.0"
+
+"commondir@^1.0.1":
+  "integrity" "sha512-W9pAhw0ja1Edb5GVdIF1mjZw/ASI0AlShXM83UUGe2DVr5TdAPEA1OA8m/g8zWp9x6On7gqufY+FatDbC3MDQg=="
+  "resolved" "https://registry.npmjs.org/commondir/-/commondir-1.0.1.tgz"
+  "version" "1.0.1"
+
+"compressible@~2.0.16":
+  "integrity" "sha512-AF3r7P5dWxL8MxyITRMlORQNaOA2IkAFaTr4k7BUumjPtRpGDTZpl0Pb1XCO6JeDCBdp126Cgs9sMxqSjgYyRg=="
+  "resolved" "https://registry.npmjs.org/compressible/-/compressible-2.0.18.tgz"
+  "version" "2.0.18"
+  dependencies:
+    "mime-db" ">= 1.43.0 < 2"
+
+"compression@^1.7.4":
+  "integrity" "sha512-jaSIDzP9pZVS4ZfQ+TzvtiWhdpFhE2RDHz8QJkpX9SIpLq88VueF5jJw6t+6CUQcAoA6t+x89MLrWAqpfDE8iQ=="
+  "resolved" "https://registry.npmjs.org/compression/-/compression-1.7.4.tgz"
+  "version" "1.7.4"
+  dependencies:
+    "accepts" "~1.3.5"
+    "bytes" "3.0.0"
+    "compressible" "~2.0.16"
+    "debug" "2.6.9"
+    "on-headers" "~1.0.2"
+    "safe-buffer" "5.1.2"
+    "vary" "~1.1.2"
+
+"concat-map@0.0.1":
+  "integrity" "sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg=="
+  "resolved" "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz"
+  "version" "0.0.1"
+
+"concat-stream@^2.0.0":
+  "integrity" "sha512-MWufYdFw53ccGjCA+Ol7XJYpAlW6/prSMzuPOTRnJGcGzuhLn4Scrz7qf6o8bROZ514ltazcIFJZevcfbo0x7A=="
+  "resolved" "https://registry.npmjs.org/concat-stream/-/concat-stream-2.0.0.tgz"
+  "version" "2.0.0"
+  dependencies:
+    "buffer-from" "^1.0.0"
+    "inherits" "^2.0.3"
+    "readable-stream" "^3.0.2"
+    "typedarray" "^0.0.6"
+
+"concat@^1.0.3":
+  "integrity" "sha1-QPM1MInWVGdpXLGIa0Xt1jfYzKg= sha512-f/ZaH1aLe64qHgTILdldbvyfGiGF4uzeo9IuXUloIOLQzFmIPloy9QbZadNsuVv0j5qbKQvQb/H/UYf2UsKTpw=="
+  "resolved" "https://registry.npmjs.org/concat/-/concat-1.0.3.tgz"
+  "version" "1.0.3"
+  dependencies:
+    "commander" "^2.9.0"
+
+"config-chain@^1.1.13":
+  "integrity" "sha512-qj+f8APARXHrM0hraqXYb2/bOVSV4PvJQlNZ/DVj0QrmNM2q2euizkeuVckQ57J+W0mRH6Hvi+k50M4Jul2VRQ=="
+  "resolved" "https://registry.npmjs.org/config-chain/-/config-chain-1.1.13.tgz"
+  "version" "1.1.13"
+  dependencies:
+    "ini" "^1.3.4"
+    "proto-list" "~1.2.1"
+
+"connect-history-api-fallback@^2.0.0":
+  "integrity" "sha512-U73+6lQFmfiNPrYbXqr6kZ1i1wiRqXnp2nhMsINseWXO8lDau0LGEffJ8kQi4EjLZympVgRdvqjAgiZ1tgzDDA=="
+  "resolved" "https://registry.npmjs.org/connect-history-api-fallback/-/connect-history-api-fallback-2.0.0.tgz"
+  "version" "2.0.0"
+
+"consola@^2.15.3":
+  "integrity" "sha512-9vAdYbHj6x2fLKC4+oPH0kFzY/orMZyG2Aj+kNylHxKGJ/Ed4dpNyAQYwJOdqO4zdM7XpVHmyejQDcQHrnuXbw=="
+  "resolved" "https://registry.npmjs.org/consola/-/consola-2.15.3.tgz"
+  "version" "2.15.3"
+
+"console-browserify@^1.1.0":
+  "integrity" "sha512-ZMkYO/LkF17QvCPqM0gxw8yUzigAOZOSWSHg91FH6orS7vcEj5dVZTidN2fQ14yBSdg97RqhSNwLUXInd52OTA=="
+  "resolved" "https://registry.npmjs.org/console-browserify/-/console-browserify-1.2.0.tgz"
+  "version" "1.2.0"
+
+"constants-browserify@^1.0.0":
+  "integrity" "sha512-xFxOwqIzR/e1k1gLiWEophSCMqXcwVHIH7akf7b/vxcUeGunlj3hvZaaqxwHsTgn+IndtkQJgSztIDWeumWJDQ=="
+  "resolved" "https://registry.npmjs.org/constants-browserify/-/constants-browserify-1.0.0.tgz"
+  "version" "1.0.0"
+
+"content-disposition@0.5.4":
+  "integrity" "sha512-FveZTNuGw04cxlAiWbzi6zTAL/lhehaWbTtgluJh4/E95DqMwTmha3KZN1aAWA8cFIhHzMZUvLevkw5Rqk+tSQ=="
+  "resolved" "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.4.tgz"
+  "version" "0.5.4"
+  dependencies:
+    "safe-buffer" "5.2.1"
+
+"content-type@~1.0.4":
+  "integrity" "sha512-nTjqfcBFEipKdXCv4YDQWCfmcLZKm81ldF0pAopTvyrFGVbcR6P/VAAd5G7N+0tTr8QqiU0tFadD6FK4NtJwOA=="
+  "resolved" "https://registry.npmjs.org/content-type/-/content-type-1.0.5.tgz"
+  "version" "1.0.5"
+
+"convert-source-map@^1.7.0":
+  "integrity" "sha512-+OQdjP49zViI/6i7nIJpA8rAl4sV/JdPfU9nZs3VqOwGIgizICvuN2ru6fMd+4llL0tar18UYJXfZ/TWtmhUjA=="
+  "resolved" "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.8.0.tgz"
+  "version" "1.8.0"
+  dependencies:
+    "safe-buffer" "~5.1.1"
+
+"cookie-signature@1.0.6":
+  "integrity" "sha512-QADzlaHc8icV8I7vbaJXJwod9HWYp8uCqf1xa4OfNu1T7JVxQIrUgOWtHdNDtPiywmFbiS12VjotIXLrKM3orQ=="
+  "resolved" "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.6.tgz"
+  "version" "1.0.6"
+
+"cookie@0.5.0":
+  "integrity" "sha512-YZ3GUyn/o8gfKJlnlX7g7xq4gyO6OSuhGPKaaGssGB2qgDUS0gPgtTvoyZLTt9Ab6dC4hfc9dV5arkvc/OCmrw=="
+  "resolved" "https://registry.npmjs.org/cookie/-/cookie-0.5.0.tgz"
+  "version" "0.5.0"
+
+"core-js-compat@^3.21.0", "core-js-compat@^3.22.1":
+  "integrity" "sha512-6pYKNOgD/j/bkC5xS5IIg6bncid3rfrI42oBH1SQJbsmYPKF7rhzcFzYCcxYMmNQQ0rCEB8WqpW7QHndOggaeQ=="
+  "resolved" "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.33.1.tgz"
+  "version" "3.33.1"
+  dependencies:
+    "browserslist" "^4.22.1"
+
+"core-js-pure@^3.20.2":
+  "integrity" "sha512-8t78LdpKSuCq4pJYCYk8hl7XEkAX+BP16yRIwL3AanTksxuEf7CM83vRyctmiEL8NDZ3jpUcv56fk9/zG3aIuw=="
+  "resolved" "https://registry.npmjs.org/core-js-pure/-/core-js-pure-3.23.5.tgz"
+  "version" "3.23.5"
+
+"core-util-is@~1.0.0":
+  "integrity" "sha512-ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ=="
+  "resolved" "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.3.tgz"
+  "version" "1.0.3"
+
+"cosmiconfig@^7.0.0":
+  "integrity" "sha512-AdmX6xUzdNASswsFtmwSt7Vj8po9IuqXm0UXz7QKPuEUmPB4XyjGfaAr2PSuELMwkRMVH1EpIkX5bTZGRB3eCA=="
+  "resolved" "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-7.1.0.tgz"
+  "version" "7.1.0"
+  dependencies:
+    "@types/parse-json" "^4.0.0"
+    "import-fresh" "^3.2.1"
+    "parse-json" "^5.0.0"
+    "path-type" "^4.0.0"
+    "yaml" "^1.10.0"
+
+"create-ecdh@^4.0.0":
+  "integrity" "sha512-mf+TCx8wWc9VpuxfP2ht0iSISLZnt0JgWlrOKZiNqyUZWnjIaCIVNQArMHnCZKfEYRg6IM7A+NeJoN8gf/Ws0A=="
+  "resolved" "https://registry.npmjs.org/create-ecdh/-/create-ecdh-4.0.4.tgz"
+  "version" "4.0.4"
+  dependencies:
+    "bn.js" "^4.1.0"
+    "elliptic" "^6.5.3"
+
+"create-hash@^1.1.0", "create-hash@^1.1.2", "create-hash@^1.2.0":
+  "integrity" "sha512-z00bCGNHDG8mHAkP7CtT1qVu+bFQUPjYq/4Iv3C3kWjTFV10zIjfSoeqXo9Asws8gwSHDGj/hl2u4OGIjapeCg=="
+  "resolved" "https://registry.npmjs.org/create-hash/-/create-hash-1.2.0.tgz"
+  "version" "1.2.0"
+  dependencies:
+    "cipher-base" "^1.0.1"
+    "inherits" "^2.0.1"
+    "md5.js" "^1.3.4"
+    "ripemd160" "^2.0.1"
+    "sha.js" "^2.4.0"
+
+"create-hmac@^1.1.0", "create-hmac@^1.1.4", "create-hmac@^1.1.7":
+  "integrity" "sha512-MJG9liiZ+ogc4TzUwuvbER1JRdgvUFSB5+VR/g5h82fGaIRWMWddtKBHi7/sVhfjQZ6SehlyhvQYrcYkaUIpLg=="
+  "resolved" "https://registry.npmjs.org/create-hmac/-/create-hmac-1.1.7.tgz"
+  "version" "1.1.7"
+  dependencies:
+    "cipher-base" "^1.0.3"
+    "create-hash" "^1.1.0"
+    "inherits" "^2.0.1"
+    "ripemd160" "^2.0.0"
+    "safe-buffer" "^5.0.1"
+    "sha.js" "^2.4.8"
+
+"cross-env@^7.0":
+  "integrity" "sha512-+/HKd6EgcQCJGh2PSjZuUitQBQynKor4wrFbRg4DtAgS1aWO+gU52xpH7M9ScGgXSYmAVS9bIJ8EzuaGw0oNAw=="
+  "resolved" "https://registry.npmjs.org/cross-env/-/cross-env-7.0.3.tgz"
+  "version" "7.0.3"
+  dependencies:
+    "cross-spawn" "^7.0.1"
+
+"cross-spawn@^7.0.1", "cross-spawn@^7.0.3":
+  "integrity" "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w=="
+  "resolved" "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz"
+  "version" "7.0.3"
+  dependencies:
+    "path-key" "^3.1.0"
+    "shebang-command" "^2.0.0"
+    "which" "^2.0.1"
+
+"crypt@0.0.2":
+  "integrity" "sha512-mCxBlsHFYh9C+HVpiEacem8FEBnMXgU9gy4zmNC+SXAZNB/1idgp/aulFJ4FgCi7GPEVbfyng092GqL2k2rmow=="
+  "resolved" "https://registry.npmjs.org/crypt/-/crypt-0.0.2.tgz"
+  "version" "0.0.2"
+
+"crypto-browserify@^3.11.0":
+  "integrity" "sha512-fz4spIh+znjO2VjL+IdhEpRJ3YN6sMzITSBijk6FK2UvTqruSQW+/cCZTSNsMiZNvUeq0CqurF+dAbyiGOY6Wg=="
+  "resolved" "https://registry.npmjs.org/crypto-browserify/-/crypto-browserify-3.12.0.tgz"
+  "version" "3.12.0"
+  dependencies:
+    "browserify-cipher" "^1.0.0"
+    "browserify-sign" "^4.0.0"
+    "create-ecdh" "^4.0.0"
+    "create-hash" "^1.1.0"
+    "create-hmac" "^1.1.0"
+    "diffie-hellman" "^5.0.0"
+    "inherits" "^2.0.1"
+    "pbkdf2" "^3.0.3"
+    "public-encrypt" "^4.0.0"
+    "randombytes" "^2.0.0"
+    "randomfill" "^1.0.3"
+
+"css-declaration-sorter@^6.3.1":
+  "integrity" "sha512-rtdthzxKuyq6IzqX6jEcIzQF/YqccluefyCYheovBOLhFT/drQA9zj/UbRAa9J7C0o6EG6u3E6g+vKkay7/k3g=="
+  "resolved" "https://registry.npmjs.org/css-declaration-sorter/-/css-declaration-sorter-6.4.1.tgz"
+  "version" "6.4.1"
+
+"css-loader@^5.2.6":
+  "integrity" "sha512-Q7mOvpBNBG7YrVGMxRxcBJZFL75o+cH2abNASdibkj/fffYD8qWbInZrD0S9ccI6vZclF3DsHE7njGlLtaHbhg=="
+  "resolved" "https://registry.npmjs.org/css-loader/-/css-loader-5.2.7.tgz"
+  "version" "5.2.7"
+  dependencies:
+    "icss-utils" "^5.1.0"
+    "loader-utils" "^2.0.0"
+    "postcss" "^8.2.15"
+    "postcss-modules-extract-imports" "^3.0.0"
+    "postcss-modules-local-by-default" "^4.0.0"
+    "postcss-modules-scope" "^3.0.0"
+    "postcss-modules-values" "^4.0.0"
+    "postcss-value-parser" "^4.1.0"
+    "schema-utils" "^3.0.0"
+    "semver" "^7.3.5"
+
+"css-select@^4.1.3":
+  "integrity" "sha512-wPpOYtnsVontu2mODhA19JrqWxNsfdatRKd64kmpRbQgh1KtItko5sTnEpPdpSaJszTOhEMlF/RPz28qj4HqhQ=="
+  "resolved" "https://registry.npmjs.org/css-select/-/css-select-4.3.0.tgz"
+  "version" "4.3.0"
+  dependencies:
+    "boolbase" "^1.0.0"
+    "css-what" "^6.0.1"
+    "domhandler" "^4.3.1"
+    "domutils" "^2.8.0"
+    "nth-check" "^2.0.1"
+
+"css-tree@^1.1.2", "css-tree@^1.1.3":
+  "integrity" "sha512-tRpdppF7TRazZrjJ6v3stzv93qxRcSsFmW6cX0Zm2NVKpxE1WV1HblnghVv9TreireHkqI/VDEsfolRF1p6y7Q=="
+  "resolved" "https://registry.npmjs.org/css-tree/-/css-tree-1.1.3.tgz"
+  "version" "1.1.3"
+  dependencies:
+    "mdn-data" "2.0.14"
+    "source-map" "^0.6.1"
+
+"css-what@^6.0.1":
+  "integrity" "sha512-HTUrgRJ7r4dsZKU6GjmpfRK1O76h97Z8MfS1G0FozR+oF2kG6Vfe8JE6zwrkbxigziPHinCJ+gCPjA9EaBDtRw=="
+  "resolved" "https://registry.npmjs.org/css-what/-/css-what-6.1.0.tgz"
+  "version" "6.1.0"
+
+"cssesc@^3.0.0":
+  "integrity" "sha512-/Tb/JcjK111nNScGob5MNtsntNM1aCNUDipB/TkwZFhyDrrE47SOx/18wF2bbjgc3ZzCSKW1T5nt5EbFoAz/Vg=="
+  "resolved" "https://registry.npmjs.org/cssesc/-/cssesc-3.0.0.tgz"
+  "version" "3.0.0"
+
+"cssnano-preset-default@^5.2.14":
+  "integrity" "sha512-t0SFesj/ZV2OTylqQVOrFgEh5uanxbO6ZAdeCrNsUQ6fVuXwYTxJPNAGvGTxHbD68ldIJNec7PyYZDBrfDQ+6A=="
+  "resolved" "https://registry.npmjs.org/cssnano-preset-default/-/cssnano-preset-default-5.2.14.tgz"
+  "version" "5.2.14"
+  dependencies:
+    "css-declaration-sorter" "^6.3.1"
+    "cssnano-utils" "^3.1.0"
+    "postcss-calc" "^8.2.3"
+    "postcss-colormin" "^5.3.1"
+    "postcss-convert-values" "^5.1.3"
+    "postcss-discard-comments" "^5.1.2"
+    "postcss-discard-duplicates" "^5.1.0"
+    "postcss-discard-empty" "^5.1.1"
+    "postcss-discard-overridden" "^5.1.0"
+    "postcss-merge-longhand" "^5.1.7"
+    "postcss-merge-rules" "^5.1.4"
+    "postcss-minify-font-values" "^5.1.0"
+    "postcss-minify-gradients" "^5.1.1"
+    "postcss-minify-params" "^5.1.4"
+    "postcss-minify-selectors" "^5.2.1"
+    "postcss-normalize-charset" "^5.1.0"
+    "postcss-normalize-display-values" "^5.1.0"
+    "postcss-normalize-positions" "^5.1.1"
+    "postcss-normalize-repeat-style" "^5.1.1"
+    "postcss-normalize-string" "^5.1.0"
+    "postcss-normalize-timing-functions" "^5.1.0"
+    "postcss-normalize-unicode" "^5.1.1"
+    "postcss-normalize-url" "^5.1.0"
+    "postcss-normalize-whitespace" "^5.1.1"
+    "postcss-ordered-values" "^5.1.3"
+    "postcss-reduce-initial" "^5.1.2"
+    "postcss-reduce-transforms" "^5.1.0"
+    "postcss-svgo" "^5.1.0"
+    "postcss-unique-selectors" "^5.1.1"
+
+"cssnano-utils@^3.1.0":
+  "integrity" "sha512-JQNR19/YZhz4psLX/rQ9M83e3z2Wf/HdJbryzte4a3NSuafyp9w/I4U+hx5C2S9g41qlstH7DEWnZaaj83OuEA=="
+  "resolved" "https://registry.npmjs.org/cssnano-utils/-/cssnano-utils-3.1.0.tgz"
+  "version" "3.1.0"
+
+"cssnano@^5.0.8":
+  "integrity" "sha512-j+BKgDcLDQA+eDifLx0EO4XSA56b7uut3BQFH+wbSaSTuGLuiyTa/wbRYthUXX8LC9mLg+WWKe8h+qJuwTAbHw=="
+  "resolved" "https://registry.npmjs.org/cssnano/-/cssnano-5.1.15.tgz"
+  "version" "5.1.15"
+  dependencies:
+    "cssnano-preset-default" "^5.2.14"
+    "lilconfig" "^2.0.3"
+    "yaml" "^1.10.2"
+
+"csso@^4.2.0":
+  "integrity" "sha512-wvlcdIbf6pwKEk7vHj8/Bkc0B4ylXZruLvOgs9doS5eOsOpuodOV2zJChSpkp+pRpYQLQMeF04nr3Z68Sta9jA=="
+  "resolved" "https://registry.npmjs.org/csso/-/csso-4.2.0.tgz"
+  "version" "4.2.0"
+  dependencies:
+    "css-tree" "^1.1.2"
+
+"csstype@^3.1.3":
+  "integrity" "sha512-M1uQkMl8rQK/szD0LNhtqxIPLpimGm8sOBwU7lLnCpSbTyY3yeU1Vc7l4KT5zT4s/yOxHH5O7tIuuLOCnLADRw=="
+  "resolved" "https://registry.npmjs.org/csstype/-/csstype-3.1.3.tgz"
+  "version" "3.1.3"
+
+"debug@^4.1.0", "debug@^4.1.1":
+  "integrity" "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ=="
+  "resolved" "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz"
+  "version" "4.3.4"
+  dependencies:
+    "ms" "2.1.2"
+
+"debug@2.6.9":
+  "integrity" "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA=="
+  "resolved" "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz"
+  "version" "2.6.9"
+  dependencies:
+    "ms" "2.0.0"
+
+"default-gateway@^6.0.3":
+  "integrity" "sha512-fwSOJsbbNzZ/CUFpqFBqYfYNLj1NbMPm8MMCIzHjC83iSJRBEGmDUxU+WP661BaBQImeC2yHwXtz+P/O9o+XEg=="
+  "resolved" "https://registry.npmjs.org/default-gateway/-/default-gateway-6.0.3.tgz"
+  "version" "6.0.3"
+  dependencies:
+    "execa" "^5.0.0"
+
+"define-lazy-prop@^2.0.0":
+  "integrity" "sha512-Ds09qNh8yw3khSjiJjiUInaGX9xlqZDY7JVryGxdxV7NPeuqQfplOpQ66yJFZut3jLa5zOwkXw1g9EI2uKh4Og=="
+  "resolved" "https://registry.npmjs.org/define-lazy-prop/-/define-lazy-prop-2.0.0.tgz"
+  "version" "2.0.0"
+
+"define-properties@^1.1.4":
+  "integrity" "sha512-uckOqKcfaVvtBdsVkdPv3XjveQJsNQqmhXgRi8uhvWWuPYZCNlzT8qAyblUgNoXdHdjMTzAqeGjAoli8f+bzPA=="
+  "resolved" "https://registry.npmjs.org/define-properties/-/define-properties-1.1.4.tgz"
+  "version" "1.1.4"
+  dependencies:
+    "has-property-descriptors" "^1.0.0"
+    "object-keys" "^1.1.1"
+
+"delayed-stream@~1.0.0":
+  "integrity" "sha1-3zrhmayt+31ECqrgsp4icrJOxhk= sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ=="
+  "resolved" "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz"
+  "version" "1.0.0"
+
+"depd@~1.1.2":
+  "integrity" "sha512-7emPTl6Dpo6JRXOXjLRxck+FlLRX5847cLKEn00PLAgc3g2hTZZgr+e4c2v6QpSmLeFP3n5yUo7ft6avBK/5jQ=="
+  "resolved" "https://registry.npmjs.org/depd/-/depd-1.1.2.tgz"
+  "version" "1.1.2"
+
+"depd@2.0.0":
+  "integrity" "sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw=="
+  "resolved" "https://registry.npmjs.org/depd/-/depd-2.0.0.tgz"
+  "version" "2.0.0"
+
+"des.js@^1.0.0":
+  "integrity" "sha512-r17GxjhUCjSRy8aiJpr8/UadFIzMzJGexI3Nmz4ADi9LYSFx4gTBp80+NaX/YsXWWLhpZ7v/v/ubEc/bCNfKwg=="
+  "resolved" "https://registry.npmjs.org/des.js/-/des.js-1.1.0.tgz"
+  "version" "1.1.0"
+  dependencies:
+    "inherits" "^2.0.1"
+    "minimalistic-assert" "^1.0.0"
+
+"destroy@1.2.0":
+  "integrity" "sha512-2sJGJTaXIIaR1w4iJSNoN0hnMY7Gpc/n8D4qSCJw8QqFWXf7cuAgnEHxBpweaVcPevC2l3KpjYCx3NypQQgaJg=="
+  "resolved" "https://registry.npmjs.org/destroy/-/destroy-1.2.0.tgz"
+  "version" "1.2.0"
+
+"detect-indent@^6.0.0":
+  "integrity" "sha512-reYkTUJAZb9gUuZ2RvVCNhVHdg62RHnJ7WJl8ftMi4diZ6NWlciOzQN88pUhSELEwflJht4oQDv0F0BMlwaYtA=="
+  "resolved" "https://registry.npmjs.org/detect-indent/-/detect-indent-6.1.0.tgz"
+  "version" "6.1.0"
+
+"detect-node@^2.0.4":
+  "integrity" "sha512-T0NIuQpnTvFDATNuHN5roPwSBG83rFsuO+MXXH9/3N1eFbn4wcPjttvjMLEPWJ0RGUYgQE7cGgS3tNxbqCGM7g=="
+  "resolved" "https://registry.npmjs.org/detect-node/-/detect-node-2.1.0.tgz"
+  "version" "2.1.0"
+
+"didyoumean@^1.2.2":
+  "integrity" "sha512-gxtyfqMg7GKyhQmb056K7M3xszy/myH8w+B4RT+QXBQsvAOdc3XymqDDPHx1BgPgsdAA5SIifona89YtRATDzw=="
+  "resolved" "https://registry.npmjs.org/didyoumean/-/didyoumean-1.2.2.tgz"
+  "version" "1.2.2"
+
+"diffie-hellman@^5.0.0":
+  "integrity" "sha512-kqag/Nl+f3GwyK25fhUMYj81BUOrZ9IuJsjIcDE5icNM9FJHAVm3VcUDxdLPoQtTuUylWm6ZIknYJwwaPxsUzg=="
+  "resolved" "https://registry.npmjs.org/diffie-hellman/-/diffie-hellman-5.0.3.tgz"
+  "version" "5.0.3"
+  dependencies:
+    "bn.js" "^4.1.0"
+    "miller-rabin" "^4.0.0"
+    "randombytes" "^2.0.0"
+
+"dir-glob@^3.0.1":
+  "integrity" "sha512-WkrWp9GR4KXfKGYzOLmTuGVi1UWFfws377n9cc55/tb6DuqyF6pcQ5AbiHEshaDpY9v6oaSr2XCDidGmMwdzIA=="
+  "resolved" "https://registry.npmjs.org/dir-glob/-/dir-glob-3.0.1.tgz"
+  "version" "3.0.1"
+  dependencies:
+    "path-type" "^4.0.0"
+
+"dlv@^1.1.3":
+  "integrity" "sha512-+HlytyjlPKnIG8XuRG8WvmBP8xs8P71y+SKKS6ZXWoEgLuePxtDoUEiH7WkdePWrQ5JBpE6aoVqfZfJUQkjXwA=="
+  "resolved" "https://registry.npmjs.org/dlv/-/dlv-1.1.3.tgz"
+  "version" "1.1.3"
+
+"dns-equal@^1.0.0":
+  "integrity" "sha512-z+paD6YUQsk+AbGCEM4PrOXSss5gd66QfcVBFTKR/HpFL9jCqikS94HYwKww6fQyO7IxrIIyUu+g0Ka9tUS2Cg=="
+  "resolved" "https://registry.npmjs.org/dns-equal/-/dns-equal-1.0.0.tgz"
+  "version" "1.0.0"
+
+"dns-packet@^5.2.2":
+  "integrity" "sha512-l4gcSouhcgIKRvyy99RNVOgxXiicE+2jZoNmaNmZ6JXiGajBOJAesk1OBlJuM5k2c+eudGdLxDqXuPCKIj6kpw=="
+  "resolved" "https://registry.npmjs.org/dns-packet/-/dns-packet-5.6.1.tgz"
+  "version" "5.6.1"
+  dependencies:
+    "@leichtgewicht/ip-codec" "^2.0.1"
+
+"dom-serializer@^1.0.1":
+  "integrity" "sha512-VHwB3KfrcOOkelEG2ZOfxqLZdfkil8PtJi4P8N2MMXucZq2yLp75ClViUlOVwyoHEDjYU433Aq+5zWP61+RGag=="
+  "resolved" "https://registry.npmjs.org/dom-serializer/-/dom-serializer-1.4.1.tgz"
+  "version" "1.4.1"
+  dependencies:
+    "domelementtype" "^2.0.1"
+    "domhandler" "^4.2.0"
+    "entities" "^2.0.0"
+
+"domain-browser@^1.1.1":
+  "integrity" "sha512-jnjyiM6eRyZl2H+W8Q/zLMA481hzi0eszAaBUzIVnmYVDBbnLxVNnfu1HgEBvCbL+71FrxMl3E6lpKH7Ge3OXA=="
+  "resolved" "https://registry.npmjs.org/domain-browser/-/domain-browser-1.2.0.tgz"
+  "version" "1.2.0"
+
+"domelementtype@^2.0.1", "domelementtype@^2.2.0":
+  "integrity" "sha512-OLETBj6w0OsagBwdXnPdN0cnMfF9opN69co+7ZrbfPGrdpPVNBUj02spi6B1N7wChLQiPn4CSH/zJvXw56gmHw=="
+  "resolved" "https://registry.npmjs.org/domelementtype/-/domelementtype-2.3.0.tgz"
+  "version" "2.3.0"
+
+"domhandler@^3.0.0":
+  "integrity" "sha512-J1C5rIANUbuYK+FuFL98650rihynUOEzRLxW+90bKZRWB6A1X1Tf82GxR1qAWLyfNPRvjqfip3Q5tdYlmAa9lA=="
+  "resolved" "https://registry.npmjs.org/domhandler/-/domhandler-3.3.0.tgz"
+  "version" "3.3.0"
+  dependencies:
+    "domelementtype" "^2.0.1"
+
+"domhandler@^4.2.0":
+  "integrity" "sha512-GrwoxYN+uWlzO8uhUXRl0P+kHE4GtVPfYzVLcUxPL7KNdHKj66vvlhiweIHqYYXWlw+T8iLMp42Lm67ghw4WMQ=="
+  "resolved" "https://registry.npmjs.org/domhandler/-/domhandler-4.3.1.tgz"
+  "version" "4.3.1"
+  dependencies:
+    "domelementtype" "^2.2.0"
+
+"domhandler@^4.3.1":
+  "integrity" "sha512-GrwoxYN+uWlzO8uhUXRl0P+kHE4GtVPfYzVLcUxPL7KNdHKj66vvlhiweIHqYYXWlw+T8iLMp42Lm67ghw4WMQ=="
+  "resolved" "https://registry.npmjs.org/domhandler/-/domhandler-4.3.1.tgz"
+  "version" "4.3.1"
+  dependencies:
+    "domelementtype" "^2.2.0"
+
+"domutils@^2.0.0", "domutils@^2.8.0":
+  "integrity" "sha512-w96Cjofp72M5IIhpjgobBimYEfoPjx1Vx0BSX9P30WBdZW2WIKU0T1Bd0kz2eNZ9ikjKgHbEyKx8BB6H1L3h3A=="
+  "resolved" "https://registry.npmjs.org/domutils/-/domutils-2.8.0.tgz"
+  "version" "2.8.0"
+  dependencies:
+    "dom-serializer" "^1.0.1"
+    "domelementtype" "^2.2.0"
+    "domhandler" "^4.2.0"
+
+"dot-case@^3.0.4":
+  "integrity" "sha512-Kv5nKlh6yRrdrGvxeJ2e5y2eRUpkUosIW4A2AS38zwSz27zu7ufDwQPi5Jhs3XAlGNetl3bmnGhQsMtkKJnj3w=="
+  "resolved" "https://registry.npmjs.org/dot-case/-/dot-case-3.0.4.tgz"
+  "version" "3.0.4"
+  dependencies:
+    "no-case" "^3.0.4"
+    "tslib" "^2.0.3"
+
+"dotenv-expand@^5.1.0":
+  "integrity" "sha512-YXQl1DSa4/PQyRfgrv6aoNjhasp/p4qs9FjJ4q4cQk+8m4r6k4ZSiEyytKG8f8W9gi8WsQtIObNmKd+tMzNTmA=="
+  "resolved" "https://registry.npmjs.org/dotenv-expand/-/dotenv-expand-5.1.0.tgz"
+  "version" "5.1.0"
+
+"dotenv@^10.0.0":
+  "integrity" "sha512-rlBi9d8jpv9Sf1klPjNfFAuWDjKLwTIJJ/VxtoTwIR6hnZxcEOQCZg2oIL3MWBYw5GpUDKOEnND7LXTbIpQ03Q=="
+  "resolved" "https://registry.npmjs.org/dotenv/-/dotenv-10.0.0.tgz"
+  "version" "10.0.0"
+
+"editorconfig@^1.0.3":
+  "integrity" "sha512-L9Qe08KWTlqYMVvMcTIvMAdl1cDUubzRNYL+WfA4bLDMHe4nemKkpmYzkznE1FwLKu0EEmy6obgQKzMJrg4x9Q=="
+  "resolved" "https://registry.npmjs.org/editorconfig/-/editorconfig-1.0.4.tgz"
+  "version" "1.0.4"
+  dependencies:
+    "@one-ini/wasm" "0.1.1"
+    "commander" "^10.0.0"
+    "minimatch" "9.0.1"
+    "semver" "^7.5.3"
+
+"ee-first@1.1.1":
+  "integrity" "sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow=="
+  "resolved" "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz"
+  "version" "1.1.1"
+
+"electron-to-chromium@^1.4.535":
+  "integrity" "sha512-dg5gj5qOgfZNkPNeyKBZQAQitIQ/xwfIDmEQJHCbXaD9ebTZxwJXUsDYcBlAvZGZLi+/354l35J1wkmP6CqYaw=="
+  "resolved" "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.563.tgz"
+  "version" "1.4.563"
+
+"elliptic@^6.5.3", "elliptic@^6.5.4":
+  "integrity" "sha512-iLhC6ULemrljPZb+QutR5TQGB+pdW6KGD5RSegS+8sorOZT+rdQFbsQFJgvN3eRqNALqJer4oQ16YvJHlU8hzQ=="
+  "resolved" "https://registry.npmjs.org/elliptic/-/elliptic-6.5.4.tgz"
+  "version" "6.5.4"
+  dependencies:
+    "bn.js" "^4.11.9"
+    "brorand" "^1.1.0"
+    "hash.js" "^1.0.0"
+    "hmac-drbg" "^1.0.1"
+    "inherits" "^2.0.4"
+    "minimalistic-assert" "^1.0.1"
+    "minimalistic-crypto-utils" "^1.0.1"
+
+"emoji-regex@^8.0.0":
+  "integrity" "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A=="
+  "resolved" "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz"
+  "version" "8.0.0"
+
+"emojis-list@^3.0.0":
+  "integrity" "sha512-/kyM18EfinwXZbno9FyUGeFh87KC8HRQBQGildHZbEuRyWFOmv1U10o9BBp8XVZDVNNuQKyIGIu5ZYAAXJ0V2Q=="
+  "resolved" "https://registry.npmjs.org/emojis-list/-/emojis-list-3.0.0.tgz"
+  "version" "3.0.0"
+
+"encodeurl@~1.0.2":
+  "integrity" "sha512-TPJXq8JqFaVYm2CWmPvnP2Iyo4ZSM7/QKcSmuMLDObfpH5fi7RUGmd/rTDf+rut/saiDiQEeVTNgAmJEdAOx0w=="
+  "resolved" "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz"
+  "version" "1.0.2"
+
+"enhanced-resolve@^5.15.0":
+  "integrity" "sha512-LXYT42KJ7lpIKECr2mAXIaMldcNCh/7E0KBKOu4KSfkHmP+mZmSs+8V5gBAqisWBy0OO4W5Oyys0GO1Y8KtdKg=="
+  "resolved" "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.15.0.tgz"
+  "version" "5.15.0"
+  dependencies:
+    "graceful-fs" "^4.2.4"
+    "tapable" "^2.2.0"
+
+"entities@^2.0.0":
+  "integrity" "sha512-p92if5Nz619I0w+akJrLZH0MX0Pb5DX39XOwQTtXSdQQOaYH03S1uIQp4mhOZtAXrxq4ViO67YTiLBo2638o9A=="
+  "resolved" "https://registry.npmjs.org/entities/-/entities-2.2.0.tgz"
+  "version" "2.2.0"
+
+"envinfo@^7.7.3":
+  "integrity" "sha512-ZtUjZO6l5mwTHvc1L9+1q5p/R3wTopcfqMW8r5t8SJSKqeVI/LtajORwRFEKpEFuekjD0VBjwu1HMxL4UalIRw=="
+  "resolved" "https://registry.npmjs.org/envinfo/-/envinfo-7.10.0.tgz"
+  "version" "7.10.0"
+
+"error-ex@^1.3.1":
+  "integrity" "sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g=="
+  "resolved" "https://registry.npmjs.org/error-ex/-/error-ex-1.3.2.tgz"
+  "version" "1.3.2"
+  dependencies:
+    "is-arrayish" "^0.2.1"
+
+"es-module-lexer@^1.2.1":
+  "integrity" "sha512-JUFAyicQV9mXc3YRxPnDlrfBKpqt6hUYzz9/boprUJHs4e4KVr3XwOF70doO6gwXUor6EWZJAyWAfKki84t20Q=="
+  "resolved" "https://registry.npmjs.org/es-module-lexer/-/es-module-lexer-1.3.1.tgz"
+  "version" "1.3.1"
+
+"escalade@^3.1.1":
+  "integrity" "sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw=="
+  "resolved" "https://registry.npmjs.org/escalade/-/escalade-3.1.1.tgz"
+  "version" "3.1.1"
+
+"escape-html@~1.0.3":
+  "integrity" "sha512-NiSupZ4OeuGwr68lGIeym/ksIZMJodUGOSCZ/FSnTxcrekbvqrgdUxlJOMpijaKZVjAJrWrGs/6Jy8OMuyj9ow=="
+  "resolved" "https://registry.npmjs.org/escape-html/-/escape-html-1.0.3.tgz"
+  "version" "1.0.3"
+
+"escape-string-regexp@^1.0.5":
+  "integrity" "sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg=="
+  "resolved" "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz"
+  "version" "1.0.5"
+
+"eslint-scope@5.1.1":
+  "integrity" "sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw=="
+  "resolved" "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.1.1.tgz"
+  "version" "5.1.1"
+  dependencies:
+    "esrecurse" "^4.3.0"
+    "estraverse" "^4.1.1"
+
+"esrecurse@^4.3.0":
+  "integrity" "sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag=="
+  "resolved" "https://registry.npmjs.org/esrecurse/-/esrecurse-4.3.0.tgz"
+  "version" "4.3.0"
+  dependencies:
+    "estraverse" "^5.2.0"
+
+"estraverse@^4.1.1":
+  "integrity" "sha512-VHvyaGnJy+FuGfcfaM7W7OZw4mQiKW73jPHwQXx2VnMSUBajYmytOT5sKEfsBvNPtGX6YDwcrGDz2eocoHg0JA=="
+  "resolved" "https://registry.npmjs.org/estraverse/-/estraverse-4.2.0.tgz"
+  "version" "4.2.0"
+
+"estraverse@^5.2.0":
+  "integrity" "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA=="
+  "resolved" "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz"
+  "version" "5.3.0"
+
+"estree-walker@^2.0.2":
+  "integrity" "sha512-Rfkk/Mp/DL7JVje3u18FxFujQlTNR2q6QfMSMB7AvCBx91NGj/ba3kCfza0f6dVDbw7YlRf/nDrn7pQrCCyQ/w=="
+  "resolved" "https://registry.npmjs.org/estree-walker/-/estree-walker-2.0.2.tgz"
+  "version" "2.0.2"
+
+"esutils@^2.0.2":
+  "integrity" "sha512-UUPPULqkyAV+M3Shodis7l8D+IyX6V8SbaBnTb449jf3fMTd8+UOZI1Q70NbZVOQkcR91yYgdHsJiMMMVmYshg=="
+  "resolved" "https://registry.npmjs.org/esutils/-/esutils-2.0.2.tgz"
+  "version" "2.0.2"
+
+"etag@~1.8.1":
+  "integrity" "sha512-aIL5Fx7mawVa300al2BnEE4iNvo1qETxLrPI/o05L7z6go7fCw1J6EQmbK4FmJ2AS7kgVF/KEZWufBfdClMcPg=="
+  "resolved" "https://registry.npmjs.org/etag/-/etag-1.8.1.tgz"
+  "version" "1.8.1"
+
+"eventemitter3@^4.0.0":
+  "integrity" "sha512-8guHBZCwKnFhYdHr2ysuRWErTwhoN2X8XELRlrRwpmfeY2jjuUN4taQMsULKUVo1K4DvZl+0pgfyoysHxvmvEw=="
+  "resolved" "https://registry.npmjs.org/eventemitter3/-/eventemitter3-4.0.7.tgz"
+  "version" "4.0.7"
+
+"events@^3.0.0", "events@^3.2.0":
+  "integrity" "sha512-mQw+2fkQbALzQ7V0MY0IqdnXNOeTtP4r0lN9z7AAawCXgqea7bDii20AYrIBrFd/Hx0M2Ocz6S111CaFkUcb0Q=="
+  "resolved" "https://registry.npmjs.org/events/-/events-3.3.0.tgz"
+  "version" "3.3.0"
+
+"evp_bytestokey@^1.0.0", "evp_bytestokey@^1.0.3":
+  "integrity" "sha512-/f2Go4TognH/KvCISP7OUsHn85hT9nUkxxA9BEWxFn+Oj9o8ZNLm/40hdlgSLyuOimsrTKLUMEorQexp/aPQeA=="
+  "resolved" "https://registry.npmjs.org/evp_bytestokey/-/evp_bytestokey-1.0.3.tgz"
+  "version" "1.0.3"
+  dependencies:
+    "md5.js" "^1.3.4"
+    "safe-buffer" "^5.1.1"
+
+"execa@^5.0.0":
+  "integrity" "sha512-8uSpZZocAZRBAPIEINJj3Lo9HyGitllczc27Eh5YYojjMFMn8yHMDMaUHE2Jqfq05D/wucwI4JGURyXt1vchyg=="
+  "resolved" "https://registry.npmjs.org/execa/-/execa-5.1.1.tgz"
+  "version" "5.1.1"
+  dependencies:
+    "cross-spawn" "^7.0.3"
+    "get-stream" "^6.0.0"
+    "human-signals" "^2.1.0"
+    "is-stream" "^2.0.0"
+    "merge-stream" "^2.0.0"
+    "npm-run-path" "^4.0.1"
+    "onetime" "^5.1.2"
+    "signal-exit" "^3.0.3"
+    "strip-final-newline" "^2.0.0"
+
+"express@^4.17.3":
+  "integrity" "sha512-5/PsL6iGPdfQ/lKM1UuielYgv3BUoJfz1aUwU9vHZ+J7gyvwdQXFEBIEIaxeGf0GIcreATNyBExtalisDbuMqQ=="
+  "resolved" "https://registry.npmjs.org/express/-/express-4.18.2.tgz"
+  "version" "4.18.2"
+  dependencies:
+    "accepts" "~1.3.8"
+    "array-flatten" "1.1.1"
+    "body-parser" "1.20.1"
+    "content-disposition" "0.5.4"
+    "content-type" "~1.0.4"
+    "cookie" "0.5.0"
+    "cookie-signature" "1.0.6"
+    "debug" "2.6.9"
+    "depd" "2.0.0"
+    "encodeurl" "~1.0.2"
+    "escape-html" "~1.0.3"
+    "etag" "~1.8.1"
+    "finalhandler" "1.2.0"
+    "fresh" "0.5.2"
+    "http-errors" "2.0.0"
+    "merge-descriptors" "1.0.1"
+    "methods" "~1.1.2"
+    "on-finished" "2.4.1"
+    "parseurl" "~1.3.3"
+    "path-to-regexp" "0.1.7"
+    "proxy-addr" "~2.0.7"
+    "qs" "6.11.0"
+    "range-parser" "~1.2.1"
+    "safe-buffer" "5.2.1"
+    "send" "0.18.0"
+    "serve-static" "1.15.0"
+    "setprototypeof" "1.2.0"
+    "statuses" "2.0.1"
+    "type-is" "~1.6.18"
+    "utils-merge" "1.0.1"
+    "vary" "~1.1.2"
+
+"fast-deep-equal@^3.1.1", "fast-deep-equal@^3.1.3":
+  "integrity" "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q=="
+  "resolved" "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz"
+  "version" "3.1.3"
+
+"fast-glob@^3.0.3", "fast-glob@^3.2.12":
+  "integrity" "sha512-ChDuvbOypPuNjO8yIDf36x7BlZX1smcUMTTcyoIjycexOxd6DFsKsg21qVBzEmr3G7fUKIRy2/psii+CIUt7FA=="
+  "resolved" "https://registry.npmjs.org/fast-glob/-/fast-glob-3.3.0.tgz"
+  "version" "3.3.0"
+  dependencies:
+    "@nodelib/fs.stat" "^2.0.2"
+    "@nodelib/fs.walk" "^1.2.3"
+    "glob-parent" "^5.1.2"
+    "merge2" "^1.3.0"
+    "micromatch" "^4.0.4"
+
+"fast-json-stable-stringify@^2.0.0":
+  "integrity" "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw=="
+  "resolved" "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz"
+  "version" "2.1.0"
+
+"fastest-levenshtein@^1.0.12":
+  "integrity" "sha512-eRnCtTTtGZFpQCwhJiUOuxPQWRXVKYDn0b2PeHfXL6/Zi53SLAzAHfVhVWK2AryC/WH05kGfxhFIPvTF0SXQzg=="
+  "resolved" "https://registry.npmjs.org/fastest-levenshtein/-/fastest-levenshtein-1.0.16.tgz"
+  "version" "1.0.16"
+
+"fastq@^1.6.0":
+  "integrity" "sha512-wBrocU2LCXXa+lWBt8RoIRD89Fi8OdABODa/kEnyeyjS5aZO5/GNvI5sEINADqP/h8M29UHTHUb53sUu5Ihqdw=="
+  "resolved" "https://registry.npmjs.org/fastq/-/fastq-1.15.0.tgz"
+  "version" "1.15.0"
+  dependencies:
+    "reusify" "^1.0.4"
+
+"faye-websocket@^0.11.3":
+  "integrity" "sha512-CzbClwlXAuiRQAlUyfqPgvPoNKTckTPGfwZV4ZdAhVcP2lh9KUxJg2b5GkE7XbjKQ3YJnQ9z6D9ntLAlB+tP8g=="
+  "resolved" "https://registry.npmjs.org/faye-websocket/-/faye-websocket-0.11.4.tgz"
+  "version" "0.11.4"
+  dependencies:
+    "websocket-driver" ">=0.5.1"
+
+"file-loader@^6.2.0":
+  "integrity" "sha512-qo3glqyTa61Ytg4u73GultjHGjdRyig3tG6lPtyX/jOEJvHif9uB0/OCI2Kif6ctF3caQTW2G5gym21oAsI4pw=="
+  "resolved" "https://registry.npmjs.org/file-loader/-/file-loader-6.2.0.tgz"
+  "version" "6.2.0"
+  dependencies:
+    "loader-utils" "^2.0.0"
+    "schema-utils" "^3.0.0"
+
+"file-type@^12.0.0":
+  "integrity" "sha512-UssQP5ZgIOKelfsaB5CuGAL+Y+q7EmONuiwF3N5HAH0t27rvrttgi6Ra9k/+DVaY9UF6+ybxu5pOXLUdA8N7Vg=="
+  "resolved" "https://registry.npmjs.org/file-type/-/file-type-12.4.2.tgz"
+  "version" "12.4.2"
+
+"fill-range@^7.0.1":
+  "integrity" "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ=="
+  "resolved" "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz"
+  "version" "7.0.1"
+  dependencies:
+    "to-regex-range" "^5.0.1"
+
+"finalhandler@1.2.0":
+  "integrity" "sha512-5uXcUVftlQMFnWC9qu/svkWv3GTd2PfUhK/3PLkYNAe7FbqJMt3515HaxE6eRL74GdsriiwujiawdaB1BpEISg=="
+  "resolved" "https://registry.npmjs.org/finalhandler/-/finalhandler-1.2.0.tgz"
+  "version" "1.2.0"
+  dependencies:
+    "debug" "2.6.9"
+    "encodeurl" "~1.0.2"
+    "escape-html" "~1.0.3"
+    "on-finished" "2.4.1"
+    "parseurl" "~1.3.3"
+    "statuses" "2.0.1"
+    "unpipe" "~1.0.0"
+
+"find-cache-dir@^3.3.1":
+  "integrity" "sha512-wXZV5emFEjrridIgED11OoUKLxiYjAcqot/NJdAkOhlJ+vGzwhOAfcG5OX1jP+S0PcjEn8bdMJv+g2jwQ3Onig=="
+  "resolved" "https://registry.npmjs.org/find-cache-dir/-/find-cache-dir-3.3.2.tgz"
+  "version" "3.3.2"
+  dependencies:
+    "commondir" "^1.0.1"
+    "make-dir" "^3.0.2"
+    "pkg-dir" "^4.1.0"
+
+"find-config@^1.0.0":
+  "integrity" "sha512-Z+suHH+7LSE40WfUeZPIxSxypCWvrzdVc60xAjUShZeT5eMWM0/FQUduq3HjluyfAHWvC/aOBkT1pTZktyF/jg=="
+  "resolved" "https://registry.npmjs.org/find-config/-/find-config-1.0.0.tgz"
+  "version" "1.0.0"
+  dependencies:
+    "user-home" "^2.0.0"
+
+"find-up@^4.0.0":
+  "integrity" "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw=="
+  "resolved" "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz"
+  "version" "4.1.0"
+  dependencies:
+    "locate-path" "^5.0.0"
+    "path-exists" "^4.0.0"
+
+"flat@^5.0.2":
+  "integrity" "sha512-b6suED+5/3rTpUBdG1gupIl8MPFCAMA0QXwmljLhvCUKcUvdE4gWky9zpuGCcXHOsz4J9wPGNWq6OKpmIzz3hQ=="
+  "resolved" "https://registry.npmjs.org/flat/-/flat-5.0.2.tgz"
+  "version" "5.0.2"
+
+"follow-redirects@^1.0.0", "follow-redirects@^1.15.0":
+  "integrity" "sha512-VQLG33o04KaQ8uYi2tVNbdrWp1QWxNNea+nmIB4EVM28v0hmP17z7aG1+wAkNzVq4KeXTq3221ye5qTJP91JwA=="
+  "resolved" "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.2.tgz"
+  "version" "1.15.2"
+
+"form-data@^4.0.0":
+  "integrity" "sha512-ETEklSGi5t0QMZuiXoA/Q6vcnxcLQP5vdugSpuAyi6SVGi2clPPp+xgEhuMaHC+zGgn31Kd235W35f7Hykkaww=="
+  "resolved" "https://registry.npmjs.org/form-data/-/form-data-4.0.0.tgz"
+  "version" "4.0.0"
+  dependencies:
+    "asynckit" "^0.4.0"
+    "combined-stream" "^1.0.8"
+    "mime-types" "^2.1.12"
+
+"forwarded@0.2.0":
+  "integrity" "sha512-buRG0fpBtRHSTCOASe6hD258tEubFoRLb4ZNA6NxMVHNw2gOcwHo9wyablzMzOA5z9xA9L1KNjk/Nt6MT9aYow=="
+  "resolved" "https://registry.npmjs.org/forwarded/-/forwarded-0.2.0.tgz"
+  "version" "0.2.0"
+
+"fraction.js@^4.3.6":
+  "integrity" "sha512-ZsDfxO51wGAXREY55a7la9LScWpwv9RxIrYABrlvOFBlH/ShPnrtsXeuUIfXKKOVicNxQ+o8JTbJvjS4M89yew=="
+  "resolved" "https://registry.npmjs.org/fraction.js/-/fraction.js-4.3.7.tgz"
+  "version" "4.3.7"
+
+"fresh@0.5.2":
+  "integrity" "sha512-zJ2mQYM18rEFOudeV4GShTGIQ7RbzA7ozbU9I/XBpm7kqgMywgmylMwXHxZJmkVoYkna9d2pVXVXPdYTP9ej8Q=="
+  "resolved" "https://registry.npmjs.org/fresh/-/fresh-0.5.2.tgz"
+  "version" "0.5.2"
+
+"fs-extra@^10.0.0":
+  "integrity" "sha512-oRXApq54ETRj4eMiFzGnHWGy+zo5raudjuxN0b8H7s/RU2oW0Wvsx9O0ACRN/kRq9E8Vu/ReskGB5o3ji+FzHQ=="
+  "resolved" "https://registry.npmjs.org/fs-extra/-/fs-extra-10.1.0.tgz"
+  "version" "10.1.0"
+  dependencies:
+    "graceful-fs" "^4.2.0"
+    "jsonfile" "^6.0.1"
+    "universalify" "^2.0.0"
+
+"fs-monkey@^1.0.4":
+  "integrity" "sha512-8uMbBjrhzW76TYgEV27Y5E//W2f/lTFmx78P2w19FZSxarhI/798APGQyuGCwmkNxgwGRhrLfvWyLBvNtuOmew=="
+  "resolved" "https://registry.npmjs.org/fs-monkey/-/fs-monkey-1.0.5.tgz"
+  "version" "1.0.5"
+
+"fs.realpath@^1.0.0":
+  "integrity" "sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw=="
+  "resolved" "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz"
+  "version" "1.0.0"
+
+"function-bind@^1.1.1":
+  "integrity" "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A=="
+  "resolved" "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz"
+  "version" "1.1.1"
+
+"gensync@^1.0.0-beta.2":
+  "integrity" "sha512-3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg=="
+  "resolved" "https://registry.npmjs.org/gensync/-/gensync-1.0.0-beta.2.tgz"
+  "version" "1.0.0-beta.2"
+
+"get-caller-file@^2.0.5":
+  "integrity" "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg=="
+  "resolved" "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz"
+  "version" "2.0.5"
+
+"get-intrinsic@^1.0.2", "get-intrinsic@^1.1.1":
+  "integrity" "sha512-Jfm3OyCxHh9DJyc28qGk+JmfkpO41A4XkneDSujN9MDXrm4oDKdHvndhZ2dN94+ERNfkYJWDclW6k2L/ZGHjXA=="
+  "resolved" "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.1.2.tgz"
+  "version" "1.1.2"
+  dependencies:
+    "function-bind" "^1.1.1"
+    "has" "^1.0.3"
+    "has-symbols" "^1.0.3"
+
+"get-stream@^6.0.0":
+  "integrity" "sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg=="
+  "resolved" "https://registry.npmjs.org/get-stream/-/get-stream-6.0.1.tgz"
+  "version" "6.0.1"
+
+"glob-parent@^5.1.2", "glob-parent@~5.1.2":
+  "integrity" "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow=="
+  "resolved" "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz"
+  "version" "5.1.2"
+  dependencies:
+    "is-glob" "^4.0.1"
+
+"glob-parent@^6.0.2":
+  "integrity" "sha512-XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A=="
+  "resolved" "https://registry.npmjs.org/glob-parent/-/glob-parent-6.0.2.tgz"
+  "version" "6.0.2"
+  dependencies:
+    "is-glob" "^4.0.3"
+
+"glob-to-regexp@^0.4.1":
+  "integrity" "sha512-lkX1HJXwyMcprw/5YUZc2s7DrpAiHB21/V+E1rHUrVNokkvB6bqMzT0VfV6/86ZNabt1k14YOIaT7nDvOX3Iiw=="
+  "resolved" "https://registry.npmjs.org/glob-to-regexp/-/glob-to-regexp-0.4.1.tgz"
+  "version" "0.4.1"
+
+"glob@^7.1.3", "glob@^7.2.0":
+  "integrity" "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q=="
+  "resolved" "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz"
+  "version" "7.2.3"
+  dependencies:
+    "fs.realpath" "^1.0.0"
+    "inflight" "^1.0.4"
+    "inherits" "2"
+    "minimatch" "^3.1.1"
+    "once" "^1.3.0"
+    "path-is-absolute" "^1.0.0"
+
+"glob@^8.0.1":
+  "integrity" "sha512-ull455NHSHI/Y1FqGaaYFaLGkNMMJbavMrEGFXG/PGrg6y7sutWHUHrz6gy6WEBH6akM1M414dWKCNs+IhKdiQ=="
+  "resolved" "https://registry.npmjs.org/glob/-/glob-8.0.3.tgz"
+  "version" "8.0.3"
+  dependencies:
+    "fs.realpath" "^1.0.0"
+    "inflight" "^1.0.4"
+    "inherits" "2"
+    "minimatch" "^5.0.1"
+    "once" "^1.3.0"
+
+"glob@^8.1.0":
+  "integrity" "sha512-r8hpEjiQEYlF2QU0df3dS+nxxSIreXQS1qRhMJM0Q5NDdR386C7jb7Hwwod8Fgiuex+k0GFjgft18yvxm5XoCQ=="
+  "resolved" "https://registry.npmjs.org/glob/-/glob-8.1.0.tgz"
+  "version" "8.1.0"
+  dependencies:
+    "fs.realpath" "^1.0.0"
+    "inflight" "^1.0.4"
+    "inherits" "2"
+    "minimatch" "^5.0.1"
+    "once" "^1.3.0"
+
+"glob@7.1.6":
+  "integrity" "sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA=="
+  "resolved" "https://registry.npmjs.org/glob/-/glob-7.1.6.tgz"
+  "version" "7.1.6"
+  dependencies:
+    "fs.realpath" "^1.0.0"
+    "inflight" "^1.0.4"
+    "inherits" "2"
+    "minimatch" "^3.0.4"
+    "once" "^1.3.0"
+    "path-is-absolute" "^1.0.0"
+
+"globals@^11.1.0":
+  "integrity" "sha512-WHq43gS+6ufNOEqlrDBxVEbb8ntfXrfAUU2ZOpCxrBdGKW3gyv8mCxAfIBD0DroPKGrJ2eSsXsLtY9MPntsyTw=="
+  "resolved" "https://registry.npmjs.org/globals/-/globals-11.11.0.tgz"
+  "version" "11.11.0"
+
+"globby@^10.0.0":
+  "integrity" "sha512-7dUi7RvCoT/xast/o/dLN53oqND4yk0nsHkhRgn9w65C4PofCLOoJ39iSOg+qVDdWQPIEj+eszMHQ+aLVwwQSg=="
+  "resolved" "https://registry.npmjs.org/globby/-/globby-10.0.2.tgz"
+  "version" "10.0.2"
+  dependencies:
+    "@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"
+
+"graceful-fs@^4.1.2", "graceful-fs@^4.1.6", "graceful-fs@^4.2.0", "graceful-fs@^4.2.2", "graceful-fs@^4.2.4", "graceful-fs@^4.2.6", "graceful-fs@^4.2.9":
+  "integrity" "sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA=="
+  "resolved" "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.10.tgz"
+  "version" "4.2.10"
+
+"growly@^1.3.0":
+  "integrity" "sha512-+xGQY0YyAWCnqy7Cd++hc2JqMYzlm0dG30Jd0beaA64sROr8C4nt8Yc9V5Ro3avlSUDTN0ulqP/VBKi1/lLygw=="
+  "resolved" "https://registry.npmjs.org/growly/-/growly-1.3.0.tgz"
+  "version" "1.3.0"
+
+"handle-thing@^2.0.0":
+  "integrity" "sha512-9Qn4yBxelxoh2Ow62nP+Ka/kMnOXRi8BXnRaUwezLNhqelnN49xKz4F/dPP8OYLxLxq6JDtZb2i9XznUQbNPTg=="
+  "resolved" "https://registry.npmjs.org/handle-thing/-/handle-thing-2.0.1.tgz"
+  "version" "2.0.1"
+
+"has-flag@^3.0.0":
+  "integrity" "sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw=="
+  "resolved" "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz"
+  "version" "3.0.0"
+
+"has-flag@^4.0.0":
+  "integrity" "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ=="
+  "resolved" "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz"
+  "version" "4.0.0"
+
+"has-property-descriptors@^1.0.0":
+  "integrity" "sha512-62DVLZGoiEBDHQyqG4w9xCuZ7eJEwNmJRWw2VY84Oedb7WFcA27fiEVe8oUQx9hAUJ4ekurquucTGwsyO1XGdQ=="
+  "resolved" "https://registry.npmjs.org/has-property-descriptors/-/has-property-descriptors-1.0.0.tgz"
+  "version" "1.0.0"
+  dependencies:
+    "get-intrinsic" "^1.1.1"
+
+"has-symbols@^1.0.3":
+  "integrity" "sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A=="
+  "resolved" "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.3.tgz"
+  "version" "1.0.3"
+
+"has@^1.0.3":
+  "integrity" "sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw=="
+  "resolved" "https://registry.npmjs.org/has/-/has-1.0.3.tgz"
+  "version" "1.0.3"
+  dependencies:
+    "function-bind" "^1.1.1"
+
+"hash-base@^3.0.0":
+  "integrity" "sha512-1nmYp/rhMDiE7AYkDw+lLwlAzz0AntGIe51F3RfFfEqyQ3feY2eI/NcwC6umIQVOASPMsWJLJScWKSSvzL9IVA=="
+  "resolved" "https://registry.npmjs.org/hash-base/-/hash-base-3.1.0.tgz"
+  "version" "3.1.0"
+  dependencies:
+    "inherits" "^2.0.4"
+    "readable-stream" "^3.6.0"
+    "safe-buffer" "^5.2.0"
+
+"hash-sum@^1.0.2":
+  "integrity" "sha512-fUs4B4L+mlt8/XAtSOGMUO1TXmAelItBPtJG7CyHJfYTdDjwisntGO2JQz7oUsatOY9o68+57eziUVNw/mRHmA=="
+  "resolved" "https://registry.npmjs.org/hash-sum/-/hash-sum-1.0.2.tgz"
+  "version" "1.0.2"
+
+"hash.js@^1.0.0", "hash.js@^1.0.3":
+  "integrity" "sha512-taOaskGt4z4SOANNseOviYDvjEJinIkRgmp7LbKP2YTTmVxWBl87s/uzK9r+44BclBSp2X7K1hqeNfz9JbBeXA=="
+  "resolved" "https://registry.npmjs.org/hash.js/-/hash.js-1.1.7.tgz"
+  "version" "1.1.7"
+  dependencies:
+    "inherits" "^2.0.3"
+    "minimalistic-assert" "^1.0.1"
+
+"he@^1.2.0":
+  "integrity" "sha512-F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw=="
+  "resolved" "https://registry.npmjs.org/he/-/he-1.2.0.tgz"
+  "version" "1.2.0"
+
+"hmac-drbg@^1.0.1":
+  "integrity" "sha512-Tti3gMqLdZfhOQY1Mzf/AanLiqh1WTiJgEj26ZuYQ9fbkLomzGchCws4FyrSd4VkpBfiNhaE1On+lOz894jvXg=="
+  "resolved" "https://registry.npmjs.org/hmac-drbg/-/hmac-drbg-1.0.1.tgz"
+  "version" "1.0.1"
+  dependencies:
+    "hash.js" "^1.0.3"
+    "minimalistic-assert" "^1.0.0"
+    "minimalistic-crypto-utils" "^1.0.1"
+
+"hpack.js@^2.1.6":
+  "integrity" "sha512-zJxVehUdMGIKsRaNt7apO2Gqp0BdqW5yaiGHXXmbpvxgBYVZnAql+BJb4RO5ad2MgpbZKn5G6nMnegrH1FcNYQ=="
+  "resolved" "https://registry.npmjs.org/hpack.js/-/hpack.js-2.1.6.tgz"
+  "version" "2.1.6"
+  dependencies:
+    "inherits" "^2.0.1"
+    "obuf" "^1.0.0"
+    "readable-stream" "^2.0.1"
+    "wbuf" "^1.1.0"
+
+"html-attribute-sorter@^0.4.3":
+  "integrity" "sha512-HWSvaXJki44tg0uR1t+j5pRdUVpNiZcJaoB/PFhss/YoAw9cxUDLCpIBbLWQmKjBQfWk91P6LaRnredEyabrDw=="
+  "resolved" "https://registry.npmjs.org/html-attribute-sorter/-/html-attribute-sorter-0.4.3.tgz"
+  "version" "0.4.3"
+
+"html-entities@^2.3.2":
+  "integrity" "sha512-igBTJcNNNhvZFRtm8uA6xMY6xYleeDwn3PeBCkDz7tHttv4F2hsDI2aPgNERWzvRcNYHNT3ymRaQzllmXj4YsQ=="
+  "resolved" "https://registry.npmjs.org/html-entities/-/html-entities-2.4.0.tgz"
+  "version" "2.4.0"
+
+"html-loader@^1.3.2":
+  "integrity" "sha512-DEkUwSd0sijK5PF3kRWspYi56XP7bTNkyg5YWSzBdjaSDmvCufep5c4Vpb3PBf6lUL0YPtLwBfy9fL0t5hBAGA=="
+  "resolved" "https://registry.npmjs.org/html-loader/-/html-loader-1.3.2.tgz"
+  "version" "1.3.2"
+  dependencies:
+    "html-minifier-terser" "^5.1.1"
+    "htmlparser2" "^4.1.0"
+    "loader-utils" "^2.0.0"
+    "schema-utils" "^3.0.0"
+
+"html-minifier-terser@^5.1.1":
+  "integrity" "sha512-ZPr5MNObqnV/T9akshPKbVgyOqLmy+Bxo7juKCfTfnjNniTAMdy4hz21YQqoofMBJD2kdREaqPPdThoR78Tgxg=="
+  "resolved" "https://registry.npmjs.org/html-minifier-terser/-/html-minifier-terser-5.1.1.tgz"
+  "version" "5.1.1"
+  dependencies:
+    "camel-case" "^4.1.1"
+    "clean-css" "^4.2.3"
+    "commander" "^4.1.1"
+    "he" "^1.2.0"
+    "param-case" "^3.0.3"
+    "relateurl" "^0.2.7"
+    "terser" "^4.6.3"
+
+"htmlparser2@^4.1.0":
+  "integrity" "sha512-4zDq1a1zhE4gQso/c5LP1OtrhYTncXNSpvJYtWJBtXAETPlMfi3IFNjGuQbYLuVY4ZR0QMqRVvo4Pdy9KLyP8Q=="
+  "resolved" "https://registry.npmjs.org/htmlparser2/-/htmlparser2-4.1.0.tgz"
+  "version" "4.1.0"
+  dependencies:
+    "domelementtype" "^2.0.1"
+    "domhandler" "^3.0.0"
+    "domutils" "^2.0.0"
+    "entities" "^2.0.0"
+
+"http-deceiver@^1.2.7":
+  "integrity" "sha512-LmpOGxTfbpgtGVxJrj5k7asXHCgNZp5nLfp+hWc8QQRqtb7fUy6kRY3BO1h9ddF6yIPYUARgxGOwB42DnxIaNw=="
+  "resolved" "https://registry.npmjs.org/http-deceiver/-/http-deceiver-1.2.7.tgz"
+  "version" "1.2.7"
+
+"http-errors@~1.6.2":
+  "integrity" "sha512-lks+lVC8dgGyh97jxvxeYTWQFvh4uw4yC12gVl63Cg30sjPX4wuGcdkICVXDAESr6OJGjqGA8Iz5mkeN6zlD7A=="
+  "resolved" "https://registry.npmjs.org/http-errors/-/http-errors-1.6.3.tgz"
+  "version" "1.6.3"
+  dependencies:
+    "depd" "~1.1.2"
+    "inherits" "2.0.3"
+    "setprototypeof" "1.1.0"
+    "statuses" ">= 1.4.0 < 2"
+
+"http-errors@2.0.0":
+  "integrity" "sha512-FtwrG/euBzaEjYeRqOgly7G0qviiXoJWnvEH2Z1plBdXgbyjv34pHTSb9zoeHMyDy33+DWy5Wt9Wo+TURtOYSQ=="
+  "resolved" "https://registry.npmjs.org/http-errors/-/http-errors-2.0.0.tgz"
+  "version" "2.0.0"
+  dependencies:
+    "depd" "2.0.0"
+    "inherits" "2.0.4"
+    "setprototypeof" "1.2.0"
+    "statuses" "2.0.1"
+    "toidentifier" "1.0.1"
+
+"http-parser-js@>=0.5.1":
+  "integrity" "sha512-SGeBX54F94Wgu5RH3X5jsDtf4eHyRogWX1XGT3b4HuW3tQPM4AaBzoUji/4AAJNXCEOWZ5O0DgZmJw1947gD5Q=="
+  "resolved" "https://registry.npmjs.org/http-parser-js/-/http-parser-js-0.5.8.tgz"
+  "version" "0.5.8"
+
+"http-proxy-middleware@^2.0.3":
+  "integrity" "sha512-ya/UeJ6HVBYxrgYotAZo1KvPWlgB48kUJLDePFeneHsVujFaW5WNj2NgWCAE//B1Dl02BIfYlpNgBy8Kf8Rjmw=="
+  "resolved" "https://registry.npmjs.org/http-proxy-middleware/-/http-proxy-middleware-2.0.6.tgz"
+  "version" "2.0.6"
+  dependencies:
+    "@types/http-proxy" "^1.17.8"
+    "http-proxy" "^1.18.1"
+    "is-glob" "^4.0.1"
+    "is-plain-obj" "^3.0.0"
+    "micromatch" "^4.0.2"
+
+"http-proxy@^1.18.1":
+  "integrity" "sha512-7mz/721AbnJwIVbnaSv1Cz3Am0ZLT/UBwkC92VlxhXv/k/BBQfM2fXElQNC27BVGr0uwUpplYPQM9LnaBMR5NQ=="
+  "resolved" "https://registry.npmjs.org/http-proxy/-/http-proxy-1.18.1.tgz"
+  "version" "1.18.1"
+  dependencies:
+    "eventemitter3" "^4.0.0"
+    "follow-redirects" "^1.0.0"
+    "requires-port" "^1.0.0"
+
+"https-browserify@^1.0.0":
+  "integrity" "sha512-J+FkSdyD+0mA0N+81tMotaRMfSL9SGi+xpD3T6YApKsc3bGSXJlfXri3VyFOeYkfLRQisDk1W+jIFFKBeUBbBg=="
+  "resolved" "https://registry.npmjs.org/https-browserify/-/https-browserify-1.0.0.tgz"
+  "version" "1.0.0"
+
+"human-signals@^2.1.0":
+  "integrity" "sha512-B4FFZ6q/T2jhhksgkbEW3HBvWIfDW85snkQgawt07S7J5QXTk6BkNV+0yAeZrM5QpMAdYlocGoljn0sJ/WQkFw=="
+  "resolved" "https://registry.npmjs.org/human-signals/-/human-signals-2.1.0.tgz"
+  "version" "2.1.0"
+
+"iconv-lite@0.4.24":
+  "integrity" "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA=="
+  "resolved" "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz"
+  "version" "0.4.24"
+  dependencies:
+    "safer-buffer" ">= 2.1.2 < 3"
+
+"icss-utils@^5.0.0", "icss-utils@^5.1.0":
+  "integrity" "sha512-soFhflCVWLfRNOPU3iv5Z9VUdT44xFRbzjLsEzSr5AQmgqPMTHdU3PMT1Cf1ssx8fLNJDA1juftYl+PUcv3MqA=="
+  "resolved" "https://registry.npmjs.org/icss-utils/-/icss-utils-5.1.0.tgz"
+  "version" "5.1.0"
+
+"ieee754@^1.1.4":
+  "integrity" "sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA=="
+  "resolved" "https://registry.npmjs.org/ieee754/-/ieee754-1.2.1.tgz"
+  "version" "1.2.1"
+
+"ignore@^5.1.1", "ignore@^5.1.8":
+  "integrity" "sha512-CmxgYGiEPCLhfLnpPp1MoRmifwEIOgjcHXxOBjv7mY96c+eWScsOP9c112ZyLdWHi0FxHjI+4uVhKYp/gcdRmQ=="
+  "resolved" "https://registry.npmjs.org/ignore/-/ignore-5.2.0.tgz"
+  "version" "5.2.0"
+
+"imagemin@^5.0.0 || ^6.0.0 || ^7.0.0 || ^8.0.0", "imagemin@^7.0.1":
+  "integrity" "sha512-33AmZ+xjZhg2JMCe+vDf6a9mzWukE7l+wAtesjE7KyteqqKjzxv7aVQeWnul1Ve26mWvEQqyPwl0OctNBfSR9w=="
+  "resolved" "https://registry.npmjs.org/imagemin/-/imagemin-7.0.1.tgz"
+  "version" "7.0.1"
+  dependencies:
+    "file-type" "^12.0.0"
+    "globby" "^10.0.0"
+    "graceful-fs" "^4.2.2"
+    "junk" "^3.1.0"
+    "make-dir" "^3.0.0"
+    "p-pipe" "^3.0.0"
+    "replace-ext" "^1.0.0"
+
+"img-loader@^4.0.0":
+  "integrity" "sha512-UwRcPQdwdOyEHyCxe1V9s9YFwInwEWCpoO+kJGfIqDrBDqA8jZUsEZTxQ0JteNPGw/Gupmwesk2OhLTcnw6tnQ=="
+  "resolved" "https://registry.npmjs.org/img-loader/-/img-loader-4.0.0.tgz"
+  "version" "4.0.0"
+  dependencies:
+    "loader-utils" "^1.1.0"
+
+"immutable@^4.0.0":
+  "integrity" "sha512-zIE9hX70qew5qTUjSS7wi1iwj/l7+m54KWU247nhM3v806UdGj1yDndXj+IOYxxtW9zyLI+xqFNZjTuDaLUqFw=="
+  "resolved" "https://registry.npmjs.org/immutable/-/immutable-4.0.0.tgz"
+  "version" "4.0.0"
+
+"import-fresh@^3.2.1":
+  "integrity" "sha512-veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw=="
+  "resolved" "https://registry.npmjs.org/import-fresh/-/import-fresh-3.3.0.tgz"
+  "version" "3.3.0"
+  dependencies:
+    "parent-module" "^1.0.0"
+    "resolve-from" "^4.0.0"
+
+"import-local@^3.0.2":
+  "integrity" "sha512-ASB07uLtnDs1o6EHjKpX34BKYDSqnFerfTOJL2HvMqF70LnxpjkzDB8J44oT9pu4AMPkQwf8jl6szgvNd2tRIg=="
+  "resolved" "https://registry.npmjs.org/import-local/-/import-local-3.1.0.tgz"
+  "version" "3.1.0"
+  dependencies:
+    "pkg-dir" "^4.2.0"
+    "resolve-cwd" "^3.0.0"
+
+"inflight@^1.0.4":
+  "integrity" "sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA=="
+  "resolved" "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz"
+  "version" "1.0.6"
+  dependencies:
+    "once" "^1.3.0"
+    "wrappy" "1"
+
+"inherits@^2.0.1", "inherits@^2.0.3", "inherits@^2.0.4", "inherits@~2.0.1", "inherits@~2.0.3", "inherits@2", "inherits@2.0.4":
+  "integrity" "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ=="
+  "resolved" "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz"
+  "version" "2.0.4"
+
+"inherits@2.0.3":
+  "integrity" "sha512-x00IRNXNy63jwGkJmzPigoySHbaqpNuzKbBOmzK+g2OdZpQ9w+sxCN+VSB3ja7IAge2OP2qpfxTjeNcyjmW1uw=="
+  "resolved" "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz"
+  "version" "2.0.3"
+
+"ini@^1.3.4":
+  "integrity" "sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew=="
+  "resolved" "https://registry.npmjs.org/ini/-/ini-1.3.8.tgz"
+  "version" "1.3.8"
+
+"interpret@^2.2.0":
+  "integrity" "sha512-Ju0Bz/cEia55xDwUWEa8+olFpCiQoypjnQySseKtmjNrnps3P+xfpUmGr90T7yjlVJmOtybRvPXhKMbHr+fWnw=="
+  "resolved" "https://registry.npmjs.org/interpret/-/interpret-2.2.0.tgz"
+  "version" "2.2.0"
+
+"ipaddr.js@^2.0.1":
+  "integrity" "sha512-LlbxQ7xKzfBusov6UMi4MFpEg0m+mAm9xyNGEduwXMEDuf4WfzB/RZwMVYEd7IKGvh4IUkEXYxtAVu9T3OelJQ=="
+  "resolved" "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-2.1.0.tgz"
+  "version" "2.1.0"
+
+"ipaddr.js@1.9.1":
+  "integrity" "sha512-0KI/607xoxSToH7GjN1FfSbLoU0+btTicjsQSWQlh/hZykN8KpmMf7uYwPW3R+akZ6R/w18ZlXSHBYXiYUPO3g=="
+  "resolved" "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.9.1.tgz"
+  "version" "1.9.1"
+
+"is-arrayish@^0.2.1":
+  "integrity" "sha512-zz06S8t0ozoDXMG+ube26zeCTNXcKIPJZJi8hBrF4idCLms4CG9QtK7qBl1boi5ODzFpjswb5JPmHCbMpjaYzg=="
+  "resolved" "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz"
+  "version" "0.2.1"
+
+"is-binary-path@~2.1.0":
+  "integrity" "sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw=="
+  "resolved" "https://registry.npmjs.org/is-binary-path/-/is-binary-path-2.1.0.tgz"
+  "version" "2.1.0"
+  dependencies:
+    "binary-extensions" "^2.0.0"
+
+"is-buffer@~1.1.6":
+  "integrity" "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w=="
+  "resolved" "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz"
+  "version" "1.1.6"
+
+"is-core-module@^2.11.0":
+  "integrity" "sha512-Q4ZuBAe2FUsKtyQJoQHlvP8OvBERxO3jEmy1I7hcRXcJBGGHFh/aJBswbXuS9sgrDH2QUO8ilkwNPHvHMd8clg=="
+  "resolved" "https://registry.npmjs.org/is-core-module/-/is-core-module-2.12.1.tgz"
+  "version" "2.12.1"
+  dependencies:
+    "has" "^1.0.3"
+
+"is-docker@^2.0.0", "is-docker@^2.1.1":
+  "integrity" "sha512-F+i2BKsFrH66iaUFc0woD8sLy8getkwTwtOBjvs56Cx4CgJDeKQeqfz8wAYiSb8JOprWhHH5p77PbmYCvvUuXQ=="
+  "resolved" "https://registry.npmjs.org/is-docker/-/is-docker-2.2.1.tgz"
+  "version" "2.2.1"
+
+"is-extglob@^2.1.1":
+  "integrity" "sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ=="
+  "resolved" "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz"
+  "version" "2.1.1"
+
+"is-fullwidth-code-point@^3.0.0":
+  "integrity" "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg=="
+  "resolved" "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz"
+  "version" "3.0.0"
+
+"is-glob@^4.0.1", "is-glob@^4.0.3", "is-glob@~4.0.1":
+  "integrity" "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg=="
+  "resolved" "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz"
+  "version" "4.0.3"
+  dependencies:
+    "is-extglob" "^2.1.1"
+
+"is-number@^7.0.0":
+  "integrity" "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng=="
+  "resolved" "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz"
+  "version" "7.0.0"
+
+"is-plain-obj@^3.0.0":
+  "integrity" "sha512-gwsOE28k+23GP1B6vFl1oVh/WOzmawBrKwo5Ev6wMKzPkaXaCDIQKzLnvsA42DRlbVTWorkgTKIviAKCWkfUwA=="
+  "resolved" "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-3.0.0.tgz"
+  "version" "3.0.0"
+
+"is-plain-object@^2.0.4":
+  "integrity" "sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og=="
+  "resolved" "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz"
+  "version" "2.0.4"
+  dependencies:
+    "isobject" "^3.0.1"
+
+"is-stream@^2.0.0":
+  "integrity" "sha512-hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg=="
+  "resolved" "https://registry.npmjs.org/is-stream/-/is-stream-2.0.1.tgz"
+  "version" "2.0.1"
+
+"is-wsl@^2.2.0":
+  "integrity" "sha512-fKzAra0rGJUUBwGBgNkHZuToZcn+TtXHpeCgmkMJMMYx1sQDYaCSyjJBSCa2nH1DGm7s3n1oBnohoVTBaN7Lww=="
+  "resolved" "https://registry.npmjs.org/is-wsl/-/is-wsl-2.2.0.tgz"
+  "version" "2.2.0"
+  dependencies:
+    "is-docker" "^2.0.0"
+
+"isarray@^1.0.0", "isarray@~1.0.0":
+  "integrity" "sha512-VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ=="
+  "resolved" "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz"
+  "version" "1.0.0"
+
+"isexe@^2.0.0":
+  "integrity" "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw=="
+  "resolved" "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz"
+  "version" "2.0.0"
+
+"isobject@^3.0.1":
+  "integrity" "sha512-WhB9zCku7EGTj/HQQRz5aUQEUeoQZH2bWcltRErOpymJ4boYE6wL9Tbr23krRPSZ+C5zqNSrSw+Cc7sZZ4b7vg=="
+  "resolved" "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz"
+  "version" "3.0.1"
+
+"jest-worker@^27.4.5":
+  "integrity" "sha512-7vuh85V5cdDofPyxn58nrPjBktZo0u9x1g8WtjQol+jZDaE+fhN+cIvTj11GndBnMnyfrUOG1sZQxCdjKh+DKg=="
+  "resolved" "https://registry.npmjs.org/jest-worker/-/jest-worker-27.5.1.tgz"
+  "version" "27.5.1"
+  dependencies:
+    "@types/node" "*"
+    "merge-stream" "^2.0.0"
+    "supports-color" "^8.0.0"
+
+"jiti@^1.18.2":
+  "integrity" "sha512-oVhqoRDaBXf7sjkll95LHVS6Myyyb1zaunVwk4Z0+WPSW4gjS0pl01zYKHScTuyEhQsFxV5L4DR5r+YqSyqyyg=="
+  "resolved" "https://registry.npmjs.org/jiti/-/jiti-1.19.1.tgz"
+  "version" "1.19.1"
+
+"jquery@^3.7", "jquery@1.9.1 - 3":
+  "integrity" "sha512-m4avr8yL8kmFN8psrbFFFmB/If14iN5o9nw/NgnnM+kybDJpRsAynV2BsfpTYrTRysYUdADVD7CkUUizgkpLfg=="
+  "resolved" "https://registry.npmjs.org/jquery/-/jquery-3.7.1.tgz"
+  "version" "3.7.1"
+
+"js-beautify@^1.14.8":
+  "integrity" "sha512-coM7xq1syLcMyuVGyToxcj2AlzhkDjmfklL8r0JgJ7A76wyGMpJ1oA35mr4APdYNO/o/4YY8H54NQIJzhMbhBg=="
+  "resolved" "https://registry.npmjs.org/js-beautify/-/js-beautify-1.14.9.tgz"
+  "version" "1.14.9"
+  dependencies:
+    "config-chain" "^1.1.13"
+    "editorconfig" "^1.0.3"
+    "glob" "^8.1.0"
+    "nopt" "^6.0.0"
+
+"js-tokens@^4.0.0":
+  "integrity" "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ=="
+  "resolved" "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz"
+  "version" "4.0.0"
+
+"jsesc@^2.5.1":
+  "integrity" "sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA=="
+  "resolved" "https://registry.npmjs.org/jsesc/-/jsesc-2.5.2.tgz"
+  "version" "2.5.2"
+
+"jsesc@~0.5.0":
+  "integrity" "sha512-uZz5UnB7u4T9LvwmFqXii7pZSouaRPorGs5who1Ip7VO0wxanFvBL7GkM6dTHlgX+jhBApRetaWpnDabOeTcnA=="
+  "resolved" "https://registry.npmjs.org/jsesc/-/jsesc-0.5.0.tgz"
+  "version" "0.5.0"
+
+"json-parse-even-better-errors@^2.3.0", "json-parse-even-better-errors@^2.3.1":
+  "integrity" "sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w=="
+  "resolved" "https://registry.npmjs.org/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz"
+  "version" "2.3.1"
+
+"json-schema-traverse@^0.4.1":
+  "integrity" "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg=="
+  "resolved" "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz"
+  "version" "0.4.1"
+
+"json-schema-traverse@^1.0.0":
+  "integrity" "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug=="
+  "resolved" "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz"
+  "version" "1.0.0"
+
+"json5@^1.0.1":
+  "integrity" "sha512-g1MWMLBiz8FKi1e4w0UyVL3w+iJceWAFBAaBnnGKOpNa5f8TLktkbre1+s6oICydWAm+HRUGTmI+//xv2hvXYA=="
+  "resolved" "https://registry.npmjs.org/json5/-/json5-1.0.2.tgz"
+  "version" "1.0.2"
+  dependencies:
+    "minimist" "^1.2.0"
+
+"json5@^2.1.2", "json5@^2.2.1":
+  "integrity" "sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg=="
+  "resolved" "https://registry.npmjs.org/json5/-/json5-2.2.3.tgz"
+  "version" "2.2.3"
+
+"jsonfile@^6.0.1":
+  "integrity" "sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ=="
+  "resolved" "https://registry.npmjs.org/jsonfile/-/jsonfile-6.1.0.tgz"
+  "version" "6.1.0"
+  dependencies:
+    "universalify" "^2.0.0"
+  optionalDependencies:
+    "graceful-fs" "^4.1.6"
+
+"junk@^3.1.0":
+  "integrity" "sha512-pBxcB3LFc8QVgdggvZWyeys+hnrNWg4OcZIU/1X59k5jQdLBlCsYGRQaz234SqoRLTCgMH00fY0xRJH+F9METQ=="
+  "resolved" "https://registry.npmjs.org/junk/-/junk-3.1.0.tgz"
+  "version" "3.1.0"
+
+"kind-of@^6.0.2":
+  "integrity" "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw=="
+  "resolved" "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz"
+  "version" "6.0.3"
+
+"klona@^2.0.5":
+  "integrity" "sha512-dhG34DXATL5hSxJbIexCft8FChFXtmskoZYnoPWjXQuebWYCNkVeV3KkGegCK9CP1oswI/vQibS2GY7Em/sJJA=="
+  "resolved" "https://registry.npmjs.org/klona/-/klona-2.0.6.tgz"
+  "version" "2.0.6"
+
+"laravel-mix@^6.0.49":
+  "integrity" "sha512-bBMFpFjp26XfijPvY5y9zGKud7VqlyOE0OWUcPo3vTBY5asw8LTjafAbee1dhfLz6PWNqDziz69CP78ELSpfKw=="
+  "resolved" "https://registry.npmjs.org/laravel-mix/-/laravel-mix-6.0.49.tgz"
+  "version" "6.0.49"
+  dependencies:
+    "@babel/core" "^7.15.8"
+    "@babel/plugin-proposal-object-rest-spread" "^7.15.6"
+    "@babel/plugin-syntax-dynamic-import" "^7.8.3"
+    "@babel/plugin-transform-runtime" "^7.15.8"
+    "@babel/preset-env" "^7.15.8"
+    "@babel/runtime" "^7.15.4"
+    "@types/babel__core" "^7.1.16"
+    "@types/clean-css" "^4.2.5"
+    "@types/imagemin-gifsicle" "^7.0.1"
+    "@types/imagemin-mozjpeg" "^8.0.1"
+    "@types/imagemin-optipng" "^5.2.1"
+    "@types/imagemin-svgo" "^8.0.0"
+    "autoprefixer" "^10.4.0"
+    "babel-loader" "^8.2.3"
+    "chalk" "^4.1.2"
+    "chokidar" "^3.5.2"
+    "clean-css" "^5.2.4"
+    "cli-table3" "^0.6.0"
+    "collect.js" "^4.28.5"
+    "commander" "^7.2.0"
+    "concat" "^1.0.3"
+    "css-loader" "^5.2.6"
+    "cssnano" "^5.0.8"
+    "dotenv" "^10.0.0"
+    "dotenv-expand" "^5.1.0"
+    "file-loader" "^6.2.0"
+    "fs-extra" "^10.0.0"
+    "glob" "^7.2.0"
+    "html-loader" "^1.3.2"
+    "imagemin" "^7.0.1"
+    "img-loader" "^4.0.0"
+    "lodash" "^4.17.21"
+    "md5" "^2.3.0"
+    "mini-css-extract-plugin" "^1.6.2"
+    "node-libs-browser" "^2.2.1"
+    "postcss-load-config" "^3.1.0"
+    "postcss-loader" "^6.2.0"
+    "semver" "^7.3.5"
+    "strip-ansi" "^6.0.0"
+    "style-loader" "^2.0.0"
+    "terser" "^5.9.0"
+    "terser-webpack-plugin" "^5.2.4"
+    "vue-style-loader" "^4.1.3"
+    "webpack" "^5.60.0"
+    "webpack-cli" "^4.9.1"
+    "webpack-dev-server" "^4.7.3"
+    "webpack-merge" "^5.8.0"
+    "webpack-notifier" "^1.14.1"
+    "webpackbar" "^5.0.0-3"
+    "yargs" "^17.2.1"
+
+"launch-editor@^2.6.0":
+  "integrity" "sha512-eB/uXmFVpY4zezmGp5XtU21kwo7GBbKB+EQ+UZeWtGb9yAM5xt/Evk+lYH3eRNAtId+ej4u7TYPFZ07w4s7rRw=="
+  "resolved" "https://registry.npmjs.org/launch-editor/-/launch-editor-2.6.1.tgz"
+  "version" "2.6.1"
+  dependencies:
+    "picocolors" "^1.0.0"
+    "shell-quote" "^1.8.1"
+
+"lilconfig@^2.0.3", "lilconfig@^2.0.5", "lilconfig@^2.1.0":
+  "integrity" "sha512-utWOt/GHzuUxnLKxB6dk81RoOeoNeHgbrXiuGk4yyF5qlRz+iIVWu56E2fqGHFrXz0QNUhLB/8nKqvRH66JKGQ=="
+  "resolved" "https://registry.npmjs.org/lilconfig/-/lilconfig-2.1.0.tgz"
+  "version" "2.1.0"
+
+"lines-and-columns@^1.1.6":
+  "integrity" "sha512-7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg=="
+  "resolved" "https://registry.npmjs.org/lines-and-columns/-/lines-and-columns-1.2.4.tgz"
+  "version" "1.2.4"
+
+"linguist-languages@^7.21.0":
+  "integrity" "sha512-B9O5pDocOkfswmA0qKrqdfeua1TxeQ5PPWdsuo5QRXFv2N0tB3plY+DVWvSWiGkjdqKNU3KBjJYHs/jRXG0adw=="
+  "resolved" "https://registry.npmjs.org/linguist-languages/-/linguist-languages-7.26.1.tgz"
+  "version" "7.26.1"
+
+"loader-runner@^4.2.0":
+  "integrity" "sha512-3R/1M+yS3j5ou80Me59j7F9IMs4PXs3VqRrm0TU3AbKPxlmpoY1TNscJV/oGJXo8qCatFGTfDbY6W6ipGOYXfg=="
+  "resolved" "https://registry.npmjs.org/loader-runner/-/loader-runner-4.3.0.tgz"
+  "version" "4.3.0"
+
+"loader-utils@^1.0.2":
+  "integrity" "sha512-I5d00Pd/jwMD2QCduo657+YM/6L3KZu++pmX9VFncxaxvHcru9jx1lBaFft+r4Mt2jK0Yhp41XlRAihzPxHNCg=="
+  "resolved" "https://registry.npmjs.org/loader-utils/-/loader-utils-1.4.2.tgz"
+  "version" "1.4.2"
+  dependencies:
+    "big.js" "^5.2.2"
+    "emojis-list" "^3.0.0"
+    "json5" "^1.0.1"
+
+"loader-utils@^1.1.0":
+  "integrity" "sha512-I5d00Pd/jwMD2QCduo657+YM/6L3KZu++pmX9VFncxaxvHcru9jx1lBaFft+r4Mt2jK0Yhp41XlRAihzPxHNCg=="
+  "resolved" "https://registry.npmjs.org/loader-utils/-/loader-utils-1.4.2.tgz"
+  "version" "1.4.2"
+  dependencies:
+    "big.js" "^5.2.2"
+    "emojis-list" "^3.0.0"
+    "json5" "^1.0.1"
+
+"loader-utils@^2.0.0":
+  "integrity" "sha512-xXqpXoINfFhgua9xiqD8fPFHgkoq1mmmpE92WlDbm9rNRd/EbRb+Gqf908T2DMfuHjjJlksiK2RbHVOdD/MqSw=="
+  "resolved" "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.4.tgz"
+  "version" "2.0.4"
+  dependencies:
+    "big.js" "^5.2.2"
+    "emojis-list" "^3.0.0"
+    "json5" "^2.1.2"
+
+"locate-path@^5.0.0":
+  "integrity" "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g=="
+  "resolved" "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz"
+  "version" "5.0.0"
+  dependencies:
+    "p-locate" "^4.1.0"
+
+"lodash.debounce@^4.0.8":
+  "integrity" "sha512-FT1yDzDYEoYWhnSGnpE/4Kj1fLZkDFyqRb7fNt6FdYOSxlUWAtp42Eh6Wb0rGIv/m9Bgo7x4GhQbm5Ys4SG5ow=="
+  "resolved" "https://registry.npmjs.org/lodash.debounce/-/lodash.debounce-4.0.8.tgz"
+  "version" "4.0.8"
+
+"lodash.memoize@^4.1.2":
+  "integrity" "sha512-t7j+NzmgnQzTAYXcsHYLgimltOV1MXHtlOWf6GjL9Kj8GK5FInw5JotxvbOs+IvV1/Dzo04/fCGfLVs7aXb4Ag=="
+  "resolved" "https://registry.npmjs.org/lodash.memoize/-/lodash.memoize-4.1.2.tgz"
+  "version" "4.1.2"
+
+"lodash.uniq@^4.5.0":
+  "integrity" "sha512-xfBaXQd9ryd9dlSDvnvI0lvxfLJlYAZzXomUYzLKtUeOQvOP5piqAWuGtrhWeqaXK9hhoM/iyJc5AV+XfsX3HQ=="
+  "resolved" "https://registry.npmjs.org/lodash.uniq/-/lodash.uniq-4.5.0.tgz"
+  "version" "4.5.0"
+
+"lodash@^4.17.19", "lodash@^4.17.21":
+  "integrity" "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg=="
+  "resolved" "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz"
+  "version" "4.17.21"
+
+"lower-case@^2.0.2":
+  "integrity" "sha512-7fm3l3NAF9WfN6W3JOmf5drwpVqX78JtoGJ3A6W0a6ZnldM41w2fV5D490psKFTpMds8TJse/eHLFFsNHHjHgg=="
+  "resolved" "https://registry.npmjs.org/lower-case/-/lower-case-2.0.2.tgz"
+  "version" "2.0.2"
+  dependencies:
+    "tslib" "^2.0.3"
+
+"lru-cache@^6.0.0":
+  "integrity" "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA=="
+  "resolved" "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz"
+  "version" "6.0.0"
+  dependencies:
+    "yallist" "^4.0.0"
+
+"magic-string@^0.30.5":
+  "integrity" "sha512-7xlpfBaQaP/T6Vh8MO/EqXSW5En6INHEvEXQiuff7Gku0PWjU3uf6w/j9o7O+SpB5fOAkrI5HeoNgwjEO0pFsA=="
+  "resolved" "https://registry.npmjs.org/magic-string/-/magic-string-0.30.5.tgz"
+  "version" "0.30.5"
+  dependencies:
+    "@jridgewell/sourcemap-codec" "^1.4.15"
+
+"make-dir@^3.0.0", "make-dir@^3.0.2", "make-dir@^3.1.0":
+  "integrity" "sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw=="
+  "resolved" "https://registry.npmjs.org/make-dir/-/make-dir-3.1.0.tgz"
+  "version" "3.1.0"
+  dependencies:
+    "semver" "^6.0.0"
+
+"map-age-cleaner@^0.1.3":
+  "integrity" "sha512-bJzx6nMoP6PDLPBFmg7+xRKeFZvFboMrGlxmNj9ClvX53KrmvM5bXFXEWjbz4cz1AFn+jWJ9z/DJSz7hrs0w3w=="
+  "resolved" "https://registry.npmjs.org/map-age-cleaner/-/map-age-cleaner-0.1.3.tgz"
+  "version" "0.1.3"
+  dependencies:
+    "p-defer" "^1.0.0"
+
+"md5.js@^1.3.4":
+  "integrity" "sha512-xitP+WxNPcTTOgnTJcrhM0xvdPepipPSf3I8EIpGKeFLjt3PlJLIDG3u8EX53ZIubkb+5U2+3rELYpEhHhzdkg=="
+  "resolved" "https://registry.npmjs.org/md5.js/-/md5.js-1.3.5.tgz"
+  "version" "1.3.5"
+  dependencies:
+    "hash-base" "^3.0.0"
+    "inherits" "^2.0.1"
+    "safe-buffer" "^5.1.2"
+
+"md5@^2.3.0":
+  "integrity" "sha512-T1GITYmFaKuO91vxyoQMFETst+O71VUPEU3ze5GNzDm0OWdP8v1ziTaAEPUr/3kLsY3Sftgz242A1SetQiDL7g=="
+  "resolved" "https://registry.npmjs.org/md5/-/md5-2.3.0.tgz"
+  "version" "2.3.0"
+  dependencies:
+    "charenc" "0.0.2"
+    "crypt" "0.0.2"
+    "is-buffer" "~1.1.6"
+
+"mdn-data@2.0.14":
+  "integrity" "sha512-dn6wd0uw5GsdswPFfsgMp5NSB0/aDe6fK94YJV/AJDYXL6HVLWBsxeq7js7Ad+mU2K9LAlwpk6kN2D5mwCPVow=="
+  "resolved" "https://registry.npmjs.org/mdn-data/-/mdn-data-2.0.14.tgz"
+  "version" "2.0.14"
+
+"media-typer@0.3.0":
+  "integrity" "sha512-dq+qelQ9akHpcOl/gUVRTxVIOkAJ1wR3QAvb4RsVjS8oVoFjDGTc679wJYmUmknUF5HwMLOgb5O+a3KxfWapPQ=="
+  "resolved" "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz"
+  "version" "0.3.0"
+
+"mem@^8.0.0":
+  "integrity" "sha512-qFCFUDs7U3b8mBDPyz5EToEKoAkgCzqquIgi9nkkR9bixxOVOre+09lbuH7+9Kn2NFpm56M3GUWVbU2hQgdACA=="
+  "resolved" "https://registry.npmjs.org/mem/-/mem-8.1.1.tgz"
+  "version" "8.1.1"
+  dependencies:
+    "map-age-cleaner" "^0.1.3"
+    "mimic-fn" "^3.1.0"
+
+"memfs@^3.4.3":
+  "integrity" "sha512-UERzLsxzllchadvbPs5aolHh65ISpKpM+ccLbOJ8/vvpBKmAWf+la7dXFy7Mr0ySHbdHrFv5kGFCUHHe6GFEmw=="
+  "resolved" "https://registry.npmjs.org/memfs/-/memfs-3.5.3.tgz"
+  "version" "3.5.3"
+  dependencies:
+    "fs-monkey" "^1.0.4"
+
+"merge-descriptors@1.0.1":
+  "integrity" "sha512-cCi6g3/Zr1iqQi6ySbseM1Xvooa98N0w31jzUYrXPX2xqObmFGHJ0tQ5u74H3mVh7wLouTseZyYIq39g8cNp1w=="
+  "resolved" "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.1.tgz"
+  "version" "1.0.1"
+
+"merge-stream@^2.0.0":
+  "integrity" "sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w=="
+  "resolved" "https://registry.npmjs.org/merge-stream/-/merge-stream-2.0.0.tgz"
+  "version" "2.0.0"
+
+"merge2@^1.2.3", "merge2@^1.3.0":
+  "integrity" "sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg=="
+  "resolved" "https://registry.npmjs.org/merge2/-/merge2-1.4.1.tgz"
+  "version" "1.4.1"
+
+"methods@~1.1.2":
+  "integrity" "sha512-iclAHeNqNm68zFtnZ0e+1L2yUIdvzNoauKU4WBA3VvH/vPFieF7qfRlwUZU+DA9P9bPXIS90ulxoUoCH23sV2w=="
+  "resolved" "https://registry.npmjs.org/methods/-/methods-1.1.2.tgz"
+  "version" "1.1.2"
+
+"micromatch@^4.0.2", "micromatch@^4.0.4", "micromatch@^4.0.5":
+  "integrity" "sha512-DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA=="
+  "resolved" "https://registry.npmjs.org/micromatch/-/micromatch-4.0.5.tgz"
+  "version" "4.0.5"
+  dependencies:
+    "braces" "^3.0.2"
+    "picomatch" "^2.3.1"
+
+"miller-rabin@^4.0.0":
+  "integrity" "sha512-115fLhvZVqWwHPbClyntxEVfVDfl9DLLTuJvq3g2O/Oxi8AiNouAHvDSzHS0viUJc+V5vm3eq91Xwqn9dp4jRA=="
+  "resolved" "https://registry.npmjs.org/miller-rabin/-/miller-rabin-4.0.1.tgz"
+  "version" "4.0.1"
+  dependencies:
+    "bn.js" "^4.0.0"
+    "brorand" "^1.0.1"
+
+"mime-db@>= 1.43.0 < 2", "mime-db@1.52.0":
+  "integrity" "sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg=="
+  "resolved" "https://registry.npmjs.org/mime-db/-/mime-db-1.52.0.tgz"
+  "version" "1.52.0"
+
+"mime-types@^2.1.12", "mime-types@^2.1.27", "mime-types@^2.1.31", "mime-types@~2.1.17", "mime-types@~2.1.24", "mime-types@~2.1.34":
+  "integrity" "sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw=="
+  "resolved" "https://registry.npmjs.org/mime-types/-/mime-types-2.1.35.tgz"
+  "version" "2.1.35"
+  dependencies:
+    "mime-db" "1.52.0"
+
+"mime@1.6.0":
+  "integrity" "sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg=="
+  "resolved" "https://registry.npmjs.org/mime/-/mime-1.6.0.tgz"
+  "version" "1.6.0"
+
+"mimic-fn@^2.1.0":
+  "integrity" "sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg=="
+  "resolved" "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz"
+  "version" "2.1.0"
+
+"mimic-fn@^3.1.0":
+  "integrity" "sha512-Ysbi9uYW9hFyfrThdDEQuykN4Ey6BuwPD2kpI5ES/nFTDn/98yxYNLZJcgUAKPT/mcrLLKaGzJR9YVxJrIdASQ=="
+  "resolved" "https://registry.npmjs.org/mimic-fn/-/mimic-fn-3.1.0.tgz"
+  "version" "3.1.0"
+
+"mini-css-extract-plugin@^1.6.2":
+  "integrity" "sha512-WhDvO3SjGm40oV5y26GjMJYjd2UMqrLAGKy5YS2/3QKJy2F7jgynuHTir/tgUUOiNQu5saXHdc8reo7YuhhT4Q=="
+  "resolved" "https://registry.npmjs.org/mini-css-extract-plugin/-/mini-css-extract-plugin-1.6.2.tgz"
+  "version" "1.6.2"
+  dependencies:
+    "loader-utils" "^2.0.0"
+    "schema-utils" "^3.0.0"
+    "webpack-sources" "^1.1.0"
+
+"minimalistic-assert@^1.0.0", "minimalistic-assert@^1.0.1":
+  "integrity" "sha512-UtJcAD4yEaGtjPezWuO9wC4nwUnVH/8/Im3yEHQP4b67cXlD/Qr9hdITCU1xDbSEXg2XKNaP8jsReV7vQd00/A=="
+  "resolved" "https://registry.npmjs.org/minimalistic-assert/-/minimalistic-assert-1.0.1.tgz"
+  "version" "1.0.1"
+
+"minimalistic-crypto-utils@^1.0.1":
+  "integrity" "sha512-JIYlbt6g8i5jKfJ3xz7rF0LXmv2TkDxBLUkiBeZ7bAx4GnnNMr8xFpGnOxn6GhTEHx3SjRrZEoU+j04prX1ktg=="
+  "resolved" "https://registry.npmjs.org/minimalistic-crypto-utils/-/minimalistic-crypto-utils-1.0.1.tgz"
+  "version" "1.0.1"
+
+"minimatch@^3.0.4", "minimatch@^3.1.1":
+  "integrity" "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw=="
+  "resolved" "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz"
+  "version" "3.1.2"
+  dependencies:
+    "brace-expansion" "^1.1.7"
+
+"minimatch@^5.0.1":
+  "integrity" "sha512-9TPBGGak4nHfGZsPBohm9AWg6NoT7QTCehS3BIJABslyZbzxfV78QM2Y6+i741OPZIafFAaiiEMh5OyIrJPgtg=="
+  "resolved" "https://registry.npmjs.org/minimatch/-/minimatch-5.1.0.tgz"
+  "version" "5.1.0"
+  dependencies:
+    "brace-expansion" "^2.0.1"
+
+"minimatch@9.0.1":
+  "integrity" "sha512-0jWhJpD/MdhPXwPuiRkCbfYfSKp2qnn2eOc279qI7f+osl/l+prKSrvhg157zSYvx/1nmgn2NqdT6k2Z7zSH9w=="
+  "resolved" "https://registry.npmjs.org/minimatch/-/minimatch-9.0.1.tgz"
+  "version" "9.0.1"
+  dependencies:
+    "brace-expansion" "^2.0.1"
+
+"minimist@^1.2.0":
+  "integrity" "sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA=="
+  "resolved" "https://registry.npmjs.org/minimist/-/minimist-1.2.8.tgz"
+  "version" "1.2.8"
+
+"ms@2.0.0":
+  "integrity" "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A=="
+  "resolved" "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz"
+  "version" "2.0.0"
+
+"ms@2.1.2":
+  "integrity" "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w=="
+  "resolved" "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz"
+  "version" "2.1.2"
+
+"ms@2.1.3":
+  "integrity" "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA=="
+  "resolved" "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz"
+  "version" "2.1.3"
+
+"multicast-dns@^7.2.5":
+  "integrity" "sha512-2eznPJP8z2BFLX50tf0LuODrpINqP1RVIm/CObbTcBRITQgmC/TjcREF1NeTBzIcR5XO/ukWo+YHOjBbFwIupg=="
+  "resolved" "https://registry.npmjs.org/multicast-dns/-/multicast-dns-7.2.5.tgz"
+  "version" "7.2.5"
+  dependencies:
+    "dns-packet" "^5.2.2"
+    "thunky" "^1.0.2"
+
+"mz@^2.7.0":
+  "integrity" "sha512-z81GNO7nnYMEhrGh9LeymoE4+Yr0Wn5McHIZMK5cfQCl+NDX08sCZgUc9/6MHni9IWuFLm1Z3HTCXu2z9fN62Q=="
+  "resolved" "https://registry.npmjs.org/mz/-/mz-2.7.0.tgz"
+  "version" "2.7.0"
+  dependencies:
+    "any-promise" "^1.0.0"
+    "object-assign" "^4.0.1"
+    "thenify-all" "^1.0.0"
+
+"nanoid@^3.3.7":
+  "integrity" "sha512-eSRppjcPIatRIMC1U6UngP8XFcz8MQWGQdt1MTBQ7NaAmvXDfvNxbvWV3x2y6CdEUciCSsDHDQZbhYaB8QEo2g=="
+  "resolved" "https://registry.npmjs.org/nanoid/-/nanoid-3.3.7.tgz"
+  "version" "3.3.7"
+
+"negotiator@0.6.3":
+  "integrity" "sha512-+EUsqGPLsM+j/zdChZjsnX51g4XrHFOIXwfnCVPGlQk/k5giakcKsuxCObBRu6DSm9opw/O6slWbJdghQM4bBg=="
+  "resolved" "https://registry.npmjs.org/negotiator/-/negotiator-0.6.3.tgz"
+  "version" "0.6.3"
+
+"neo-async@^2.6.2":
+  "integrity" "sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw=="
+  "resolved" "https://registry.npmjs.org/neo-async/-/neo-async-2.6.2.tgz"
+  "version" "2.6.2"
+
+"no-case@^3.0.4":
+  "integrity" "sha512-fgAN3jGAh+RoxUGZHTSOLJIqUc2wmoBwGR4tbpNAKmmovFoWq0OdRkb0VkldReO2a2iBT/OEulG9XSUc10r3zg=="
+  "resolved" "https://registry.npmjs.org/no-case/-/no-case-3.0.4.tgz"
+  "version" "3.0.4"
+  dependencies:
+    "lower-case" "^2.0.2"
+    "tslib" "^2.0.3"
+
+"node-forge@^1":
+  "integrity" "sha512-dPEtOeMvF9VMcYV/1Wb8CPoVAXtp6MKMlcbAt4ddqmGqUJ6fQZFXkNZNkNlfevtNkGtaSoXf/vNNNSvgrdXwtA=="
+  "resolved" "https://registry.npmjs.org/node-forge/-/node-forge-1.3.1.tgz"
+  "version" "1.3.1"
+
+"node-libs-browser@^2.2.1":
+  "integrity" "sha512-h/zcD8H9kaDZ9ALUWwlBUDo6TKF8a7qBSCSEGfjTVIYeqsioSKaAX+BN7NgiMGp6iSIXZ3PxgCu8KS3b71YK5Q=="
+  "resolved" "https://registry.npmjs.org/node-libs-browser/-/node-libs-browser-2.2.1.tgz"
+  "version" "2.2.1"
+  dependencies:
+    "assert" "^1.1.1"
+    "browserify-zlib" "^0.2.0"
+    "buffer" "^4.3.0"
+    "console-browserify" "^1.1.0"
+    "constants-browserify" "^1.0.0"
+    "crypto-browserify" "^3.11.0"
+    "domain-browser" "^1.1.1"
+    "events" "^3.0.0"
+    "https-browserify" "^1.0.0"
+    "os-browserify" "^0.3.0"
+    "path-browserify" "0.0.1"
+    "process" "^0.11.10"
+    "punycode" "^1.2.4"
+    "querystring-es3" "^0.2.0"
+    "readable-stream" "^2.3.3"
+    "stream-browserify" "^2.0.1"
+    "stream-http" "^2.7.2"
+    "string_decoder" "^1.0.0"
+    "timers-browserify" "^2.0.4"
+    "tty-browserify" "0.0.0"
+    "url" "^0.11.0"
+    "util" "^0.11.0"
+    "vm-browserify" "^1.0.1"
+
+"node-notifier@^9.0.0":
+  "integrity" "sha512-fPNFIp2hF/Dq7qLDzSg4vZ0J4e9v60gJR+Qx7RbjbWqzPDdEqeVpEx5CFeDAELIl+A/woaaNn1fQ5nEVerMxJg=="
+  "resolved" "https://registry.npmjs.org/node-notifier/-/node-notifier-9.0.1.tgz"
+  "version" "9.0.1"
+  dependencies:
+    "growly" "^1.3.0"
+    "is-wsl" "^2.2.0"
+    "semver" "^7.3.2"
+    "shellwords" "^0.1.1"
+    "uuid" "^8.3.0"
+    "which" "^2.0.2"
+
+"node-releases@^2.0.13":
+  "integrity" "sha512-uYr7J37ae/ORWdZeQ1xxMJe3NtdmqMC/JZK+geofDrkLUApKRHPd18/TxtBOJ4A0/+uUIliorNrfYV6s1b02eQ=="
+  "resolved" "https://registry.npmjs.org/node-releases/-/node-releases-2.0.13.tgz"
+  "version" "2.0.13"
+
+"nopt@^6.0.0":
+  "integrity" "sha512-ZwLpbTgdhuZUnZzjd7nb1ZV+4DoiC6/sfiVKok72ym/4Tlf+DFdlHYmT2JPmcNNWV6Pi3SDf1kT+A4r9RTuT9g=="
+  "resolved" "https://registry.npmjs.org/nopt/-/nopt-6.0.0.tgz"
+  "version" "6.0.0"
+  dependencies:
+    "abbrev" "^1.0.0"
+
+"normalize-path@^3.0.0", "normalize-path@~3.0.0":
+  "integrity" "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA=="
+  "resolved" "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz"
+  "version" "3.0.0"
+
+"normalize-range@^0.1.2":
+  "integrity" "sha512-bdok/XvKII3nUpklnV6P2hxtMNrCboOjAcyBuQnWEhO665FwrSNRxU+AqpsyvO6LgGYPspN+lu5CLtw4jPRKNA=="
+  "resolved" "https://registry.npmjs.org/normalize-range/-/normalize-range-0.1.2.tgz"
+  "version" "0.1.2"
+
+"normalize-url@^6.0.1":
+  "integrity" "sha512-DlL+XwOy3NxAQ8xuC0okPgK46iuVNAK01YN7RueYBqqFeGsBjV9XmCAzAdgt+667bCl5kPh9EqKKDwnaPG1I7A=="
+  "resolved" "https://registry.npmjs.org/normalize-url/-/normalize-url-6.1.0.tgz"
+  "version" "6.1.0"
+
+"npm-run-path@^4.0.1":
+  "integrity" "sha512-S48WzZW777zhNIrn7gxOlISNAqi9ZC/uQFnRdbeIHhZhCA6UqpkOT8T1G7BvfdgP4Er8gF4sUbaS0i7QvIfCWw=="
+  "resolved" "https://registry.npmjs.org/npm-run-path/-/npm-run-path-4.0.1.tgz"
+  "version" "4.0.1"
+  dependencies:
+    "path-key" "^3.0.0"
+
+"nth-check@^2.0.1":
+  "integrity" "sha512-lqjrjmaOoAnWfMmBPL+XNnynZh2+swxiX3WUE0s4yEHI6m+AwrK2UZOimIRl3X/4QctVqS8AiZjFqyOGrMXb/w=="
+  "resolved" "https://registry.npmjs.org/nth-check/-/nth-check-2.1.1.tgz"
+  "version" "2.1.1"
+  dependencies:
+    "boolbase" "^1.0.0"
+
+"object-assign@^4.0.1":
+  "integrity" "sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg=="
+  "resolved" "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz"
+  "version" "4.1.1"
+
+"object-hash@^3.0.0":
+  "integrity" "sha512-RSn9F68PjH9HqtltsSnqYC1XXoWe9Bju5+213R98cNGttag9q9yAOTzdbsqvIa7aNm5WffBZFpWYr2aWrklWAw=="
+  "resolved" "https://registry.npmjs.org/object-hash/-/object-hash-3.0.0.tgz"
+  "version" "3.0.0"
+
+"object-inspect@^1.9.0":
+  "integrity" "sha512-5qoj1RUiKOMsCCNLV1CBiPYE10sziTsnmNxkAI/rZhiD63CF7IqdFGC/XzjWjpSgLf0LxXX3bDFIh0E18f6UhQ=="
+  "resolved" "https://registry.npmjs.org/object-inspect/-/object-inspect-1.13.1.tgz"
+  "version" "1.13.1"
+
+"object-keys@^1.1.1":
+  "integrity" "sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA=="
+  "resolved" "https://registry.npmjs.org/object-keys/-/object-keys-1.1.1.tgz"
+  "version" "1.1.1"
+
+"object.assign@^4.1.0", "object.assign@^4.1.4":
+  "integrity" "sha512-1mxKf0e58bvyjSCtKYY4sRe9itRk3PJpquJOjeIkz885CczcI4IvJJDLPS72oowuSh+pBxUFROpX+TU++hxhZQ=="
+  "resolved" "https://registry.npmjs.org/object.assign/-/object.assign-4.1.4.tgz"
+  "version" "4.1.4"
+  dependencies:
+    "call-bind" "^1.0.2"
+    "define-properties" "^1.1.4"
+    "has-symbols" "^1.0.3"
+    "object-keys" "^1.1.1"
+
+"obuf@^1.0.0", "obuf@^1.1.2":
+  "integrity" "sha512-PX1wu0AmAdPqOL1mWhqmlOd8kOIZQwGZw6rh7uby9fTc5lhaOWFLX3I6R1hrF9k3zUY40e6igsLGkDXK92LJNg=="
+  "resolved" "https://registry.npmjs.org/obuf/-/obuf-1.1.2.tgz"
+  "version" "1.1.2"
+
+"on-finished@2.4.1":
+  "integrity" "sha512-oVlzkg3ENAhCk2zdv7IJwd/QUD4z2RxRwpkcGY8psCVcCYZNq4wYnVWALHM+brtuJjePWiYF/ClmuDr8Ch5+kg=="
+  "resolved" "https://registry.npmjs.org/on-finished/-/on-finished-2.4.1.tgz"
+  "version" "2.4.1"
+  dependencies:
+    "ee-first" "1.1.1"
+
+"on-headers@~1.0.2":
+  "integrity" "sha512-pZAE+FJLoyITytdqK0U5s+FIpjN0JP3OzFi/u8Rx+EV5/W+JTWGXG8xFzevE7AjBfDqHv/8vL8qQsIhHnqRkrA=="
+  "resolved" "https://registry.npmjs.org/on-headers/-/on-headers-1.0.2.tgz"
+  "version" "1.0.2"
+
+"once@^1.3.0":
+  "integrity" "sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w=="
+  "resolved" "https://registry.npmjs.org/once/-/once-1.4.0.tgz"
+  "version" "1.4.0"
+  dependencies:
+    "wrappy" "1"
+
+"onetime@^5.1.2":
+  "integrity" "sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg=="
+  "resolved" "https://registry.npmjs.org/onetime/-/onetime-5.1.2.tgz"
+  "version" "5.1.2"
+  dependencies:
+    "mimic-fn" "^2.1.0"
+
+"open@^8.0.9":
+  "integrity" "sha512-7x81NCL719oNbsq/3mh+hVrAWmFuEYUqrq/Iw3kUzH8ReypT9QQ0BLoJS7/G9k6N81XjW4qHWtjWwe/9eLy1EQ=="
+  "resolved" "https://registry.npmjs.org/open/-/open-8.4.2.tgz"
+  "version" "8.4.2"
+  dependencies:
+    "define-lazy-prop" "^2.0.0"
+    "is-docker" "^2.1.1"
+    "is-wsl" "^2.2.0"
+
+"os-browserify@^0.3.0":
+  "integrity" "sha512-gjcpUc3clBf9+210TRaDWbf+rZZZEshZ+DlXMRCeAjp0xhTrnQsKHypIy1J3d5hKdUzj69t708EHtU8P6bUn0A=="
+  "resolved" "https://registry.npmjs.org/os-browserify/-/os-browserify-0.3.0.tgz"
+  "version" "0.3.0"
+
+"os-homedir@^1.0.0":
+  "integrity" "sha512-B5JU3cabzk8c67mRRd3ECmROafjYMXbuzlwtqdM8IbS8ktlTix8aFGb2bAGKrSRIlnfKwovGUUr72JUPyOb6kQ=="
+  "resolved" "https://registry.npmjs.org/os-homedir/-/os-homedir-1.0.2.tgz"
+  "version" "1.0.2"
+
+"p-defer@^1.0.0":
+  "integrity" "sha512-wB3wfAxZpk2AzOfUMJNL+d36xothRSyj8EXOa4f6GMqYDN9BJaaSISbsk+wS9abmnebVw95C2Kb5t85UmpCxuw=="
+  "resolved" "https://registry.npmjs.org/p-defer/-/p-defer-1.0.0.tgz"
+  "version" "1.0.0"
+
+"p-limit@^2.2.0":
+  "integrity" "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w=="
+  "resolved" "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz"
+  "version" "2.3.0"
+  dependencies:
+    "p-try" "^2.0.0"
+
+"p-locate@^4.1.0":
+  "integrity" "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A=="
+  "resolved" "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz"
+  "version" "4.1.0"
+  dependencies:
+    "p-limit" "^2.2.0"
+
+"p-pipe@^3.0.0":
+  "integrity" "sha512-08pj8ATpzMR0Y80x50yJHn37NF6vjrqHutASaX5LiH5npS9XPvrUmscd9MF5R4fuYRHOxQR1FfMIlF7AzwoPqw=="
+  "resolved" "https://registry.npmjs.org/p-pipe/-/p-pipe-3.1.0.tgz"
+  "version" "3.1.0"
+
+"p-retry@^4.5.0":
+  "integrity" "sha512-312Id396EbJdvRONlngUx0NydfrIQ5lsYu0znKVUzVvArzEIt08V1qhtyESbGVd1FGX7UKtiFp5uwKZdM8wIuQ=="
+  "resolved" "https://registry.npmjs.org/p-retry/-/p-retry-4.6.2.tgz"
+  "version" "4.6.2"
+  dependencies:
+    "@types/retry" "0.12.0"
+    "retry" "^0.13.1"
+
+"p-try@^2.0.0":
+  "integrity" "sha512-hMp0onDKIajHfIkdRk3P4CdCmErkYAxxDtP3Wx/4nZ3aGlau2VKh3mZpcuFkH27WQkL/3WBCPOktzA9ZOAnMQQ=="
+  "resolved" "https://registry.npmjs.org/p-try/-/p-try-2.0.0.tgz"
+  "version" "2.0.0"
+
+"pako@~1.0.5":
+  "integrity" "sha512-4hLB8Py4zZce5s4yd9XzopqwVv/yGNhV1Bl8NTmCq1763HeK2+EwVTv+leGeL13Dnh2wfbqowVPXCIO0z4taYw=="
+  "resolved" "https://registry.npmjs.org/pako/-/pako-1.0.11.tgz"
+  "version" "1.0.11"
+
+"param-case@^3.0.3":
+  "integrity" "sha512-RXlj7zCYokReqWpOPH9oYivUzLYZ5vAPIfEmCTNViosC78F8F0H9y7T7gG2M39ymgutxF5gcFEsyZQSph9Bp3A=="
+  "resolved" "https://registry.npmjs.org/param-case/-/param-case-3.0.4.tgz"
+  "version" "3.0.4"
+  dependencies:
+    "dot-case" "^3.0.4"
+    "tslib" "^2.0.3"
+
+"parent-module@^1.0.0":
+  "integrity" "sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g=="
+  "resolved" "https://registry.npmjs.org/parent-module/-/parent-module-1.0.1.tgz"
+  "version" "1.0.1"
   dependencies:
-    inherits "^2.0.3"
-    readable-stream "^2.3.6"
-
-follow-redirects@^1.0.0, follow-redirects@^1.14.0:
-  version "1.15.2"
-  resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.15.2.tgz#b460864144ba63f2681096f274c4e57026da2c13"
-  integrity sha512-VQLG33o04KaQ8uYi2tVNbdrWp1QWxNNea+nmIB4EVM28v0hmP17z7aG1+wAkNzVq4KeXTq3221ye5qTJP91JwA==
-
-for-in@^0.1.3:
-  version "0.1.8"
-  resolved "https://registry.yarnpkg.com/for-in/-/for-in-0.1.8.tgz#d8773908e31256109952b1fdb9b3fa867d2775e1"
-
-for-in@^1.0.1, for-in@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/for-in/-/for-in-1.0.2.tgz#81068d295a8142ec0ac726c6e2200c30fb6d5e80"
-  integrity sha1-gQaNKVqBQuwKxybG4iAMMPttXoA=
-
-for-own@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/for-own/-/for-own-1.0.0.tgz#c63332f415cedc4b04dbfe70cf836494c53cb44b"
-  dependencies:
-    for-in "^1.0.1"
-
-forwarded@0.2.0:
-  version "0.2.0"
-  resolved "https://registry.yarnpkg.com/forwarded/-/forwarded-0.2.0.tgz#2269936428aad4c15c7ebe9779a84bf0b2a81811"
-  integrity sha512-buRG0fpBtRHSTCOASe6hD258tEubFoRLb4ZNA6NxMVHNw2gOcwHo9wyablzMzOA5z9xA9L1KNjk/Nt6MT9aYow==
-
-fragment-cache@^0.2.1:
-  version "0.2.1"
-  resolved "https://registry.yarnpkg.com/fragment-cache/-/fragment-cache-0.2.1.tgz#4290fad27f13e89be7f33799c6bc5a0abfff0d19"
-  dependencies:
-    map-cache "^0.2.2"
-
-fresh@0.5.2:
-  version "0.5.2"
-  resolved "https://registry.yarnpkg.com/fresh/-/fresh-0.5.2.tgz#3d8cadd90d976569fa835ab1f8e4b23a105605a7"
-  integrity sha512-zJ2mQYM18rEFOudeV4GShTGIQ7RbzA7ozbU9I/XBpm7kqgMywgmylMwXHxZJmkVoYkna9d2pVXVXPdYTP9ej8Q==
-
-friendly-errors-webpack-plugin@^1.6.1:
-  version "1.7.0"
-  resolved "https://registry.yarnpkg.com/friendly-errors-webpack-plugin/-/friendly-errors-webpack-plugin-1.7.0.tgz#efc86cbb816224565861a1be7a9d84d0aafea136"
-  dependencies:
-    chalk "^1.1.3"
-    error-stack-parser "^2.0.0"
-    string-width "^2.0.0"
-
-from2@^2.1.0:
-  version "2.3.0"
-  resolved "https://registry.yarnpkg.com/from2/-/from2-2.3.0.tgz#8bfb5502bde4a4d36cfdeea007fcca21d7e382af"
-  dependencies:
-    inherits "^2.0.1"
-    readable-stream "^2.0.0"
-
-fs-extra@^7.0.1:
-  version "7.0.1"
-  resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-7.0.1.tgz#4f189c44aa123b895f722804f55ea23eadc348e9"
-  dependencies:
-    graceful-fs "^4.1.2"
-    jsonfile "^4.0.0"
-    universalify "^0.1.0"
-
-fs-minipass@^1.2.5:
-  version "1.2.5"
-  resolved "https://registry.yarnpkg.com/fs-minipass/-/fs-minipass-1.2.5.tgz#06c277218454ec288df77ada54a03b8702aacb9d"
-  dependencies:
-    minipass "^2.2.1"
-
-fs-write-stream-atomic@^1.0.8:
-  version "1.0.10"
-  resolved "https://registry.yarnpkg.com/fs-write-stream-atomic/-/fs-write-stream-atomic-1.0.10.tgz#b47df53493ef911df75731e70a9ded0189db40c9"
-  dependencies:
-    graceful-fs "^4.1.2"
-    iferr "^0.1.5"
-    imurmurhash "^0.1.4"
-    readable-stream "1 || 2"
-
-fs.realpath@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f"
-
-fsevents@^1.2.7:
-  version "1.2.7"
-  resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-1.2.7.tgz#4851b664a3783e52003b3c66eb0eee1074933aa4"
-  dependencies:
-    nan "^2.9.2"
-    node-pre-gyp "^0.10.0"
-
-function-bind@^1.1.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/function-bind/-/function-bind-1.1.1.tgz#a56899d3ea3c9bab874bb9773b7c5ede92f4895d"
-  integrity sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==
-
-gauge@~2.7.3:
-  version "2.7.4"
-  resolved "https://registry.yarnpkg.com/gauge/-/gauge-2.7.4.tgz#2c03405c7538c39d7eb37b317022e325fb018bf7"
-  dependencies:
-    aproba "^1.0.3"
-    console-control-strings "^1.0.0"
-    has-unicode "^2.0.0"
-    object-assign "^4.1.0"
-    signal-exit "^3.0.0"
-    string-width "^1.0.1"
-    strip-ansi "^3.0.1"
-    wide-align "^1.1.0"
-
-get-caller-file@^1.0.1:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-1.0.3.tgz#f978fa4c90d1dfe7ff2d6beda2a515e713bdcf4a"
-
-get-intrinsic@^1.0.2:
-  version "1.1.3"
-  resolved "https://registry.yarnpkg.com/get-intrinsic/-/get-intrinsic-1.1.3.tgz#063c84329ad93e83893c7f4f243ef63ffa351385"
-  integrity sha512-QJVz1Tj7MS099PevUG5jvnt9tSkXN8K14dxQlikJuPt4uD9hHAHjLyLBiLR5zELelBdD9QNRAXZzsJx0WaDL9A==
-  dependencies:
-    function-bind "^1.1.1"
-    has "^1.0.3"
-    has-symbols "^1.0.3"
-
-get-stream@^4.0.0:
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-4.1.0.tgz#c1b255575f3dc21d59bfc79cd3d2b46b1c3a54b5"
-  dependencies:
-    pump "^3.0.0"
-
-get-value@^2.0.3, get-value@^2.0.6:
-  version "2.0.6"
-  resolved "https://registry.yarnpkg.com/get-value/-/get-value-2.0.6.tgz#dc15ca1c672387ca76bd37ac0a395ba2042a2c28"
-
-glob-parent@^3.1.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-3.1.0.tgz#9e6af6299d8d3bd2bd40430832bd113df906c5ae"
-  dependencies:
-    is-glob "^3.1.0"
-    path-dirname "^1.0.0"
-
-glob-to-regexp@^0.3.0:
-  version "0.3.0"
-  resolved "https://registry.yarnpkg.com/glob-to-regexp/-/glob-to-regexp-0.3.0.tgz#8c5a1494d2066c570cc3bfe4496175acc4d502ab"
-
-glob@^7.0.3, glob@^7.1.1, glob@^7.1.2, glob@^7.1.3:
-  version "7.1.3"
-  resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.3.tgz#3960832d3f1574108342dafd3a67b332c0969df1"
-  dependencies:
-    fs.realpath "^1.0.0"
-    inflight "^1.0.4"
-    inherits "2"
-    minimatch "^3.0.4"
-    once "^1.3.0"
-    path-is-absolute "^1.0.0"
-
-global-modules@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/global-modules/-/global-modules-1.0.0.tgz#6d770f0eb523ac78164d72b5e71a8877265cc3ea"
-  dependencies:
-    global-prefix "^1.0.1"
-    is-windows "^1.0.1"
-    resolve-dir "^1.0.0"
-
-global-prefix@^1.0.1:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/global-prefix/-/global-prefix-1.0.2.tgz#dbf743c6c14992593c655568cb66ed32c0122ebe"
-  dependencies:
-    expand-tilde "^2.0.2"
-    homedir-polyfill "^1.0.1"
-    ini "^1.3.4"
-    is-windows "^1.0.1"
-    which "^1.2.14"
-
-globals@^11.1.0:
-  version "11.11.0"
-  resolved "https://registry.yarnpkg.com/globals/-/globals-11.11.0.tgz#dcf93757fa2de5486fbeed7118538adf789e9c2e"
-
-globby@^6.1.0:
-  version "6.1.0"
-  resolved "https://registry.yarnpkg.com/globby/-/globby-6.1.0.tgz#f5a6d70e8395e21c858fb0489d64df02424d506c"
-  dependencies:
-    array-union "^1.0.1"
-    glob "^7.0.3"
-    object-assign "^4.0.1"
-    pify "^2.0.0"
-    pinkie-promise "^2.0.0"
-
-globby@^8.0.1:
-  version "8.0.2"
-  resolved "https://registry.yarnpkg.com/globby/-/globby-8.0.2.tgz#5697619ccd95c5275dbb2d6faa42087c1a941d8d"
-  dependencies:
-    array-union "^1.0.1"
-    dir-glob "2.0.0"
-    fast-glob "^2.0.2"
-    glob "^7.1.2"
-    ignore "^3.3.5"
-    pify "^3.0.0"
-    slash "^1.0.0"
-
-globs@^0.1.2:
-  version "0.1.4"
-  resolved "https://registry.yarnpkg.com/globs/-/globs-0.1.4.tgz#1d13639f6174e4ae73a7f936da7d9a079f657c1c"
-  dependencies:
-    glob "^7.1.1"
-
-graceful-fs@^4.1.11, graceful-fs@^4.1.15, graceful-fs@^4.1.2, graceful-fs@^4.1.6:
-  version "4.1.15"
-  resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.1.15.tgz#ffb703e1066e8a0eeaa4c8b80ba9253eeefbfb00"
-
-growly@^1.3.0:
-  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/growly/-/growly-1.3.0.tgz#f10748cbe76af964b7c96c93c6bcc28af120c081"
-
-handle-thing@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/handle-thing/-/handle-thing-2.0.0.tgz#0e039695ff50c93fc288557d696f3c1dc6776754"
-
-has-ansi@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/has-ansi/-/has-ansi-2.0.0.tgz#34f5049ce1ecdf2b0649af3ef24e45ed35416d91"
+    "callsites" "^3.0.0"
+
+"parse-asn1@^5.0.0", "parse-asn1@^5.1.6":
+  "integrity" "sha512-RnZRo1EPU6JBnra2vGHj0yhp6ebyjBZpmUCLHWiFhxlzvBCCpAuZ7elsBp1PVAbQN0/04VD/19rfzlBSwLstMw=="
+  "resolved" "https://registry.npmjs.org/parse-asn1/-/parse-asn1-5.1.6.tgz"
+  "version" "5.1.6"
+  dependencies:
+    "asn1.js" "^5.2.0"
+    "browserify-aes" "^1.0.0"
+    "evp_bytestokey" "^1.0.0"
+    "pbkdf2" "^3.0.3"
+    "safe-buffer" "^5.1.1"
+
+"parse-json@^5.0.0":
+  "integrity" "sha512-ayCKvm/phCGxOkYRSCM82iDwct8/EonSEgCSxWxD7ve6jHggsFl4fZVQBPRNgQoKiuV/odhFrGzQXZwbifC8Rg=="
+  "resolved" "https://registry.npmjs.org/parse-json/-/parse-json-5.2.0.tgz"
+  "version" "5.2.0"
   dependencies:
-    ansi-regex "^2.0.0"
-
-has-flag@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-3.0.0.tgz#b5d454dc2199ae225699f3467e5a07f3b955bafd"
+    "@babel/code-frame" "^7.0.0"
+    "error-ex" "^1.3.1"
+    "json-parse-even-better-errors" "^2.3.0"
+    "lines-and-columns" "^1.1.6"
+
+"parseurl@~1.3.2", "parseurl@~1.3.3":
+  "integrity" "sha512-CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ=="
+  "resolved" "https://registry.npmjs.org/parseurl/-/parseurl-1.3.3.tgz"
+  "version" "1.3.3"
+
+"pascal-case@^3.1.2":
+  "integrity" "sha512-uWlGT3YSnK9x3BQJaOdcZwrnV6hPpd8jFH1/ucpiLRPh/2zCVJKS19E4GvYHvaCcACn3foXZ0cLB9Wrx1KGe5g=="
+  "resolved" "https://registry.npmjs.org/pascal-case/-/pascal-case-3.1.2.tgz"
+  "version" "3.1.2"
+  dependencies:
+    "no-case" "^3.0.4"
+    "tslib" "^2.0.3"
+
+"path-browserify@0.0.1":
+  "integrity" "sha512-BapA40NHICOS+USX9SN4tyhq+A2RrN/Ws5F0Z5aMHDp98Fl86lX8Oti8B7uN93L4Ifv4fHOEA+pQw87gmMO/lQ=="
+  "resolved" "https://registry.npmjs.org/path-browserify/-/path-browserify-0.0.1.tgz"
+  "version" "0.0.1"
+
+"path-exists@^4.0.0":
+  "integrity" "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w=="
+  "resolved" "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz"
+  "version" "4.0.0"
+
+"path-is-absolute@^1.0.0":
+  "integrity" "sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg=="
+  "resolved" "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz"
+  "version" "1.0.1"
+
+"path-key@^3.0.0", "path-key@^3.1.0":
+  "integrity" "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q=="
+  "resolved" "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz"
+  "version" "3.1.1"
+
+"path-parse@^1.0.7":
+  "integrity" "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw=="
+  "resolved" "https://registry.npmjs.org/path-parse/-/path-parse-1.0.7.tgz"
+  "version" "1.0.7"
+
+"path-to-regexp@0.1.7":
+  "integrity" "sha512-5DFkuoqlv1uYQKxy8omFBeJPQcdoE07Kv2sferDCrAq1ohOU+MSDswDIbnx3YAM60qIOnYa53wBhXW0EbMonrQ=="
+  "resolved" "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.7.tgz"
+  "version" "0.1.7"
+
+"path-type@^4.0.0":
+  "integrity" "sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw=="
+  "resolved" "https://registry.npmjs.org/path-type/-/path-type-4.0.0.tgz"
+  "version" "4.0.0"
+
+"pbkdf2@^3.0.3":
+  "integrity" "sha512-iuh7L6jA7JEGu2WxDwtQP1ddOpaJNC4KlDEFfdQajSGgGPNi4OyDc2R7QnbY2bR9QjBVGwgvTdNJZoE7RaxUMA=="
+  "resolved" "https://registry.npmjs.org/pbkdf2/-/pbkdf2-3.1.2.tgz"
+  "version" "3.1.2"
+  dependencies:
+    "create-hash" "^1.1.2"
+    "create-hmac" "^1.1.4"
+    "ripemd160" "^2.0.1"
+    "safe-buffer" "^5.0.1"
+    "sha.js" "^2.4.8"
+
+"php-parser@^3.1.5", "php-parser@3.1.5":
+  "integrity" "sha512-jEY2DcbgCm5aclzBdfW86GM6VEIWcSlhTBSHN1qhJguVePlYe28GhwS0yoeLYXpM2K8y6wzLwrbq814n2PHSoQ=="
+  "resolved" "https://registry.npmjs.org/php-parser/-/php-parser-3.1.5.tgz"
+  "version" "3.1.5"
+
+"picocolors@^1.0.0":
+  "integrity" "sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ=="
+  "resolved" "https://registry.npmjs.org/picocolors/-/picocolors-1.0.0.tgz"
+  "version" "1.0.0"
+
+"picomatch@^2.0.4", "picomatch@^2.2.1", "picomatch@^2.3.1":
+  "integrity" "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA=="
+  "resolved" "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz"
+  "version" "2.3.1"
+
+"pify@^2.3.0":
+  "integrity" "sha512-udgsAY+fTnvv7kI7aaxbqwWNb0AHiB0qBO89PZKPkoTmGOgdbrHDKD+0B2X4uTfJ/FT1R09r9gTsjUjNJotuog=="
+  "resolved" "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz"
+  "version" "2.3.0"
+
+"pirates@^4.0.1":
+  "integrity" "sha512-saLsH7WeYYPiD25LDuLRRY/i+6HaPYr6G1OUlN39otzkSTxKnubR9RTxS3/Kk50s1g2JTgFwWQDQyplC5/SHZg=="
+  "resolved" "https://registry.npmjs.org/pirates/-/pirates-4.0.6.tgz"
+  "version" "4.0.6"
+
+"pkg-dir@^4.1.0", "pkg-dir@^4.2.0":
+  "integrity" "sha512-HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ=="
+  "resolved" "https://registry.npmjs.org/pkg-dir/-/pkg-dir-4.2.0.tgz"
+  "version" "4.2.0"
+  dependencies:
+    "find-up" "^4.0.0"
+
+"popper.js@^1.16", "popper.js@^1.16.1":
+  "integrity" "sha512-Wb4p1J4zyFTbM+u6WuO4XstYx4Ky9Cewe4DWrel7B0w6VVICvPwdOpotjzcf6eD8TsckVnIMNONQyPIUFOUbCQ=="
+  "resolved" "https://registry.npmjs.org/popper.js/-/popper.js-1.16.1.tgz"
+  "version" "1.16.1"
+
+"postcss-calc@^8.2.3":
+  "integrity" "sha512-SmWMSJmB8MRnnULldx0lQIyhSNvuDl9HfrZkaqqE/WHAhToYsAvDq+yAsA/kIyINDszOp3Rh0GFoNuH5Ypsm3Q=="
+  "resolved" "https://registry.npmjs.org/postcss-calc/-/postcss-calc-8.2.4.tgz"
+  "version" "8.2.4"
+  dependencies:
+    "postcss-selector-parser" "^6.0.9"
+    "postcss-value-parser" "^4.2.0"
+
+"postcss-colormin@^5.3.1":
+  "integrity" "sha512-UsWQG0AqTFQmpBegeLLc1+c3jIqBNB0zlDGRWR+dQ3pRKJL1oeMzyqmH3o2PIfn9MBdNrVPWhDbT769LxCTLJQ=="
+  "resolved" "https://registry.npmjs.org/postcss-colormin/-/postcss-colormin-5.3.1.tgz"
+  "version" "5.3.1"
+  dependencies:
+    "browserslist" "^4.21.4"
+    "caniuse-api" "^3.0.0"
+    "colord" "^2.9.1"
+    "postcss-value-parser" "^4.2.0"
+
+"postcss-convert-values@^5.1.3":
+  "integrity" "sha512-82pC1xkJZtcJEfiLw6UXnXVXScgtBrjlO5CBmuDQc+dlb88ZYheFsjTn40+zBVi3DkfF7iezO0nJUPLcJK3pvA=="
+  "resolved" "https://registry.npmjs.org/postcss-convert-values/-/postcss-convert-values-5.1.3.tgz"
+  "version" "5.1.3"
+  dependencies:
+    "browserslist" "^4.21.4"
+    "postcss-value-parser" "^4.2.0"
+
+"postcss-discard-comments@^5.1.2":
+  "integrity" "sha512-+L8208OVbHVF2UQf1iDmRcbdjJkuBF6IS29yBDSiWUIzpYaAhtNl6JYnYm12FnkeCwQqF5LeklOu6rAqgfBZqQ=="
+  "resolved" "https://registry.npmjs.org/postcss-discard-comments/-/postcss-discard-comments-5.1.2.tgz"
+  "version" "5.1.2"
+
+"postcss-discard-duplicates@^5.1.0":
+  "integrity" "sha512-zmX3IoSI2aoenxHV6C7plngHWWhUOV3sP1T8y2ifzxzbtnuhk1EdPwm0S1bIUNaJ2eNbWeGLEwzw8huPD67aQw=="
+  "resolved" "https://registry.npmjs.org/postcss-discard-duplicates/-/postcss-discard-duplicates-5.1.0.tgz"
+  "version" "5.1.0"
+
+"postcss-discard-empty@^5.1.1":
+  "integrity" "sha512-zPz4WljiSuLWsI0ir4Mcnr4qQQ5e1Ukc3i7UfE2XcrwKK2LIPIqE5jxMRxO6GbI3cv//ztXDsXwEWT3BHOGh3A=="
+  "resolved" "https://registry.npmjs.org/postcss-discard-empty/-/postcss-discard-empty-5.1.1.tgz"
+  "version" "5.1.1"
+
+"postcss-discard-overridden@^5.1.0":
+  "integrity" "sha512-21nOL7RqWR1kasIVdKs8HNqQJhFxLsyRfAnUDm4Fe4t4mCWL9OJiHvlHPjcd8zc5Myu89b/7wZDnOSjFgeWRtw=="
+  "resolved" "https://registry.npmjs.org/postcss-discard-overridden/-/postcss-discard-overridden-5.1.0.tgz"
+  "version" "5.1.0"
+
+"postcss-import@^15.1.0":
+  "integrity" "sha512-hpr+J05B2FVYUAXHeK1YyI267J/dDDhMU6B6civm8hSY1jYJnBXxzKDKDswzJmtLHryrjhnDjqqp/49t8FALew=="
+  "resolved" "https://registry.npmjs.org/postcss-import/-/postcss-import-15.1.0.tgz"
+  "version" "15.1.0"
+  dependencies:
+    "postcss-value-parser" "^4.0.0"
+    "read-cache" "^1.0.0"
+    "resolve" "^1.1.7"
+
+"postcss-js@^4.0.1":
+  "integrity" "sha512-dDLF8pEO191hJMtlHFPRa8xsizHaM82MLfNkUHdUtVEV3tgTp5oj+8qbEqYM57SLfc74KSbw//4SeJma2LRVIw=="
+  "resolved" "https://registry.npmjs.org/postcss-js/-/postcss-js-4.0.1.tgz"
+  "version" "4.0.1"
+  dependencies:
+    "camelcase-css" "^2.0.1"
+
+"postcss-load-config@^3.1.0":
+  "integrity" "sha512-6DiM4E7v4coTE4uzA8U//WhtPwyhiim3eyjEMFCnUpzbrkK9wJHgKDT2mR+HbtSrd/NubVaYTOpSpjUl8NQeRg=="
+  "resolved" "https://registry.npmjs.org/postcss-load-config/-/postcss-load-config-3.1.4.tgz"
+  "version" "3.1.4"
+  dependencies:
+    "lilconfig" "^2.0.5"
+    "yaml" "^1.10.2"
+
+"postcss-load-config@^4.0.1":
+  "integrity" "sha512-vEJIc8RdiBRu3oRAI0ymerOn+7rPuMvRXslTvZUKZonDHFIczxztIyJ1urxM1x9JXEikvpWWTUUqal5j/8QgvA=="
+  "resolved" "https://registry.npmjs.org/postcss-load-config/-/postcss-load-config-4.0.1.tgz"
+  "version" "4.0.1"
+  dependencies:
+    "lilconfig" "^2.0.5"
+    "yaml" "^2.1.1"
+
+"postcss-loader@^6.2.0":
+  "integrity" "sha512-WbbYpmAaKcux/P66bZ40bpWsBucjx/TTgVVzRZ9yUO8yQfVBlameJ0ZGVaPfH64hNSBh63a+ICP5nqOpBA0w+Q=="
+  "resolved" "https://registry.npmjs.org/postcss-loader/-/postcss-loader-6.2.1.tgz"
+  "version" "6.2.1"
+  dependencies:
+    "cosmiconfig" "^7.0.0"
+    "klona" "^2.0.5"
+    "semver" "^7.3.5"
+
+"postcss-merge-longhand@^5.1.7":
+  "integrity" "sha512-YCI9gZB+PLNskrK0BB3/2OzPnGhPkBEwmwhfYk1ilBHYVAZB7/tkTHFBAnCrvBBOmeYyMYw3DMjT55SyxMBzjQ=="
+  "resolved" "https://registry.npmjs.org/postcss-merge-longhand/-/postcss-merge-longhand-5.1.7.tgz"
+  "version" "5.1.7"
+  dependencies:
+    "postcss-value-parser" "^4.2.0"
+    "stylehacks" "^5.1.1"
+
+"postcss-merge-rules@^5.1.4":
+  "integrity" "sha512-0R2IuYpgU93y9lhVbO/OylTtKMVcHb67zjWIfCiKR9rWL3GUk1677LAqD/BcHizukdZEjT8Ru3oHRoAYoJy44g=="
+  "resolved" "https://registry.npmjs.org/postcss-merge-rules/-/postcss-merge-rules-5.1.4.tgz"
+  "version" "5.1.4"
+  dependencies:
+    "browserslist" "^4.21.4"
+    "caniuse-api" "^3.0.0"
+    "cssnano-utils" "^3.1.0"
+    "postcss-selector-parser" "^6.0.5"
 
-has-symbols@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/has-symbols/-/has-symbols-1.0.0.tgz#ba1a8f1af2a0fc39650f5c850367704122063b44"
-
-has-symbols@^1.0.3:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/has-symbols/-/has-symbols-1.0.3.tgz#bb7b2c4349251dce87b125f7bdf874aa7c8b39f8"
-  integrity sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A==
-
-has-unicode@^2.0.0:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/has-unicode/-/has-unicode-2.0.1.tgz#e0e6fe6a28cf51138855e086d1691e771de2a8b9"
-
-has-value@^0.3.1:
-  version "0.3.1"
-  resolved "https://registry.yarnpkg.com/has-value/-/has-value-0.3.1.tgz#7b1f58bada62ca827ec0a2078025654845995e1f"
-  dependencies:
-    get-value "^2.0.3"
-    has-values "^0.1.4"
-    isobject "^2.0.0"
-
-has-value@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/has-value/-/has-value-1.0.0.tgz#18b281da585b1c5c51def24c930ed29a0be6b177"
-  dependencies:
-    get-value "^2.0.6"
-    has-values "^1.0.0"
-    isobject "^3.0.0"
-
-has-values@^0.1.4:
-  version "0.1.4"
-  resolved "https://registry.yarnpkg.com/has-values/-/has-values-0.1.4.tgz#6d61de95d91dfca9b9a02089ad384bff8f62b771"
-
-has-values@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/has-values/-/has-values-1.0.0.tgz#95b0b63fec2146619a6fe57fe75628d5a39efe4f"
-  dependencies:
-    is-number "^3.0.0"
-    kind-of "^4.0.0"
-
-has@^1.0.0, has@^1.0.1, has@^1.0.3:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/has/-/has-1.0.3.tgz#722d7cbfc1f6aa8241f16dd814e011e1f41e8796"
-  integrity sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==
-  dependencies:
-    function-bind "^1.1.1"
-
-hash-base@^3.0.0:
-  version "3.0.4"
-  resolved "https://registry.yarnpkg.com/hash-base/-/hash-base-3.0.4.tgz#5fc8686847ecd73499403319a6b0a3f3f6ae4918"
-  dependencies:
-    inherits "^2.0.1"
-    safe-buffer "^5.0.1"
-
-hash-sum@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/hash-sum/-/hash-sum-1.0.2.tgz#33b40777754c6432573c120cc3808bbd10d47f04"
-
-hash.js@^1.0.0, hash.js@^1.0.3:
-  version "1.1.7"
-  resolved "https://registry.yarnpkg.com/hash.js/-/hash.js-1.1.7.tgz#0babca538e8d4ee4a0f8988d68866537a003cf42"
-  integrity sha512-taOaskGt4z4SOANNseOviYDvjEJinIkRgmp7LbKP2YTTmVxWBl87s/uzK9r+44BclBSp2X7K1hqeNfz9JbBeXA==
-  dependencies:
-    inherits "^2.0.3"
-    minimalistic-assert "^1.0.1"
-
-he@1.2.x:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/he/-/he-1.2.0.tgz#84ae65fa7eafb165fddb61566ae14baf05664f0f"
-
-hex-color-regex@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/hex-color-regex/-/hex-color-regex-1.1.0.tgz#4c06fccb4602fe2602b3c93df82d7e7dbf1a8a8e"
-
-hmac-drbg@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/hmac-drbg/-/hmac-drbg-1.0.1.tgz#d2745701025a6c775a6c545793ed502fc0c649a1"
-  integrity sha1-0nRXAQJabHdabFRXk+1QL8DGSaE=
-  dependencies:
-    hash.js "^1.0.3"
-    minimalistic-assert "^1.0.0"
-    minimalistic-crypto-utils "^1.0.1"
-
-homedir-polyfill@^1.0.1:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/homedir-polyfill/-/homedir-polyfill-1.0.3.tgz#743298cef4e5af3e194161fbadcc2151d3a058e8"
-  dependencies:
-    parse-passwd "^1.0.0"
-
-hpack.js@^2.1.6:
-  version "2.1.6"
-  resolved "https://registry.yarnpkg.com/hpack.js/-/hpack.js-2.1.6.tgz#87774c0949e513f42e84575b3c45681fade2a0b2"
-  dependencies:
-    inherits "^2.0.1"
-    obuf "^1.0.0"
-    readable-stream "^2.0.1"
-    wbuf "^1.1.0"
-
-hsl-regex@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/hsl-regex/-/hsl-regex-1.0.0.tgz#d49330c789ed819e276a4c0d272dffa30b18fe6e"
-
-hsla-regex@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/hsla-regex/-/hsla-regex-1.0.0.tgz#c1ce7a3168c8c6614033a4b5f7877f3b225f9c38"
-
-html-comment-regex@^1.1.0:
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/html-comment-regex/-/html-comment-regex-1.1.2.tgz#97d4688aeb5c81886a364faa0cad1dda14d433a7"
-
-html-entities@^1.2.0:
-  version "1.2.1"
-  resolved "https://registry.yarnpkg.com/html-entities/-/html-entities-1.2.1.tgz#0df29351f0721163515dfb9e5543e5f6eed5162f"
-
-html-loader@^0.5.5:
-  version "0.5.5"
-  resolved "https://registry.yarnpkg.com/html-loader/-/html-loader-0.5.5.tgz#6356dbeb0c49756d8ebd5ca327f16ff06ab5faea"
-  dependencies:
-    es6-templates "^0.2.3"
-    fastparse "^1.1.1"
-    html-minifier "^3.5.8"
-    loader-utils "^1.1.0"
-    object-assign "^4.1.1"
+"postcss-minify-font-values@^5.1.0":
+  "integrity" "sha512-el3mYTgx13ZAPPirSVsHqFzl+BBBDrXvbySvPGFnQcTI4iNslrPaFq4muTkLZmKlGk4gyFAYUBMH30+HurREyA=="
+  "resolved" "https://registry.npmjs.org/postcss-minify-font-values/-/postcss-minify-font-values-5.1.0.tgz"
+  "version" "5.1.0"
+  dependencies:
+    "postcss-value-parser" "^4.2.0"
 
-html-minifier@^3.5.8:
-  version "3.5.21"
-  resolved "https://registry.yarnpkg.com/html-minifier/-/html-minifier-3.5.21.tgz#d0040e054730e354db008463593194015212d20c"
-  dependencies:
-    camel-case "3.0.x"
-    clean-css "4.2.x"
-    commander "2.17.x"
-    he "1.2.x"
-    param-case "2.1.x"
-    relateurl "0.2.x"
-    uglify-js "3.4.x"
-
-http-deceiver@^1.2.7:
-  version "1.2.7"
-  resolved "https://registry.yarnpkg.com/http-deceiver/-/http-deceiver-1.2.7.tgz#fa7168944ab9a519d337cb0bec7284dc3e723d87"
-
-http-errors@2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/http-errors/-/http-errors-2.0.0.tgz#b7774a1486ef73cf7667ac9ae0858c012c57b9d3"
-  integrity sha512-FtwrG/euBzaEjYeRqOgly7G0qviiXoJWnvEH2Z1plBdXgbyjv34pHTSb9zoeHMyDy33+DWy5Wt9Wo+TURtOYSQ==
+"postcss-minify-gradients@^5.1.1":
+  "integrity" "sha512-VGvXMTpCEo4qHTNSa9A0a3D+dxGFZCYwR6Jokk+/3oB6flu2/PnPXAh2x7x52EkY5xlIHLm+Le8tJxe/7TNhzw=="
+  "resolved" "https://registry.npmjs.org/postcss-minify-gradients/-/postcss-minify-gradients-5.1.1.tgz"
+  "version" "5.1.1"
   dependencies:
-    depd "2.0.0"
-    inherits "2.0.4"
-    setprototypeof "1.2.0"
-    statuses "2.0.1"
-    toidentifier "1.0.1"
+    "colord" "^2.9.1"
+    "cssnano-utils" "^3.1.0"
+    "postcss-value-parser" "^4.2.0"
 
-http-errors@~1.6.2:
-  version "1.6.3"
-  resolved "https://registry.yarnpkg.com/http-errors/-/http-errors-1.6.3.tgz#8b55680bb4be283a0b5bf4ea2e38580be1d9320d"
-  dependencies:
-    depd "~1.1.2"
-    inherits "2.0.3"
-    setprototypeof "1.1.0"
-    statuses ">= 1.4.0 < 2"
-
-http-parser-js@>=0.4.0:
-  version "0.5.0"
-  resolved "https://registry.yarnpkg.com/http-parser-js/-/http-parser-js-0.5.0.tgz#d65edbede84349d0dc30320815a15d39cc3cbbd8"
-
-http-proxy-middleware@^0.19.1:
-  version "0.19.1"
-  resolved "https://registry.yarnpkg.com/http-proxy-middleware/-/http-proxy-middleware-0.19.1.tgz#183c7dc4aa1479150306498c210cdaf96080a43a"
+"postcss-minify-params@^5.1.4":
+  "integrity" "sha512-+mePA3MgdmVmv6g+30rn57USjOGSAyuxUmkfiWpzalZ8aiBkdPYjXWtHuwJGm1v5Ojy0Z0LaSYhHaLJQB0P8Jw=="
+  "resolved" "https://registry.npmjs.org/postcss-minify-params/-/postcss-minify-params-5.1.4.tgz"
+  "version" "5.1.4"
   dependencies:
-    http-proxy "^1.17.0"
-    is-glob "^4.0.0"
-    lodash "^4.17.11"
-    micromatch "^3.1.10"
+    "browserslist" "^4.21.4"
+    "cssnano-utils" "^3.1.0"
+    "postcss-value-parser" "^4.2.0"
 
-http-proxy@^1.17.0:
-  version "1.18.1"
-  resolved "https://registry.yarnpkg.com/http-proxy/-/http-proxy-1.18.1.tgz#401541f0534884bbf95260334e72f88ee3976549"
-  integrity sha512-7mz/721AbnJwIVbnaSv1Cz3Am0ZLT/UBwkC92VlxhXv/k/BBQfM2fXElQNC27BVGr0uwUpplYPQM9LnaBMR5NQ==
+"postcss-minify-selectors@^5.2.1":
+  "integrity" "sha512-nPJu7OjZJTsVUmPdm2TcaiohIwxP+v8ha9NehQ2ye9szv4orirRU3SDdtUmKH+10nzn0bAyOXZ0UEr7OpvLehg=="
+  "resolved" "https://registry.npmjs.org/postcss-minify-selectors/-/postcss-minify-selectors-5.2.1.tgz"
+  "version" "5.2.1"
   dependencies:
-    eventemitter3 "^4.0.0"
-    follow-redirects "^1.0.0"
-    requires-port "^1.0.0"
+    "postcss-selector-parser" "^6.0.5"
 
-https-browserify@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/https-browserify/-/https-browserify-1.0.0.tgz#ec06c10e0a34c0f2faf199f7fd7fc78fffd03c73"
+"postcss-modules-extract-imports@^3.0.0":
+  "integrity" "sha512-bdHleFnP3kZ4NYDhuGlVK+CMrQ/pqUm8bx/oGL93K6gVwiclvX5x0n76fYMKuIGKzlABOy13zsvqjb0f92TEXw=="
+  "resolved" "https://registry.npmjs.org/postcss-modules-extract-imports/-/postcss-modules-extract-imports-3.0.0.tgz"
+  "version" "3.0.0"
 
-iconv-lite@0.4.24:
-  version "0.4.24"
-  resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.24.tgz#2022b4b25fbddc21d2f524974a474aafe733908b"
-  integrity sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==
+"postcss-modules-local-by-default@^4.0.0":
+  "integrity" "sha512-2/u2zraspoACtrbFRnTijMiQtb4GW4BvatjaG/bCjYQo8kLTdevCUlwuBHx2sCnSyrI3x3qj4ZK1j5LQBgzmwA=="
+  "resolved" "https://registry.npmjs.org/postcss-modules-local-by-default/-/postcss-modules-local-by-default-4.0.3.tgz"
+  "version" "4.0.3"
   dependencies:
-    safer-buffer ">= 2.1.2 < 3"
+    "icss-utils" "^5.0.0"
+    "postcss-selector-parser" "^6.0.2"
+    "postcss-value-parser" "^4.1.0"
 
-iconv-lite@^0.4.4:
-  version "0.4.23"
-  resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.23.tgz#297871f63be507adcfbfca715d0cd0eed84e9a63"
+"postcss-modules-scope@^3.0.0":
+  "integrity" "sha512-hncihwFA2yPath8oZ15PZqvWGkWf+XUfQgUGamS4LqoP1anQLOsOJw0vr7J7IwLpoY9fatA2qiGUGmuZL0Iqlg=="
+  "resolved" "https://registry.npmjs.org/postcss-modules-scope/-/postcss-modules-scope-3.0.0.tgz"
+  "version" "3.0.0"
   dependencies:
-    safer-buffer ">= 2.1.2 < 3"
-
-icss-replace-symbols@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/icss-replace-symbols/-/icss-replace-symbols-1.1.0.tgz#06ea6f83679a7749e386cfe1fe812ae5db223ded"
+    "postcss-selector-parser" "^6.0.4"
 
-icss-utils@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/icss-utils/-/icss-utils-2.1.0.tgz#83f0a0ec378bf3246178b6c2ad9136f135b1c962"
+"postcss-modules-values@^4.0.0":
+  "integrity" "sha512-RDxHkAiEGI78gS2ofyvCsu7iycRv7oqw5xMWn9iMoR0N/7mf9D50ecQqUo5BZ9Zh2vH4bCUR/ktCqbB9m8vJjQ=="
+  "resolved" "https://registry.npmjs.org/postcss-modules-values/-/postcss-modules-values-4.0.0.tgz"
+  "version" "4.0.0"
   dependencies:
-    postcss "^6.0.1"
+    "icss-utils" "^5.0.0"
 
-ieee754@^1.1.4:
-  version "1.1.12"
-  resolved "https://registry.yarnpkg.com/ieee754/-/ieee754-1.1.12.tgz#50bf24e5b9c8bb98af4964c941cdb0918da7b60b"
-
-iferr@^0.1.5:
-  version "0.1.5"
-  resolved "https://registry.yarnpkg.com/iferr/-/iferr-0.1.5.tgz#c60eed69e6d8fdb6b3104a1fcbca1c192dc5b501"
-
-ignore-walk@^3.0.1:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/ignore-walk/-/ignore-walk-3.0.1.tgz#a83e62e7d272ac0e3b551aaa82831a19b69f82f8"
+"postcss-nested@^6.0.1":
+  "integrity" "sha512-mEp4xPMi5bSWiMbsgoPfcP74lsWLHkQbZc3sY+jWYd65CUwXrUaTp0fmNpa01ZcETKlIgUdFN/MpS2xZtqL9dQ=="
+  "resolved" "https://registry.npmjs.org/postcss-nested/-/postcss-nested-6.0.1.tgz"
+  "version" "6.0.1"
   dependencies:
-    minimatch "^3.0.4"
+    "postcss-selector-parser" "^6.0.11"
 
-ignore@^3.3.5:
-  version "3.3.10"
-  resolved "https://registry.yarnpkg.com/ignore/-/ignore-3.3.10.tgz#0a97fb876986e8081c631160f8f9f389157f0043"
-
-imagemin@^6.0.0:
-  version "6.1.0"
-  resolved "https://registry.yarnpkg.com/imagemin/-/imagemin-6.1.0.tgz#62508b465728fea36c03cdc07d915fe2d8cf9e13"
-  dependencies:
-    file-type "^10.7.0"
-    globby "^8.0.1"
-    make-dir "^1.0.0"
-    p-pipe "^1.1.0"
-    pify "^4.0.1"
-    replace-ext "^1.0.0"
+"postcss-normalize-charset@^5.1.0":
+  "integrity" "sha512-mSgUJ+pd/ldRGVx26p2wz9dNZ7ji6Pn8VWBajMXFf8jk7vUoSrZ2lt/wZR7DtlZYKesmZI680qjr2CeFF2fbUg=="
+  "resolved" "https://registry.npmjs.org/postcss-normalize-charset/-/postcss-normalize-charset-5.1.0.tgz"
+  "version" "5.1.0"
 
-img-loader@^3.0.0:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/img-loader/-/img-loader-3.0.1.tgz#c279691c0a9e6b94fa7d8318d2a6596d98bcee78"
+"postcss-normalize-display-values@^5.1.0":
+  "integrity" "sha512-WP4KIM4o2dazQXWmFaqMmcvsKmhdINFblgSeRgn8BJ6vxaMyaJkwAzpPpuvSIoG/rmX3M+IrRZEz2H0glrQNEA=="
+  "resolved" "https://registry.npmjs.org/postcss-normalize-display-values/-/postcss-normalize-display-values-5.1.0.tgz"
+  "version" "5.1.0"
   dependencies:
-    loader-utils "^1.1.0"
+    "postcss-value-parser" "^4.2.0"
 
-import-cwd@^2.0.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/import-cwd/-/import-cwd-2.1.0.tgz#aa6cf36e722761285cb371ec6519f53e2435b0a9"
+"postcss-normalize-positions@^5.1.1":
+  "integrity" "sha512-6UpCb0G4eofTCQLFVuI3EVNZzBNPiIKcA1AKVka+31fTVySphr3VUgAIULBhxZkKgwLImhzMR2Bw1ORK+37INg=="
+  "resolved" "https://registry.npmjs.org/postcss-normalize-positions/-/postcss-normalize-positions-5.1.1.tgz"
+  "version" "5.1.1"
   dependencies:
-    import-from "^2.1.0"
+    "postcss-value-parser" "^4.2.0"
 
-import-fresh@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/import-fresh/-/import-fresh-2.0.0.tgz#d81355c15612d386c61f9ddd3922d4304822a546"
+"postcss-normalize-repeat-style@^5.1.1":
+  "integrity" "sha512-mFpLspGWkQtBcWIRFLmewo8aC3ImN2i/J3v8YCFUwDnPu3Xz4rLohDO26lGjwNsQxB3YF0KKRwspGzE2JEuS0g=="
+  "resolved" "https://registry.npmjs.org/postcss-normalize-repeat-style/-/postcss-normalize-repeat-style-5.1.1.tgz"
+  "version" "5.1.1"
   dependencies:
-    caller-path "^2.0.0"
-    resolve-from "^3.0.0"
+    "postcss-value-parser" "^4.2.0"
 
-import-from@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/import-from/-/import-from-2.1.0.tgz#335db7f2a7affd53aaa471d4b8021dee36b7f3b1"
+"postcss-normalize-string@^5.1.0":
+  "integrity" "sha512-oYiIJOf4T9T1N4i+abeIc7Vgm/xPCGih4bZz5Nm0/ARVJ7K6xrDlLwvwqOydvyL3RHNf8qZk6vo3aatiw/go3w=="
+  "resolved" "https://registry.npmjs.org/postcss-normalize-string/-/postcss-normalize-string-5.1.0.tgz"
+  "version" "5.1.0"
   dependencies:
-    resolve-from "^3.0.0"
+    "postcss-value-parser" "^4.2.0"
 
-import-local@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/import-local/-/import-local-2.0.0.tgz#55070be38a5993cf18ef6db7e961f5bee5c5a09d"
+"postcss-normalize-timing-functions@^5.1.0":
+  "integrity" "sha512-DOEkzJ4SAXv5xkHl0Wa9cZLF3WCBhF3o1SKVxKQAa+0pYKlueTpCgvkFAHfk+Y64ezX9+nITGrDZeVGgITJXjg=="
+  "resolved" "https://registry.npmjs.org/postcss-normalize-timing-functions/-/postcss-normalize-timing-functions-5.1.0.tgz"
+  "version" "5.1.0"
   dependencies:
-    pkg-dir "^3.0.0"
-    resolve-cwd "^2.0.0"
+    "postcss-value-parser" "^4.2.0"
 
-imurmurhash@^0.1.4:
-  version "0.1.4"
-  resolved "https://registry.yarnpkg.com/imurmurhash/-/imurmurhash-0.1.4.tgz#9218b9b2b928a238b13dc4fb6b6d576f231453ea"
-
-indexes-of@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/indexes-of/-/indexes-of-1.0.1.tgz#f30f716c8e2bd346c7b67d3df3915566a7c05607"
-
-indexof@0.0.1:
-  version "0.0.1"
-  resolved "https://registry.yarnpkg.com/indexof/-/indexof-0.0.1.tgz#82dc336d232b9062179d05ab3293a66059fd435d"
-
-inflight@^1.0.4:
-  version "1.0.6"
-  resolved "https://registry.yarnpkg.com/inflight/-/inflight-1.0.6.tgz#49bd6331d7d02d0c09bc910a1075ba8165b56df9"
+"postcss-normalize-unicode@^5.1.1":
+  "integrity" "sha512-qnCL5jzkNUmKVhZoENp1mJiGNPcsJCs1aaRmURmeJGES23Z/ajaln+EPTD+rBeNkSryI+2WTdW+lwcVdOikrpA=="
+  "resolved" "https://registry.npmjs.org/postcss-normalize-unicode/-/postcss-normalize-unicode-5.1.1.tgz"
+  "version" "5.1.1"
   dependencies:
-    once "^1.3.0"
-    wrappy "1"
-
-inherits@2, inherits@2.0.4, inherits@^2.0.1, inherits@^2.0.3, inherits@^2.0.4, inherits@~2.0.1, inherits@~2.0.3:
-  version "2.0.4"
-  resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.4.tgz#0fa2c64f932917c3433a0ded55363aae37416b7c"
-  integrity sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==
+    "browserslist" "^4.21.4"
+    "postcss-value-parser" "^4.2.0"
 
-inherits@2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.1.tgz#b17d08d326b4423e568eff719f91b0b1cbdf69f1"
-
-inherits@2.0.3:
-  version "2.0.3"
-  resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.3.tgz#633c2c83e3da42a502f52466022480f4208261de"
-
-ini@^1.3.4, ini@~1.3.0:
-  version "1.3.8"
-  resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.8.tgz#a29da425b48806f34767a4efce397269af28432c"
-  integrity sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew==
-
-internal-ip@^4.2.0:
-  version "4.2.0"
-  resolved "https://registry.yarnpkg.com/internal-ip/-/internal-ip-4.2.0.tgz#46e81b638d84c338e5c67e42b1a17db67d0814fa"
+"postcss-normalize-url@^5.1.0":
+  "integrity" "sha512-5upGeDO+PVthOxSmds43ZeMeZfKH+/DKgGRD7TElkkyS46JXAUhMzIKiCa7BabPeIy3AQcTkXwVVN7DbqsiCew=="
+  "resolved" "https://registry.npmjs.org/postcss-normalize-url/-/postcss-normalize-url-5.1.0.tgz"
+  "version" "5.1.0"
   dependencies:
-    default-gateway "^4.0.1"
-    ipaddr.js "^1.9.0"
-
-interpret@^1.1.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/interpret/-/interpret-1.2.0.tgz#d5061a6224be58e8083985f5014d844359576296"
+    "normalize-url" "^6.0.1"
+    "postcss-value-parser" "^4.2.0"
 
-invariant@^2.2.2:
-  version "2.2.4"
-  resolved "https://registry.yarnpkg.com/invariant/-/invariant-2.2.4.tgz#610f3c92c9359ce1db616e538008d23ff35158e6"
+"postcss-normalize-whitespace@^5.1.1":
+  "integrity" "sha512-83ZJ4t3NUDETIHTa3uEg6asWjSBYL5EdkVB0sDncx9ERzOKBVJIUeDO9RyA9Zwtig8El1d79HBp0JEi8wvGQnA=="
+  "resolved" "https://registry.npmjs.org/postcss-normalize-whitespace/-/postcss-normalize-whitespace-5.1.1.tgz"
+  "version" "5.1.1"
   dependencies:
-    loose-envify "^1.0.0"
-
-invert-kv@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/invert-kv/-/invert-kv-2.0.0.tgz#7393f5afa59ec9ff5f67a27620d11c226e3eec02"
-
-ip-regex@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/ip-regex/-/ip-regex-2.1.0.tgz#fa78bf5d2e6913c911ce9f819ee5146bb6d844e9"
-
-ip@^1.1.0, ip@^1.1.5:
-  version "1.1.5"
-  resolved "https://registry.yarnpkg.com/ip/-/ip-1.1.5.tgz#bdded70114290828c0a039e72ef25f5aaec4354a"
-
-ipaddr.js@1.9.1:
-  version "1.9.1"
-  resolved "https://registry.yarnpkg.com/ipaddr.js/-/ipaddr.js-1.9.1.tgz#bff38543eeb8984825079ff3a2a8e6cbd46781b3"
-  integrity sha512-0KI/607xoxSToH7GjN1FfSbLoU0+btTicjsQSWQlh/hZykN8KpmMf7uYwPW3R+akZ6R/w18ZlXSHBYXiYUPO3g==
+    "postcss-value-parser" "^4.2.0"
 
-ipaddr.js@^1.9.0:
-  version "1.9.0"
-  resolved "https://registry.yarnpkg.com/ipaddr.js/-/ipaddr.js-1.9.0.tgz#37df74e430a0e47550fe54a2defe30d8acd95f65"
-
-is-absolute-url@^2.0.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/is-absolute-url/-/is-absolute-url-2.1.0.tgz#50530dfb84fcc9aa7dbe7852e83a37b93b9f2aa6"
-
-is-accessor-descriptor@^0.1.6:
-  version "0.1.6"
-  resolved "https://registry.yarnpkg.com/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz#a9e12cb3ae8d876727eeef3843f8a0897b5c98d6"
+"postcss-ordered-values@^5.1.3":
+  "integrity" "sha512-9UO79VUhPwEkzbb3RNpqqghc6lcYej1aveQteWY+4POIwlqkYE21HKWaLDF6lWNuqCobEAyTovVhtI32Rbv2RQ=="
+  "resolved" "https://registry.npmjs.org/postcss-ordered-values/-/postcss-ordered-values-5.1.3.tgz"
+  "version" "5.1.3"
   dependencies:
-    kind-of "^3.0.2"
+    "cssnano-utils" "^3.1.0"
+    "postcss-value-parser" "^4.2.0"
+
+"postcss-reduce-initial@^5.1.2":
+  "integrity" "sha512-dE/y2XRaqAi6OvjzD22pjTUQ8eOfc6m/natGHgKFBK9DxFmIm69YmaRVQrGgFlEfc1HePIurY0TmDeROK05rIg=="
+  "resolved" "https://registry.npmjs.org/postcss-reduce-initial/-/postcss-reduce-initial-5.1.2.tgz"
+  "version" "5.1.2"
+  dependencies:
+    "browserslist" "^4.21.4"
+    "caniuse-api" "^3.0.0"
 
-is-accessor-descriptor@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz#169c2f6d3df1f992618072365c9b0ea1f6878656"
+"postcss-reduce-transforms@^5.1.0":
+  "integrity" "sha512-2fbdbmgir5AvpW9RLtdONx1QoYG2/EtqpNQbFASDlixBbAYuTcJ0dECwlqNqH7VbaUnEnh8SrxOe2sRIn24XyQ=="
+  "resolved" "https://registry.npmjs.org/postcss-reduce-transforms/-/postcss-reduce-transforms-5.1.0.tgz"
+  "version" "5.1.0"
   dependencies:
-    kind-of "^6.0.0"
-
-is-arrayish@^0.2.1:
-  version "0.2.1"
-  resolved "https://registry.yarnpkg.com/is-arrayish/-/is-arrayish-0.2.1.tgz#77c99840527aa8ecb1a8ba697b80645a7a926a9d"
-
-is-arrayish@^0.3.1:
-  version "0.3.2"
-  resolved "https://registry.yarnpkg.com/is-arrayish/-/is-arrayish-0.3.2.tgz#4574a2ae56f7ab206896fb431eaeed066fdf8f03"
-
-is-binary-path@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/is-binary-path/-/is-binary-path-1.0.1.tgz#75f16642b480f187a711c814161fd3a4a7655898"
+    "postcss-value-parser" "^4.2.0"
+
+"postcss-selector-parser@^6.0.11", "postcss-selector-parser@^6.0.2", "postcss-selector-parser@^6.0.4", "postcss-selector-parser@^6.0.5", "postcss-selector-parser@^6.0.9":
+  "integrity" "sha512-EaV1Gl4mUEV4ddhDnv/xtj7sxwrwxdetHdWUGnT4VJQf+4d05v6lHYZr8N573k5Z0BViss7BDhfWtKS3+sfAqQ=="
+  "resolved" "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.0.13.tgz"
+  "version" "6.0.13"
   dependencies:
-    binary-extensions "^1.0.0"
-
-is-buffer@^1.1.5, is-buffer@~1.1.1:
-  version "1.1.6"
-  resolved "https://registry.yarnpkg.com/is-buffer/-/is-buffer-1.1.6.tgz#efaa2ea9daa0d7ab2ea13a97b2b8ad51fefbe8be"
-
-is-callable@^1.1.4:
-  version "1.1.4"
-  resolved "https://registry.yarnpkg.com/is-callable/-/is-callable-1.1.4.tgz#1e1adf219e1eeb684d691f9d6a05ff0d30a24d75"
-
-is-color-stop@^1.0.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/is-color-stop/-/is-color-stop-1.1.0.tgz#cfff471aee4dd5c9e158598fbe12967b5cdad345"
-  dependencies:
-    css-color-names "^0.0.4"
-    hex-color-regex "^1.1.0"
-    hsl-regex "^1.0.0"
-    hsla-regex "^1.0.0"
-    rgb-regex "^1.0.1"
-    rgba-regex "^1.0.0"
-
-is-data-descriptor@^0.1.4:
-  version "0.1.4"
-  resolved "https://registry.yarnpkg.com/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz#0b5ee648388e2c860282e793f1856fec3f301b56"
-  dependencies:
-    kind-of "^3.0.2"
-
-is-data-descriptor@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz#d84876321d0e7add03990406abbbbd36ba9268c7"
-  dependencies:
-    kind-of "^6.0.0"
-
-is-date-object@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/is-date-object/-/is-date-object-1.0.1.tgz#9aa20eb6aeebbff77fbd33e74ca01b33581d3a16"
-
-is-descriptor@^0.1.0:
-  version "0.1.6"
-  resolved "https://registry.yarnpkg.com/is-descriptor/-/is-descriptor-0.1.6.tgz#366d8240dde487ca51823b1ab9f07a10a78251ca"
-  dependencies:
-    is-accessor-descriptor "^0.1.6"
-    is-data-descriptor "^0.1.4"
-    kind-of "^5.0.0"
-
-is-descriptor@^1.0.0, is-descriptor@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/is-descriptor/-/is-descriptor-1.0.2.tgz#3b159746a66604b04f8c81524ba365c5f14d86ec"
-  dependencies:
-    is-accessor-descriptor "^1.0.0"
-    is-data-descriptor "^1.0.0"
-    kind-of "^6.0.2"
-
-is-directory@^0.3.1:
-  version "0.3.1"
-  resolved "https://registry.yarnpkg.com/is-directory/-/is-directory-0.3.1.tgz#61339b6f2475fc772fd9c9d83f5c8575dc154ae1"
-
-is-extendable@^0.1.0, is-extendable@^0.1.1:
-  version "0.1.1"
-  resolved "https://registry.yarnpkg.com/is-extendable/-/is-extendable-0.1.1.tgz#62b110e289a471418e3ec36a617d472e301dfc89"
-
-is-extendable@^1.0.0, is-extendable@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/is-extendable/-/is-extendable-1.0.1.tgz#a7470f9e426733d81bd81e1155264e3a3507cab4"
-  dependencies:
-    is-plain-object "^2.0.4"
-
-is-extglob@^2.1.0, is-extglob@^2.1.1:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/is-extglob/-/is-extglob-2.1.1.tgz#a88c02535791f02ed37c76a1b9ea9773c833f8c2"
-
-is-fullwidth-code-point@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz#ef9e31386f031a7f0d643af82fde50c457ef00cb"
-  dependencies:
-    number-is-nan "^1.0.0"
-
-is-fullwidth-code-point@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz#a3b30a5c4f199183167aaab93beefae3ddfb654f"
-
-is-glob@^3.1.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-3.1.0.tgz#7ba5ae24217804ac70707b96922567486cc3e84a"
-  dependencies:
-    is-extglob "^2.1.0"
-
-is-glob@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-4.0.0.tgz#9521c76845cc2610a85203ddf080a958c2ffabc0"
-  dependencies:
-    is-extglob "^2.1.1"
-
-is-number@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/is-number/-/is-number-3.0.0.tgz#24fd6201a4782cf50561c810276afc7d12d71195"
-  dependencies:
-    kind-of "^3.0.2"
-
-is-obj@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/is-obj/-/is-obj-1.0.1.tgz#3e4729ac1f5fde025cd7d83a896dab9f4f67db0f"
-  integrity sha1-PkcprB9f3gJc19g6iW2rn09n2w8=
-
-is-path-cwd@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/is-path-cwd/-/is-path-cwd-1.0.0.tgz#d225ec23132e89edd38fda767472e62e65f1106d"
-
-is-path-in-cwd@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/is-path-in-cwd/-/is-path-in-cwd-1.0.1.tgz#5ac48b345ef675339bd6c7a48a912110b241cf52"
-  dependencies:
-    is-path-inside "^1.0.0"
-
-is-path-inside@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/is-path-inside/-/is-path-inside-1.0.1.tgz#8ef5b7de50437a3fdca6b4e865ef7aa55cb48036"
-  dependencies:
-    path-is-inside "^1.0.1"
-
-is-plain-object@^2.0.1, is-plain-object@^2.0.3, is-plain-object@^2.0.4:
-  version "2.0.4"
-  resolved "https://registry.yarnpkg.com/is-plain-object/-/is-plain-object-2.0.4.tgz#2c163b3fafb1b606d9d17928f05c2a1c38e07677"
-  integrity sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==
-  dependencies:
-    isobject "^3.0.1"
-
-is-regex@^1.0.4:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/is-regex/-/is-regex-1.0.4.tgz#5517489b547091b0930e095654ced25ee97e9491"
-  dependencies:
-    has "^1.0.1"
-
-is-resolvable@^1.0.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/is-resolvable/-/is-resolvable-1.1.0.tgz#fb18f87ce1feb925169c9a407c19318a3206ed88"
-
-is-stream@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/is-stream/-/is-stream-1.1.0.tgz#12d4a3dd4e68e0b79ceb8dbc84173ae80d91ca44"
-
-is-svg@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/is-svg/-/is-svg-3.0.0.tgz#9321dbd29c212e5ca99c4fa9794c714bcafa2f75"
-  dependencies:
-    html-comment-regex "^1.1.0"
-
-is-symbol@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/is-symbol/-/is-symbol-1.0.2.tgz#a055f6ae57192caee329e7a860118b497a950f38"
-  dependencies:
-    has-symbols "^1.0.0"
-
-is-windows@^1.0.0, is-windows@^1.0.1, is-windows@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/is-windows/-/is-windows-1.0.2.tgz#d1850eb9791ecd18e6182ce12a30f396634bb19d"
-
-is-wsl@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/is-wsl/-/is-wsl-1.1.0.tgz#1f16e4aa22b04d1336b66188a66af3c600c3a66d"
-
-isarray@1.0.0, isarray@^1.0.0, isarray@~1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/isarray/-/isarray-1.0.0.tgz#bb935d48582cba168c06834957a54a3e07124f11"
-
-isexe@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/isexe/-/isexe-2.0.0.tgz#e8fbf374dc556ff8947a10dcb0572d633f2cfa10"
-
-isobject@^2.0.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/isobject/-/isobject-2.1.0.tgz#f065561096a3f1da2ef46272f815c840d87e0c89"
-  dependencies:
-    isarray "1.0.0"
-
-isobject@^3.0.0, isobject@^3.0.1:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/isobject/-/isobject-3.0.1.tgz#4e431e92b11a9731636aa1f9c8d1ccbcfdab78df"
-  integrity sha1-TkMekrEalzFjaqH5yNHMvP2reN8=
-
-jquery@^3.5:
-  version "3.5.0"
-  resolved "https://registry.yarnpkg.com/jquery/-/jquery-3.5.0.tgz#9980b97d9e4194611c36530e7dc46a58d7340fc9"
-  integrity sha512-Xb7SVYMvygPxbFMpTFQiHh1J7HClEaThguL15N/Gg37Lri/qKyhRGZYzHRyLH8Stq3Aow0LsHO2O2ci86fCrNQ==
-
-js-levenshtein@^1.1.3:
-  version "1.1.6"
-  resolved "https://registry.yarnpkg.com/js-levenshtein/-/js-levenshtein-1.1.6.tgz#c6cee58eb3550372df8deb85fad5ce66ce01d59d"
-
-"js-tokens@^3.0.0 || ^4.0.0", js-tokens@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-4.0.0.tgz#19203fb59991df98e3a287050d4647cdeaf32499"
-
-js-tokens@^3.0.2:
-  version "3.0.2"
-  resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-3.0.2.tgz#9866df395102130e38f7f996bceb65443209c25b"
-
-js-yaml@^3.12.0, js-yaml@^3.9.0:
-  version "3.13.1"
-  resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.13.1.tgz#aff151b30bfdfa8e49e05da22e7415e9dfa37847"
-  integrity sha512-YfbcO7jXDdyj0DGxYVSlSeQNHbD7XPWvrVWeVUujrQEoZzWJIRrCPoyk6kL6IAjAG2IolMK4T0hNUe0HOUs5Jw==
-  dependencies:
-    argparse "^1.0.7"
-    esprima "^4.0.0"
-
-jsesc@^2.5.1:
-  version "2.5.2"
-  resolved "https://registry.yarnpkg.com/jsesc/-/jsesc-2.5.2.tgz#80564d2e483dacf6e8ef209650a67df3f0c283a4"
-
-jsesc@~0.5.0:
-  version "0.5.0"
-  resolved "https://registry.yarnpkg.com/jsesc/-/jsesc-0.5.0.tgz#e7dee66e35d6fc16f710fe91d5cf69f70f08911d"
-
-json-parse-better-errors@^1.0.1, json-parse-better-errors@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/json-parse-better-errors/-/json-parse-better-errors-1.0.2.tgz#bb867cfb3450e69107c131d1c514bab3dc8bcaa9"
-
-json-schema-traverse@^0.4.1:
-  version "0.4.1"
-  resolved "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz#69f6a87d9513ab8bb8fe63bdb0979c448e684660"
-
-json3@^3.3.2:
-  version "3.3.2"
-  resolved "https://registry.yarnpkg.com/json3/-/json3-3.3.2.tgz#3c0434743df93e2f5c42aee7b19bcb483575f4e1"
-
-json5@^1.0.1:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/json5/-/json5-1.0.2.tgz#63d98d60f21b313b77c4d6da18bfa69d80e1d593"
-  integrity sha512-g1MWMLBiz8FKi1e4w0UyVL3w+iJceWAFBAaBnnGKOpNa5f8TLktkbre1+s6oICydWAm+HRUGTmI+//xv2hvXYA==
-  dependencies:
-    minimist "^1.2.0"
-
-json5@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/json5/-/json5-2.1.0.tgz#e7a0c62c48285c628d20a10b85c89bb807c32850"
-  dependencies:
-    minimist "^1.2.0"
-
-jsonfile@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/jsonfile/-/jsonfile-4.0.0.tgz#8771aae0799b64076b76640fca058f9c10e33ecb"
-  optionalDependencies:
-    graceful-fs "^4.1.6"
-
-killable@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/killable/-/killable-1.0.1.tgz#4c8ce441187a061c7474fb87ca08e2a638194892"
-
-kind-of@^3.0.2, kind-of@^3.0.3, kind-of@^3.2.0:
-  version "3.2.2"
-  resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-3.2.2.tgz#31ea21a734bab9bbb0f32466d893aea51e4a3c64"
-  dependencies:
-    is-buffer "^1.1.5"
-
-kind-of@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-4.0.0.tgz#20813df3d712928b207378691a45066fae72dd57"
-  dependencies:
-    is-buffer "^1.1.5"
-
-kind-of@^5.0.0:
-  version "5.1.0"
-  resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-5.1.0.tgz#729c91e2d857b7a419a1f9aa65685c4c33f5845d"
-
-kind-of@^6.0.0, kind-of@^6.0.2:
-  version "6.0.2"
-  resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-6.0.2.tgz#01146b36a6218e64e58f3a8d66de5d7fc6f6d051"
-
-laravel-mix@^4.0.7:
-  version "4.0.14"
-  resolved "https://registry.yarnpkg.com/laravel-mix/-/laravel-mix-4.0.14.tgz#949374650d39f2c937257ad2749dab039b848f28"
-  dependencies:
-    "@babel/core" "^7.2.0"
-    "@babel/plugin-proposal-object-rest-spread" "^7.2.0"
-    "@babel/plugin-transform-runtime" "^7.2.0"
-    "@babel/preset-env" "^7.2.0"
-    "@babel/runtime" "^7.2.0"
-    autoprefixer "^9.4.2"
-    babel-loader "^8.0.4"
-    babel-merge "^2.0.1"
-    chokidar "^2.0.3"
-    clean-css "^4.1.3"
-    concatenate "0.0.2"
-    css-loader "^1.0.1"
-    dotenv "^6.2.0"
-    dotenv-expand "^4.2.0"
-    extract-text-webpack-plugin v4.0.0-beta.0
-    file-loader "^2.0.0"
-    friendly-errors-webpack-plugin "^1.6.1"
-    fs-extra "^7.0.1"
-    glob "^7.1.2"
-    html-loader "^0.5.5"
-    imagemin "^6.0.0"
-    img-loader "^3.0.0"
-    lodash "^4.17.5"
-    md5 "^2.2.1"
-    optimize-css-assets-webpack-plugin "^5.0.1"
-    postcss-loader "^3.0.0"
-    style-loader "^0.23.1"
-    terser "^3.11.0"
-    terser-webpack-plugin "^1.1.0"
-    vue-loader "^15.4.2"
-    webpack "^4.27.1"
-    webpack-cli "^3.1.2"
-    webpack-dev-server "^3.1.14"
-    webpack-merge "^4.1.0"
-    webpack-notifier "^1.5.1"
-    yargs "^12.0.5"
-
-last-call-webpack-plugin@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/last-call-webpack-plugin/-/last-call-webpack-plugin-3.0.0.tgz#9742df0e10e3cf46e5c0381c2de90d3a7a2d7555"
-  dependencies:
-    lodash "^4.17.5"
-    webpack-sources "^1.1.0"
-
-lcid@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/lcid/-/lcid-2.0.0.tgz#6ef5d2df60e52f82eb228a4c373e8d1f397253cf"
-  dependencies:
-    invert-kv "^2.0.0"
-
-loader-runner@^2.3.0:
-  version "2.4.0"
-  resolved "https://registry.yarnpkg.com/loader-runner/-/loader-runner-2.4.0.tgz#ed47066bfe534d7e84c4c7b9998c2a75607d9357"
-
-loader-utils@^1.0.1, loader-utils@^1.0.2, loader-utils@^1.1.0:
-  version "1.4.2"
-  resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-1.4.2.tgz#29a957f3a63973883eb684f10ffd3d151fec01a3"
-  integrity sha512-I5d00Pd/jwMD2QCduo657+YM/6L3KZu++pmX9VFncxaxvHcru9jx1lBaFft+r4Mt2jK0Yhp41XlRAihzPxHNCg==
-  dependencies:
-    big.js "^5.2.2"
-    emojis-list "^3.0.0"
-    json5 "^1.0.1"
-
-locate-path@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-3.0.0.tgz#dbec3b3ab759758071b58fe59fc41871af21400e"
-  dependencies:
-    p-locate "^3.0.0"
-    path-exists "^3.0.0"
-
-lodash._baseassign@^3.0.0:
-  version "3.2.0"
-  resolved "https://registry.yarnpkg.com/lodash._baseassign/-/lodash._baseassign-3.2.0.tgz#8c38a099500f215ad09e59f1722fd0c52bfe0a4e"
-  dependencies:
-    lodash._basecopy "^3.0.0"
-    lodash.keys "^3.0.0"
-
-lodash._basecopy@^3.0.0:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/lodash._basecopy/-/lodash._basecopy-3.0.1.tgz#8da0e6a876cf344c0ad8a54882111dd3c5c7ca36"
-
-lodash._bindcallback@^3.0.0:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/lodash._bindcallback/-/lodash._bindcallback-3.0.1.tgz#e531c27644cf8b57a99e17ed95b35c748789392e"
-
-lodash._createassigner@^3.0.0:
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/lodash._createassigner/-/lodash._createassigner-3.1.1.tgz#838a5bae2fdaca63ac22dee8e19fa4e6d6970b11"
-  dependencies:
-    lodash._bindcallback "^3.0.0"
-    lodash._isiterateecall "^3.0.0"
-    lodash.restparam "^3.0.0"
-
-lodash._getnative@^3.0.0:
-  version "3.9.1"
-  resolved "https://registry.yarnpkg.com/lodash._getnative/-/lodash._getnative-3.9.1.tgz#570bc7dede46d61cdcde687d65d3eecbaa3aaff5"
-
-lodash._isiterateecall@^3.0.0:
-  version "3.0.9"
-  resolved "https://registry.yarnpkg.com/lodash._isiterateecall/-/lodash._isiterateecall-3.0.9.tgz#5203ad7ba425fae842460e696db9cf3e6aac057c"
-
-lodash.assign@^3.0.0:
-  version "3.2.0"
-  resolved "https://registry.yarnpkg.com/lodash.assign/-/lodash.assign-3.2.0.tgz#3ce9f0234b4b2223e296b8fa0ac1fee8ebca64fa"
-  dependencies:
-    lodash._baseassign "^3.0.0"
-    lodash._createassigner "^3.0.0"
-    lodash.keys "^3.0.0"
-
-lodash.assign@^4.0.1:
-  version "4.2.0"
-  resolved "https://registry.yarnpkg.com/lodash.assign/-/lodash.assign-4.2.0.tgz#0d99f3ccd7a6d261d19bdaeb9245005d285808e7"
-
-lodash.defaults@^3.1.2:
-  version "3.1.2"
-  resolved "https://registry.yarnpkg.com/lodash.defaults/-/lodash.defaults-3.1.2.tgz#c7308b18dbf8bc9372d701a73493c61192bd2e2c"
-  dependencies:
-    lodash.assign "^3.0.0"
-    lodash.restparam "^3.0.0"
-
-lodash.defaults@^4.0.0:
-  version "4.2.0"
-  resolved "https://registry.yarnpkg.com/lodash.defaults/-/lodash.defaults-4.2.0.tgz#d09178716ffea4dde9e5fb7b37f6f0802274580c"
-
-lodash.get@^4.4.2:
-  version "4.4.2"
-  resolved "https://registry.yarnpkg.com/lodash.get/-/lodash.get-4.4.2.tgz#2d177f652fa31e939b4438d5341499dfa3825e99"
-
-lodash.isarguments@^3.0.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/lodash.isarguments/-/lodash.isarguments-3.1.0.tgz#2f573d85c6a24289ff00663b491c1d338ff3458a"
-
-lodash.isarray@^3.0.0:
-  version "3.0.4"
-  resolved "https://registry.yarnpkg.com/lodash.isarray/-/lodash.isarray-3.0.4.tgz#79e4eb88c36a8122af86f844aa9bcd851b5fbb55"
-
-lodash.keys@^3.0.0:
-  version "3.1.2"
-  resolved "https://registry.yarnpkg.com/lodash.keys/-/lodash.keys-3.1.2.tgz#4dbc0472b156be50a0b286855d1bd0b0c656098a"
-  dependencies:
-    lodash._getnative "^3.0.0"
-    lodash.isarguments "^3.0.0"
-    lodash.isarray "^3.0.0"
-
-lodash.memoize@^4.1.2:
-  version "4.1.2"
-  resolved "https://registry.yarnpkg.com/lodash.memoize/-/lodash.memoize-4.1.2.tgz#bcc6c49a42a2840ed997f323eada5ecd182e0bfe"
-
-lodash.restparam@^3.0.0:
-  version "3.6.1"
-  resolved "https://registry.yarnpkg.com/lodash.restparam/-/lodash.restparam-3.6.1.tgz#936a4e309ef330a7645ed4145986c85ae5b20805"
-
-lodash.tail@^4.1.1:
-  version "4.1.1"
-  resolved "https://registry.yarnpkg.com/lodash.tail/-/lodash.tail-4.1.1.tgz#d2333a36d9e7717c8ad2f7cacafec7c32b444664"
-
-lodash.uniq@^4.5.0:
-  version "4.5.0"
-  resolved "https://registry.yarnpkg.com/lodash.uniq/-/lodash.uniq-4.5.0.tgz#d0225373aeb652adc1bc82e4945339a842754773"
-
-lodash@^4.17.10, lodash@^4.17.11, lodash@^4.17.19, lodash@^4.17.5:
-  version "4.17.19"
-  resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.19.tgz#e48ddedbe30b3321783c5b4301fbd353bc1e4a4b"
-  integrity sha512-JNvd8XER9GQX0v2qJgsaN/mzFCNA5BRe/j8JN9d+tWyGLSodKQHKFicdwNYzWwI3wjRnaKPsGj1XkBjx/F96DQ==
-
-loglevel@^1.4.1:
-  version "1.6.1"
-  resolved "https://registry.yarnpkg.com/loglevel/-/loglevel-1.6.1.tgz#e0fc95133b6ef276cdc8887cdaf24aa6f156f8fa"
-
-loose-envify@^1.0.0:
-  version "1.4.0"
-  resolved "https://registry.yarnpkg.com/loose-envify/-/loose-envify-1.4.0.tgz#71ee51fa7be4caec1a63839f7e682d8132d30caf"
-  dependencies:
-    js-tokens "^3.0.0 || ^4.0.0"
-
-lower-case@^1.1.1:
-  version "1.1.4"
-  resolved "https://registry.yarnpkg.com/lower-case/-/lower-case-1.1.4.tgz#9a2cabd1b9e8e0ae993a4bf7d5875c39c42e8eac"
-
-lru-cache@^4.1.2:
-  version "4.1.5"
-  resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-4.1.5.tgz#8bbe50ea85bed59bc9e33dcab8235ee9bcf443cd"
-  dependencies:
-    pseudomap "^1.0.2"
-    yallist "^2.1.2"
-
-lru-cache@^5.1.1:
-  version "5.1.1"
-  resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-5.1.1.tgz#1da27e6710271947695daf6848e847f01d84b920"
-  dependencies:
-    yallist "^3.0.2"
-
-make-dir@^1.0.0:
-  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/make-dir/-/make-dir-1.3.0.tgz#79c1033b80515bd6d24ec9933e860ca75ee27f0c"
-  dependencies:
-    pify "^3.0.0"
-
-mamacro@^0.0.3:
-  version "0.0.3"
-  resolved "https://registry.yarnpkg.com/mamacro/-/mamacro-0.0.3.tgz#ad2c9576197c9f1abf308d0787865bd975a3f3e4"
-
-map-age-cleaner@^0.1.1:
-  version "0.1.3"
-  resolved "https://registry.yarnpkg.com/map-age-cleaner/-/map-age-cleaner-0.1.3.tgz#7d583a7306434c055fe474b0f45078e6e1b4b92a"
-  dependencies:
-    p-defer "^1.0.0"
-
-map-cache@^0.2.2:
-  version "0.2.2"
-  resolved "https://registry.yarnpkg.com/map-cache/-/map-cache-0.2.2.tgz#c32abd0bd6525d9b051645bb4f26ac5dc98a0dbf"
-
-map-visit@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/map-visit/-/map-visit-1.0.0.tgz#ecdca8f13144e660f1b5bd41f12f3479d98dfb8f"
-  dependencies:
-    object-visit "^1.0.0"
-
-md5.js@^1.3.4:
-  version "1.3.5"
-  resolved "https://registry.yarnpkg.com/md5.js/-/md5.js-1.3.5.tgz#b5d07b8e3216e3e27cd728d72f70d1e6a342005f"
-  dependencies:
-    hash-base "^3.0.0"
-    inherits "^2.0.1"
-    safe-buffer "^5.1.2"
-
-md5@^2.2.1:
-  version "2.2.1"
-  resolved "https://registry.yarnpkg.com/md5/-/md5-2.2.1.tgz#53ab38d5fe3c8891ba465329ea23fac0540126f9"
-  dependencies:
-    charenc "~0.0.1"
-    crypt "~0.0.1"
-    is-buffer "~1.1.1"
-
-mdn-data@~1.1.0:
-  version "1.1.4"
-  resolved "https://registry.yarnpkg.com/mdn-data/-/mdn-data-1.1.4.tgz#50b5d4ffc4575276573c4eedb8780812a8419f01"
-
-media-typer@0.3.0:
-  version "0.3.0"
-  resolved "https://registry.yarnpkg.com/media-typer/-/media-typer-0.3.0.tgz#8710d7af0aa626f8fffa1ce00168545263255748"
-  integrity sha512-dq+qelQ9akHpcOl/gUVRTxVIOkAJ1wR3QAvb4RsVjS8oVoFjDGTc679wJYmUmknUF5HwMLOgb5O+a3KxfWapPQ==
-
-mem@^4.0.0:
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/mem/-/mem-4.1.0.tgz#aeb9be2d21f47e78af29e4ac5978e8afa2ca5b8a"
-  dependencies:
-    map-age-cleaner "^0.1.1"
-    mimic-fn "^1.0.0"
-    p-is-promise "^2.0.0"
-
-memory-fs@^0.4.0, memory-fs@^0.4.1, memory-fs@~0.4.1:
-  version "0.4.1"
-  resolved "https://registry.yarnpkg.com/memory-fs/-/memory-fs-0.4.1.tgz#3a9a20b8462523e447cfbc7e8bb80ed667bfc552"
-  dependencies:
-    errno "^0.1.3"
-    readable-stream "^2.0.1"
-
-merge-descriptors@1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/merge-descriptors/-/merge-descriptors-1.0.1.tgz#b00aaa556dd8b44568150ec9d1b953f3f90cbb61"
-  integrity sha512-cCi6g3/Zr1iqQi6ySbseM1Xvooa98N0w31jzUYrXPX2xqObmFGHJ0tQ5u74H3mVh7wLouTseZyYIq39g8cNp1w==
-
-merge-source-map@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/merge-source-map/-/merge-source-map-1.1.0.tgz#2fdde7e6020939f70906a68f2d7ae685e4c8c646"
-  dependencies:
-    source-map "^0.6.1"
-
-merge2@^1.2.3:
-  version "1.2.3"
-  resolved "https://registry.yarnpkg.com/merge2/-/merge2-1.2.3.tgz#7ee99dbd69bb6481689253f018488a1b902b0ed5"
-
-methods@~1.1.2:
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/methods/-/methods-1.1.2.tgz#5529a4d67654134edcc5266656835b0f851afcee"
-  integrity sha512-iclAHeNqNm68zFtnZ0e+1L2yUIdvzNoauKU4WBA3VvH/vPFieF7qfRlwUZU+DA9P9bPXIS90ulxoUoCH23sV2w==
-
-micromatch@^3.0.4, micromatch@^3.1.10, micromatch@^3.1.4, micromatch@^3.1.8:
-  version "3.1.10"
-  resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-3.1.10.tgz#70859bc95c9840952f359a068a3fc49f9ecfac23"
-  dependencies:
-    arr-diff "^4.0.0"
-    array-unique "^0.3.2"
-    braces "^2.3.1"
-    define-property "^2.0.2"
-    extend-shallow "^3.0.2"
-    extglob "^2.0.4"
-    fragment-cache "^0.2.1"
-    kind-of "^6.0.2"
-    nanomatch "^1.2.9"
-    object.pick "^1.3.0"
-    regex-not "^1.0.0"
-    snapdragon "^0.8.1"
-    to-regex "^3.0.2"
-
-miller-rabin@^4.0.0:
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/miller-rabin/-/miller-rabin-4.0.1.tgz#f080351c865b0dc562a8462966daa53543c78a4d"
-  dependencies:
-    bn.js "^4.0.0"
-    brorand "^1.0.1"
-
-mime-db@1.52.0:
-  version "1.52.0"
-  resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.52.0.tgz#bbabcdc02859f4987301c856e3387ce5ec43bf70"
-  integrity sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==
-
-"mime-db@>= 1.38.0 < 2", mime-db@~1.38.0:
-  version "1.38.0"
-  resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.38.0.tgz#1a2aab16da9eb167b49c6e4df2d9c68d63d8e2ad"
-
-mime-types@~2.1.17:
-  version "2.1.22"
-  resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.22.tgz#fe6b355a190926ab7698c9a0556a11199b2199bd"
-  dependencies:
-    mime-db "~1.38.0"
-
-mime-types@~2.1.24, mime-types@~2.1.34:
-  version "2.1.35"
-  resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.35.tgz#381a871b62a734450660ae3deee44813f70d959a"
-  integrity sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==
-  dependencies:
-    mime-db "1.52.0"
-
-mime@1.6.0:
-  version "1.6.0"
-  resolved "https://registry.yarnpkg.com/mime/-/mime-1.6.0.tgz#32cd9e5c64553bd58d19a568af452acff04981b1"
-  integrity sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==
-
-mime@^2.3.1:
-  version "2.4.0"
-  resolved "https://registry.yarnpkg.com/mime/-/mime-2.4.0.tgz#e051fd881358585f3279df333fe694da0bcffdd6"
-
-mimic-fn@^1.0.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-1.2.0.tgz#820c86a39334640e99516928bd03fca88057d022"
-
-minimalistic-assert@^1.0.0, minimalistic-assert@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/minimalistic-assert/-/minimalistic-assert-1.0.1.tgz#2e194de044626d4a10e7f7fbc00ce73e83e4d5c7"
-  integrity sha512-UtJcAD4yEaGtjPezWuO9wC4nwUnVH/8/Im3yEHQP4b67cXlD/Qr9hdITCU1xDbSEXg2XKNaP8jsReV7vQd00/A==
-
-minimalistic-crypto-utils@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/minimalistic-crypto-utils/-/minimalistic-crypto-utils-1.0.1.tgz#f6c00c1c0b082246e5c4d99dfb8c7c083b2b582a"
-  integrity sha1-9sAMHAsIIkblxNmd+4x8CDsrWCo=
-
-minimatch@^3.0.4:
-  version "3.1.2"
-  resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.1.2.tgz#19cd194bfd3e428f049a70817c038d89ab4be35b"
-  integrity sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==
-  dependencies:
-    brace-expansion "^1.1.7"
-
-minimist@0.0.8:
-  version "0.0.8"
-  resolved "https://registry.yarnpkg.com/minimist/-/minimist-0.0.8.tgz#857fcabfc3397d2625b8228262e86aa7a011b05d"
-
-minimist@^1.2.0:
-  version "1.2.7"
-  resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.7.tgz#daa1c4d91f507390437c6a8bc01078e7000c4d18"
-  integrity sha512-bzfL1YUZsP41gmu/qjrEk0Q6i2ix/cVeAhbCbqH9u3zYutS1cLg00qhrD0M2MVdCcx4Sc0UpP2eBWo9rotpq6g==
-
-minipass@^2.2.1, minipass@^2.3.4:
-  version "2.3.5"
-  resolved "https://registry.yarnpkg.com/minipass/-/minipass-2.3.5.tgz#cacebe492022497f656b0f0f51e2682a9ed2d848"
-  dependencies:
-    safe-buffer "^5.1.2"
-    yallist "^3.0.0"
-
-minizlib@^1.1.1:
-  version "1.2.1"
-  resolved "https://registry.yarnpkg.com/minizlib/-/minizlib-1.2.1.tgz#dd27ea6136243c7c880684e8672bb3a45fd9b614"
-  dependencies:
-    minipass "^2.2.1"
-
-mississippi@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/mississippi/-/mississippi-3.0.0.tgz#ea0a3291f97e0b5e8776b363d5f0a12d94c67022"
-  dependencies:
-    concat-stream "^1.5.0"
-    duplexify "^3.4.2"
-    end-of-stream "^1.1.0"
-    flush-write-stream "^1.0.0"
-    from2 "^2.1.0"
-    parallel-transform "^1.1.0"
-    pump "^3.0.0"
-    pumpify "^1.3.3"
-    stream-each "^1.1.0"
-    through2 "^2.0.0"
-
-mixin-deep@^1.2.0:
-  version "1.3.2"
-  resolved "https://registry.yarnpkg.com/mixin-deep/-/mixin-deep-1.3.2.tgz#1120b43dc359a785dce65b55b82e257ccf479566"
-  integrity sha512-WRoDn//mXBiJ1H40rqa3vH0toePwSsGb45iInWlTySa+Uu4k3tYUSxa2v1KqAiLtvlrSzaExqS1gtk96A9zvEA==
-  dependencies:
-    for-in "^1.0.2"
-    is-extendable "^1.0.1"
-
-mixin-object@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/mixin-object/-/mixin-object-2.0.1.tgz#4fb949441dab182540f1fe035ba60e1947a5e57e"
-  dependencies:
-    for-in "^0.1.3"
-    is-extendable "^0.1.1"
-
-mkdirp@0.5.x, mkdirp@^0.5.0, mkdirp@^0.5.1, mkdirp@~0.5.0, mkdirp@~0.5.1:
-  version "0.5.1"
-  resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.1.tgz#30057438eac6cf7f8c4767f38648d6697d75c903"
-  dependencies:
-    minimist "0.0.8"
-
-move-concurrently@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/move-concurrently/-/move-concurrently-1.0.1.tgz#be2c005fda32e0b29af1f05d7c4b33214c701f92"
-  dependencies:
-    aproba "^1.1.1"
-    copy-concurrently "^1.0.0"
-    fs-write-stream-atomic "^1.0.8"
-    mkdirp "^0.5.1"
-    rimraf "^2.5.4"
-    run-queue "^1.0.3"
-
-ms@2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/ms/-/ms-2.0.0.tgz#5608aeadfc00be6c2901df5f9861788de0d597c8"
-  integrity sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==
-
-ms@2.1.3:
-  version "2.1.3"
-  resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.3.tgz#574c8138ce1d2b5861f0b44579dbadd60c6615b2"
-  integrity sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==
-
-ms@^2.1.1:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.1.tgz#30a5864eb3ebb0a66f2ebe6d727af06a09d86e0a"
-
-multicast-dns-service-types@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/multicast-dns-service-types/-/multicast-dns-service-types-1.1.0.tgz#899f11d9686e5e05cb91b35d5f0e63b773cfc901"
-
-multicast-dns@^6.0.1:
-  version "6.2.3"
-  resolved "https://registry.yarnpkg.com/multicast-dns/-/multicast-dns-6.2.3.tgz#a0ec7bd9055c4282f790c3c82f4e28db3b31b229"
-  dependencies:
-    dns-packet "^1.3.1"
-    thunky "^1.0.2"
-
-nan@^2.9.2:
-  version "2.12.1"
-  resolved "https://registry.yarnpkg.com/nan/-/nan-2.12.1.tgz#7b1aa193e9aa86057e3c7bbd0ac448e770925552"
-
-nanomatch@^1.2.9:
-  version "1.2.13"
-  resolved "https://registry.yarnpkg.com/nanomatch/-/nanomatch-1.2.13.tgz#b87a8aa4fc0de8fe6be88895b38983ff265bd119"
-  dependencies:
-    arr-diff "^4.0.0"
-    array-unique "^0.3.2"
-    define-property "^2.0.2"
-    extend-shallow "^3.0.2"
-    fragment-cache "^0.2.1"
-    is-windows "^1.0.2"
-    kind-of "^6.0.2"
-    object.pick "^1.3.0"
-    regex-not "^1.0.0"
-    snapdragon "^0.8.1"
-    to-regex "^3.0.1"
-
-needle@^2.2.1:
-  version "2.2.4"
-  resolved "https://registry.yarnpkg.com/needle/-/needle-2.2.4.tgz#51931bff82533b1928b7d1d69e01f1b00ffd2a4e"
-  dependencies:
-    debug "^2.1.2"
-    iconv-lite "^0.4.4"
-    sax "^1.2.4"
-
-negotiator@0.6.3:
-  version "0.6.3"
-  resolved "https://registry.yarnpkg.com/negotiator/-/negotiator-0.6.3.tgz#58e323a72fedc0d6f9cd4d31fe49f51479590ccd"
-  integrity sha512-+EUsqGPLsM+j/zdChZjsnX51g4XrHFOIXwfnCVPGlQk/k5giakcKsuxCObBRu6DSm9opw/O6slWbJdghQM4bBg==
-
-neo-async@^2.5.0:
-  version "2.6.0"
-  resolved "https://registry.yarnpkg.com/neo-async/-/neo-async-2.6.0.tgz#b9d15e4d71c6762908654b5183ed38b753340835"
-
-nice-try@^1.0.4:
-  version "1.0.5"
-  resolved "https://registry.yarnpkg.com/nice-try/-/nice-try-1.0.5.tgz#a3378a7696ce7d223e88fc9b764bd7ef1089e366"
-
-no-case@^2.2.0:
-  version "2.3.2"
-  resolved "https://registry.yarnpkg.com/no-case/-/no-case-2.3.2.tgz#60b813396be39b3f1288a4c1ed5d1e7d28b464ac"
-  dependencies:
-    lower-case "^1.1.1"
-
-node-forge@0.7.5:
-  version "0.7.5"
-  resolved "https://registry.yarnpkg.com/node-forge/-/node-forge-0.7.5.tgz#6c152c345ce11c52f465c2abd957e8639cd674df"
-
-node-libs-browser@^2.0.0:
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/node-libs-browser/-/node-libs-browser-2.2.0.tgz#c72f60d9d46de08a940dedbb25f3ffa2f9bbaa77"
-  dependencies:
-    assert "^1.1.1"
-    browserify-zlib "^0.2.0"
-    buffer "^4.3.0"
-    console-browserify "^1.1.0"
-    constants-browserify "^1.0.0"
-    crypto-browserify "^3.11.0"
-    domain-browser "^1.1.1"
-    events "^3.0.0"
-    https-browserify "^1.0.0"
-    os-browserify "^0.3.0"
-    path-browserify "0.0.0"
-    process "^0.11.10"
-    punycode "^1.2.4"
-    querystring-es3 "^0.2.0"
-    readable-stream "^2.3.3"
-    stream-browserify "^2.0.1"
-    stream-http "^2.7.2"
-    string_decoder "^1.0.0"
-    timers-browserify "^2.0.4"
-    tty-browserify "0.0.0"
-    url "^0.11.0"
-    util "^0.11.0"
-    vm-browserify "0.0.4"
-
-node-notifier@^5.1.2:
-  version "5.4.0"
-  resolved "https://registry.yarnpkg.com/node-notifier/-/node-notifier-5.4.0.tgz#7b455fdce9f7de0c63538297354f3db468426e6a"
-  dependencies:
-    growly "^1.3.0"
-    is-wsl "^1.1.0"
-    semver "^5.5.0"
-    shellwords "^0.1.1"
-    which "^1.3.0"
-
-node-pre-gyp@^0.10.0:
-  version "0.10.3"
-  resolved "https://registry.yarnpkg.com/node-pre-gyp/-/node-pre-gyp-0.10.3.tgz#3070040716afdc778747b61b6887bf78880b80fc"
-  dependencies:
-    detect-libc "^1.0.2"
-    mkdirp "^0.5.1"
-    needle "^2.2.1"
-    nopt "^4.0.1"
-    npm-packlist "^1.1.6"
-    npmlog "^4.0.2"
-    rc "^1.2.7"
-    rimraf "^2.6.1"
-    semver "^5.3.0"
-    tar "^4"
-
-node-releases@^1.1.8:
-  version "1.1.8"
-  resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.8.tgz#32a63fff63c5e51b7e0f540ac95947d220fc6862"
-  dependencies:
-    semver "^5.3.0"
-
-nopt@^4.0.1:
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/nopt/-/nopt-4.0.1.tgz#d0d4685afd5415193c8c7505602d0d17cd64474d"
-  dependencies:
-    abbrev "1"
-    osenv "^0.1.4"
-
-normalize-path@^2.1.1:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/normalize-path/-/normalize-path-2.1.1.tgz#1ab28b556e198363a8c1a6f7e6fa20137fe6aed9"
-  dependencies:
-    remove-trailing-separator "^1.0.1"
-
-normalize-path@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/normalize-path/-/normalize-path-3.0.0.tgz#0dcd69ff23a1c9b11fd0978316644a0388216a65"
-
-normalize-range@^0.1.2:
-  version "0.1.2"
-  resolved "https://registry.yarnpkg.com/normalize-range/-/normalize-range-0.1.2.tgz#2d10c06bdfd312ea9777695a4d28439456b75942"
-
-normalize-url@^3.0.0:
-  version "3.3.0"
-  resolved "https://registry.yarnpkg.com/normalize-url/-/normalize-url-3.3.0.tgz#b2e1c4dc4f7c6d57743df733a4f5978d18650559"
-
-npm-bundled@^1.0.1:
-  version "1.0.6"
-  resolved "https://registry.yarnpkg.com/npm-bundled/-/npm-bundled-1.0.6.tgz#e7ba9aadcef962bb61248f91721cd932b3fe6bdd"
-
-npm-packlist@^1.1.6:
-  version "1.4.1"
-  resolved "https://registry.yarnpkg.com/npm-packlist/-/npm-packlist-1.4.1.tgz#19064cdf988da80ea3cee45533879d90192bbfbc"
-  dependencies:
-    ignore-walk "^3.0.1"
-    npm-bundled "^1.0.1"
-
-npm-run-path@^2.0.0:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/npm-run-path/-/npm-run-path-2.0.2.tgz#35a9232dfa35d7067b4cb2ddf2357b1871536c5f"
-  dependencies:
-    path-key "^2.0.0"
-
-npmlog@^4.0.2:
-  version "4.1.2"
-  resolved "https://registry.yarnpkg.com/npmlog/-/npmlog-4.1.2.tgz#08a7f2a8bf734604779a9efa4ad5cc717abb954b"
-  dependencies:
-    are-we-there-yet "~1.1.2"
-    console-control-strings "~1.1.0"
-    gauge "~2.7.3"
-    set-blocking "~2.0.0"
-
-nth-check@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/nth-check/-/nth-check-1.0.2.tgz#b2bd295c37e3dd58a3bf0700376663ba4d9cf05c"
-  dependencies:
-    boolbase "~1.0.0"
-
-num2fraction@^1.2.2:
-  version "1.2.2"
-  resolved "https://registry.yarnpkg.com/num2fraction/-/num2fraction-1.2.2.tgz#6f682b6a027a4e9ddfa4564cd2589d1d4e669ede"
-
-number-is-nan@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/number-is-nan/-/number-is-nan-1.0.1.tgz#097b602b53422a522c1afb8790318336941a011d"
-
-object-assign@^4.0.1, object-assign@^4.1.0, object-assign@^4.1.1:
-  version "4.1.1"
-  resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.1.tgz#2109adc7965887cfc05cbbd442cac8bfbb360863"
-
-object-copy@^0.1.0:
-  version "0.1.0"
-  resolved "https://registry.yarnpkg.com/object-copy/-/object-copy-0.1.0.tgz#7e7d858b781bd7c991a41ba975ed3812754e998c"
-  dependencies:
-    copy-descriptor "^0.1.0"
-    define-property "^0.2.5"
-    kind-of "^3.0.3"
-
-object-inspect@^1.9.0:
-  version "1.12.2"
-  resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.12.2.tgz#c0641f26394532f28ab8d796ab954e43c009a8ea"
-  integrity sha512-z+cPxW0QGUp0mcqcsgQyLVRDoXFQbXOwBaqyF7VIgI4TWNQsDHrBpUQslRmIfAoYWdYzs6UlKJtB2XJpTaNSpQ==
-
-object-keys@^1.0.12:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/object-keys/-/object-keys-1.1.0.tgz#11bd22348dd2e096a045ab06f6c85bcc340fa032"
-
-object-path@^0.9.2:
-  version "0.9.2"
-  resolved "https://registry.yarnpkg.com/object-path/-/object-path-0.9.2.tgz#0fd9a74fc5fad1ae3968b586bda5c632bd6c05a5"
-
-object-visit@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/object-visit/-/object-visit-1.0.1.tgz#f79c4493af0c5377b59fe39d395e41042dd045bb"
-  dependencies:
-    isobject "^3.0.0"
-
-object.getownpropertydescriptors@^2.0.3:
-  version "2.0.3"
-  resolved "https://registry.yarnpkg.com/object.getownpropertydescriptors/-/object.getownpropertydescriptors-2.0.3.tgz#8758c846f5b407adab0f236e0986f14b051caa16"
-  dependencies:
-    define-properties "^1.1.2"
-    es-abstract "^1.5.1"
-
-object.omit@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/object.omit/-/object.omit-3.0.0.tgz#0e3edc2fce2ba54df5577ff529f6d97bd8a522af"
-  dependencies:
-    is-extendable "^1.0.0"
-
-object.pick@^1.3.0:
-  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/object.pick/-/object.pick-1.3.0.tgz#87a10ac4c1694bd2e1cbf53591a66141fb5dd747"
-  dependencies:
-    isobject "^3.0.1"
-
-object.values@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/object.values/-/object.values-1.1.0.tgz#bf6810ef5da3e5325790eaaa2be213ea84624da9"
-  dependencies:
-    define-properties "^1.1.3"
-    es-abstract "^1.12.0"
-    function-bind "^1.1.1"
-    has "^1.0.3"
-
-obuf@^1.0.0, obuf@^1.1.2:
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/obuf/-/obuf-1.1.2.tgz#09bea3343d41859ebd446292d11c9d4db619084e"
-
-on-finished@2.4.1:
-  version "2.4.1"
-  resolved "https://registry.yarnpkg.com/on-finished/-/on-finished-2.4.1.tgz#58c8c44116e54845ad57f14ab10b03533184ac3f"
-  integrity sha512-oVlzkg3ENAhCk2zdv7IJwd/QUD4z2RxRwpkcGY8psCVcCYZNq4wYnVWALHM+brtuJjePWiYF/ClmuDr8Ch5+kg==
-  dependencies:
-    ee-first "1.1.1"
-
-on-headers@~1.0.1:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/on-headers/-/on-headers-1.0.2.tgz#772b0ae6aaa525c399e489adfad90c403eb3c28f"
-
-once@^1.3.0, once@^1.3.1, once@^1.4.0:
-  version "1.4.0"
-  resolved "https://registry.yarnpkg.com/once/-/once-1.4.0.tgz#583b1aa775961d4b113ac17d9c50baef9dd76bd1"
-  dependencies:
-    wrappy "1"
-
-opn@^5.1.0:
-  version "5.4.0"
-  resolved "https://registry.yarnpkg.com/opn/-/opn-5.4.0.tgz#cb545e7aab78562beb11aa3bfabc7042e1761035"
-  dependencies:
-    is-wsl "^1.1.0"
-
-optimize-css-assets-webpack-plugin@^5.0.1:
-  version "5.0.1"
-  resolved "https://registry.yarnpkg.com/optimize-css-assets-webpack-plugin/-/optimize-css-assets-webpack-plugin-5.0.1.tgz#9eb500711d35165b45e7fd60ba2df40cb3eb9159"
-  dependencies:
-    cssnano "^4.1.0"
-    last-call-webpack-plugin "^3.0.0"
-
-original@^1.0.0:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/original/-/original-1.0.2.tgz#e442a61cffe1c5fd20a65f3261c26663b303f25f"
-  dependencies:
-    url-parse "^1.4.3"
-
-os-browserify@^0.3.0:
-  version "0.3.0"
-  resolved "https://registry.yarnpkg.com/os-browserify/-/os-browserify-0.3.0.tgz#854373c7f5c2315914fc9bfc6bd8238fdda1ec27"
-
-os-homedir@^1.0.0:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/os-homedir/-/os-homedir-1.0.2.tgz#ffbc4988336e0e833de0c168c7ef152121aa7fb3"
-
-os-locale@^3.0.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/os-locale/-/os-locale-3.1.0.tgz#a802a6ee17f24c10483ab9935719cef4ed16bf1a"
-  dependencies:
-    execa "^1.0.0"
-    lcid "^2.0.0"
-    mem "^4.0.0"
-
-os-tmpdir@^1.0.0:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/os-tmpdir/-/os-tmpdir-1.0.2.tgz#bbe67406c79aa85c5cfec766fe5734555dfa1274"
-
-osenv@^0.1.4:
-  version "0.1.5"
-  resolved "https://registry.yarnpkg.com/osenv/-/osenv-0.1.5.tgz#85cdfafaeb28e8677f416e287592b5f3f49ea410"
-  dependencies:
-    os-homedir "^1.0.0"
-    os-tmpdir "^1.0.0"
-
-p-defer@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/p-defer/-/p-defer-1.0.0.tgz#9f6eb182f6c9aa8cd743004a7d4f96b196b0fb0c"
-
-p-finally@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/p-finally/-/p-finally-1.0.0.tgz#3fbcfb15b899a44123b34b6dcc18b724336a2cae"
-
-p-is-promise@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/p-is-promise/-/p-is-promise-2.0.0.tgz#7554e3d572109a87e1f3f53f6a7d85d1b194f4c5"
-
-p-limit@^2.0.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-2.1.0.tgz#1d5a0d20fb12707c758a655f6bbc4386b5930d68"
-  dependencies:
-    p-try "^2.0.0"
-
-p-locate@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/p-locate/-/p-locate-3.0.0.tgz#322d69a05c0264b25997d9f40cd8a891ab0064a4"
-  dependencies:
-    p-limit "^2.0.0"
-
-p-map@^1.1.1:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/p-map/-/p-map-1.2.0.tgz#e4e94f311eabbc8633a1e79908165fca26241b6b"
-
-p-pipe@^1.1.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/p-pipe/-/p-pipe-1.2.0.tgz#4b1a11399a11520a67790ee5a0c1d5881d6befe9"
-
-p-try@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/p-try/-/p-try-2.0.0.tgz#85080bb87c64688fa47996fe8f7dfbe8211760b1"
-
-pako@~1.0.5:
-  version "1.0.8"
-  resolved "https://registry.yarnpkg.com/pako/-/pako-1.0.8.tgz#6844890aab9c635af868ad5fecc62e8acbba3ea4"
-
-parallel-transform@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/parallel-transform/-/parallel-transform-1.1.0.tgz#d410f065b05da23081fcd10f28854c29bda33b06"
-  dependencies:
-    cyclist "~0.2.2"
-    inherits "^2.0.3"
-    readable-stream "^2.1.5"
-
-param-case@2.1.x:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/param-case/-/param-case-2.1.1.tgz#df94fd8cf6531ecf75e6bef9a0858fbc72be2247"
-  dependencies:
-    no-case "^2.2.0"
-
-parse-asn1@^5.0.0:
-  version "5.1.4"
-  resolved "https://registry.yarnpkg.com/parse-asn1/-/parse-asn1-5.1.4.tgz#37f6628f823fbdeb2273b4d540434a22f3ef1fcc"
-  dependencies:
-    asn1.js "^4.0.0"
-    browserify-aes "^1.0.0"
-    create-hash "^1.1.0"
-    evp_bytestokey "^1.0.0"
-    pbkdf2 "^3.0.3"
-    safe-buffer "^5.1.1"
-
-parse-json@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/parse-json/-/parse-json-4.0.0.tgz#be35f5425be1f7f6c747184f98a788cb99477ee0"
-  dependencies:
-    error-ex "^1.3.1"
-    json-parse-better-errors "^1.0.1"
-
-parse-passwd@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/parse-passwd/-/parse-passwd-1.0.0.tgz#6d5b934a456993b23d37f40a382d6f1666a8e5c6"
-
-parseurl@~1.3.2, parseurl@~1.3.3:
-  version "1.3.3"
-  resolved "https://registry.yarnpkg.com/parseurl/-/parseurl-1.3.3.tgz#9da19e7bee8d12dff0513ed5b76957793bc2e8d4"
-  integrity sha512-CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ==
-
-pascalcase@^0.1.1:
-  version "0.1.1"
-  resolved "https://registry.yarnpkg.com/pascalcase/-/pascalcase-0.1.1.tgz#b363e55e8006ca6fe21784d2db22bd15d7917f14"
-
-path-browserify@0.0.0:
-  version "0.0.0"
-  resolved "https://registry.yarnpkg.com/path-browserify/-/path-browserify-0.0.0.tgz#a0b870729aae214005b7d5032ec2cbbb0fb4451a"
-
-path-dirname@^1.0.0:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/path-dirname/-/path-dirname-1.0.2.tgz#cc33d24d525e099a5388c0336c6e32b9160609e0"
-
-path-exists@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/path-exists/-/path-exists-3.0.0.tgz#ce0ebeaa5f78cb18925ea7d810d7b59b010fd515"
-
-path-is-absolute@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/path-is-absolute/-/path-is-absolute-1.0.1.tgz#174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f"
-
-path-is-inside@^1.0.1:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/path-is-inside/-/path-is-inside-1.0.2.tgz#365417dede44430d1c11af61027facf074bdfc53"
-
-path-key@^2.0.0, path-key@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/path-key/-/path-key-2.0.1.tgz#411cadb574c5a140d3a4b1910d40d80cc9f40b40"
-
-path-parse@^1.0.6:
-  version "1.0.6"
-  resolved "https://registry.yarnpkg.com/path-parse/-/path-parse-1.0.6.tgz#d62dbb5679405d72c4737ec58600e9ddcf06d24c"
-
-path-to-regexp@0.1.7:
-  version "0.1.7"
-  resolved "https://registry.yarnpkg.com/path-to-regexp/-/path-to-regexp-0.1.7.tgz#df604178005f522f15eb4490e7247a1bfaa67f8c"
-  integrity sha512-5DFkuoqlv1uYQKxy8omFBeJPQcdoE07Kv2sferDCrAq1ohOU+MSDswDIbnx3YAM60qIOnYa53wBhXW0EbMonrQ==
-
-path-type@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/path-type/-/path-type-3.0.0.tgz#cef31dc8e0a1a3bb0d105c0cd97cf3bf47f4e36f"
-  dependencies:
-    pify "^3.0.0"
-
-pbkdf2@^3.0.3:
-  version "3.0.17"
-  resolved "https://registry.yarnpkg.com/pbkdf2/-/pbkdf2-3.0.17.tgz#976c206530617b14ebb32114239f7b09336e93a6"
-  dependencies:
-    create-hash "^1.1.2"
-    create-hmac "^1.1.4"
-    ripemd160 "^2.0.1"
-    safe-buffer "^5.0.1"
-    sha.js "^2.4.8"
-
-pify@^2.0.0:
-  version "2.3.0"
-  resolved "https://registry.yarnpkg.com/pify/-/pify-2.3.0.tgz#ed141a6ac043a849ea588498e7dca8b15330e90c"
-
-pify@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/pify/-/pify-3.0.0.tgz#e5a4acd2c101fdf3d9a4d07f0dbc4db49dd28176"
-
-pify@^4.0.1:
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/pify/-/pify-4.0.1.tgz#4b2cd25c50d598735c50292224fd8c6df41e3231"
-
-pinkie-promise@^2.0.0:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/pinkie-promise/-/pinkie-promise-2.0.1.tgz#2135d6dfa7a358c069ac9b178776288228450ffa"
-  dependencies:
-    pinkie "^2.0.0"
-
-pinkie@^2.0.0:
-  version "2.0.4"
-  resolved "https://registry.yarnpkg.com/pinkie/-/pinkie-2.0.4.tgz#72556b80cfa0d48a974e80e77248e80ed4f7f870"
-
-pkg-dir@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/pkg-dir/-/pkg-dir-3.0.0.tgz#2749020f239ed990881b1f71210d51eb6523bea3"
-  dependencies:
-    find-up "^3.0.0"
-
-popper.js@^1.12:
-  version "1.14.7"
-  resolved "https://registry.yarnpkg.com/popper.js/-/popper.js-1.14.7.tgz#e31ec06cfac6a97a53280c3e55e4e0c860e7738e"
-
-portfinder@^1.0.9:
-  version "1.0.20"
-  resolved "https://registry.yarnpkg.com/portfinder/-/portfinder-1.0.20.tgz#bea68632e54b2e13ab7b0c4775e9b41bf270e44a"
-  dependencies:
-    async "^1.5.2"
-    debug "^2.2.0"
-    mkdirp "0.5.x"
-
-posix-character-classes@^0.1.0:
-  version "0.1.1"
-  resolved "https://registry.yarnpkg.com/posix-character-classes/-/posix-character-classes-0.1.1.tgz#01eac0fe3b5af71a2a6c02feabb8c1fef7e00eab"
-
-postcss-calc@^7.0.1:
-  version "7.0.1"
-  resolved "https://registry.yarnpkg.com/postcss-calc/-/postcss-calc-7.0.1.tgz#36d77bab023b0ecbb9789d84dcb23c4941145436"
-  dependencies:
-    css-unit-converter "^1.1.1"
-    postcss "^7.0.5"
-    postcss-selector-parser "^5.0.0-rc.4"
-    postcss-value-parser "^3.3.1"
-
-postcss-colormin@^4.0.3:
-  version "4.0.3"
-  resolved "https://registry.yarnpkg.com/postcss-colormin/-/postcss-colormin-4.0.3.tgz#ae060bce93ed794ac71264f08132d550956bd381"
-  dependencies:
-    browserslist "^4.0.0"
-    color "^3.0.0"
-    has "^1.0.0"
-    postcss "^7.0.0"
-    postcss-value-parser "^3.0.0"
-
-postcss-convert-values@^4.0.1:
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/postcss-convert-values/-/postcss-convert-values-4.0.1.tgz#ca3813ed4da0f812f9d43703584e449ebe189a7f"
-  dependencies:
-    postcss "^7.0.0"
-    postcss-value-parser "^3.0.0"
-
-postcss-discard-comments@^4.0.2:
-  version "4.0.2"
-  resolved "https://registry.yarnpkg.com/postcss-discard-comments/-/postcss-discard-comments-4.0.2.tgz#1fbabd2c246bff6aaad7997b2b0918f4d7af4033"
-  dependencies:
-    postcss "^7.0.0"
-
-postcss-discard-duplicates@^4.0.2:
-  version "4.0.2"
-  resolved "https://registry.yarnpkg.com/postcss-discard-duplicates/-/postcss-discard-duplicates-4.0.2.tgz#3fe133cd3c82282e550fc9b239176a9207b784eb"
-  dependencies:
-    postcss "^7.0.0"
-
-postcss-discard-empty@^4.0.1:
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/postcss-discard-empty/-/postcss-discard-empty-4.0.1.tgz#c8c951e9f73ed9428019458444a02ad90bb9f765"
-  dependencies:
-    postcss "^7.0.0"
-
-postcss-discard-overridden@^4.0.1:
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/postcss-discard-overridden/-/postcss-discard-overridden-4.0.1.tgz#652aef8a96726f029f5e3e00146ee7a4e755ff57"
-  dependencies:
-    postcss "^7.0.0"
-
-postcss-load-config@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/postcss-load-config/-/postcss-load-config-2.0.0.tgz#f1312ddbf5912cd747177083c5ef7a19d62ee484"
-  dependencies:
-    cosmiconfig "^4.0.0"
-    import-cwd "^2.0.0"
-
-postcss-loader@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/postcss-loader/-/postcss-loader-3.0.0.tgz#6b97943e47c72d845fa9e03f273773d4e8dd6c2d"
-  dependencies:
-    loader-utils "^1.1.0"
-    postcss "^7.0.0"
-    postcss-load-config "^2.0.0"
-    schema-utils "^1.0.0"
-
-postcss-merge-longhand@^4.0.11:
-  version "4.0.11"
-  resolved "https://registry.yarnpkg.com/postcss-merge-longhand/-/postcss-merge-longhand-4.0.11.tgz#62f49a13e4a0ee04e7b98f42bb16062ca2549e24"
-  dependencies:
-    css-color-names "0.0.4"
-    postcss "^7.0.0"
-    postcss-value-parser "^3.0.0"
-    stylehacks "^4.0.0"
-
-postcss-merge-rules@^4.0.3:
-  version "4.0.3"
-  resolved "https://registry.yarnpkg.com/postcss-merge-rules/-/postcss-merge-rules-4.0.3.tgz#362bea4ff5a1f98e4075a713c6cb25aefef9a650"
-  dependencies:
-    browserslist "^4.0.0"
-    caniuse-api "^3.0.0"
-    cssnano-util-same-parent "^4.0.0"
-    postcss "^7.0.0"
-    postcss-selector-parser "^3.0.0"
-    vendors "^1.0.0"
-
-postcss-minify-font-values@^4.0.2:
-  version "4.0.2"
-  resolved "https://registry.yarnpkg.com/postcss-minify-font-values/-/postcss-minify-font-values-4.0.2.tgz#cd4c344cce474343fac5d82206ab2cbcb8afd5a6"
-  dependencies:
-    postcss "^7.0.0"
-    postcss-value-parser "^3.0.0"
-
-postcss-minify-gradients@^4.0.2:
-  version "4.0.2"
-  resolved "https://registry.yarnpkg.com/postcss-minify-gradients/-/postcss-minify-gradients-4.0.2.tgz#93b29c2ff5099c535eecda56c4aa6e665a663471"
-  dependencies:
-    cssnano-util-get-arguments "^4.0.0"
-    is-color-stop "^1.0.0"
-    postcss "^7.0.0"
-    postcss-value-parser "^3.0.0"
-
-postcss-minify-params@^4.0.2:
-  version "4.0.2"
-  resolved "https://registry.yarnpkg.com/postcss-minify-params/-/postcss-minify-params-4.0.2.tgz#6b9cef030c11e35261f95f618c90036d680db874"
-  dependencies:
-    alphanum-sort "^1.0.0"
-    browserslist "^4.0.0"
-    cssnano-util-get-arguments "^4.0.0"
-    postcss "^7.0.0"
-    postcss-value-parser "^3.0.0"
-    uniqs "^2.0.0"
-
-postcss-minify-selectors@^4.0.2:
-  version "4.0.2"
-  resolved "https://registry.yarnpkg.com/postcss-minify-selectors/-/postcss-minify-selectors-4.0.2.tgz#e2e5eb40bfee500d0cd9243500f5f8ea4262fbd8"
-  dependencies:
-    alphanum-sort "^1.0.0"
-    has "^1.0.0"
-    postcss "^7.0.0"
-    postcss-selector-parser "^3.0.0"
-
-postcss-modules-extract-imports@^1.2.0:
-  version "1.2.1"
-  resolved "https://registry.yarnpkg.com/postcss-modules-extract-imports/-/postcss-modules-extract-imports-1.2.1.tgz#dc87e34148ec7eab5f791f7cd5849833375b741a"
-  dependencies:
-    postcss "^6.0.1"
-
-postcss-modules-local-by-default@^1.2.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/postcss-modules-local-by-default/-/postcss-modules-local-by-default-1.2.0.tgz#f7d80c398c5a393fa7964466bd19500a7d61c069"
-  dependencies:
-    css-selector-tokenizer "^0.7.0"
-    postcss "^6.0.1"
-
-postcss-modules-scope@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/postcss-modules-scope/-/postcss-modules-scope-1.1.0.tgz#d6ea64994c79f97b62a72b426fbe6056a194bb90"
-  dependencies:
-    css-selector-tokenizer "^0.7.0"
-    postcss "^6.0.1"
-
-postcss-modules-values@^1.3.0:
-  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/postcss-modules-values/-/postcss-modules-values-1.3.0.tgz#ecffa9d7e192518389f42ad0e83f72aec456ea20"
-  dependencies:
-    icss-replace-symbols "^1.1.0"
-    postcss "^6.0.1"
-
-postcss-normalize-charset@^4.0.1:
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/postcss-normalize-charset/-/postcss-normalize-charset-4.0.1.tgz#8b35add3aee83a136b0471e0d59be58a50285dd4"
-  dependencies:
-    postcss "^7.0.0"
-
-postcss-normalize-display-values@^4.0.2:
-  version "4.0.2"
-  resolved "https://registry.yarnpkg.com/postcss-normalize-display-values/-/postcss-normalize-display-values-4.0.2.tgz#0dbe04a4ce9063d4667ed2be476bb830c825935a"
-  dependencies:
-    cssnano-util-get-match "^4.0.0"
-    postcss "^7.0.0"
-    postcss-value-parser "^3.0.0"
-
-postcss-normalize-positions@^4.0.2:
-  version "4.0.2"
-  resolved "https://registry.yarnpkg.com/postcss-normalize-positions/-/postcss-normalize-positions-4.0.2.tgz#05f757f84f260437378368a91f8932d4b102917f"
-  dependencies:
-    cssnano-util-get-arguments "^4.0.0"
-    has "^1.0.0"
-    postcss "^7.0.0"
-    postcss-value-parser "^3.0.0"
-
-postcss-normalize-repeat-style@^4.0.2:
-  version "4.0.2"
-  resolved "https://registry.yarnpkg.com/postcss-normalize-repeat-style/-/postcss-normalize-repeat-style-4.0.2.tgz#c4ebbc289f3991a028d44751cbdd11918b17910c"
-  dependencies:
-    cssnano-util-get-arguments "^4.0.0"
-    cssnano-util-get-match "^4.0.0"
-    postcss "^7.0.0"
-    postcss-value-parser "^3.0.0"
-
-postcss-normalize-string@^4.0.2:
-  version "4.0.2"
-  resolved "https://registry.yarnpkg.com/postcss-normalize-string/-/postcss-normalize-string-4.0.2.tgz#cd44c40ab07a0c7a36dc5e99aace1eca4ec2690c"
-  dependencies:
-    has "^1.0.0"
-    postcss "^7.0.0"
-    postcss-value-parser "^3.0.0"
-
-postcss-normalize-timing-functions@^4.0.2:
-  version "4.0.2"
-  resolved "https://registry.yarnpkg.com/postcss-normalize-timing-functions/-/postcss-normalize-timing-functions-4.0.2.tgz#8e009ca2a3949cdaf8ad23e6b6ab99cb5e7d28d9"
-  dependencies:
-    cssnano-util-get-match "^4.0.0"
-    postcss "^7.0.0"
-    postcss-value-parser "^3.0.0"
-
-postcss-normalize-unicode@^4.0.1:
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/postcss-normalize-unicode/-/postcss-normalize-unicode-4.0.1.tgz#841bd48fdcf3019ad4baa7493a3d363b52ae1cfb"
-  dependencies:
-    browserslist "^4.0.0"
-    postcss "^7.0.0"
-    postcss-value-parser "^3.0.0"
-
-postcss-normalize-url@^4.0.1:
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/postcss-normalize-url/-/postcss-normalize-url-4.0.1.tgz#10e437f86bc7c7e58f7b9652ed878daaa95faae1"
-  dependencies:
-    is-absolute-url "^2.0.0"
-    normalize-url "^3.0.0"
-    postcss "^7.0.0"
-    postcss-value-parser "^3.0.0"
-
-postcss-normalize-whitespace@^4.0.2:
-  version "4.0.2"
-  resolved "https://registry.yarnpkg.com/postcss-normalize-whitespace/-/postcss-normalize-whitespace-4.0.2.tgz#bf1d4070fe4fcea87d1348e825d8cc0c5faa7d82"
-  dependencies:
-    postcss "^7.0.0"
-    postcss-value-parser "^3.0.0"
-
-postcss-ordered-values@^4.1.2:
-  version "4.1.2"
-  resolved "https://registry.yarnpkg.com/postcss-ordered-values/-/postcss-ordered-values-4.1.2.tgz#0cf75c820ec7d5c4d280189559e0b571ebac0eee"
-  dependencies:
-    cssnano-util-get-arguments "^4.0.0"
-    postcss "^7.0.0"
-    postcss-value-parser "^3.0.0"
-
-postcss-reduce-initial@^4.0.3:
-  version "4.0.3"
-  resolved "https://registry.yarnpkg.com/postcss-reduce-initial/-/postcss-reduce-initial-4.0.3.tgz#7fd42ebea5e9c814609639e2c2e84ae270ba48df"
-  dependencies:
-    browserslist "^4.0.0"
-    caniuse-api "^3.0.0"
-    has "^1.0.0"
-    postcss "^7.0.0"
-
-postcss-reduce-transforms@^4.0.2:
-  version "4.0.2"
-  resolved "https://registry.yarnpkg.com/postcss-reduce-transforms/-/postcss-reduce-transforms-4.0.2.tgz#17efa405eacc6e07be3414a5ca2d1074681d4e29"
-  dependencies:
-    cssnano-util-get-match "^4.0.0"
-    has "^1.0.0"
-    postcss "^7.0.0"
-    postcss-value-parser "^3.0.0"
-
-postcss-selector-parser@^3.0.0:
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/postcss-selector-parser/-/postcss-selector-parser-3.1.1.tgz#4f875f4afb0c96573d5cf4d74011aee250a7e865"
-  dependencies:
-    dot-prop "^4.1.1"
-    indexes-of "^1.0.1"
-    uniq "^1.0.1"
-
-postcss-selector-parser@^5.0.0, postcss-selector-parser@^5.0.0-rc.4:
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/postcss-selector-parser/-/postcss-selector-parser-5.0.0.tgz#249044356697b33b64f1a8f7c80922dddee7195c"
-  dependencies:
-    cssesc "^2.0.0"
-    indexes-of "^1.0.1"
-    uniq "^1.0.1"
-
-postcss-svgo@^4.0.2:
-  version "4.0.2"
-  resolved "https://registry.yarnpkg.com/postcss-svgo/-/postcss-svgo-4.0.2.tgz#17b997bc711b333bab143aaed3b8d3d6e3d38258"
-  dependencies:
-    is-svg "^3.0.0"
-    postcss "^7.0.0"
-    postcss-value-parser "^3.0.0"
-    svgo "^1.0.0"
-
-postcss-unique-selectors@^4.0.1:
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/postcss-unique-selectors/-/postcss-unique-selectors-4.0.1.tgz#9446911f3289bfd64c6d680f073c03b1f9ee4bac"
-  dependencies:
-    alphanum-sort "^1.0.0"
-    postcss "^7.0.0"
-    uniqs "^2.0.0"
-
-postcss-value-parser@^3.0.0, postcss-value-parser@^3.3.0, postcss-value-parser@^3.3.1:
-  version "3.3.1"
-  resolved "https://registry.yarnpkg.com/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz#9ff822547e2893213cf1c30efa51ac5fd1ba8281"
-
-postcss@^6.0.1, postcss@^6.0.23:
-  version "6.0.23"
-  resolved "https://registry.yarnpkg.com/postcss/-/postcss-6.0.23.tgz#61c82cc328ac60e677645f979054eb98bc0e3324"
-  dependencies:
-    chalk "^2.4.1"
-    source-map "^0.6.1"
-    supports-color "^5.4.0"
-
-postcss@^7.0.0, postcss@^7.0.1, postcss@^7.0.14, postcss@^7.0.5:
-  version "7.0.14"
-  resolved "https://registry.yarnpkg.com/postcss/-/postcss-7.0.14.tgz#4527ed6b1ca0d82c53ce5ec1a2041c2346bbd6e5"
-  dependencies:
-    chalk "^2.4.2"
-    source-map "^0.6.1"
-    supports-color "^6.1.0"
-
-prettier@1.16.3:
-  version "1.16.3"
-  resolved "https://registry.yarnpkg.com/prettier/-/prettier-1.16.3.tgz#8c62168453badef702f34b45b6ee899574a6a65d"
-
-private@^0.1.6, private@~0.1.5:
-  version "0.1.8"
-  resolved "https://registry.yarnpkg.com/private/-/private-0.1.8.tgz#2381edb3689f7a53d653190060fcf822d2f368ff"
-
-process-nextick-args@~2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-2.0.0.tgz#a37d732f4271b4ab1ad070d35508e8290788ffaa"
-
-process@^0.11.10:
-  version "0.11.10"
-  resolved "https://registry.yarnpkg.com/process/-/process-0.11.10.tgz#7332300e840161bda3e69a1d1d91a7d4bc16f182"
-
-promise-inflight@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/promise-inflight/-/promise-inflight-1.0.1.tgz#98472870bf228132fcbdd868129bad12c3c029e3"
-
-proxy-addr@~2.0.7:
-  version "2.0.7"
-  resolved "https://registry.yarnpkg.com/proxy-addr/-/proxy-addr-2.0.7.tgz#f19fe69ceab311eeb94b42e70e8c2070f9ba1025"
-  integrity sha512-llQsMLSUDUPT44jdrU/O37qlnifitDP+ZwrmmZcoSKyLKvtZxpyV0n2/bD/N4tBAAZ/gJEdZU7KMraoK1+XYAg==
-  dependencies:
-    forwarded "0.2.0"
-    ipaddr.js "1.9.1"
-
-prr@~1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/prr/-/prr-1.0.1.tgz#d3fc114ba06995a45ec6893f484ceb1d78f5f476"
-
-pseudomap@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/pseudomap/-/pseudomap-1.0.2.tgz#f052a28da70e618917ef0a8ac34c1ae5a68286b3"
-
-public-encrypt@^4.0.0:
-  version "4.0.3"
-  resolved "https://registry.yarnpkg.com/public-encrypt/-/public-encrypt-4.0.3.tgz#4fcc9d77a07e48ba7527e7cbe0de33d0701331e0"
-  dependencies:
-    bn.js "^4.1.0"
-    browserify-rsa "^4.0.0"
-    create-hash "^1.1.0"
-    parse-asn1 "^5.0.0"
-    randombytes "^2.0.1"
-    safe-buffer "^5.1.2"
-
-pump@^2.0.0:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/pump/-/pump-2.0.1.tgz#12399add6e4cf7526d973cbc8b5ce2e2908b3909"
-  dependencies:
-    end-of-stream "^1.1.0"
-    once "^1.3.1"
-
-pump@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/pump/-/pump-3.0.0.tgz#b4a2116815bde2f4e1ea602354e8c75565107a64"
-  dependencies:
-    end-of-stream "^1.1.0"
-    once "^1.3.1"
-
-pumpify@^1.3.3:
-  version "1.5.1"
-  resolved "https://registry.yarnpkg.com/pumpify/-/pumpify-1.5.1.tgz#36513be246ab27570b1a374a5ce278bfd74370ce"
-  dependencies:
-    duplexify "^3.6.0"
-    inherits "^2.0.3"
-    pump "^2.0.0"
-
-punycode@1.3.2:
-  version "1.3.2"
-  resolved "https://registry.yarnpkg.com/punycode/-/punycode-1.3.2.tgz#9653a036fb7c1ee42342f2325cceefea3926c48d"
-
-punycode@^1.2.4:
-  version "1.4.1"
-  resolved "https://registry.yarnpkg.com/punycode/-/punycode-1.4.1.tgz#c0d5a63b2718800ad8e1eb0fa5269c84dd41845e"
-
-punycode@^2.1.0:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/punycode/-/punycode-2.1.1.tgz#b58b010ac40c22c5657616c8d2c2c02c7bf479ec"
-
-q@^1.1.2:
-  version "1.5.1"
-  resolved "https://registry.yarnpkg.com/q/-/q-1.5.1.tgz#7e32f75b41381291d04611f1bf14109ac00651d7"
-
-qs@6.11.0:
-  version "6.11.0"
-  resolved "https://registry.yarnpkg.com/qs/-/qs-6.11.0.tgz#fd0d963446f7a65e1367e01abd85429453f0c37a"
-  integrity sha512-MvjoMCJwEarSbUYk5O+nmoSzSutSsTwF85zcHPQ9OrlFoZOYIjaqBAJIqIXjptyD5vThxGq52Xu/MaJzRkIk4Q==
-  dependencies:
-    side-channel "^1.0.4"
-
-querystring-es3@^0.2.0:
-  version "0.2.1"
-  resolved "https://registry.yarnpkg.com/querystring-es3/-/querystring-es3-0.2.1.tgz#9ec61f79049875707d69414596fd907a4d711e73"
-
-querystring@0.2.0:
-  version "0.2.0"
-  resolved "https://registry.yarnpkg.com/querystring/-/querystring-0.2.0.tgz#b209849203bb25df820da756e747005878521620"
-
-querystringify@^2.0.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/querystringify/-/querystringify-2.1.0.tgz#7ded8dfbf7879dcc60d0a644ac6754b283ad17ef"
-
-randombytes@^2.0.0, randombytes@^2.0.1, randombytes@^2.0.5:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/randombytes/-/randombytes-2.1.0.tgz#df6f84372f0270dc65cdf6291349ab7a473d4f2a"
-  dependencies:
-    safe-buffer "^5.1.0"
-
-randomfill@^1.0.3:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/randomfill/-/randomfill-1.0.4.tgz#c92196fc86ab42be983f1bf31778224931d61458"
-  dependencies:
-    randombytes "^2.0.5"
-    safe-buffer "^5.1.0"
-
-range-parser@^1.0.3, range-parser@~1.2.1:
-  version "1.2.1"
-  resolved "https://registry.yarnpkg.com/range-parser/-/range-parser-1.2.1.tgz#3cf37023d199e1c24d1a55b84800c2f3e6468031"
-  integrity sha512-Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg==
-
-raw-body@2.5.1:
-  version "2.5.1"
-  resolved "https://registry.yarnpkg.com/raw-body/-/raw-body-2.5.1.tgz#fe1b1628b181b700215e5fd42389f98b71392857"
-  integrity sha512-qqJBtEyVgS0ZmPGdCFPWJ3FreoqvG4MVQln/kCgF7Olq95IbOp0/BWyMwbdtn4VTvkM8Y7khCQ2Xgk/tcrCXig==
-  dependencies:
-    bytes "3.1.2"
-    http-errors "2.0.0"
-    iconv-lite "0.4.24"
-    unpipe "1.0.0"
-
-rc@^1.2.7:
-  version "1.2.8"
-  resolved "https://registry.yarnpkg.com/rc/-/rc-1.2.8.tgz#cd924bf5200a075b83c188cd6b9e211b7fc0d3ed"
-  dependencies:
-    deep-extend "^0.6.0"
-    ini "~1.3.0"
-    minimist "^1.2.0"
-    strip-json-comments "~2.0.1"
-
-"readable-stream@1 || 2", readable-stream@^2.0.0, readable-stream@^2.0.1, readable-stream@^2.0.2, readable-stream@^2.0.6, readable-stream@^2.1.5, readable-stream@^2.2.2, readable-stream@^2.3.3, readable-stream@^2.3.6, readable-stream@~2.3.6:
-  version "2.3.6"
-  resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.6.tgz#b11c27d88b8ff1fbe070643cf94b0c79ae1b0aaf"
-  dependencies:
-    core-util-is "~1.0.0"
-    inherits "~2.0.3"
-    isarray "~1.0.0"
-    process-nextick-args "~2.0.0"
-    safe-buffer "~5.1.1"
-    string_decoder "~1.1.1"
-    util-deprecate "~1.0.1"
-
-readable-stream@^3.0.6:
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-3.1.1.tgz#ed6bbc6c5ba58b090039ff18ce670515795aeb06"
-  dependencies:
-    inherits "^2.0.3"
-    string_decoder "^1.1.1"
-    util-deprecate "^1.0.1"
-
-readdirp@^2.2.1:
-  version "2.2.1"
-  resolved "https://registry.yarnpkg.com/readdirp/-/readdirp-2.2.1.tgz#0e87622a3325aa33e892285caf8b4e846529a525"
-  dependencies:
-    graceful-fs "^4.1.11"
-    micromatch "^3.1.10"
-    readable-stream "^2.0.2"
-
-recast@~0.11.12:
-  version "0.11.23"
-  resolved "https://registry.yarnpkg.com/recast/-/recast-0.11.23.tgz#451fd3004ab1e4df9b4e4b66376b2a21912462d3"
-  dependencies:
-    ast-types "0.9.6"
-    esprima "~3.1.0"
-    private "~0.1.5"
-    source-map "~0.5.0"
-
-regenerate-unicode-properties@^7.0.0:
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/regenerate-unicode-properties/-/regenerate-unicode-properties-7.0.0.tgz#107405afcc4a190ec5ed450ecaa00ed0cafa7a4c"
-  dependencies:
-    regenerate "^1.4.0"
-
-regenerate@^1.2.1, regenerate@^1.4.0:
-  version "1.4.0"
-  resolved "https://registry.yarnpkg.com/regenerate/-/regenerate-1.4.0.tgz#4a856ec4b56e4077c557589cae85e7a4c8869a11"
-
-regenerator-runtime@^0.12.0:
-  version "0.12.1"
-  resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.12.1.tgz#fa1a71544764c036f8c49b13a08b2594c9f8a0de"
-
-regenerator-transform@^0.13.4:
-  version "0.13.4"
-  resolved "https://registry.yarnpkg.com/regenerator-transform/-/regenerator-transform-0.13.4.tgz#18f6763cf1382c69c36df76c6ce122cc694284fb"
-  dependencies:
-    private "^0.1.6"
-
-regex-not@^1.0.0, regex-not@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/regex-not/-/regex-not-1.0.2.tgz#1f4ece27e00b0b65e0247a6810e6a85d83a5752c"
-  dependencies:
-    extend-shallow "^3.0.2"
-    safe-regex "^1.1.0"
-
-regex-parser@^2.2.9:
-  version "2.2.10"
-  resolved "https://registry.yarnpkg.com/regex-parser/-/regex-parser-2.2.10.tgz#9e66a8f73d89a107616e63b39d4deddfee912b37"
-
-regexp-tree@^0.1.0:
-  version "0.1.5"
-  resolved "https://registry.yarnpkg.com/regexp-tree/-/regexp-tree-0.1.5.tgz#7cd71fca17198d04b4176efd79713f2998009397"
-
-regexpu-core@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/regexpu-core/-/regexpu-core-1.0.0.tgz#86a763f58ee4d7c2f6b102e4764050de7ed90c6b"
-  dependencies:
-    regenerate "^1.2.1"
-    regjsgen "^0.2.0"
-    regjsparser "^0.1.4"
-
-regexpu-core@^4.1.3, regexpu-core@^4.2.0:
-  version "4.4.0"
-  resolved "https://registry.yarnpkg.com/regexpu-core/-/regexpu-core-4.4.0.tgz#8d43e0d1266883969720345e70c275ee0aec0d32"
-  dependencies:
-    regenerate "^1.4.0"
-    regenerate-unicode-properties "^7.0.0"
-    regjsgen "^0.5.0"
-    regjsparser "^0.6.0"
-    unicode-match-property-ecmascript "^1.0.4"
-    unicode-match-property-value-ecmascript "^1.0.2"
-
-regjsgen@^0.2.0:
-  version "0.2.0"
-  resolved "https://registry.yarnpkg.com/regjsgen/-/regjsgen-0.2.0.tgz#6c016adeac554f75823fe37ac05b92d5a4edb1f7"
-
-regjsgen@^0.5.0:
-  version "0.5.0"
-  resolved "https://registry.yarnpkg.com/regjsgen/-/regjsgen-0.5.0.tgz#a7634dc08f89209c2049adda3525711fb97265dd"
-
-regjsparser@^0.1.4:
-  version "0.1.5"
-  resolved "https://registry.yarnpkg.com/regjsparser/-/regjsparser-0.1.5.tgz#7ee8f84dc6fa792d3fd0ae228d24bd949ead205c"
-  dependencies:
-    jsesc "~0.5.0"
-
-regjsparser@^0.6.0:
-  version "0.6.0"
-  resolved "https://registry.yarnpkg.com/regjsparser/-/regjsparser-0.6.0.tgz#f1e6ae8b7da2bae96c99399b868cd6c933a2ba9c"
-  dependencies:
-    jsesc "~0.5.0"
-
-relateurl@0.2.x:
-  version "0.2.7"
-  resolved "https://registry.yarnpkg.com/relateurl/-/relateurl-0.2.7.tgz#54dbf377e51440aca90a4cd274600d3ff2d888a9"
-
-remove-trailing-separator@^1.0.1:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/remove-trailing-separator/-/remove-trailing-separator-1.1.0.tgz#c24bce2a283adad5bc3f58e0d48249b92379d8ef"
-
-repeat-element@^1.1.2:
-  version "1.1.3"
-  resolved "https://registry.yarnpkg.com/repeat-element/-/repeat-element-1.1.3.tgz#782e0d825c0c5a3bb39731f84efee6b742e6b1ce"
-
-repeat-string@^1.6.1:
-  version "1.6.1"
-  resolved "https://registry.yarnpkg.com/repeat-string/-/repeat-string-1.6.1.tgz#8dcae470e1c88abc2d600fff4a776286da75e637"
-
-replace-ext@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/replace-ext/-/replace-ext-1.0.0.tgz#de63128373fcbf7c3ccfa4de5a480c45a67958eb"
-
-require-directory@^2.1.1:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/require-directory/-/require-directory-2.1.1.tgz#8c64ad5fd30dab1c976e2344ffe7f792a6a6df42"
-
-require-from-string@^2.0.1:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/require-from-string/-/require-from-string-2.0.2.tgz#89a7fdd938261267318eafe14f9c32e598c36909"
-
-require-main-filename@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/require-main-filename/-/require-main-filename-1.0.1.tgz#97f717b69d48784f5f526a6c5aa8ffdda055a4d1"
-
-requires-port@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/requires-port/-/requires-port-1.0.0.tgz#925d2601d39ac485e091cf0da5c6e694dc3dcaff"
-  integrity sha1-kl0mAdOaxIXgkc8NpcbmlNw9yv8=
-
-resolve-cwd@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/resolve-cwd/-/resolve-cwd-2.0.0.tgz#00a9f7387556e27038eae232caa372a6a59b665a"
-  dependencies:
-    resolve-from "^3.0.0"
-
-resolve-dir@^1.0.0, resolve-dir@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/resolve-dir/-/resolve-dir-1.0.1.tgz#79a40644c362be82f26effe739c9bb5382046f43"
-  dependencies:
-    expand-tilde "^2.0.0"
-    global-modules "^1.0.0"
-
-resolve-from@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-3.0.0.tgz#b22c7af7d9d6881bc8b6e653335eebcb0a188748"
-
-resolve-url-loader@^2.3.1:
-  version "2.3.2"
-  resolved "https://registry.yarnpkg.com/resolve-url-loader/-/resolve-url-loader-2.3.2.tgz#83bb9ebc392b66c563795eef22f078970357a26e"
-  dependencies:
-    adjust-sourcemap-loader "^1.1.0"
-    camelcase "^4.1.0"
-    convert-source-map "^1.5.1"
-    loader-utils "^1.1.0"
-    lodash.defaults "^4.0.0"
-    rework "^1.0.1"
-    rework-visit "^1.0.0"
-    source-map "^0.5.7"
-    urix "^0.1.0"
-
-resolve-url@^0.2.1:
-  version "0.2.1"
-  resolved "https://registry.yarnpkg.com/resolve-url/-/resolve-url-0.2.1.tgz#2c637fe77c893afd2a663fe21aa9080068e2052a"
-
-resolve@^1.3.2, resolve@^1.8.1:
-  version "1.10.0"
-  resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.10.0.tgz#3bdaaeaf45cc07f375656dfd2e54ed0810b101ba"
-  dependencies:
-    path-parse "^1.0.6"
-
-ret@~0.1.10:
-  version "0.1.15"
-  resolved "https://registry.yarnpkg.com/ret/-/ret-0.1.15.tgz#b8a4825d5bdb1fc3f6f53c2bc33f81388681c7bc"
-
-rework-visit@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/rework-visit/-/rework-visit-1.0.0.tgz#9945b2803f219e2f7aca00adb8bc9f640f842c9a"
-
-rework@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/rework/-/rework-1.0.1.tgz#30806a841342b54510aa4110850cd48534144aa7"
-  dependencies:
-    convert-source-map "^0.3.3"
-    css "^2.0.0"
-
-rgb-regex@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/rgb-regex/-/rgb-regex-1.0.1.tgz#c0e0d6882df0e23be254a475e8edd41915feaeb1"
-
-rgba-regex@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/rgba-regex/-/rgba-regex-1.0.0.tgz#43374e2e2ca0968b0ef1523460b7d730ff22eeb3"
-
-rimraf@^2.2.8, rimraf@^2.5.4, rimraf@^2.6.1, rimraf@^2.6.2:
-  version "2.6.3"
-  resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.6.3.tgz#b2d104fe0d8fb27cf9e0a1cda8262dd3833c6cab"
-  dependencies:
-    glob "^7.1.3"
-
-ripemd160@^2.0.0, ripemd160@^2.0.1:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/ripemd160/-/ripemd160-2.0.2.tgz#a1c1a6f624751577ba5d07914cbc92850585890c"
-  dependencies:
-    hash-base "^3.0.0"
-    inherits "^2.0.1"
-
-run-queue@^1.0.0, run-queue@^1.0.3:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/run-queue/-/run-queue-1.0.3.tgz#e848396f057d223f24386924618e25694161ec47"
-  dependencies:
-    aproba "^1.1.1"
-
-safe-buffer@5.1.2, safe-buffer@~5.1.0, safe-buffer@~5.1.1:
-  version "5.1.2"
-  resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.2.tgz#991ec69d296e0313747d59bdfd2b745c35f8828d"
-
-safe-buffer@5.2.1, safe-buffer@^5.0.1, safe-buffer@^5.1.0, safe-buffer@^5.1.1, safe-buffer@^5.1.2:
-  version "5.2.1"
-  resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.2.1.tgz#1eaf9fa9bdb1fdd4ec75f58f9cdb4e6b7827eec6"
-  integrity sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==
-
-safe-regex@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/safe-regex/-/safe-regex-1.1.0.tgz#40a3669f3b077d1e943d44629e157dd48023bf2e"
-  dependencies:
-    ret "~0.1.10"
-
-"safer-buffer@>= 2.1.2 < 3":
-  version "2.1.2"
-  resolved "https://registry.yarnpkg.com/safer-buffer/-/safer-buffer-2.1.2.tgz#44fa161b0187b9549dd84bb91802f9bd8385cd6a"
-  integrity sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==
-
-sass-loader@^7.1.0:
-  version "7.1.0"
-  resolved "https://registry.yarnpkg.com/sass-loader/-/sass-loader-7.1.0.tgz#16fd5138cb8b424bf8a759528a1972d72aad069d"
-  dependencies:
-    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"
-
-sass@^1.15.2:
-  version "1.17.2"
-  resolved "https://registry.yarnpkg.com/sass/-/sass-1.17.2.tgz#b5a28f2f13c6a219f28084c03623bb2c8d176323"
-  dependencies:
-    chokidar "^2.0.0"
-
-sax@^1.2.4, sax@~1.2.4:
-  version "1.2.4"
-  resolved "https://registry.yarnpkg.com/sax/-/sax-1.2.4.tgz#2816234e2378bddc4e5354fab5caa895df7100d9"
-
-schema-utils@^0.4.5:
-  version "0.4.7"
-  resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-0.4.7.tgz#ba74f597d2be2ea880131746ee17d0a093c68187"
-  dependencies:
-    ajv "^6.1.0"
-    ajv-keywords "^3.1.0"
-
-schema-utils@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-1.0.0.tgz#0b79a93204d7b600d4b2850d1f66c2a34951c770"
-  dependencies:
-    ajv "^6.1.0"
-    ajv-errors "^1.0.0"
-    ajv-keywords "^3.1.0"
-
-select-hose@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/select-hose/-/select-hose-2.0.0.tgz#625d8658f865af43ec962bfc376a37359a4994ca"
-
-selfsigned@^1.9.1:
-  version "1.10.4"
-  resolved "https://registry.yarnpkg.com/selfsigned/-/selfsigned-1.10.4.tgz#cdd7eccfca4ed7635d47a08bf2d5d3074092e2cd"
-  dependencies:
-    node-forge "0.7.5"
-
-semver@^5.3.0, semver@^5.4.1, semver@^5.5.0, semver@^5.5.1, semver@^5.6.0:
-  version "5.6.0"
-  resolved "https://registry.yarnpkg.com/semver/-/semver-5.6.0.tgz#7e74256fbaa49c75aa7c7a205cc22799cac80004"
-
-send@0.18.0:
-  version "0.18.0"
-  resolved "https://registry.yarnpkg.com/send/-/send-0.18.0.tgz#670167cc654b05f5aa4a767f9113bb371bc706be"
-  integrity sha512-qqWzuOjSFOuqPjFe4NOsMLafToQQwBSOEpS+FwEt3A2V3vKubTquT3vmLTQpFgMXp8AlFWFuP1qKaJZOtPpVXg==
-  dependencies:
-    debug "2.6.9"
-    depd "2.0.0"
-    destroy "1.2.0"
-    encodeurl "~1.0.2"
-    escape-html "~1.0.3"
-    etag "~1.8.1"
-    fresh "0.5.2"
-    http-errors "2.0.0"
-    mime "1.6.0"
-    ms "2.1.3"
-    on-finished "2.4.1"
-    range-parser "~1.2.1"
-    statuses "2.0.1"
-
-serialize-javascript@^1.4.0:
-  version "1.6.1"
-  resolved "https://registry.yarnpkg.com/serialize-javascript/-/serialize-javascript-1.6.1.tgz#4d1f697ec49429a847ca6f442a2a755126c4d879"
-
-serve-index@^1.7.2:
-  version "1.9.1"
-  resolved "https://registry.yarnpkg.com/serve-index/-/serve-index-1.9.1.tgz#d3768d69b1e7d82e5ce050fff5b453bea12a9239"
-  dependencies:
-    accepts "~1.3.4"
-    batch "0.6.1"
-    debug "2.6.9"
-    escape-html "~1.0.3"
-    http-errors "~1.6.2"
-    mime-types "~2.1.17"
-    parseurl "~1.3.2"
-
-serve-static@1.15.0:
-  version "1.15.0"
-  resolved "https://registry.yarnpkg.com/serve-static/-/serve-static-1.15.0.tgz#faaef08cffe0a1a62f60cad0c4e513cff0ac9540"
-  integrity sha512-XGuRDNjXUijsUL0vl6nSD7cwURuzEgglbOaFuZM9g3kwDXOWVTck0jLzjPzGD+TazWbboZYu52/9/XPdUgne9g==
-  dependencies:
-    encodeurl "~1.0.2"
-    escape-html "~1.0.3"
-    parseurl "~1.3.3"
-    send "0.18.0"
-
-set-blocking@^2.0.0, set-blocking@~2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/set-blocking/-/set-blocking-2.0.0.tgz#045f9782d011ae9a6803ddd382b24392b3d890f7"
-
-set-value@^0.4.3:
-  version "0.4.3"
-  resolved "https://registry.yarnpkg.com/set-value/-/set-value-0.4.3.tgz#7db08f9d3d22dc7f78e53af3c3bf4666ecdfccf1"
-  dependencies:
-    extend-shallow "^2.0.1"
-    is-extendable "^0.1.1"
-    is-plain-object "^2.0.1"
-    to-object-path "^0.3.0"
-
-set-value@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/set-value/-/set-value-2.0.0.tgz#71ae4a88f0feefbbf52d1ea604f3fb315ebb6274"
-  dependencies:
-    extend-shallow "^2.0.1"
-    is-extendable "^0.1.1"
-    is-plain-object "^2.0.3"
-    split-string "^3.0.1"
-
-setimmediate@^1.0.4:
-  version "1.0.5"
-  resolved "https://registry.yarnpkg.com/setimmediate/-/setimmediate-1.0.5.tgz#290cbb232e306942d7d7ea9b83732ab7856f8285"
-
-setprototypeof@1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/setprototypeof/-/setprototypeof-1.1.0.tgz#d0bd85536887b6fe7c0d818cb962d9d91c54e656"
-
-setprototypeof@1.2.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/setprototypeof/-/setprototypeof-1.2.0.tgz#66c9a24a73f9fc28cbe66b09fed3d33dcaf1b424"
-  integrity sha512-E5LDX7Wrp85Kil5bhZv46j8jOeboKq5JMmYM3gVGdGH8xFpPWXUMsNrlODCrkoxMEeNi/XZIwuRvY4XNwYMJpw==
-
-sha.js@^2.4.0, sha.js@^2.4.8:
-  version "2.4.11"
-  resolved "https://registry.yarnpkg.com/sha.js/-/sha.js-2.4.11.tgz#37a5cf0b81ecbc6943de109ba2960d1b26584ae7"
-  dependencies:
-    inherits "^2.0.1"
-    safe-buffer "^5.0.1"
-
-shallow-clone@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/shallow-clone/-/shallow-clone-1.0.0.tgz#4480cd06e882ef68b2ad88a3ea54832e2c48b571"
-  dependencies:
-    is-extendable "^0.1.1"
-    kind-of "^5.0.0"
-    mixin-object "^2.0.1"
-
-shebang-command@^1.2.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/shebang-command/-/shebang-command-1.2.0.tgz#44aac65b695b03398968c39f363fee5deafdf1ea"
-  dependencies:
-    shebang-regex "^1.0.0"
-
-shebang-regex@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/shebang-regex/-/shebang-regex-1.0.0.tgz#da42f49740c0b42db2ca9728571cb190c98efea3"
-
-shellwords@^0.1.1:
-  version "0.1.1"
-  resolved "https://registry.yarnpkg.com/shellwords/-/shellwords-0.1.1.tgz#d6b9181c1a48d397324c84871efbcfc73fc0654b"
-
-side-channel@^1.0.4:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/side-channel/-/side-channel-1.0.4.tgz#efce5c8fdc104ee751b25c58d4290011fa5ea2cf"
-  integrity sha512-q5XPytqFEIKHkGdiMIrY10mvLRvnQh42/+GoBlFW3b2LXLE2xxJpZFdm94we0BaoV3RwJyGqg5wS7epxTv0Zvw==
-  dependencies:
-    call-bind "^1.0.0"
-    get-intrinsic "^1.0.2"
-    object-inspect "^1.9.0"
-
-signal-exit@^3.0.0:
-  version "3.0.2"
-  resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.2.tgz#b5fdc08f1287ea1178628e415e25132b73646c6d"
-
-simple-swizzle@^0.2.2:
-  version "0.2.2"
-  resolved "https://registry.yarnpkg.com/simple-swizzle/-/simple-swizzle-0.2.2.tgz#a4da6b635ffcccca33f70d17cb92592de95e557a"
-  dependencies:
-    is-arrayish "^0.3.1"
-
-slash@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/slash/-/slash-1.0.0.tgz#c41f2f6c39fc16d1cd17ad4b5d896114ae470d55"
-
-snapdragon-node@^2.0.1:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/snapdragon-node/-/snapdragon-node-2.1.1.tgz#6c175f86ff14bdb0724563e8f3c1b021a286853b"
-  dependencies:
-    define-property "^1.0.0"
-    isobject "^3.0.0"
-    snapdragon-util "^3.0.1"
-
-snapdragon-util@^3.0.1:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/snapdragon-util/-/snapdragon-util-3.0.1.tgz#f956479486f2acd79700693f6f7b805e45ab56e2"
-  dependencies:
-    kind-of "^3.2.0"
-
-snapdragon@^0.8.1:
-  version "0.8.2"
-  resolved "https://registry.yarnpkg.com/snapdragon/-/snapdragon-0.8.2.tgz#64922e7c565b0e14204ba1aa7d6964278d25182d"
-  dependencies:
-    base "^0.11.1"
-    debug "^2.2.0"
-    define-property "^0.2.5"
-    extend-shallow "^2.0.1"
-    map-cache "^0.2.2"
-    source-map "^0.5.6"
-    source-map-resolve "^0.5.0"
-    use "^3.1.0"
-
-sockjs-client@1.3.0:
-  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/sockjs-client/-/sockjs-client-1.3.0.tgz#12fc9d6cb663da5739d3dc5fb6e8687da95cb177"
-  dependencies:
-    debug "^3.2.5"
-    eventsource "^1.0.7"
-    faye-websocket "~0.11.1"
-    inherits "^2.0.3"
-    json3 "^3.3.2"
-    url-parse "^1.4.3"
-
-sockjs@0.3.19:
-  version "0.3.19"
-  resolved "https://registry.yarnpkg.com/sockjs/-/sockjs-0.3.19.tgz#d976bbe800af7bd20ae08598d582393508993c0d"
-  dependencies:
-    faye-websocket "^0.10.0"
-    uuid "^3.0.1"
-
-source-list-map@^2.0.0:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/source-list-map/-/source-list-map-2.0.1.tgz#3993bd873bfc48479cca9ea3a547835c7c154b34"
-
-source-map-resolve@^0.5.0, source-map-resolve@^0.5.2:
-  version "0.5.2"
-  resolved "https://registry.yarnpkg.com/source-map-resolve/-/source-map-resolve-0.5.2.tgz#72e2cc34095543e43b2c62b2c4c10d4a9054f259"
-  dependencies:
-    atob "^2.1.1"
-    decode-uri-component "^0.2.0"
-    resolve-url "^0.2.1"
-    source-map-url "^0.4.0"
-    urix "^0.1.0"
-
-source-map-support@~0.5.9:
-  version "0.5.10"
-  resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.10.tgz#2214080bc9d51832511ee2bab96e3c2f9353120c"
-  dependencies:
-    buffer-from "^1.0.0"
-    source-map "^0.6.0"
-
-source-map-url@^0.4.0:
-  version "0.4.0"
-  resolved "https://registry.yarnpkg.com/source-map-url/-/source-map-url-0.4.0.tgz#3e935d7ddd73631b97659956d55128e87b5084a3"
-
-source-map@^0.5.0, source-map@^0.5.3, source-map@^0.5.6, source-map@^0.5.7, source-map@~0.5.0:
-  version "0.5.7"
-  resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.5.7.tgz#8a039d2d1021d22d1ea14c80d8ea468ba2ef3fcc"
-
-source-map@^0.6.0, source-map@^0.6.1, source-map@~0.6.0, source-map@~0.6.1:
-  version "0.6.1"
-  resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.6.1.tgz#74722af32e9614e9c287a8d0bbde48b5e2f1a263"
-
-spdy-transport@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/spdy-transport/-/spdy-transport-3.0.0.tgz#00d4863a6400ad75df93361a1608605e5dcdcf31"
-  dependencies:
-    debug "^4.1.0"
-    detect-node "^2.0.4"
-    hpack.js "^2.1.6"
-    obuf "^1.1.2"
-    readable-stream "^3.0.6"
-    wbuf "^1.7.3"
-
-spdy@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/spdy/-/spdy-4.0.0.tgz#81f222b5a743a329aa12cea6a390e60e9b613c52"
-  dependencies:
-    debug "^4.1.0"
-    handle-thing "^2.0.0"
-    http-deceiver "^1.2.7"
-    select-hose "^2.0.0"
-    spdy-transport "^3.0.0"
-
-split-string@^3.0.1, split-string@^3.0.2:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/split-string/-/split-string-3.1.0.tgz#7cb09dda3a86585705c64b39a6466038682e8fe2"
-  dependencies:
-    extend-shallow "^3.0.0"
-
-sprintf-js@~1.0.2:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.0.3.tgz#04e6926f662895354f3dd015203633b857297e2c"
-  integrity sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw=
-
-ssri@^6.0.1:
-  version "6.0.2"
-  resolved "https://registry.yarnpkg.com/ssri/-/ssri-6.0.2.tgz#157939134f20464e7301ddba3e90ffa8f7728ac5"
-  integrity sha512-cepbSq/neFK7xB6A50KHN0xHDotYzq58wWCa5LeWqnPrHG8GzfEjO/4O8kpmcGW+oaxkvhEJCWgbgNk4/ZV93Q==
-  dependencies:
-    figgy-pudding "^3.5.1"
-
-stable@^0.1.8:
-  version "0.1.8"
-  resolved "https://registry.yarnpkg.com/stable/-/stable-0.1.8.tgz#836eb3c8382fe2936feaf544631017ce7d47a3cf"
-
-stackframe@^1.0.4:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/stackframe/-/stackframe-1.0.4.tgz#357b24a992f9427cba6b545d96a14ed2cbca187b"
-
-static-extend@^0.1.1:
-  version "0.1.2"
-  resolved "https://registry.yarnpkg.com/static-extend/-/static-extend-0.1.2.tgz#60809c39cbff55337226fd5e0b520f341f1fb5c6"
-  dependencies:
-    define-property "^0.2.5"
-    object-copy "^0.1.0"
-
-statuses@2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/statuses/-/statuses-2.0.1.tgz#55cb000ccf1d48728bd23c685a063998cf1a1b63"
-  integrity sha512-RwNA9Z/7PrK06rYLIzFMlaF+l73iwpzsqRIFgbMLbTcLD6cOao82TaWefPXQvB2fOC4AjuYSEndS7N/mTCbkdQ==
+    "cssesc" "^3.0.0"
+    "util-deprecate" "^1.0.2"
+
+"postcss-svgo@^5.1.0":
+  "integrity" "sha512-D75KsH1zm5ZrHyxPakAxJWtkyXew5qwS70v56exwvw542d9CRtTo78K0WeFxZB4G7JXKKMbEZtZayTGdIky/eA=="
+  "resolved" "https://registry.npmjs.org/postcss-svgo/-/postcss-svgo-5.1.0.tgz"
+  "version" "5.1.0"
+  dependencies:
+    "postcss-value-parser" "^4.2.0"
+    "svgo" "^2.7.0"
+
+"postcss-unique-selectors@^5.1.1":
+  "integrity" "sha512-5JiODlELrz8L2HwxfPnhOWZYWDxVHWL83ufOv84NrcgipI7TaeRsatAhK4Tr2/ZiYldpK/wBvw5BD3qfaK96GA=="
+  "resolved" "https://registry.npmjs.org/postcss-unique-selectors/-/postcss-unique-selectors-5.1.1.tgz"
+  "version" "5.1.1"
+  dependencies:
+    "postcss-selector-parser" "^6.0.5"
+
+"postcss-value-parser@^4.0.0", "postcss-value-parser@^4.1.0", "postcss-value-parser@^4.2.0":
+  "integrity" "sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ=="
+  "resolved" "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.2.0.tgz"
+  "version" "4.2.0"
+
+"postcss@^7.0.0 || ^8.0.1", "postcss@^8.0.0", "postcss@^8.0.9", "postcss@^8.1.0", "postcss@^8.2.14", "postcss@^8.2.15", "postcss@^8.2.2", "postcss@^8.3.11", "postcss@^8.4.21", "postcss@^8.4.23", "postcss@^8.4.32", "postcss@>=8.0.9":
+  "integrity" "sha512-D/kj5JNu6oo2EIy+XL/26JEDTlIbB8hw85G8StOE6L74RQAVVP5rej6wxCNqyMbR4RkPfqvezVbPw81Ngd6Kcw=="
+  "resolved" "https://registry.npmjs.org/postcss/-/postcss-8.4.32.tgz"
+  "version" "8.4.32"
+  dependencies:
+    "nanoid" "^3.3.7"
+    "picocolors" "^1.0.0"
+    "source-map-js" "^1.0.2"
+
+"prettier@^1.15.0 || ^2.0.0", "prettier@^2.2.0":
+  "integrity" "sha512-ujppO+MkdPqoVINuDFDRLClm7D78qbDt0/NR+wp5FqEZOoTNAjPHWj17QRhu7geIHJfcNhRk1XVQmF8Bp3ye+g=="
+  "resolved" "https://registry.npmjs.org/prettier/-/prettier-2.7.1.tgz"
+  "version" "2.7.1"
+
+"pretty-time@^1.1.0":
+  "integrity" "sha512-28iF6xPQrP8Oa6uxE6a1biz+lWeTOAPKggvjB8HAs6nVMKZwf5bG++632Dx614hIWgUPkgivRfG+a8uAXGTIbA=="
+  "resolved" "https://registry.npmjs.org/pretty-time/-/pretty-time-1.1.0.tgz"
+  "version" "1.1.0"
+
+"process-nextick-args@~2.0.0":
+  "integrity" "sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag=="
+  "resolved" "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.1.tgz"
+  "version" "2.0.1"
+
+"process@^0.11.10":
+  "integrity" "sha512-cdGef/drWFoydD1JsMzuFf8100nZl+GT+yacc2bEced5f9Rjk4z+WtFUTBu9PhOi9j/jfmBPu0mMEY4wIdAF8A=="
+  "resolved" "https://registry.npmjs.org/process/-/process-0.11.10.tgz"
+  "version" "0.11.10"
+
+"proto-list@~1.2.1":
+  "integrity" "sha512-vtK/94akxsTMhe0/cbfpR+syPuszcuwhqVjJq26CuNDgFGj682oRBXOP5MJpv2r7JtE8MsiepGIqvvOTBwn2vA=="
+  "resolved" "https://registry.npmjs.org/proto-list/-/proto-list-1.2.4.tgz"
+  "version" "1.2.4"
+
+"proxy-addr@~2.0.7":
+  "integrity" "sha512-llQsMLSUDUPT44jdrU/O37qlnifitDP+ZwrmmZcoSKyLKvtZxpyV0n2/bD/N4tBAAZ/gJEdZU7KMraoK1+XYAg=="
+  "resolved" "https://registry.npmjs.org/proxy-addr/-/proxy-addr-2.0.7.tgz"
+  "version" "2.0.7"
+  dependencies:
+    "forwarded" "0.2.0"
+    "ipaddr.js" "1.9.1"
+
+"proxy-from-env@^1.1.0":
+  "integrity" "sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg=="
+  "resolved" "https://registry.npmjs.org/proxy-from-env/-/proxy-from-env-1.1.0.tgz"
+  "version" "1.1.0"
+
+"public-encrypt@^4.0.0":
+  "integrity" "sha512-zVpa8oKZSz5bTMTFClc1fQOnyyEzpl5ozpi1B5YcvBrdohMjH2rfsBtyXcuNuwjsDIXmBYlF2N5FlJYhR29t8Q=="
+  "resolved" "https://registry.npmjs.org/public-encrypt/-/public-encrypt-4.0.3.tgz"
+  "version" "4.0.3"
+  dependencies:
+    "bn.js" "^4.1.0"
+    "browserify-rsa" "^4.0.0"
+    "create-hash" "^1.1.0"
+    "parse-asn1" "^5.0.0"
+    "randombytes" "^2.0.1"
+    "safe-buffer" "^5.1.2"
+
+"punycode@^1.2.4", "punycode@^1.4.1":
+  "integrity" "sha512-jmYNElW7yvO7TV33CjSmvSiE2yco3bV2czu/OzDKdMNVZQWfxCblURLhf+47syQRBntjfLdd/H0egrzIG+oaFQ=="
+  "resolved" "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz"
+  "version" "1.4.1"
+
+"punycode@^2.1.0":
+  "integrity" "sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A=="
+  "resolved" "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz"
+  "version" "2.1.1"
+
+"qs@^6.11.2":
+  "integrity" "sha512-tDNIz22aBzCDxLtVH++VnTfzxlfeK5CbqohpSqpJgj1Wg/cQbStNAz3NuqCs5vV+pjBsK4x4pN9HlVh7rcYRiA=="
+  "resolved" "https://registry.npmjs.org/qs/-/qs-6.11.2.tgz"
+  "version" "6.11.2"
+  dependencies:
+    "side-channel" "^1.0.4"
+
+"qs@6.11.0":
+  "integrity" "sha512-MvjoMCJwEarSbUYk5O+nmoSzSutSsTwF85zcHPQ9OrlFoZOYIjaqBAJIqIXjptyD5vThxGq52Xu/MaJzRkIk4Q=="
+  "resolved" "https://registry.npmjs.org/qs/-/qs-6.11.0.tgz"
+  "version" "6.11.0"
+  dependencies:
+    "side-channel" "^1.0.4"
+
+"querystring-es3@^0.2.0":
+  "integrity" "sha512-773xhDQnZBMFobEiztv8LIl70ch5MSF/jUQVlhwFyBILqq96anmoctVIYz+ZRp0qbCKATTn6ev02M3r7Ga5vqA=="
+  "resolved" "https://registry.npmjs.org/querystring-es3/-/querystring-es3-0.2.1.tgz"
+  "version" "0.2.1"
+
+"queue-microtask@^1.2.2":
+  "integrity" "sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A=="
+  "resolved" "https://registry.npmjs.org/queue-microtask/-/queue-microtask-1.2.3.tgz"
+  "version" "1.2.3"
+
+"randombytes@^2.0.0", "randombytes@^2.0.1", "randombytes@^2.0.5", "randombytes@^2.1.0":
+  "integrity" "sha512-vYl3iOX+4CKUWuxGi9Ukhie6fsqXqS9FE2Zaic4tNFD2N2QQaXOMFbuKK4QmDHC0JO6B1Zp41J0LpT0oR68amQ=="
+  "resolved" "https://registry.npmjs.org/randombytes/-/randombytes-2.1.0.tgz"
+  "version" "2.1.0"
+  dependencies:
+    "safe-buffer" "^5.1.0"
+
+"randomfill@^1.0.3":
+  "integrity" "sha512-87lcbR8+MhcWcUiQ+9e+Rwx8MyR2P7qnt15ynUlbm3TU/fjbgz4GsvfSUDTemtCCtVCqb4ZcEFlyPNTh9bBTLw=="
+  "resolved" "https://registry.npmjs.org/randomfill/-/randomfill-1.0.4.tgz"
+  "version" "1.0.4"
+  dependencies:
+    "randombytes" "^2.0.5"
+    "safe-buffer" "^5.1.0"
+
+"range-parser@^1.2.1", "range-parser@~1.2.1":
+  "integrity" "sha512-Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg=="
+  "resolved" "https://registry.npmjs.org/range-parser/-/range-parser-1.2.1.tgz"
+  "version" "1.2.1"
+
+"raw-body@2.5.1":
+  "integrity" "sha512-qqJBtEyVgS0ZmPGdCFPWJ3FreoqvG4MVQln/kCgF7Olq95IbOp0/BWyMwbdtn4VTvkM8Y7khCQ2Xgk/tcrCXig=="
+  "resolved" "https://registry.npmjs.org/raw-body/-/raw-body-2.5.1.tgz"
+  "version" "2.5.1"
+  dependencies:
+    "bytes" "3.1.2"
+    "http-errors" "2.0.0"
+    "iconv-lite" "0.4.24"
+    "unpipe" "1.0.0"
+
+"read-cache@^1.0.0":
+  "integrity" "sha512-Owdv/Ft7IjOgm/i0xvNDZ1LrRANRfew4b2prF3OWMQLxLfu3bS8FVhCsrSCMK4lR56Y9ya+AThoTpDCTxCmpRA=="
+  "resolved" "https://registry.npmjs.org/read-cache/-/read-cache-1.0.0.tgz"
+  "version" "1.0.0"
+  dependencies:
+    "pify" "^2.3.0"
+
+"readable-stream@^2.0.1":
+  "integrity" "sha512-8p0AUk4XODgIewSi0l8Epjs+EVnWiK7NoDIEGU0HhE7+ZyY8D1IMY7odu5lRrFXGg71L15KG8QrPmum45RTtdA=="
+  "resolved" "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.8.tgz"
+  "version" "2.3.8"
+  dependencies:
+    "core-util-is" "~1.0.0"
+    "inherits" "~2.0.3"
+    "isarray" "~1.0.0"
+    "process-nextick-args" "~2.0.0"
+    "safe-buffer" "~5.1.1"
+    "string_decoder" "~1.1.1"
+    "util-deprecate" "~1.0.1"
+
+"readable-stream@^2.0.2":
+  "integrity" "sha512-8p0AUk4XODgIewSi0l8Epjs+EVnWiK7NoDIEGU0HhE7+ZyY8D1IMY7odu5lRrFXGg71L15KG8QrPmum45RTtdA=="
+  "resolved" "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.8.tgz"
+  "version" "2.3.8"
+  dependencies:
+    "core-util-is" "~1.0.0"
+    "inherits" "~2.0.3"
+    "isarray" "~1.0.0"
+    "process-nextick-args" "~2.0.0"
+    "safe-buffer" "~5.1.1"
+    "string_decoder" "~1.1.1"
+    "util-deprecate" "~1.0.1"
+
+"readable-stream@^2.3.3":
+  "integrity" "sha512-8p0AUk4XODgIewSi0l8Epjs+EVnWiK7NoDIEGU0HhE7+ZyY8D1IMY7odu5lRrFXGg71L15KG8QrPmum45RTtdA=="
+  "resolved" "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.8.tgz"
+  "version" "2.3.8"
+  dependencies:
+    "core-util-is" "~1.0.0"
+    "inherits" "~2.0.3"
+    "isarray" "~1.0.0"
+    "process-nextick-args" "~2.0.0"
+    "safe-buffer" "~5.1.1"
+    "string_decoder" "~1.1.1"
+    "util-deprecate" "~1.0.1"
+
+"readable-stream@^2.3.6":
+  "integrity" "sha512-8p0AUk4XODgIewSi0l8Epjs+EVnWiK7NoDIEGU0HhE7+ZyY8D1IMY7odu5lRrFXGg71L15KG8QrPmum45RTtdA=="
+  "resolved" "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.8.tgz"
+  "version" "2.3.8"
+  dependencies:
+    "core-util-is" "~1.0.0"
+    "inherits" "~2.0.3"
+    "isarray" "~1.0.0"
+    "process-nextick-args" "~2.0.0"
+    "safe-buffer" "~5.1.1"
+    "string_decoder" "~1.1.1"
+    "util-deprecate" "~1.0.1"
+
+"readable-stream@^3.0.2", "readable-stream@^3.0.6", "readable-stream@^3.6.0", "readable-stream@^3.6.2":
+  "integrity" "sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA=="
+  "resolved" "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.2.tgz"
+  "version" "3.6.2"
+  dependencies:
+    "inherits" "^2.0.3"
+    "string_decoder" "^1.1.1"
+    "util-deprecate" "^1.0.1"
+
+"readdirp@~3.6.0":
+  "integrity" "sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA=="
+  "resolved" "https://registry.npmjs.org/readdirp/-/readdirp-3.6.0.tgz"
+  "version" "3.6.0"
+  dependencies:
+    "picomatch" "^2.2.1"
+
+"rechoir@^0.7.0":
+  "integrity" "sha512-/njmZ8s1wVeR6pjTZ+0nCnv8SpZNRMT2D1RLOJQESlYFDBvwpTA4KWJpZ+sBJ4+vhjILRcK7JIFdGCdxEAAitg=="
+  "resolved" "https://registry.npmjs.org/rechoir/-/rechoir-0.7.1.tgz"
+  "version" "0.7.1"
+  dependencies:
+    "resolve" "^1.9.0"
+
+"regenerate-unicode-properties@^10.0.1":
+  "integrity" "sha512-vn5DU6yg6h8hP/2OkQo3K7uVILvY4iu0oI4t3HFa81UPkhGJwkRwM10JEc3upjdhHjs/k8GJY1sRBhk5sr69Bw=="
+  "resolved" "https://registry.npmjs.org/regenerate-unicode-properties/-/regenerate-unicode-properties-10.0.1.tgz"
+  "version" "10.0.1"
+  dependencies:
+    "regenerate" "^1.4.2"
+
+"regenerate@^1.4.2":
+  "integrity" "sha512-zrceR/XhGYU/d/opr2EKO7aRHUeiBI8qjtfHqADTwZd6Szfy16la6kqD0MIUs5z5hx6AaKa+PixpPrR289+I0A=="
+  "resolved" "https://registry.npmjs.org/regenerate/-/regenerate-1.4.2.tgz"
+  "version" "1.4.2"
+
+"regenerator-runtime@^0.13.4":
+  "integrity" "sha512-p3VT+cOEgxFsRRA9X4lkI1E+k2/CtnKtU4gcxyaCUreilL/vqI6CdZ3wxVUx3UOUg+gnUOQQcRI7BmSI656MYA=="
+  "resolved" "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.9.tgz"
+  "version" "0.13.9"
+
+"regenerator-transform@^0.15.0":
+  "integrity" "sha512-LsrGtPmbYg19bcPHwdtmXwbW+TqNvtY4riE3P83foeHRroMbH6/2ddFBfab3t7kbzc7v7p4wbkIecHImqt0QNg=="
+  "resolved" "https://registry.npmjs.org/regenerator-transform/-/regenerator-transform-0.15.0.tgz"
+  "version" "0.15.0"
+  dependencies:
+    "@babel/runtime" "^7.8.4"
+
+"regex-parser@^2.2.11":
+  "integrity" "sha512-jbD/FT0+9MBU2XAZluI7w2OBs1RBi6p9M83nkoZayQXXU9e8Robt69FcZc7wU4eJD/YFTjn1JdCk3rbMJajz8Q=="
+  "resolved" "https://registry.npmjs.org/regex-parser/-/regex-parser-2.2.11.tgz"
+  "version" "2.2.11"
+
+"regexpu-core@^5.1.0":
+  "integrity" "sha512-bb6hk+xWd2PEOkj5It46A16zFMs2mv86Iwpdu94la4S3sJ7C973h2dHpYKwIBGaWSO7cIRJ+UX0IeMaWcO4qwA=="
+  "resolved" "https://registry.npmjs.org/regexpu-core/-/regexpu-core-5.1.0.tgz"
+  "version" "5.1.0"
+  dependencies:
+    "regenerate" "^1.4.2"
+    "regenerate-unicode-properties" "^10.0.1"
+    "regjsgen" "^0.6.0"
+    "regjsparser" "^0.8.2"
+    "unicode-match-property-ecmascript" "^2.0.0"
+    "unicode-match-property-value-ecmascript" "^2.0.0"
+
+"regjsgen@^0.6.0":
+  "integrity" "sha512-ozE883Uigtqj3bx7OhL1KNbCzGyW2NQZPl6Hs09WTvCuZD5sTI4JY58bkbQWa/Y9hxIsvJ3M8Nbf7j54IqeZbA=="
+  "resolved" "https://registry.npmjs.org/regjsgen/-/regjsgen-0.6.0.tgz"
+  "version" "0.6.0"
+
+"regjsparser@^0.8.2":
+  "integrity" "sha512-J3LABycON/VNEu3abOviqGHuB/LOtOQj8SKmfP9anY5GfAVw/SPjwzSjxGjbZXIxbGfqTHtJw58C2Li/WkStmA=="
+  "resolved" "https://registry.npmjs.org/regjsparser/-/regjsparser-0.8.4.tgz"
+  "version" "0.8.4"
+  dependencies:
+    "jsesc" "~0.5.0"
+
+"relateurl@^0.2.7":
+  "integrity" "sha512-G08Dxvm4iDN3MLM0EsP62EDV9IuhXPR6blNz6Utcp7zyV3tr4HVNINt6MpaRWbxoOHT3Q7YN2P+jaHX8vUbgog=="
+  "resolved" "https://registry.npmjs.org/relateurl/-/relateurl-0.2.7.tgz"
+  "version" "0.2.7"
+
+"replace-ext@^1.0.0":
+  "integrity" "sha512-yD5BHCe7quCgBph4rMQ+0KkIRKwWCrHDOX1p1Gp6HwjPM5kVoCdKGNhN7ydqqsX6lJEnQDKZ/tFMiEdQ1dvPEw=="
+  "resolved" "https://registry.npmjs.org/replace-ext/-/replace-ext-1.0.1.tgz"
+  "version" "1.0.1"
+
+"require-directory@^2.1.1":
+  "integrity" "sha512-fGxEI7+wsG9xrvdjsrlmL22OMTTiHRwAMroiEeMgq8gzoLC/PQr7RsRDSTLUg/bZAZtF+TVIkHc6/4RIKrui+Q=="
+  "resolved" "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz"
+  "version" "2.1.1"
+
+"require-from-string@^2.0.2":
+  "integrity" "sha512-Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw=="
+  "resolved" "https://registry.npmjs.org/require-from-string/-/require-from-string-2.0.2.tgz"
+  "version" "2.0.2"
+
+"requires-port@^1.0.0":
+  "integrity" "sha512-KigOCHcocU3XODJxsu8i/j8T9tzT4adHiecwORRQ0ZZFcp7ahwXuRU1m+yuO90C5ZUyGeGfocHDI14M3L3yDAQ=="
+  "resolved" "https://registry.npmjs.org/requires-port/-/requires-port-1.0.0.tgz"
+  "version" "1.0.0"
+
+"resolve-cwd@^3.0.0":
+  "integrity" "sha512-OrZaX2Mb+rJCpH/6CpSqt9xFVpN++x01XnN2ie9g6P5/3xelLAkXWVADpdz1IHD/KFfEXyE6V0U01OQ3UO2rEg=="
+  "resolved" "https://registry.npmjs.org/resolve-cwd/-/resolve-cwd-3.0.0.tgz"
+  "version" "3.0.0"
+  dependencies:
+    "resolve-from" "^5.0.0"
+
+"resolve-from@^4.0.0":
+  "integrity" "sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g=="
+  "resolved" "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz"
+  "version" "4.0.0"
+
+"resolve-from@^5.0.0":
+  "integrity" "sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw=="
+  "resolved" "https://registry.npmjs.org/resolve-from/-/resolve-from-5.0.0.tgz"
+  "version" "5.0.0"
+
+"resolve-url-loader@^5.0.0":
+  "integrity" "sha512-uZtduh8/8srhBoMx//5bwqjQ+rfYOUq8zC9NrMUGtjBiGTtFJM42s58/36+hTqeqINcnYe08Nj3LkK9lW4N8Xg=="
+  "resolved" "https://registry.npmjs.org/resolve-url-loader/-/resolve-url-loader-5.0.0.tgz"
+  "version" "5.0.0"
+  dependencies:
+    "adjust-sourcemap-loader" "^4.0.0"
+    "convert-source-map" "^1.7.0"
+    "loader-utils" "^2.0.0"
+    "postcss" "^8.2.14"
+    "source-map" "0.6.1"
+
+"resolve@^1.1.7", "resolve@^1.14.2", "resolve@^1.22.2", "resolve@^1.9.0":
+  "integrity" "sha512-Sb+mjNHOULsBv818T40qSPeRiuWLyaGMa5ewydRLFimneixmVy2zdivRl+AF6jaYPC8ERxGDmFSiqui6SfPd+g=="
+  "resolved" "https://registry.npmjs.org/resolve/-/resolve-1.22.2.tgz"
+  "version" "1.22.2"
+  dependencies:
+    "is-core-module" "^2.11.0"
+    "path-parse" "^1.0.7"
+    "supports-preserve-symlinks-flag" "^1.0.0"
+
+"retry@^0.13.1":
+  "integrity" "sha512-XQBQ3I8W1Cge0Seh+6gjj03LbmRFWuoszgK9ooCpwYIrhhoO80pfq4cUkU5DkknwfOfFteRwlZ56PYOGYyFWdg=="
+  "resolved" "https://registry.npmjs.org/retry/-/retry-0.13.1.tgz"
+  "version" "0.13.1"
+
+"reusify@^1.0.4":
+  "integrity" "sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw=="
+  "resolved" "https://registry.npmjs.org/reusify/-/reusify-1.0.4.tgz"
+  "version" "1.0.4"
+
+"rimraf@^3.0.2":
+  "integrity" "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA=="
+  "resolved" "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz"
+  "version" "3.0.2"
+  dependencies:
+    "glob" "^7.1.3"
+
+"ripemd160@^2.0.0", "ripemd160@^2.0.1":
+  "integrity" "sha512-ii4iagi25WusVoiC4B4lq7pbXfAp3D9v5CwfkY33vffw2+pkDjY1D8GaN7spsxvCSx8dkPqOZCEZyfxcmJG2IA=="
+  "resolved" "https://registry.npmjs.org/ripemd160/-/ripemd160-2.0.2.tgz"
+  "version" "2.0.2"
+  dependencies:
+    "hash-base" "^3.0.0"
+    "inherits" "^2.0.1"
+
+"run-parallel@^1.1.9":
+  "integrity" "sha512-5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA=="
+  "resolved" "https://registry.npmjs.org/run-parallel/-/run-parallel-1.2.0.tgz"
+  "version" "1.2.0"
+  dependencies:
+    "queue-microtask" "^1.2.2"
+
+"safe-buffer@^5.0.1", "safe-buffer@^5.1.0", "safe-buffer@^5.1.1", "safe-buffer@^5.1.2", "safe-buffer@>=5.1.0", "safe-buffer@~5.1.0", "safe-buffer@~5.1.1", "safe-buffer@5.1.2":
+  "integrity" "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g=="
+  "resolved" "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz"
+  "version" "5.1.2"
+
+"safe-buffer@^5.2.0":
+  "integrity" "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ=="
+  "resolved" "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz"
+  "version" "5.2.1"
+
+"safe-buffer@^5.2.1":
+  "integrity" "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ=="
+  "resolved" "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz"
+  "version" "5.2.1"
+
+"safe-buffer@5.2.1":
+  "integrity" "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ=="
+  "resolved" "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz"
+  "version" "5.2.1"
+
+"safer-buffer@^2.1.0", "safer-buffer@>= 2.1.2 < 3":
+  "integrity" "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg=="
+  "resolved" "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz"
+  "version" "2.1.2"
+
+"sass-loader@^13.3.2":
+  "integrity" "sha512-CQbKl57kdEv+KDLquhC+gE3pXt74LEAzm+tzywcA0/aHZuub8wTErbjAoNI57rPUWRYRNC5WUnNl8eGJNbDdwg=="
+  "resolved" "https://registry.npmjs.org/sass-loader/-/sass-loader-13.3.2.tgz"
+  "version" "13.3.2"
+  dependencies:
+    "neo-async" "^2.6.2"
+
+"sass@^1.3.0", "sass@^1.69.5":
+  "integrity" "sha512-qg2+UCJibLr2LCVOt3OlPhr/dqVHWOa9XtZf2OjbLs/T4VPSJ00udtgJxH3neXZm+QqX8B+3cU7RaLqp1iVfcQ=="
+  "resolved" "https://registry.npmjs.org/sass/-/sass-1.69.5.tgz"
+  "version" "1.69.5"
+  dependencies:
+    "chokidar" ">=3.0.0 <4.0.0"
+    "immutable" "^4.0.0"
+    "source-map-js" ">=0.6.2 <2.0.0"
+
+"schema-utils@^2.6.5":
+  "integrity" "sha512-SHiNtMOUGWBQJwzISiVYKu82GiV4QYGePp3odlY1tuKO7gPtphAT5R/py0fA6xtbgLL/RvtJZnU9b8s0F1q0Xg=="
+  "resolved" "https://registry.npmjs.org/schema-utils/-/schema-utils-2.7.1.tgz"
+  "version" "2.7.1"
+  dependencies:
+    "@types/json-schema" "^7.0.5"
+    "ajv" "^6.12.4"
+    "ajv-keywords" "^3.5.2"
+
+"schema-utils@^3.0.0":
+  "integrity" "sha512-pN/yOAvcC+5rQ5nERGuwrjLlYvLTbCibnZ1I7B1LaiAz9BRBlE9GMgE/eqV30P7aJQUf7Ddimy/RsbYO/GrVGg=="
+  "resolved" "https://registry.npmjs.org/schema-utils/-/schema-utils-3.3.0.tgz"
+  "version" "3.3.0"
+  dependencies:
+    "@types/json-schema" "^7.0.8"
+    "ajv" "^6.12.5"
+    "ajv-keywords" "^3.5.2"
+
+"schema-utils@^3.1.1":
+  "integrity" "sha512-pN/yOAvcC+5rQ5nERGuwrjLlYvLTbCibnZ1I7B1LaiAz9BRBlE9GMgE/eqV30P7aJQUf7Ddimy/RsbYO/GrVGg=="
+  "resolved" "https://registry.npmjs.org/schema-utils/-/schema-utils-3.3.0.tgz"
+  "version" "3.3.0"
+  dependencies:
+    "@types/json-schema" "^7.0.8"
+    "ajv" "^6.12.5"
+    "ajv-keywords" "^3.5.2"
+
+"schema-utils@^3.2.0":
+  "integrity" "sha512-pN/yOAvcC+5rQ5nERGuwrjLlYvLTbCibnZ1I7B1LaiAz9BRBlE9GMgE/eqV30P7aJQUf7Ddimy/RsbYO/GrVGg=="
+  "resolved" "https://registry.npmjs.org/schema-utils/-/schema-utils-3.3.0.tgz"
+  "version" "3.3.0"
+  dependencies:
+    "@types/json-schema" "^7.0.8"
+    "ajv" "^6.12.5"
+    "ajv-keywords" "^3.5.2"
+
+"schema-utils@^4.0.0":
+  "integrity" "sha512-L0jRsrPpjdckP3oPug3/VxNKt2trR8TcabrM6FOAAlvC/9Phcmm+cuAgTlxBqdBR1WJx7Naj9WHw+aOmheSVbw=="
+  "resolved" "https://registry.npmjs.org/schema-utils/-/schema-utils-4.2.0.tgz"
+  "version" "4.2.0"
+  dependencies:
+    "@types/json-schema" "^7.0.9"
+    "ajv" "^8.9.0"
+    "ajv-formats" "^2.1.1"
+    "ajv-keywords" "^5.1.0"
+
+"select-hose@^2.0.0":
+  "integrity" "sha512-mEugaLK+YfkijB4fx0e6kImuJdCIt2LxCRcbEYPqRGCs4F2ogyfZU5IAZRdjCP8JPq2AtdNoC/Dux63d9Kiryg=="
+  "resolved" "https://registry.npmjs.org/select-hose/-/select-hose-2.0.0.tgz"
+  "version" "2.0.0"
+
+"selfsigned@^2.1.1":
+  "integrity" "sha512-GSL3aowiF7wa/WtSFwnUrludWFoNhftq8bUkH9pkzjpN2XSPOAYEgg6e0sS9s0rZwgJzJiQRPU18A6clnoW5wQ=="
+  "resolved" "https://registry.npmjs.org/selfsigned/-/selfsigned-2.1.1.tgz"
+  "version" "2.1.1"
+  dependencies:
+    "node-forge" "^1"
+
+"semver@^6.0.0":
+  "integrity" "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA=="
+  "resolved" "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz"
+  "version" "6.3.1"
+
+"semver@^6.1.1":
+  "integrity" "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA=="
+  "resolved" "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz"
+  "version" "6.3.1"
+
+"semver@^6.1.2":
+  "integrity" "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA=="
+  "resolved" "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz"
+  "version" "6.3.1"
+
+"semver@^6.3.0":
+  "integrity" "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA=="
+  "resolved" "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz"
+  "version" "6.3.1"
+
+"semver@^7.3.2", "semver@^7.3.5", "semver@^7.5.3":
+  "integrity" "sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA=="
+  "resolved" "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz"
+  "version" "7.5.4"
+  dependencies:
+    "lru-cache" "^6.0.0"
+
+"send@0.18.0":
+  "integrity" "sha512-qqWzuOjSFOuqPjFe4NOsMLafToQQwBSOEpS+FwEt3A2V3vKubTquT3vmLTQpFgMXp8AlFWFuP1qKaJZOtPpVXg=="
+  "resolved" "https://registry.npmjs.org/send/-/send-0.18.0.tgz"
+  "version" "0.18.0"
+  dependencies:
+    "debug" "2.6.9"
+    "depd" "2.0.0"
+    "destroy" "1.2.0"
+    "encodeurl" "~1.0.2"
+    "escape-html" "~1.0.3"
+    "etag" "~1.8.1"
+    "fresh" "0.5.2"
+    "http-errors" "2.0.0"
+    "mime" "1.6.0"
+    "ms" "2.1.3"
+    "on-finished" "2.4.1"
+    "range-parser" "~1.2.1"
+    "statuses" "2.0.1"
+
+"serialize-javascript@^6.0.1":
+  "integrity" "sha512-owoXEFjWRllis8/M1Q+Cw5k8ZH40e3zhp/ovX+Xr/vi1qj6QesbyXXViFbpNvWvPNAD62SutwEXavefrLJWj7w=="
+  "resolved" "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-6.0.1.tgz"
+  "version" "6.0.1"
+  dependencies:
+    "randombytes" "^2.1.0"
+
+"serve-index@^1.9.1":
+  "integrity" "sha512-pXHfKNP4qujrtteMrSBb0rc8HJ9Ms/GrXwcUtUtD5s4ewDJI8bT3Cz2zTVRMKtri49pLx2e0Ya8ziP5Ya2pZZw=="
+  "resolved" "https://registry.npmjs.org/serve-index/-/serve-index-1.9.1.tgz"
+  "version" "1.9.1"
+  dependencies:
+    "accepts" "~1.3.4"
+    "batch" "0.6.1"
+    "debug" "2.6.9"
+    "escape-html" "~1.0.3"
+    "http-errors" "~1.6.2"
+    "mime-types" "~2.1.17"
+    "parseurl" "~1.3.2"
+
+"serve-static@1.15.0":
+  "integrity" "sha512-XGuRDNjXUijsUL0vl6nSD7cwURuzEgglbOaFuZM9g3kwDXOWVTck0jLzjPzGD+TazWbboZYu52/9/XPdUgne9g=="
+  "resolved" "https://registry.npmjs.org/serve-static/-/serve-static-1.15.0.tgz"
+  "version" "1.15.0"
+  dependencies:
+    "encodeurl" "~1.0.2"
+    "escape-html" "~1.0.3"
+    "parseurl" "~1.3.3"
+    "send" "0.18.0"
+
+"setimmediate@^1.0.4":
+  "integrity" "sha512-MATJdZp8sLqDl/68LfQmbP8zKPLQNV6BIZoIgrscFDQ+RsvK/BxeDQOgyxKKoh0y/8h3BqVFnCqQ/gd+reiIXA=="
+  "resolved" "https://registry.npmjs.org/setimmediate/-/setimmediate-1.0.5.tgz"
+  "version" "1.0.5"
+
+"setprototypeof@1.1.0":
+  "integrity" "sha512-BvE/TwpZX4FXExxOxZyRGQQv651MSwmWKZGqvmPcRIjDqWub67kTKuIMx43cZZrS/cBBzwBcNDWoFxt2XEFIpQ=="
+  "resolved" "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.1.0.tgz"
+  "version" "1.1.0"
+
+"setprototypeof@1.2.0":
+  "integrity" "sha512-E5LDX7Wrp85Kil5bhZv46j8jOeboKq5JMmYM3gVGdGH8xFpPWXUMsNrlODCrkoxMEeNi/XZIwuRvY4XNwYMJpw=="
+  "resolved" "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.2.0.tgz"
+  "version" "1.2.0"
+
+"sha.js@^2.4.0", "sha.js@^2.4.8":
+  "integrity" "sha512-QMEp5B7cftE7APOjk5Y6xgrbWu+WkLVQwk8JNjZ8nKRciZaByEW6MubieAiToS7+dwvrjGhH8jRXz3MVd0AYqQ=="
+  "resolved" "https://registry.npmjs.org/sha.js/-/sha.js-2.4.11.tgz"
+  "version" "2.4.11"
+  dependencies:
+    "inherits" "^2.0.1"
+    "safe-buffer" "^5.0.1"
+
+"shallow-clone@^3.0.0":
+  "integrity" "sha512-/6KqX+GVUdqPuPPd2LxDDxzX6CAbjJehAAOKlNpqqUpAqPM6HeL8f+o3a+JsyGjn2lv0WY8UsTgUJjU9Ok55NA=="
+  "resolved" "https://registry.npmjs.org/shallow-clone/-/shallow-clone-3.0.1.tgz"
+  "version" "3.0.1"
+  dependencies:
+    "kind-of" "^6.0.2"
+
+"shebang-command@^2.0.0":
+  "integrity" "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA=="
+  "resolved" "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz"
+  "version" "2.0.0"
+  dependencies:
+    "shebang-regex" "^3.0.0"
+
+"shebang-regex@^3.0.0":
+  "integrity" "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A=="
+  "resolved" "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz"
+  "version" "3.0.0"
+
+"shell-quote@^1.8.1":
+  "integrity" "sha512-6j1W9l1iAs/4xYBI1SYOVZyFcCis9b4KCLQ8fgAGG07QvzaRLVVRQvAy85yNmmZSjYjg4MWh4gNvlPujU/5LpA=="
+  "resolved" "https://registry.npmjs.org/shell-quote/-/shell-quote-1.8.1.tgz"
+  "version" "1.8.1"
+
+"shellwords@^0.1.1":
+  "integrity" "sha512-vFwSUfQvqybiICwZY5+DAWIPLKsWO31Q91JSKl3UYv+K5c2QRPzn0qzec6QPu1Qc9eHYItiP3NdJqNVqetYAww=="
+  "resolved" "https://registry.npmjs.org/shellwords/-/shellwords-0.1.1.tgz"
+  "version" "0.1.1"
+
+"side-channel@^1.0.4":
+  "integrity" "sha512-q5XPytqFEIKHkGdiMIrY10mvLRvnQh42/+GoBlFW3b2LXLE2xxJpZFdm94we0BaoV3RwJyGqg5wS7epxTv0Zvw=="
+  "resolved" "https://registry.npmjs.org/side-channel/-/side-channel-1.0.4.tgz"
+  "version" "1.0.4"
+  dependencies:
+    "call-bind" "^1.0.0"
+    "get-intrinsic" "^1.0.2"
+    "object-inspect" "^1.9.0"
+
+"signal-exit@^3.0.3":
+  "integrity" "sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ=="
+  "resolved" "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.7.tgz"
+  "version" "3.0.7"
+
+"slash@^3.0.0":
+  "integrity" "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q=="
+  "resolved" "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz"
+  "version" "3.0.0"
+
+"sockjs@^0.3.24":
+  "integrity" "sha512-GJgLTZ7vYb/JtPSSZ10hsOYIvEYsjbNU+zPdIHcUaWVNUEPivzxku31865sSSud0Da0W4lEeOPlmw93zLQchuQ=="
+  "resolved" "https://registry.npmjs.org/sockjs/-/sockjs-0.3.24.tgz"
+  "version" "0.3.24"
+  dependencies:
+    "faye-websocket" "^0.11.3"
+    "uuid" "^8.3.2"
+    "websocket-driver" "^0.7.4"
+
+"source-list-map@^2.0.0":
+  "integrity" "sha512-qnQ7gVMxGNxsiL4lEuJwe/To8UnK7fAnmbGEEH8RpLouuKbeEm0lhbQVFIrNSuB+G7tVrAlVsZgETT5nljf+Iw=="
+  "resolved" "https://registry.npmjs.org/source-list-map/-/source-list-map-2.0.1.tgz"
+  "version" "2.0.1"
+
+"source-map-js@^1.0.2", "source-map-js@>=0.6.2 <2.0.0":
+  "integrity" "sha512-R0XvVJ9WusLiqTCEiGCmICCMplcCkIwwR11mOSD9CR5u+IXYdiseeEuXCVAjS54zqwkLcPNnmU4OeJ6tUrWhDw=="
+  "resolved" "https://registry.npmjs.org/source-map-js/-/source-map-js-1.0.2.tgz"
+  "version" "1.0.2"
+
+"source-map-support@~0.5.12", "source-map-support@~0.5.20":
+  "integrity" "sha512-uBHU3L3czsIyYXKX88fdrGovxdSCoTGDRZ6SYXtSRxLZUzHg5P/66Ht6uoUlHu9EZod+inXhKo3qQgwXUT/y1w=="
+  "resolved" "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.21.tgz"
+  "version" "0.5.21"
+  dependencies:
+    "buffer-from" "^1.0.0"
+    "source-map" "^0.6.0"
+
+"source-map@^0.6.0", "source-map@^0.6.1", "source-map@~0.6.0", "source-map@~0.6.1", "source-map@0.6.1":
+  "integrity" "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g=="
+  "resolved" "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz"
+  "version" "0.6.1"
+
+"spdy-transport@^3.0.0":
+  "integrity" "sha512-hsLVFE5SjA6TCisWeJXFKniGGOpBgMLmerfO2aCyCU5s7nJ/rpAepqmFifv/GCbSbueEeAJJnmSQ2rKC/g8Fcw=="
+  "resolved" "https://registry.npmjs.org/spdy-transport/-/spdy-transport-3.0.0.tgz"
+  "version" "3.0.0"
+  dependencies:
+    "debug" "^4.1.0"
+    "detect-node" "^2.0.4"
+    "hpack.js" "^2.1.6"
+    "obuf" "^1.1.2"
+    "readable-stream" "^3.0.6"
+    "wbuf" "^1.7.3"
+
+"spdy@^4.0.2":
+  "integrity" "sha512-r46gZQZQV+Kl9oItvl1JZZqJKGr+oEkB08A6BzkiR7593/7IbtuncXHd2YoYeTsG4157ZssMu9KYvUHLcjcDoA=="
+  "resolved" "https://registry.npmjs.org/spdy/-/spdy-4.0.2.tgz"
+  "version" "4.0.2"
+  dependencies:
+    "debug" "^4.1.0"
+    "handle-thing" "^2.0.0"
+    "http-deceiver" "^1.2.7"
+    "select-hose" "^2.0.0"
+    "spdy-transport" "^3.0.0"
+
+"stable@^0.1.8":
+  "integrity" "sha512-ji9qxRnOVfcuLDySj9qzhGSEFVobyt1kIOSkj1qZzYLzq7Tos/oUUWvotUPQLlrsidqsK6tBH89Bc9kL5zHA6w=="
+  "resolved" "https://registry.npmjs.org/stable/-/stable-0.1.8.tgz"
+  "version" "0.1.8"
 
 "statuses@>= 1.4.0 < 2":
-  version "1.4.0"
-  resolved "https://registry.yarnpkg.com/statuses/-/statuses-1.4.0.tgz#bb73d446da2796106efcc1b601a253d6c46bd087"
-
-stream-browserify@^2.0.1:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/stream-browserify/-/stream-browserify-2.0.2.tgz#87521d38a44aa7ee91ce1cd2a47df0cb49dd660b"
-  dependencies:
-    inherits "~2.0.1"
-    readable-stream "^2.0.2"
-
-stream-each@^1.1.0:
-  version "1.2.3"
-  resolved "https://registry.yarnpkg.com/stream-each/-/stream-each-1.2.3.tgz#ebe27a0c389b04fbcc233642952e10731afa9bae"
-  dependencies:
-    end-of-stream "^1.1.0"
-    stream-shift "^1.0.0"
-
-stream-http@^2.7.2:
-  version "2.8.3"
-  resolved "https://registry.yarnpkg.com/stream-http/-/stream-http-2.8.3.tgz#b2d242469288a5a27ec4fe8933acf623de6514fc"
-  dependencies:
-    builtin-status-codes "^3.0.0"
-    inherits "^2.0.1"
-    readable-stream "^2.3.6"
-    to-arraybuffer "^1.0.0"
-    xtend "^4.0.0"
-
-stream-shift@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/stream-shift/-/stream-shift-1.0.0.tgz#d5c752825e5367e786f78e18e445ea223a155952"
-
-string-width@^1.0.1:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/string-width/-/string-width-1.0.2.tgz#118bdf5b8cdc51a2a7e70d211e07e2b0b9b107d3"
-  dependencies:
-    code-point-at "^1.0.0"
-    is-fullwidth-code-point "^1.0.0"
-    strip-ansi "^3.0.0"
-
-"string-width@^1.0.2 || 2", string-width@^2.0.0, string-width@^2.1.1:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/string-width/-/string-width-2.1.1.tgz#ab93f27a8dc13d28cac815c462143a6d9012ae9e"
-  dependencies:
-    is-fullwidth-code-point "^2.0.0"
-    strip-ansi "^4.0.0"
-
-string_decoder@^1.0.0, string_decoder@^1.1.1:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.2.0.tgz#fe86e738b19544afe70469243b2a1ee9240eae8d"
-  dependencies:
-    safe-buffer "~5.1.0"
-
-string_decoder@~1.1.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.1.1.tgz#9cf1611ba62685d7030ae9e4ba34149c3af03fc8"
-  dependencies:
-    safe-buffer "~5.1.0"
-
-strip-ansi@^3.0.0, strip-ansi@^3.0.1:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-3.0.1.tgz#6a385fb8853d952d5ff05d0e8aaf94278dc63dcf"
-  dependencies:
-    ansi-regex "^2.0.0"
-
-strip-ansi@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-4.0.0.tgz#a8479022eb1ac368a871389b635262c505ee368f"
-  dependencies:
-    ansi-regex "^3.0.0"
-
-strip-eof@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/strip-eof/-/strip-eof-1.0.0.tgz#bb43ff5598a6eb05d89b59fcd129c983313606bf"
-
-strip-json-comments@~2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-2.0.1.tgz#3c531942e908c2697c0ec344858c286c7ca0a60a"
-
-style-loader@^0.23.1:
-  version "0.23.1"
-  resolved "https://registry.yarnpkg.com/style-loader/-/style-loader-0.23.1.tgz#cb9154606f3e771ab6c4ab637026a1049174d925"
-  dependencies:
-    loader-utils "^1.1.0"
-    schema-utils "^1.0.0"
-
-stylehacks@^4.0.0:
-  version "4.0.3"
-  resolved "https://registry.yarnpkg.com/stylehacks/-/stylehacks-4.0.3.tgz#6718fcaf4d1e07d8a1318690881e8d96726a71d5"
-  dependencies:
-    browserslist "^4.0.0"
-    postcss "^7.0.0"
-    postcss-selector-parser "^3.0.0"
-
-supports-color@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-2.0.0.tgz#535d045ce6b6363fa40117084629995e9df324c7"
-
-supports-color@^5.3.0, supports-color@^5.4.0, supports-color@^5.5.0:
-  version "5.5.0"
-  resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-5.5.0.tgz#e2e69a44ac8772f78a1ec0b35b689df6530efc8f"
-  dependencies:
-    has-flag "^3.0.0"
-
-supports-color@^6.1.0:
-  version "6.1.0"
-  resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-6.1.0.tgz#0764abc69c63d5ac842dd4867e8d025e880df8f3"
-  dependencies:
-    has-flag "^3.0.0"
-
-svgo@^1.0.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/svgo/-/svgo-1.2.0.tgz#305a8fc0f4f9710828c65039bb93d5793225ffc3"
-  dependencies:
-    chalk "^2.4.1"
-    coa "^2.0.2"
-    css-select "^2.0.0"
-    css-select-base-adapter "^0.1.1"
-    css-tree "1.0.0-alpha.28"
-    css-url-regex "^1.1.0"
-    csso "^3.5.1"
-    js-yaml "^3.12.0"
-    mkdirp "~0.5.1"
-    object.values "^1.1.0"
-    sax "~1.2.4"
-    stable "^0.1.8"
-    unquote "~1.1.1"
-    util.promisify "~1.0.0"
-
-tapable@^1.0.0, tapable@^1.1.0:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/tapable/-/tapable-1.1.1.tgz#4d297923c5a72a42360de2ab52dadfaaec00018e"
-
-tar@^4:
-  version "4.4.8"
-  resolved "https://registry.yarnpkg.com/tar/-/tar-4.4.8.tgz#b19eec3fde2a96e64666df9fdb40c5ca1bc3747d"
-  dependencies:
-    chownr "^1.1.1"
-    fs-minipass "^1.2.5"
-    minipass "^2.3.4"
-    minizlib "^1.1.1"
-    mkdirp "^0.5.0"
-    safe-buffer "^5.1.2"
-    yallist "^3.0.2"
-
-terser-webpack-plugin@^1.1.0:
-  version "1.2.3"
-  resolved "https://registry.yarnpkg.com/terser-webpack-plugin/-/terser-webpack-plugin-1.2.3.tgz#3f98bc902fac3e5d0de730869f50668561262ec8"
-  dependencies:
-    cacache "^11.0.2"
-    find-cache-dir "^2.0.0"
-    schema-utils "^1.0.0"
-    serialize-javascript "^1.4.0"
-    source-map "^0.6.1"
-    terser "^3.16.1"
-    webpack-sources "^1.1.0"
-    worker-farm "^1.5.2"
-
-terser@^3.11.0, terser@^3.16.1:
-  version "3.16.1"
-  resolved "https://registry.yarnpkg.com/terser/-/terser-3.16.1.tgz#5b0dd4fa1ffd0b0b43c2493b2c364fd179160493"
-  dependencies:
-    commander "~2.17.1"
-    source-map "~0.6.1"
-    source-map-support "~0.5.9"
-
-through2@^2.0.0:
-  version "2.0.5"
-  resolved "https://registry.yarnpkg.com/through2/-/through2-2.0.5.tgz#01c1e39eb31d07cb7d03a96a70823260b23132cd"
-  dependencies:
-    readable-stream "~2.3.6"
-    xtend "~4.0.1"
-
-through@~2.3.6:
-  version "2.3.8"
-  resolved "https://registry.yarnpkg.com/through/-/through-2.3.8.tgz#0dd4c9ffaabc357960b1b724115d7e0e86a2e1f5"
-
-thunky@^1.0.2:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/thunky/-/thunky-1.0.3.tgz#f5df732453407b09191dae73e2a8cc73f381a826"
-
-timers-browserify@^2.0.4:
-  version "2.0.10"
-  resolved "https://registry.yarnpkg.com/timers-browserify/-/timers-browserify-2.0.10.tgz#1d28e3d2aadf1d5a5996c4e9f95601cd053480ae"
-  dependencies:
-    setimmediate "^1.0.4"
-
-timsort@^0.3.0:
-  version "0.3.0"
-  resolved "https://registry.yarnpkg.com/timsort/-/timsort-0.3.0.tgz#405411a8e7e6339fe64db9a234de11dc31e02bd4"
-
-to-arraybuffer@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/to-arraybuffer/-/to-arraybuffer-1.0.1.tgz#7d229b1fcc637e466ca081180836a7aabff83f43"
-
-to-fast-properties@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/to-fast-properties/-/to-fast-properties-2.0.0.tgz#dc5e698cbd079265bc73e0377681a4e4e83f616e"
-
-to-object-path@^0.3.0:
-  version "0.3.0"
-  resolved "https://registry.yarnpkg.com/to-object-path/-/to-object-path-0.3.0.tgz#297588b7b0e7e0ac08e04e672f85c1f4999e17af"
-  dependencies:
-    kind-of "^3.0.2"
-
-to-regex-range@^2.1.0:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/to-regex-range/-/to-regex-range-2.1.1.tgz#7c80c17b9dfebe599e27367e0d4dd5590141db38"
-  dependencies:
-    is-number "^3.0.0"
-    repeat-string "^1.6.1"
-
-to-regex@^3.0.1, to-regex@^3.0.2:
-  version "3.0.2"
-  resolved "https://registry.yarnpkg.com/to-regex/-/to-regex-3.0.2.tgz#13cfdd9b336552f30b51f33a8ae1b42a7a7599ce"
-  dependencies:
-    define-property "^2.0.2"
-    extend-shallow "^3.0.2"
-    regex-not "^1.0.2"
-    safe-regex "^1.1.0"
-
-toidentifier@1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/toidentifier/-/toidentifier-1.0.1.tgz#3be34321a88a820ed1bd80dfaa33e479fbb8dd35"
-  integrity sha512-o5sSPKEkg/DIQNmH43V0/uerLrpzVedkUh8tGNvaeXpfpuwjKenlSox/2O/BTlZUtEe+JG7s5YhEz608PlAHRA==
-
-trim-right@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/trim-right/-/trim-right-1.0.1.tgz#cb2e1203067e0c8de1f614094b9fe45704ea6003"
-
-tslib@^1.9.0:
-  version "1.9.3"
-  resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.9.3.tgz#d7e4dd79245d85428c4d7e4822a79917954ca286"
-
-tty-browserify@0.0.0:
-  version "0.0.0"
-  resolved "https://registry.yarnpkg.com/tty-browserify/-/tty-browserify-0.0.0.tgz#a157ba402da24e9bf957f9aa69d524eed42901a6"
-
-type-is@~1.6.18:
-  version "1.6.18"
-  resolved "https://registry.yarnpkg.com/type-is/-/type-is-1.6.18.tgz#4e552cd05df09467dcbc4ef739de89f2cf37c131"
-  integrity sha512-TkRKr9sUTxEH8MdfuCSP7VizJyzRNMjj2J2do2Jr3Kym598JVdEksuzPQCnlFPW4ky9Q+iA+ma9BGm06XQBy8g==
-  dependencies:
-    media-typer "0.3.0"
-    mime-types "~2.1.24"
-
-typedarray@^0.0.6:
-  version "0.0.6"
-  resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777"
-
-uglify-js@3.4.x:
-  version "3.4.9"
-  resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.4.9.tgz#af02f180c1207d76432e473ed24a28f4a782bae3"
-  dependencies:
-    commander "~2.17.1"
-    source-map "~0.6.1"
-
-unicode-canonical-property-names-ecmascript@^1.0.4:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/unicode-canonical-property-names-ecmascript/-/unicode-canonical-property-names-ecmascript-1.0.4.tgz#2619800c4c825800efdd8343af7dd9933cbe2818"
-
-unicode-match-property-ecmascript@^1.0.4:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/unicode-match-property-ecmascript/-/unicode-match-property-ecmascript-1.0.4.tgz#8ed2a32569961bce9227d09cd3ffbb8fed5f020c"
-  dependencies:
-    unicode-canonical-property-names-ecmascript "^1.0.4"
-    unicode-property-aliases-ecmascript "^1.0.4"
-
-unicode-match-property-value-ecmascript@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/unicode-match-property-value-ecmascript/-/unicode-match-property-value-ecmascript-1.0.2.tgz#9f1dc76926d6ccf452310564fd834ace059663d4"
-
-unicode-property-aliases-ecmascript@^1.0.4:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/unicode-property-aliases-ecmascript/-/unicode-property-aliases-ecmascript-1.0.4.tgz#5a533f31b4317ea76f17d807fa0d116546111dd0"
-
-union-value@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/union-value/-/union-value-1.0.0.tgz#5c71c34cb5bad5dcebe3ea0cd08207ba5aa1aea4"
-  dependencies:
-    arr-union "^3.1.0"
-    get-value "^2.0.6"
-    is-extendable "^0.1.1"
-    set-value "^0.4.3"
-
-uniq@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/uniq/-/uniq-1.0.1.tgz#b31c5ae8254844a3a8281541ce2b04b865a734ff"
-
-uniqs@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/uniqs/-/uniqs-2.0.0.tgz#ffede4b36b25290696e6e165d4a59edb998e6b02"
-
-unique-filename@^1.1.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/unique-filename/-/unique-filename-1.1.1.tgz#1d69769369ada0583103a1e6ae87681b56573230"
-  dependencies:
-    unique-slug "^2.0.0"
-
-unique-slug@^2.0.0:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/unique-slug/-/unique-slug-2.0.1.tgz#5e9edc6d1ce8fb264db18a507ef9bd8544451ca6"
-  dependencies:
-    imurmurhash "^0.1.4"
-
-universalify@^0.1.0:
-  version "0.1.2"
-  resolved "https://registry.yarnpkg.com/universalify/-/universalify-0.1.2.tgz#b646f69be3942dabcecc9d6639c80dc105efaa66"
-
-unpipe@1.0.0, unpipe@~1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/unpipe/-/unpipe-1.0.0.tgz#b2bf4ee8514aae6165b4817829d21b2ef49904ec"
-  integrity sha512-pjy2bYhSsufwWlKwPc+l3cN7+wuJlK6uz0YdJEOlQDbl6jo/YlPi4mb8agUkVC8BF7V8NuzeyPNqRksA3hztKQ==
-
-unquote@~1.1.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/unquote/-/unquote-1.1.1.tgz#8fded7324ec6e88a0ff8b905e7c098cdc086d544"
-
-unset-value@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/unset-value/-/unset-value-1.0.0.tgz#8376873f7d2335179ffb1e6fc3a8ed0dfc8ab559"
-  dependencies:
-    has-value "^0.3.1"
-    isobject "^3.0.0"
-
-upath@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/upath/-/upath-1.1.0.tgz#35256597e46a581db4793d0ce47fa9aebfc9fabd"
-
-upper-case@^1.1.1:
-  version "1.1.3"
-  resolved "https://registry.yarnpkg.com/upper-case/-/upper-case-1.1.3.tgz#f6b4501c2ec4cdd26ba78be7222961de77621598"
-
-uri-js@^4.2.2:
-  version "4.2.2"
-  resolved "https://registry.yarnpkg.com/uri-js/-/uri-js-4.2.2.tgz#94c540e1ff772956e2299507c010aea6c8838eb0"
-  dependencies:
-    punycode "^2.1.0"
-
-urix@^0.1.0:
-  version "0.1.0"
-  resolved "https://registry.yarnpkg.com/urix/-/urix-0.1.0.tgz#da937f7a62e21fec1fd18d49b35c2935067a6c72"
-
-url-parse@^1.4.3:
-  version "1.4.4"
-  resolved "https://registry.yarnpkg.com/url-parse/-/url-parse-1.4.4.tgz#cac1556e95faa0303691fec5cf9d5a1bc34648f8"
-  dependencies:
-    querystringify "^2.0.0"
-    requires-port "^1.0.0"
-
-url@^0.11.0:
-  version "0.11.0"
-  resolved "https://registry.yarnpkg.com/url/-/url-0.11.0.tgz#3838e97cfc60521eb73c525a8e55bfdd9e2e28f1"
-  dependencies:
-    punycode "1.3.2"
-    querystring "0.2.0"
-
-use@^3.1.0:
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/use/-/use-3.1.1.tgz#d50c8cac79a19fbc20f2911f56eb973f4e10070f"
-
-util-deprecate@^1.0.1, util-deprecate@~1.0.1:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/util-deprecate/-/util-deprecate-1.0.2.tgz#450d4dc9fa70de732762fbd2d4a28981419a0ccf"
-
-util.promisify@^1.0.0, util.promisify@~1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/util.promisify/-/util.promisify-1.0.0.tgz#440f7165a459c9a16dc145eb8e72f35687097030"
-  dependencies:
-    define-properties "^1.1.2"
-    object.getownpropertydescriptors "^2.0.3"
-
-util@0.10.3:
-  version "0.10.3"
-  resolved "https://registry.yarnpkg.com/util/-/util-0.10.3.tgz#7afb1afe50805246489e3db7fe0ed379336ac0f9"
-  dependencies:
-    inherits "2.0.1"
-
-util@^0.11.0:
-  version "0.11.1"
-  resolved "https://registry.yarnpkg.com/util/-/util-0.11.1.tgz#3236733720ec64bb27f6e26f421aaa2e1b588d61"
-  dependencies:
-    inherits "2.0.3"
-
-utils-merge@1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/utils-merge/-/utils-merge-1.0.1.tgz#9f95710f50a267947b2ccc124741c1028427e713"
-  integrity sha512-pMZTvIkT1d+TFGvDOqodOclx0QWkkgi6Tdoa8gC8ffGAAqz9pzPTZWAybbsHHoED/ztMtkv/VoYTYyShUn81hA==
-
-uuid@^3.0.1, uuid@^3.3.2:
-  version "3.3.2"
-  resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.3.2.tgz#1b4af4955eb3077c501c23872fc6513811587131"
-
-v8-compile-cache@^2.0.2:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/v8-compile-cache/-/v8-compile-cache-2.0.2.tgz#a428b28bb26790734c4fc8bc9fa106fccebf6a6c"
-
-vary@~1.1.2:
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/vary/-/vary-1.1.2.tgz#2299f02c6ded30d4a5961b0b9f74524a18f634fc"
-  integrity sha512-BNGbWLfd0eUPabhkXUVm0j8uuvREyTh5ovRa/dyow/BqAbZJyC+5fU+IzQOzmAKzYqYRAISoRhdQr3eIZ/PXqg==
-
-vendors@^1.0.0:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/vendors/-/vendors-1.0.2.tgz#7fcb5eef9f5623b156bcea89ec37d63676f21801"
-
-vm-browserify@0.0.4:
-  version "0.0.4"
-  resolved "https://registry.yarnpkg.com/vm-browserify/-/vm-browserify-0.0.4.tgz#5d7ea45bbef9e4a6ff65f95438e0a87c357d5a73"
-  dependencies:
-    indexof "0.0.1"
-
-vue-hot-reload-api@^2.3.0:
-  version "2.3.3"
-  resolved "https://registry.yarnpkg.com/vue-hot-reload-api/-/vue-hot-reload-api-2.3.3.tgz#2756f46cb3258054c5f4723de8ae7e87302a1ccf"
-
-vue-loader@^15.4.2:
-  version "15.6.4"
-  resolved "https://registry.yarnpkg.com/vue-loader/-/vue-loader-15.6.4.tgz#ea6ea48cada424da2cc2304495377678e4b0f6a7"
-  dependencies:
-    "@vue/component-compiler-utils" "^2.5.1"
-    hash-sum "^1.0.2"
-    loader-utils "^1.1.0"
-    vue-hot-reload-api "^2.3.0"
-    vue-style-loader "^4.1.0"
-
-vue-style-loader@^4.1.0:
-  version "4.1.2"
-  resolved "https://registry.yarnpkg.com/vue-style-loader/-/vue-style-loader-4.1.2.tgz#dedf349806f25ceb4e64f3ad7c0a44fba735fcf8"
-  dependencies:
-    hash-sum "^1.0.2"
-    loader-utils "^1.0.2"
-
-vue-template-es2015-compiler@^1.9.0:
-  version "1.9.1"
-  resolved "https://registry.yarnpkg.com/vue-template-es2015-compiler/-/vue-template-es2015-compiler-1.9.1.tgz#1ee3bc9a16ecbf5118be334bb15f9c46f82f5825"
-
-vue@^2.5.17:
-  version "2.6.7"
-  resolved "https://registry.yarnpkg.com/vue/-/vue-2.6.7.tgz#254f188e7621d2d19ee28d0c0442c6d21b53ae2d"
-
-watchpack@^1.5.0:
-  version "1.6.0"
-  resolved "https://registry.yarnpkg.com/watchpack/-/watchpack-1.6.0.tgz#4bc12c2ebe8aa277a71f1d3f14d685c7b446cd00"
-  dependencies:
-    chokidar "^2.0.2"
-    graceful-fs "^4.1.2"
-    neo-async "^2.5.0"
-
-wbuf@^1.1.0, wbuf@^1.7.3:
-  version "1.7.3"
-  resolved "https://registry.yarnpkg.com/wbuf/-/wbuf-1.7.3.tgz#c1d8d149316d3ea852848895cb6a0bfe887b87df"
-  dependencies:
-    minimalistic-assert "^1.0.0"
-
-webpack-cli@^3.1.2:
-  version "3.2.3"
-  resolved "https://registry.yarnpkg.com/webpack-cli/-/webpack-cli-3.2.3.tgz#13653549adfd8ccd920ad7be1ef868bacc22e346"
-  dependencies:
-    chalk "^2.4.1"
-    cross-spawn "^6.0.5"
-    enhanced-resolve "^4.1.0"
-    findup-sync "^2.0.0"
-    global-modules "^1.0.0"
-    import-local "^2.0.0"
-    interpret "^1.1.0"
-    loader-utils "^1.1.0"
-    supports-color "^5.5.0"
-    v8-compile-cache "^2.0.2"
-    yargs "^12.0.4"
-
-webpack-dev-middleware@^3.5.1:
-  version "3.6.0"
-  resolved "https://registry.yarnpkg.com/webpack-dev-middleware/-/webpack-dev-middleware-3.6.0.tgz#71f1b04e52ff8d442757af2be3a658237d53a3e5"
-  dependencies:
-    memory-fs "^0.4.1"
-    mime "^2.3.1"
-    range-parser "^1.0.3"
-    webpack-log "^2.0.0"
-
-webpack-dev-server@^3.1.14:
-  version "3.2.1"
-  resolved "https://registry.yarnpkg.com/webpack-dev-server/-/webpack-dev-server-3.2.1.tgz#1b45ce3ecfc55b6ebe5e36dab2777c02bc508c4e"
-  dependencies:
-    ansi-html "0.0.7"
-    bonjour "^3.5.0"
-    chokidar "^2.0.0"
-    compression "^1.5.2"
-    connect-history-api-fallback "^1.3.0"
-    debug "^4.1.1"
-    del "^3.0.0"
-    express "^4.16.2"
-    html-entities "^1.2.0"
-    http-proxy-middleware "^0.19.1"
-    import-local "^2.0.0"
-    internal-ip "^4.2.0"
-    ip "^1.1.5"
-    killable "^1.0.0"
-    loglevel "^1.4.1"
-    opn "^5.1.0"
-    portfinder "^1.0.9"
-    schema-utils "^1.0.0"
-    selfsigned "^1.9.1"
-    semver "^5.6.0"
-    serve-index "^1.7.2"
-    sockjs "0.3.19"
-    sockjs-client "1.3.0"
-    spdy "^4.0.0"
-    strip-ansi "^3.0.0"
-    supports-color "^6.1.0"
-    url "^0.11.0"
-    webpack-dev-middleware "^3.5.1"
-    webpack-log "^2.0.0"
-    yargs "12.0.2"
-
-webpack-log@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/webpack-log/-/webpack-log-2.0.0.tgz#5b7928e0637593f119d32f6227c1e0ac31e1b47f"
-  dependencies:
-    ansi-colors "^3.0.0"
-    uuid "^3.3.2"
-
-webpack-merge@^4.1.0:
-  version "4.2.1"
-  resolved "https://registry.yarnpkg.com/webpack-merge/-/webpack-merge-4.2.1.tgz#5e923cf802ea2ace4fd5af1d3247368a633489b4"
-  dependencies:
-    lodash "^4.17.5"
-
-webpack-notifier@^1.5.1:
-  version "1.7.0"
-  resolved "https://registry.yarnpkg.com/webpack-notifier/-/webpack-notifier-1.7.0.tgz#4e03ea3ba1c0588d863935363f145d067815068a"
-  dependencies:
-    node-notifier "^5.1.2"
-    object-assign "^4.1.0"
-    strip-ansi "^3.0.1"
-
-webpack-sources@^1.1.0, webpack-sources@^1.3.0:
-  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/webpack-sources/-/webpack-sources-1.3.0.tgz#2a28dcb9f1f45fe960d8f1493252b5ee6530fa85"
-  dependencies:
-    source-list-map "^2.0.0"
-    source-map "~0.6.1"
-
-webpack@^4.27.1:
-  version "4.29.5"
-  resolved "https://registry.yarnpkg.com/webpack/-/webpack-4.29.5.tgz#52b60a7b0838427c3a894cd801a11dc0836bc79f"
-  dependencies:
-    "@webassemblyjs/ast" "1.8.3"
-    "@webassemblyjs/helper-module-context" "1.8.3"
-    "@webassemblyjs/wasm-edit" "1.8.3"
-    "@webassemblyjs/wasm-parser" "1.8.3"
-    acorn "^6.0.5"
-    acorn-dynamic-import "^4.0.0"
-    ajv "^6.1.0"
-    ajv-keywords "^3.1.0"
-    chrome-trace-event "^1.0.0"
-    enhanced-resolve "^4.1.0"
-    eslint-scope "^4.0.0"
-    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"
-    schema-utils "^1.0.0"
-    tapable "^1.1.0"
-    terser-webpack-plugin "^1.1.0"
-    watchpack "^1.5.0"
-    webpack-sources "^1.3.0"
-
-websocket-driver@>=0.5.1:
-  version "0.7.0"
-  resolved "https://registry.yarnpkg.com/websocket-driver/-/websocket-driver-0.7.0.tgz#0caf9d2d755d93aee049d4bdd0d3fe2cca2a24eb"
-  dependencies:
-    http-parser-js ">=0.4.0"
-    websocket-extensions ">=0.1.1"
-
-websocket-extensions@>=0.1.1:
-  version "0.1.4"
-  resolved "https://registry.yarnpkg.com/websocket-extensions/-/websocket-extensions-0.1.4.tgz#7f8473bc839dfd87608adb95d7eb075211578a42"
-  integrity sha512-OqedPIGOfsDlo31UNwYbCFMSaO9m9G/0faIHj5/dZFDMFqPTcx6UwqyOy3COEaEOg/9VsGIpdqn62W5KhoKSpg==
-
-which-module@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/which-module/-/which-module-2.0.0.tgz#d9ef07dce77b9902b8a3a8fa4b31c3e3f7e6e87a"
-
-which@^1.2.14, which@^1.2.9, which@^1.3.0:
-  version "1.3.1"
-  resolved "https://registry.yarnpkg.com/which/-/which-1.3.1.tgz#a45043d54f5805316da8d62f9f50918d3da70b0a"
-  dependencies:
-    isexe "^2.0.0"
-
-wide-align@^1.1.0:
-  version "1.1.3"
-  resolved "https://registry.yarnpkg.com/wide-align/-/wide-align-1.1.3.tgz#ae074e6bdc0c14a431e804e624549c633b000457"
-  dependencies:
-    string-width "^1.0.2 || 2"
-
-worker-farm@^1.5.2:
-  version "1.6.0"
-  resolved "https://registry.yarnpkg.com/worker-farm/-/worker-farm-1.6.0.tgz#aecc405976fab5a95526180846f0dba288f3a4a0"
-  dependencies:
-    errno "~0.1.7"
-
-wrap-ansi@^2.0.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-2.1.0.tgz#d8fc3d284dd05794fe84973caecdd1cf824fdd85"
-  dependencies:
-    string-width "^1.0.1"
-    strip-ansi "^3.0.1"
-
-wrappy@1:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"
-
-xregexp@4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/xregexp/-/xregexp-4.0.0.tgz#e698189de49dd2a18cc5687b05e17c8e43943020"
-
-xtend@^4.0.0, xtend@~4.0.1:
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/xtend/-/xtend-4.0.1.tgz#a5c6d532be656e23db820efb943a1f04998d63af"
-
-"y18n@^3.2.1 || ^4.0.0", y18n@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/y18n/-/y18n-4.0.0.tgz#95ef94f85ecc81d007c264e190a120f0a3c8566b"
-
-yallist@^2.1.2:
-  version "2.1.2"
-  resolved "https://registry.yarnpkg.com/yallist/-/yallist-2.1.2.tgz#1c11f9218f076089a47dd512f93c6699a6a81d52"
-
-yallist@^3.0.0, yallist@^3.0.2:
-  version "3.0.3"
-  resolved "https://registry.yarnpkg.com/yallist/-/yallist-3.0.3.tgz#b4b049e314be545e3ce802236d6cd22cd91c3de9"
-
-yargs-parser@^10.1.0:
-  version "10.1.0"
-  resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-10.1.0.tgz#7202265b89f7e9e9f2e5765e0fe735a905edbaa8"
-  dependencies:
-    camelcase "^4.1.0"
-
-yargs-parser@^11.1.1:
-  version "11.1.1"
-  resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-11.1.1.tgz#879a0865973bca9f6bab5cbdf3b1c67ec7d3bcf4"
-  dependencies:
-    camelcase "^5.0.0"
-    decamelize "^1.2.0"
-
-yargs@12.0.2:
-  version "12.0.2"
-  resolved "https://registry.yarnpkg.com/yargs/-/yargs-12.0.2.tgz#fe58234369392af33ecbef53819171eff0f5aadc"
-  dependencies:
-    cliui "^4.0.0"
-    decamelize "^2.0.0"
-    find-up "^3.0.0"
-    get-caller-file "^1.0.1"
-    os-locale "^3.0.0"
-    require-directory "^2.1.1"
-    require-main-filename "^1.0.1"
-    set-blocking "^2.0.0"
-    string-width "^2.0.0"
-    which-module "^2.0.0"
-    y18n "^3.2.1 || ^4.0.0"
-    yargs-parser "^10.1.0"
-
-yargs@^12.0.4, yargs@^12.0.5:
-  version "12.0.5"
-  resolved "https://registry.yarnpkg.com/yargs/-/yargs-12.0.5.tgz#05f5997b609647b64f66b81e3b4b10a368e7ad13"
-  dependencies:
-    cliui "^4.0.0"
-    decamelize "^1.2.0"
-    find-up "^3.0.0"
-    get-caller-file "^1.0.1"
-    os-locale "^3.0.0"
-    require-directory "^2.1.1"
-    require-main-filename "^1.0.1"
-    set-blocking "^2.0.0"
-    string-width "^2.0.0"
-    which-module "^2.0.0"
-    y18n "^3.2.1 || ^4.0.0"
-    yargs-parser "^11.1.1"
+  "integrity" "sha512-OpZ3zP+jT1PI7I8nemJX4AKmAX070ZkYPVWV/AaKTJl+tXCTGyVdC1a4SL8RUQYEwk/f34ZX8UTykN68FwrqAA=="
+  "resolved" "https://registry.npmjs.org/statuses/-/statuses-1.5.0.tgz"
+  "version" "1.5.0"
+
+"statuses@2.0.1":
+  "integrity" "sha512-RwNA9Z/7PrK06rYLIzFMlaF+l73iwpzsqRIFgbMLbTcLD6cOao82TaWefPXQvB2fOC4AjuYSEndS7N/mTCbkdQ=="
+  "resolved" "https://registry.npmjs.org/statuses/-/statuses-2.0.1.tgz"
+  "version" "2.0.1"
+
+"std-env@^3.0.1":
+  "integrity" "sha512-f9aPhy8fYBuMN+sNfakZV18U39PbalgjXG3lLB9WkaYTxijru61wb57V9wxxNthXM5Sd88ETBWi29qLAsHO52Q=="
+  "resolved" "https://registry.npmjs.org/std-env/-/std-env-3.4.3.tgz"
+  "version" "3.4.3"
+
+"stream-browserify@^2.0.1":
+  "integrity" "sha512-nX6hmklHs/gr2FuxYDltq8fJA1GDlxKQCz8O/IM4atRqBH8OORmBNgfvW5gG10GT/qQ9u0CzIvr2X5Pkt6ntqg=="
+  "resolved" "https://registry.npmjs.org/stream-browserify/-/stream-browserify-2.0.2.tgz"
+  "version" "2.0.2"
+  dependencies:
+    "inherits" "~2.0.1"
+    "readable-stream" "^2.0.2"
+
+"stream-http@^2.7.2":
+  "integrity" "sha512-+TSkfINHDo4J+ZobQLWiMouQYB+UVYFttRA94FpEzzJ7ZdqcL4uUUQ7WkdkI4DSozGmgBUE/a47L+38PenXhUw=="
+  "resolved" "https://registry.npmjs.org/stream-http/-/stream-http-2.8.3.tgz"
+  "version" "2.8.3"
+  dependencies:
+    "builtin-status-codes" "^3.0.0"
+    "inherits" "^2.0.1"
+    "readable-stream" "^2.3.6"
+    "to-arraybuffer" "^1.0.0"
+    "xtend" "^4.0.0"
+
+"string_decoder@^1.0.0", "string_decoder@~1.1.1":
+  "integrity" "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg=="
+  "resolved" "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz"
+  "version" "1.1.1"
+  dependencies:
+    "safe-buffer" "~5.1.0"
+
+"string_decoder@^1.1.1":
+  "integrity" "sha512-6YqyX6ZWEYguAxgZzHGL7SsCeGx3V2TtOTqZz1xSTSWnqsbWwbptafNyvf/ACquZUXV3DANr5BDIwNYe1mN42w=="
+  "resolved" "https://registry.npmjs.org/string_decoder/-/string_decoder-1.2.0.tgz"
+  "version" "1.2.0"
+  dependencies:
+    "safe-buffer" "~5.1.0"
+
+"string-width@^4.1.0", "string-width@^4.2.0", "string-width@^4.2.3":
+  "integrity" "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g=="
+  "resolved" "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz"
+  "version" "4.2.3"
+  dependencies:
+    "emoji-regex" "^8.0.0"
+    "is-fullwidth-code-point" "^3.0.0"
+    "strip-ansi" "^6.0.1"
+
+"strip-ansi@^6.0.0", "strip-ansi@^6.0.1":
+  "integrity" "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A=="
+  "resolved" "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz"
+  "version" "6.0.1"
+  dependencies:
+    "ansi-regex" "^5.0.1"
+
+"strip-final-newline@^2.0.0":
+  "integrity" "sha512-BrpvfNAE3dcvq7ll3xVumzjKjZQ5tI1sEUIKr3Uoks0XUl45St3FlatVqef9prk4jRDzhW6WZg+3bk93y6pLjA=="
+  "resolved" "https://registry.npmjs.org/strip-final-newline/-/strip-final-newline-2.0.0.tgz"
+  "version" "2.0.0"
+
+"style-loader@^2.0.0":
+  "integrity" "sha512-Z0gYUJmzZ6ZdRUqpg1r8GsaFKypE+3xAzuFeMuoHgjc9KZv3wMyCRjQIWEbhoFSq7+7yoHXySDJyyWQaPajeiQ=="
+  "resolved" "https://registry.npmjs.org/style-loader/-/style-loader-2.0.0.tgz"
+  "version" "2.0.0"
+  dependencies:
+    "loader-utils" "^2.0.0"
+    "schema-utils" "^3.0.0"
+
+"stylehacks@^5.1.1":
+  "integrity" "sha512-sBpcd5Hx7G6seo7b1LkpttvTz7ikD0LlH5RmdcBNb6fFR0Fl7LQwHDFr300q4cwUqi+IYrFGmsIHieMBfnN/Bw=="
+  "resolved" "https://registry.npmjs.org/stylehacks/-/stylehacks-5.1.1.tgz"
+  "version" "5.1.1"
+  dependencies:
+    "browserslist" "^4.21.4"
+    "postcss-selector-parser" "^6.0.4"
+
+"sucrase@^3.32.0":
+  "integrity" "sha512-ydQOU34rpSyj2TGyz4D2p8rbktIOZ8QY9s+DGLvFU1i5pWJE8vkpruCjGCMHsdXwnD7JDcS+noSwM/a7zyNFDQ=="
+  "resolved" "https://registry.npmjs.org/sucrase/-/sucrase-3.32.0.tgz"
+  "version" "3.32.0"
+  dependencies:
+    "@jridgewell/gen-mapping" "^0.3.2"
+    "commander" "^4.0.0"
+    "glob" "7.1.6"
+    "lines-and-columns" "^1.1.6"
+    "mz" "^2.7.0"
+    "pirates" "^4.0.1"
+    "ts-interface-checker" "^0.1.9"
+
+"supports-color@^5.3.0":
+  "integrity" "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow=="
+  "resolved" "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz"
+  "version" "5.5.0"
+  dependencies:
+    "has-flag" "^3.0.0"
+
+"supports-color@^7.1.0":
+  "integrity" "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw=="
+  "resolved" "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz"
+  "version" "7.2.0"
+  dependencies:
+    "has-flag" "^4.0.0"
+
+"supports-color@^8.0.0":
+  "integrity" "sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q=="
+  "resolved" "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz"
+  "version" "8.1.1"
+  dependencies:
+    "has-flag" "^4.0.0"
+
+"supports-preserve-symlinks-flag@^1.0.0":
+  "integrity" "sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w=="
+  "resolved" "https://registry.npmjs.org/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz"
+  "version" "1.0.0"
+
+"svgo@^2.7.0":
+  "integrity" "sha512-+N/Q9kV1+F+UeWYoSiULYo4xYSDQlTgb+ayMobAXPwMnLvop7oxKMo9OzIrX5x3eS4L4f2UHhc9axXwY8DpChg=="
+  "resolved" "https://registry.npmjs.org/svgo/-/svgo-2.8.0.tgz"
+  "version" "2.8.0"
+  dependencies:
+    "@trysound/sax" "0.2.0"
+    "commander" "^7.2.0"
+    "css-select" "^4.1.3"
+    "css-tree" "^1.1.3"
+    "csso" "^4.2.0"
+    "picocolors" "^1.0.0"
+    "stable" "^0.1.8"
+
+"tailwindcss@^3.1.8", "tailwindcss@^3.3.2":
+  "integrity" "sha512-9jPkMiIBXvPc2KywkraqsUfbfj+dHDb+JPWtSJa9MLFdrPyazI7q6WX2sUrm7R9eVR7qqv3Pas7EvQFzxKnI6w=="
+  "resolved" "https://registry.npmjs.org/tailwindcss/-/tailwindcss-3.3.2.tgz"
+  "version" "3.3.2"
+  dependencies:
+    "@alloc/quick-lru" "^5.2.0"
+    "arg" "^5.0.2"
+    "chokidar" "^3.5.3"
+    "didyoumean" "^1.2.2"
+    "dlv" "^1.1.3"
+    "fast-glob" "^3.2.12"
+    "glob-parent" "^6.0.2"
+    "is-glob" "^4.0.3"
+    "jiti" "^1.18.2"
+    "lilconfig" "^2.1.0"
+    "micromatch" "^4.0.5"
+    "normalize-path" "^3.0.0"
+    "object-hash" "^3.0.0"
+    "picocolors" "^1.0.0"
+    "postcss" "^8.4.23"
+    "postcss-import" "^15.1.0"
+    "postcss-js" "^4.0.1"
+    "postcss-load-config" "^4.0.1"
+    "postcss-nested" "^6.0.1"
+    "postcss-selector-parser" "^6.0.11"
+    "postcss-value-parser" "^4.2.0"
+    "resolve" "^1.22.2"
+    "sucrase" "^3.32.0"
+
+"tapable@^2.1.1", "tapable@^2.2.0":
+  "integrity" "sha512-GNzQvQTOIP6RyTfE2Qxb8ZVlNmw0n88vp1szwWRimP02mnTsx3Wtn5qRdqY9w2XduFNUgvOwhNnQsjwCp+kqaQ=="
+  "resolved" "https://registry.npmjs.org/tapable/-/tapable-2.2.1.tgz"
+  "version" "2.2.1"
+
+"terser-webpack-plugin@^5.2.4", "terser-webpack-plugin@^5.3.7":
+  "integrity" "sha512-ZuXsqE07EcggTWQjXUj+Aot/OMcD0bMKGgF63f7UxYcu5/AJF53aIpK1YoP5xR9l6s/Hy2b+t1AM0bLNPRuhwA=="
+  "resolved" "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-5.3.9.tgz"
+  "version" "5.3.9"
+  dependencies:
+    "@jridgewell/trace-mapping" "^0.3.17"
+    "jest-worker" "^27.4.5"
+    "schema-utils" "^3.1.1"
+    "serialize-javascript" "^6.0.1"
+    "terser" "^5.16.8"
+
+"terser@^4.6.3":
+  "integrity" "sha512-4GnLC0x667eJG0ewJTa6z/yXrbLGv80D9Ru6HIpCQmO+Q4PfEtBFi0ObSckqwL6VyQv/7ENJieXHo2ANmdQwgw=="
+  "resolved" "https://registry.npmjs.org/terser/-/terser-4.8.1.tgz"
+  "version" "4.8.1"
+  dependencies:
+    "commander" "^2.20.0"
+    "source-map" "~0.6.1"
+    "source-map-support" "~0.5.12"
+
+"terser@^5.16.8", "terser@^5.9.0":
+  "integrity" "sha512-hHZVLgRA2z4NWcN6aS5rQDc+7Dcy58HOf2zbYwmFcQ+ua3h6eEFf5lIDKTzbWwlazPyOZsFQO8V80/IjVNExEw=="
+  "resolved" "https://registry.npmjs.org/terser/-/terser-5.22.0.tgz"
+  "version" "5.22.0"
+  dependencies:
+    "@jridgewell/source-map" "^0.3.3"
+    "acorn" "^8.8.2"
+    "commander" "^2.20.0"
+    "source-map-support" "~0.5.20"
+
+"thenify-all@^1.0.0":
+  "integrity" "sha512-RNxQH/qI8/t3thXJDwcstUO4zeqo64+Uy/+sNVRBx4Xn2OX+OZ9oP+iJnNFqplFra2ZUVeKCSa2oVWi3T4uVmA=="
+  "resolved" "https://registry.npmjs.org/thenify-all/-/thenify-all-1.6.0.tgz"
+  "version" "1.6.0"
+  dependencies:
+    "thenify" ">= 3.1.0 < 4"
+
+"thenify@>= 3.1.0 < 4":
+  "integrity" "sha512-RVZSIV5IG10Hk3enotrhvz0T9em6cyHBLkH/YAZuKqd8hRkKhSfCGIcP2KUY0EPxndzANBmNllzWPwak+bheSw=="
+  "resolved" "https://registry.npmjs.org/thenify/-/thenify-3.3.1.tgz"
+  "version" "3.3.1"
+  dependencies:
+    "any-promise" "^1.0.0"
+
+"thunky@^1.0.2":
+  "integrity" "sha512-eHY7nBftgThBqOyHGVN+l8gF0BucP09fMo0oO/Lb0w1OF80dJv+lDVpXG60WMQvkcxAkNybKsrEIE3ZtKGmPrA=="
+  "resolved" "https://registry.npmjs.org/thunky/-/thunky-1.1.0.tgz"
+  "version" "1.1.0"
+
+"timers-browserify@^2.0.4":
+  "integrity" "sha512-9phl76Cqm6FhSX9Xe1ZUAMLtm1BLkKj2Qd5ApyWkXzsMRaA7dgr81kf4wJmQf/hAvg8EEyJxDo3du/0KlhPiKQ=="
+  "resolved" "https://registry.npmjs.org/timers-browserify/-/timers-browserify-2.0.12.tgz"
+  "version" "2.0.12"
+  dependencies:
+    "setimmediate" "^1.0.4"
+
+"to-arraybuffer@^1.0.0":
+  "integrity" "sha512-okFlQcoGTi4LQBG/PgSYblw9VOyptsz2KJZqc6qtgGdes8VktzUQkj4BI2blit072iS8VODNcMA+tvnS9dnuMA=="
+  "resolved" "https://registry.npmjs.org/to-arraybuffer/-/to-arraybuffer-1.0.1.tgz"
+  "version" "1.0.1"
+
+"to-fast-properties@^2.0.0":
+  "integrity" "sha512-/OaKK0xYrs3DmxRYqL/yDc+FxFUVYhDlXMhRmv3z915w2HF1tnN1omB354j8VUGO/hbRzyD6Y3sA7v7GS/ceog=="
+  "resolved" "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-2.0.0.tgz"
+  "version" "2.0.0"
+
+"to-regex-range@^5.0.1":
+  "integrity" "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ=="
+  "resolved" "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz"
+  "version" "5.0.1"
+  dependencies:
+    "is-number" "^7.0.0"
+
+"toidentifier@1.0.1":
+  "integrity" "sha512-o5sSPKEkg/DIQNmH43V0/uerLrpzVedkUh8tGNvaeXpfpuwjKenlSox/2O/BTlZUtEe+JG7s5YhEz608PlAHRA=="
+  "resolved" "https://registry.npmjs.org/toidentifier/-/toidentifier-1.0.1.tgz"
+  "version" "1.0.1"
+
+"ts-interface-checker@^0.1.9":
+  "integrity" "sha512-Y/arvbn+rrz3JCKl9C4kVNfTfSm2/mEp5FSz5EsZSANGPSlQrpRI5M4PKF+mJnE52jOO90PnPSc3Ur3bTQw0gA=="
+  "resolved" "https://registry.npmjs.org/ts-interface-checker/-/ts-interface-checker-0.1.13.tgz"
+  "version" "0.1.13"
+
+"tslib@^2.0.3":
+  "integrity" "sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q=="
+  "resolved" "https://registry.npmjs.org/tslib/-/tslib-2.6.2.tgz"
+  "version" "2.6.2"
+
+"tty-browserify@0.0.0":
+  "integrity" "sha512-JVa5ijo+j/sOoHGjw0sxw734b1LhBkQ3bvUGNdxnVXDCX81Yx7TFgnZygxrIIWn23hbfTaMYLwRmAxFyDuFmIw=="
+  "resolved" "https://registry.npmjs.org/tty-browserify/-/tty-browserify-0.0.0.tgz"
+  "version" "0.0.0"
+
+"type-is@~1.6.18":
+  "integrity" "sha512-TkRKr9sUTxEH8MdfuCSP7VizJyzRNMjj2J2do2Jr3Kym598JVdEksuzPQCnlFPW4ky9Q+iA+ma9BGm06XQBy8g=="
+  "resolved" "https://registry.npmjs.org/type-is/-/type-is-1.6.18.tgz"
+  "version" "1.6.18"
+  dependencies:
+    "media-typer" "0.3.0"
+    "mime-types" "~2.1.24"
+
+"typedarray@^0.0.6":
+  "integrity" "sha512-/aCDEGatGvZ2BIk+HmLf4ifCJFwvKFNb9/JeZPMulfgFracn9QFcAf5GO8B/mweUjSoblS5In0cWhqpfs/5PQA=="
+  "resolved" "https://registry.npmjs.org/typedarray/-/typedarray-0.0.6.tgz"
+  "version" "0.0.6"
+
+"unicode-canonical-property-names-ecmascript@^2.0.0":
+  "integrity" "sha512-yY5PpDlfVIU5+y/BSCxAJRBIS1Zc2dDG3Ujq+sR0U+JjUevW2JhocOF+soROYDSaAezOzOKuyyixhD6mBknSmQ=="
+  "resolved" "https://registry.npmjs.org/unicode-canonical-property-names-ecmascript/-/unicode-canonical-property-names-ecmascript-2.0.0.tgz"
+  "version" "2.0.0"
+
+"unicode-match-property-ecmascript@^2.0.0":
+  "integrity" "sha512-5kaZCrbp5mmbz5ulBkDkbY0SsPOjKqVS35VpL9ulMPfSl0J0Xsm+9Evphv9CoIZFwre7aJoa94AY6seMKGVN5Q=="
+  "resolved" "https://registry.npmjs.org/unicode-match-property-ecmascript/-/unicode-match-property-ecmascript-2.0.0.tgz"
+  "version" "2.0.0"
+  dependencies:
+    "unicode-canonical-property-names-ecmascript" "^2.0.0"
+    "unicode-property-aliases-ecmascript" "^2.0.0"
+
+"unicode-match-property-value-ecmascript@^2.0.0":
+  "integrity" "sha512-7Yhkc0Ye+t4PNYzOGKedDhXbYIBe1XEQYQxOPyhcXNMJ0WCABqqj6ckydd6pWRZTHV4GuCPKdBAUiMc60tsKVw=="
+  "resolved" "https://registry.npmjs.org/unicode-match-property-value-ecmascript/-/unicode-match-property-value-ecmascript-2.0.0.tgz"
+  "version" "2.0.0"
+
+"unicode-property-aliases-ecmascript@^2.0.0":
+  "integrity" "sha512-5Zfuy9q/DFr4tfO7ZPeVXb1aPoeQSdeFMLpYuFebehDAhbuevLs5yxSZmIFN1tP5F9Wl4IpJrYojg85/zgyZHQ=="
+  "resolved" "https://registry.npmjs.org/unicode-property-aliases-ecmascript/-/unicode-property-aliases-ecmascript-2.0.0.tgz"
+  "version" "2.0.0"
+
+"universalify@^2.0.0":
+  "integrity" "sha512-hAZsKq7Yy11Zu1DE0OzWjw7nnLZmJZYTDZZyEFHZdUhV8FkH5MCfoU1XMaxXovpyW5nq5scPqq0ZDP9Zyl04oQ=="
+  "resolved" "https://registry.npmjs.org/universalify/-/universalify-2.0.0.tgz"
+  "version" "2.0.0"
+
+"unpipe@~1.0.0", "unpipe@1.0.0":
+  "integrity" "sha512-pjy2bYhSsufwWlKwPc+l3cN7+wuJlK6uz0YdJEOlQDbl6jo/YlPi4mb8agUkVC8BF7V8NuzeyPNqRksA3hztKQ=="
+  "resolved" "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz"
+  "version" "1.0.0"
+
+"update-browserslist-db@^1.0.13":
+  "integrity" "sha512-xebP81SNcPuNpPP3uzeW1NYXxI3rxyJzF3pD6sH4jE7o/IX+WtSpwnVU+qIsDPyk0d3hmFQ7mjqc6AtV604hbg=="
+  "resolved" "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.0.13.tgz"
+  "version" "1.0.13"
+  dependencies:
+    "escalade" "^3.1.1"
+    "picocolors" "^1.0.0"
+
+"uri-js@^4.2.2":
+  "integrity" "sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg=="
+  "resolved" "https://registry.npmjs.org/uri-js/-/uri-js-4.4.1.tgz"
+  "version" "4.4.1"
+  dependencies:
+    "punycode" "^2.1.0"
+
+"url@^0.11.0":
+  "integrity" "sha512-6hxOLGfZASQK/cijlZnZJTq8OXAkt/3YGfQX45vvMYXpZoo8NdWZcY73K108Jf759lS1Bv/8wXnHDTSz17dSRw=="
+  "resolved" "https://registry.npmjs.org/url/-/url-0.11.3.tgz"
+  "version" "0.11.3"
+  dependencies:
+    "punycode" "^1.4.1"
+    "qs" "^6.11.2"
+
+"user-home@^2.0.0":
+  "integrity" "sha512-KMWqdlOcjCYdtIJpicDSFBQ8nFwS2i9sslAd6f4+CBGcU4gist2REnr2fxj2YocvJFxSF3ZOHLYLVZnUxv4BZQ=="
+  "resolved" "https://registry.npmjs.org/user-home/-/user-home-2.0.0.tgz"
+  "version" "2.0.0"
+  dependencies:
+    "os-homedir" "^1.0.0"
+
+"util-deprecate@^1.0.1", "util-deprecate@^1.0.2", "util-deprecate@~1.0.1":
+  "integrity" "sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw=="
+  "resolved" "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz"
+  "version" "1.0.2"
+
+"util@^0.10.4":
+  "integrity" "sha512-0Pm9hTQ3se5ll1XihRic3FDIku70C+iHUdT/W926rSgHV5QgXsYbKZN8MSC3tJtSkhuROzvsQjAaFENRXr+19A=="
+  "resolved" "https://registry.npmjs.org/util/-/util-0.10.4.tgz"
+  "version" "0.10.4"
+  dependencies:
+    "inherits" "2.0.3"
+
+"util@^0.11.0":
+  "integrity" "sha512-HShAsny+zS2TZfaXxD9tYj4HQGlBezXZMZuM/S5PKLLoZkShZiGk9o5CzukI1LVHZvjdvZ2Sj1aW/Ndn2NB/HQ=="
+  "resolved" "https://registry.npmjs.org/util/-/util-0.11.1.tgz"
+  "version" "0.11.1"
+  dependencies:
+    "inherits" "2.0.3"
+
+"utils-merge@1.0.1":
+  "integrity" "sha512-pMZTvIkT1d+TFGvDOqodOclx0QWkkgi6Tdoa8gC8ffGAAqz9pzPTZWAybbsHHoED/ztMtkv/VoYTYyShUn81hA=="
+  "resolved" "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.1.tgz"
+  "version" "1.0.1"
+
+"uuid@^8.3.0", "uuid@^8.3.2":
+  "integrity" "sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg=="
+  "resolved" "https://registry.npmjs.org/uuid/-/uuid-8.3.2.tgz"
+  "version" "8.3.2"
+
+"vary@~1.1.2":
+  "integrity" "sha512-BNGbWLfd0eUPabhkXUVm0j8uuvREyTh5ovRa/dyow/BqAbZJyC+5fU+IzQOzmAKzYqYRAISoRhdQr3eIZ/PXqg=="
+  "resolved" "https://registry.npmjs.org/vary/-/vary-1.1.2.tgz"
+  "version" "1.1.2"
+
+"vm-browserify@^1.0.1":
+  "integrity" "sha512-2ham8XPWTONajOR0ohOKOHXkm3+gaBmGut3SRuu75xLd/RRaY6vqgh8NBYYk7+RW3u5AtzPQZG8F10LHkl0lAQ=="
+  "resolved" "https://registry.npmjs.org/vm-browserify/-/vm-browserify-1.1.2.tgz"
+  "version" "1.1.2"
+
+"vscode-oniguruma@1.7.0":
+  "integrity" "sha512-L9WMGRfrjOhgHSdOYgCt/yRMsXzLDJSL7BPrOZt73gU0iWO4mpqzqQzOz5srxqTvMBaR0XZTSrVWo4j55Rc6cA=="
+  "resolved" "https://registry.npmjs.org/vscode-oniguruma/-/vscode-oniguruma-1.7.0.tgz"
+  "version" "1.7.0"
+
+"vscode-textmate@^7.0.1":
+  "integrity" "sha512-zQ5U/nuXAAMsh691FtV0wPz89nSkHbs+IQV8FDk+wew9BlSDhf4UmWGlWJfTR2Ti6xZv87Tj5fENzKf6Qk7aLw=="
+  "resolved" "https://registry.npmjs.org/vscode-textmate/-/vscode-textmate-7.0.1.tgz"
+  "version" "7.0.1"
+
+"vue-style-loader@^4.1.3":
+  "integrity" "sha512-sFuh0xfbtpRlKfm39ss/ikqs9AbKCoXZBpHeVZ8Tx650o0k0q/YCM7FRvigtxpACezfq6af+a7JeqVTWvncqDg=="
+  "resolved" "https://registry.npmjs.org/vue-style-loader/-/vue-style-loader-4.1.3.tgz"
+  "version" "4.1.3"
+  dependencies:
+    "hash-sum" "^1.0.2"
+    "loader-utils" "^1.0.2"
+
+"vue@^3.3.13", "vue@3.3.13":
+  "integrity" "sha512-LDnUpQvDgsfc0u/YgtAgTMXJlJQqjkxW1PVcOnJA5cshPleULDjHi7U45pl2VJYazSSvLH8UKcid/kzH8I0a0Q=="
+  "resolved" "https://registry.npmjs.org/vue/-/vue-3.3.13.tgz"
+  "version" "3.3.13"
+  dependencies:
+    "@vue/compiler-dom" "3.3.13"
+    "@vue/compiler-sfc" "3.3.13"
+    "@vue/runtime-dom" "3.3.13"
+    "@vue/server-renderer" "3.3.13"
+    "@vue/shared" "3.3.13"
+
+"watchpack@^2.4.0":
+  "integrity" "sha512-Lcvm7MGST/4fup+ifyKi2hjyIAwcdI4HRgtvTpIUxBRhB+RFtUh8XtDOxUfctVCnhVi+QQj49i91OyvzkJl6cg=="
+  "resolved" "https://registry.npmjs.org/watchpack/-/watchpack-2.4.0.tgz"
+  "version" "2.4.0"
+  dependencies:
+    "glob-to-regexp" "^0.4.1"
+    "graceful-fs" "^4.1.2"
+
+"wbuf@^1.1.0", "wbuf@^1.7.3":
+  "integrity" "sha512-O84QOnr0icsbFGLS0O3bI5FswxzRr8/gHwWkDlQFskhSPryQXvrTMxjxGP4+iWYoauLoBvfDpkrOauZ+0iZpDA=="
+  "resolved" "https://registry.npmjs.org/wbuf/-/wbuf-1.7.3.tgz"
+  "version" "1.7.3"
+  dependencies:
+    "minimalistic-assert" "^1.0.0"
+
+"webpack-cli@^4.9.1", "webpack-cli@4.x.x":
+  "integrity" "sha512-NLhDfH/h4O6UOy+0LSso42xvYypClINuMNBVVzX4vX98TmTaTUxwRbXdhucbFMd2qLaCTcLq/PdYrvi8onw90w=="
+  "resolved" "https://registry.npmjs.org/webpack-cli/-/webpack-cli-4.10.0.tgz"
+  "version" "4.10.0"
+  dependencies:
+    "@discoveryjs/json-ext" "^0.5.0"
+    "@webpack-cli/configtest" "^1.2.0"
+    "@webpack-cli/info" "^1.5.0"
+    "@webpack-cli/serve" "^1.7.0"
+    "colorette" "^2.0.14"
+    "commander" "^7.0.0"
+    "cross-spawn" "^7.0.3"
+    "fastest-levenshtein" "^1.0.12"
+    "import-local" "^3.0.2"
+    "interpret" "^2.2.0"
+    "rechoir" "^0.7.0"
+    "webpack-merge" "^5.7.3"
+
+"webpack-dev-middleware@^5.3.1":
+  "integrity" "sha512-hj5CYrY0bZLB+eTO+x/j67Pkrquiy7kWepMHmUMoPsmcUaeEnQJqFzHJOyxgWlq746/wUuA64p9ta34Kyb01pA=="
+  "resolved" "https://registry.npmjs.org/webpack-dev-middleware/-/webpack-dev-middleware-5.3.3.tgz"
+  "version" "5.3.3"
+  dependencies:
+    "colorette" "^2.0.10"
+    "memfs" "^3.4.3"
+    "mime-types" "^2.1.31"
+    "range-parser" "^1.2.1"
+    "schema-utils" "^4.0.0"
+
+"webpack-dev-server@^4.7.3":
+  "integrity" "sha512-5hbAst3h3C3L8w6W4P96L5vaV0PxSmJhxZvWKYIdgxOQm8pNZ5dEOmmSLBVpP85ReeyRt6AS1QJNyo/oFFPeVA=="
+  "resolved" "https://registry.npmjs.org/webpack-dev-server/-/webpack-dev-server-4.15.1.tgz"
+  "version" "4.15.1"
+  dependencies:
+    "@types/bonjour" "^3.5.9"
+    "@types/connect-history-api-fallback" "^1.3.5"
+    "@types/express" "^4.17.13"
+    "@types/serve-index" "^1.9.1"
+    "@types/serve-static" "^1.13.10"
+    "@types/sockjs" "^0.3.33"
+    "@types/ws" "^8.5.5"
+    "ansi-html-community" "^0.0.8"
+    "bonjour-service" "^1.0.11"
+    "chokidar" "^3.5.3"
+    "colorette" "^2.0.10"
+    "compression" "^1.7.4"
+    "connect-history-api-fallback" "^2.0.0"
+    "default-gateway" "^6.0.3"
+    "express" "^4.17.3"
+    "graceful-fs" "^4.2.6"
+    "html-entities" "^2.3.2"
+    "http-proxy-middleware" "^2.0.3"
+    "ipaddr.js" "^2.0.1"
+    "launch-editor" "^2.6.0"
+    "open" "^8.0.9"
+    "p-retry" "^4.5.0"
+    "rimraf" "^3.0.2"
+    "schema-utils" "^4.0.0"
+    "selfsigned" "^2.1.1"
+    "serve-index" "^1.9.1"
+    "sockjs" "^0.3.24"
+    "spdy" "^4.0.2"
+    "webpack-dev-middleware" "^5.3.1"
+    "ws" "^8.13.0"
+
+"webpack-merge@^5.7.3", "webpack-merge@^5.8.0":
+  "integrity" "sha512-+4zXKdx7UnO+1jaN4l2lHVD+mFvnlZQP/6ljaJVb4SZiwIKeUnrT5l0gkT8z+n4hKpC+jpOv6O9R+gLtag7pSA=="
+  "resolved" "https://registry.npmjs.org/webpack-merge/-/webpack-merge-5.10.0.tgz"
+  "version" "5.10.0"
+  dependencies:
+    "clone-deep" "^4.0.1"
+    "flat" "^5.0.2"
+    "wildcard" "^2.0.0"
+
+"webpack-notifier@^1.14.1":
+  "integrity" "sha512-N2V8UMgRB5komdXQRavBsRpw0hPhJq2/SWNOGuhrXpIgRhcMexzkGQysUyGStHLV5hkUlgpRiF7IUXoBqyMmzQ=="
+  "resolved" "https://registry.npmjs.org/webpack-notifier/-/webpack-notifier-1.15.0.tgz"
+  "version" "1.15.0"
+  dependencies:
+    "node-notifier" "^9.0.0"
+    "strip-ansi" "^6.0.0"
+
+"webpack-sources@^1.1.0":
+  "integrity" "sha512-lgTS3Xhv1lCOKo7SA5TjKXMjpSM4sBjNV5+q2bqesbSPs5FjGmU6jjtBSkX9b4qW87vDIsCIlUPOEhbZrMdjeQ=="
+  "resolved" "https://registry.npmjs.org/webpack-sources/-/webpack-sources-1.4.3.tgz"
+  "version" "1.4.3"
+  dependencies:
+    "source-list-map" "^2.0.0"
+    "source-map" "~0.6.1"
+
+"webpack-sources@^3.2.3":
+  "integrity" "sha512-/DyMEOrDgLKKIG0fmvtz+4dUX/3Ghozwgm6iPp8KRhvn+eQf9+Q7GWxVNMk3+uCPWfdXYC4ExGBckIXdFEfH1w=="
+  "resolved" "https://registry.npmjs.org/webpack-sources/-/webpack-sources-3.2.3.tgz"
+  "version" "3.2.3"
+
+"webpack@^4.0.0 || ^5.0.0", "webpack@^4.27.0 || ^5.0.0", "webpack@^4.37.0 || ^5.0.0", "webpack@^4.4.0 || ^5.0.0", "webpack@^5.0.0", "webpack@^5.1.0", "webpack@^5.60.0", "webpack@>=2", "webpack@3 || 4 || 5", "webpack@4.x.x || 5.x.x":
+  "integrity" "sha512-qyfIC10pOr70V+jkmud8tMfajraGCZMBWJtrmuBymQKCrLTRejBI8STDp1MCyZu/QTdZSeacCQYpYNQVOzX5kw=="
+  "resolved" "https://registry.npmjs.org/webpack/-/webpack-5.89.0.tgz"
+  "version" "5.89.0"
+  dependencies:
+    "@types/eslint-scope" "^3.7.3"
+    "@types/estree" "^1.0.0"
+    "@webassemblyjs/ast" "^1.11.5"
+    "@webassemblyjs/wasm-edit" "^1.11.5"
+    "@webassemblyjs/wasm-parser" "^1.11.5"
+    "acorn" "^8.7.1"
+    "acorn-import-assertions" "^1.9.0"
+    "browserslist" "^4.14.5"
+    "chrome-trace-event" "^1.0.2"
+    "enhanced-resolve" "^5.15.0"
+    "es-module-lexer" "^1.2.1"
+    "eslint-scope" "5.1.1"
+    "events" "^3.2.0"
+    "glob-to-regexp" "^0.4.1"
+    "graceful-fs" "^4.2.9"
+    "json-parse-even-better-errors" "^2.3.1"
+    "loader-runner" "^4.2.0"
+    "mime-types" "^2.1.27"
+    "neo-async" "^2.6.2"
+    "schema-utils" "^3.2.0"
+    "tapable" "^2.1.1"
+    "terser-webpack-plugin" "^5.3.7"
+    "watchpack" "^2.4.0"
+    "webpack-sources" "^3.2.3"
+
+"webpackbar@^5.0.0-3":
+  "integrity" "sha512-BmFJo7veBDgQzfWXl/wwYXr/VFus0614qZ8i9znqcl9fnEdiVkdbi0TedLQ6xAK92HZHDJ0QmyQ0fmuZPAgCYQ=="
+  "resolved" "https://registry.npmjs.org/webpackbar/-/webpackbar-5.0.2.tgz"
+  "version" "5.0.2"
+  dependencies:
+    "chalk" "^4.1.0"
+    "consola" "^2.15.3"
+    "pretty-time" "^1.1.0"
+    "std-env" "^3.0.1"
+
+"websocket-driver@^0.7.4", "websocket-driver@>=0.5.1":
+  "integrity" "sha512-b17KeDIQVjvb0ssuSDF2cYXSg2iztliJ4B9WdsuB6J952qCPKmnVq4DyW5motImXHDC1cBT/1UezrJVsKw5zjg=="
+  "resolved" "https://registry.npmjs.org/websocket-driver/-/websocket-driver-0.7.4.tgz"
+  "version" "0.7.4"
+  dependencies:
+    "http-parser-js" ">=0.5.1"
+    "safe-buffer" ">=5.1.0"
+    "websocket-extensions" ">=0.1.1"
+
+"websocket-extensions@>=0.1.1":
+  "integrity" "sha512-OqedPIGOfsDlo31UNwYbCFMSaO9m9G/0faIHj5/dZFDMFqPTcx6UwqyOy3COEaEOg/9VsGIpdqn62W5KhoKSpg=="
+  "resolved" "https://registry.npmjs.org/websocket-extensions/-/websocket-extensions-0.1.4.tgz"
+  "version" "0.1.4"
+
+"which@^2.0.1", "which@^2.0.2":
+  "integrity" "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA=="
+  "resolved" "https://registry.npmjs.org/which/-/which-2.0.2.tgz"
+  "version" "2.0.2"
+  dependencies:
+    "isexe" "^2.0.0"
+
+"wildcard@^2.0.0":
+  "integrity" "sha512-CC1bOL87PIWSBhDcTrdeLo6eGT7mCFtrg0uIJtqJUFyK+eJnzl8A1niH56uu7KMa5XFrtiV+AQuHO3n7DsHnLQ=="
+  "resolved" "https://registry.npmjs.org/wildcard/-/wildcard-2.0.1.tgz"
+  "version" "2.0.1"
+
+"wrap-ansi@^7.0.0":
+  "integrity" "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q=="
+  "resolved" "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz"
+  "version" "7.0.0"
+  dependencies:
+    "ansi-styles" "^4.0.0"
+    "string-width" "^4.1.0"
+    "strip-ansi" "^6.0.0"
+
+"wrappy@1":
+  "integrity" "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ=="
+  "resolved" "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz"
+  "version" "1.0.2"
+
+"ws@^8.13.0":
+  "integrity" "sha512-wEBG1ftX4jcglPxgFCMJmZ2PLtSbJ2Peg6TmpJFTbe9GZYOQCDPdMYu/Tm0/bGZkw8paZnJY45J4K2PZrLYq8g=="
+  "resolved" "https://registry.npmjs.org/ws/-/ws-8.14.2.tgz"
+  "version" "8.14.2"
+
+"xregexp@^5.0.1":
+  "integrity" "sha512-fKXeVorD+CzWvFs7VBuKTYIW63YD1e1osxwQ8caZ6o1jg6pDAbABDG54LCIq0j5cy7PjRvGIq6sef9DYPXpncg=="
+  "resolved" "https://registry.npmjs.org/xregexp/-/xregexp-5.1.1.tgz"
+  "version" "5.1.1"
+  dependencies:
+    "@babel/runtime-corejs3" "^7.16.5"
+
+"xtend@^4.0.0":
+  "integrity" "sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ=="
+  "resolved" "https://registry.npmjs.org/xtend/-/xtend-4.0.2.tgz"
+  "version" "4.0.2"
+
+"y18n@^5.0.5":
+  "integrity" "sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA=="
+  "resolved" "https://registry.npmjs.org/y18n/-/y18n-5.0.8.tgz"
+  "version" "5.0.8"
+
+"yallist@^4.0.0":
+  "integrity" "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A=="
+  "resolved" "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz"
+  "version" "4.0.0"
+
+"yaml@^1.10.0":
+  "integrity" "sha512-r3vXyErRCYJ7wg28yvBY5VSoAF8ZvlcW9/BwUzEtUsjvX/DKs24dIkuwjtuprwJJHsbyUbLApepYTR1BN4uHrg=="
+  "resolved" "https://registry.npmjs.org/yaml/-/yaml-1.10.2.tgz"
+  "version" "1.10.2"
+
+"yaml@^1.10.2":
+  "integrity" "sha512-r3vXyErRCYJ7wg28yvBY5VSoAF8ZvlcW9/BwUzEtUsjvX/DKs24dIkuwjtuprwJJHsbyUbLApepYTR1BN4uHrg=="
+  "resolved" "https://registry.npmjs.org/yaml/-/yaml-1.10.2.tgz"
+  "version" "1.10.2"
+
+"yaml@^2.1.1":
+  "integrity" "sha512-2eHWfjaoXgTBC2jNM1LRef62VQa0umtvRiDSk6HSzW7RvS5YtkabJrwYLLEKWBc8a5U2PTSCs+dJjUTJdlHsWQ=="
+  "resolved" "https://registry.npmjs.org/yaml/-/yaml-2.3.1.tgz"
+  "version" "2.3.1"
+
+"yargs-parser@^21.0.0":
+  "integrity" "sha512-9BK1jFpLzJROCI5TzwZL/TU4gqjK5xiHV/RfWLOahrjAko/e4DJkRDZQXfvqAsiZzzYhgAzbgz6lg48jcm4GLg=="
+  "resolved" "https://registry.npmjs.org/yargs-parser/-/yargs-parser-21.0.1.tgz"
+  "version" "21.0.1"
+
+"yargs@^17.2.1", "yargs@^17.3.1":
+  "integrity" "sha512-t6YAJcxDkNX7NFYiVtKvWUz8l+PaKTLiL63mJYWR2GnHq2gjEWISzsLp9wg3aY36dY1j+gfIEL3pIF+XlJJfbA=="
+  "resolved" "https://registry.npmjs.org/yargs/-/yargs-17.5.1.tgz"
+  "version" "17.5.1"
+  dependencies:
+    "cliui" "^7.0.2"
+    "escalade" "^3.1.1"
+    "get-caller-file" "^2.0.5"
+    "require-directory" "^2.1.1"
+    "string-width" "^4.2.3"
+    "y18n" "^5.0.5"
+    "yargs-parser" "^21.0.0"