diff --git a/.env.travis b/.env.travis
index 22a0c3047..f1d4f5698 100644
--- a/.env.travis
+++ b/.env.travis
@@ -16,3 +16,4 @@ MAIL_DRIVER=array
 QUEUE_DRIVER=sync
 
 HASHIDS_SALT=test123
+APP_ENVIRONMENT_ONLY=true
diff --git a/app/Contracts/Repository/SettingsRepositoryInterface.php b/app/Contracts/Repository/SettingsRepositoryInterface.php
new file mode 100644
index 000000000..dbf87f744
--- /dev/null
+++ b/app/Contracts/Repository/SettingsRepositoryInterface.php
@@ -0,0 +1,32 @@
+<?php
+
+namespace Pterodactyl\Contracts\Repository;
+
+interface SettingsRepositoryInterface extends RepositoryInterface
+{
+    /**
+     * Store a new persistent setting in the database.
+     *
+     * @param string $key
+     * @param string $value
+     * @return mixed
+     */
+    public function set(string $key, string $value);
+
+    /**
+     * Retrieve a persistent setting from the database.
+     *
+     * @param string $key
+     * @param mixed  $default
+     * @return mixed
+     */
+    public function get(string $key, $default);
+
+    /**
+     * Remove a key from the database cache.
+     *
+     * @param string $key
+     * @return mixed
+     */
+    public function forget(string $key);
+}
diff --git a/app/Http/Controllers/Admin/BaseController.php b/app/Http/Controllers/Admin/BaseController.php
index ebdebd361..b80676f2e 100644
--- a/app/Http/Controllers/Admin/BaseController.php
+++ b/app/Http/Controllers/Admin/BaseController.php
@@ -1,51 +1,25 @@
 <?php
-/**
- * Pterodactyl - Panel
- * Copyright (c) 2015 - 2017 Dane Everitt <dane@daneeveritt.com>.
- *
- * This software is licensed under the terms of the MIT license.
- * https://opensource.org/licenses/MIT
- */
 
 namespace Pterodactyl\Http\Controllers\Admin;
 
-use Krucas\Settings\Settings;
-use Prologue\Alerts\AlertsMessageBag;
+use Illuminate\View\View;
 use Pterodactyl\Http\Controllers\Controller;
