diff --git a/app/Http/Controllers/AuthController.php b/app/Http/Controllers/AuthController.php
index 6fb64413..3b10ce2c 100644
--- a/app/Http/Controllers/AuthController.php
+++ b/app/Http/Controllers/AuthController.php
@@ -8,16 +8,16 @@ use App\Mail\ForgotPassword;
 use App\Models\Player;
 use App\Models\User;
 use App\Rules;
-use Auth;
 use Blessing\Filter;
 use Blessing\Rejection;
-use Cache;
 use Carbon\Carbon;
 use Illuminate\Contracts\Events\Dispatcher;
 use Illuminate\Http\Request;
-use Mail;
-use Session;
-use URL;
+use Illuminate\Support\Facades\Auth;
+use Illuminate\Support\Facades\Cache;
+use Illuminate\Support\Facades\Mail;
+use Illuminate\Support\Facades\Session;
+use Illuminate\Support\Facades\URL;
 use Vectorface\Whip\Whip;
 
 class AuthController extends Controller
diff --git a/app/Http/Controllers/ClosetController.php b/app/Http/Controllers/ClosetController.php
index aac2ce7c..a67daebf 100644
--- a/app/Http/Controllers/ClosetController.php
+++ b/app/Http/Controllers/ClosetController.php
@@ -4,12 +4,12 @@ namespace App\Http\Controllers;
 
 use App\Models\Texture;
 use App\Models\User;
