diff --git a/.sandstorm/app-graphics/firefly-iii-128.png b/.sandstorm/app-graphics/firefly-iii-128.png
index 70de2bc75a..2c587a5ed7 100644
Binary files a/.sandstorm/app-graphics/firefly-iii-128.png and b/.sandstorm/app-graphics/firefly-iii-128.png differ
diff --git a/.sandstorm/app-graphics/firefly-iii-150.png b/.sandstorm/app-graphics/firefly-iii-150.png
index 0d97be4768..171538ef45 100644
Binary files a/.sandstorm/app-graphics/firefly-iii-150.png and b/.sandstorm/app-graphics/firefly-iii-150.png differ
diff --git a/.sandstorm/app-graphics/firefly-iii-24.png b/.sandstorm/app-graphics/firefly-iii-24.png
index a727ae4992..a12a63355d 100644
Binary files a/.sandstorm/app-graphics/firefly-iii-24.png and b/.sandstorm/app-graphics/firefly-iii-24.png differ
diff --git a/.sandstorm/app-graphics/firefly-iii-48.png b/.sandstorm/app-graphics/firefly-iii-48.png
index 6f81c5731b..9a14b4c79f 100644
Binary files a/.sandstorm/app-graphics/firefly-iii-48.png and b/.sandstorm/app-graphics/firefly-iii-48.png differ
diff --git a/.sandstorm/changelog.md b/.sandstorm/changelog.md
index 58249de976..2dda553d4e 100644
--- a/.sandstorm/changelog.md
+++ b/.sandstorm/changelog.md
@@ -1,3 +1,7 @@
+# 4.6.9
+
+* First version that works!
+
 # 3.4.3
 
 * Initial release on Sandstorm.io
\ No newline at end of file
diff --git a/.sandstorm/sandstorm-files.list b/.sandstorm/sandstorm-files.list
index f1a5fbe4ba..b33912a238 100644
--- a/.sandstorm/sandstorm-files.list
+++ b/.sandstorm/sandstorm-files.list
@@ -5,12 +5,9 @@
 bin/bash
 bin/cat
 bin/chmod
-bin/cp
 bin/dash
 bin/grep
 bin/hostname
-bin/ln
-bin/ls
 bin/mkdir
 bin/rm
 bin/sed
@@ -18,12 +15,10 @@ bin/sh
 bin/sleep
 bin/stty
 etc/alternatives/php
-etc/bash.bashrc
 etc/bindresvport.blacklist
 etc/default/nss
 etc/hosts.allow
 etc/hosts.deny
-etc/inputrc
 etc/ld.so.cache
 etc/locale.alias
 etc/localtime
@@ -142,20 +137,11 @@ etc/php/7.1/mods-available/xsl.ini
 etc/php/7.1/mods-available/zip.ini
 etc/services
 etc/ssl/openssl.cnf
-lib/terminfo/d/dumb
 lib/x86_64-linux-gnu/ld-2.19.so
-lib/x86_64-linux-gnu/libacl.so.1
-lib/x86_64-linux-gnu/libacl.so.1.1.0
 lib/x86_64-linux-gnu/libaio.so.1
 lib/x86_64-linux-gnu/libaio.so.1.0.1
-lib/x86_64-linux-gnu/libattr.so.1
-lib/x86_64-linux-gnu/libattr.so.1.1.0
-lib/x86_64-linux-gnu/libaudit.so.1
-lib/x86_64-linux-gnu/libaudit.so.1.0.0
 lib/x86_64-linux-gnu/libbsd.so.0
 lib/x86_64-linux-gnu/libbsd.so.0.7.0
-lib/x86_64-linux-gnu/libbz2.so.1.0
-lib/x86_64-linux-gnu/libbz2.so.1.0.4
 lib/x86_64-linux-gnu/libc-2.19.so
 lib/x86_64-linux-gnu/libc.so.6
 lib/x86_64-linux-gnu/libcom_err.so.2
@@ -171,8 +157,6 @@ lib/x86_64-linux-gnu/libgcrypt.so.20
 lib/x86_64-linux-gnu/libgcrypt.so.20.0.3
 lib/x86_64-linux-gnu/libgpg-error.so.0
 lib/x86_64-linux-gnu/libgpg-error.so.0.13.0
-lib/x86_64-linux-gnu/libjson-c.so.2
-lib/x86_64-linux-gnu/libjson-c.so.2.0.0
 lib/x86_64-linux-gnu/libkeyutils.so.1
 lib/x86_64-linux-gnu/libkeyutils.so.1.5
 lib/x86_64-linux-gnu/liblzma.so.5
@@ -185,18 +169,12 @@ lib/x86_64-linux-gnu/libnsl-2.19.so
 lib/x86_64-linux-gnu/libnsl.so.1
 lib/x86_64-linux-gnu/libnss_compat-2.19.so
 lib/x86_64-linux-gnu/libnss_compat.so.2
-lib/x86_64-linux-gnu/libnss_dns-2.19.so
-lib/x86_64-linux-gnu/libnss_dns.so.2
 lib/x86_64-linux-gnu/libnss_files-2.19.so
 lib/x86_64-linux-gnu/libnss_files.so.2
 lib/x86_64-linux-gnu/libnss_nis-2.19.so
 lib/x86_64-linux-gnu/libnss_nis.so.2
-lib/x86_64-linux-gnu/libpam.so.0
-lib/x86_64-linux-gnu/libpam.so.0.83.1
 lib/x86_64-linux-gnu/libpcre.so.3
 lib/x86_64-linux-gnu/libpcre.so.3.13.3
-lib/x86_64-linux-gnu/libpng12.so.0
-lib/x86_64-linux-gnu/libpng12.so.0.50.0
 lib/x86_64-linux-gnu/libpthread-2.19.so
 lib/x86_64-linux-gnu/libpthread.so.0
 lib/x86_64-linux-gnu/libreadline.so.6
@@ -210,14 +188,11 @@ lib/x86_64-linux-gnu/libsystemd.so.0
 lib/x86_64-linux-gnu/libsystemd.so.0.3.1
 lib/x86_64-linux-gnu/libtinfo.so.5
 lib/x86_64-linux-gnu/libtinfo.so.5.9
-lib/x86_64-linux-gnu/libutil-2.19.so
-lib/x86_64-linux-gnu/libutil.so.1
 lib/x86_64-linux-gnu/libwrap.so.0
 lib/x86_64-linux-gnu/libwrap.so.0.7.6
 lib/x86_64-linux-gnu/libz.so.1
 lib/x86_64-linux-gnu/libz.so.1.2.8
 lib64/ld-linux-x86-64.so.2
-opt/app
 opt/app/.env
 opt/app/.sandstorm/launcher.sh
 opt/app/.sandstorm/service-config/mime.types
@@ -236,97 +211,28 @@ opt/app/app/Console/Commands/VerifiesAccessToken.php
 opt/app/app/Console/Commands/VerifyDatabase.php
 opt/app/app/Console/Kernel.php
 opt/app/app/Exceptions/Handler.php
-opt/app/app/Generator/Chart/Basic/ChartJsGenerator.php
-opt/app/app/Generator/Chart/Basic/GeneratorInterface.php
-opt/app/app/Generator/Report/ReportGeneratorFactory.php
-opt/app/app/Generator/Report/ReportGeneratorInterface.php
-opt/app/app/Generator/Report/Standard/MonthReportGenerator.php
-opt/app/app/Helpers/Attachments/AttachmentHelper.php
-opt/app/app/Helpers/Attachments/AttachmentHelperInterface.php
-opt/app/app/Helpers/Collection/Balance.php
-opt/app/app/Helpers/Collection/BalanceEntry.php
-opt/app/app/Helpers/Collection/BalanceHeader.php
-opt/app/app/Helpers/Collection/BalanceLine.php
-opt/app/app/Helpers/Collection/Bill.php
-opt/app/app/Helpers/Collector/JournalCollector.php
-opt/app/app/Helpers/Collector/JournalCollectorInterface.php
-opt/app/app/Helpers/FiscalHelper.php
-opt/app/app/Helpers/FiscalHelperInterface.php
-opt/app/app/Helpers/Report/BalanceReportHelper.php
-opt/app/app/Helpers/Report/BalanceReportHelperInterface.php
-opt/app/app/Helpers/Report/BudgetReportHelper.php
-opt/app/app/Helpers/Report/BudgetReportHelperInterface.php
-opt/app/app/Helpers/Report/ReportHelper.php
-opt/app/app/Helpers/Report/ReportHelperInterface.php
-opt/app/app/Http/Controllers/AccountController.php
-opt/app/app/Http/Controllers/Auth/LoginController.php
-opt/app/app/Http/Controllers/BillController.php
-opt/app/app/Http/Controllers/BudgetController.php
-opt/app/app/Http/Controllers/CategoryController.php
-opt/app/app/Http/Controllers/Chart/AccountController.php
-opt/app/app/Http/Controllers/Chart/BudgetController.php
-opt/app/app/Http/Controllers/Chart/CategoryController.php
 opt/app/app/Http/Controllers/Controller.php
 opt/app/app/Http/Controllers/HomeController.php
-opt/app/app/Http/Controllers/ImportController.php
 opt/app/app/Http/Controllers/JavascriptController.php
-opt/app/app/Http/Controllers/JsonController.php
 opt/app/app/Http/Controllers/NewUserController.php