-use Pterodactyl\Http\Requests\Admin\BaseFormRequest;
 use Pterodactyl\Services\Helpers\SoftwareVersionService;
 
 class BaseController extends Controller
 {
-    /**
-     * @var \Prologue\Alerts\AlertsMessageBag
-     */
-    protected $alert;
-
-    /**
-     * @var \Krucas\Settings\Settings
-     */
-    protected $settings;
-
     /**
      * @var \Pterodactyl\Services\Helpers\SoftwareVersionService
      */
-    protected $version;
+    private $version;
 
     /**
      * BaseController constructor.
      *
-     * @param \Prologue\Alerts\AlertsMessageBag                    $alert
-     * @param \Krucas\Settings\Settings                            $settings
      * @param \Pterodactyl\Services\Helpers\SoftwareVersionService $version
      */
-    public function __construct(
-        AlertsMessageBag $alert,
-        Settings $settings,
-        SoftwareVersionService $version
-    ) {
-        $this->alert = $alert;
-        $this->settings = $settings;
+    public function __construct(SoftwareVersionService $version)
+    {
         $this->version = $version;
     }
 
@@ -54,34 +28,8 @@ class BaseController extends Controller
      *
      * @return \Illuminate\View\View
      */
-    public function getIndex()
+    public function index(): View
     {
         return view('admin.index', ['version' => $this->version]);
     }
-
-    /**
-     * Return the admin settings view.
-     *
-     * @return \Illuminate\View\View
-     */
-    public function getSettings()
-    {
-        return view('admin.settings');
-    }
-
-    /**
-     * Handle settings post request.
-     *
-     * @param \Pterodactyl\Http\Requests\Admin\BaseFormRequest $request
-     * @return \Illuminate\Http\RedirectResponse
-     */
-    public function postSettings(BaseFormRequest $request)
-    {
-        $this->settings->set('company', $request->input('company'));
-        $this->settings->set('2fa', $request->input('2fa'));
-
-        $this->alert->success('Settings have been successfully updated.')->flash();
-
-        return redirect()->route('admin.settings');
-    }
 }
diff --git a/app/Http/Controllers/Admin/Settings/AdvancedController.php b/app/Http/Controllers/Admin/Settings/AdvancedController.php
new file mode 100644
index 000000000..f8249acd3
--- /dev/null
+++ b/app/Http/Controllers/Admin/Settings/AdvancedController.php
@@ -0,0 +1,91 @@
+<?php
+
+namespace Pterodactyl\Http\Controllers\Admin\Settings;
+
+use Illuminate\View\View;
+use Illuminate\Http\RedirectResponse;
+use Prologue\Alerts\AlertsMessageBag;
+use Illuminate\Contracts\Console\Kernel;
+use Pterodactyl\Http\Controllers\Controller;
+use Illuminate\Contracts\Config\Repository as ConfigRepository;
+use Pterodactyl\Contracts\Repository\SettingsRepositoryInterface;
+use Pterodactyl\Http\Requests\Admin\Settings\AdvancedSettingsFormRequest;
+
+class AdvancedController extends Controller
+{
+    /**
+     * @var \Prologue\Alerts\AlertsMessageBag
+     */
+    private $alert;
+
+    /**
+     * @var \Illuminate\Contracts\Config\Repository
+     */
+    private $config;
+
+    /**
+     * @var \Illuminate\Contracts\Console\Kernel
+     */
+    private $kernel;
+
+    /**
+     * @var \Pterodactyl\Contracts\Repository\SettingsRepositoryInterface
+     */
+    private $settings;
+
+    /**
+     * AdvancedController constructor.
+     *
+     * @param \Prologue\Alerts\AlertsMessageBag                             $alert
+     * @param \Illuminate\Contracts\Config\Repository                       $config
+     * @param \Illuminate\Contracts\Console\Kernel                          $kernel
+     * @param \Pterodactyl\Contracts\Repository\SettingsRepositoryInterface $settings
+     */
+    public function __construct(
+        AlertsMessageBag $alert,
+        ConfigRepository $config,
+        Kernel $kernel,
+        SettingsRepositoryInterface $settings
+    ) {
+        $this->alert = $alert;
+        $this->config = $config;
+        $this->kernel = $kernel;
+        $this->settings = $settings;
+    }
+
+    /**
+     * Render advanced Panel settings UI.
+     *
+     * @return \Illuminate\View\View
+     */
+    public function index(): View
+    {
+        $showRecaptchaWarning = false;
+        if (
+            $this->config->get('recaptcha._shipped_secret_key') === $this->config->get('recaptcha.secret_key')
+            || $this->config->get('recaptcha._shipped_website_key') === $this->config->get('recaptcha.website_key')
+        ) {
+            $showRecaptchaWarning = true;
+        }
+
+        return view('admin.settings.advanced', [
+            'showRecaptchaWarning' => $showRecaptchaWarning,
+        ]);
+    }
+
+    /**
+     * @param \Pterodactyl\Http\Requests\Admin\Settings\AdvancedSettingsFormRequest $request
+     * @return \Illuminate\Http\RedirectResponse
+     */
+    public function update(AdvancedSettingsFormRequest $request): RedirectResponse
+    {
+        foreach ($request->normalize() as $key => $value) {
+            $this->settings->set('settings::' . $key, $value);
+        }
+
+        $this->kernel->call('queue:restart');
+        $this->alert->success('Advanced settings have been updated successfully and the queue worker was restarted to apply these changes.')->flash();
+
+        return redirect()->route('admin.settings.advanced');
+    }
+}
diff --git a/app/Http/Controllers/Admin/Settings/IndexController.php b/app/Http/Controllers/Admin/Settings/IndexController.php
new file mode 100644
index 000000000..604684da4
--- /dev/null
+++ b/app/Http/Controllers/Admin/Settings/IndexController.php
@@ -0,0 +1,89 @@
+<?php
+
+namespace Pterodactyl\Http\Controllers\Admin\Settings;
+
+use Illuminate\View\View;
+use Illuminate\Http\RedirectResponse;
+use Prologue\Alerts\AlertsMessageBag;
+use Illuminate\Contracts\Console\Kernel;
+use Pterodactyl\Http\Controllers\Controller;
+use Pterodactyl\Traits\Helpers\AvailableLanguages;
+use Pterodactyl\Services\Helpers\SoftwareVersionService;
+use Pterodactyl\Contracts\Repository\SettingsRepositoryInterface;
+use Pterodactyl\Http\Requests\Admin\Settings\BaseSettingsFormRequest;
+
+class IndexController extends Controller
+{
+    use AvailableLanguages;
+
+    /**
+     * @var \Prologue\Alerts\AlertsMessageBag
+     */
+    private $alert;
+
+    /**
+     * @var \Illuminate\Contracts\Console\Kernel
+     */
+    private $kernel;
+
+    /**
+     * @var \Pterodactyl\Contracts\Repository\SettingsRepositoryInterface
+     */
+    private $settings;
+
+    /**
+     * @var \Pterodactyl\Services\Helpers\SoftwareVersionService
+     */
+    private $versionService;
+
+    /**
+     * IndexController constructor.
+     *
+     * @param \Prologue\Alerts\AlertsMessageBag                             $alert
+     * @param \Illuminate\Contracts\Console\Kernel                          $kernel
+     * @param \Pterodactyl\Contracts\Repository\SettingsRepositoryInterface $settings
+     * @param \Pterodactyl\Services\Helpers\SoftwareVersionService          $versionService
+     */
+    public function __construct(
+        AlertsMessageBag $alert,
+        Kernel $kernel,
+        SettingsRepositoryInterface $settings,
+        SoftwareVersionService $versionService)
+    {
+        $this->alert = $alert;
+        $this->kernel = $kernel;
+        $this->settings = $settings;
+        $this->versionService = $versionService;
+    }
+
+    /**
+     * Render the UI for basic Panel settings.
+     *
+     * @return \Illuminate\View\View
+     */
+    public function index(): View
+    {
+        return view('admin.settings.index', [
+            'version' => $this->versionService,
+            'languages' => $this->getAvailableLanguages(true),
+        ]);
+    }
+
+    /**
+     * Handle settings update.
+     *
+     * @param \Pterodactyl\Http\Requests\Admin\Settings\BaseSettingsFormRequest $request
+     * @return \Illuminate\Http\RedirectResponse
+     */
+    public function update(BaseSettingsFormRequest $request): RedirectResponse
+    {
+        foreach ($request->normalize() as $key => $value) {
+            $this->settings->set('settings::' . $key, $value);
+        }
+
+        $this->kernel->call('queue:restart');
+        $this->alert->success('Panel settings have been updated successfully and the queue worker was restarted to apply these changes.')->flash();
+
+        return redirect()->route('admin.settings');
+    }
+}
diff --git a/app/Http/Controllers/Admin/Settings/MailController.php b/app/Http/Controllers/Admin/Settings/MailController.php
new file mode 100644
index 000000000..0e5a1d737
--- /dev/null
+++ b/app/Http/Controllers/Admin/Settings/MailController.php
@@ -0,0 +1,112 @@
+<?php
+
+namespace Pterodactyl\Http\Controllers\Admin\Settings;
+
+use Illuminate\View\View;
+use Illuminate\Http\RedirectResponse;
+use Prologue\Alerts\AlertsMessageBag;
+use Illuminate\Contracts\Console\Kernel;
+use Pterodactyl\Exceptions\DisplayException;
+use Pterodactyl\Http\Controllers\Controller;
+use Illuminate\Contracts\Encryption\Encrypter;
+use Pterodactyl\Providers\SettingsServiceProvider;
+use Illuminate\Contracts\Config\Repository as ConfigRepository;
+use Pterodactyl\Contracts\Repository\SettingsRepositoryInterface;
+use Pterodactyl\Http\Requests\Admin\Settings\MailSettingsFormRequest;
+
+class MailController extends Controller
+{
+    /**
+     * @var \Prologue\Alerts\AlertsMessageBag
+     */
+    private $alert;
+
+    /**
+     * @var \Illuminate\Contracts\Config\Repository
+     */
+    private $config;
+
+    /**
+     * @var \Illuminate\Contracts\Encryption\Encrypter
+     */
+    private $encrypter;
+
+    /**
+     * @var \Illuminate\Contracts\Console\Kernel
+     */
+    private $kernel;
+
+    /**
+     * @var \Pterodactyl\Contracts\Repository\SettingsRepositoryInterface
+     */
+    private $settings;
+
+    /**
+     * MailController constructor.
+     *
+     * @param \Prologue\Alerts\AlertsMessageBag                             $alert
+     * @param \Illuminate\Contracts\Config\Repository                       $config
+     * @param \Illuminate\Contracts\Encryption\Encrypter                    $encrypter
+     * @param \Illuminate\Contracts\Console\Kernel                          $kernel
+     * @param \Pterodactyl\Contracts\Repository\SettingsRepositoryInterface $settings
+     */
+    public function __construct(
+        AlertsMessageBag $alert,
+        ConfigRepository $config,
+        Encrypter $encrypter,
+        Kernel $kernel,
+        SettingsRepositoryInterface $settings
+    ) {
+        $this->alert = $alert;
+        $this->config = $config;
+        $this->encrypter = $encrypter;
+        $this->kernel = $kernel;
+        $this->settings = $settings;
+    }
+
+    /**
+     * Render UI for editing mail settings. This UI should only display if
+     * the server is configured to send mail using SMTP.
+     *
+     * @return \Illuminate\View\View
+     */
+    public function index(): View
+    {
+        return view('admin.settings.mail', [
+            'disabled' => $this->config->get('mail.driver') !== 'smtp',
+        ]);
+    }
+
+    /**
+     * Handle request to update SMTP mail settings.
+     *
+     * @param \Pterodactyl\Http\Requests\Admin\Settings\MailSettingsFormRequest $request
+     * @return \Illuminate\Http\RedirectResponse
+     *
+     * @throws \Pterodactyl\Exceptions\DisplayException
+     */
+    public function update(MailSettingsFormRequest $request): RedirectResponse
+    {
+        if ($this->config->get('mail.driver') !== 'smtp') {
+            throw new DisplayException('This feature is only available if SMTP is the selected email driver for the Panel.');
+        }
+
+        $values = $request->normalize();
+        if (array_get($values, 'mail:password') === '!e') {
+            $values['mail:password'] = '';
+        }
+
+        foreach ($values as $key => $value) {
+            if (in_array($key, SettingsServiceProvider::getEncryptedKeys()) && ! empty($value)) {
+                $value = $this->encrypter->encrypt($value);
+            }
+
+            $this->settings->set('settings::' . $key, $value);
+        }
+
+        $this->kernel->call('queue:restart');
+        $this->alert->success('Mail settings have been updated successfully and the queue worker was restarted to apply these changes.')->flash();
+
+        return redirect()->route('admin.settings.mail');
+    }
+}
diff --git a/app/Http/Middleware/RequireTwoFactorAuthentication.php b/app/Http/Middleware/RequireTwoFactorAuthentication.php
index bc5ff70ee..266983471 100644
--- a/app/Http/Middleware/RequireTwoFactorAuthentication.php
+++ b/app/Http/Middleware/RequireTwoFactorAuthentication.php
@@ -11,7 +11,6 @@ namespace Pterodactyl\Http\Middleware;
 
 use Closure;
 use Illuminate\Http\Request;
-use Krucas\Settings\Settings;
 use Prologue\Alerts\AlertsMessageBag;
 
 class RequireTwoFactorAuthentication
@@ -25,11 +24,6 @@ class RequireTwoFactorAuthentication
      */
     private $alert;
 
-    /**
-     * @var \Krucas\Settings\Settings
-     */
-    private $settings;
-
     /**
      * The names of routes that should be accessable without 2FA enabled.
      *
@@ -56,12 +50,10 @@ class RequireTwoFactorAuthentication
      * RequireTwoFactorAuthentication constructor.
      *
      * @param \Prologue\Alerts\AlertsMessageBag $alert
-     * @param \Krucas\Settings\Settings         $settings
      */
-    public function __construct(AlertsMessageBag $alert, Settings $settings)
+    public function __construct(AlertsMessageBag $alert)
     {
         $this->alert = $alert;
-        $this->settings = $settings;
     }
 
     /**
@@ -81,10 +73,7 @@ class RequireTwoFactorAuthentication
             return $next($request);
         }
 
-        switch ((int) $this->settings->get('2fa', 0)) {
-            case self::LEVEL_NONE:
-                return $next($request);
-                break;
+        switch ((int) config('pterodactyl.auth.2fa_required')) {
             case self::LEVEL_ADMIN:
                 if (! $request->user()->root_admin || $request->user()->use_totp) {
                     return $next($request);
@@ -95,6 +84,9 @@ class RequireTwoFactorAuthentication
                     return $next($request);
                 }
                 break;
+            case self::LEVEL_NONE:
+            default:
+                return $next($request);
         }
 
         $this->alert->danger(trans('auth.2fa_must_be_enabled'))->flash();
diff --git a/app/Http/Requests/Admin/Settings/AdvancedSettingsFormRequest.php b/app/Http/Requests/Admin/Settings/AdvancedSettingsFormRequest.php
new file mode 100644
index 000000000..a80d8dab9
--- /dev/null
+++ b/app/Http/Requests/Admin/Settings/AdvancedSettingsFormRequest.php
@@ -0,0 +1,42 @@
+<?php
+
+namespace Pterodactyl\Http\Requests\Admin\Settings;
+
+use Pterodactyl\Http\Requests\Admin\AdminFormRequest;
+
+class AdvancedSettingsFormRequest extends AdminFormRequest
+{
+    /**
+     * Return all of the rules to apply to this request's data.
+     *
+     * @return array
+     */
+    public function rules()
+    {
+        return [
+            'recaptcha:enabled' => 'required|in:true,false',
+            'recaptcha:secret_key' => 'required|string|max:255',
+            'recaptcha:website_key' => 'required|string|max:255',
+            'pterodactyl:guzzle:timeout' => 'required|integer|between:1,60',
+            'pterodactyl:guzzle:connect_timeout' => 'required|integer|between:1,60',
+            'pterodactyl:console:count' => 'required|integer|min:1',
+            'pterodactyl:console:frequency' => 'required|integer|min:10',
+        ];
+    }
+
+    /**
+     * @return array
+     */
+    public function attributes()
+    {
+        return [
+            'recaptcha:enabled' => 'reCAPTCHA Enabled',
+            'recaptcha:secret_key' => 'reCAPTCHA Secret Key',
+            'recaptcha:website_key' => 'reCAPTCHA Website Key',
+            'pterodactyl:guzzle:timeout' => 'HTTP Request Timeout',
+            'pterodactyl:guzzle:connect_timeout' => 'HTTP Connection Timeout',
+            'pterodactyl:console:count' => 'Console Message Count',
+            'pterodactyl:console:frequency' => 'Console Frequency Tick',
+        ];
+    }
+}
diff --git a/app/Http/Requests/Admin/Settings/BaseSettingsFormRequest.php b/app/Http/Requests/Admin/Settings/BaseSettingsFormRequest.php
new file mode 100644
index 000000000..0b02561dd
--- /dev/null
+++ b/app/Http/Requests/Admin/Settings/BaseSettingsFormRequest.php
@@ -0,0 +1,36 @@
+<?php
+
+namespace Pterodactyl\Http\Requests\Admin\Settings;
+
+use Illuminate\Validation\Rule;
+use Pterodactyl\Traits\Helpers\AvailableLanguages;
+use Pterodactyl\Http\Requests\Admin\AdminFormRequest;
+
+class BaseSettingsFormRequest extends AdminFormRequest
+{
+    use AvailableLanguages;
+
+    /**
+     * @return array
+     */
+    public function rules()
+    {
+        return [
+            'app:name' => 'required|string|max:255',
+            'pterodactyl:auth:2fa_required' => 'required|integer|in:0,1,2',
+            'app:locale' => ['required', 'string', Rule::in(array_keys($this->getAvailableLanguages()))],
+        ];
+    }
+
+    /**
+     * @return array
+     */
+    public function attributes()
+    {
+        return [
+            'app:name' => 'Company Name',
+            'pterodactyl:auth:2fa_required' => 'Require 2-Factor Authentication',
+            'app:locale' => 'Default Language',
+        ];
+    }
+}
diff --git a/app/Http/Requests/Admin/Settings/MailSettingsFormRequest.php b/app/Http/Requests/Admin/Settings/MailSettingsFormRequest.php
new file mode 100644
index 000000000..269c2f6c7
--- /dev/null
+++ b/app/Http/Requests/Admin/Settings/MailSettingsFormRequest.php
@@ -0,0 +1,44 @@
+<?php
+
+namespace Pterodactyl\Http\Requests\Admin\Settings;
+
+use Pterodactyl\Http\Requests\Admin\AdminFormRequest;
+
+class MailSettingsFormRequest extends AdminFormRequest
+{
+    /**
+     * Return rules to validate mail settings POST data aganist.
+     *
+     * @return array
+     */
+    public function rules()
+    {
+        return [
+            'mail:host' => 'required|string',
+            'mail:port' => 'required|integer|between:1,65535',
+            'mail:encryption' => 'present|string|in:"",tls,ssl',
+            'mail:username' => 'string|max:255',
+            'mail:password' => 'string|max:255',
+            'mail:from:address' => 'required|string|email',
+            'mail:from:name' => 'string|max:255',
+        ];
+    }
+
+    /**
+     * Override the default normalization function for this type of request
+     * as we need to accept empty values on the keys.
+     *
+     * @param array $only
+     * @return array
+     */
+    public function normalize($only = [])
+    {
+        $keys = array_flip(array_keys($this->rules()));
+
+        if (empty($this->input('mail:password'))) {
+            unset($keys['mail:password']);
+        }
+
+        return $this->only(array_flip($keys));
+    }
+}
diff --git a/app/Models/Setting.php b/app/Models/Setting.php
new file mode 100644
index 000000000..90d41f3d4
--- /dev/null
+++ b/app/Models/Setting.php
@@ -0,0 +1,39 @@
+<?php
+
+namespace Pterodactyl\Models;
+
+use Sofa\Eloquence\Eloquence;
+use Sofa\Eloquence\Validable;
+use Illuminate\Database\Eloquent\Model;
+use Sofa\Eloquence\Contracts\CleansAttributes;
+use Sofa\Eloquence\Contracts\Validable as ValidableContract;
+
+class Setting extends Model implements CleansAttributes, ValidableContract
+{
+    use Eloquence, Validable;
+
+    /**
+     * The table associated with the model.
+     *
+     * @var string
+     */
+    protected $table = 'settings';
+
+    /**
+     * @var bool
+     */
+    public $timestamps = false;
+
+    /**
+     * @var array
+     */
+    protected $fillable = ['key', 'value'];
+
+    /**
+     * @var array
+     */
+    protected static $applicationRules = [
+        'key' => 'required|string|between:1,255',
+        'value' => 'string',
+    ];
+}
diff --git a/app/Providers/AppServiceProvider.php b/app/Providers/AppServiceProvider.php
index b9b656dc1..b3a7c33ea 100644
--- a/app/Providers/AppServiceProvider.php
+++ b/app/Providers/AppServiceProvider.php
@@ -13,7 +13,6 @@ use Pterodactyl\Observers\UserObserver;
 use Pterodactyl\Observers\ServerObserver;
 use Pterodactyl\Observers\SubuserObserver;
 use Barryvdh\LaravelIdeHelper\IdeHelperServiceProvider;
