diff --git a/app/assets/javascripts/app/directives/views/componentView.js b/app/assets/javascripts/app/directives/views/componentView.js
index 5c92ffac6..045fad945 100644
--- a/app/assets/javascripts/app/directives/views/componentView.js
+++ b/app/assets/javascripts/app/directives/views/componentView.js
@@ -60,7 +60,7 @@ class ComponentView {
 
       if(component) {
         componentManager.activateComponent(component);
-        console.log("Loading", $scope.component.name, $scope.getUrl(), component.valid_until, $scope.component);
+        console.log("Loading", $scope.component.name, $scope.getUrl(), component.valid_until);
 
         $scope.reloadStatus();
       }
diff --git a/app/assets/javascripts/app/services/componentManager.js b/app/assets/javascripts/app/services/componentManager.js
index effc98f5b..cf4b58a4c 100644
--- a/app/assets/javascripts/app/services/componentManager.js
+++ b/app/assets/javascripts/app/services/componentManager.js
@@ -3,13 +3,13 @@ let ClientDataDomain = "org.standardnotes.sn.components";
 
 class ComponentManager {
 
-  constructor($rootScope, modelManager, syncManager, desktopManager, sysExtManager, $timeout, $compile) {
+  constructor($rootScope, modelManager, syncManager, desktopManager, nativeExtManager, $timeout, $compile) {
     this.$compile = $compile;
     this.$rootScope = $rootScope;
     this.modelManager = modelManager;
     this.syncManager = syncManager;
     this.desktopManager = desktopManager;
-    this.sysExtManager = sysExtManager;
+    this.nativeExtManager = nativeExtManager;
     this.timeout = $timeout;
     this.streamObservers = [];
     this.contextStreamObservers = [];
@@ -244,7 +244,7 @@ class ComponentManager {
     if(component.offlineOnly || (isDesktopApplication() && component.local_url)) {
       return component.local_url && component.local_url.replace("sn://", this.desktopManager.getApplicationDataPath() + "/");
     } else {
-      return component.url || component.hosted_url;
+      return component.hosted_url || component.url;
     }
   }
 
@@ -319,7 +319,7 @@ class ComponentManager {
   removePrivatePropertiesFromResponseItems(responseItems, component, options = {}) {
     if(component) {
       // System extensions can bypass this step
-      if(this.sysExtManager.isSystemExtension(component)) {
+      if(this.nativeExtManager.isSystemExtension(component)) {
         return;
       }
     }
@@ -548,7 +548,7 @@ class ComponentManager {
 
   handleInstallLocalComponentMessage(sourceComponent, message) {
     // Only extensions manager has this permission
-    if(!this.sysExtManager.isSystemExtension(sourceComponent)) {
+    if(!this.nativeExtManager.isSystemExtension(sourceComponent)) {
       return;
     }
 
diff --git a/app/assets/javascripts/app/services/sysExtManager.js b/app/assets/javascripts/app/services/nativeExtManager.js
similarity index 96%
rename from app/assets/javascripts/app/services/sysExtManager.js
rename to app/assets/javascripts/app/services/nativeExtManager.js
index c822a9f2d..503e3f3b3 100644
--- a/app/assets/javascripts/app/services/sysExtManager.js
+++ b/app/assets/javascripts/app/services/nativeExtManager.js
@@ -1,6 +1,6 @@
 /* A class for handling installation of system extensions */
 
-class SysExtManager {
+class NativeExtManager {
 
   constructor(modelManager, syncManager, singletonManager) {
     this.modelManager = modelManager;
@@ -89,4 +89,4 @@ class SysExtManager {
 
 }
 
-angular.module('app').service('sysExtManager', SysExtManager);
+angular.module('app').service('nativeExtManager', NativeExtManager);
diff --git a/package-lock.json b/package-lock.json
index 69b9a3d84..765a76d8b 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -5781,9 +5781,9 @@
       "dev": true
     },
     "sn-stylekit": {
-      "version": "1.0.1195",
-      "resolved": "https://registry.npmjs.org/sn-stylekit/-/sn-stylekit-1.0.1195.tgz",
-      "integrity": "sha512-XPutiDkA0Jbf3fGHjC6avoWbMsLJKLOXnPJDpE2VFA2/HUf87sjyTvvhg8mrRT2IiE8Cr0gJFQr/ALnoP+u1EQ==",
+      "version": "1.0.1196",
+      "resolved": "https://registry.npmjs.org/sn-stylekit/-/sn-stylekit-1.0.1196.tgz",
+      "integrity": "sha512-/6P0m4A+TEwJ6VxstiEzCCfBheWz5c8Y/B209cItqLX+9ltfg4yEUaTHG/Q/TMKPID8or4CiiMLzj+6SwuMqGQ==",
       "dev": true
     },
     "snake-case": {
diff --git a/package.json b/package.json
index 12f5b412f..13d5a11f4 100644
--- a/package.json
+++ b/package.json
@@ -33,7 +33,7 @@
     "karma-cli": "^1.0.1",
     "karma-jasmine": "^1.1.0",
     "karma-phantomjs-launcher": "^1.0.2",
-    "sn-stylekit": "^1.0.1195"
+    "sn-stylekit": "^1.0.1196"
   },
   "license": "GPL-3.0"
 }
diff --git a/public/extensions/extensions-manager b/public/extensions/extensions-manager
index 1af12dc1a..aed8ee9e8 160000
--- a/public/extensions/extensions-manager
+++ b/public/extensions/extensions-manager
@@ -1 +1 @@
-Subproject commit 1af12dc1abf77d6be1bc61681ef8e2452e436a08
+Subproject commit aed8ee9e89b62ac1bca9af0f429d6731f3c8f8d9