-opt/app/app/Http/Controllers/PiggyBankController.php
-opt/app/app/Http/Controllers/ProfileController.php
-opt/app/app/Http/Controllers/Report/AccountController.php
-opt/app/app/Http/Controllers/Report/BalanceController.php
-opt/app/app/Http/Controllers/Report/BudgetController.php
-opt/app/app/Http/Controllers/Report/CategoryController.php
-opt/app/app/Http/Controllers/Report/OperationsController.php
-opt/app/app/Http/Controllers/ReportController.php
-opt/app/app/Http/Controllers/RuleController.php
-opt/app/app/Http/Controllers/TagController.php
-opt/app/app/Http/Controllers/Transaction/SingleController.php
-opt/app/app/Http/Controllers/TransactionController.php
 opt/app/app/Http/Kernel.php
 opt/app/app/Http/Middleware/Authenticate.php
 opt/app/app/Http/Middleware/AuthenticateTwoFactor.php
 opt/app/app/Http/Middleware/Binder.php
 opt/app/app/Http/Middleware/EncryptCookies.php
 opt/app/app/Http/Middleware/Range.php
-opt/app/app/Http/Middleware/RedirectIfAuthenticated.php
 opt/app/app/Http/Middleware/Sandstorm.php
+opt/app/app/Http/Middleware/TrimStrings.php
+opt/app/app/Http/Middleware/TrustProxies.php
 opt/app/app/Http/Middleware/VerifyCsrfToken.php
-opt/app/app/Http/Requests/BudgetFormRequest.php
-opt/app/app/Http/Requests/BudgetIncomeRequest.php
-opt/app/app/Http/Requests/CategoryFormRequest.php
-opt/app/app/Http/Requests/JournalFormRequest.php
-opt/app/app/Http/Requests/NewUserFormRequest.php
-opt/app/app/Http/Requests/PiggyBankFormRequest.php
-opt/app/app/Http/Requests/ProfileFormRequest.php
-opt/app/app/Http/Requests/ReportFormRequest.php
-opt/app/app/Http/Requests/Request.php
-opt/app/app/Http/Requests/TagFormRequest.php
 opt/app/app/Http/breadcrumbs.php
-opt/app/app/Jobs/Job.php
-opt/app/app/Jobs/MailError.php
 opt/app/app/Models/Account.php
-opt/app/app/Models/AccountMeta.php
 opt/app/app/Models/AccountType.php
-opt/app/app/Models/AvailableBudget.php
-opt/app/app/Models/Bill.php
-opt/app/app/Models/Budget.php
-opt/app/app/Models/BudgetLimit.php
-opt/app/app/Models/Category.php
 opt/app/app/Models/Configuration.php
 opt/app/app/Models/LinkType.php
-opt/app/app/Models/Note.php
 opt/app/app/Models/PiggyBank.php
-opt/app/app/Models/PiggyBankRepetition.php
 opt/app/app/Models/Preference.php
 opt/app/app/Models/Role.php
-opt/app/app/Models/Rule.php
-opt/app/app/Models/RuleAction.php
-opt/app/app/Models/RuleGroup.php
-opt/app/app/Models/RuleTrigger.php
-opt/app/app/Models/Tag.php
-opt/app/app/Models/Transaction.php
 opt/app/app/Models/TransactionCurrency.php
 opt/app/app/Models/TransactionJournal.php
 opt/app/app/Models/TransactionType.php
@@ -342,9 +248,7 @@ opt/app/app/Providers/CurrencyServiceProvider.php
 opt/app/app/Providers/EventServiceProvider.php
 opt/app/app/Providers/ExportJobServiceProvider.php
 opt/app/app/Providers/FireflyServiceProvider.php
-opt/app/app/Providers/FireflySessionProvider.php
 opt/app/app/Providers/JournalServiceProvider.php
-opt/app/app/Providers/LogServiceProvider.php
 opt/app/app/Providers/PiggyBankServiceProvider.php
 opt/app/app/Providers/RouteServiceProvider.php
 opt/app/app/Providers/RuleGroupServiceProvider.php
@@ -353,32 +257,15 @@ opt/app/app/Providers/SearchServiceProvider.php
 opt/app/app/Providers/TagServiceProvider.php
 opt/app/app/Repositories/Account/AccountRepository.php
 opt/app/app/Repositories/Account/AccountRepositoryInterface.php
-opt/app/app/Repositories/Account/AccountTasker.php
-opt/app/app/Repositories/Account/AccountTaskerInterface.php
-opt/app/app/Repositories/Bill/BillRepository.php
-opt/app/app/Repositories/Bill/BillRepositoryInterface.php
-opt/app/app/Repositories/Budget/BudgetRepository.php
-opt/app/app/Repositories/Budget/BudgetRepositoryInterface.php
-opt/app/app/Repositories/Category/CategoryRepository.php
-opt/app/app/Repositories/Category/CategoryRepositoryInterface.php
-opt/app/app/Repositories/Currency/CurrencyRepository.php
-opt/app/app/Repositories/Currency/CurrencyRepositoryInterface.php
+opt/app/app/Repositories/Account/FindAccountsTrait.php
+opt/app/app/Repositories/Journal/CreateJournalsTrait.php
 opt/app/app/Repositories/Journal/JournalRepository.php
 opt/app/app/Repositories/Journal/JournalRepositoryInterface.php
-opt/app/app/Repositories/PiggyBank/PiggyBankRepository.php
-opt/app/app/Repositories/PiggyBank/PiggyBankRepositoryInterface.php
-opt/app/app/Repositories/Rule/RuleRepository.php
-opt/app/app/Repositories/Rule/RuleRepositoryInterface.php
-opt/app/app/Repositories/RuleGroup/RuleGroupRepository.php
-opt/app/app/Repositories/RuleGroup/RuleGroupRepositoryInterface.php
-opt/app/app/Repositories/Tag/TagRepository.php
-opt/app/app/Repositories/Tag/TagRepositoryInterface.php
+opt/app/app/Repositories/Journal/SupportJournalsTrait.php
+opt/app/app/Repositories/Journal/UpdateJournalsTrait.php
 opt/app/app/Repositories/User/UserRepository.php
 opt/app/app/Repositories/User/UserRepositoryInterface.php
 opt/app/app/Support/Amount.php
-opt/app/app/Support/Binder/AccountList.php
-opt/app/app/Support/Binder/BinderInterface.php
-opt/app/app/Support/Binder/Date.php
 opt/app/app/Support/CacheProperties.php
 opt/app/app/Support/Domain.php
 opt/app/app/Support/ExpandedForm.php
@@ -387,12 +274,10 @@ opt/app/app/Support/Facades/ExpandedForm.php
 opt/app/app/Support/Facades/FireflyConfig.php
 opt/app/app/Support/Facades/Navigation.php
 opt/app/app/Support/Facades/Preferences.php
-opt/app/app/Support/Facades/Steam.php
 opt/app/app/Support/FireflyConfig.php
 opt/app/app/Support/Models/TransactionJournalTrait.php
 opt/app/app/Support/Navigation.php
 opt/app/app/Support/Preferences.php
-opt/app/app/Support/Steam.php
 opt/app/app/Support/Twig/AmountFormat.php
 opt/app/app/Support/Twig/General.php
 opt/app/app/Support/Twig/Journal.php
@@ -401,7 +286,6 @@ opt/app/app/Support/Twig/Rule.php
 opt/app/app/Support/Twig/Transaction.php
 opt/app/app/Support/Twig/Translation.php
 opt/app/app/User.php
-opt/app/app/Validation/FireflyValidator.php
 opt/app/artisan
 opt/app/bootstrap/app.php
 opt/app/bootstrap/cache/packages.php
@@ -444,52 +328,19 @@ opt/app/database/seeds/LinkTypeSeeder.php
 opt/app/database/seeds/PermissionSeeder.php
 opt/app/database/seeds/TransactionCurrencySeeder.php
 opt/app/database/seeds/TransactionTypeSeeder.php
-opt/app/public/css/bootstrap-multiselect.css
-opt/app/public/css/bootstrap-sortable.css
-opt/app/public/css/bootstrap-tagsinput.css
 opt/app/public/css/daterangepicker.css
 opt/app/public/css/firefly.css
-opt/app/public/css/jquery-ui/jquery-ui.structure.min.css
-opt/app/public/css/jquery-ui/jquery-ui.theme.min.css
-opt/app/public/favicon-16x16.png
-opt/app/public/favicon-32x32.png
 opt/app/public/index.php
-opt/app/public/js/ff/accounts/edit.js
-opt/app/public/js/ff/bills/create.js
-opt/app/public/js/ff/budgets/index.js
-opt/app/public/js/ff/categories/index.js
-opt/app/public/js/ff/charts.defaults.js
-opt/app/public/js/ff/charts.js
 opt/app/public/js/ff/firefly.js
-opt/app/public/js/ff/guest.js
 opt/app/public/js/ff/help.js
-opt/app/public/js/ff/index.js
-opt/app/public/js/ff/piggy-banks/create.js
-opt/app/public/js/ff/piggy-banks/index.js
-opt/app/public/js/ff/reports/default/all.js
-opt/app/public/js/ff/reports/default/month.js
-opt/app/public/js/ff/reports/index.js
-opt/app/public/js/ff/rules/index.js
-opt/app/public/js/ff/tags/create-edit.js
-opt/app/public/js/ff/tags/index.js
-opt/app/public/js/ff/transactions/list.js
-opt/app/public/js/ff/transactions/single/create.js
-opt/app/public/js/lib/Chart.bundle.min.js
 opt/app/public/js/lib/accounting.min.js
