diff --git a/app/Providers/AppServiceProvider.php b/app/Providers/AppServiceProvider.php
index 3a871108..2390473f 100644
--- a/app/Providers/AppServiceProvider.php
+++ b/app/Providers/AppServiceProvider.php
@@ -2,12 +2,16 @@
 
 namespace App\Providers;
 
+use View;
 use Event;
 use Utils;
+use Parsedown;
 use App\Events;
 use ReflectionException;
 use Illuminate\Support\ServiceProvider;
 use App\Exceptions\PrettyPageException;
+use App\Services\Repositories\UserRepository;
+use App\Services\Repositories\OptionRepository;
 
 class AppServiceProvider extends ServiceProvider
 {
@@ -31,6 +35,8 @@ class AppServiceProvider extends ServiceProvider
             $this->app['url']->forceSchema('https');
         }
 
+        View::addExtension('tpl', 'blade');
+
         Event::listen(Events\RenderingHeader::class, function($event) {
             // Provide some application information for javascript
             $blessing = array_merge(array_except(config('app'), ['key', 'providers', 'aliases', 'cipher', 'log', 'url']), [
@@ -56,7 +62,8 @@ class AppServiceProvider extends ServiceProvider
     public function register()
     {
         $this->app->singleton('cipher', 'App\Services\Cipher\\'.config('secure.cipher'));
-        $this->app->singleton('users', \App\Services\Repositories\UserRepository::class);
-        $this->app->singleton('parsedown', \Parsedown::class);
+        $this->app->singleton('parsedown', Parsedown::class);
+        $this->app->singleton('users', UserRepository::class);
+        $this->app->singleton('options', OptionRepository::class);
     }
 }
diff --git a/app/Providers/BootServiceProvider.php b/app/Providers/RuntimeCheckServiceProvider.php
similarity index 91%
rename from app/Providers/BootServiceProvider.php
rename to app/Providers/RuntimeCheckServiceProvider.php
index 65e9b6dd..857b6d40 100644
--- a/app/Providers/BootServiceProvider.php
+++ b/app/Providers/RuntimeCheckServiceProvider.php
@@ -3,16 +3,13 @@
 namespace App\Providers;
 
 use DB;
-use View;
-use Utils;
 use Illuminate\Http\Request;
 use Composer\Semver\Comparator;
 use Illuminate\Support\ServiceProvider;
 use App\Exceptions\PrettyPageException;
 use App\Http\Controllers\SetupController;
-use App\Services\Repositories\OptionRepository;
 
-class BootServiceProvider extends ServiceProvider
+class RuntimeCheckServiceProvider extends ServiceProvider
 {
     /**
      * Bootstrap any application services.
@@ -95,8 +92,6 @@ class BootServiceProvider extends ServiceProvider
      */
     public function register()
     {
-        View::addExtension('tpl', 'blade');
-
-        $this->app->singleton('options',  OptionRepository::class);
+        //
     }
 }
diff --git a/config/app.php b/config/app.php
index 9ef67dfe..5f197965 100644
--- a/config/app.php
+++ b/config/app.php
@@ -132,7 +132,7 @@ return [
 
     'providers' => [
 
-        /*
+        /**
          * Laravel Framework Service Providers...
          */
         Illuminate\Auth\AuthServiceProvider::class,
@@ -157,7 +157,7 @@ return [
         Illuminate\View\ViewServiceProvider::class,
 
         /**
-         * Third-party libraries
+         * Third-party Libraries...
          */
         Swiggles\Memcache\MemcacheServiceProvider::class,
         Yajra\Datatables\DatatablesServiceProvider::class,
@@ -165,15 +165,15 @@ return [
         /**
          * Application Service Providers...
          */
-        App\Providers\BootServiceProvider::class,
         App\Providers\AppServiceProvider::class,
-        App\Providers\LogServiceProvider::class,
-        App\Providers\PluginServiceProvider::class,
         App\Providers\EventServiceProvider::class,
+        App\Providers\LogServiceProvider::class,
         App\Providers\MemoryServiceProvider::class,
-        App\Providers\RouteServiceProvider::class,
-        App\Providers\TranslationServiceProvider::class,
+        App\Providers\PluginServiceProvider::class,
         App\Providers\ResponseMacroServiceProvider::class,
+        App\Providers\RouteServiceProvider::class,
+        App\Providers\RuntimeCheckServiceProvider::class,
+        App\Providers\TranslationServiceProvider::class,
         App\Providers\ValidatorExtendServiceProvider::class,
 
     ],