-use DaneEveritt\LoginNotifications\NotificationServiceProvider;
 use Barryvdh\Debugbar\ServiceProvider as DebugbarServiceProvider;
 
 class AppServiceProvider extends ServiceProvider
@@ -42,10 +41,6 @@ class AppServiceProvider extends ServiceProvider
             $this->app->register(DebugbarServiceProvider::class);
             $this->app->register(IdeHelperServiceProvider::class);
         }
-
-        if (config('pterodactyl.auth.notifications')) {
-            $this->app->register(NotificationServiceProvider::class);
-        }
     }
 
     /**
diff --git a/app/Providers/RepositoryServiceProvider.php b/app/Providers/RepositoryServiceProvider.php
index bc393a883..e34520962 100644
--- a/app/Providers/RepositoryServiceProvider.php
+++ b/app/Providers/RepositoryServiceProvider.php
@@ -26,6 +26,7 @@ use Pterodactyl\Repositories\Eloquent\SubuserRepository;
 use Pterodactyl\Repositories\Eloquent\DatabaseRepository;
 use Pterodactyl\Repositories\Eloquent\LocationRepository;
 use Pterodactyl\Repositories\Eloquent\ScheduleRepository;
+use Pterodactyl\Repositories\Eloquent\SettingsRepository;
 use Pterodactyl\Repositories\Eloquent\DaemonKeyRepository;
 use Pterodactyl\Repositories\Eloquent\AllocationRepository;
 use Pterodactyl\Repositories\Eloquent\PermissionRepository;
@@ -47,6 +48,7 @@ use Pterodactyl\Contracts\Repository\SubuserRepositoryInterface;
 use Pterodactyl\Contracts\Repository\DatabaseRepositoryInterface;
 use Pterodactyl\Contracts\Repository\LocationRepositoryInterface;
 use Pterodactyl\Contracts\Repository\ScheduleRepositoryInterface;
+use Pterodactyl\Contracts\Repository\SettingsRepositoryInterface;
 use Pterodactyl\Contracts\Repository\DaemonKeyRepositoryInterface;
 use Pterodactyl\Contracts\Repository\AllocationRepositoryInterface;
 use Pterodactyl\Contracts\Repository\PermissionRepositoryInterface;
@@ -86,10 +88,13 @@ class RepositoryServiceProvider extends ServiceProvider
         $this->app->bind(ServerRepositoryInterface::class, ServerRepository::class);
         $this->app->bind(ServerVariableRepositoryInterface::class, ServerVariableRepository::class);
         $this->app->bind(SessionRepositoryInterface::class, SessionRepository::class);
+        $this->app->bind(SettingsRepositoryInterface::class, SettingsRepository::class);
         $this->app->bind(SubuserRepositoryInterface::class, SubuserRepository::class);
         $this->app->bind(TaskRepositoryInterface::class, TaskRepository::class);
         $this->app->bind(UserRepositoryInterface::class, UserRepository::class);
 
+        $this->app->alias(SettingsRepositoryInterface::class, 'settings');
+
         // Daemon Repositories
         if ($this->app->make('config')->get('pterodactyl.daemon.use_new_daemon')) {
             $this->app->bind(ConfigurationRepositoryInterface::class, \Pterodactyl\Repositories\Wings\ConfigurationRepository::class);
diff --git a/app/Providers/SettingsServiceProvider.php b/app/Providers/SettingsServiceProvider.php
new file mode 100644
index 000000000..dc9e9cdc6
--- /dev/null
+++ b/app/Providers/SettingsServiceProvider.php
@@ -0,0 +1,101 @@
+<?php
+
+namespace Pterodactyl\Providers;
+
+use Illuminate\Support\ServiceProvider;
+use Illuminate\Contracts\Encryption\Encrypter;
+use Illuminate\Contracts\Encryption\DecryptException;
+use Illuminate\Contracts\Config\Repository as ConfigRepository;
+use Pterodactyl\Contracts\Repository\SettingsRepositoryInterface;
+
+class SettingsServiceProvider extends ServiceProvider
+{
+    /**
+     * An array of configuration keys to override with database values
+     * if they exist.
+     *
+     * @var array
+     */
+    protected $keys = [
+        'app:name',
+        'app:locale',
+        'recaptcha:enabled',
+        'recaptcha:secret_key',
+        'recaptcha:website_key',
+        'pterodactyl:guzzle:timeout',
+        'pterodactyl:guzzle:connect_timeout',
+        'pterodactyl:console:count',
+        'pterodactyl:console:frequency',
+        'pterodactyl:auth:2fa_required',
+    ];
+
+    /**
+     * Keys specific to the mail driver that are only grabbed from the database
+     * when using the SMTP driver.
+     *
+     * @var array
+     */
+    protected $emailKeys = [
+        'mail:host',
+        'mail:port',
+        'mail:from:address',
+        'mail:from:name',
+        'mail:encryption',
+        'mail:username',
+        'mail:password',
+    ];
+
+    /**
+     * Keys that are encrypted and should be decrypted when set in the
+     * configuration array.
+     *
+     * @var array
+     */
+    protected static $encrypted = [
+        'mail:password',
+    ];
+
+    /**
+     * Boot the service provider.
+     *
+     * @param \Illuminate\Contracts\Config\Repository                       $config
+     * @param \Illuminate\Contracts\Encryption\Encrypter                    $encrypter
+     * @param \Pterodactyl\Contracts\Repository\SettingsRepositoryInterface $settings
+     */
+    public function boot(ConfigRepository $config, Encrypter $encrypter, SettingsRepositoryInterface $settings)
+    {
+        if ($config->get('pterodactyl.load_environment_only', false)) {
+            return;
+        }
+
+        // Only set the email driver settings from the database if we
+        // are configured using SMTP as the driver.
+        if ($config->get('mail.driver') === 'smtp') {
+            $this->keys = array_merge($this->keys, $this->emailKeys);
+        }
+
+        $values = $settings->all()->mapWithKeys(function ($setting) {
+            return [$setting->key => $setting->value];
+        })->toArray();
+
+        foreach ($this->keys as $key) {
+            $value = array_get($values, 'settings::' . $key, $config->get(str_replace(':', '.', $key)));
+            if (in_array($key, self::$encrypted)) {
+                try {
+                    $value = $encrypter->decrypt($value);
+                } catch (DecryptException $exception) {
+                }
+            }
+
+            $config->set(str_replace(':', '.', $key), $value);
+        }
+    }
+
+    /**
+     * @return array
+     */
+    public static function getEncryptedKeys(): array
+    {
+        return self::$encrypted;
+    }
+}
diff --git a/app/Repositories/Eloquent/SettingsRepository.php b/app/Repositories/Eloquent/SettingsRepository.php
new file mode 100644
index 000000000..b6937bf31
--- /dev/null
+++ b/app/Repositories/Eloquent/SettingsRepository.php
@@ -0,0 +1,96 @@
+<?php
+
+namespace Pterodactyl\Repositories\Eloquent;
+
+use Pterodactyl\Models\Setting;
+use Pterodactyl\Contracts\Repository\SettingsRepositoryInterface;
+
+class SettingsRepository extends EloquentRepository implements SettingsRepositoryInterface
+{
+    /**
+     * @var array
+     */
+    private $cache = [];
+
+    /**
+     * @var array
+     */
+    private $databaseMiss = [];
+
+    /**
+     * Return an instance of the model that acts as the base for
+     * this repository.
+     *
+     * @return string
+     */
+    public function model()
+    {
+        return Setting::class;
+    }
+
+    /**
+     * Store a new persistent setting in the database.
+     *
+     * @param string $key
+     * @param string $value
+     */
+    public function set(string $key, string $value)
+    {
+        // Clear item from the cache.
+        $this->clearCache($key);
+        $this->withoutFresh()->updateOrCreate(['key' => $key], ['value' => $value]);
+    }
+
+    /**
+     * Retrieve a persistent setting from the database.
+     *
+     * @param string $key
+     * @param mixed  $default
+     * @return mixed
+     */
+    public function get(string $key, $default = null)
+    {
+        // If item has already been requested return it from the cache. If
+        // we already know it is missing, immediately return the default
+        // value.
+        if (array_key_exists($key, $this->cache)) {
+            return $this->cache[$key];
+        } elseif (array_key_exists($key, $this->databaseMiss)) {
+            return $default;
+        }
+
+        $instance = $this->getBuilder()->where('key', $key)->first();
+
+        if (is_null($instance)) {
+            $this->databaseMiss[$key] = true;
+
+            return $default;
+        }
+
+        $this->cache[$key] = $instance->value;
+
+        return $this->cache[$key];
+    }
+
+    /**
+     * Remove a key from the database cache.
+     *
+     * @param string $key
+     * @return mixed
+     */
+    public function forget(string $key)
+    {
+        $this->clearCache($key);
+        $this->deleteWhere(['key' => $key]);
+    }
+
+    /**
+     * Remove a key from the cache.
+     *
+     * @param string $key
+     */
+    protected function clearCache(string $key)
+    {
+        unset($this->cache[$key], $this->databaseMiss[$key]);
+    }
+}
diff --git a/app/Traits/Helpers/AvailableLanguages.php b/app/Traits/Helpers/AvailableLanguages.php
new file mode 100644
index 000000000..f44771f6d
--- /dev/null
+++ b/app/Traits/Helpers/AvailableLanguages.php
@@ -0,0 +1,56 @@
+<?php
+
+namespace Pterodactyl\Traits\Helpers;
+
+use Matriphe\ISO639\ISO639;
+use Illuminate\Filesystem\Filesystem;
+
+trait AvailableLanguages
+{
+    /**
+     * @var \Illuminate\Filesystem\Filesystem
+     */
+    private $filesystem;
+
+    /**
+     * @var \Matriphe\ISO639\ISO639
+     */
+    private $iso639;
+
+    /**
+     * Return all of the available languages on the Panel based on those
+     * that are present in the language folder.
+     *
+     * @param bool $localize
+     * @return array
+     */
+    public function getAvailableLanguages($localize = false): array
+    {
+        return collect($this->getFilesystemInstance()->directories(resource_path('lang')))->mapWithKeys(function ($path) use ($localize) {
+            $code = basename($path);
+            $value = $localize ? $this->getIsoInstance()->nativeByCode1($code) : $this->getIsoInstance()->languageByCode1($code);
+
+            return [$code => title_case($value)];
+        })->toArray();
+    }
+
+    /**
+     * Return an instance of the filesystem for getting a folder listing.
+     *
+     * @return \Illuminate\Filesystem\Filesystem
+     */
+    private function getFilesystemInstance(): Filesystem
+    {
+        return $this->filesystem = $this->filesystem ?: app()->make(Filesystem::class);
+    }
+
+    /**
+     * Return an instance of the ISO639 class for generating names.
+     *
+     * @return \Matriphe\ISO639\ISO639
+     */
+    private function getIsoInstance(): ISO639
+    {
+        return $this->iso639 = $this->iso639 ?: app()->make(ISO639::class);
+    }
+}
diff --git a/composer.json b/composer.json
index fabe01f0f..6b1271f84 100644
--- a/composer.json
+++ b/composer.json
@@ -28,6 +28,7 @@
         "laravel/framework": "5.4.27",
         "laravel/tinker": "1.0.1",
         "lord/laroute": "~2.4.5",