-opt/app/public/js/lib/bootstrap-multiselect.js
-opt/app/public/js/lib/bootstrap-sortable.js
-opt/app/public/js/lib/bootstrap-tagsinput.min.js
-opt/app/public/js/lib/bootstrap3-typeahead.min.js
 opt/app/public/js/lib/daterangepicker.js
 opt/app/public/js/lib/jquery-3.1.1.min.js
-opt/app/public/js/lib/jquery-ui.min.js
-opt/app/public/js/lib/modernizr-custom.js
 opt/app/public/js/lib/moment.min.js
 opt/app/public/lib/adminlte/css/AdminLTE.min.css
 opt/app/public/lib/adminlte/css/skins/skin-blue-light.min.css
 opt/app/public/lib/adminlte/js/app.min.js
 opt/app/public/lib/bootstrap/css/bootstrap.min.css
-opt/app/public/lib/bootstrap/fonts/glyphicons-halflings-regular.woff2
 opt/app/public/lib/bootstrap/js/bootstrap.min.js
 opt/app/public/lib/font-awesome/css/font-awesome.min.css
 opt/app/public/lib/font-awesome/fonts/fontawesome-webfont.woff2
@@ -497,77 +348,18 @@ opt/app/resources/lang/en_US/breadcrumbs.php
 opt/app/resources/lang/en_US/config.php
 opt/app/resources/lang/en_US/firefly.php
 opt/app/resources/lang/en_US/form.php
-opt/app/resources/lang/en_US/list.php
-opt/app/resources/lang/en_US/validation.php
-opt/app/resources/views/accounts/delete.twig
-opt/app/resources/views/accounts/edit.twig
-opt/app/resources/views/accounts/index.twig
-opt/app/resources/views/auth/login.twig
-opt/app/resources/views/bills/create.twig
-opt/app/resources/views/bills/index.twig
-opt/app/resources/views/budgets/create.twig
-opt/app/resources/views/budgets/income.twig
-opt/app/resources/views/budgets/index.twig
-opt/app/resources/views/categories/create.twig
-opt/app/resources/views/categories/index.twig
-opt/app/resources/views/emails/error-html.twig
-opt/app/resources/views/emails/error-text.twig
-opt/app/resources/views/emails/footer-html.twig
-opt/app/resources/views/emails/footer-text.twig
-opt/app/resources/views/emails/header-html.twig
-opt/app/resources/views/emails/header-text.twig
-opt/app/resources/views/error.twig
-opt/app/resources/views/form/amount.twig
 opt/app/resources/views/form/balance.twig
-opt/app/resources/views/form/checkbox.twig
-opt/app/resources/views/form/date.twig
 opt/app/resources/views/form/feedback.twig
-opt/app/resources/views/form/file.twig
 opt/app/resources/views/form/help.twig
-opt/app/resources/views/form/integer.twig
-opt/app/resources/views/form/location.twig
-opt/app/resources/views/form/multiRadio.twig
-opt/app/resources/views/form/options.twig
-opt/app/resources/views/form/select.twig
-opt/app/resources/views/form/tags.twig
 opt/app/resources/views/form/text.twig
-opt/app/resources/views/form/textarea.twig
-opt/app/resources/views/import/index.twig
-opt/app/resources/views/index.twig
 opt/app/resources/views/javascript/variables.twig
 opt/app/resources/views/layout/default.twig
-opt/app/resources/views/layout/guest.twig
-opt/app/resources/views/list/accounts.twig
-opt/app/resources/views/list/bills.twig
-opt/app/resources/views/list/categories.twig
-opt/app/resources/views/list/piggy-banks.twig
 opt/app/resources/views/new-user/index.twig
-opt/app/resources/views/partials/boxes.twig
 opt/app/resources/views/partials/control-bar.twig
 opt/app/resources/views/partials/favicons.twig
 opt/app/resources/views/partials/flashes.twig
 opt/app/resources/views/partials/menu-sidebar.twig
 opt/app/resources/views/partials/page-header.twig
-opt/app/resources/views/piggy-banks/create.twig
-opt/app/resources/views/piggy-banks/index.twig
-opt/app/resources/views/profile/change-password.twig
-opt/app/resources/views/profile/delete-account.twig
-opt/app/resources/views/profile/index.twig
-opt/app/resources/views/reports/default/month.twig
-opt/app/resources/views/reports/index.twig
-opt/app/resources/views/reports/options/no-options.twig
-opt/app/resources/views/reports/partials/accounts.twig
-opt/app/resources/views/reports/partials/balance.twig
-opt/app/resources/views/reports/partials/bills.twig
-opt/app/resources/views/reports/partials/budgets.twig
-opt/app/resources/views/reports/partials/categories.twig
-opt/app/resources/views/reports/partials/income-expenses.twig
-opt/app/resources/views/reports/partials/operations.twig
-opt/app/resources/views/rules/index.twig
-opt/app/resources/views/tags/create.twig
-opt/app/resources/views/tags/index.twig
-opt/app/resources/views/transactions/index.twig
-opt/app/resources/views/transactions/single/create.twig
 opt/app/routes/api.php
 opt/app/routes/console.php
 opt/app/routes/web.php
@@ -590,10 +382,8 @@ opt/app/vendor/doctrine/dbal/lib/Doctrine/DBAL/Connection.php
 opt/app/vendor/doctrine/dbal/lib/Doctrine/DBAL/Driver.php
 opt/app/vendor/doctrine/dbal/lib/Doctrine/DBAL/Driver/AbstractMySQLDriver.php
 opt/app/vendor/doctrine/dbal/lib/Doctrine/DBAL/Driver/Connection.php
-opt/app/vendor/doctrine/dbal/lib/Doctrine/DBAL/Driver/DriverException.php
 opt/app/vendor/doctrine/dbal/lib/Doctrine/DBAL/Driver/ExceptionConverterDriver.php
 opt/app/vendor/doctrine/dbal/lib/Doctrine/DBAL/Driver/PDOConnection.php
-opt/app/vendor/doctrine/dbal/lib/Doctrine/DBAL/Driver/PDOException.php
 opt/app/vendor/doctrine/dbal/lib/Doctrine/DBAL/Driver/PDOMySql/Driver.php
 opt/app/vendor/doctrine/dbal/lib/Doctrine/DBAL/Driver/PDOStatement.php
 opt/app/vendor/doctrine/dbal/lib/Doctrine/DBAL/Driver/ResultStatement.php
@@ -645,6 +435,7 @@ opt/app/vendor/doctrine/dbal/lib/Doctrine/DBAL/Types/Type.php
 opt/app/vendor/doctrine/dbal/lib/Doctrine/DBAL/VersionAwarePlatformDriver.php
 opt/app/vendor/doctrine/inflector/lib/Doctrine/Common/Inflector/Inflector.php
 opt/app/vendor/fideloper/proxy/config/trustedproxy.php
+opt/app/vendor/fideloper/proxy/src/TrustProxies.php
 opt/app/vendor/fideloper/proxy/src/TrustedProxyServiceProvider.php
 opt/app/vendor/laravel/framework/src/Illuminate/Auth/Access/Gate.php
 opt/app/vendor/laravel/framework/src/Illuminate/Auth/Access/HandlesAuthorization.php
@@ -663,8 +454,6 @@ opt/app/vendor/laravel/framework/src/Illuminate/Auth/Passwords/PasswordResetServ
 opt/app/vendor/laravel/framework/src/Illuminate/Auth/SessionGuard.php
 opt/app/vendor/laravel/framework/src/Illuminate/Broadcasting/BroadcastServiceProvider.php
 opt/app/vendor/laravel/framework/src/Illuminate/Bus/BusServiceProvider.php
-opt/app/vendor/laravel/framework/src/Illuminate/Bus/Dispatcher.php
-opt/app/vendor/laravel/framework/src/Illuminate/Bus/Queueable.php
 opt/app/vendor/laravel/framework/src/Illuminate/Cache/CacheManager.php
 opt/app/vendor/laravel/framework/src/Illuminate/Cache/CacheServiceProvider.php
 opt/app/vendor/laravel/framework/src/Illuminate/Cache/Console/CacheTableCommand.php
@@ -705,8 +494,6 @@ opt/app/vendor/laravel/framework/src/Illuminate/Contracts/Auth/Guard.php
 opt/app/vendor/laravel/framework/src/Illuminate/Contracts/Auth/StatefulGuard.php
 opt/app/vendor/laravel/framework/src/Illuminate/Contracts/Auth/SupportsBasicAuth.php
 opt/app/vendor/laravel/framework/src/Illuminate/Contracts/Auth/UserProvider.php
-opt/app/vendor/laravel/framework/src/Illuminate/Contracts/Bus/Dispatcher.php
-opt/app/vendor/laravel/framework/src/Illuminate/Contracts/Bus/QueueingDispatcher.php
 opt/app/vendor/laravel/framework/src/Illuminate/Contracts/Cache/Factory.php
 opt/app/vendor/laravel/framework/src/Illuminate/Contracts/Cache/Repository.php
 opt/app/vendor/laravel/framework/src/Illuminate/Contracts/Cache/Store.php
@@ -717,29 +504,19 @@ opt/app/vendor/laravel/framework/src/Illuminate/Contracts/Container/Container.ph
 opt/app/vendor/laravel/framework/src/Illuminate/Contracts/Cookie/Factory.php
 opt/app/vendor/laravel/framework/src/Illuminate/Contracts/Cookie/QueueingFactory.php
 opt/app/vendor/laravel/framework/src/Illuminate/Contracts/Debug/ExceptionHandler.php
