diff --git a/api.php b/api.php
index 979d8cd..e671c10 100644
--- a/api.php
+++ b/api.php
@@ -10,9 +10,7 @@ use Zend\Stratigility\MiddlewarePipe;
 $app = require __DIR__.'/system/bootstrap.php';
 
 // Set up everything we need for the API
-$app->instance('type', 'api');
 $app->register('Flarum\Api\ApiServiceProvider');
-$app->register('Flarum\Support\Extensions\ExtensionsServiceProvider');
 
 // Build a middleware pipeline for the API
 $api = new MiddlewarePipe();
diff --git a/index.php b/index.php
index f5b0072..0bce1ce 100644
--- a/index.php
+++ b/index.php
@@ -10,9 +10,7 @@ use Zend\Stratigility\MiddlewarePipe;
 $app = require __DIR__.'/system/bootstrap.php';
 
 // Set up everything we need for the frontend
-$app->instance('type', 'forum');
 $app->register('Flarum\Forum\ForumServiceProvider');
-$app->register('Flarum\Support\Extensions\ExtensionsServiceProvider');
 
 // Build a middleware pipeline for Flarum
 $flarum = new MiddlewarePipe();
diff --git a/system/bootstrap.php b/system/bootstrap.php
index d73624d..9745876 100644
--- a/system/bootstrap.php
+++ b/system/bootstrap.php
@@ -138,9 +138,12 @@ $serviceProviders = [
 ];
 
 if (Core::isInstalled()) {
-	$serviceProviders[] = 'Flarum\Core\CoreServiceProvider';
-	$serviceProviders[] = 'Flarum\Core\DatabaseServiceProvider';
-	$serviceProviders[] = 'Flarum\Console\ConsoleServiceProvider';
+    $serviceProviders[] = 'Flarum\Core\DatabaseServiceProvider';
+	$serviceProviders[] = 'Flarum\Core\Settings\SettingsServiceProvider';
+    $serviceProviders[] = 'Flarum\Support\ExtensionsServiceProvider';
+    $serviceProviders[] = 'Flarum\Core\CoreServiceProvider';
+	$serviceProviders[] = 'Flarum\Locale\LocaleServiceProvider';
+    $serviceProviders[] = 'Flarum\Console\ConsoleServiceProvider';
 }
 
 foreach ($serviceProviders as $provider) {
diff --git a/system/core b/system/core
index 22f91bb..0cb3378 160000
--- a/system/core
+++ b/system/core
@@ -1 +1 @@
-Subproject commit 22f91bb7e43ded9876a3749c56f23da0035711b9
+Subproject commit 0cb3378658b4a6ff3b4a8d5a06378ae8b6c5b87a