+        "matriphe/iso-639": "^1.2",
         "mtdowling/cron-expression": "^1.2",
         "nesbot/carbon": "^1.22",
         "nicolaslopezj/searchable": "^1.9",
diff --git a/composer.lock b/composer.lock
index 9895b8330..139e3c1c3 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
         "This file is @generated automatically"
     ],
-    "content-hash": "a393763d136e25a93fd5b636229496cf",
+    "content-hash": "bd42f43877e96cca4d4af755c590eb25",
     "packages": [
         {
             "name": "appstract/laravel-blade-directives",
@@ -687,57 +687,6 @@
             ],
             "time": "2014-09-09T13:34:57+00:00"
         },
-        {
-            "name": "edvinaskrucas/settings",
-            "version": "2.0.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/edvinaskrucas/settings.git",
-                "reference": "23f2a912ca8f5b6ba550721a6fc0e6d1acaa9022"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/edvinaskrucas/settings/zipball/23f2a912ca8f5b6ba550721a6fc0e6d1acaa9022",
-                "reference": "23f2a912ca8f5b6ba550721a6fc0e6d1acaa9022",
-                "shasum": ""
-            },
-            "require": {
-                "illuminate/console": "^5.2",
-                "illuminate/database": "^5.2",
-                "illuminate/filesystem": "^5.2",
-                "illuminate/support": "^5.2",
-                "php": "^5.5|^7.0"
-            },
-            "require-dev": {
-                "mockery/mockery": "0.9.*"
-            },
-            "type": "library",
-            "autoload": {
-                "psr-0": {
-                    "Krucas\\Settings\\": "src/"
-                },
-                "files": [
-                    "src/helpers.php"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Edvinas Kručas",
-                    "email": "edv.krucas@gmail.com"
-                }
-            ],
-            "description": "Persistent settings package for Laravel framework.",
-            "keywords": [
-                "Settings",
-                "laravel",
-                "persistent settings"
-            ],
-            "time": "2016-01-19T13:50:39+00:00"
-        },
         {
             "name": "erusev/parsedown",
             "version": "1.6.3",
@@ -1674,6 +1623,50 @@
             ],
             "time": "2017-09-04T02:25:29+00:00"
         },