-use Auth;
 use Blessing\Filter;
 use Blessing\Rejection;
 use Illuminate\Contracts\Events\Dispatcher;
 use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Auth;
 
 class ClosetController extends Controller
 {
diff --git a/app/Http/Controllers/PlayerController.php b/app/Http/Controllers/PlayerController.php
index eb5b1764..8283aa1f 100644
--- a/app/Http/Controllers/PlayerController.php
+++ b/app/Http/Controllers/PlayerController.php
@@ -10,11 +10,11 @@ use App\Models\Player;
 use App\Models\Texture;
 use App\Models\User;
 use App\Rules;
-use Auth;
 use Blessing\Filter;
 use Blessing\Rejection;
 use Illuminate\Contracts\Events\Dispatcher;
 use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Auth;
 use Illuminate\Validation\Rule;
 
 class PlayerController extends Controller
diff --git a/app/Http/Controllers/SkinlibController.php b/app/Http/Controllers/SkinlibController.php
index 36b23eaf..2897491f 100644
--- a/app/Http/Controllers/SkinlibController.php
+++ b/app/Http/Controllers/SkinlibController.php
@@ -4,7 +4,6 @@ namespace App\Http\Controllers;
 
 use App\Models\Texture;
 use App\Models\User;
-use Auth;
 use Blessing\Filter;
 use Blessing\Rejection;
 use Illuminate\Contracts\Events\Dispatcher;
@@ -12,11 +11,12 @@ use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Filesystem\FilesystemAdapter;
 use Illuminate\Http\Request;
 use Illuminate\Http\UploadedFile;
+use Illuminate\Support\Facades\Auth;
 use Illuminate\Support\Facades\Log;
+use Illuminate\Support\Facades\Storage;
 use Illuminate\Validation\Rule;
 use Intervention\Image\Facades\Image;
 use League\CommonMark\GithubFlavoredMarkdownConverter;
-use Storage;
 
 class SkinlibController extends Controller
 {
diff --git a/app/Http/Controllers/TextureController.php b/app/Http/Controllers/TextureController.php
index c1fcec62..701c09db 100644
--- a/app/Http/Controllers/TextureController.php
+++ b/app/Http/Controllers/TextureController.php
@@ -6,11 +6,11 @@ use App\Models\Player;
 use App\Models\Texture;
 use App\Models\User;
 use Blessing\Minecraft;
-use Cache;
 use Carbon\Carbon;
 use Illuminate\Http\Request;
-use Image;
-use Storage;
+use Illuminate\Support\Facades\Cache;
+use Illuminate\Support\Facades\Storage;
+use Intervention\Image\Facades\Image;
 
 class TextureController extends Controller
 {
diff --git a/app/Http/Controllers/UserController.php b/app/Http/Controllers/UserController.php
index e6ae82d4..c464f992 100644
--- a/app/Http/Controllers/UserController.php
+++ b/app/Http/Controllers/UserController.php
@@ -6,16 +6,16 @@ use App\Events\UserProfileUpdated;
 use App\Mail\EmailVerification;
 use App\Models\Texture;
 use App\Models\User;
-use Auth;
 use Blessing\Filter;
 use Blessing\Rejection;
 use Carbon\Carbon;
 use Illuminate\Contracts\Events\Dispatcher;
 use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Auth;
+use Illuminate\Support\Facades\Mail;
+use Illuminate\Support\Facades\Session;
+use Illuminate\Support\Facades\URL;
 use League\CommonMark\GithubFlavoredMarkdownConverter;
-use Mail;
-use Session;
-use URL;
 
 class UserController extends Controller
 {
diff --git a/app/Listeners/NotifyFailedPlugin.php b/app/Listeners/NotifyFailedPlugin.php
index 2e9f32c8..a689068c 100644
--- a/app/Listeners/NotifyFailedPlugin.php
+++ b/app/Listeners/NotifyFailedPlugin.php
@@ -3,7 +3,7 @@
 namespace App\Listeners;
 
 use App\Models\User;
-use Event;
+use Illuminate\Support\Facades\Event;
 
 class NotifyFailedPlugin
 {
diff --git a/app/Services/Hook.php b/app/Services/Hook.php
index 64180af1..e5b3bb49 100644
--- a/app/Services/Hook.php
+++ b/app/Services/Hook.php
@@ -8,10 +8,10 @@ use App\Events;
 use App\Notifications;
 use Blessing\Filter;
 use Closure;
-use Event;
 use Illuminate\Support\Arr;
+use Illuminate\Support\Facades\Event;
+use Illuminate\Support\Facades\Notification;
 use Illuminate\Support\Str;
-use Notification;
 
 class Hook
 {
diff --git a/app/Services/Option.php b/app/Services/Option.php
index 79b3927d..5514fe38 100644
--- a/app/Services/Option.php
+++ b/app/Services/Option.php
@@ -2,10 +2,10 @@
 
 namespace App\Services;
 
-use DB;
 use Illuminate\Database\QueryException;
 use Illuminate\Filesystem\Filesystem;
 use Illuminate\Support\Arr;
+use Illuminate\Support\Facades\DB;
 
 class Option
 {
diff --git a/app/Services/OptionForm.php b/app/Services/OptionForm.php
index 9d13a450..f4555dcf 100644
--- a/app/Services/OptionForm.php
+++ b/app/Services/OptionForm.php
@@ -2,10 +2,10 @@
 
 namespace App\Services;
 
+use App\Services\Facades\Option;
 use BadMethodCallException;
 use Illuminate\Support\Arr;
 use Illuminate\Support\Str;
-use Option;
 use ReflectionClass;
 
 /**
diff --git a/database/migrations/2016_11_18_133939_create_all_tables.php b/database/migrations/2016_11_18_133939_create_all_tables.php
index b2c34964..007ee064 100644
--- a/database/migrations/2016_11_18_133939_create_all_tables.php
+++ b/database/migrations/2016_11_18_133939_create_all_tables.php
@@ -2,6 +2,7 @@
 
 use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
 
 class CreateAllTables extends Migration
 {
diff --git a/database/migrations/2016_11_18_134542_import_options.php b/database/migrations/2016_11_18_134542_import_options.php
index b99d2df7..24ebf518 100644
--- a/database/migrations/2016_11_18_134542_import_options.php
+++ b/database/migrations/2016_11_18_134542_import_options.php
@@ -1,6 +1,8 @@
 <?php
 
+use App\Services\Facades\Option;
 use Illuminate\Database\Migrations\Migration;
+use Illuminate\Support\Facades\DB;
 
 class ImportOptions extends Migration
 {
diff --git a/database/migrations/2018_07_26_130617_add_verification_to_users_table.php b/database/migrations/2018_07_26_130617_add_verification_to_users_table.php
index 2d10ebdf..f5bff224 100644
--- a/database/migrations/2018_07_26_130617_add_verification_to_users_table.php
+++ b/database/migrations/2018_07_26_130617_add_verification_to_users_table.php
@@ -2,6 +2,7 @@
 
 use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
 
 class AddVerificationToUsersTable extends Migration
 {
diff --git a/routes/api.php b/routes/api.php
index 10485593..81cdb088 100644
--- a/routes/api.php
+++ b/routes/api.php
@@ -1,5 +1,7 @@
 <?php
 
+use Illuminate\Support\Facades\Route;
+
 Route::any('', 'HomeController@apiRoot');
 
 Route::prefix('user')->middleware('auth:oauth')->group(function () {
diff --git a/routes/static.php b/routes/static.php
index 45091cea..d5712d07 100644
--- a/routes/static.php
+++ b/routes/static.php
@@ -1,5 +1,7 @@
 <?php
 
+use Illuminate\Support\Facades\Route;
+
 Route::get('{player}.json', 'TextureController@json');
 Route::get('csl/{player}.json', 'TextureController@json');
 
diff --git a/routes/web.php b/routes/web.php
index 2c8ceb5f..06cb4ba9 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -1,6 +1,7 @@
 <?php
 
 use App\Http\Middleware;
+use Illuminate\Support\Facades\Route;
 
 /*
 |--------------------------------------------------------------------------
diff --git a/tests/HttpTest/ControllersTest/AuthControllerTest.php b/tests/HttpTest/ControllersTest/AuthControllerTest.php
index 85528c4b..8331557f 100644
--- a/tests/HttpTest/ControllersTest/AuthControllerTest.php
+++ b/tests/HttpTest/ControllersTest/AuthControllerTest.php
@@ -8,10 +8,10 @@ use App\Models\Player;
 use App\Models\User;
 use App\Rules\Captcha;
 use Blessing\Rejection;
-use Cache;
 use Carbon\Carbon;
-use Event;
 use Illuminate\Foundation\Testing\DatabaseTransactions;
+use Illuminate\Support\Facades\Cache;
+use Illuminate\Support\Facades\Event;
 use Illuminate\Support\Facades\Mail;
 use Illuminate\Support\Facades\URL;
 use Illuminate\Support\Str;
diff --git a/tests/HttpTest/ControllersTest/OptionsControllerTest.php b/tests/HttpTest/ControllersTest/OptionsControllerTest.php
index 1c913e24..16de323d 100644
--- a/tests/HttpTest/ControllersTest/OptionsControllerTest.php
+++ b/tests/HttpTest/ControllersTest/OptionsControllerTest.php
@@ -3,7 +3,7 @@
 namespace Tests;
 
 use App\Models\User;
-use Cache;
+use Illuminate\Support\Facades\Cache;
 use Illuminate\Foundation\Testing\DatabaseTransactions;
 use Mockery;
 
diff --git a/tests/HttpTest/ControllersTest/PlayerControllerTest.php b/tests/HttpTest/ControllersTest/PlayerControllerTest.php
index d171151c..08e90085 100644
--- a/tests/HttpTest/ControllersTest/PlayerControllerTest.php
+++ b/tests/HttpTest/ControllersTest/PlayerControllerTest.php
@@ -7,8 +7,8 @@ use App\Models\Player;
 use App\Models\Texture;
 use App\Models\User;
 use Blessing\Rejection;
-use Event;
 use Illuminate\Foundation\Testing\DatabaseTransactions;
+use Illuminate\Support\Facades\Event;
 
 class PlayerControllerTest extends TestCase
 {
diff --git a/tests/HttpTest/ControllersTest/PlayersManagementControllerTest.php b/tests/HttpTest/ControllersTest/PlayersManagementControllerTest.php
index eb54c752..23b9269d 100644
--- a/tests/HttpTest/ControllersTest/PlayersManagementControllerTest.php
+++ b/tests/HttpTest/ControllersTest/PlayersManagementControllerTest.php
@@ -5,8 +5,8 @@ namespace Tests;
 use App\Models\Player;
 use App\Models\Texture;
 use App\Models\User;
-use Event;
 use Illuminate\Foundation\Testing\DatabaseTransactions;
+use Illuminate\Support\Facades\Event;
 
 class PlayersManagementControllerTest extends TestCase
 {
diff --git a/tests/HttpTest/ControllersTest/ReportControllerTest.php b/tests/HttpTest/ControllersTest/ReportControllerTest.php
index 23cb6f28..7fd0100e 100644
--- a/tests/HttpTest/ControllersTest/ReportControllerTest.php
+++ b/tests/HttpTest/ControllersTest/ReportControllerTest.php
@@ -7,8 +7,8 @@ use App\Models\Texture;
 use App\Models\User;
 use Blessing\Filter;
 use Blessing\Rejection;
-use Event;
 use Illuminate\Foundation\Testing\DatabaseTransactions;
+use Illuminate\Support\Facades\Event;
 use Illuminate\Support\Facades\Storage;
 
 class ReportControllerTest extends TestCase
diff --git a/tests/HttpTest/ControllersTest/TextureControllerTest.php b/tests/HttpTest/ControllersTest/TextureControllerTest.php
index a5574a54..af5830fa 100644
--- a/tests/HttpTest/ControllersTest/TextureControllerTest.php
+++ b/tests/HttpTest/ControllersTest/TextureControllerTest.php
@@ -6,10 +6,10 @@ use App\Models\Player;
 use App\Models\Texture;
 use App\Models\User;
 use Blessing\Minecraft;
-use Cache;
+use Illuminate\Support\Facades\Cache;
 use Illuminate\Foundation\Testing\DatabaseTransactions;
 use Illuminate\Support\Facades\Storage;
-use Image;
+use Intervention\Image\Facades\Image;
 
 class TextureControllerTest extends TestCase
 {
diff --git a/tests/HttpTest/ControllersTest/UserControllerTest.php b/tests/HttpTest/ControllersTest/UserControllerTest.php
index b43b9624..422ad0fd 100644
--- a/tests/HttpTest/ControllersTest/UserControllerTest.php
+++ b/tests/HttpTest/ControllersTest/UserControllerTest.php
@@ -9,8 +9,8 @@ use App\Models\User;
 use Blessing\Filter;
 use Blessing\Rejection;
 use Carbon\Carbon;
-use Event;
 use Illuminate\Foundation\Testing\DatabaseTransactions;
+use Illuminate\Support\Facades\Event;
 use Illuminate\Support\Facades\Mail;
 use Illuminate\Support\Str;
 use League\CommonMark\GithubFlavoredMarkdownConverter;
diff --git a/tests/HttpTest/MiddlewareTest/FireUserAuthenticatedTest.php b/tests/HttpTest/MiddlewareTest/FireUserAuthenticatedTest.php
index 3313bb70..7fe8c74d 100644
--- a/tests/HttpTest/MiddlewareTest/FireUserAuthenticatedTest.php
+++ b/tests/HttpTest/MiddlewareTest/FireUserAuthenticatedTest.php
@@ -3,7 +3,7 @@
 namespace Tests;
 
 use App\Models\User;
-use Event;
+use Illuminate\Support\Facades\Event;
 
 class FireUserAuthenticatedTest extends TestCase
 {
diff --git a/tests/HttpTest/ViewTest/ComposersTest/FootComposerTest.php b/tests/HttpTest/ViewTest/ComposersTest/FootComposerTest.php
index 82addce7..e21d0f18 100644
--- a/tests/HttpTest/ViewTest/ComposersTest/FootComposerTest.php
+++ b/tests/HttpTest/ViewTest/ComposersTest/FootComposerTest.php
@@ -4,8 +4,8 @@ namespace Tests;
 
 use App\Models\User;
 use App\Services\Translations\JavaScript;
-use Event;
 use Illuminate\Foundation\Testing\DatabaseTransactions;
+use Illuminate\Support\Facades\Event;
 use Symfony\Component\DomCrawler\Crawler;
 
 class FootComposerTest extends TestCase
diff --git a/tests/HttpTest/ViewTest/ComposersTest/HeadComposerTest.php b/tests/HttpTest/ViewTest/ComposersTest/HeadComposerTest.php
index 0ebc8e4f..8bdd1244 100644
--- a/tests/HttpTest/ViewTest/ComposersTest/HeadComposerTest.php
+++ b/tests/HttpTest/ViewTest/ComposersTest/HeadComposerTest.php
@@ -2,8 +2,8 @@
 
 namespace Tests;
 
-use Event;
 use Illuminate\Foundation\Testing\DatabaseTransactions;
+use Illuminate\Support\Facades\Event;
 use Symfony\Component\DomCrawler\Crawler;
 
 class HeadComposerTest extends TestCase
diff --git a/tests/HttpTest/ViewTest/ComposersTest/SideMenuComposerTest.php b/tests/HttpTest/ViewTest/ComposersTest/SideMenuComposerTest.php
index c1dee230..a1acff04 100644
--- a/tests/HttpTest/ViewTest/ComposersTest/SideMenuComposerTest.php
+++ b/tests/HttpTest/ViewTest/ComposersTest/SideMenuComposerTest.php
@@ -6,7 +6,7 @@ use App\Events;
 use App\Models\User;
 use App\Services\Plugin;
 use App\Services\PluginManager;
-use Event;
+use Illuminate\Support\Facades\Event;
 use Symfony\Component\DomCrawler\Crawler;
 
 class SideMenuComposerTest extends TestCase
diff --git a/tests/HttpTest/ViewTest/ComposersTest/UserPanelComposerTest.php b/tests/HttpTest/ViewTest/ComposersTest/UserPanelComposerTest.php
index 7f489438..5ef0b378 100644
--- a/tests/HttpTest/ViewTest/ComposersTest/UserPanelComposerTest.php
+++ b/tests/HttpTest/ViewTest/ComposersTest/UserPanelComposerTest.php
@@ -3,7 +3,7 @@
 namespace Tests;
 
 use App\Models\User;
-use Event;
+use Illuminate\Support\Facades\Event;
 
 class UserPanelComposerTest extends TestCase
 {
diff --git a/tests/ServicesTest/PluginManagerTest.php b/tests/ServicesTest/PluginManagerTest.php
index b8b1da83..f11e2ccb 100644
--- a/tests/ServicesTest/PluginManagerTest.php
+++ b/tests/ServicesTest/PluginManagerTest.php
@@ -6,8 +6,8 @@ use App\Events;
 use App\Services\Option;
 use App\Services\Plugin;
 use App\Services\PluginManager;
-use Event;
 use Illuminate\Filesystem\Filesystem;
+use Illuminate\Support\Facades\Event;
 use ReflectionClass;
 
 class PluginManagerTest extends TestCase