diff --git a/app/Providers/AppServiceProvider.php b/app/Providers/AppServiceProvider.php
index 973d7e1a..3ebb5f61 100644
--- a/app/Providers/AppServiceProvider.php
+++ b/app/Providers/AppServiceProvider.php
@@ -2,6 +2,7 @@
 
 namespace App\Providers;
 
+use View;
 use Blade;
 use Event;
 use Utils;
@@ -10,6 +11,7 @@ use App\Models\User;
 use ReflectionException;
 use Illuminate\Support\ServiceProvider;
 use App\Exceptions\PrettyPageException;
+use App\Services\Repositories\OptionRepository;
 
 class AppServiceProvider extends ServiceProvider
 {
@@ -33,6 +35,8 @@ class AppServiceProvider extends ServiceProvider
             $this->app['url']->forceScheme('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']), [
@@ -59,6 +63,7 @@ class AppServiceProvider extends ServiceProvider
     {
         $this->app->singleton('cipher', 'App\Services\Cipher\\'.config('secure.cipher'));
         $this->app->singleton('users', \App\Services\Repositories\UserRepository::class);
+        $this->app->singleton('options',  OptionRepository::class);
 
         Blade::if('admin', function (User $user) {
             return $user->isAdmin();
diff --git a/app/Providers/BootServiceProvider.php b/app/Providers/BootServiceProvider.php
index 828367f0..35679da9 100644
--- a/app/Providers/BootServiceProvider.php
+++ b/app/Providers/BootServiceProvider.php
@@ -2,15 +2,10 @@
 
 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
 {
@@ -51,8 +46,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 e39b285e..076980bb 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,