-opt/app/vendor/laravel/framework/src/Illuminate/Contracts/Encryption/DecryptException.php
 opt/app/vendor/laravel/framework/src/Illuminate/Contracts/Encryption/Encrypter.php
 opt/app/vendor/laravel/framework/src/Illuminate/Contracts/Events/Dispatcher.php
-opt/app/vendor/laravel/framework/src/Illuminate/Contracts/Filesystem/Cloud.php
-opt/app/vendor/laravel/framework/src/Illuminate/Contracts/Filesystem/Factory.php
 opt/app/vendor/laravel/framework/src/Illuminate/Contracts/Filesystem/FileNotFoundException.php
-opt/app/vendor/laravel/framework/src/Illuminate/Contracts/Filesystem/Filesystem.php
 opt/app/vendor/laravel/framework/src/Illuminate/Contracts/Foundation/Application.php
 opt/app/vendor/laravel/framework/src/Illuminate/Contracts/Hashing/Hasher.php
 opt/app/vendor/laravel/framework/src/Illuminate/Contracts/Http/Kernel.php
 opt/app/vendor/laravel/framework/src/Illuminate/Contracts/Logging/Log.php
-opt/app/vendor/laravel/framework/src/Illuminate/Contracts/Mail/MailQueue.php
-opt/app/vendor/laravel/framework/src/Illuminate/Contracts/Mail/Mailer.php
-opt/app/vendor/laravel/framework/src/Illuminate/Contracts/Pagination/LengthAwarePaginator.php
 opt/app/vendor/laravel/framework/src/Illuminate/Contracts/Pagination/Paginator.php
 opt/app/vendor/laravel/framework/src/Illuminate/Contracts/Pipeline/Pipeline.php
 opt/app/vendor/laravel/framework/src/Illuminate/Contracts/Queue/Factory.php
-opt/app/vendor/laravel/framework/src/Illuminate/Contracts/Queue/Job.php
 opt/app/vendor/laravel/framework/src/Illuminate/Contracts/Queue/Monitor.php
-opt/app/vendor/laravel/framework/src/Illuminate/Contracts/Queue/Queue.php
 opt/app/vendor/laravel/framework/src/Illuminate/Contracts/Queue/QueueableCollection.php
 opt/app/vendor/laravel/framework/src/Illuminate/Contracts/Queue/QueueableEntity.php
-opt/app/vendor/laravel/framework/src/Illuminate/Contracts/Queue/ShouldQueue.php
 opt/app/vendor/laravel/framework/src/Illuminate/Contracts/Routing/BindingRegistrar.php
 opt/app/vendor/laravel/framework/src/Illuminate/Contracts/Routing/Registrar.php
 opt/app/vendor/laravel/framework/src/Illuminate/Contracts/Routing/ResponseFactory.php
@@ -755,8 +532,7 @@ opt/app/vendor/laravel/framework/src/Illuminate/Contracts/Support/Renderable.php
 opt/app/vendor/laravel/framework/src/Illuminate/Contracts/Translation/Loader.php
 opt/app/vendor/laravel/framework/src/Illuminate/Contracts/Translation/Translator.php
 opt/app/vendor/laravel/framework/src/Illuminate/Contracts/Validation/Factory.php
-opt/app/vendor/laravel/framework/src/Illuminate/Contracts/Validation/ValidatesWhenResolved.php
-opt/app/vendor/laravel/framework/src/Illuminate/Contracts/Validation/Validator.php
+opt/app/vendor/laravel/framework/src/Illuminate/Contracts/View/Engine.php
 opt/app/vendor/laravel/framework/src/Illuminate/Contracts/View/Factory.php
 opt/app/vendor/laravel/framework/src/Illuminate/Contracts/View/View.php
 opt/app/vendor/laravel/framework/src/Illuminate/Cookie/CookieJar.php
@@ -802,11 +578,9 @@ opt/app/vendor/laravel/framework/src/Illuminate/Database/Eloquent/Model.php
 opt/app/vendor/laravel/framework/src/Illuminate/Database/Eloquent/Relations/BelongsTo.php
 opt/app/vendor/laravel/framework/src/Illuminate/Database/Eloquent/Relations/BelongsToMany.php
 opt/app/vendor/laravel/framework/src/Illuminate/Database/Eloquent/Relations/Concerns/InteractsWithPivotTable.php
+opt/app/vendor/laravel/framework/src/Illuminate/Database/Eloquent/Relations/Concerns/SupportsDefaultModels.php
 opt/app/vendor/laravel/framework/src/Illuminate/Database/Eloquent/Relations/HasMany.php
-opt/app/vendor/laravel/framework/src/Illuminate/Database/Eloquent/Relations/HasManyThrough.php
 opt/app/vendor/laravel/framework/src/Illuminate/Database/Eloquent/Relations/HasOneOrMany.php
-opt/app/vendor/laravel/framework/src/Illuminate/Database/Eloquent/Relations/MorphMany.php
-opt/app/vendor/laravel/framework/src/Illuminate/Database/Eloquent/Relations/MorphOneOrMany.php
 opt/app/vendor/laravel/framework/src/Illuminate/Database/Eloquent/Relations/Relation.php
 opt/app/vendor/laravel/framework/src/Illuminate/Database/Eloquent/Scope.php
 opt/app/vendor/laravel/framework/src/Illuminate/Database/Eloquent/SoftDeletes.php
@@ -822,13 +596,11 @@ opt/app/vendor/laravel/framework/src/Illuminate/Database/Migrations/MigrationRep
 opt/app/vendor/laravel/framework/src/Illuminate/Database/Migrations/Migrator.php
 opt/app/vendor/laravel/framework/src/Illuminate/Database/MySqlConnection.php
 opt/app/vendor/laravel/framework/src/Illuminate/Database/Query/Builder.php
-opt/app/vendor/laravel/framework/src/Illuminate/Database/Query/Expression.php
 opt/app/vendor/laravel/framework/src/Illuminate/Database/Query/Grammars/Grammar.php
 opt/app/vendor/laravel/framework/src/Illuminate/Database/Query/Grammars/MySqlGrammar.php
 opt/app/vendor/laravel/framework/src/Illuminate/Database/Query/JoinClause.php
 opt/app/vendor/laravel/framework/src/Illuminate/Database/Query/Processors/MySqlProcessor.php
 opt/app/vendor/laravel/framework/src/Illuminate/Database/Query/Processors/Processor.php
-opt/app/vendor/laravel/framework/src/Illuminate/Database/QueryException.php
 opt/app/vendor/laravel/framework/src/Illuminate/Database/Schema/Blueprint.php
 opt/app/vendor/laravel/framework/src/Illuminate/Database/Schema/Builder.php
 opt/app/vendor/laravel/framework/src/Illuminate/Database/Schema/Grammars/ChangeColumn.php
@@ -842,16 +614,11 @@ opt/app/vendor/laravel/framework/src/Illuminate/Encryption/EncryptionServiceProv
 opt/app/vendor/laravel/framework/src/Illuminate/Events/Dispatcher.php
 opt/app/vendor/laravel/framework/src/Illuminate/Events/EventServiceProvider.php
 opt/app/vendor/laravel/framework/src/Illuminate/Filesystem/Filesystem.php
-opt/app/vendor/laravel/framework/src/Illuminate/Filesystem/FilesystemAdapter.php
-opt/app/vendor/laravel/framework/src/Illuminate/Filesystem/FilesystemManager.php
 opt/app/vendor/laravel/framework/src/Illuminate/Filesystem/FilesystemServiceProvider.php
 opt/app/vendor/laravel/framework/src/Illuminate/Foundation/AliasLoader.php
 opt/app/vendor/laravel/framework/src/Illuminate/Foundation/Application.php
 opt/app/vendor/laravel/framework/src/Illuminate/Foundation/Auth/Access/Authorizable.php
 opt/app/vendor/laravel/framework/src/Illuminate/Foundation/Auth/Access/AuthorizesRequests.php
-opt/app/vendor/laravel/framework/src/Illuminate/Foundation/Auth/AuthenticatesUsers.php
-opt/app/vendor/laravel/framework/src/Illuminate/Foundation/Auth/RedirectsUsers.php
-opt/app/vendor/laravel/framework/src/Illuminate/Foundation/Auth/ThrottlesLogins.php
 opt/app/vendor/laravel/framework/src/Illuminate/Foundation/Auth/User.php
 opt/app/vendor/laravel/framework/src/Illuminate/Foundation/Bootstrap/BootProviders.php
 opt/app/vendor/laravel/framework/src/Illuminate/Foundation/Bootstrap/HandleExceptions.php
@@ -900,9 +667,12 @@ opt/app/vendor/laravel/framework/src/Illuminate/Foundation/EnvironmentDetector.p
 opt/app/vendor/laravel/framework/src/Illuminate/Foundation/Events/LocaleUpdated.php
 opt/app/vendor/laravel/framework/src/Illuminate/Foundation/Exceptions/Handler.php
 opt/app/vendor/laravel/framework/src/Illuminate/Foundation/Http/Events/RequestHandled.php
-opt/app/vendor/laravel/framework/src/Illuminate/Foundation/Http/FormRequest.php
 opt/app/vendor/laravel/framework/src/Illuminate/Foundation/Http/Kernel.php
 opt/app/vendor/laravel/framework/src/Illuminate/Foundation/Http/Middleware/CheckForMaintenanceMode.php
