diff --git a/modules/cms/classes/Theme.php b/modules/cms/classes/Theme.php
index 9e5dc8e77..83bcd0dc2 100644
--- a/modules/cms/classes/Theme.php
+++ b/modules/cms/classes/Theme.php
@@ -1,15 +1,15 @@
 <?php namespace Cms\Classes;
 
+use URL;
 use File;
 use Lang;
+use Cache;
 use Event;
 use Config;
-use URL;
-use Cache;
-use DB;
-use DirectoryIterator;
-use System\Classes\SystemException;
 use October\Rain\Support\Yaml;
+use System\Models\Parameters;
+use System\Classes\SystemException;
+use DirectoryIterator;
 
 /**
  * This class represents the CMS theme.
@@ -94,14 +94,14 @@ class Theme
      */
     public static function getActiveTheme()
     {
-        $configKey = 'cms.activeTheme';
+        $paramKey = 'cms::theme.active';
+        $activeTheme = Config::get('cms.activeTheme');
 
-        $activeTheme = Config::get($configKey);
+        $dbResult = Parameters::findRecord($paramKey)
+            ->remember(1440, $paramKey)
+            ->pluck('value')
+        ;
 
-        $dbResult = DB::table('system_settings')
-            ->where('item', '=', $configKey)
-            ->remember(1440, $configKey)
-            ->pluck('value');
         if ($dbResult !== null)
             $activeTheme = $dbResult;
 
@@ -127,11 +127,9 @@ class Theme
      */
     public static function setActiveTheme($code)
     {
-        $configKey = 'cms.activeTheme';
-
-        DB::table('system_settings')->where('item', '=', $configKey)->delete();
-        DB::table('system_settings')->insert(['item'=>$configKey, 'value'=>$code]);
-        Cache::forget($configKey);
+        $paramKey = 'cms::theme.active';
+        Parameters::set($paramKey, $code);
+        Cache::forget($paramKey);
     }
 
     /**
diff --git a/modules/cms/controllers/theme/_theme_list.htm b/modules/cms/controllers/theme/_theme_list.htm
index c4f01374f..e7f9670c6 100644
--- a/modules/cms/controllers/theme/_theme_list.htm
+++ b/modules/cms/controllers/theme/_theme_list.htm
@@ -25,7 +25,7 @@
                     disabled
                     class="btn btn-disabled">
                     <i class="icon-star"></i>
-                    <?= e(trans('cms::lang.theme.active_btn')) ?>
+                    <?= e(trans('cms::lang.theme.active_button')) ?>
                 </button>
             <?php else: ?>
                 <button