diff --git a/designer-base/src/main/java/com/fr/design/mainframe/JTemplate.java b/designer-base/src/main/java/com/fr/design/mainframe/JTemplate.java
index b9143fe33f..e936a945b9 100644
--- a/designer-base/src/main/java/com/fr/design/mainframe/JTemplate.java
+++ b/designer-base/src/main/java/com/fr/design/mainframe/JTemplate.java
@@ -24,7 +24,7 @@ import com.fr.design.actions.edit.UndoAction;
 import com.fr.design.actions.file.SaveAsTemplateAction;
 import com.fr.design.actions.file.SaveTemplateAction;
 import com.fr.design.actions.file.WebPreviewUtils;
-import com.fr.controldisplayenhance.designer.WidgetThemeDisplayAction;
+import com.fr.widgettheme.designer.WidgetThemeDisplayAction;
 import com.fr.design.base.mode.DesignModeContext;
 import com.fr.design.data.datapane.TableDataTreePane;
 import com.fr.design.designer.DesignerProxy;
diff --git a/designer-base/src/main/java/com/fr/design/mainframe/mobile/ui/MobileStylePane.java b/designer-base/src/main/java/com/fr/design/mainframe/mobile/ui/MobileStylePane.java
index 43edd10eb8..921fb34863 100644
--- a/designer-base/src/main/java/com/fr/design/mainframe/mobile/ui/MobileStylePane.java
+++ b/designer-base/src/main/java/com/fr/design/mainframe/mobile/ui/MobileStylePane.java
@@ -19,7 +19,7 @@ import com.fr.log.FineLoggerFactory;
 import com.fr.plugin.context.PluginContext;
 import com.fr.plugin.observer.PluginEventType;
 import com.fr.stable.ArrayUtils;
-import com.fr.controldisplayenhance.widget.mobile.provider.WidgetThemeMobileStyleDefinePaneCreator;
+import com.fr.widgettheme.widget.mobile.provider.WidgetThemeMobileStyleDefinePaneCreator;
 
 import javax.swing.DefaultListCellRenderer;
 import javax.swing.DefaultListModel;
diff --git a/designer-base/src/main/java/com/fr/design/mainframe/theme/FormThemeProfilePane.java b/designer-base/src/main/java/com/fr/design/mainframe/theme/FormThemeProfilePane.java
index 2f9c5d417c..6ff3333517 100644
--- a/designer-base/src/main/java/com/fr/design/mainframe/theme/FormThemeProfilePane.java
+++ b/designer-base/src/main/java/com/fr/design/mainframe/theme/FormThemeProfilePane.java
@@ -11,7 +11,7 @@ import com.fr.design.mainframe.theme.edit.ChartStyleFormEditPane;
 import com.fr.design.mainframe.theme.edit.ComponentStyleEditPane;
 import com.fr.design.mainframe.theme.edit.FormBodyStyleEditPane;
 import com.fr.design.mainframe.theme.processor.ThemePreviewPaneProcessor;
-import com.fr.controldisplayenhance.theme.panel.WidgetDisplayFormThemePreviewPane;
+import com.fr.widgettheme.theme.panel.WidgetDisplayFormThemePreviewPane;
 
 import javax.swing.JPanel;
 
diff --git a/designer-base/src/main/java/com/fr/design/mainframe/theme/ReportThemeProfilePane.java b/designer-base/src/main/java/com/fr/design/mainframe/theme/ReportThemeProfilePane.java
index 021b1e3ee5..18423c06b3 100644
--- a/designer-base/src/main/java/com/fr/design/mainframe/theme/ReportThemeProfilePane.java
+++ b/designer-base/src/main/java/com/fr/design/mainframe/theme/ReportThemeProfilePane.java
@@ -6,7 +6,7 @@ import com.fr.design.ExtraDesignClassManager;
 import com.fr.design.i18n.Toolkit;
 import com.fr.design.mainframe.theme.edit.ReportBodyStyleEditPane;
 import com.fr.design.mainframe.theme.processor.ThemePreviewPaneProcessor;