+opt/app/vendor/laravel/framework/src/Illuminate/Foundation/Http/Middleware/ConvertEmptyStringsToNull.php
+opt/app/vendor/laravel/framework/src/Illuminate/Foundation/Http/Middleware/TransformsRequest.php
+opt/app/vendor/laravel/framework/src/Illuminate/Foundation/Http/Middleware/TrimStrings.php
+opt/app/vendor/laravel/framework/src/Illuminate/Foundation/Http/Middleware/ValidatePostSize.php
 opt/app/vendor/laravel/framework/src/Illuminate/Foundation/Http/Middleware/VerifyCsrfToken.php
 opt/app/vendor/laravel/framework/src/Illuminate/Foundation/PackageManifest.php
 opt/app/vendor/laravel/framework/src/Illuminate/Foundation/ProviderRepository.php
@@ -921,7 +691,6 @@ opt/app/vendor/laravel/framework/src/Illuminate/Hashing/HashServiceProvider.php
 opt/app/vendor/laravel/framework/src/Illuminate/Http/Concerns/InteractsWithContentTypes.php
 opt/app/vendor/laravel/framework/src/Illuminate/Http/Concerns/InteractsWithFlashData.php
 opt/app/vendor/laravel/framework/src/Illuminate/Http/Concerns/InteractsWithInput.php
-opt/app/vendor/laravel/framework/src/Illuminate/Http/JsonResponse.php
 opt/app/vendor/laravel/framework/src/Illuminate/Http/RedirectResponse.php
 opt/app/vendor/laravel/framework/src/Illuminate/Http/Request.php
 opt/app/vendor/laravel/framework/src/Illuminate/Http/Response.php
@@ -929,27 +698,17 @@ opt/app/vendor/laravel/framework/src/Illuminate/Http/ResponseTrait.php
 opt/app/vendor/laravel/framework/src/Illuminate/Log/Events/MessageLogged.php
 opt/app/vendor/laravel/framework/src/Illuminate/Log/LogServiceProvider.php
 opt/app/vendor/laravel/framework/src/Illuminate/Log/Writer.php
-opt/app/vendor/laravel/framework/src/Illuminate/Mail/Events/MessageSending.php
 opt/app/vendor/laravel/framework/src/Illuminate/Mail/MailServiceProvider.php
-opt/app/vendor/laravel/framework/src/Illuminate/Mail/Mailer.php
-opt/app/vendor/laravel/framework/src/Illuminate/Mail/Message.php
-opt/app/vendor/laravel/framework/src/Illuminate/Mail/TransportManager.php
 opt/app/vendor/laravel/framework/src/Illuminate/Notifications/Console/NotificationTableCommand.php
 opt/app/vendor/laravel/framework/src/Illuminate/Notifications/HasDatabaseNotifications.php
 opt/app/vendor/laravel/framework/src/Illuminate/Notifications/Notifiable.php
 opt/app/vendor/laravel/framework/src/Illuminate/Notifications/NotificationServiceProvider.php
 opt/app/vendor/laravel/framework/src/Illuminate/Notifications/RoutesNotifications.php
 opt/app/vendor/laravel/framework/src/Illuminate/Pagination/AbstractPaginator.php
-opt/app/vendor/laravel/framework/src/Illuminate/Pagination/LengthAwarePaginator.php
 opt/app/vendor/laravel/framework/src/Illuminate/Pagination/PaginationServiceProvider.php
 opt/app/vendor/laravel/framework/src/Illuminate/Pagination/Paginator.php
-opt/app/vendor/laravel/framework/src/Illuminate/Pagination/UrlWindow.php
-opt/app/vendor/laravel/framework/src/Illuminate/Pagination/resources/views/default.blade.php
 opt/app/vendor/laravel/framework/src/Illuminate/Pipeline/Pipeline.php
 opt/app/vendor/laravel/framework/src/Illuminate/Pipeline/PipelineServiceProvider.php
-opt/app/vendor/laravel/framework/src/Illuminate/Queue/CallQueuedHandler.php
-opt/app/vendor/laravel/framework/src/Illuminate/Queue/Connectors/ConnectorInterface.php
-opt/app/vendor/laravel/framework/src/Illuminate/Queue/Connectors/SyncConnector.php
 opt/app/vendor/laravel/framework/src/Illuminate/Queue/Console/FailedTableCommand.php
 opt/app/vendor/laravel/framework/src/Illuminate/Queue/Console/FlushFailedCommand.php
 opt/app/vendor/laravel/framework/src/Illuminate/Queue/Console/ForgetFailedCommand.php
@@ -959,22 +718,16 @@ opt/app/vendor/laravel/framework/src/Illuminate/Queue/Console/RestartCommand.php
 opt/app/vendor/laravel/framework/src/Illuminate/Queue/Console/RetryCommand.php
 opt/app/vendor/laravel/framework/src/Illuminate/Queue/Console/TableCommand.php
 opt/app/vendor/laravel/framework/src/Illuminate/Queue/Console/WorkCommand.php
-opt/app/vendor/laravel/framework/src/Illuminate/Queue/Events/JobProcessed.php
-opt/app/vendor/laravel/framework/src/Illuminate/Queue/Events/JobProcessing.php
-opt/app/vendor/laravel/framework/src/Illuminate/Queue/InteractsWithQueue.php
-opt/app/vendor/laravel/framework/src/Illuminate/Queue/Jobs/Job.php
-opt/app/vendor/laravel/framework/src/Illuminate/Queue/Jobs/SyncJob.php
 opt/app/vendor/laravel/framework/src/Illuminate/Queue/Listener.php
-opt/app/vendor/laravel/framework/src/Illuminate/Queue/Queue.php
 opt/app/vendor/laravel/framework/src/Illuminate/Queue/QueueManager.php
 opt/app/vendor/laravel/framework/src/Illuminate/Queue/QueueServiceProvider.php
 opt/app/vendor/laravel/framework/src/Illuminate/Queue/SerializesAndRestoresModelIdentifiers.php
 opt/app/vendor/laravel/framework/src/Illuminate/Queue/SerializesModels.php
-opt/app/vendor/laravel/framework/src/Illuminate/Queue/SyncQueue.php
 opt/app/vendor/laravel/framework/src/Illuminate/Queue/Worker.php
 opt/app/vendor/laravel/framework/src/Illuminate/Redis/RedisServiceProvider.php
 opt/app/vendor/laravel/framework/src/Illuminate/Routing/Console/ControllerMakeCommand.php
 opt/app/vendor/laravel/framework/src/Illuminate/Routing/Console/MiddlewareMakeCommand.php
+opt/app/vendor/laravel/framework/src/Illuminate/Routing/Contracts/ControllerDispatcher.php
 opt/app/vendor/laravel/framework/src/Illuminate/Routing/Controller.php
 opt/app/vendor/laravel/framework/src/Illuminate/Routing/ControllerDispatcher.php
 opt/app/vendor/laravel/framework/src/Illuminate/Routing/ControllerMiddlewareOptions.php
@@ -1011,7 +764,6 @@ opt/app/vendor/laravel/framework/src/Illuminate/Session/Middleware/StartSession.
 opt/app/vendor/laravel/framework/src/Illuminate/Session/SessionManager.php
 opt/app/vendor/laravel/framework/src/Illuminate/Session/SessionServiceProvider.php
 opt/app/vendor/laravel/framework/src/Illuminate/Session/Store.php
-opt/app/vendor/laravel/framework/src/Illuminate/Session/TokenMismatchException.php
 opt/app/vendor/laravel/framework/src/Illuminate/Support/AggregateServiceProvider.php
 opt/app/vendor/laravel/framework/src/Illuminate/Support/Arr.php
 opt/app/vendor/laravel/framework/src/Illuminate/Support/Carbon.php
@@ -1024,21 +776,13 @@ opt/app/vendor/laravel/framework/src/Illuminate/Support/Facades/Cache.php
 opt/app/vendor/laravel/framework/src/Illuminate/Support/Facades/Config.php
 opt/app/vendor/laravel/framework/src/Illuminate/Support/Facades/Cookie.php
 opt/app/vendor/laravel/framework/src/Illuminate/Support/Facades/Crypt.php
-opt/app/vendor/laravel/framework/src/Illuminate/Support/Facades/DB.php
 opt/app/vendor/laravel/framework/src/Illuminate/Support/Facades/Event.php
 opt/app/vendor/laravel/framework/src/Illuminate/Support/Facades/Facade.php
 opt/app/vendor/laravel/framework/src/Illuminate/Support/Facades/Gate.php
-opt/app/vendor/laravel/framework/src/Illuminate/Support/Facades/Input.php
-opt/app/vendor/laravel/framework/src/Illuminate/Support/Facades/Lang.php
 opt/app/vendor/laravel/framework/src/Illuminate/Support/Facades/Log.php
-opt/app/vendor/laravel/framework/src/Illuminate/Support/Facades/Mail.php
-opt/app/vendor/laravel/framework/src/Illuminate/Support/Facades/Request.php
-opt/app/vendor/laravel/framework/src/Illuminate/Support/Facades/Response.php
 opt/app/vendor/laravel/framework/src/Illuminate/Support/Facades/Route.php
 opt/app/vendor/laravel/framework/src/Illuminate/Support/Facades/Schema.php
 opt/app/vendor/laravel/framework/src/Illuminate/Support/Facades/Session.php
