diff --git a/UPGRADE.md b/UPGRADE.md
index 76d63b44e..864466aa9 100644
--- a/UPGRADE.md
+++ b/UPGRADE.md
@@ -29,6 +29,10 @@ Optional things you can delete, if they do not contain anything custom.
     [DELETE] /app
     [DELETE] /storage/cache
 
+### Remmoved config
+
+    cms.tempDir - use temp_path()
+
 ### Breaking code changes
 
 #### Paginator / setCurrentPage
diff --git a/config/cms.php b/config/cms.php
index d23e7c4b7..92afc59d7 100644
--- a/config/cms.php
+++ b/config/cms.php
@@ -185,17 +185,6 @@ return array(
 
     'uploadsDir' => '/uploads',
 
-    /*
-    |--------------------------------------------------------------------------
-    | Temporary directory
-    |--------------------------------------------------------------------------
-    |
-    | Specifies a directory used by the application for temporarily storing files.
-    |
-    */
-
-    'tempDir' => storage_path().'/temp',
-
     /*
     |--------------------------------------------------------------------------
     | Default permission mask
diff --git a/modules/backend/formwidgets/relation/partials/_relation.htm b/modules/backend/formwidgets/relation/partials/_relation.htm
index 6bcd9e33e..9d979a288 100644
--- a/modules/backend/formwidgets/relation/partials/_relation.htm
+++ b/modules/backend/formwidgets/relation/partials/_relation.htm
@@ -1,3 +1,3 @@
 <div class="relation-widget" id="<?= $this->getId() ?>">
-    <?= $this->makePartial(PATH_BASE . '/modules/backend/widgets/form/partials/_field_'.$field->type.'.htm', ['field' => $field]) ?>
+    <?= $this->makePartial('~/modules/backend/widgets/form/partials/_field_'.$field->type.'.htm', ['field' => $field]) ?>
 </div>
\ No newline at end of file
diff --git a/modules/backend/models/BrandSettings.php b/modules/backend/models/BrandSettings.php
index e99acde50..facf08fbb 100644
--- a/modules/backend/models/BrandSettings.php
+++ b/modules/backend/models/BrandSettings.php
@@ -99,7 +99,7 @@ class BrandSettings extends Model
         ]);
 
         $parser->parse(
-            File::get(PATH_BASE.'/modules/backend/models/brandsettings/custom.less')
+            File::get(base_path().'/modules/backend/models/brandsettings/custom.less')
             . self::get('custom_css')
         );
 
diff --git a/modules/backend/skins/Standard.php b/modules/backend/skins/Standard.php
index cef01de75..7d1720f8c 100644
--- a/modules/backend/skins/Standard.php
+++ b/modules/backend/skins/Standard.php
@@ -21,7 +21,7 @@ class Standard extends Skin
      */
     public function __construct()
     {
-        $this->skinPath = $this->defaultSkinPath = PATH_BASE . '/modules/backend';
+        $this->skinPath = $this->defaultSkinPath = base_path() . '/modules/backend';
         $this->publicSkinPath = $this->defaultPublicSkinPath = File::localToPublic($this->skinPath);
     }
 
diff --git a/modules/system/classes/UpdateManager.php b/modules/system/classes/UpdateManager.php
index 0390345b5..1fe62b30a 100644
--- a/modules/system/classes/UpdateManager.php
+++ b/modules/system/classes/UpdateManager.php
@@ -77,8 +77,8 @@ class UpdateManager
         $this->versionManager = VersionManager::instance();
         $this->migrator = App::make('migrator');
         $this->repository = App::make('migration.repository');
-        $this->tempDirectory = Config::get('cms.tempDir', sys_get_temp_dir());
-        $this->baseDirectory = PATH_BASE;
+        $this->tempDirectory = temp_path();
+        $this->baseDirectory = base_path();
         $this->disableCoreUpdates = Config::get('cms.disableCoreUpdates', false);
 
         /*