+        {
+            "name": "matriphe/iso-639",
+            "version": "1.2",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/matriphe/php-iso-639.git",
+                "reference": "0245d844daeefdd22a54b47103ffdb0e03c323e1"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/matriphe/php-iso-639/zipball/0245d844daeefdd22a54b47103ffdb0e03c323e1",
+                "reference": "0245d844daeefdd22a54b47103ffdb0e03c323e1",
+                "shasum": ""
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^4.7"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "Matriphe\\ISO639\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Muhammad Zamroni",
+                    "email": "halo@matriphe.com"
+                }
+            ],
+            "description": "PHP library to convert ISO-639-1 code to language name.",
+            "keywords": [
+                "639",
+                "iso",
+                "iso-639",
+                "lang",
+                "language",
+                "laravel"
+            ],
+            "time": "2017-07-19T15:11:19+00:00"
+        },
         {
             "name": "monolog/monolog",
             "version": "1.23.0",
diff --git a/config/app.php b/config/app.php
index 2f9da6704..d56b80634 100644
--- a/config/app.php
+++ b/config/app.php
@@ -1,5 +1,6 @@
 <?php
 
+
 return [
     'env' => env('APP_ENV', 'production'),
 
@@ -14,7 +15,7 @@ return [
     | framework needs to place the application's name in a notification or
     | any other location as required by the application or its packages.
     */
-    'name' => 'Pterodactyl',
+    'name' => env('APP_NAME', 'Pterodactyl'),
 
     /*
     |--------------------------------------------------------------------------
@@ -158,6 +159,7 @@ return [
         /*
          * Application Service Providers...
          */
+        Pterodactyl\Providers\SettingsServiceProvider::class,
         Pterodactyl\Providers\AppServiceProvider::class,
         Pterodactyl\Providers\AuthServiceProvider::class,
         Pterodactyl\Providers\EventServiceProvider::class,
@@ -173,7 +175,6 @@ return [
          */
         igaster\laravelTheme\themeServiceProvider::class,
         Prologue\Alerts\AlertsServiceProvider::class,
-        Krucas\Settings\Providers\SettingsServiceProvider::class,
         Fideloper\Proxy\TrustedProxyServiceProvider::class,
         Laracasts\Utilities\JavaScript\JavaScriptServiceProvider::class,
         Lord\Laroute\LarouteServiceProvider::class,
@@ -228,7 +229,6 @@ return [
         'Response' => Illuminate\Support\Facades\Response::class,
         'Route' => Illuminate\Support\Facades\Route::class,
         'Schema' => Illuminate\Support\Facades\Schema::class,
-        'Settings' => Krucas\Settings\Facades\Settings::class,
         'Session' => Illuminate\Support\Facades\Session::class,
         'Storage' => Illuminate\Support\Facades\Storage::class,
         'Theme' => igaster\laravelTheme\Facades\Theme::class,
diff --git a/config/pterodactyl.php b/config/pterodactyl.php
index ad371bce9..523080ae3 100644
--- a/config/pterodactyl.php
+++ b/config/pterodactyl.php
@@ -1,6 +1,18 @@
 <?php
 
+
 return [
+    /*
+    |--------------------------------------------------------------------------
+    | Restricted Environment
+    |--------------------------------------------------------------------------
+    |
+    | Set this environment variable to true to enable a restricted configuration
+    | setup on the panel. When set to true, configurations stored in the
+    | database will not be applied.
+    */
+    'load_environment_only' => (bool) env('APP_ENVIRONMENT_ONLY', false),
+
     /*
     |--------------------------------------------------------------------------
     | Service Author
@@ -22,7 +34,7 @@ return [
     | Should login success and failure events trigger an email to the user?
     */
     'auth' => [
-        'notifications' => env('LOGIN_NOTIFICATIONS', false),
+        '2fa_required' => env('APP_2FA_REQUIRED', 0),
         '2fa' => [
             'bytes' => 32,
             'window' => env('APP_2FA_WINDOW', 4),
diff --git a/config/recaptcha.php b/config/recaptcha.php
index 1bac5a877..22d739481 100644
--- a/config/recaptcha.php
+++ b/config/recaptcha.php
@@ -14,12 +14,14 @@ return [
     /*
      * Use a custom secret key, we use our public one by default
      */
-    'secret_key' => env('RECAPTCHA_SECRET_KEY', '6LekAxoUAAAAAPW-PxNWaCLH76WkClMLSa2jImwD'),
+    'secret_key' => env('RECAPTCHA_SECRET_KEY', '6LcJcjwUAAAAALOcDJqAEYKTDhwELCkzUkNDQ0J5'),
+    '_shipped_secret_key' => '6LcJcjwUAAAAALOcDJqAEYKTDhwELCkzUkNDQ0J5',
 
     /*
      * Use a custom website key, we use our public one by default
      */
-    'website_key' => env('RECAPTCHA_WEBSITE_KEY', '6LekAxoUAAAAADjWZJ4ufcDRZBBiH9vfHawqRbup'),
+    'website_key' => env('RECAPTCHA_WEBSITE_KEY', '6LcJcjwUAAAAAO_Xqjrtj9wWufUpYRnK6BW8lnfn'),
+    '_shipped_website_key' => '6LcJcjwUAAAAAO_Xqjrtj9wWufUpYRnK6BW8lnfn',
 
     /*
      * Domain verification is enabled by default and compares the domain used when solving the captcha
diff --git a/config/settings.php b/config/settings.php
deleted file mode 100644
index c6a75fb01..000000000
--- a/config/settings.php
+++ /dev/null
@@ -1,113 +0,0 @@
-<?php
-
-return [
-    /*
-    |--------------------------------------------------------------------------
-    | Default Settings Driver
-    |--------------------------------------------------------------------------
-    |
-    | Settings driver used to store persistent settings.
-    |
-    | Supported: "database"
-    |
-    */
-
-    'default' => env('SETTINGS_DRIVER', 'database'),
-
-    /*
-    |--------------------------------------------------------------------------
-    | Enable / Disable caching
-    |--------------------------------------------------------------------------
-    |
-    | If it is enabled all values gets cached after accessing it.
-    |
-    */
-    'cache' => true,
-
-    /*
-    |--------------------------------------------------------------------------
-    | Enable / Disable value encryption
-    |--------------------------------------------------------------------------
-    |
-    | If it is enabled all values gets encrypted and decrypted.
-    |
-    */
-    'encryption' => env('SETTINGS_ENCRYPTION', false),
-
-    /*
-    |--------------------------------------------------------------------------
-    | Enable / Disable events
-    |--------------------------------------------------------------------------
-    |
-    | If it is enabled various settings related events will be fired.
-    |
-    */
-    'events' => true,
-
-    /*
-    |--------------------------------------------------------------------------
-    | Repositories Configuration
-    |--------------------------------------------------------------------------
-    |
-    | Here you may configure the driver information for each repository that
-    | is used by your application. A default configuration has been added
-    | for each back-end shipped with this package. You are free to add more.
-    |
-    */
-
-    'repositories' => [
-        'database' => [
-            'driver' => 'database',
-            'connection' => env('DB_CONNECTION', 'mysql'),
-            'table' => 'settings',
-        ],
-    ],
-
-    /*
-    |--------------------------------------------------------------------------
-    | Key generator class
-    |--------------------------------------------------------------------------
-    |
-    | Key generator is used to generate keys based on setting key and context.
-    |
-    */
-    'key_generator' => \Krucas\Settings\KeyGenerators\KeyGenerator::class,
-
-    /*
-    |--------------------------------------------------------------------------
-    | Context serializer class
-    |--------------------------------------------------------------------------
-    |
-    | Context serializer serializes context.
-    | It is used with "Krucas\Settings\KeyGenerators\KeyGenerator" class.
-    |
-    */
-    'context_serializer' => \Krucas\Settings\ContextSerializers\ContextSerializer::class,
-
-    /*
-    |--------------------------------------------------------------------------
-    | Value serializer class
-    |--------------------------------------------------------------------------
-    |
-    | Value serializer serializes / unserializes given value.
-    |
-    */
-    'value_serializer' => \Krucas\Settings\ValueSerializers\ValueSerializer::class,
-
-    /*
-    |--------------------------------------------------------------------------
-    | Override application config values
-    |--------------------------------------------------------------------------
-    |
-    | If defined, settings package will override these config values from persistent
-    | settings repository.
-    |
-    | Sample:
-    |   "app.fallback_locale",
-    |   "app.locale" => "settings.locale",
-    |
-    */
-
-    'override' => [
-    ],
-];
diff --git a/database/migrations/2017_12_12_220426_MigrateSettingsTableToNewFormat.php b/database/migrations/2017_12_12_220426_MigrateSettingsTableToNewFormat.php
new file mode 100644
index 000000000..1bdaf6477
--- /dev/null
+++ b/database/migrations/2017_12_12_220426_MigrateSettingsTableToNewFormat.php
@@ -0,0 +1,30 @@
+<?php
+
+use Illuminate\Support\Facades\DB;
+use Illuminate\Support\Facades\Schema;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
+
+class MigrateSettingsTableToNewFormat extends Migration
+{
+    /**
+     * Run the migrations.
+     */
+    public function up()
+    {
+        DB::table('settings')->truncate();
+        Schema::table('settings', function (Blueprint $table) {
+            $table->increments('id')->first();
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     */
+    public function down()
+    {
+        Schema::table('settings', function (Blueprint $table) {
+            $table->dropColumn('id');
+        });
+    }
+}
diff --git a/phpunit.xml b/phpunit.xml
index ceb832d08..89b3c0b22 100644
--- a/phpunit.xml
+++ b/phpunit.xml
@@ -32,5 +32,6 @@
         <env name="SESSION_DRIVER" value="array"/>
         <env name="QUEUE_DRIVER" value="sync"/>
         <env name="MAIL_DRIVER" value="array"/>
+        <env name="APP_ENVIRONMENT_ONLY" value="true"/>
     </php>
 </phpunit>
diff --git a/public/themes/pterodactyl/js/frontend/server.socket.js b/public/themes/pterodactyl/js/frontend/server.socket.js
index ef6986168..f43409fd4 100644
--- a/public/themes/pterodactyl/js/frontend/server.socket.js
+++ b/public/themes/pterodactyl/js/frontend/server.socket.js
@@ -66,6 +66,7 @@ var Server = (function ()  {
                     delay: 0,
                 });
             }
+            setStatusIcon(999);
         });
 
         Socket.io.on('connect_error', function (err) {
@@ -77,6 +78,7 @@ var Server = (function ()  {
                     delay: 0,
                 });
             }
+            setStatusIcon(999);
         });
 
         // Connected to Socket Successfully
@@ -111,6 +113,7 @@ var Server = (function ()  {
                 $('#server_status_icon').html('<i class="fa fa-circle text-warning"></i> Stopping');
                 break;
             default:
+                $('#server_status_icon').html('<i class="fa fa-question-circle text-danger"></i> Connection Error');
                 break;
         }
     }
diff --git a/resources/themes/pterodactyl/admin/settings.blade.php b/resources/themes/pterodactyl/admin/settings.blade.php
deleted file mode 100644
index 3e0407e67..000000000
--- a/resources/themes/pterodactyl/admin/settings.blade.php
+++ /dev/null
@@ -1,69 +0,0 @@
-{{-- Pterodactyl - Panel --}}
-{{-- Copyright (c) 2015 - 2017 Dane Everitt <dane@daneeveritt.com> --}}
-
-{{-- This software is licensed under the terms of the MIT license. --}}
-{{-- https://opensource.org/licenses/MIT --}}
-@extends('layouts.admin')
-
-@section('title')
-    Settings
-@endsection
-
-@section('content-header')
-    <h1>Panel Settings<small>Configure Pterodactyl to your liking.</small></h1>
-    <ol class="breadcrumb">
-        <li><a href="{{ route('admin.index') }}">Admin</a></li>
-        <li class="active">Settings</li>
-    </ol>
-@endsection
-
-@section('content')
-<div class="row">
-    <div class="col-xs-12">
-        <div class="box">
-            <div class="box-header with-border">
-                <h3 class="box-title">Panel Settings</h3>
-            </div>
-            <form action="{{ route('admin.settings') }}" method="POST">
-                <div class="box-body">
-                    <div class="row">
-                        <div class="form-group col-md-6">
-                            <label class="control-label">Company Name:</label>
-                            <div>
-                                <input type="text" class="form-control" name="company" value="{{ old('company', Settings::get('company')) }}" />
-                                <p class="text-muted"><small>This is the name that is used throughout the panel and in emails sent to clients.</small></p>
-                            </div>
-                        </div>
-                        <div class="form-group col-md-6">
-                            <label class="control-label">2FA Required</label>
-                            <div>
-                                <div class="btn-group" data-toggle="buttons">
-                                    <label class="btn btn-primary @if (old('2fa', Settings::get('2fa', 0)) == 0) active @endif">
-                                        <input type="radio" name="2fa" autocomplete="off" value="0" @if (old('2fa', Settings::get('2fa', 0)) == 0) checked @endif> Nobody
-                                    </label>
-                                    <label class="btn btn-primary @if (old('2fa', Settings::get('2fa', 0)) == 1) active @endif">
-                                        <input type="radio" name="2fa" autocomplete="off" value="1" @if (old('2fa', Settings::get('2fa', 0)) == 1) checked @endif> Admins
-                                    </label>
-                                    <label class="btn btn-primary @if (old('2fa', Settings::get('2fa', 0)) == 2) active @endif">
-                                        <input type="radio" name="2fa" autocomplete="off" value="2" @if (old('2fa', Settings::get('2fa', 0)) == 2) checked @endif> Everybody
-                                    </label>
-                                </div>
-                                <p class="text-muted"><small>For improved security you can require all administrators to have 2-Factor authentication enabled, or even require it for all users on the Panel.</small></p>
-                            </div>
-                        </div>
-                    </div>
-                    <div class="row">
-                        <div class="col-md-12">
-                            <div class="alert alert-info">In order to modify your SMTP settings for sending mail you will need to run <code>php artisan p:environment:mail</code> in this project's root folder.</div>
-                        </div>
-                    </div>
-                </div>
-                <div class="box-footer">
-                    {!! csrf_field() !!}
-                    <input type="submit" class="btn btn-sm btn-primary" value="Modify Settings">
-                </div>
-            </form>
-        </div>
-    </div>
-</div>
-@endsection
diff --git a/resources/themes/pterodactyl/admin/settings/advanced.blade.php b/resources/themes/pterodactyl/admin/settings/advanced.blade.php
new file mode 100644
index 000000000..5a7b4d724
--- /dev/null
+++ b/resources/themes/pterodactyl/admin/settings/advanced.blade.php
@@ -0,0 +1,117 @@
+@extends('layouts.admin')
+@include('partials/admin.settings.nav', ['activeTab' => 'advanced'])
+
+@section('title')
+    Advanced Settings
+@endsection
+
+@section('content-header')
+    <h1>Advanced Settings<small>Configure advanced settings for Pterodactyl.</small></h1>
+    <ol class="breadcrumb">
+        <li><a href="{{ route('admin.index') }}">Admin</a></li>
+        <li class="active">Settings</li>
+    </ol>
+@endsection
+
+@section('content')
+    @yield('settings::nav')
+    <div class="row">
+        <div class="col-xs-12">
+            <form action="" method="POST">
+                <div class="box">
+                    <div class="box-header with-border">
+                        <h3 class="box-title">reCAPTCHA</h3>
+                    </div>
+                    <div class="box-body">
+                        <div class="row">
+                            <div class="form-group col-md-4">
+                                <label class="control-label">Status</label>
+                                <div>
+                                    <select class="form-control" name="recaptcha:enabled">
+                                        <option value="true">Enabled</option>
+                                        <option value="false" @if(old('recaptcha:enabled', config('recaptcha.enabled')) == '0') selected @endif>Disabled</option>
+                                    </select>
+                                    <p class="text-muted small">If enabled, login forms and password reset forms will do a silent captcha check and display a visible captcha if needed.</p>
+                                </div>
+                            </div>
+                            <div class="form-group col-md-4">
+                                <label class="control-label">Secret Key</label>
+                                <div>
+                                    <input type="text" required class="form-control" name="recaptcha:secret_key" value="{{ old('recaptcha:secret_key', config('recaptcha.secret_key')) }}">
+                                    <p class="text-muted small">Used for communication between your site and Google. Be sure to keep it a secret.</p>
+                                </div>
+                            </div>
+                            <div class="form-group col-md-4">
+                                <label class="control-label">Website Key</label>
+                                <div>
+                                    <input type="text" required class="form-control" name="recaptcha:website_key" value="{{ old('recaptcha:website_key', config('recaptcha.website_key')) }}">
+                                </div>
+                            </div>
+                        </div>
+                        @if($showRecaptchaWarning)
+                            <div class="row">
+                                <div class="col-xs-12">
+                                    <div class="alert alert-warning no-margin">
+                                        You are currently using reCAPTCHA keys that were shipped with this Panel. For improved security it is recommended to <a href="https://www.google.com/recaptcha/admin">generate new invisible reCAPTCHA keys</a> that tied specifically to your website.
+                                    </div>
+                                </div>
+                            </div>
+                        @endif
+                    </div>
+                </div>
+                <div class="box">
+                    <div class="box-header with-border">
+                        <h3 class="box-title">HTTP Connections</h3>
+                    </div>
+                    <div class="box-body">
+                        <div class="row">
+                            <div class="form-group col-md-6">
+                                <label class="control-label">Connection Timeout</label>
+                                <div>
+                                    <input type="number" required class="form-control" name="pterodactyl:guzzle:connect_timeout" value="{{ old('pterodactyl:guzzle:connect_timeout', config('pterodactyl.guzzle.connect_timeout')) }}">
+                                    <p class="text-muted small">The amount of time in seconds to wait for a connection to be opened before throwing an error.</p>
+                                </div>
+                            </div>
+                            <div class="form-group col-md-6">
+                                <label class="control-label">Request Timeout</label>
+                                <div>
+                                    <input type="number" required class="form-control" name="pterodactyl:guzzle:timeout" value="{{ old('pterodactyl:guzzle:timeout', config('pterodactyl.guzzle.timeout')) }}">
+                                    <p class="text-muted small">The amount of time in seconds to wait for a request to be completed before throwing an error.</p>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+                <div class="box">
+                    <div class="box-header with-border">
+                        <h3 class="box-title">Console</h3>
+                    </div>
+                    <div class="box-body">
+                        <div class="row">
+                            <div class="form-group col-md-6">
+                                <label class="control-label">Message Count</label>
+                                <div>
+                                    <input type="number" required class="form-control" name="pterodactyl:console:count" value="{{ old('pterodactyl:console:count', config('pterodactyl.console.count')) }}">
+                                    <p class="text-muted small">The number of messages to be pushed to the console per frequency tick.</p>
+                                </div>
+                            </div>
+                            <div class="form-group col-md-6">
+                                <label class="control-label">Frequency Tick</label>
+                                <div>
+                                    <input type="number" required class="form-control" name="pterodactyl:console:frequency" value="{{ old('pterodactyl:console:frequency', config('pterodactyl.console.frequency')) }}">
+                                    <p class="text-muted small">The amount of time in milliseconds between each console message sending tick.</p>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+                <div class="box box-primary">
+                    <div class="box-footer">
+                        {{ csrf_field() }}
+                        <button type="submit" name="_method" value="PATCH" class="btn btn-sm btn-primary pull-right">Save</button>
+                    </div>
+                </div>
+            </form>
+        </div>
+    </div>
+@endsection
diff --git a/resources/themes/pterodactyl/admin/settings/index.blade.php b/resources/themes/pterodactyl/admin/settings/index.blade.php
new file mode 100644
index 000000000..62ef09631
--- /dev/null
+++ b/resources/themes/pterodactyl/admin/settings/index.blade.php
@@ -0,0 +1,75 @@
+@extends('layouts.admin')
+@include('partials/admin.settings.nav', ['activeTab' => 'basic'])
+
+@section('title')
+    Settings
+@endsection
+
+@section('content-header')
+    <h1>Panel Settings<small>Configure Pterodactyl to your liking.</small></h1>
+    <ol class="breadcrumb">
+        <li><a href="{{ route('admin.index') }}">Admin</a></li>
+        <li class="active">Settings</li>
+    </ol>
+@endsection
+
+@section('content')
+    @yield('settings::nav')
+    <div class="row">
+        <div class="col-xs-12">
+            <div class="box">
+                <div class="box-header with-border">
+                    <h3 class="box-title">Panel Settings</h3>
+                </div>
+                <form action="{{ route('admin.settings') }}" method="POST">
+                    <div class="box-body">
+                        <div class="row">
+                            <div class="form-group col-md-4">
+                                <label class="control-label">Company Name</label>
+                                <div>
+                                    <input type="text" class="form-control" name="app:name" value="{{ old('app:name', config('app.name')) }}" />
+                                    <p class="text-muted"><small>This is the name that is used throughout the panel and in emails sent to clients.</small></p>
+                                </div>
+                            </div>
+                            <div class="form-group col-md-4">
+                                <label class="control-label">Require 2-Factor Authentication</label>
+                                <div>
+                                    <div class="btn-group" data-toggle="buttons">
+                                        @php
+                                            $level = old('pterodactyl:auth:2fa_required', config('pterodactyl.auth.2fa_required'));
+                                        @endphp
+                                        <label class="btn btn-primary @if ($level == 0) active @endif">
+                                            <input type="radio" name="pterodactyl:auth:2fa_required" autocomplete="off" value="0" @if ($level == 0) checked @endif> Not Required
+                                        </label>
+                                        <label class="btn btn-primary @if ($level == 1) active @endif">
+                                            <input type="radio" name="pterodactyl:auth:2fa_required" autocomplete="off" value="1" @if ($level == 1) checked @endif> Admin Only
+                                        </label>
+                                        <label class="btn btn-primary @if ($level == 2) active @endif">
+                                            <input type="radio" name="pterodactyl:auth:2fa_required" autocomplete="off" value="2" @if ($level == 2) checked @endif> All Users
+                                        </label>
+                                    </div>
+                                    <p class="text-muted"><small>If enabled, any account falling into the selected grouping will be required to have 2-Factor authentication enabled to use the Panel.</small></p>
+                                </div>
+                            </div>
+                            <div class="form-group col-md-4">
+                                <label class="control-label">Default Langauge</label>
+                                <div>
+                                    <select name="app:locale" class="form-control">
+                                        @foreach($languages as $key => $value)
+                                            <option value="{{ $key }}" @if(config('app.locale') === $key) selected @endif>{{ $value }}</option>
+                                        @endforeach
+                                    </select>
+                                    <p class="text-muted"><small>The default language to use when rendering UI components.</small></p>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                    <div class="box-footer">
+                        {!! csrf_field() !!}
+                        <button type="submit" name="_method" value="PATCH" class="btn btn-sm btn-primary pull-right">Save</button>
+                    </div>
+                </form>
+            </div>
+        </div>
+    </div>
+@endsection
diff --git a/resources/themes/pterodactyl/admin/settings/mail.blade.php b/resources/themes/pterodactyl/admin/settings/mail.blade.php
new file mode 100644
index 000000000..40403993f
--- /dev/null
+++ b/resources/themes/pterodactyl/admin/settings/mail.blade.php
@@ -0,0 +1,108 @@
+@extends('layouts.admin')
+@include('partials/admin.settings.nav', ['activeTab' => 'mail'])
+
+@section('title')
+    Mail Settings
+@endsection
+
+@section('content-header')
+    <h1>Mail Settings<small>Configure how Pterodactyl should handle sending emails.</small></h1>
+    <ol class="breadcrumb">
+        <li><a href="{{ route('admin.index') }}">Admin</a></li>
+        <li class="active">Settings</li>
+    </ol>
+@endsection
+
+@section('content')
+    @yield('settings::nav')
+    <div class="row">
+        <div class="col-xs-12">
+            <div class="box">
+                <div class="box-header with-border">
+                    <h3 class="box-title">Email Settings</h3>
+                </div>
+                @if($disabled)
+                    <div class="box-body">
+                        <div class="row">
+                            <div class="col-xs-12">
+                                <div class="alert alert-info no-margin-bottom">
+                                    This interface is limited to instances using SMTP as the mail driver. Please either use <code>php artisan p:environment:mail</code> command to update your email settings, or set <code>MAIL_DRIVER=smtp</code> in your environment file.
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                @else
+                    <form action="{{ route('admin.settings.mail') }}" method="POST">
+                        <div class="box-body">
+                            <div class="row">
+                                <div class="form-group col-md-6">
+                                    <label class="control-label">SMTP Host</label>
+                                    <div>
+                                        <input required type="text" class="form-control" name="mail:host" value="{{ old('mail:host', config('mail.host')) }}" />
+                                        <p class="text-muted small">Enter the SMTP server address that mail should be sent through.</p>
+                                    </div>
+                                </div>
+                                <div class="form-group col-md-2">
+                                    <label class="control-label">SMTP Port</label>
+                                    <div>
+                                        <input required type="number" class="form-control" name="mail:port" value="{{ old('mail:port', config('mail.port')) }}" />
+                                        <p class="text-muted small">Enter the SMTP server port that mail should be sent through.</p>
+                                    </div>
+                                </div>
+                                <div class="form-group col-md-4">
+                                    <label class="control-label">Encryption</label>
+                                    <div>
+                                        @php
+                                            $encryption = old('mail:encryption', config('mail.encryption'));
+                                        @endphp
+                                        <select name="mail:encryption" class="form-control">
+                                            <option value="" @if($encryption === '') selected @endif>None</option>
+                                            <option value="tls" @if($encryption === 'tls') selected @endif>Transport Layer Security (TLS)</option>
+                                            <option value="ssl" @if($encryption === 'ssl') selected @endif>Secure Sockets Layer (SSL)</option>
+                                        </select>
+                                        <p class="text-muted small">Select the type of encryption to use when sending mail.</p>
+                                    </div>
+                                </div>
+                                <div class="form-group col-md-6">
+                                    <label class="control-label">Username <span class="field-optional"></span></label>
+                                    <div>
+                                        <input type="text" class="form-control" name="mail:username" value="{{ old('mail:username', config('mail.username')) }}" />
+                                        <p class="text-muted small">The username to use when connecting to the SMTP server.</p>
+                                    </div>
+                                </div>
+                                <div class="form-group col-md-6">
+                                    <label class="control-label">Password <span class="field-optional"></span></label>
+                                    <div>
+                                        <input type="password" class="form-control" name="mail:password"/>
+                                        <p class="text-muted small">The password to use in conjunction with the SMTP username. Leave blank to continue using the existing password. To set the password to an empty value enter <code>!e</code> into the field.</p>
+                                    </div>
+                                </div>
+                            </div>
+                            <div class="row">
+                                <hr />
+                                <div class="form-group col-md-6">
+                                    <label class="control-label">Mail From</label>
+                                    <div>
+                                        <input required type="email" class="form-control" name="mail:from:address" value="{{ old('mail:from:address', config('mail.from.address')) }}" />
+                                        <p class="text-muted small">Enter an email address that all outgoing emails will originate from.</p>
+                                    </div>
+                                </div>
+                                <div class="form-group col-md-6">
+                                    <label class="control-label">Mail From Name <span class="field-optional"></span></label>
+                                    <div>
+                                        <input type="text" class="form-control" name="mail:from:name" value="{{ old('mail:from:name', config('mail.from.name')) }}" />
+                                        <p class="text-muted small">The name that emails should appear to come from.</p>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                        <div class="box-footer">
+                            {{ csrf_field() }}
+                            <button type="submit" name="_method" value="PATCH" class="btn btn-sm btn-primary pull-right">Save</button>
+                        </div>
+                    </form>
+                @endif
+            </div>
+        </div>
+    </div>
+@endsection
diff --git a/resources/themes/pterodactyl/layouts/admin.blade.php b/resources/themes/pterodactyl/layouts/admin.blade.php
index 0c2108ffa..262e59cd5 100644
--- a/resources/themes/pterodactyl/layouts/admin.blade.php
+++ b/resources/themes/pterodactyl/layouts/admin.blade.php
@@ -8,7 +8,7 @@
     <head>
         <meta charset="utf-8">
         <meta http-equiv="X-UA-Compatible" content="IE=edge">
-        <title>{{ Settings::get('company', 'Pterodactyl') }} - @yield('title')</title>
+        <title>{{ config('app.name', 'Pterodactyl') }} - @yield('title')</title>
         <meta content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no" name="viewport">
         <meta name="_token" content="{{ csrf_token() }}">
 
@@ -44,7 +44,7 @@
         <div class="wrapper">
             <header class="main-header">
                 <a href="{{ route('index') }}" class="logo">
-                    <span>{{ Settings::get('company', 'Pterodactyl') }}</span>
+                    <span>{{ config('app.name', 'Pterodactyl') }}</span>
                 </a>
                 <nav class="navbar navbar-static-top">
                     <a href="#" class="sidebar-toggle" data-toggle="push-menu" role="button">
diff --git a/resources/themes/pterodactyl/layouts/auth.blade.php b/resources/themes/pterodactyl/layouts/auth.blade.php
index fbe96b40a..1ecafbbdb 100644
--- a/resources/themes/pterodactyl/layouts/auth.blade.php
+++ b/resources/themes/pterodactyl/layouts/auth.blade.php
@@ -8,7 +8,7 @@
     <head>
         <meta charset="utf-8">
         <meta http-equiv="X-UA-Compatible" content="IE=edge">
-        <title>{{ Settings::get('company', 'Pterodactyl') }} - @yield('title')</title>
+        <title>{{ config('app.name', 'Pterodactyl') }} - @yield('title')</title>
         <meta content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no" name="viewport">
 
         <link rel="apple-touch-icon" sizes="180x180" href="/favicons/apple-touch-icon.png">
@@ -37,7 +37,7 @@
         <div class="container">
             <div id="login-position-elements">
                 <div class="login-logo">
-                    {{ Settings::get('company', 'Pterodactyl') }}
+                    {{ config('app.name', 'Pterodactyl') }}
                 </div>
                 @yield('content')
                 <p class="small login-copyright text-center">
diff --git a/resources/themes/pterodactyl/layouts/error.blade.php b/resources/themes/pterodactyl/layouts/error.blade.php
index 1c7b13ba3..e190a3692 100644
--- a/resources/themes/pterodactyl/layouts/error.blade.php
+++ b/resources/themes/pterodactyl/layouts/error.blade.php
@@ -8,7 +8,7 @@
     <head>
         <meta charset="utf-8">
         <meta http-equiv="X-UA-Compatible" content="IE=edge">
-        <title>{{ Settings::get('company', 'Pterodactyl') }} - @yield('title')</title>
+        <title>{{ config('app.name', 'Pterodactyl') }} - @yield('title')</title>
         <meta content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no" name="viewport">
         <meta name="_token" content="{{ csrf_token() }}">
 
@@ -40,7 +40,7 @@
         <div class="wrapper">
             <header class="main-header">
                 <a href="{{ route('index') }}" class="logo">
-                    <span>{{ Settings::get('company', 'Pterodactyl') }}</span>
+                    <span>{{ config('app.name', 'Pterodactyl') }}</span>
                 </a>
                 <nav class="navbar navbar-static-top"></nav>
             </header>
diff --git a/resources/themes/pterodactyl/layouts/master.blade.php b/resources/themes/pterodactyl/layouts/master.blade.php
index 67168274c..dbc9a8fe1 100644
--- a/resources/themes/pterodactyl/layouts/master.blade.php
+++ b/resources/themes/pterodactyl/layouts/master.blade.php
@@ -8,7 +8,7 @@
     <head>
         <meta charset="utf-8">
         <meta http-equiv="X-UA-Compatible" content="IE=edge">
-        <title>{{ Settings::get('company', 'Pterodactyl') }} - @yield('title')</title>
+        <title>{{ config('app.name', 'Pterodactyl') }} - @yield('title')</title>
         <meta content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no" name="viewport">
         <meta name="_token" content="{{ csrf_token() }}">
 
@@ -43,7 +43,7 @@
         <div class="wrapper">
             <header class="main-header">
                 <a href="{{ route('index') }}" class="logo">
-                    <span>{{ Settings::get('company', 'Pterodactyl') }}</span>
+                    <span>{{ config('app.name', 'Pterodactyl') }}</span>
                 </a>
                 <nav class="navbar navbar-static-top">
                     <a href="#" class="sidebar-toggle" data-toggle="push-menu" role="button">
diff --git a/resources/themes/pterodactyl/partials/admin/settings/nav.blade.php b/resources/themes/pterodactyl/partials/admin/settings/nav.blade.php
new file mode 100644
index 000000000..5f8937107
--- /dev/null
+++ b/resources/themes/pterodactyl/partials/admin/settings/nav.blade.php
@@ -0,0 +1,13 @@
+@section('settings::nav')
+    <div class="row">
+        <div class="col-xs-12">
+            <div class="nav-tabs-custom nav-tabs-floating">
+                <ul class="nav nav-tabs">
+                    <li @if($activeTab === 'basic')class="active"@endif><a href="{{ route('admin.settings') }}">General</a></li>
+                    <li @if($activeTab === 'mail')class="active"@endif><a href="{{ route('admin.settings.mail') }}">Mail</a></li>
+                    <li @if($activeTab === 'advanced')class="active"@endif><a href="{{ route('admin.settings.advanced') }}">Advanced</a></li>
+                </ul>
+            </div>
+        </div>
+    </div>
+@endsection
diff --git a/resources/themes/pterodactyl/server/console.blade.php b/resources/themes/pterodactyl/server/console.blade.php
index f50db615f..d1dea1d53 100644
--- a/resources/themes/pterodactyl/server/console.blade.php
+++ b/resources/themes/pterodactyl/server/console.blade.php
@@ -6,7 +6,7 @@
 <!DOCTYPE html>
 <html>
     <head>
-        <title>{{ Settings::get('company', 'Pterodactyl') }} - Console &rarr; {{ $server->name }}</title>
+        <title>{{ config('app.name', 'Pterodactyl') }} - Console &rarr; {{ $server->name }}</title>
         @include('layouts.scripts')
         {!! Theme::css('vendor/bootstrap/bootstrap.min.css') !!}
         {!! Theme::css('css/terminal.css') !!}
diff --git a/resources/themes/pterodactyl/vendor/notifications/email-plain.blade.php b/resources/themes/pterodactyl/vendor/notifications/email-plain.blade.php
index 875095895..acefa6523 100644
--- a/resources/themes/pterodactyl/vendor/notifications/email-plain.blade.php
+++ b/resources/themes/pterodactyl/vendor/notifications/email-plain.blade.php
@@ -19,4 +19,4 @@ if (! empty($outroLines)) {
 }
 
 echo 'Regards,', "\n";
-echo Settings::get('company'), "\n";
+echo config('app.name'), "\n";
diff --git a/resources/themes/pterodactyl/vendor/notifications/email.blade.php b/resources/themes/pterodactyl/vendor/notifications/email.blade.php
index 855286b63..94f86a960 100644
--- a/resources/themes/pterodactyl/vendor/notifications/email.blade.php
+++ b/resources/themes/pterodactyl/vendor/notifications/email.blade.php
@@ -71,7 +71,7 @@ $style = [
                     <tr>
                         <td style="{{ $style['email-masthead'] }}">
                             <a style="{{ $fontFamily }} {{ $style['email-masthead_name'] }}" href="{{ url('/') }}" target="_blank">
-                                {{ Settings::get('company') }}
+                                {{ config('app.name') }}
                             </a>
                         </td>
                     </tr>
@@ -140,7 +140,7 @@ $style = [
 
                                         <!-- Salutation -->
                                         <p style="{{ $style['paragraph'] }}">
-                                            Regards,<br>{{ Settings::get('company') }}
+                                            Regards,<br>{{ config('app.name') }}
                                         </p>
 
                                         <!-- Sub Copy -->
@@ -176,7 +176,7 @@ $style = [
                                     <td style="{{ $fontFamily }} {{ $style['email-footer_cell'] }}">
                                         <p style="{{ $style['paragraph-sub'] }}">
                                             &copy; {{ date('Y') }}
-                                            <a style="{{ $style['anchor'] }}" href="{{ url('/') }}" target="_blank">{{ Settings::get('company') }}</a>.
+                                            <a style="{{ $style['anchor'] }}" href="{{ url('/') }}" target="_blank">{{ config('app.name') }}</a>.
                                             All rights reserved.
                                         </p>
                                     </td>
diff --git a/routes/admin.php b/routes/admin.php
index edb6fd9f6..01b20bc6d 100644
--- a/routes/admin.php
+++ b/routes/admin.php
@@ -1,12 +1,6 @@
 <?php
-/**
- * Pterodactyl - Panel
- * Copyright (c) 2015 - 2017 Dane Everitt <dane@daneeveritt.com>.
- *
- * This software is licensed under the terms of the MIT license.
- * https://opensource.org/licenses/MIT
- */
-Route::get('/', 'BaseController@getIndex')->name('admin.index');
+
+Route::get('/', 'BaseController@index')->name('admin.index');
 
 /*
 |--------------------------------------------------------------------------
@@ -50,9 +44,13 @@ Route::group(['prefix' => 'databases'], function () {
 |
 */
 Route::group(['prefix' => 'settings'], function () {
-    Route::get('/', 'BaseController@getSettings')->name('admin.settings');
+    Route::get('/', 'Settings\IndexController@index')->name('admin.settings');
+    Route::get('/mail', 'Settings\MailController@index')->name('admin.settings.mail');
+    Route::get('/advanced', 'Settings\AdvancedController@index')->name('admin.settings.advanced');
 
-    Route::post('/', 'BaseController@postSettings');
+    Route::patch('/', 'Settings\IndexController@update');
+    Route::patch('/mail', 'Settings\MailController@update');
+    Route::patch('/advanced', 'Settings\AdvancedController@update');
 });
 
 /*
diff --git a/tests/Traits/Http/RequestMockHelpers.php b/tests/Traits/Http/RequestMockHelpers.php
index d6cc7865a..8611e710f 100644
--- a/tests/Traits/Http/RequestMockHelpers.php
+++ b/tests/Traits/Http/RequestMockHelpers.php
@@ -33,16 +33,26 @@ trait RequestMockHelpers
     }
 
     /**
-     * Set the active request object to be an instance of a mocked request.
+     * Configure the user model that the request mock should return with.
+     *
+     * @param \Pterodactyl\Models\User|null $user
      */
-    protected function buildRequestMock()
+    public function setRequestUserModel(User $user = null)
     {
-        $this->request = m::mock($this->requestMockClass);
-        if (! $this->request instanceof Request) {
-            throw new InvalidArgumentException('First argument passed to buildRequestMock must be an instance of \Illuminate\Http\Request when mocked.');
-        }
+        $this->request->shouldReceive('user')->andReturn($user);
+    }
 
-        $this->request->attributes = new ParameterBag();
+    /**
+     * Generates a new request user model and also returns the generated model.
+     *
+     * @return \Pterodactyl\Models\User
+     */
+    public function generateRequestUserModel(): User
+    {
+        $user = factory(User::class)->make();
+        $this->setRequestUserModel($user);
+
+        return $user;
     }
 
     /**
@@ -51,17 +61,41 @@ trait RequestMockHelpers
      * @param string $attribute
      * @param mixed  $value
      */
-    protected function setRequestAttribute(string $attribute, $value)
+    public function setRequestAttribute(string $attribute, $value)
     {
         $this->request->attributes->set($attribute, $value);
     }
 
+    /**
+     * Set the request route name.
+     *
+     * @param string $name
+     */
+    public function setRequestRouteName(string $name)
+    {
+        $this->request->shouldReceive('route->getName')->andReturn($name);
+    }
+
+    /**
+     * Set the active request object to be an instance of a mocked request.
+     */
+    protected function buildRequestMock()
+    {
+        $this->request = m::mock($this->requestMockClass);
+        if (! $this->request instanceof Request) {
+            throw new InvalidArgumentException('Request mock class must be an instance of ' . Request::class . ' when mocked.');
+        }
+
+        $this->request->attributes = new ParameterBag();
+    }
+
     /**
      * Sets the mocked request user. If a user model is not provided, a factory model
      * will be created and returned.
      *
      * @param \Pterodactyl\Models\User|null $user
      * @return \Pterodactyl\Models\User
+     * @deprecated
      */
     protected function setRequestUser(User $user = null): User
     {
diff --git a/tests/Unit/Http/Middleware/RequireTwoFactorAuthenticationTest.php b/tests/Unit/Http/Middleware/RequireTwoFactorAuthenticationTest.php
index fac13aab9..19bd45129 100644
--- a/tests/Unit/Http/Middleware/RequireTwoFactorAuthenticationTest.php
+++ b/tests/Unit/Http/Middleware/RequireTwoFactorAuthenticationTest.php
@@ -4,7 +4,6 @@ namespace Tests\Unit\Http\Middleware;
 
 use Mockery as m;
 use Pterodactyl\Models\User;
-use Krucas\Settings\Settings;
 use Illuminate\Http\RedirectResponse;
 use Prologue\Alerts\AlertsMessageBag;
 use Pterodactyl\Http\Middleware\RequireTwoFactorAuthentication;
@@ -16,11 +15,6 @@ class RequireTwoFactorAuthenticationTest extends MiddlewareTestCase
      */
     private $alert;
 
-    /**
-     * @var \Krucas\Settings\Settings|\Mockery\Mock
-     */
-    private $settings;
-
     /**
      * Setup tests.
      */
@@ -29,7 +23,6 @@ class RequireTwoFactorAuthenticationTest extends MiddlewareTestCase
         parent::setUp();
 
         $this->alert = m::mock(AlertsMessageBag::class);
-        $this->settings = m::mock(Settings::class);
     }
 
     /**
@@ -37,7 +30,7 @@ class RequireTwoFactorAuthenticationTest extends MiddlewareTestCase
      */
     public function testRequestMissingUser()
     {
-        $this->request->shouldReceive('user')->withNoArgs()->once()->andReturnNull();
+        $this->setRequestUserModel(null);
 
         $this->getMiddleware()->handle($this->request, $this->getClosureAssertions());
     }
@@ -46,11 +39,12 @@ class RequireTwoFactorAuthenticationTest extends MiddlewareTestCase
      * Test that the middleware is ignored on specific routes.
      *
      * @dataProvider ignoredRoutesDataProvider
+     * @param string $route
      */
     public function testRequestOnIgnoredRoute($route)
     {
-        $this->request->shouldReceive('user')->withNoArgs()->once()->andReturn(true);
-        $this->request->shouldReceive('route->getName')->withNoArgs()->once()->andReturn($route);
+        $this->generateRequestUserModel();
+        $this->setRequestRouteName($route);
 
         $this->getMiddleware()->handle($this->request, $this->getClosureAssertions());
     }
@@ -60,10 +54,21 @@ class RequireTwoFactorAuthenticationTest extends MiddlewareTestCase
      */
     public function testTwoFactorRequirementDisabled()
     {
-        $this->request->shouldReceive('user')->withNoArgs()->once()->andReturn(true);
-        $this->request->shouldReceive('route->getName')->withNoArgs()->once()->andReturn('random.route');
+        $this->generateRequestUserModel();
+        $this->setRequestRouteName('random.route');
+        $this->setRequirementLevel(RequireTwoFactorAuthentication::LEVEL_NONE);
 
-        $this->settings->shouldReceive('get')->with('2fa', 0)->once()->andReturn(RequireTwoFactorAuthentication::LEVEL_NONE);
+        $this->getMiddleware()->handle($this->request, $this->getClosureAssertions());
+    }
+
+    /**
+     * Test that an invalid value for the level skips the check and continues with the request.
+     */
+    public function testTwoFactorRequirementWithInvalidValue()
+    {
+        $this->generateRequestUserModel();
+        $this->setRequestRouteName('random.route');
+        $this->setRequirementLevel(333);
 
         $this->getMiddleware()->handle($this->request, $this->getClosureAssertions());
     }
@@ -74,11 +79,10 @@ class RequireTwoFactorAuthenticationTest extends MiddlewareTestCase
     public function testTwoFactorEnabledForAdminsAsAdminUserWith2FADisabled()
     {
         $user = factory(User::class)->make(['root_admin' => 1, 'use_totp' => 0]);
+        $this->setRequestUserModel($user);
+        $this->setRequestRouteName('random.route');
+        $this->setRequirementLevel(RequireTwoFactorAuthentication::LEVEL_ADMIN);
 
-        $this->request->shouldReceive('user')->withNoArgs()->times(3)->andReturn($user);
-        $this->request->shouldReceive('route->getName')->withNoArgs()->once()->andReturn('random.route');
-
-        $this->settings->shouldReceive('get')->with('2fa', 0)->once()->andReturn(RequireTwoFactorAuthentication::LEVEL_ADMIN);
         $this->alert->shouldReceive('danger')->with(trans('auth.2fa_must_be_enabled'))->once()->andReturnSelf();
         $this->alert->shouldReceive('flash')->withNoArgs()->once()->andReturnSelf();
 
@@ -93,11 +97,9 @@ class RequireTwoFactorAuthenticationTest extends MiddlewareTestCase
     public function testTwoFactorEnabledForAdminsAsAdminUserWith2FAEnabled()
     {
         $user = factory(User::class)->make(['root_admin' => 1, 'use_totp' => 1]);
-
-        $this->request->shouldReceive('user')->withNoArgs()->times(3)->andReturn($user);
-        $this->request->shouldReceive('route->getName')->withNoArgs()->once()->andReturn('random.route');
-
-        $this->settings->shouldReceive('get')->with('2fa', 0)->once()->andReturn(RequireTwoFactorAuthentication::LEVEL_ADMIN);
+        $this->setRequestUserModel($user);
+        $this->setRequestRouteName('random.route');
+        $this->setRequirementLevel(RequireTwoFactorAuthentication::LEVEL_ADMIN);
 
         $this->getMiddleware()->handle($this->request, $this->getClosureAssertions());
     }
@@ -108,11 +110,9 @@ class RequireTwoFactorAuthenticationTest extends MiddlewareTestCase
     public function testTwoFactorEnabledForAdminsAsNonAdmin()
     {
         $user = factory(User::class)->make(['root_admin' => 0]);
-
-        $this->request->shouldReceive('user')->withNoArgs()->twice()->andReturn($user);
-        $this->request->shouldReceive('route->getName')->withNoArgs()->once()->andReturn('random.route');
-
-        $this->settings->shouldReceive('get')->with('2fa', 0)->once()->andReturn(RequireTwoFactorAuthentication::LEVEL_ADMIN);
+        $this->setRequestUserModel($user);
+        $this->setRequestRouteName('random.route');
+        $this->setRequirementLevel(RequireTwoFactorAuthentication::LEVEL_ADMIN);
 
         $this->getMiddleware()->handle($this->request, $this->getClosureAssertions());
     }
@@ -123,11 +123,10 @@ class RequireTwoFactorAuthenticationTest extends MiddlewareTestCase
     public function testTwoFactorEnabledForAllUsersAsUserWith2FADisabled()
     {
         $user = factory(User::class)->make(['use_totp' => 0]);
+        $this->setRequestUserModel($user);
+        $this->setRequestRouteName('random.route');
+        $this->setRequirementLevel(RequireTwoFactorAuthentication::LEVEL_ALL);
 
-        $this->request->shouldReceive('user')->withNoArgs()->twice()->andReturn($user);
-        $this->request->shouldReceive('route->getName')->withNoArgs()->once()->andReturn('random.route');
-
-        $this->settings->shouldReceive('get')->with('2fa', 0)->once()->andReturn(RequireTwoFactorAuthentication::LEVEL_ALL);
         $this->alert->shouldReceive('danger')->with(trans('auth.2fa_must_be_enabled'))->once()->andReturnSelf();
         $this->alert->shouldReceive('flash')->withNoArgs()->once()->andReturnSelf();
 
@@ -142,11 +141,9 @@ class RequireTwoFactorAuthenticationTest extends MiddlewareTestCase
     public function testTwoFactorEnabledForAllUsersAsUserWith2FAEnabled()
     {
         $user = factory(User::class)->make(['use_totp' => 1]);
-
-        $this->request->shouldReceive('user')->withNoArgs()->twice()->andReturn($user);
-        $this->request->shouldReceive('route->getName')->withNoArgs()->once()->andReturn('random.route');
-
-        $this->settings->shouldReceive('get')->with('2fa', 0)->once()->andReturn(RequireTwoFactorAuthentication::LEVEL_ALL);
+        $this->setRequestUserModel($user);
+        $this->setRequestRouteName('random.route');
+        $this->setRequirementLevel(RequireTwoFactorAuthentication::LEVEL_ALL);
 
         $this->getMiddleware()->handle($this->request, $this->getClosureAssertions());
     }
@@ -176,6 +173,16 @@ class RequireTwoFactorAuthenticationTest extends MiddlewareTestCase
      */
     private function getMiddleware(): RequireTwoFactorAuthentication
     {
-        return new RequireTwoFactorAuthentication($this->alert, $this->settings);
+        return new RequireTwoFactorAuthentication($this->alert);
+    }
+
+    /**
+     * Set the authentication level requirement.
+     *
+     * @param int $level
+     */
+    private function setRequirementLevel(int $level)
+    {
+        config()->set('pterodactyl.auth.2fa_required', $level);
     }
 }