-opt/app/vendor/laravel/framework/src/Illuminate/Support/Facades/Storage.php
-opt/app/vendor/laravel/framework/src/Illuminate/Support/Facades/URL.php
 opt/app/vendor/laravel/framework/src/Illuminate/Support/Facades/Validator.php
 opt/app/vendor/laravel/framework/src/Illuminate/Support/Facades/View.php
 opt/app/vendor/laravel/framework/src/Illuminate/Support/Fluent.php
@@ -1054,20 +798,12 @@ opt/app/vendor/laravel/framework/src/Illuminate/Support/Traits/Macroable.php
 opt/app/vendor/laravel/framework/src/Illuminate/Support/ViewErrorBag.php
 opt/app/vendor/laravel/framework/src/Illuminate/Support/helpers.php
 opt/app/vendor/laravel/framework/src/Illuminate/Translation/FileLoader.php
-opt/app/vendor/laravel/framework/src/Illuminate/Translation/MessageSelector.php
 opt/app/vendor/laravel/framework/src/Illuminate/Translation/TranslationServiceProvider.php
 opt/app/vendor/laravel/framework/src/Illuminate/Translation/Translator.php
-opt/app/vendor/laravel/framework/src/Illuminate/Validation/Concerns/FormatsMessages.php
-opt/app/vendor/laravel/framework/src/Illuminate/Validation/Concerns/ReplacesAttributes.php
-opt/app/vendor/laravel/framework/src/Illuminate/Validation/Concerns/ValidatesAttributes.php
 opt/app/vendor/laravel/framework/src/Illuminate/Validation/DatabasePresenceVerifier.php
 opt/app/vendor/laravel/framework/src/Illuminate/Validation/Factory.php
 opt/app/vendor/laravel/framework/src/Illuminate/Validation/PresenceVerifierInterface.php
-opt/app/vendor/laravel/framework/src/Illuminate/Validation/ValidatesWhenResolvedTrait.php
-opt/app/vendor/laravel/framework/src/Illuminate/Validation/ValidationException.php
-opt/app/vendor/laravel/framework/src/Illuminate/Validation/ValidationRuleParser.php
 opt/app/vendor/laravel/framework/src/Illuminate/Validation/ValidationServiceProvider.php
-opt/app/vendor/laravel/framework/src/Illuminate/Validation/Validator.php
 opt/app/vendor/laravel/framework/src/Illuminate/View/Compilers/BladeCompiler.php
 opt/app/vendor/laravel/framework/src/Illuminate/View/Compilers/Compiler.php
 opt/app/vendor/laravel/framework/src/Illuminate/View/Compilers/CompilerInterface.php
@@ -1078,6 +814,7 @@ opt/app/vendor/laravel/framework/src/Illuminate/View/Compilers/Concerns/Compiles
 opt/app/vendor/laravel/framework/src/Illuminate/View/Compilers/Concerns/CompilesEchos.php
 opt/app/vendor/laravel/framework/src/Illuminate/View/Compilers/Concerns/CompilesIncludes.php
 opt/app/vendor/laravel/framework/src/Illuminate/View/Compilers/Concerns/CompilesInjections.php
+opt/app/vendor/laravel/framework/src/Illuminate/View/Compilers/Concerns/CompilesJson.php
 opt/app/vendor/laravel/framework/src/Illuminate/View/Compilers/Concerns/CompilesLayouts.php
 opt/app/vendor/laravel/framework/src/Illuminate/View/Compilers/Concerns/CompilesLoops.php
 opt/app/vendor/laravel/framework/src/Illuminate/View/Compilers/Concerns/CompilesRawPhp.php
@@ -1105,25 +842,14 @@ opt/app/vendor/laravelcollective/html/src/FormFacade.php
 opt/app/vendor/laravelcollective/html/src/HtmlBuilder.php
 opt/app/vendor/laravelcollective/html/src/HtmlServiceProvider.php
 opt/app/vendor/laravelcollective/html/src/helpers.php
-opt/app/vendor/league/flysystem/src/Adapter/AbstractAdapter.php
-opt/app/vendor/league/flysystem/src/Adapter/Local.php
-opt/app/vendor/league/flysystem/src/AdapterInterface.php
-opt/app/vendor/league/flysystem/src/Config.php
-opt/app/vendor/league/flysystem/src/ConfigAwareTrait.php
-opt/app/vendor/league/flysystem/src/Filesystem.php
-opt/app/vendor/league/flysystem/src/FilesystemInterface.php
-opt/app/vendor/league/flysystem/src/Plugin/PluggableTrait.php
-opt/app/vendor/league/flysystem/src/ReadInterface.php
 opt/app/vendor/monolog/monolog/src/Monolog/Formatter/FormatterInterface.php
 opt/app/vendor/monolog/monolog/src/Monolog/Formatter/LineFormatter.php
 opt/app/vendor/monolog/monolog/src/Monolog/Formatter/NormalizerFormatter.php
 opt/app/vendor/monolog/monolog/src/Monolog/Handler/AbstractHandler.php
 opt/app/vendor/monolog/monolog/src/Monolog/Handler/AbstractProcessingHandler.php
-opt/app/vendor/monolog/monolog/src/Monolog/Handler/AbstractSyslogHandler.php
 opt/app/vendor/monolog/monolog/src/Monolog/Handler/HandlerInterface.php
 opt/app/vendor/monolog/monolog/src/Monolog/Handler/RotatingFileHandler.php
 opt/app/vendor/monolog/monolog/src/Monolog/Handler/StreamHandler.php
-opt/app/vendor/monolog/monolog/src/Monolog/Handler/SyslogHandler.php
 opt/app/vendor/monolog/monolog/src/Monolog/Logger.php
 opt/app/vendor/nesbot/carbon/src/Carbon/Carbon.php
 opt/app/vendor/nesbot/carbon/src/Carbon/Lang/en.php
@@ -1158,80 +884,6 @@ opt/app/vendor/rcrowe/twigbridge/src/Twig/Globals.php
 opt/app/vendor/rcrowe/twigbridge/src/Twig/Loader.php
 opt/app/vendor/rcrowe/twigbridge/src/Twig/Template.php
 opt/app/vendor/swiftmailer/swiftmailer/lib/classes/Swift.php
-opt/app/vendor/swiftmailer/swiftmailer/lib/classes/Swift/ByteStream/AbstractFilterableInputStream.php
-opt/app/vendor/swiftmailer/swiftmailer/lib/classes/Swift/CharacterReaderFactory.php
-opt/app/vendor/swiftmailer/swiftmailer/lib/classes/Swift/CharacterReaderFactory/SimpleCharacterReaderFactory.php
-opt/app/vendor/swiftmailer/swiftmailer/lib/classes/Swift/CharacterStream.php
-opt/app/vendor/swiftmailer/swiftmailer/lib/classes/Swift/CharacterStream/NgCharacterStream.php
-opt/app/vendor/swiftmailer/swiftmailer/lib/classes/Swift/DependencyContainer.php
-opt/app/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Encoder.php
-opt/app/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Encoder/QpEncoder.php
-opt/app/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Encoder/Rfc2231Encoder.php
-opt/app/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Events/Event.php
-opt/app/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Events/EventDispatcher.php
-opt/app/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Events/EventObject.php
-opt/app/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Events/SimpleEventDispatcher.php
-opt/app/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Events/TransportChangeEvent.php
-opt/app/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Events/TransportExceptionEvent.php
-opt/app/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Filterable.php
-opt/app/vendor/swiftmailer/swiftmailer/lib/classes/Swift/InputByteStream.php
-opt/app/vendor/swiftmailer/swiftmailer/lib/classes/Swift/IoException.php
-opt/app/vendor/swiftmailer/swiftmailer/lib/classes/Swift/KeyCache.php
-opt/app/vendor/swiftmailer/swiftmailer/lib/classes/Swift/KeyCache/DiskKeyCache.php
-opt/app/vendor/swiftmailer/swiftmailer/lib/classes/Swift/KeyCache/KeyCacheInputStream.php
-opt/app/vendor/swiftmailer/swiftmailer/lib/classes/Swift/KeyCache/SimpleKeyCacheInputStream.php
-opt/app/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Mailer.php
-opt/app/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Message.php
-opt/app/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Mime/CharsetObserver.php
-opt/app/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Mime/ContentEncoder.php
-opt/app/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Mime/ContentEncoder/NativeQpContentEncoder.php
-opt/app/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Mime/ContentEncoder/QpContentEncoder.php
-opt/app/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Mime/ContentEncoder/QpContentEncoderProxy.php
-opt/app/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Mime/EncodingObserver.php
-opt/app/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Mime/Header.php
-opt/app/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Mime/HeaderEncoder.php
-opt/app/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Mime/HeaderEncoder/QpHeaderEncoder.php
-opt/app/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Mime/Headers/AbstractHeader.php
-opt/app/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Mime/Headers/DateHeader.php
-opt/app/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Mime/Headers/IdentificationHeader.php
-opt/app/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Mime/Headers/MailboxHeader.php
-opt/app/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Mime/Headers/ParameterizedHeader.php
-opt/app/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Mime/Headers/UnstructuredHeader.php
-opt/app/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Mime/MimePart.php
-opt/app/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Mime/SimpleHeaderFactory.php
-opt/app/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Mime/SimpleHeaderSet.php
-opt/app/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Mime/SimpleMessage.php
-opt/app/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Mime/SimpleMimeEntity.php
-opt/app/vendor/swiftmailer/swiftmailer/lib/classes/Swift/MimePart.php
-opt/app/vendor/swiftmailer/swiftmailer/lib/classes/Swift/OutputByteStream.php
-opt/app/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Preferences.php
-opt/app/vendor/swiftmailer/swiftmailer/lib/classes/Swift/ReplacementFilterFactory.php
-opt/app/vendor/swiftmailer/swiftmailer/lib/classes/Swift/SmtpTransport.php
-opt/app/vendor/swiftmailer/swiftmailer/lib/classes/Swift/StreamFilter.php
-opt/app/vendor/swiftmailer/swiftmailer/lib/classes/Swift/StreamFilters/ByteArrayReplacementFilter.php
-opt/app/vendor/swiftmailer/swiftmailer/lib/classes/Swift/StreamFilters/StringReplacementFilterFactory.php
-opt/app/vendor/swiftmailer/swiftmailer/lib/classes/Swift/SwiftException.php
-opt/app/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Transport.php
-opt/app/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Transport/AbstractSmtpTransport.php
-opt/app/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Transport/Esmtp/Auth/CramMd5Authenticator.php
-opt/app/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Transport/Esmtp/Auth/LoginAuthenticator.php
-opt/app/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Transport/Esmtp/Auth/NTLMAuthenticator.php
-opt/app/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Transport/Esmtp/Auth/PlainAuthenticator.php
-opt/app/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Transport/Esmtp/Auth/XOAuth2Authenticator.php
-opt/app/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Transport/Esmtp/AuthHandler.php
-opt/app/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Transport/Esmtp/Authenticator.php
-opt/app/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Transport/EsmtpHandler.php
-opt/app/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Transport/EsmtpTransport.php
-opt/app/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Transport/IoBuffer.php
-opt/app/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Transport/SmtpAgent.php
-opt/app/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Transport/StreamBuffer.php
-opt/app/vendor/swiftmailer/swiftmailer/lib/classes/Swift/TransportException.php
-opt/app/vendor/swiftmailer/swiftmailer/lib/dependency_maps/cache_deps.php
-opt/app/vendor/swiftmailer/swiftmailer/lib/dependency_maps/message_deps.php
-opt/app/vendor/swiftmailer/swiftmailer/lib/dependency_maps/mime_deps.php
-opt/app/vendor/swiftmailer/swiftmailer/lib/dependency_maps/transport_deps.php
-opt/app/vendor/swiftmailer/swiftmailer/lib/mime_types.php
-opt/app/vendor/swiftmailer/swiftmailer/lib/preferences.php
 opt/app/vendor/swiftmailer/swiftmailer/lib/swift_required.php
 opt/app/vendor/symfony/console/Application.php
 opt/app/vendor/symfony/console/Command/Command.php
