diff --git a/app/Extensions/Plugin/PluginManager.php b/app/Extensions/Plugin/PluginManager.php
index 623f187a..338d8542 100644
--- a/app/Extensions/Plugin/PluginManager.php
+++ b/app/Extensions/Plugin/PluginManager.php
@@ -4,6 +4,7 @@
 
 use Azuriom\Extensions\ExtensionManager;
 use Azuriom\Extensions\UpdateManager;
+use Azuriom\Support\Files;
 use Azuriom\Support\Optimizer;
 use Composer\Autoload\ClassLoader;
 use Illuminate\Contracts\Filesystem\FileNotFoundException;
@@ -494,7 +495,7 @@ protected function createAssetsLink(string $plugin)
         $pluginAssetsPath = $this->path($plugin, 'assets');
 
         if ($this->files->exists($pluginAssetsPath)) {
-            $this->files->link($pluginAssetsPath, $this->pluginsPublicPath($plugin));
+            Files::relativeLink($pluginAssetsPath, $this->pluginsPublicPath($plugin));
         }
     }
 }
diff --git a/app/Extensions/Theme/ThemeManager.php b/app/Extensions/Theme/ThemeManager.php
index 7bfd73ef..b0c39d9c 100644
--- a/app/Extensions/Theme/ThemeManager.php
+++ b/app/Extensions/Theme/ThemeManager.php
@@ -5,6 +5,7 @@
 use Azuriom\Extensions\ExtensionManager;
 use Azuriom\Extensions\UpdateManager;
 use Azuriom\Models\Setting;
+use Azuriom\Support\Files;
 use Illuminate\Filesystem\Filesystem;
 use Illuminate\Support\Facades\Cache;
 use RuntimeException;
@@ -327,7 +328,7 @@ protected function loadConfig(string $theme)
 
         if ($themeConfig !== null) {
             foreach ($themeConfig as $key => $value) {
-                config(['theme.'.$key => $value]);
+                setting()->set('theme.'.$key, $value);
             }
         }
     }
@@ -341,7 +342,7 @@ protected function createAssetsLink(string $theme)
         $themeAssetsPath = $this->path('assets', $theme);
 
         if ($this->files->exists($themeAssetsPath)) {
-            $this->files->link($themeAssetsPath, $this->themesPublicPath($theme));
+            Files::relativeLink($themeAssetsPath, $this->themesPublicPath($theme));
         }
     }
 }