diff --git a/src/main/java/cc/ryanc/halo/listener/StartedListener.java b/src/main/java/cc/ryanc/halo/listener/StartedListener.java
index 669d7c982..de2c3ae70 100644
--- a/src/main/java/cc/ryanc/halo/listener/StartedListener.java
+++ b/src/main/java/cc/ryanc/halo/listener/StartedListener.java
@@ -11,7 +11,6 @@ import cc.ryanc.halo.service.OptionService;
 import cc.ryanc.halo.service.ThemeService;
 import cc.ryanc.halo.service.UserService;
 import cc.ryanc.halo.utils.HaloUtils;
-import cc.ryanc.halo.web.controller.content.base.BaseContentController;
 import cn.hutool.core.io.FileUtil;
 import cn.hutool.core.util.StrUtil;
 import com.fasterxml.jackson.databind.ObjectMapper;
@@ -30,6 +29,7 @@ import java.util.Collections;
 import java.util.List;
 import java.util.Map;
 
+import static cc.ryanc.halo.model.support.HaloConst.ACTIVATED_THEME_NAME;
 import static cc.ryanc.halo.model.support.HaloConst.DEFAULT_THEME_NAME;
 
 /**
@@ -113,10 +113,10 @@ public class StartedListener implements ApplicationListener<ApplicationStartedEv
      * Get active theme
      */
     private void getActiveTheme() {
-        BaseContentController.THEME = optionService.getByProperty(PrimaryProperties.THEME).orElse(DEFAULT_THEME_NAME);
+        ACTIVATED_THEME_NAME = optionService.getByProperty(PrimaryProperties.THEME).orElse(DEFAULT_THEME_NAME);
 
         try {
-            configuration.setSharedVariable("themeName", BaseContentController.THEME);
+            configuration.setSharedVariable("themeName", ACTIVATED_THEME_NAME);
         } catch (TemplateModelException e) {
             e.printStackTrace();
         }
diff --git a/src/main/java/cc/ryanc/halo/model/support/HaloConst.java b/src/main/java/cc/ryanc/halo/model/support/HaloConst.java
index 718d88b8e..47a4c0fd2 100644
--- a/src/main/java/cc/ryanc/halo/model/support/HaloConst.java
+++ b/src/main/java/cc/ryanc/halo/model/support/HaloConst.java
@@ -24,6 +24,11 @@ public class HaloConst {
      */
     public final static String DEFAULT_THEME_NAME = "anatole";
 
+    /**
+     * Activated theme name.
+     */
+    public static String ACTIVATED_THEME_NAME = "anatole";
+
     /**
      * version constant
      */
diff --git a/src/main/java/cc/ryanc/halo/service/impl/ThemeServiceImpl.java b/src/main/java/cc/ryanc/halo/service/impl/ThemeServiceImpl.java
index 5e61e239a..04a91d25a 100644
--- a/src/main/java/cc/ryanc/halo/service/impl/ThemeServiceImpl.java
+++ b/src/main/java/cc/ryanc/halo/service/impl/ThemeServiceImpl.java
@@ -7,7 +7,6 @@ import cc.ryanc.halo.model.support.ThemeFile;
 import cc.ryanc.halo.model.support.ThemeProperties;
 import cc.ryanc.halo.service.ThemeService;
 import cc.ryanc.halo.utils.FilenameUtils;
-import cc.ryanc.halo.web.controller.content.base.BaseContentController;
 import cn.hutool.core.text.StrBuilder;
 import cn.hutool.core.util.StrUtil;
 import cn.hutool.setting.dialect.Props;
@@ -151,7 +150,7 @@ public class ThemeServiceImpl implements ThemeService {
      */
     @Override
     public boolean isTemplateExist(String template) {
-        StrBuilder templatePath = new StrBuilder(BaseContentController.THEME);
+        StrBuilder templatePath = new StrBuilder(HaloConst.ACTIVATED_THEME_NAME);
         templatePath.append("/");
         templatePath.append(template);
         File file = new File(getThemeBasePath(), templatePath.toString());
diff --git a/src/main/java/cc/ryanc/halo/web/controller/admin/api/ThemeController.java b/src/main/java/cc/ryanc/halo/web/controller/admin/api/ThemeController.java
index a694a69ce..3e5298199 100644
--- a/src/main/java/cc/ryanc/halo/web/controller/admin/api/ThemeController.java
+++ b/src/main/java/cc/ryanc/halo/web/controller/admin/api/ThemeController.java
@@ -3,11 +3,11 @@ package cc.ryanc.halo.web.controller.admin.api;
 import cc.ryanc.halo.model.enums.OptionSource;
 import cc.ryanc.halo.model.properties.PrimaryProperties;
 import cc.ryanc.halo.model.properties.PropertyEnum;
+import cc.ryanc.halo.model.support.HaloConst;
 import cc.ryanc.halo.model.support.Theme;
 import cc.ryanc.halo.model.support.ThemeFile;
 import cc.ryanc.halo.service.OptionService;
 import cc.ryanc.halo.service.ThemeService;
-import cc.ryanc.halo.web.controller.content.base.BaseContentController;
 import freemarker.template.Configuration;
 import freemarker.template.TemplateModelException;
 import io.swagger.annotations.ApiOperation;
@@ -62,7 +62,7 @@ public class ThemeController {
      */
     @GetMapping("files")
     public List<ThemeFile> listFiles() {
-        return themeService.listThemeFolderBy(BaseContentController.THEME);
+        return themeService.listThemeFolderBy(HaloConst.ACTIVATED_THEME_NAME);
     }
 
     /**
@@ -78,7 +78,7 @@ public class ThemeController {
         properties.put(PrimaryProperties.THEME, themeName);
         // TODO Refactor: saveProperties => saveProperty
         optionService.saveProperties(properties, OptionSource.SYSTEM);
-        BaseContentController.THEME = themeName;
+        HaloConst.ACTIVATED_THEME_NAME = themeName;
         configuration.setSharedVariable("themeName", themeName);
         configuration.setSharedVariable("options", optionService.listOptions());
     }
diff --git a/src/main/java/cc/ryanc/halo/web/controller/content/base/BaseContentController.java b/src/main/java/cc/ryanc/halo/web/controller/content/base/BaseContentController.java
index 92e9dde5b..0528983a9 100644
--- a/src/main/java/cc/ryanc/halo/web/controller/content/base/BaseContentController.java
+++ b/src/main/java/cc/ryanc/halo/web/controller/content/base/BaseContentController.java
@@ -2,7 +2,7 @@ package cc.ryanc.halo.web.controller.content.base;
 
 import cn.hutool.core.text.StrBuilder;
 
-import static cc.ryanc.halo.model.support.HaloConst.DEFAULT_THEME_NAME;
+import static cc.ryanc.halo.model.support.HaloConst.ACTIVATED_THEME_NAME;
 
 /**
  * Content base Controller
@@ -12,12 +12,6 @@ import static cc.ryanc.halo.model.support.HaloConst.DEFAULT_THEME_NAME;
  */
 public abstract class BaseContentController {
 
-    /**
-     * Default theme
-     */
-    @Deprecated
-    public static String THEME = DEFAULT_THEME_NAME;
-
     /**
      * Render page by template name
      *
@@ -26,7 +20,7 @@ public abstract class BaseContentController {
      */
     public String render(String pageName) {
         final StrBuilder themeStr = new StrBuilder("themes/");
-        themeStr.append(THEME);
+        themeStr.append(ACTIVATED_THEME_NAME);
         themeStr.append("/");
         themeStr.append(pageName);
         return themeStr.toString();
diff --git a/src/main/java/cc/ryanc/halo/web/controller/core/CommonController.java b/src/main/java/cc/ryanc/halo/web/controller/core/CommonController.java
index fa7bfd9a5..af4795abf 100644
--- a/src/main/java/cc/ryanc/halo/web/controller/core/CommonController.java
+++ b/src/main/java/cc/ryanc/halo/web/controller/core/CommonController.java
@@ -3,7 +3,6 @@ package cc.ryanc.halo.web.controller.core;
 import cc.ryanc.halo.model.entity.User;
 import cc.ryanc.halo.model.support.HaloConst;
 import cc.ryanc.halo.service.ThemeService;
-import cc.ryanc.halo.web.controller.content.base.BaseContentController;
 import cn.hutool.core.text.StrBuilder;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -107,7 +106,7 @@ public class CommonController implements ErrorController {
             return "common/error/404";
         }
         StrBuilder path = new StrBuilder("themes/");
-        path.append(BaseContentController.THEME);
+        path.append(HaloConst.ACTIVATED_THEME_NAME);
         path.append("/404");
         return path.toString();
     }
@@ -123,7 +122,7 @@ public class CommonController implements ErrorController {
             return "common/error/500";
         }
         StrBuilder path = new StrBuilder("themes/");
-        path.append(BaseContentController.THEME);
+        path.append(HaloConst.ACTIVATED_THEME_NAME);
         path.append("/500");
         return path.toString();
     }