@@ -1267,15 +919,8 @@ opt/app/vendor/symfony/console/Style/OutputStyle.php
 opt/app/vendor/symfony/console/Style/StyleInterface.php
 opt/app/vendor/symfony/console/Style/SymfonyStyle.php
 opt/app/vendor/symfony/console/Terminal.php
-opt/app/vendor/symfony/debug/Exception/FatalErrorException.php
-opt/app/vendor/symfony/debug/Exception/FatalThrowableError.php
-opt/app/vendor/symfony/debug/Exception/FlattenException.php
-opt/app/vendor/symfony/debug/ExceptionHandler.php
-opt/app/vendor/symfony/finder/Comparator/Comparator.php
-opt/app/vendor/symfony/finder/Comparator/DateComparator.php
 opt/app/vendor/symfony/finder/Finder.php
 opt/app/vendor/symfony/finder/Glob.php
-opt/app/vendor/symfony/finder/Iterator/DateRangeFilterIterator.php
 opt/app/vendor/symfony/finder/Iterator/ExcludeDirectoryFilterIterator.php
 opt/app/vendor/symfony/finder/Iterator/FileTypeFilterIterator.php
 opt/app/vendor/symfony/finder/Iterator/FilenameFilterIterator.php
@@ -1284,21 +929,16 @@ opt/app/vendor/symfony/finder/Iterator/MultiplePcreFilterIterator.php
 opt/app/vendor/symfony/finder/Iterator/PathFilterIterator.php
 opt/app/vendor/symfony/finder/Iterator/RecursiveDirectoryIterator.php
 opt/app/vendor/symfony/finder/SplFileInfo.php
-opt/app/vendor/symfony/http-foundation/AcceptHeader.php
-opt/app/vendor/symfony/http-foundation/AcceptHeaderItem.php
 opt/app/vendor/symfony/http-foundation/Cookie.php
 opt/app/vendor/symfony/http-foundation/FileBag.php
 opt/app/vendor/symfony/http-foundation/HeaderBag.php
-opt/app/vendor/symfony/http-foundation/JsonResponse.php
+opt/app/vendor/symfony/http-foundation/IpUtils.php
 opt/app/vendor/symfony/http-foundation/ParameterBag.php
 opt/app/vendor/symfony/http-foundation/RedirectResponse.php
 opt/app/vendor/symfony/http-foundation/Request.php
 opt/app/vendor/symfony/http-foundation/Response.php
 opt/app/vendor/symfony/http-foundation/ResponseHeaderBag.php
 opt/app/vendor/symfony/http-foundation/ServerBag.php
-opt/app/vendor/symfony/http-foundation/Session/SessionBagInterface.php
-opt/app/vendor/symfony/http-foundation/Session/SessionInterface.php
-opt/app/vendor/symfony/http-foundation/Session/Storage/MetadataBag.php
 opt/app/vendor/symfony/http-kernel/HttpKernelInterface.php
 opt/app/vendor/symfony/polyfill-mbstring/bootstrap.php
 opt/app/vendor/symfony/polyfill-php56/bootstrap.php
@@ -1349,17 +989,11 @@ opt/app/vendor/twig/twig/lib/Twig/Node/Expression.php
 opt/app/vendor/twig/twig/lib/Twig/Node/Expression/Array.php
 opt/app/vendor/twig/twig/lib/Twig/Node/Expression/AssignName.php
 opt/app/vendor/twig/twig/lib/Twig/Node/Expression/Binary.php
-opt/app/vendor/twig/twig/lib/Twig/Node/Expression/Binary/Add.php
 opt/app/vendor/twig/twig/lib/Twig/Node/Expression/Binary/And.php
 opt/app/vendor/twig/twig/lib/Twig/Node/Expression/Binary/Concat.php
 opt/app/vendor/twig/twig/lib/Twig/Node/Expression/Binary/Equal.php
 opt/app/vendor/twig/twig/lib/Twig/Node/Expression/Binary/Greater.php
-opt/app/vendor/twig/twig/lib/Twig/Node/Expression/Binary/Less.php
-opt/app/vendor/twig/twig/lib/Twig/Node/Expression/Binary/Mod.php
-opt/app/vendor/twig/twig/lib/Twig/Node/Expression/Binary/Mul.php
 opt/app/vendor/twig/twig/lib/Twig/Node/Expression/Binary/NotEqual.php
-opt/app/vendor/twig/twig/lib/Twig/Node/Expression/Binary/Or.php
-opt/app/vendor/twig/twig/lib/Twig/Node/Expression/Binary/Sub.php
 opt/app/vendor/twig/twig/lib/Twig/Node/Expression/Call.php
 opt/app/vendor/twig/twig/lib/Twig/Node/Expression/Conditional.php
 opt/app/vendor/twig/twig/lib/Twig/Node/Expression/Constant.php
@@ -1371,7 +1005,6 @@ opt/app/vendor/twig/twig/lib/Twig/Node/Expression/Name.php
 opt/app/vendor/twig/twig/lib/Twig/Node/Expression/Test.php
 opt/app/vendor/twig/twig/lib/Twig/Node/Expression/Test/Defined.php
 opt/app/vendor/twig/twig/lib/Twig/Node/Expression/Unary.php
-opt/app/vendor/twig/twig/lib/Twig/Node/Expression/Unary/Neg.php
 opt/app/vendor/twig/twig/lib/Twig/Node/Expression/Unary/Not.php
 opt/app/vendor/twig/twig/lib/Twig/Node/For.php
 opt/app/vendor/twig/twig/lib/Twig/Node/ForLoop.php
@@ -1379,7 +1012,6 @@ opt/app/vendor/twig/twig/lib/Twig/Node/If.php
 opt/app/vendor/twig/twig/lib/Twig/Node/Include.php
 opt/app/vendor/twig/twig/lib/Twig/Node/Module.php
 opt/app/vendor/twig/twig/lib/Twig/Node/Print.php
-opt/app/vendor/twig/twig/lib/Twig/Node/Set.php
 opt/app/vendor/twig/twig/lib/Twig/Node/Text.php
 opt/app/vendor/twig/twig/lib/Twig/NodeInterface.php
 opt/app/vendor/twig/twig/lib/Twig/NodeOutputInterface.php
@@ -1434,7 +1066,6 @@ usr/bin/mysql
 usr/bin/mysql_install_db
 usr/bin/php
 usr/bin/php7.1
-usr/bin/sudo
 usr/lib/locale/locale-archive
 usr/lib/php/20160303/bcmath.so
 usr/lib/php/20160303/calendar.so
@@ -1473,33 +1104,18 @@ usr/lib/php/20160303/zip.so
 usr/lib/ssl/openssl.cnf
 usr/lib/x86_64-linux-gnu/libGeoIP.so.1
 usr/lib/x86_64-linux-gnu/libGeoIP.so.1.6.2