-import com.fr.controldisplayenhance.theme.panel.WidgetDisplayReportThemePreviewPane;
+import com.fr.widgettheme.theme.panel.WidgetDisplayReportThemePreviewPane;
 
 /**
  * @author Starryi
diff --git a/designer-base/src/main/java/com/fr/design/mainframe/theme/TemplateThemeEditorPane.java b/designer-base/src/main/java/com/fr/design/mainframe/theme/TemplateThemeEditorPane.java
index 35e4c2553a..963f387f33 100644
--- a/designer-base/src/main/java/com/fr/design/mainframe/theme/TemplateThemeEditorPane.java
+++ b/designer-base/src/main/java/com/fr/design/mainframe/theme/TemplateThemeEditorPane.java
@@ -5,7 +5,7 @@ import com.fr.base.theme.TemplateTheme;
 import com.fr.base.theme.TemplateThemeConfig;
 import com.fr.base.theme.settings.ThemedCellStyleList;
 import com.fr.base.theme.settings.ThemedColorScheme;
-import com.fr.controldisplayenhance.util.WidgetThemeDesignerUtils;
+import com.fr.widgettheme.util.WidgetThemeDesignerUtils;
 import com.fr.design.ExtraDesignClassManager;
 import com.fr.design.beans.BasicBeanPane;
 import com.fr.design.designer.IntervalConstants;
@@ -29,8 +29,8 @@ import com.fr.general.GeneralContext;
 import com.fr.plugin.observer.PluginEvent;
 import com.fr.plugin.observer.PluginEventListener;
 import com.fr.stable.StringUtils;
-import com.fr.controldisplayenhance.theme.edit.ParamContainerStyleEditPane;
-import com.fr.controldisplayenhance.theme.edit.widget.WidgetStyleEditContainerPane;
+import com.fr.widgettheme.theme.edit.ParamContainerStyleEditPane;
+import com.fr.widgettheme.theme.edit.widget.WidgetStyleEditContainerPane;
 
 import javax.swing.BorderFactory;
 import javax.swing.JComponent;
diff --git a/designer-base/src/main/java/com/fr/controldisplayenhance/ParameterBackgroundStyleSettingPane.java b/designer-base/src/main/java/com/fr/widgettheme/ParameterBackgroundStyleSettingPane.java
similarity index 96%
rename from designer-base/src/main/java/com/fr/controldisplayenhance/ParameterBackgroundStyleSettingPane.java
rename to designer-base/src/main/java/com/fr/widgettheme/ParameterBackgroundStyleSettingPane.java
index ae1d226944..144308c223 100644
--- a/designer-base/src/main/java/com/fr/controldisplayenhance/ParameterBackgroundStyleSettingPane.java
+++ b/designer-base/src/main/java/com/fr/widgettheme/ParameterBackgroundStyleSettingPane.java
@@ -1,4 +1,4 @@
-package com.fr.controldisplayenhance;
+package com.fr.widgettheme;
 
 import com.fr.base.theme.TemplateTheme;
 import com.fr.design.beans.BasicBeanPane;
@@ -13,15 +13,15 @@ import com.fr.form.ui.container.WParameterLayout;
 import com.fr.general.Background;
 import org.jetbrains.annotations.Nullable;
 
-import javax.swing.*;
-import java.awt.*;
+import javax.swing.JPanel;
+import java.awt.BorderLayout;
 
 /**
  * 设计器参数面板的“高级”设置增加背景的主题样式设置
  *
  * @author Bruce.Deng
- * @version 11.0
- * Created by Bruce.Deng on 2023/2/20
+ * @since 11.0
+ * Created on 2023/2/20
  */
 public class ParameterBackgroundStyleSettingPane extends BasicBeanPane<WParameterLayout> {
 
diff --git a/designer-base/src/main/java/com/fr/controldisplayenhance/designer/WidgetThemeDisplayAction.java b/designer-base/src/main/java/com/fr/widgettheme/designer/WidgetThemeDisplayAction.java
similarity index 90%
rename from designer-base/src/main/java/com/fr/controldisplayenhance/designer/WidgetThemeDisplayAction.java
rename to designer-base/src/main/java/com/fr/widgettheme/designer/WidgetThemeDisplayAction.java
index 9217f9134a..b5ed01377a 100644
--- a/designer-base/src/main/java/com/fr/controldisplayenhance/designer/WidgetThemeDisplayAction.java
+++ b/designer-base/src/main/java/com/fr/widgettheme/designer/WidgetThemeDisplayAction.java
@@ -1,9 +1,9 @@
-package com.fr.controldisplayenhance.designer;
+package com.fr.widgettheme.designer;
 
 import com.fr.base.io.BaseBook;
 import com.fr.base.svg.IconUtils;
 import com.fr.design.actions.JTemplateAction;
-import com.fr.controldisplayenhance.util.WidgetThemeDesignerUtils;
+import com.fr.widgettheme.util.WidgetThemeDesignerUtils;
 import com.fr.design.dialog.DialogActionAdapter;
 import com.fr.design.file.HistoryTemplateListCache;
 import com.fr.design.i18n.Toolkit;
@@ -15,8 +15,8 @@ import java.awt.event.ActionEvent;
 
 /**
  * @author Bruce.Deng
- * @version 11.0
- * Created by Bruce.Deng on 2022/11/28
+ * @since 11.0
+ * Created 2022/11/28
  */
 public class WidgetThemeDisplayAction<T extends JTemplate<?, ?>> extends JTemplateAction<T> {
 
diff --git a/designer-base/src/main/java/com/fr/controldisplayenhance/designer/WidgetThemeDisplayConfigPane.java b/designer-base/src/main/java/com/fr/widgettheme/designer/WidgetThemeDisplayConfigPane.java
similarity index 97%
rename from designer-base/src/main/java/com/fr/controldisplayenhance/designer/WidgetThemeDisplayConfigPane.java
rename to designer-base/src/main/java/com/fr/widgettheme/designer/WidgetThemeDisplayConfigPane.java
index 09071a5597..3d70153eb5 100644
--- a/designer-base/src/main/java/com/fr/controldisplayenhance/designer/WidgetThemeDisplayConfigPane.java
+++ b/designer-base/src/main/java/com/fr/widgettheme/designer/WidgetThemeDisplayConfigPane.java
@@ -1,4 +1,4 @@
-package com.fr.controldisplayenhance.designer;
+package com.fr.widgettheme.designer;
 
 import com.fr.design.dialog.BasicPane;
 import com.fr.design.gui.icheckbox.UICheckBox;
diff --git a/designer-base/src/main/java/com/fr/controldisplayenhance/theme/edit/ParamContainerBackgroundPane.java b/designer-base/src/main/java/com/fr/widgettheme/theme/edit/ParamContainerBackgroundPane.java
similarity index 97%
rename from designer-base/src/main/java/com/fr/controldisplayenhance/theme/edit/ParamContainerBackgroundPane.java
rename to designer-base/src/main/java/com/fr/widgettheme/theme/edit/ParamContainerBackgroundPane.java
index 8b7d232240..b6fb44c92a 100644
--- a/designer-base/src/main/java/com/fr/controldisplayenhance/theme/edit/ParamContainerBackgroundPane.java
+++ b/designer-base/src/main/java/com/fr/widgettheme/theme/edit/ParamContainerBackgroundPane.java
@@ -1,4 +1,4 @@
-package com.fr.controldisplayenhance.theme.edit;
+package com.fr.widgettheme.theme.edit;
 
 import com.fr.design.ExtraDesignClassManager;
 import com.fr.design.event.UIObserverListener;
@@ -18,8 +18,8 @@ import java.util.Set;
 
 /**
  * @author Bruce.Deng
- * @version 11.0
- * Created by Bruce.Deng on 2023/1/5
+ * @since 11.0
+ * Created on 2023/1/5
  */
 public class ParamContainerBackgroundPane extends BackgroundPane {
     public ParamContainerBackgroundPane(){
diff --git a/designer-base/src/main/java/com/fr/controldisplayenhance/theme/edit/ParamContainerStyleEditPane.java b/designer-base/src/main/java/com/fr/widgettheme/theme/edit/ParamContainerStyleEditPane.java
similarity index 93%
rename from designer-base/src/main/java/com/fr/controldisplayenhance/theme/edit/ParamContainerStyleEditPane.java
rename to designer-base/src/main/java/com/fr/widgettheme/theme/edit/ParamContainerStyleEditPane.java
index 5094d726d9..6013ef212c 100644
--- a/designer-base/src/main/java/com/fr/controldisplayenhance/theme/edit/ParamContainerStyleEditPane.java
+++ b/designer-base/src/main/java/com/fr/widgettheme/theme/edit/ParamContainerStyleEditPane.java
@@ -1,4 +1,4 @@
-package com.fr.controldisplayenhance.theme.edit;
+package com.fr.widgettheme.theme.edit;
 
 import com.fr.base.theme.TemplateTheme;
 import com.fr.widgettheme.theme.widget.style.ThemedParamContainerStyle;
@@ -10,13 +10,15 @@ import com.fr.design.layout.FRGUIPaneFactory;
 import com.fr.design.layout.TableLayout;
 import com.fr.design.layout.TableLayoutHelper;
 
-import javax.swing.*;
-import java.awt.*;
+import javax.swing.BorderFactory;
+import javax.swing.JPanel;
+import java.awt.BorderLayout;
+import java.awt.Component;
 
 /**
  * @author Bruce.Deng
- * @version 11.0
- * Created by Bruce.Deng on 2022/12/16
+ * @since 11.0
+ * Created on 2022/12/16
  */
 public class ParamContainerStyleEditPane<T extends TemplateTheme> extends BasicBeanPane<T> {
     public static final int LABEL_WIDTH = 60;
diff --git a/designer-base/src/main/java/com/fr/controldisplayenhance/theme/edit/widget/DesktopWidgetStyleEditPane.java b/designer-base/src/main/java/com/fr/widgettheme/theme/edit/widget/DesktopWidgetStyleEditPane.java
similarity index 97%
rename from designer-base/src/main/java/com/fr/controldisplayenhance/theme/edit/widget/DesktopWidgetStyleEditPane.java
rename to designer-base/src/main/java/com/fr/widgettheme/theme/edit/widget/DesktopWidgetStyleEditPane.java
index 78dac07564..983b256814 100644
--- a/designer-base/src/main/java/com/fr/controldisplayenhance/theme/edit/widget/DesktopWidgetStyleEditPane.java
+++ b/designer-base/src/main/java/com/fr/widgettheme/theme/edit/widget/DesktopWidgetStyleEditPane.java
@@ -1,4 +1,4 @@
-package com.fr.controldisplayenhance.theme.edit.widget;
+package com.fr.widgettheme.theme.edit.widget;
 
 import com.fr.base.background.ColorBackground;
 import com.fr.base.theme.TemplateTheme;
@@ -11,8 +11,10 @@ import com.fr.design.gui.ilable.UILabel;
 import com.fr.design.i18n.Toolkit;
 import com.fr.design.layout.FRGUIPaneFactory;
 
-import javax.swing.*;
-import java.awt.*;
+import javax.swing.ButtonGroup;
+import javax.swing.JPanel;
+import java.awt.Component;
+
 
 /**
  * 桌面端主题面板
diff --git a/designer-base/src/main/java/com/fr/controldisplayenhance/theme/edit/widget/MobileWidgetStyleEditPane.java b/designer-base/src/main/java/com/fr/widgettheme/theme/edit/widget/MobileWidgetStyleEditPane.java
similarity index 97%
rename from designer-base/src/main/java/com/fr/controldisplayenhance/theme/edit/widget/MobileWidgetStyleEditPane.java
rename to designer-base/src/main/java/com/fr/widgettheme/theme/edit/widget/MobileWidgetStyleEditPane.java
index ef57dcc79a..29a1de5742 100644
--- a/designer-base/src/main/java/com/fr/controldisplayenhance/theme/edit/widget/MobileWidgetStyleEditPane.java
+++ b/designer-base/src/main/java/com/fr/widgettheme/theme/edit/widget/MobileWidgetStyleEditPane.java
@@ -1,4 +1,4 @@
-package com.fr.controldisplayenhance.theme.edit.widget;
+package com.fr.widgettheme.theme.edit.widget;
 
 import com.fr.base.theme.TemplateTheme;
 import com.fr.widgettheme.theme.widget.style.BorderStyle;
diff --git a/designer-base/src/main/java/com/fr/controldisplayenhance/theme/edit/widget/WidgetStyleEditContainerPane.java b/designer-base/src/main/java/com/fr/widgettheme/theme/edit/widget/WidgetStyleEditContainerPane.java
similarity index 96%
rename from designer-base/src/main/java/com/fr/controldisplayenhance/theme/edit/widget/WidgetStyleEditContainerPane.java
rename to designer-base/src/main/java/com/fr/widgettheme/theme/edit/widget/WidgetStyleEditContainerPane.java
index 67668b6c2a..789c0f61ac 100644
--- a/designer-base/src/main/java/com/fr/controldisplayenhance/theme/edit/widget/WidgetStyleEditContainerPane.java
+++ b/designer-base/src/main/java/com/fr/widgettheme/theme/edit/widget/WidgetStyleEditContainerPane.java
@@ -1,4 +1,4 @@
-package com.fr.controldisplayenhance.theme.edit.widget;
+package com.fr.widgettheme.theme.edit.widget;
 
 import com.fr.base.theme.TemplateTheme;
 import com.fr.design.beans.BasicBeanPane;
@@ -10,8 +10,9 @@ import com.fr.design.layout.TableLayout;
 import com.fr.design.layout.TableLayoutHelper;
 import org.jetbrains.annotations.Nullable;
 
-import javax.swing.*;
-import java.awt.*;
+import javax.swing.JPanel;
+import java.awt.BorderLayout;
+import java.awt.Component;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 
diff --git a/designer-base/src/main/java/com/fr/controldisplayenhance/theme/edit/widget/WidgetStyleEditPane.java b/designer-base/src/main/java/com/fr/widgettheme/theme/edit/widget/WidgetStyleEditPane.java
similarity index 93%
rename from designer-base/src/main/java/com/fr/controldisplayenhance/theme/edit/widget/WidgetStyleEditPane.java
rename to designer-base/src/main/java/com/fr/widgettheme/theme/edit/widget/WidgetStyleEditPane.java
index 89396ff2ca..e3a6d8e56c 100644
--- a/designer-base/src/main/java/com/fr/controldisplayenhance/theme/edit/widget/WidgetStyleEditPane.java
+++ b/designer-base/src/main/java/com/fr/widgettheme/theme/edit/widget/WidgetStyleEditPane.java
@@ -1,4 +1,4 @@
-package com.fr.controldisplayenhance.theme.edit.widget;
+package com.fr.widgettheme.theme.edit.widget;
 
 import com.fr.base.theme.TemplateTheme;
 import com.fr.design.beans.BasicBeanPane;
@@ -17,8 +17,11 @@ import com.fr.stable.StringUtils;
 import com.fr.widgettheme.theme.widget.theme.WidgetThemeDisplayConstants;
 import org.jetbrains.annotations.Nullable;
 
-import javax.swing.*;
-import java.awt.*;
+import javax.swing.BorderFactory;
+import javax.swing.JPanel;
+import java.awt.BorderLayout;
+import java.awt.Component;
+
 
 /**
  * 组件样式编辑基础类
@@ -58,6 +61,11 @@ public class WidgetStyleEditPane<T extends TemplateTheme> extends BasicBeanPane<
         this.add(customPane, BorderLayout.NORTH);
     }
 
+    /**
+     * 初始化标签
+     *
+     * @return components
+     */
     public Component[][] generateComponent() {
         Component[][] components = new Component[][]{new Component[]{
                 new UILabel(Toolkit.i18nText("Fine-Design_Widget_Theme_Color")), colorSelectBox},
diff --git a/designer-base/src/main/java/com/fr/controldisplayenhance/theme/panel/ButtonStyleDefinedPane.java b/designer-base/src/main/java/com/fr/widgettheme/theme/panel/ButtonStyleDefinedPane.java
similarity index 89%
rename from designer-base/src/main/java/com/fr/controldisplayenhance/theme/panel/ButtonStyleDefinedPane.java
rename to designer-base/src/main/java/com/fr/widgettheme/theme/panel/ButtonStyleDefinedPane.java
index 6b26bc1987..c6ec951eb4 100644
--- a/designer-base/src/main/java/com/fr/controldisplayenhance/theme/panel/ButtonStyleDefinedPane.java
+++ b/designer-base/src/main/java/com/fr/widgettheme/theme/panel/ButtonStyleDefinedPane.java
@@ -1,4 +1,4 @@
-package com.fr.controldisplayenhance.theme.panel;
+package com.fr.widgettheme.theme.panel;
 
 import com.fr.widgettheme.theme.widget.style.ButtonBackgroundStyle;
 import com.fr.design.dialog.BasicPane;
@@ -10,12 +10,18 @@ import com.fr.widgettheme.theme.bean.ButtonBackground;
 import com.fr.design.mainframe.widget.accessibles.AccessibleImgBackgroundEditor;
 import com.fr.general.Background;
 
-import javax.swing.*;
-import java.awt.*;
+import javax.swing.BorderFactory;
+import javax.swing.JPanel;
+import java.awt.BorderLayout;
+import java.awt.Component;
 
 /**
- * Created by johntsai(mailto://johntsai@fanruan.com) on 10/3/23.
- **/
+ * 按钮样式定义窗口
+ *
+ * @author obo
+ * @since 11.0
+ * Created on 2023/11/13
+ */
 public class ButtonStyleDefinedPane extends BasicPane {
 
     protected AccessibleImgBackgroundEditor initBackgroundPane;
@@ -47,12 +53,18 @@ public class ButtonStyleDefinedPane extends BasicPane {
 
     }
 
+    /**
+     * 填充
+     */
     public void populate(ButtonBackground buttonBackground) {
         initBackgroundPane.setValue(buttonBackground.getInitialBackground());
         overBackgroundPane.setValue(buttonBackground.getOverBackground());
         clickBackgroundPane.setValue(buttonBackground.getClickBackground());
     }
 
+    /**
+     * 更新
+     */
     public ButtonBackgroundStyle update() {
         return new ButtonBackgroundStyle((Background) initBackgroundPane.getValue(), (Background) overBackgroundPane.getValue(), (Background) clickBackgroundPane.getValue());
     }
diff --git a/designer-base/src/main/java/com/fr/controldisplayenhance/theme/panel/ControlPreviewCell.java b/designer-base/src/main/java/com/fr/widgettheme/theme/panel/ControlPreviewCell.java
similarity index 99%
rename from designer-base/src/main/java/com/fr/controldisplayenhance/theme/panel/ControlPreviewCell.java
rename to designer-base/src/main/java/com/fr/widgettheme/theme/panel/ControlPreviewCell.java
index 1f1fa6123a..776297879a 100644
--- a/designer-base/src/main/java/com/fr/controldisplayenhance/theme/panel/ControlPreviewCell.java
+++ b/designer-base/src/main/java/com/fr/widgettheme/theme/panel/ControlPreviewCell.java
@@ -1,4 +1,4 @@
-package com.fr.controldisplayenhance.theme.panel;
+package com.fr.widgettheme.theme.panel;
 
 import com.fr.base.BaseUtils;
 import com.fr.base.Style;
diff --git a/designer-base/src/main/java/com/fr/controldisplayenhance/theme/panel/ControlPreviewCellWithIcon.java b/designer-base/src/main/java/com/fr/widgettheme/theme/panel/ControlPreviewCellWithIcon.java
similarity index 88%
rename from designer-base/src/main/java/com/fr/controldisplayenhance/theme/panel/ControlPreviewCellWithIcon.java
rename to designer-base/src/main/java/com/fr/widgettheme/theme/panel/ControlPreviewCellWithIcon.java
index 361cd1245e..3b55899e01 100644
--- a/designer-base/src/main/java/com/fr/controldisplayenhance/theme/panel/ControlPreviewCellWithIcon.java
+++ b/designer-base/src/main/java/com/fr/widgettheme/theme/panel/ControlPreviewCellWithIcon.java
@@ -1,4 +1,4 @@
-package com.fr.controldisplayenhance.theme.panel;
+package com.fr.widgettheme.theme.panel;
 
 
 import com.fr.base.svg.IconUtils;
@@ -7,15 +7,20 @@ import com.fr.design.border.UIRoundedBorder;
 import com.fr.stable.StringUtils;
 import com.fr.widgettheme.theme.widget.theme.WidgetThemeDisplayConstants;
 
-import javax.swing.*;
-import java.awt.*;
+import javax.swing.Icon;
+import javax.swing.JLabel;
+import java.awt.BorderLayout;
+import java.awt.Color;
+import java.awt.Dimension;
+import java.awt.Graphics;
+import java.awt.LayoutManager;
 
 /**
  * 主题界面预览控件单元格子,控件图表直接用icon
  *
  * @author John.Ying
- * @version 11.0
- * Created by John.Ying on 2023/3/18
+ * @since 11.0
+ * Created on 2023/3/18
  */
 public class ControlPreviewCellWithIcon extends ControlPreviewCell {
     private static final int CONTROL_ALPHA = 16;
diff --git a/designer-base/src/main/java/com/fr/controldisplayenhance/theme/panel/ControlPreviewPane.java b/designer-base/src/main/java/com/fr/widgettheme/theme/panel/ControlPreviewPane.java
similarity index 95%
rename from designer-base/src/main/java/com/fr/controldisplayenhance/theme/panel/ControlPreviewPane.java
rename to designer-base/src/main/java/com/fr/widgettheme/theme/panel/ControlPreviewPane.java
index 91395c2918..110e6943c4 100644
--- a/designer-base/src/main/java/com/fr/controldisplayenhance/theme/panel/ControlPreviewPane.java
+++ b/designer-base/src/main/java/com/fr/widgettheme/theme/panel/ControlPreviewPane.java
@@ -1,4 +1,4 @@
-package com.fr.controldisplayenhance.theme.panel;
+package com.fr.widgettheme.theme.panel;
 
 import com.fr.base.background.ColorBackground;
 import com.fr.base.theme.TemplateTheme;
@@ -7,8 +7,11 @@ import com.fr.design.layout.FRGUIPaneFactory;
 import com.fr.design.mainframe.theme.preview.ThemePreviewed;
 import com.fr.general.Background;
 
-import javax.swing.*;
-import java.awt.*;
+import javax.swing.JPanel;
+import java.awt.Color;
+import java.awt.Dimension;
+import java.awt.Graphics;
+import java.awt.Graphics2D;
 import java.awt.geom.Rectangle2D;
 import java.util.ArrayList;
 import java.util.List;
@@ -17,8 +20,8 @@ import java.util.List;
  * 主题界面页面中的参数界面
  *
  * @author John.Ying
- * @version 11.0
- * Created by John.Ying on 2023/3/18
+ * @since 11.0
+ * Created on 2023/3/18
  */
 public class ControlPreviewPane extends JPanel implements ThemePreviewed<TemplateTheme> {
 
diff --git a/designer-base/src/main/java/com/fr/controldisplayenhance/theme/panel/ImageUtils.java b/designer-base/src/main/java/com/fr/widgettheme/theme/panel/ImageUtils.java
similarity index 76%
rename from designer-base/src/main/java/com/fr/controldisplayenhance/theme/panel/ImageUtils.java
rename to designer-base/src/main/java/com/fr/widgettheme/theme/panel/ImageUtils.java
index 9001dd84c5..5cedf6203f 100644
--- a/designer-base/src/main/java/com/fr/controldisplayenhance/theme/panel/ImageUtils.java
+++ b/designer-base/src/main/java/com/fr/widgettheme/theme/panel/ImageUtils.java
@@ -1,15 +1,27 @@
-package com.fr.controldisplayenhance.theme.panel;
+package com.fr.widgettheme.theme.panel;
 
-import javax.swing.*;
-import java.awt.*;
+import javax.swing.ImageIcon;
+import java.awt.Color;
+import java.awt.Graphics;
 import java.awt.image.BufferedImage;
 import java.awt.image.WritableRaster;
 
 /**
- * Created by johntsai(mailto://johntsai@fanruan.com) on 15/6/23.
- **/
+ * 控件主题Image处理工具类
+ *
+ * @author obo
+ * @since 11.0
+ * Created on 2023/11/13
+ */
 public class ImageUtils {
 
+    /**
+     * 根据主题色处理image
+     *
+     * @param image 图像
+     * @param color 主题色
+     * @return 处理结果
+     */
     public static BufferedImage colorImage(BufferedImage image, Color color) {
         int width = image.getWidth();
         int height = image.getHeight();
@@ -42,6 +54,12 @@ public class ImageUtils {
         return image;
     }
 
+    /**
+     * ImageIcon转换为BufferImage
+     *
+     * @param icon imageIcon
+     * @return BufferedImage
+     */
     public static BufferedImage imageIconToBufferedImage(ImageIcon icon) {
         BufferedImage bi = new BufferedImage(
                 icon.getIconWidth(),
diff --git a/designer-base/src/main/java/com/fr/controldisplayenhance/theme/panel/NormalButtonPreviewCell.java b/designer-base/src/main/java/com/fr/widgettheme/theme/panel/NormalButtonPreviewCell.java
similarity index 96%
rename from designer-base/src/main/java/com/fr/controldisplayenhance/theme/panel/NormalButtonPreviewCell.java
rename to designer-base/src/main/java/com/fr/widgettheme/theme/panel/NormalButtonPreviewCell.java
index 47f2d8fd49..fe8a2076e5 100644
--- a/designer-base/src/main/java/com/fr/controldisplayenhance/theme/panel/NormalButtonPreviewCell.java
+++ b/designer-base/src/main/java/com/fr/widgettheme/theme/panel/NormalButtonPreviewCell.java
@@ -1,4 +1,4 @@
-package com.fr.controldisplayenhance.theme.panel;
+package com.fr.widgettheme.theme.panel;
 
 
 import com.fr.widgettheme.theme.widget.style.ThemedWidgetStyle;
diff --git a/designer-base/src/main/java/com/fr/controldisplayenhance/theme/panel/RingControlPreviewCell.java b/designer-base/src/main/java/com/fr/widgettheme/theme/panel/RingControlPreviewCell.java
similarity index 84%
rename from designer-base/src/main/java/com/fr/controldisplayenhance/theme/panel/RingControlPreviewCell.java
rename to designer-base/src/main/java/com/fr/widgettheme/theme/panel/RingControlPreviewCell.java
index 972ef785e1..6d492688d4 100644
--- a/designer-base/src/main/java/com/fr/controldisplayenhance/theme/panel/RingControlPreviewCell.java
+++ b/designer-base/src/main/java/com/fr/widgettheme/theme/panel/RingControlPreviewCell.java
@@ -1,16 +1,20 @@
-package com.fr.controldisplayenhance.theme.panel;
+package com.fr.widgettheme.theme.panel;
 
 
 import com.fr.widgettheme.theme.widget.style.ThemedWidgetStyle;
 
-import java.awt.*;
+import java.awt.Dimension;
+import java.awt.LayoutManager;
+import java.awt.Graphics2D;
+import java.awt.Graphics;
+import java.awt.Color;
 
 /**
  * 主题界面预览控件单元格子,单选按钮组被选中的样子
  *
  * @author John.Ying
- * @version 11.0
- * Created by John.Ying on 2023/3/18
+ * @since 11.0
+ * Created on 2023/3/18
  */
 public class RingControlPreviewCell extends ControlPreviewCell {
     /**
diff --git a/designer-base/src/main/java/com/fr/controldisplayenhance/theme/panel/RoundControlPreviewCell.java b/designer-base/src/main/java/com/fr/widgettheme/theme/panel/RoundControlPreviewCell.java
similarity index 83%
rename from designer-base/src/main/java/com/fr/controldisplayenhance/theme/panel/RoundControlPreviewCell.java
rename to designer-base/src/main/java/com/fr/widgettheme/theme/panel/RoundControlPreviewCell.java
index ae9757bd35..dc98146b35 100644
--- a/designer-base/src/main/java/com/fr/controldisplayenhance/theme/panel/RoundControlPreviewCell.java
+++ b/designer-base/src/main/java/com/fr/widgettheme/theme/panel/RoundControlPreviewCell.java
@@ -1,16 +1,20 @@
-package com.fr.controldisplayenhance.theme.panel;
+package com.fr.widgettheme.theme.panel;
 
 
 import com.fr.widgettheme.theme.widget.style.ThemedWidgetStyle;
 
-import java.awt.*;
+import java.awt.Color;
+import java.awt.Dimension;
+import java.awt.Graphics;
+import java.awt.Graphics2D;
+import java.awt.LayoutManager;
 
 /**
  * 主题界面预览控件单元格子,单选按钮组未被选中的样子
  *
  * @author John.Ying
- * @version 11.0
- * Created by John.Ying on 2023/3/18
+ * @since 11.0
+ * Created on 2023/3/18
  */
 public class RoundControlPreviewCell extends ControlPreviewCell {
     public RoundControlPreviewCell() {
diff --git a/designer-base/src/main/java/com/fr/controldisplayenhance/theme/panel/TextPreviewCell.java b/designer-base/src/main/java/com/fr/widgettheme/theme/panel/TextPreviewCell.java
similarity index 93%
rename from designer-base/src/main/java/com/fr/controldisplayenhance/theme/panel/TextPreviewCell.java
rename to designer-base/src/main/java/com/fr/widgettheme/theme/panel/TextPreviewCell.java
index 94bf986286..c79be9f69d 100644
--- a/designer-base/src/main/java/com/fr/controldisplayenhance/theme/panel/TextPreviewCell.java
+++ b/designer-base/src/main/java/com/fr/widgettheme/theme/panel/TextPreviewCell.java
@@ -1,4 +1,4 @@
-package com.fr.controldisplayenhance.theme.panel;
+package com.fr.widgettheme.theme.panel;
 
 
 import com.fr.base.theme.TemplateTheme;
diff --git a/designer-base/src/main/java/com/fr/controldisplayenhance/theme/panel/WidgetDisplayFormThemePreviewPane.java b/designer-base/src/main/java/com/fr/widgettheme/theme/panel/WidgetDisplayFormThemePreviewPane.java
similarity index 95%
rename from designer-base/src/main/java/com/fr/controldisplayenhance/theme/panel/WidgetDisplayFormThemePreviewPane.java
rename to designer-base/src/main/java/com/fr/widgettheme/theme/panel/WidgetDisplayFormThemePreviewPane.java
index bc8e6d76f6..cd9f92aaac 100644
--- a/designer-base/src/main/java/com/fr/controldisplayenhance/theme/panel/WidgetDisplayFormThemePreviewPane.java
+++ b/designer-base/src/main/java/com/fr/widgettheme/theme/panel/WidgetDisplayFormThemePreviewPane.java
@@ -1,4 +1,4 @@
-package com.fr.controldisplayenhance.theme.panel;
+package com.fr.widgettheme.theme.panel;
 
 import com.fr.base.BaseFormula;
 import com.fr.base.background.ColorBackground;
@@ -26,8 +26,13 @@ import com.fr.plugin.chart.vanchart.VanChart;
 import com.fr.stable.Constants;
 import com.fr.stable.StringUtils;
 
-import javax.swing.*;
-import java.awt.*;
+import javax.swing.JPanel;
+import java.awt.AlphaComposite;
+import java.awt.BorderLayout;
+import java.awt.Color;
+import java.awt.Composite;
+import java.awt.Dimension;
+import java.awt.Graphics2D;
 import java.awt.geom.Rectangle2D;
 
 import static com.fr.design.i18n.Toolkit.i18nText;
@@ -36,8 +41,8 @@ import static com.fr.design.i18n.Toolkit.i18nText;
  * 主题界面预览控frm界面,就是主jar里的那个界面，做了简单的修改
  *
  * @author John.Ying
- * @version 11.0
- * Created by John.Ying on 2023/3/18
+ * @since 11.0
+ * Created on 2023/3/18
  */
 public class WidgetDisplayFormThemePreviewPane extends TemplateThemePreviewPane<FormTheme> {
     private WidgetThemeECComponentPreviewPane elementCasePane;
@@ -116,7 +121,11 @@ public class WidgetDisplayFormThemePreviewPane extends TemplateThemePreviewPane<
         g2d.setComposite(oldComposite);
     }
 
-    //柱形图
+    /**
+     * 初始化柱形图
+     *
+     * @return 存放图表
+     */
     private ChartCollection initColumnChart() {
         try {
             VanChart chart = (VanChart) ChartTypeManager.getInstance().getCharts(VanChartColumnPlot.VAN_CHART_COLUMN_PLOT_ID)[0].clone();
@@ -176,7 +185,11 @@ public class WidgetDisplayFormThemePreviewPane extends TemplateThemePreviewPane<
         return null;
     }
 
-    //饼图
+    /**
+     * 初始化饼图
+     *
+     * @return chartCollection
+     */
     private ChartCollection initPieChart() {
         try {
             VanChart chart = (VanChart) ChartTypeManager.getInstance().getCharts(PiePlot4VanChart.VAN_CHART_PIE_PLOT)[0].clone();
diff --git a/designer-base/src/main/java/com/fr/controldisplayenhance/theme/panel/WidgetDisplayReportThemePreviewPane.java b/designer-base/src/main/java/com/fr/widgettheme/theme/panel/WidgetDisplayReportThemePreviewPane.java
similarity index 95%
rename from designer-base/src/main/java/com/fr/controldisplayenhance/theme/panel/WidgetDisplayReportThemePreviewPane.java
rename to designer-base/src/main/java/com/fr/widgettheme/theme/panel/WidgetDisplayReportThemePreviewPane.java
index d0806c0031..728f7a7109 100644
--- a/designer-base/src/main/java/com/fr/controldisplayenhance/theme/panel/WidgetDisplayReportThemePreviewPane.java
+++ b/designer-base/src/main/java/com/fr/widgettheme/theme/panel/WidgetDisplayReportThemePreviewPane.java
@@ -1,4 +1,4 @@
-package com.fr.controldisplayenhance.theme.panel;
+package com.fr.widgettheme.theme.panel;
 
 import com.fr.base.BaseFormula;
 import com.fr.base.background.ColorBackground;
@@ -20,15 +20,18 @@ import com.fr.plugin.chart.column.VanChartColumnPlot;
 import com.fr.plugin.chart.type.GradientType;
 import com.fr.plugin.chart.vanchart.VanChart;
 
-import java.awt.*;
+import java.awt.BorderLayout;
+import java.awt.Color;
+import java.awt.Dimension;
+import java.awt.Graphics2D;
 import java.awt.geom.Rectangle2D;
 
 /**
  * 主题界面预览控cpt界面,就是主jar里的那个界面，做了简单的修改
  *
  * @author John.Ying
- * @version 11.0
- * Created by John.Ying on 2023/3/18
+ * @since 11.0
+ * Created on 2023/3/18
  */
 public class WidgetDisplayReportThemePreviewPane extends TemplateThemePreviewPane<ReportTheme> {
     private Background background;
@@ -74,7 +77,11 @@ public class WidgetDisplayReportThemePreviewPane extends TemplateThemePreviewPan
     }
 
 
-    //柱形图
+    /**
+     * 初始化柱形图
+     *
+     * @return chartCollection
+     */
     private ChartCollection initColumnChart() {
         try {
             VanChart chart = (VanChart) ChartTypeManager.getInstance().getCharts(VanChartColumnPlot.VAN_CHART_COLUMN_PLOT_ID)[0].clone();
diff --git a/designer-base/src/main/java/com/fr/controldisplayenhance/theme/panel/WidgetThemeECComponentPreviewPane.java b/designer-base/src/main/java/com/fr/widgettheme/theme/panel/WidgetThemeECComponentPreviewPane.java
similarity index 86%
rename from designer-base/src/main/java/com/fr/controldisplayenhance/theme/panel/WidgetThemeECComponentPreviewPane.java
rename to designer-base/src/main/java/com/fr/widgettheme/theme/panel/WidgetThemeECComponentPreviewPane.java
index c94423af2a..a2a873ea38 100644
--- a/designer-base/src/main/java/com/fr/controldisplayenhance/theme/panel/WidgetThemeECComponentPreviewPane.java
+++ b/designer-base/src/main/java/com/fr/widgettheme/theme/panel/WidgetThemeECComponentPreviewPane.java
@@ -1,9 +1,9 @@
-package com.fr.controldisplayenhance.theme.panel;
+package com.fr.widgettheme.theme.panel;
 
 import com.fr.base.theme.FormTheme;
 import com.fr.design.mainframe.theme.preview.ComponentPreviewPane;
 
-import java.awt.*;
+import java.awt.Component;
 
 import static com.fr.design.i18n.Toolkit.i18nText;
 
@@ -11,8 +11,8 @@ import static com.fr.design.i18n.Toolkit.i18nText;
  * 决策报表主题界面的那个表格+标题部分
  *
  * @author John.Ying
- * @version 1.0
- * Created by John.Ying on 2021/3/18
+ * @since 1.0
+ * Created on 2021/3/18
  */
 public class WidgetThemeECComponentPreviewPane extends ComponentPreviewPane {
     private WidgetThemeECPreviewPane contentPane;
diff --git a/designer-base/src/main/java/com/fr/controldisplayenhance/theme/panel/WidgetThemeECPreviewPane.java b/designer-base/src/main/java/com/fr/widgettheme/theme/panel/WidgetThemeECPreviewPane.java
similarity index 99%
rename from designer-base/src/main/java/com/fr/controldisplayenhance/theme/panel/WidgetThemeECPreviewPane.java
rename to designer-base/src/main/java/com/fr/widgettheme/theme/panel/WidgetThemeECPreviewPane.java
index 13682a8f66..d25993a99c 100644
--- a/designer-base/src/main/java/com/fr/controldisplayenhance/theme/panel/WidgetThemeECPreviewPane.java
+++ b/designer-base/src/main/java/com/fr/widgettheme/theme/panel/WidgetThemeECPreviewPane.java
@@ -1,4 +1,4 @@
-package com.fr.controldisplayenhance.theme.panel;
+package com.fr.widgettheme.theme.panel;
 
 import com.fr.base.CellBorderSourceFlag;
 import com.fr.base.theme.TemplateTheme;
diff --git a/designer-base/src/main/java/com/fr/controldisplayenhance/theme/panel/WidgetThemeECReportPreviewPane.java b/designer-base/src/main/java/com/fr/widgettheme/theme/panel/WidgetThemeECReportPreviewPane.java
similarity index 99%
rename from designer-base/src/main/java/com/fr/controldisplayenhance/theme/panel/WidgetThemeECReportPreviewPane.java
rename to designer-base/src/main/java/com/fr/widgettheme/theme/panel/WidgetThemeECReportPreviewPane.java
index 1dac032b14..ce48796297 100644
--- a/designer-base/src/main/java/com/fr/controldisplayenhance/theme/panel/WidgetThemeECReportPreviewPane.java
+++ b/designer-base/src/main/java/com/fr/widgettheme/theme/panel/WidgetThemeECReportPreviewPane.java
@@ -1,4 +1,4 @@
-package com.fr.controldisplayenhance.theme.panel;
+package com.fr.widgettheme.theme.panel;
 
 import com.fr.base.CellBorderSourceFlag;
 import com.fr.base.theme.ReportTheme;
diff --git a/designer-base/src/main/java/com/fr/controldisplayenhance/util/WidgetThemeDesignerUtils.java b/designer-base/src/main/java/com/fr/widgettheme/util/WidgetThemeDesignerUtils.java
similarity index 97%
rename from designer-base/src/main/java/com/fr/controldisplayenhance/util/WidgetThemeDesignerUtils.java
rename to designer-base/src/main/java/com/fr/widgettheme/util/WidgetThemeDesignerUtils.java
index 8fdfa54f73..25b07be0a3 100644
--- a/designer-base/src/main/java/com/fr/controldisplayenhance/util/WidgetThemeDesignerUtils.java
+++ b/designer-base/src/main/java/com/fr/widgettheme/util/WidgetThemeDesignerUtils.java
@@ -1,4 +1,4 @@
-package com.fr.controldisplayenhance.util;
+package com.fr.widgettheme.util;
 
 import com.fr.base.io.AttrMark;
 import com.fr.base.io.IOFile;
diff --git a/designer-base/src/main/java/com/fr/controldisplayenhance/widget/mobile/pane/DisplayEnhanceMobileStyleDefinePane.java b/designer-base/src/main/java/com/fr/widgettheme/widget/mobile/pane/DisplayEnhanceMobileStyleDefinePane.java
similarity index 99%
rename from designer-base/src/main/java/com/fr/controldisplayenhance/widget/mobile/pane/DisplayEnhanceMobileStyleDefinePane.java
rename to designer-base/src/main/java/com/fr/widgettheme/widget/mobile/pane/DisplayEnhanceMobileStyleDefinePane.java
index b53ce8ed72..4ec64262be 100644
--- a/designer-base/src/main/java/com/fr/controldisplayenhance/widget/mobile/pane/DisplayEnhanceMobileStyleDefinePane.java
+++ b/designer-base/src/main/java/com/fr/widgettheme/widget/mobile/pane/DisplayEnhanceMobileStyleDefinePane.java
@@ -1,4 +1,4 @@
-package com.fr.controldisplayenhance.widget.mobile.pane;
+package com.fr.widgettheme.widget.mobile.pane;
 
 import com.fr.base.background.ColorBackground;
 import com.fr.widgettheme.theme.widget.style.MobileThemedWidgetStyle;
diff --git a/designer-base/src/main/java/com/fr/controldisplayenhance/widget/mobile/pane/FileEditorMobileStyleDefinePane.java b/designer-base/src/main/java/com/fr/widgettheme/widget/mobile/pane/FileEditorMobileStyleDefinePane.java
similarity index 97%
rename from designer-base/src/main/java/com/fr/controldisplayenhance/widget/mobile/pane/FileEditorMobileStyleDefinePane.java
rename to designer-base/src/main/java/com/fr/widgettheme/widget/mobile/pane/FileEditorMobileStyleDefinePane.java
index f5896b6bb9..801585f429 100644
--- a/designer-base/src/main/java/com/fr/controldisplayenhance/widget/mobile/pane/FileEditorMobileStyleDefinePane.java
+++ b/designer-base/src/main/java/com/fr/widgettheme/widget/mobile/pane/FileEditorMobileStyleDefinePane.java
@@ -1,4 +1,4 @@
-package com.fr.controldisplayenhance.widget.mobile.pane;
+package com.fr.widgettheme.widget.mobile.pane;
 
 import com.fr.base.background.ColorBackground;
 import com.fr.widgettheme.theme.widget.mobile.style.FileEditorStyle;
diff --git a/designer-base/src/main/java/com/fr/controldisplayenhance/widget/mobile/pane/FreeButtonMobileStyleDefinePane.java b/designer-base/src/main/java/com/fr/widgettheme/widget/mobile/pane/FreeButtonMobileStyleDefinePane.java
similarity index 98%
rename from designer-base/src/main/java/com/fr/controldisplayenhance/widget/mobile/pane/FreeButtonMobileStyleDefinePane.java
rename to designer-base/src/main/java/com/fr/widgettheme/widget/mobile/pane/FreeButtonMobileStyleDefinePane.java
index 499ea8ba87..6ab19b8dcf 100644
--- a/designer-base/src/main/java/com/fr/controldisplayenhance/widget/mobile/pane/FreeButtonMobileStyleDefinePane.java
+++ b/designer-base/src/main/java/com/fr/widgettheme/widget/mobile/pane/FreeButtonMobileStyleDefinePane.java
@@ -1,4 +1,4 @@
-package com.fr.controldisplayenhance.widget.mobile.pane;
+package com.fr.widgettheme.widget.mobile.pane;
 
 import com.fr.base.background.ColorBackground;
 import com.fr.widgettheme.theme.widget.mobile.style.FreeButtonStyle;
diff --git a/designer-base/src/main/java/com/fr/controldisplayenhance/widget/mobile/pane/LabelMobileStyleDefinePane.java b/designer-base/src/main/java/com/fr/widgettheme/widget/mobile/pane/LabelMobileStyleDefinePane.java
similarity index 98%
rename from designer-base/src/main/java/com/fr/controldisplayenhance/widget/mobile/pane/LabelMobileStyleDefinePane.java
rename to designer-base/src/main/java/com/fr/widgettheme/widget/mobile/pane/LabelMobileStyleDefinePane.java
index 3ea4cd39a4..17388b859d 100644
--- a/designer-base/src/main/java/com/fr/controldisplayenhance/widget/mobile/pane/LabelMobileStyleDefinePane.java
+++ b/designer-base/src/main/java/com/fr/widgettheme/widget/mobile/pane/LabelMobileStyleDefinePane.java
@@ -1,4 +1,4 @@
-package com.fr.controldisplayenhance.widget.mobile.pane;
+package com.fr.widgettheme.widget.mobile.pane;
 
 import com.fr.base.background.ColorBackground;
 import com.fr.widgettheme.theme.widget.mobile.style.LabelIconSettingStyle;
diff --git a/designer-base/src/main/java/com/fr/controldisplayenhance/widget/mobile/pane/MobileStyleFontConfigPane.java b/designer-base/src/main/java/com/fr/widgettheme/widget/mobile/pane/MobileStyleFontConfigPane.java
similarity index 98%
rename from designer-base/src/main/java/com/fr/controldisplayenhance/widget/mobile/pane/MobileStyleFontConfigPane.java
rename to designer-base/src/main/java/com/fr/widgettheme/widget/mobile/pane/MobileStyleFontConfigPane.java
index e0f13a499e..84aa422fa1 100644
--- a/designer-base/src/main/java/com/fr/controldisplayenhance/widget/mobile/pane/MobileStyleFontConfigPane.java
+++ b/designer-base/src/main/java/com/fr/widgettheme/widget/mobile/pane/MobileStyleFontConfigPane.java
@@ -1,4 +1,4 @@
-package com.fr.controldisplayenhance.widget.mobile.pane;
+package com.fr.widgettheme.widget.mobile.pane;
 
 
 import com.fr.base.BaseUtils;
diff --git a/designer-base/src/main/java/com/fr/controldisplayenhance/widget/mobile/provider/DisplayEnhanceMobileStyleFactory.java b/designer-base/src/main/java/com/fr/widgettheme/widget/mobile/provider/DisplayEnhanceMobileStyleFactory.java
similarity index 86%
rename from designer-base/src/main/java/com/fr/controldisplayenhance/widget/mobile/provider/DisplayEnhanceMobileStyleFactory.java
rename to designer-base/src/main/java/com/fr/widgettheme/widget/mobile/provider/DisplayEnhanceMobileStyleFactory.java
index 48d1620984..53650ca5d2 100644
--- a/designer-base/src/main/java/com/fr/controldisplayenhance/widget/mobile/provider/DisplayEnhanceMobileStyleFactory.java
+++ b/designer-base/src/main/java/com/fr/widgettheme/widget/mobile/provider/DisplayEnhanceMobileStyleFactory.java
@@ -1,8 +1,8 @@
-package com.fr.controldisplayenhance.widget.mobile.provider;
+package com.fr.widgettheme.widget.mobile.provider;
 
-import com.fr.controldisplayenhance.widget.mobile.pane.FileEditorMobileStyleDefinePane;
-import com.fr.controldisplayenhance.widget.mobile.pane.FreeButtonMobileStyleDefinePane;
-import com.fr.controldisplayenhance.widget.mobile.pane.LabelMobileStyleDefinePane;
+import com.fr.widgettheme.widget.mobile.pane.FileEditorMobileStyleDefinePane;
+import com.fr.widgettheme.widget.mobile.pane.FreeButtonMobileStyleDefinePane;
+import com.fr.widgettheme.widget.mobile.pane.LabelMobileStyleDefinePane;
 import com.fr.widgettheme.theme.widget.mobile.style.FileEditorStyle;
 import com.fr.widgettheme.theme.widget.mobile.style.FreeButtonStyle;
 import com.fr.widgettheme.theme.widget.mobile.style.LabelIconSettingStyle;
diff --git a/designer-base/src/main/java/com/fr/controldisplayenhance/widget/mobile/provider/WidgetThemeMobileStyleDefinePaneCreator.java b/designer-base/src/main/java/com/fr/widgettheme/widget/mobile/provider/WidgetThemeMobileStyleDefinePaneCreator.java
similarity index 94%
rename from designer-base/src/main/java/com/fr/controldisplayenhance/widget/mobile/provider/WidgetThemeMobileStyleDefinePaneCreator.java
rename to designer-base/src/main/java/com/fr/widgettheme/widget/mobile/provider/WidgetThemeMobileStyleDefinePaneCreator.java
index af5cf670ea..371d0ae579 100644
--- a/designer-base/src/main/java/com/fr/controldisplayenhance/widget/mobile/provider/WidgetThemeMobileStyleDefinePaneCreator.java
+++ b/designer-base/src/main/java/com/fr/widgettheme/widget/mobile/provider/WidgetThemeMobileStyleDefinePaneCreator.java
@@ -1,7 +1,7 @@
-package com.fr.controldisplayenhance.widget.mobile.provider;
+package com.fr.widgettheme.widget.mobile.provider;
 
 import com.fr.base.io.IOFile;
-import com.fr.controldisplayenhance.widget.mobile.pane.DisplayEnhanceMobileStyleDefinePane;
+import com.fr.widgettheme.widget.mobile.pane.DisplayEnhanceMobileStyleDefinePane;
 import com.fr.widgettheme.theme.widget.mobile.style.WidgetThemeMobileCommonExtraStyle;
 import com.fr.design.beans.BasicBeanPane;
 import com.fr.design.file.HistoryTemplateListCache;
diff --git a/designer-form/src/main/java/com/fr/design/widgettheme/StyleSettingPane.java b/designer-form/src/main/java/com/fr/design/widgettheme/StyleSettingPane.java
index 9e48556a81..4d9b954838 100644
--- a/designer-form/src/main/java/com/fr/design/widgettheme/StyleSettingPane.java
+++ b/designer-form/src/main/java/com/fr/design/widgettheme/StyleSettingPane.java
@@ -23,7 +23,7 @@ import com.fr.design.widget.ui.designer.component.FontSizeComboPane;
 import com.fr.design.widget.ui.designer.component.UIBoundSpinner;
 import com.fr.form.ui.Widget;
 import com.fr.general.FRFont;
-import com.fr.controldisplayenhance.theme.panel.ButtonStyleDefinedPane;
+import com.fr.widgettheme.theme.panel.ButtonStyleDefinedPane;
 import com.fr.widgettheme.theme.widget.theme.WidgetThemeDisplayConstants;
 
 import javax.swing.*;
diff --git a/designer-form/src/main/java/com/fr/design/widgettheme/common/NormalButtonSettingPane.java b/designer-form/src/main/java/com/fr/design/widgettheme/common/NormalButtonSettingPane.java
index b122fda787..31c433f4b9 100644
--- a/designer-form/src/main/java/com/fr/design/widgettheme/common/NormalButtonSettingPane.java
+++ b/designer-form/src/main/java/com/fr/design/widgettheme/common/NormalButtonSettingPane.java
@@ -10,7 +10,6 @@ import com.fr.design.widgettheme.StyleSetting;
 import com.fr.widgettheme.theme.widget.theme.cell.NormalButtonTheme;
 import org.jetbrains.annotations.Nullable;
 
-import javax.swing.*;
 import java.util.Arrays;
 import java.util.List;
 
@@ -30,7 +29,6 @@ public class NormalButtonSettingPane<T extends Widget> extends StyleSettingPane<
                 StyleSetting.LINE_TYPE,
                 StyleSetting.BORDER_RADIUS
         ));
-        this.setBorder(BorderFactory.createEmptyBorder(10, 0, 0, 0));
     }
 
     public NormalButtonSettingPane(List<StyleSetting> styleSettingList) {
diff --git a/designer-form/src/main/java/com/fr/design/widgettheme/processor/WidgetThemeCreatorPaneAcceptor.java b/designer-form/src/main/java/com/fr/design/widgettheme/processor/WidgetThemeCreatorPaneAcceptor.java
index a0660c9b78..489105a22f 100644
--- a/designer-form/src/main/java/com/fr/design/widgettheme/processor/WidgetThemeCreatorPaneAcceptor.java
+++ b/designer-form/src/main/java/com/fr/design/widgettheme/processor/WidgetThemeCreatorPaneAcceptor.java
@@ -1,6 +1,6 @@
 package com.fr.design.widgettheme.processor;
 
-import com.fr.controldisplayenhance.util.WidgetThemeDesignerUtils;
+import com.fr.widgettheme.util.WidgetThemeDesignerUtils;
 import com.fr.design.beans.BasicBeanPane;
 import com.fr.form.parameter.FormSubmitButton;
 import com.fr.form.ui.Button;
diff --git a/designer-form/src/main/java/com/fr/design/widgettheme/processor/WidgetThemeXCreaterPaneAcceptor.java b/designer-form/src/main/java/com/fr/design/widgettheme/processor/WidgetThemeXCreaterPaneAcceptor.java
index 95ab962fd6..5ffca98d36 100644
--- a/designer-form/src/main/java/com/fr/design/widgettheme/processor/WidgetThemeXCreaterPaneAcceptor.java
+++ b/designer-form/src/main/java/com/fr/design/widgettheme/processor/WidgetThemeXCreaterPaneAcceptor.java
@@ -1,6 +1,6 @@
 package com.fr.design.widgettheme.processor;
 
-import com.fr.controldisplayenhance.util.WidgetThemeDesignerUtils;
+import com.fr.widgettheme.util.WidgetThemeDesignerUtils;
 import com.fr.design.beans.BasicBeanPane;
 import com.fr.design.designer.creator.XButton;
 import com.fr.design.designer.creator.XCheckBox;
@@ -19,7 +19,7 @@ import com.fr.design.widgettheme.LabelSettingPane;
 import com.fr.design.widgettheme.ParaButtonSettingPane;
 import com.fr.design.widgettheme.ParaEditorSettingPane;
 import com.fr.design.widgettheme.ParaTreeEditorSettingPane;
-import com.fr.controldisplayenhance.ParameterBackgroundStyleSettingPane;
+import com.fr.widgettheme.ParameterBackgroundStyleSettingPane;
 import com.fr.design.widgettheme.common.NormalButtonSettingPane;
 
 import java.util.List;
diff --git a/designer-realize/src/main/java/com/fr/strongest/WidgetThemeListenerStarter.java b/designer-realize/src/main/java/com/fr/strongest/WidgetThemeListenerStarter.java
index f37ca0224d..e39521fd4e 100644
--- a/designer-realize/src/main/java/com/fr/strongest/WidgetThemeListenerStarter.java
+++ b/designer-realize/src/main/java/com/fr/strongest/WidgetThemeListenerStarter.java
@@ -15,14 +15,18 @@ import com.fr.module.ModuleContext;
 import com.fr.widgettheme.control.attr.WidgetDisplayEnhanceMarkAttr;
 
 /**
- * 控件属性增强启动类
+ * 控件属性增强监听器启动类
  *
- * @author Leo.Qin
+ * @author obo
  * @since 11.0
- * Created on 2023/11/7
+ * Created on 2023/11/13
  */
 public class WidgetThemeListenerStarter {
     private WidgetThemeListenerStarter(){}
+
+    /**
+     * 启动对模版控件主题显示的监听开关
+     */
     public static void start() {
         EventDispatcher.listen(DesignerLaunchStatus.STARTUP_COMPLETE, new Listener<Null>() {
             @Override