-usr/lib/x86_64-linux-gnu/libX11.so.6
-usr/lib/x86_64-linux-gnu/libX11.so.6.3.0
-usr/lib/x86_64-linux-gnu/libXau.so.6
-usr/lib/x86_64-linux-gnu/libXau.so.6.0.0
-usr/lib/x86_64-linux-gnu/libXdmcp.so.6
-usr/lib/x86_64-linux-gnu/libXdmcp.so.6.0.0
-usr/lib/x86_64-linux-gnu/libXpm.so.4
-usr/lib/x86_64-linux-gnu/libXpm.so.4.11.0
 usr/lib/x86_64-linux-gnu/libapparmor.so.1
 usr/lib/x86_64-linux-gnu/libapparmor.so.1.2.0
 usr/lib/x86_64-linux-gnu/libcrypto.so.1.0.0
 usr/lib/x86_64-linux-gnu/libcrypto.so.1.0.2
 usr/lib/x86_64-linux-gnu/libcurl.so.4
 usr/lib/x86_64-linux-gnu/libcurl.so.4.3.0
-usr/lib/x86_64-linux-gnu/libdb-5.3.so
 usr/lib/x86_64-linux-gnu/libedit.so.2
 usr/lib/x86_64-linux-gnu/libedit.so.2.0.51
 usr/lib/x86_64-linux-gnu/libexslt.so.0
 usr/lib/x86_64-linux-gnu/libexslt.so.0.8.17
 usr/lib/x86_64-linux-gnu/libffi.so.6
 usr/lib/x86_64-linux-gnu/libffi.so.6.0.2
-usr/lib/x86_64-linux-gnu/libfontconfig.so.1
-usr/lib/x86_64-linux-gnu/libfontconfig.so.1.8.0
-usr/lib/x86_64-linux-gnu/libfreetype.so.6
-usr/lib/x86_64-linux-gnu/libfreetype.so.6.11.1
-usr/lib/x86_64-linux-gnu/libgd.so.3
-usr/lib/x86_64-linux-gnu/libgd.so.3.0.0
 usr/lib/x86_64-linux-gnu/libgmp.so.10
 usr/lib/x86_64-linux-gnu/libgmp.so.10.2.0
 usr/lib/x86_64-linux-gnu/libgnutls-deb0.so.28
@@ -1518,9 +1134,6 @@ usr/lib/x86_64-linux-gnu/libicuuc.so.52
 usr/lib/x86_64-linux-gnu/libicuuc.so.52.1
 usr/lib/x86_64-linux-gnu/libidn.so.11
 usr/lib/x86_64-linux-gnu/libidn.so.11.6.12
-usr/lib/x86_64-linux-gnu/libjbig.so.0
-usr/lib/x86_64-linux-gnu/libjpeg.so.62
-usr/lib/x86_64-linux-gnu/libjpeg.so.62.1.0
 usr/lib/x86_64-linux-gnu/libk5crypto.so.3
 usr/lib/x86_64-linux-gnu/libk5crypto.so.3.1
 usr/lib/x86_64-linux-gnu/libkrb5.so.3
@@ -1531,8 +1144,6 @@ usr/lib/x86_64-linux-gnu/liblber-2.4.so.2
 usr/lib/x86_64-linux-gnu/liblber-2.4.so.2.10.3
 usr/lib/x86_64-linux-gnu/libldap_r-2.4.so.2
 usr/lib/x86_64-linux-gnu/libldap_r-2.4.so.2.10.3
-usr/lib/x86_64-linux-gnu/libmysqlclient.so.18
-usr/lib/x86_64-linux-gnu/libmysqlclient.so.18.0.0
 usr/lib/x86_64-linux-gnu/libnettle.so.4
 usr/lib/x86_64-linux-gnu/libnettle.so.4.7
 usr/lib/x86_64-linux-gnu/libp11-kit.so.0
@@ -1548,12 +1159,6 @@ usr/lib/x86_64-linux-gnu/libstdc++.so.6
 usr/lib/x86_64-linux-gnu/libstdc++.so.6.0.20
 usr/lib/x86_64-linux-gnu/libtasn1.so.6
 usr/lib/x86_64-linux-gnu/libtasn1.so.6.3.2
-usr/lib/x86_64-linux-gnu/libtiff.so.5
-usr/lib/x86_64-linux-gnu/libtiff.so.5.2.0
-usr/lib/x86_64-linux-gnu/libvpx.so.1
-usr/lib/x86_64-linux-gnu/libvpx.so.1.3.0
-usr/lib/x86_64-linux-gnu/libxcb.so.1
-usr/lib/x86_64-linux-gnu/libxcb.so.1.1.0
 usr/lib/x86_64-linux-gnu/libxml2.so.2
 usr/lib/x86_64-linux-gnu/libxml2.so.2.9.1
 usr/lib/x86_64-linux-gnu/libxslt.so.1
diff --git a/.sandstorm/sandstorm-pkgdef.capnp b/.sandstorm/sandstorm-pkgdef.capnp
index 30f3d425e1..ef3136b666 100644
--- a/.sandstorm/sandstorm-pkgdef.capnp
+++ b/.sandstorm/sandstorm-pkgdef.capnp
@@ -1,4 +1,4 @@
-@0x9411e6c8b3c8a4b6;
+@0xb0032512fca90cd9;
 
 using Spk = import "/sandstorm/package.capnp";
 # This imports:
@@ -16,7 +16,8 @@ const pkgdef :Spk.PackageDefinition = (
   manifest = (
     appTitle = (defaultText = "Firefly III"),
     appVersion = 1,
-    appMarketingVersion = (defaultText = "3.4.6"),
+    appMarketingVersion = (defaultText = "4.6.9"),
+
     actions = [
       # Define your "new document" handlers here.
       ( nounPhrase = (defaultText = "administration"),
@@ -66,9 +67,9 @@ const pkgdef :Spk.PackageDefinition = (
         # Sizes are given in device-independent pixels, so if you took these
         # screenshots on a Retina-style high DPI screen, divide each dimension by two.
 
-        (width = 1200, height = 1000, png = embed "screenshots/screenshot-1.png"),
-        (width = 1200, height = 1000, png = embed "screenshots/screenshot-2.png"),
-        (width = 1200, height = 1518, png = embed "screenshots/screenshot-3.png"),
+        (width = 1291, height = 800, png = embed "screenshots/screenshot-1.png"),
+        (width = 1291, height = 800, png = embed "screenshots/screenshot-2.png"),
+        (width = 1291, height = 800, png = embed "screenshots/screenshot-3.png"),
 
       ],
       changeLog = (defaultText = embed "changelog.md"),
@@ -97,7 +98,7 @@ const pkgdef :Spk.PackageDefinition = (
   # `spk dev` will write a list of all the files your app uses to this file.
   # You should review it later, before shipping your app.
 
-  alwaysInclude = ["app","bootstrap","config","database","public","resources","routes"],
+  alwaysInclude = ["opt/app/app","opt/app/bootstrap","opt/app/config","opt/app/database","opt/app/public","opt/app/resources","opt/app/routes"],
   # Fill this list with more names of files or directories that should be
   # included in your package, even if not listed in sandstorm-files.list.
   # Use this to force-include stuff that you know you need but which may
@@ -176,7 +177,7 @@ const pkgdef :Spk.PackageDefinition = (
 
 const myCommand :Spk.Manifest.Command = (
   # Here we define the command used to start up your server.
-  argv = ["/sandstorm-http-bridge", "8000", "--", "/opt/app/.sandstorm/launcher.sh"],
+  argv = ["/sandstorm-http-bridge", "8000", "--", "/bin/bash", "/opt/app/.sandstorm/launcher.sh"],
   environ = [
     # Note that this defines the *entire* environment seen by your app.
     (key = "PATH", value = "/usr/local/bin:/usr/bin:/bin"),
diff --git a/.sandstorm/screenshots/screenshot-1.png b/.sandstorm/screenshots/screenshot-1.png
index f72ceb48e7..c8a49481c0 100644
Binary files a/.sandstorm/screenshots/screenshot-1.png and b/.sandstorm/screenshots/screenshot-1.png differ
diff --git a/.sandstorm/screenshots/screenshot-2.png b/.sandstorm/screenshots/screenshot-2.png
index 9301851850..15dbbd4122 100644
Binary files a/.sandstorm/screenshots/screenshot-2.png and b/.sandstorm/screenshots/screenshot-2.png differ
diff --git a/.sandstorm/screenshots/screenshot-3.png b/.sandstorm/screenshots/screenshot-3.png
index 20fcab548f..c52941aa7b 100644
Binary files a/.sandstorm/screenshots/screenshot-3.png and b/.sandstorm/screenshots/screenshot-3.png differ
diff --git a/config/firefly.php b/config/firefly.php
index 994157de51..5a4561097c 100644
--- a/config/firefly.php
+++ b/config/firefly.php
@@ -23,7 +23,7 @@ return [
         'is_demo_site'     => false,
     ],
     'encryption'                 => (is_null(env('USE_ENCRYPTION')) || env('USE_ENCRYPTION') === true),
-    'version'                    => '4.6.8',
+    'version'                    => '4.6.9',
     'maxUploadSize'              => 15242880,
     'allowedMimes'               => ['image/png', 'image/jpeg', 'application/pdf'],
     'list_length'                => 10,