diff --git a/internals/automate/src/theme-swap/index.ts b/internals/automate/src/theme-swap/index.ts
index 9130d545a..0abd7a28a 100644
--- a/internals/automate/src/theme-swap/index.ts
+++ b/internals/automate/src/theme-swap/index.ts
@@ -20,7 +20,7 @@ const kebab = (name: string) =>
     .map((n) => n[0].toUpperCase() + n.slice(1))
     .join('')
 
-// vars.less的所有文件夹， 类似  [ 'action-menu/vars.less',  'alert/vars.less',.........]
+// 1、vars.less的所有文件夹， 类似  [ 'action-menu/vars.less',  'alert/vars.less',.........]
 fg.sync(['**/vars.less'], { cwd: srcFold, ignore: ignoreFolds })
   .map((file) => file.split('/')[0]) // 取出组件名
   .filter((name) => fs.existsSync($smb(name))) // 过滤掉不存在在 smb-theme.js的
@@ -41,6 +41,14 @@ fg.sync(['**/vars.less'], { cwd: srcFold, ignore: ignoreFolds })
       exceptions.push({ name, reason: '替换组件变量，写入2个文件时出错！' + error.toString() })
     }
   })
+
+// 2、 替换 base/basic-var.less 与 theme/smb-theme/index.js 中的变量
+// const varsFile = fs.readFileSync(path.join(srcFold, 'base/basic-var.less'), 'utf8')
+// const smbThemeJsObj = await import('file://' + path.join(srcFold, 'theme/smb-theme/index.js'))
+// const smbJs = Object.values(smbThemeJsObj)[0]
+
+// processComponent('base', varsFile, smbJs, true)
+
 console.log('/////执行完毕/////')
 console.table(exceptions)
 
@@ -53,7 +61,7 @@ interface QueryInfo {
   varsLost: boolean
 }
 // 处理一个组件的交换
-function processComponent(name: string, varsFile: string, smbJs: any) {
+function processComponent(name: string, varsFile: string, smbJs: any, isBase = false) {
   const smbKeys = Object.keys(smbJs)
   // 记录所有替换信息
   const result: QueryInfo[] = []
@@ -65,7 +73,7 @@ function processComponent(name: string, varsFile: string, smbJs: any) {
 
     if (start === -1) {
       info.varsLost = true
-      exceptions.push({ name, reason: 'smb-theme中定义的变量错误， vars.less中找不到' })
+      exceptions.push({ name, reason: 'smb-theme中定义的变量错误， vars.less中找不到:' + key })
       return
     }
 
@@ -83,7 +91,8 @@ function processComponent(name: string, varsFile: string, smbJs: any) {
     const end = varsFile.substring(info.varsEnd)
     varsFile = `${start} ${info.smbValue}${end}`
   })
-  fs.writeFileSync($vars(name), varsFile)
+
+  fs.writeFileSync(isBase ? path.join(srcFold, 'base/basic-var.less') : $vars(name), varsFile)
 
   // 3、 根据result, 生成old-theme.js
   const oldObj = result.reduce((pre, curr) => {
@@ -91,8 +100,18 @@ function processComponent(name: string, varsFile: string, smbJs: any) {
     return pre
   }, {})
 
-  fs.writeFileSync($old(name), `export const tiny${kebab(name)}OldTheme = ${JSON.stringify(oldObj, null, 2)}`)
+  if (!isBase) {
+    fs.writeFileSync($old(name), `export const tiny${kebab(name)}OldTheme = ${JSON.stringify(oldObj, null, 2)}`)
+  } else {
+    // old-theme.js 似乎不太能用
+    fs.writeFileSync(
+      path.join(srcFold, 'base/old-theme.js'),
+      `export const tiny${kebab(name)}OldTheme = ${JSON.stringify(oldObj, null, 2)}`
+    )
+  }
 
   // 4、 删除smb-theme.js
-  fs.rmSync($smb(name))
+  if (!isBase) {
+    fs.rmSync($smb(name))
+  }
 }
diff --git a/packages/theme/src/action-menu/old-theme.js b/packages/theme/src/action-menu/old-theme.js
new file mode 100644
index 000000000..29bcb255c
--- /dev/null
+++ b/packages/theme/src/action-menu/old-theme.js
@@ -0,0 +1,12 @@
+export const tinyActionMenuOldTheme = {
+  'ti-action-menu-item-card-hover-text-color': 'var(--ti-common-color-text-link-hover, #344899)',
+  'ti-action-menu-item-card-text-color': 'var(--ti-common-color-text-link, #526ecc)',
+  'ti-action-menu-item-svg-margin-top': 'var(--ti-common-space-0, 0px)',
+  'ti-action-menu-item-hover-text-color': 'var(--ti-common-color-text-link-hover, #344899)',
+  'ti-action-menu-item-line-width': 'var(--ti-common-space-1)',
+  'ti-action-menu-item-line-bg-color': 'var(--ti-common-color-line-dividing, #dfe1e6)',
+  'ti-action-menu-more-icon-height': '1em',
+  'ti-action-menu-more-icon-width': '1em',
+  'ti-action-menu-hover-text-decoratio': 'none',
+  'ti-action-menu-font-weight': 'var(--ti-common-font-weight-normal)'
+}
diff --git a/packages/theme/src/action-menu/smb-theme.js b/packages/theme/src/action-menu/smb-theme.js
deleted file mode 100644
index d95fc1998..000000000
--- a/packages/theme/src/action-menu/smb-theme.js
+++ /dev/null
@@ -1,15 +0,0 @@
-export const tinyActionMenuSmbTheme = {
-  'ti-action-menu-item-line-bg-color': 'var(--ti-common-color-transparent)',
-  'ti-dropdown-item-font-size': 'var(--ti-common-font-size-1)',
-  'ti-dropdown-item-line-height': 'var(--ti-common-line-height-2)',
-  'ti-action-menu-item-svg-margin-top': '0',
-  'ti-action-menu-font-weight': 'var(--ti-common-font-weight-normal)',
-  'ti-action-menu-item-hover-text-color': 'var(--ti-common-color-text-link)',
-  'ti-action-menu-item-line-width': 'var(--ti-common-space-0)',
-  'ti-action-menu-hover-text-decoratio': 'underline',
-  'ti-dropdown-line-height': 'calc(var(--ti-common-line-height-4) + 2px)',
-  'ti-action-menu-more-icon-width': 'var(--ti-common-size-4x)',
-  'ti-action-menu-more-icon-height': 'var(--ti-common-size-4x)',
-  'ti-action-menu-item-card-text-color': 'var(--ti-common-color-text-primary)',
-  'ti-action-menu-item-card-hover-text-color': 'var(--ti-common-color-text-primary)'
-}
diff --git a/packages/theme/src/action-menu/vars.less b/packages/theme/src/action-menu/vars.less
index cab6225d9..41339bf4a 100644
--- a/packages/theme/src/action-menu/vars.less
+++ b/packages/theme/src/action-menu/vars.less
@@ -14,11 +14,11 @@
   // 按钮文本字重
   --ti-action-menu-font-weight: var(--ti-common-font-weight-normal);
   // 按钮文本装饰
-  --ti-action-menu-hover-text-decoratio: none;
+  --ti-action-menu-hover-text-decoratio: underline;
   // 更多...图标的宽度
-  --ti-action-menu-more-icon-width: 1em;
+  --ti-action-menu-more-icon-width: var(--ti-common-size-4x);
   // 更多...图标的高度
-  --ti-action-menu-more-icon-height: 1em;
+  --ti-action-menu-more-icon-height: var(--ti-common-size-4x);
   // 更多...图标的右边外边距
   --ti-action-menu-more-icon-margin-right: var(--ti-common-space-0, 0px);
   // 下拉触发源文本颜色
@@ -28,13 +28,13 @@
   // 下拉触发源文本字号
   --ti-action-menu-font-size: var(--ti-common-font-size-base, 12px);
   // 分割线颜色
-  --ti-action-menu-item-line-bg-color: var(--ti-common-color-line-dividing, #dfe1e6);
+  --ti-action-menu-item-line-bg-color: var(--ti-common-color-transparent);
   // 分割线宽度
-  --ti-action-menu-item-line-width: var(--ti-common-space-1);
+  --ti-action-menu-item-line-width: var(--ti-common-space-0);
   // 下拉菜单项悬浮背景色
   --ti-action-menu-item-hover-bg-color: var(--ti-common-color-transparent, transparent);
   // 下拉菜单项文本悬浮色
-  --ti-action-menu-item-hover-text-color: var(--ti-common-color-text-link-hover, #344899);
+  --ti-action-menu-item-hover-text-color: var(--ti-common-color-text-link);
   // 下拉菜单项图标悬浮色
   --ti-action-menu-item-hover-icon-color: var(--ti-common-color-text-link-hover, #344899); // 没有这个颜色的图标色
   // 下拉菜单项顶部内边距
@@ -46,7 +46,7 @@
   // 下拉菜单项右侧内边距
   --ti-action-menu-item-padding-left: var(--ti-common-space-0, 0px);
   // 下拉菜单项图标顶部内边距
-  --ti-action-menu-item-svg-margin-top: var(--ti-common-space-0, 0px);
+  --ti-action-menu-item-svg-margin-top: 0;
   // 下拉菜单项图标右侧内边距
   --ti-action-menu-item-svg-margin-right: var(--ti-common-space-base, 4px);
   // 下拉菜单项图标底部部内边距
@@ -54,7 +54,7 @@
   // 下拉菜单项图标左侧内边距
   --ti-action-menu-item-svg-margin-left: var(--ti-common-space-0, 0px);
   // 下拉菜单卡片模式字体颜色
-  --ti-action-menu-item-card-text-color: var(--ti-common-color-text-link, #526ecc);
+  --ti-action-menu-item-card-text-color: var(--ti-common-color-text-primary);
   // 下拉菜单卡片模式字体颜色
-  --ti-action-menu-item-card-hover-text-color: var(--ti-common-color-text-link-hover, #344899);
+  --ti-action-menu-item-card-hover-text-color: var(--ti-common-color-text-primary);
 }
diff --git a/packages/theme/src/alert/old-theme.js b/packages/theme/src/alert/old-theme.js
new file mode 100644
index 000000000..cc6f0c2af
--- /dev/null
+++ b/packages/theme/src/alert/old-theme.js
@@ -0,0 +1,28 @@
+export const tinyAlertOldTheme = {
+  'ti-alert-title-margin-top': 'var(--ti-common-space-0)',
+  'ti-alert-info-close-hover-icon-color': 'var(--ti-alert-info-icon-color)',
+  'ti-alert-info-close-icon-color': 'var(--ti-alert-info-icon-color)',
+  'ti-alert-success-close-hover-icon-color': 'var(--ti-alert-success-icon-color)',
+  'ti-alert-success-close-icon-color': 'var(--ti-alert-success-icon-color)',
+  'ti-alert-error-close-hover-icon-color': 'var(--ti-alert-error-icon-color)',
+  'ti-alert-error-close-icon-color': 'var(--ti-alert-error-icon-color)',
+  'ti-alert-warning-close-hover-icon-color': 'var(--ti-alert-warning-icon-color)',
+  'ti-alert-warning-close-icon-color': 'var(--ti-alert-warning-icon-color)',
+  'ti-alert-large-content-padding-left': 'var(--ti-common-space-4x, 16px)',
+  'ti-alert-large-icon-margin-top': 'calc(var(--ti-common-space-base, 4px) - 2px)',
+  'ti-alert-large-padding-right': 'calc(var(--ti-common-space-base, 4px) * 10.5)',
+  'ti-alert-large-padding-bottom': 'var(--ti-common-space-3x, 12px)',
+  'ti-alert-large-padding-top': 'calc(var(--ti-common-space-base, 4px) * 3.5)',
+  'ti-alert-normal-margin-vertical': 'var(--ti-common-space-2x, 8px)',
+  'ti-alert-normal-padding-bottom': 'var(--ti-common-space-3x, 12px)',
+  'ti-alert-normal-padding-right': 'var(--ti-common-space-4x, 16px)',
+  'ti-alert-normal-padding-top': 'var(--ti-common-space-3x, 12px)',
+  'ti-alert-description-margin-bottom': 'var(--ti-common-space-base, 4px)',
+  'ti-alert-description-margin-top': 'var(--ti-common-space-base, 4px)',
+  'ti-alert-icon-margin-top': 'var(--ti-common-space-1, 1px)',
+  'ti-alert-title-font-size': 'var(--ti-common-font-size-1, 14px)',
+  'ti-alert-border-radius': 'var(--ti-common-border-radius-normal, 2px)',
+  'ti-alert-close-font-size': 'var(--ti-common-font-size-base, 12px)',
+  'ti-alert-close-position-top': 'var(--ti-common-space-4x, 16px)',
+  'ti-alert-border-weight': 'var(--ti-common-border-weight-normal, 1px)'
+}
diff --git a/packages/theme/src/alert/smb-theme.js b/packages/theme/src/alert/smb-theme.js
deleted file mode 100644
index f41e3c434..000000000
--- a/packages/theme/src/alert/smb-theme.js
+++ /dev/null
@@ -1,28 +0,0 @@
-export const tinyAlertSmbTheme = {
-  'ti-alert-border-radius': 'var(--ti-common-border-radius-4)',
-  'ti-alert-border-weight': 'var(--ti-common-size-0)',
-  'ti-alert-close-font-size': 'var(--ti-common-font-size-2)',
-  'ti-alert-error-close-icon-color': 'var(--ti-common-color-text-weaken)',
-  'ti-alert-info-close-icon-color': 'var(--ti-common-color-text-weaken)',
-  'ti-alert-success-close-icon-color': 'var(--ti-common-color-text-weaken)',
-  'ti-alert-warning-close-icon-color': 'var(--ti-common-color-text-weaken)',
-  'ti-alert-info-close-hover-icon-color': 'var(--ti-common-color-icon-darkbg-hover)',
-  'ti-alert-success-close-hover-icon-color': 'var(--ti-common-color-icon-darkbg-hover)',
-  'ti-alert-error-close-hover-icon-color': 'var(--ti-common-color-icon-darkbg-hover)',
-  'ti-alert-warning-close-hover-icon-color': 'var(--ti-common-color-icon-darkbg-hover)',
-  'ti-alert-normal-margin-vertical': 'var(--ti-common-space-4x)',
-  'ti-alert-normal-padding-top': 'calc(var(--ti-common-space-2x) + 1.5px)',
-  'ti-alert-normal-padding-bottom': 'calc(var(--ti-common-space-2x) + 1.5px)',
-  'ti-alert-normal-padding-right': 'var(--ti-common-space-4x)',
-  'ti-alert-title-font-size': 'var(--ti-common-font-size-2)',
-  'ti-alert-large-icon-margin-top': 'var(--ti-common-space-0)',
-  'ti-alert-title-margin-top': 'var(--ti-common-size-base)',
-  'ti-alert-large-padding-top': 'var(--ti-common-space-4x)',
-  'ti-alert-large-padding-bottom': 'var(--ti-common-space-4x)',
-  'ti-alert-large-padding-right': 'var(--ti-common-space-4x)',
-  'ti-alert-large-content-padding-left': 'var(--ti-common-space-2x)',
-  'ti-alert-description-margin-bottom': 'var(--ti-common-space-0)',
-  'ti-alert-description-margin-top': 'var(--ti-common-space-base)',
-  'ti-alert-icon-margin-top': 'calc(var(--ti-common-space-6) / 2)',
-  'ti-alert-close-position-top': 'var(--ti-common-space-3x)'
-}
diff --git a/packages/theme/src/alert/vars.less b/packages/theme/src/alert/vars.less
index b4230a60f..6c90c2d4a 100644
--- a/packages/theme/src/alert/vars.less
+++ b/packages/theme/src/alert/vars.less
@@ -23,17 +23,17 @@
     'Microsoft JhengHei'
   );
   // 边框厚度(new)
-  --ti-alert-border-weight: var(--ti-common-border-weight-normal, 1px);
+  --ti-alert-border-weight: var(--ti-common-size-0);
   // 描述字号
   --ti-alert-description-font-size: var(--ti-common-font-size-base, 12px);
   // 默认关闭图标固定定位顶部距离(hide)
-  --ti-alert-close-position-top: var(--ti-common-space-4x, 16px);
+  --ti-alert-close-position-top: var(--ti-common-space-3x);
   // 默认关闭图标字号
-  --ti-alert-close-font-size: var(--ti-common-font-size-base, 12px);
+  --ti-alert-close-font-size: var(--ti-common-font-size-2);
   // 自定义关闭文字字号
   --ti-alert-close-text-font-size: var(--ti-common-font-size-base, 12px);
   // 组件圆角
-  --ti-alert-border-radius: var(--ti-common-border-radius-normal, 2px);
+  --ti-alert-border-radius: var(--ti-common-border-radius-4);
   // 标题文本色
   --ti-alert-title-text-color: var(--ti-common-color-text-primary, #252b3a);
   // success类型标题文本色
@@ -47,9 +47,9 @@
   // simple类型标题文本色
   --ti-alert-simple-title-text-color: var(--ti-common-color-text-primary, #252b3a);
   // 标题字号
-  --ti-alert-title-font-size: var(--ti-common-font-size-1, 14px);
+  --ti-alert-title-font-size: var(--ti-common-font-size-2);
   // 标题图标顶部外边距
-  --ti-alert-icon-margin-top: var(--ti-common-space-1, 1px);
+  --ti-alert-icon-margin-top: calc(var(--ti-common-space-6) / 2);
   // 标题图标字号
   --ti-alert-icon-font-size: var(--ti-common-font-size-2, 16px);
   // 描述内容行高
@@ -59,31 +59,31 @@
   // 描述内容水平内边距
   --ti-alert-normal-content-padding-horizontal: var(--ti-common-space-2x, 8px);
   // 描述内容提示内容顶部外边距
-  --ti-alert-description-margin-top: var(--ti-common-space-base, 4px);
+  --ti-alert-description-margin-top: var(--ti-common-space-base);
   // 描述内容提示内容底部外边距
-  --ti-alert-description-margin-bottom: var(--ti-common-space-base, 4px);
+  --ti-alert-description-margin-bottom: var(--ti-common-space-0);
   // 描述默认文本色
   --ti-alert-description-text-color: var(--ti-common-color-text-secondary, #575d6c);
   // 默认顶部内边距
-  --ti-alert-normal-padding-top: var(--ti-common-space-3x, 12px);
+  --ti-alert-normal-padding-top: calc(var(--ti-common-space-2x) + 1.5px);
   // 默认右内边距
-  --ti-alert-normal-padding-right: var(--ti-common-space-4x, 16px);
+  --ti-alert-normal-padding-right: var(--ti-common-space-4x);
   // 默认底部内边距
-  --ti-alert-normal-padding-bottom: var(--ti-common-space-3x, 12px);
+  --ti-alert-normal-padding-bottom: calc(var(--ti-common-space-2x) + 1.5px);
   // 默认左内边距
   --ti-alert-normal-padding-left: var(--ti-common-space-4x, 16px);
   // 默认垂直外边距
-  --ti-alert-normal-margin-vertical: var(--ti-common-space-2x, 8px);
+  --ti-alert-normal-margin-vertical: var(--ti-common-space-4x);
   // 默认水平外边距
   --ti-alert-normal-margin-horizontal: var(--ti-common-space-0, 0px);
   // large尺寸顶部内边距
-  --ti-alert-large-padding-top: calc(var(--ti-common-space-base, 4px) * 3.5);
+  --ti-alert-large-padding-top: var(--ti-common-space-4x);
   // large尺寸底部内边距
-  --ti-alert-large-padding-bottom: var(--ti-common-space-3x, 12px);
+  --ti-alert-large-padding-bottom: var(--ti-common-space-4x);
   // large尺寸左内边距
   --ti-alert-large-padding-left: var(--ti-common-space-4x, 16px);
   // large尺寸右内边距
-  --ti-alert-large-padding-right: calc(var(--ti-common-space-base, 4px) * 10.5);
+  --ti-alert-large-padding-right: var(--ti-common-space-4x);
   // large尺寸操作文本色
   --ti-alert-opration-text-color: var(--ti-common-color-text-highlight, #526ecc);
   // large尺寸操作字号
@@ -91,9 +91,9 @@
   // large尺寸图标字号
   --ti-alert-large-icon-font-size: var(--ti-common-font-size-5, 24px);
   // large尺寸图标顶部外边距
-  --ti-alert-large-icon-margin-top: calc(var(--ti-common-space-base, 4px) - 2px);
+  --ti-alert-large-icon-margin-top: var(--ti-common-space-0);
   // large尺寸描述内容左内边距
-  --ti-alert-large-content-padding-left: var(--ti-common-space-4x, 16px);
+  --ti-alert-large-content-padding-left: var(--ti-common-space-2x);
   // 大尺寸关闭图标字号
   --ti-alert-large-close-font-size: var(--ti-alert-close-font-size);
 
@@ -106,9 +106,9 @@
   // warning类型背景色
   --ti-alert-warning-bg-color: var(--ti-common-color-warn-bg, #fff3e8);
   // warning类型关闭图标色
-  --ti-alert-warning-close-icon-color: var(--ti-alert-warning-icon-color);
+  --ti-alert-warning-close-icon-color: var(--ti-common-color-text-weaken);
   // warning类型悬浮关闭图标色
-  --ti-alert-warning-close-hover-icon-color: var(--ti-alert-warning-icon-color);
+  --ti-alert-warning-close-hover-icon-color: var(--ti-common-color-icon-darkbg-hover);
   // error类型边框色
   --ti-alert-error-border-color: var(--ti-common-color-error-border-secondary, #ffbcba);
   // error类型图标色
@@ -118,9 +118,9 @@
   // error类型背景色
   --ti-alert-error-bg-color: var(--ti-common-color-error-bg, #ffeeed);
   // error类型关闭图标色
-  --ti-alert-error-close-icon-color: var(--ti-alert-error-icon-color);
+  --ti-alert-error-close-icon-color: var(--ti-common-color-text-weaken);
   // error类型悬浮关闭图标色
-  --ti-alert-error-close-hover-icon-color: var(--ti-alert-error-icon-color);
+  --ti-alert-error-close-hover-icon-color: var(--ti-common-color-icon-darkbg-hover);
   // success类型边框色
   --ti-alert-success-border-color: var(--ti-common-color-success-border, #acf2dc);
   // success类型图标色
@@ -130,9 +130,9 @@
   // success类型背景色
   --ti-alert-success-bg-color: var(--ti-common-color-success-bg, #edfff9);
   // success类型关闭图标色
-  --ti-alert-success-close-icon-color: var(--ti-alert-success-icon-color);
+  --ti-alert-success-close-icon-color: var(--ti-common-color-text-weaken);
   // success类型悬浮关闭图标色
-  --ti-alert-success-close-hover-icon-color: var(--ti-alert-success-icon-color);
+  --ti-alert-success-close-hover-icon-color: var(--ti-common-color-icon-darkbg-hover);
 
   // info类型边框色
   --ti-alert-info-border-color: var(--ti-common-color-prompt-border, #beccfa);
@@ -143,9 +143,9 @@
   // info类型背景色
   --ti-alert-info-bg-color: var(--ti-common-color-prompt-bg, #ebf6ff);
   // info类型关闭图标色
-  --ti-alert-info-close-icon-color: var(--ti-alert-info-icon-color);
+  --ti-alert-info-close-icon-color: var(--ti-common-color-text-weaken);
   // info类型悬浮关闭图标色
-  --ti-alert-info-close-hover-icon-color: var(--ti-alert-info-icon-color);
+  --ti-alert-info-close-hover-icon-color: var(--ti-common-color-icon-darkbg-hover);
 
   // simple类型边框色
   --ti-alert-simple-border-color: var(--ti-common-color-info-border, #d3d4d6);
@@ -160,5 +160,5 @@
   // simple类型悬浮关闭图标色
   --ti-alert-simple-close-hover-icon-color: var(--ti-alert-simple-icon-color);
   // 标题的上边距
-  --ti-alert-title-margin-top: var(--ti-common-space-0);
+  --ti-alert-title-margin-top: var(--ti-common-size-base);
 }
diff --git a/packages/theme/src/anchor/old-theme.js b/packages/theme/src/anchor/old-theme.js
new file mode 100644
index 000000000..04b5c4602
--- /dev/null
+++ b/packages/theme/src/anchor/old-theme.js
@@ -0,0 +1,7 @@
+export const tinyAnchorOldTheme = {
+  'ti-anchor-link-active-text-color': 'var(--ti-common-color-primary-active, #7693f5)',
+  'ti-anchor-line-opacity': '0.08',
+  'ti-anchor-line-bg-color': 'var(--ti-common-color-text-primary, #252b3a)',
+  'ti-anchor-text-color': 'var(--ti-common-color-text-primary, #252b3a)',
+  'ti-anchor-width': "'auto'"
+}
diff --git a/packages/theme/src/anchor/smb-theme.js b/packages/theme/src/anchor/smb-theme.js
deleted file mode 100644
index c8c8e0ac3..000000000
--- a/packages/theme/src/anchor/smb-theme.js
+++ /dev/null
@@ -1,7 +0,0 @@
-export const tinyAnchorSmbTheme = {
-  'ti-anchor-width': 'var(--ti-common-size-40x)',
-  'ti-anchor-text-color': 'var(--ti-common-color-text-secondary)',
-  'ti-anchor-line-bg-color': 'var(--ti-common-scrollbar-thumb-bg-color)',
-  'ti-anchor-link-active-text-color': 'var(--ti-common-color-text-primary)',
-  'ti-anchor-line-opacity': '1'
-}
diff --git a/packages/theme/src/anchor/vars.less b/packages/theme/src/anchor/vars.less
index 3ffde4827..7b9089355 100644
--- a/packages/theme/src/anchor/vars.less
+++ b/packages/theme/src/anchor/vars.less
@@ -14,13 +14,13 @@
   // 组件默认背景色
   --ti-anchor-bg-color: var(--ti-common-color-bg-white-normal, #fff);
   // 组件宽度
-  --ti-anchor-width: 'auto';
+  --ti-anchor-width: var(--ti-common-size-40x);
   // 锚点默认文本色
-  --ti-anchor-text-color: var(--ti-common-color-text-primary, #252b3a);
+  --ti-anchor-text-color: var(--ti-common-color-text-secondary);
   // dot类型线条背景色(new)
-  --ti-anchor-line-bg-color: var(--ti-common-color-text-primary, #252b3a);
+  --ti-anchor-line-bg-color: var(--ti-common-scrollbar-thumb-bg-color);
   // dot类型线条透明度(hide)
-  --ti-anchor-line-opacity: 0.08;
+  --ti-anchor-line-opacity: 1;
   // dot类型圆点边框色(new)
   --ti-anchor-dot-border-color: var(--ti-common-color-line-normal, #adb0b8);
   // 锚点默认字号
@@ -32,7 +32,7 @@
   // 竖向轨道宽度
   --ti-anchor-orbit-width: var(--ti-common-size-base, 4px);
   // 选中锚点文本色
-  --ti-anchor-link-active-text-color: var(--ti-common-color-primary-active, #7693f5);
+  --ti-anchor-link-active-text-color: var(--ti-common-color-text-primary);
   // 选中锚点蒙层背景色
   --ti-anchor-link-mask-bg-color: rgba(80, 115, 229, 0.15);
   // 悬浮锚点文本色
diff --git a/packages/theme/src/autocomplete/smb-theme.js b/packages/theme/src/autocomplete/old-theme.js
similarity index 57%
rename from packages/theme/src/autocomplete/smb-theme.js
rename to packages/theme/src/autocomplete/old-theme.js
index 0aa2c1312..b8cba8660 100644
--- a/packages/theme/src/autocomplete/smb-theme.js
+++ b/packages/theme/src/autocomplete/old-theme.js
@@ -1,3 +1,3 @@
-export const tinyAutocompleteSmbTheme = {
-  'ti-autocomplete-li-padding-horizontal': 'var(--ti-common-size-4x)'
+export const tinyAutocompleteOldTheme = {
+  'ti-autocomplete-li-padding-horizontal': 'var(--ti-common-size-2x)'
 }
diff --git a/packages/theme/src/autocomplete/vars.less b/packages/theme/src/autocomplete/vars.less
index b2f49015e..313490dd8 100644
--- a/packages/theme/src/autocomplete/vars.less
+++ b/packages/theme/src/autocomplete/vars.less
@@ -18,7 +18,7 @@
   // 下拉框背景色
   --ti-autocomplete-suggestion-bg-color: var(--ti-common-color-bg-white-normal, #fff);
   // 下拉框列表项横向填充长度
-  --ti-autocomplete-li-padding-horizontal: var(--ti-common-size-2x);
+  --ti-autocomplete-li-padding-horizontal: var(--ti-common-size-4x);
   // 下拉框列表项竖向填充长度
   --ti-autocomplete-li-padding-vertical: 5px;
   // 下拉框列表项的文本色
diff --git a/packages/theme/src/badge/old-theme.js b/packages/theme/src/badge/old-theme.js
new file mode 100644
index 000000000..f944a193f
--- /dev/null
+++ b/packages/theme/src/badge/old-theme.js
@@ -0,0 +1,11 @@
+export const tinyBadgeOldTheme = {
+  'ti-badge-margin-left': '4px',
+  'ti-badge-border': '0',
+  'ti-badge-bg-color': 'var(--ti-base-color-error-3, #f66f6a)',
+  'ti-badge-text-color': 'var(--ti-common-color-light, #fff)',
+  'ti-badge-border-radius': '12px',
+  'ti-badge-font-weight': 'var(--ti-common-font-weight-7, bold)',
+  'ti-badge-line-height': 'var(--ti-common-size-5x, 20px)',
+  'ti-badge-font-size': 'var(--ti-common-font-size-base, 12px)',
+  'ti-badge-size': 'var(--ti-common-size-5x, 20px)'
+}
diff --git a/packages/theme/src/badge/smb-theme.js b/packages/theme/src/badge/smb-theme.js
deleted file mode 100644
index a70b51702..000000000
--- a/packages/theme/src/badge/smb-theme.js
+++ /dev/null
@@ -1,11 +0,0 @@
-export const tinyBadgeSmbTheme = {
-  'ti-badge-size': 'var(--ti-common-font-size-2)',
-  'ti-badge-line-height': 'calc(var(--ti-common-font-size-2) - 2px)',
-  'ti-badge-bg-color': 'var(--ti-base-color-error)',
-  'ti-badge-font-size': 'var(--ti-common-font-size-0)',
-  'ti-badge-text-color': 'var(--ti-base-color-bg-7)',
-  'ti-badge-border-radius': 'var(--ti-common-border-radius-4)',
-  'ti-badge-border': 'var(--ti-common-border-weight-normal)',
-  'ti-badge-font-weight': 'var(--ti-common-font-weight-normal)',
-  'ti-badge-margin-left': '0'
-}
diff --git a/packages/theme/src/badge/vars.less b/packages/theme/src/badge/vars.less
index 50c49afad..a0f2a5139 100644
--- a/packages/theme/src/badge/vars.less
+++ b/packages/theme/src/badge/vars.less
@@ -11,13 +11,13 @@
 */
 
 .component-css-vars-badge() {
-  --ti-badge-size: var(--ti-common-size-5x, 20px);
-  --ti-badge-font-size: var(--ti-common-font-size-base, 12px);
-  --ti-badge-line-height: var(--ti-common-size-5x, 20px);
-  --ti-badge-font-weight: var(--ti-common-font-weight-7, bold);
-  --ti-badge-border-radius: 12px;
-  --ti-badge-text-color: var(--ti-common-color-light, #fff);
-  --ti-badge-bg-color: var(--ti-base-color-error-3, #f66f6a);
+  --ti-badge-size: var(--ti-common-font-size-2);
+  --ti-badge-font-size: var(--ti-common-font-size-0);
+  --ti-badge-line-height: calc(var(--ti-common-font-size-2) - 2px);
+  --ti-badge-font-weight: var(--ti-common-font-weight-normal);
+  --ti-badge-border-radius: var(--ti-common-border-radius-4);
+  --ti-badge-text-color: var(--ti-base-color-bg-7);
+  --ti-badge-bg-color: var(--ti-base-color-error);
   --ti-badge-link-hover-text-color: var(--ti-common-color-light, #fff);
   --ti-badge-active-text-color: var(--ti-base-color-brand-6, #5e7ce0);
   --ti-badge-active-bg-color: var(--ti-common-color-light, #fff);
@@ -26,6 +26,6 @@
   --ti-badge-warning-bg-color: var(--ti-common-color-warning-normal, #fa9841);
   --ti-badge-danger-bg-color: var(--ti-base-color-error-3, #f66f6a);
   --ti-badge-info-bg-color: var(--ti-common-color-info-normal, #252b3a);
-  --ti-badge-border: 0;
-  --ti-badge-margin-left: 4px;
+  --ti-badge-border: var(--ti-common-border-weight-normal);
+  --ti-badge-margin-left: 0;
 }
diff --git a/packages/theme/src/base-select/old-theme.js b/packages/theme/src/base-select/old-theme.js
new file mode 100644
index 000000000..18420009c
--- /dev/null
+++ b/packages/theme/src/base-select/old-theme.js
@@ -0,0 +1,18 @@
+export const tinyBaseSelectOldTheme = {
+  'ti-select-collapse-button-text-icon-color': 'var(--ti-common-color-primary-normal, #5e7ce0)',
+  'ti-select-tags-max-height': 'var(--ti-common-size-24x, 96px)',
+  'ti-select-tags-height': 'calc(var(--ti-common-size-base) * 7)',
+  'ti-select-tags-margin-left': 'var(--ti-common-space-1, 1px)',
+  'ti-select-tags-margin-bottom': 'var(--ti-common-space-1, 1px)',
+  'ti-select-tags-margin-right': 'var(--ti-common-space-1, 1px)',
+  'ti-select-tags-margin-top': 'var(--ti-common-space-1, 1px)',
+  'ti-select-tags-wrap-padding-bottom': 'calc(var(--ti-common-space-1, 1px) * 2)',
+  'ti-select-tags-wrap-padding-top': 'calc(var(--ti-common-space-1, 1px) * 2)',
+  'ti-select-tags-wrap-padding-left': 'calc(var(--ti-common-space-1, 1px) * 2)',
+  'ti-select-input-caret-font-size': '10px',
+  'ti-select-input-caret-hover-icon-color': 'var(--ti-common-color-icon-hover, #5e7ce0)',
+  'ti-select-input-caret-icon-color': 'var(--ti-common-color-text-secondary, #575d6c)',
+  'ti-select-input-icon-top-mini': 'var(--ti-common-space-3x, 12px)',
+  'ti-select-input-icon-top-small': 'var(--ti-common-space-4x, 16px)',
+  'ti-select-input-icon-top': '14px'
+}
diff --git a/packages/theme/src/base-select/smb-theme.js b/packages/theme/src/base-select/smb-theme.js
deleted file mode 100644
index 9f68d2d20..000000000
--- a/packages/theme/src/base-select/smb-theme.js
+++ /dev/null
@@ -1,18 +0,0 @@
-export const tinySelectSmbTheme = {
-  'ti-select-input-caret-font-size': 'var(--ti-common-font-size-2)',
-  'ti-select-input-caret-hover-icon-color': 'var(--ti-common-color-icon-graybg-hover)',
-  'ti-select-input-caret-icon-color': 'var(--ti-common-color-icon-normal)',
-  'ti-select-tags-height': 'var(--ti-common-space-8x)',
-  'ti-select-tags-wrap-padding-left': 'var(--ti-common-space-2)',
-  'ti-select-tags-wrap-padding-top': 'var(--ti-common-space-2)',
-  'ti-select-tags-wrap-padding-bottom': 'var(--ti-common-space-2)',
-  'ti-select-input-icon-top-small': 'var(--ti-common-space-4x)',
-  'ti-select-input-icon-top': 'var(--ti-common-space-4x)',
-  'ti-select-tags-margin-left': 'var(--ti-common-space-2)',
-  'ti-select-tags-margin-right': 'var(--ti-common-space-2)',
-  'ti-select-tags-margin-top': 'var(--ti-common-space-2)',
-  'ti-select-tags-margin-bottom': 'var(--ti-common-space-2)',
-  'ti-select-tags-max-height': 'none',
-  'ti-select-collapse-button-text-icon-color': 'var(--ti-common-color-text-link)',
-  'ti-select-input-icon-top-mini': 'var(--ti-common-space-4x)'
-}
diff --git a/packages/theme/src/base-select/vars.less b/packages/theme/src/base-select/vars.less
index 3290ca481..30564bf75 100644
--- a/packages/theme/src/base-select/vars.less
+++ b/packages/theme/src/base-select/vars.less
@@ -18,19 +18,19 @@
   // 选择器输入框字号(hide)
   --ti-select-input-font-size: var(--ti-common-font-size-base, 12px);
   // 选择器尾部图标距离输入框的垂直距离
-  --ti-select-input-icon-top: 14px;
+  --ti-select-input-icon-top: var(--ti-common-space-4x);
   // 中型选择器尾部图标距离输入框的垂直距离
   --ti-select-input-icon-top-medium: var(--ti-common-space-5x, 20px);
   // 小型选择器尾部图标距离输入框的垂直距离
-  --ti-select-input-icon-top-small: var(--ti-common-space-4x, 16px);
+  --ti-select-input-icon-top-small: var(--ti-common-space-4x);
   // 迷你型选择器尾部图标距离输入框的垂直距离
-  --ti-select-input-icon-top-mini: var(--ti-common-space-3x, 12px);
+  --ti-select-input-icon-top-mini: var(--ti-common-space-4x);
   // 选择器输入框尾部图标的颜色
-  --ti-select-input-caret-icon-color: var(--ti-common-color-text-secondary, #575d6c);
+  --ti-select-input-caret-icon-color: var(--ti-common-color-icon-normal);
   // 选择器输入框尾部图标悬浮时的颜色
-  --ti-select-input-caret-hover-icon-color: var(--ti-common-color-icon-hover, #5e7ce0);
+  --ti-select-input-caret-hover-icon-color: var(--ti-common-color-icon-graybg-hover);
   // 选择器输入框尾部图标的尺寸
-  --ti-select-input-caret-font-size: 10px;
+  --ti-select-input-caret-font-size: var(--ti-common-font-size-2);
   // 选择器输入框尾部关闭图标右侧外边距
   --ti-select-input-icon-close-margin-right: var(--ti-common-space-0, 0px);
   // 选择器输入框尾部图标禁用时的颜色（hide）
@@ -46,25 +46,25 @@
   // 中型选择器输入框高度（hide）
   --ti-select-input-medium-height: var(--ti-common-size-42);
   // 选择器多选标签容器的左侧内边距
-  --ti-select-tags-wrap-padding-left: calc(var(--ti-common-space-1, 1px) * 2);
+  --ti-select-tags-wrap-padding-left: var(--ti-common-space-2);
   // 选择器多选标签容器的顶部内边距
-  --ti-select-tags-wrap-padding-top: calc(var(--ti-common-space-1, 1px) * 2);
+  --ti-select-tags-wrap-padding-top: var(--ti-common-space-2);
   // 选择器多选标签容器的底部内边距
-  --ti-select-tags-wrap-padding-bottom: calc(var(--ti-common-space-1, 1px) * 2);
+  --ti-select-tags-wrap-padding-bottom: var(--ti-common-space-2);
   // 选择器多选标签容器的右侧内边距
   --ti-select-tags-wrap-padding-right: var(--ti-common-space-0, 0px);
   // 选择器多选标签顶部外边距
-  --ti-select-tags-margin-top: var(--ti-common-space-1, 1px);
+  --ti-select-tags-margin-top: var(--ti-common-space-2);
   // 选择器多选标签右侧外边距
-  --ti-select-tags-margin-right: var(--ti-common-space-1, 1px);
+  --ti-select-tags-margin-right: var(--ti-common-space-2);
   // 选择器多选标签底部外边距
-  --ti-select-tags-margin-bottom: var(--ti-common-space-1, 1px);
+  --ti-select-tags-margin-bottom: var(--ti-common-space-2);
   // 选择器多选标签左侧外边距
-  --ti-select-tags-margin-left: var(--ti-common-space-1, 1px);
+  --ti-select-tags-margin-left: var(--ti-common-space-2);
   // 选择器多选标签单行的高度
-  --ti-select-tags-height: calc(var(--ti-common-size-base) * 7);
+  --ti-select-tags-height: var(--ti-common-space-8x);
   // 选择器多选标签最大高度
-  --ti-select-tags-max-height: var(--ti-common-size-24x, 96px);
+  --ti-select-tags-max-height: none;
   // 选择器后缀图标显示状态
   --ti-select-suffix-display: 'inline-block';
   // 选择器右侧图标间距
@@ -72,7 +72,7 @@
   // 选择器suffix字号
   --ti-select-suffix-font-size: var(--ti-common-font-size-base, 12px);
   // 收起按钮文本与图标色(hide)
-  --ti-select-collapse-button-text-icon-color: var(--ti-common-color-primary-normal, #5e7ce0);
+  --ti-select-collapse-button-text-icon-color: var(--ti-common-color-text-link);
   // 收起按钮图标左边距(hide)
   --ti-select-collapse-button-icon-margin-left: var(--ti-common-space-2, 2px);
   // 收起按钮字号(hide)
diff --git a/packages/theme/src/base/basic-var.less b/packages/theme/src/base/basic-var.less
index a64cefc6c..a57c85f20 100644
--- a/packages/theme/src/base/basic-var.less
+++ b/packages/theme/src/base/basic-var.less
@@ -15,41 +15,57 @@
   /* 基础色 */
   --ti-base-color-white: #fff; // 纯白
   --ti-base-color-transparent: transparent; // 透明色
+  --ti-base-color-transparent-5: #0000000d; // smb 新增
+  --ti-base-color-transparent-8: rgba(0, 0, 0, 0.08); // smb 新增
+  --ti-base-color-transparent-15: rgba(0, 0, 0, 0.15); // smb 新增
+  --ti-base-color-transparent-40: rgba(0, 0, 0, 0.4); // smb 新增
+  --ti-base-color-transparent-50: #c2c2c280; // smb 新增
+  --ti-base-bg-color-loading-transparent-50: rgba(255, 255, 255, 0.5); // smb 新增
+  --ti-base-bg-color-disabled-transparent-5: rgba(0, 0, 0, 0.05); // smb 新增
+
+  // 文本色
+  --ti-base-text-color-1: #f76360; // smb 新增
+  --ti-base-text-color-2: #f2f2f2; // smb 新增
+  --ti-base-font-family: 'Manrop', 'Manrope-Medium'; // smb 新增
 
   /* 1.1品牌色*/
   /* 品牌主色*/
-  --ti-base-color-brand-6: #5e7ce0; // 主色蓝
+  --ti-base-color-brand: #191919; // 主色蓝
+  --ti-base-color-brand-6: #191919; // smb 新增
   /* 主色衍生色*/
-  --ti-base-color-brand-8: #344899; // 品牌色-8
-  --ti-base-color-brand-7: #526ecc; // 品牌色-7
-  --ti-base-color-brand-5: #7693f5; // 品牌色-5
+  --ti-base-color-brand-9: #dbdbdb; // 品牌色-8
+  --ti-base-color-brand-8: #deecff; // 品牌色-8
+  --ti-base-color-brand-7: #b3d6ff; // 品牌色-7
+  --ti-base-color-brand-5: #c2c2c2; // 品牌色-5
   --ti-base-color-brand-4: #96adfa; // 品牌色-4
-  --ti-base-color-brand-3: #beccfa; // 品牌色-3
-  --ti-base-color-brand-2: #e9edfa; // 品牌色-2
-  --ti-base-color-brand-1: #f2f5fc; // 品牌色-1
+  --ti-base-color-brand-3: #7693f5; // 品牌色-3
+  --ti-base-color-brand-2: #1476ff; // 品牌色-2
+  --ti-base-color-brand-1: #595959; // 品牌色-1
 
   /* 1.2 中立色*/
   /* 公用灰色系，用于文本、图标、线条、背景色*/
   --ti-base-color-common-9: #181818; // 中立色-9
   --ti-base-color-common-8: #282b33; // 中立色-8
   --ti-base-color-common-7: #252b3a; // 中立色-7
-  --ti-base-color-common-6: #464c59; // 中立色-6
-  --ti-base-color-common-5: #575d6c; // 中立色-5
-  --ti-base-color-common-4: #5c6173; // 中立色-4
-  --ti-base-color-common-3: #8a8e99; // 中立色-3
-  --ti-base-color-common-2: #adb0b8; // 中立色-2
-  --ti-base-color-common-1: #dfe1e6; // 中立色-1
+  --ti-base-color-common-6: #dbdbdb; // 中立色-6
+  --ti-base-color-common-5: #f0f0f0; // 中立色-5
+  --ti-base-color-common-4: #dbdbdb; // 中立色-4
+  --ti-base-color-common-3: #c2c2c2; // 中立色-3
+  --ti-base-color-common-2: #808080; // 中立色-2
+  --ti-base-color-common-1: #595959; // 中立色-1
+  --ti-base-color-common: #191919; // smb 新增
 
   /* 1.3 背景色*/
   --ti-base-color-bg-9: #b12220; // 背景-9
   --ti-base-color-bg-8: #c7000b; // 背景-8
-  --ti-base-color-bg-7: #d64a52; // 背景-7
-  --ti-base-color-bg-6: #eef0f5; // 背景-6
-  --ti-base-color-bg-5: #f5f5f6; // 背景-5
-  --ti-base-color-bg-4: #fafafa; // 背景-4
-  --ti-base-color-bg-3: #ffffff; // 背景-3
-  --ti-base-color-bg-2: #ffffff; // 背景-2
-  --ti-base-color-bg-1: #ffffff; // 背景-1
+  --ti-base-color-bg-7: #ffffff; // 背景-7
+  --ti-base-color-bg-6: #f5f5f5; // 背景-6
+  --ti-base-color-bg-5: #ffffff; // 背景-5
+  --ti-base-color-bg-4: #595959; // 背景-4
+  --ti-base-color-bg-3: #191919; // 背景-3
+  --ti-base-color-bg-2: #fafafa; // 背景-2
+  --ti-base-color-bg-1: #f0f0f0; // 背景-1
+  --ti-base-color-bg: #f5f5f5; // smb 新增
 
   /* 1.4 功能色*/
   --ti-base-color-error-4: #de504e; // 错误-4
@@ -62,26 +78,56 @@
   --ti-base-color-success-2: #acf2dc; // 成功-2
   --ti-base-color-success-1: #edfff9; // 成功-1
 
+  --ti-base-color-success-bg: #e6f2d5; // smb 新增
+  --ti-base-color-success-border: #e6f2d5; // smb 新增
+  --ti-base-color-success: #5cb300; // smb 新增
+  --ti-base-color-success-text: #5cb300; // smb 新增
+
+  --ti-base-color-error-bg: #fce3e1; // smb 新增
+  --ti-base-color-error-border: #fce3e1; // smb 新增
+  --ti-base-color-error: #f23030; // smb 新增
+  --ti-base-color-error-text: #f23030; // smb 新增
+
+  --ti-base-color-warn-bg: #ffebd1; // smb 新增
+  --ti-base-color-warn-border: #ffebd1; // smb 新增
+  --ti-base-color-warn: #ff8800; // smb 新增
+  --ti-base-color-warn-text: #ff8800; // smb 新增
+
+  --ti-base-color-prompt-bg: #deecff; // smb 新增
+  --ti-base-color-prompt-border: #deecff; // smb 新增
+  --ti-base-color-prompt: #1476ff; // smb 新增
+  --ti-base-color-prompt-text: #1476ff; // smb 新增
+
   --ti-base-color-warn-5: #e37d29; // 告警-5
   --ti-base-color-warn-4: #fa9841; // 告警-4
   --ti-base-color-warn-3: #fac20a; // 告警-3
   --ti-base-color-warn-2: #ffd0a6; // 告警-2
-  --ti-base-color-warn-1: #fff3e8; // 告警-1
+  --ti-base-color-warn-1: #ffb700; // 告警-1
 
   --ti-base-color-prompt-4: var(--ti-base-color-brand-7); // 提示-4
   --ti-base-color-prompt-3: var(--ti-base-color-brand-6); // 提示-3
   --ti-base-color-prompt-2: var(--ti-base-color-brand-3); // 提示-2
   --ti-base-color-prompt-1: #ebf6ff; // 提示-1
 
+  --ti-base-color-error-icon-from: #ff41a1; // smb 新增
+  --ti-base-color-error-icon-to: #ff8a5b; // smb 新增
+  --ti-base-color-warn-icon-from: #ff5541; // smb 新增
+  --ti-base-color-warn-icon-to: #ffd347; // smb 新增
+
   --ti-base-color-prompt-icon-from: #7769e8; // 渐变图标-提示-起始色*/
   --ti-base-color-prompt-icon-to: #58bbff; // 渐变图标-提示-终止色*/
   /* 状态图标色*/
-  --ti-base-color-icon-info: #6cbfff; // 状态图标-常规
+  --ti-base-color-icon-info: #1476ff; // 状态图标-常规
 
   /* 1.5 图表色*/
-  --ti-base-color-data-3: #a6dd82; // 图表数据色-3
-  --ti-base-color-data-4: #f3689a; // 图表数据色-4
-  --ti-base-color-data-5: #a97af8; // 图表数据色-5
+  --ti-base-color-data-3: #6e51e0; // 图表数据色-3
+  --ti-base-color-data-4: #5cb300; // 图表数据色-4
+  --ti-base-color-data-5: #fcbe1e; // 图表数据色-5
+
+  --ti-base-color-data-2: #0bb8b2; //  smb 新增
+  --ti-base-color-data-6: #33bcf2; //  smb 新增
+  --ti-base-color-data-7: #ba53e6; //  smb 新增
+  --ti-base-color-data-8: #eb4696; //  smb 新增
 
   /* 2.公共色：此处颜色为组件场景色，根据使用场景分为以下几大类，具体组件引用以下颜色，如在使用过程中有问题，请自行按类别添加*/
 
@@ -89,135 +135,140 @@
   * 2.1 基础色
   **/
   --ti-common-color-transparent: var(--ti-base-color-transparent);
-  --ti-common-color-light: #fff;
+  --ti-common-color-light: var(--ti-base-color-bg-5);
   --ti-common-color-dark: #000;
 
   /**
   * 2.2 提示类型颜色
   * 用于 alert组件、Modal（message）组件、Tag 标签组件、Notify 通知组件涉及功能提示的背景、文字、图标等的颜色使用
   **/
-  --ti-common-color-success: var(--ti-base-color-success-3); // 成功-图标色/状态图标-成功
-  --ti-common-color-text-success: var(--ti-base-color-success-4); // 成功-文字色
-  --ti-common-color-success-bg: var(--ti-base-color-success-1); // 成功-背景色
-  --ti-common-color-success-border: var(--ti-base-color-success-2); // 成功-边框色
+  --ti-common-color-success: var(--ti-base-color-success); // 成功-图标色/状态图标-成功
+  --ti-common-color-text-success: var(--ti-base-color-success-text); // 成功-文字色
+  --ti-common-color-success-bg: var(--ti-base-color-success-bg); // 成功-背景色
+  --ti-common-color-success-border: var(--ti-base-color-success-border); // 成功-边框色
 
-  --ti-common-color-error: var(--ti-base-color-error-3); // 错误-图标色/状态图标-危险、错误、失败/深色Tip中的价格文本
-  --ti-common-color-error-text: var(--ti-base-color-error-4); // 错误-文字色
-  --ti-common-color-error-bg: var(--ti-base-color-error-1); // 错误-背景色/校验背景色
-  --ti-common-color-error-border: var(--ti-base-color-error-3); // 错误-校验边框色
-  --ti-common-color-error-border-secondary: var(--ti-base-color-error-2); // 错误-alert边框色
+  --ti-common-color-error: var(--ti-base-color-error); // 错误-图标色/状态图标-危险、错误、失败/深色Tip中的价格文本
+  --ti-common-color-error-text: var(--ti-base-color-error-text); // 错误-文字色
+  --ti-common-color-error-bg: var(--ti-base-color-error-bg); // 错误-背景色/校验背景色
+  --ti-common-color-error-border: var(--ti-base-color-error); // 错误-校验边框色
+  --ti-common-color-error-border-secondary: var(--ti-base-color-error-border); // 错误-alert边框色
 
   --ti-common-color-info: var(--ti-base-color-common-7); // 信息-图标色/状态图标-信息
   --ti-common-color-info-text: var(--ti-base-color-common-7); // 信息-文字色
   --ti-common-color-info-bg: rgba(51, 51, 51, 0.06); // 信息-背景色
   --ti-common-color-info-border: #d3d4d6; // 信息-边框色
 
-  --ti-common-color-warn: var(--ti-base-color-warn-4); // 告警-图标色/状态图标-警告
-  --ti-common-color-warn-text: var(--ti-base-color-warn-5); // 告警-文字色
-  --ti-common-color-warn-bg: var(--ti-base-color-warn-1); // 告警-背景色
-  --ti-common-color-warn-border: var(--ti-base-color-warn-2); // 告警-边框色
-  --ti-common-color-warn-secondary: var(--ti-base-color-warn-3); // 次要告警-图标色/状态图标-异常
+  --ti-common-color-warn: var(--ti-base-color-warn); // 告警-图标色/状态图标-警告
+  --ti-common-color-warn-text: var(--ti-base-color-warn-text); // 告警-文字色
+  --ti-common-color-warn-bg: var(--ti-base-color-warn-bg); // 告警-背景色
+  --ti-common-color-warn-border: var(--ti-base-color-warn-border); // 告警-边框色
+  --ti-common-color-warn-secondary: var(--ti-base-color-warn-1); // 次要告警-图标色/状态图标-异常
 
-  --ti-common-color-prompt: var(--ti-base-color-prompt-3); // 提示-图标色
-  --ti-common-color-prompt-text: var(--ti-base-color-prompt-4); // 提示-图标色
-  --ti-common-color-prompt-bg: var(--ti-base-color-prompt-1); // 提示-背景色
-  --ti-common-color-prompt-border: var(--ti-base-color-prompt-2); // 提示-边框色
+  --ti-common-color-prompt: var(--ti-base-color-prompt); // 提示-图标色
+  --ti-common-color-prompt-text: var(--ti-base-color-prompt-text); // 提示-图标色
+  --ti-common-color-prompt-bg: var(--ti-base-color-prompt-bg); // 提示-背景色
+  --ti-common-color-prompt-border: var(--ti-base-color-prompt-border); // 提示-边框色
   --ti-common-color-prompt-icon-from: var(--ti-base-color-prompt-icon-from); // 渐变图标-提示-起始色
   --ti-common-color-prompt-icon-to: var(--ti-base-color-prompt-icon-to); // 渐变图标-提示-终止色
 
+  --ti-common-color-error-icon-from: var(--ti-base-color-error-icon-from); // smb 新增
+  --ti-common-color-error-icon-to: var(--ti-base-color-error-icon-to); // smb 新增
+  --ti-common-color-warn-icon-from: var(--ti-base-color-warn-icon-from); // smb 新增
+  --ti-common-color-warn-icon-to: var(--ti-base-color-warn-icon-to); // smb 新增
   /**
   * 2.3 交互类型颜色
   * 用于涉及 primary / success / warning / danger / info 类型区分，拥有状态或交互的组件（没有边框）
   * 例如：Button组件、Badge 标记、Link 文字链接，需要标识一些交互的状态颜色：hover、active、disabled
   **/
-  --ti-common-color-primary-normal: var(--ti-base-color-brand-6); // NewCssVar
-  --ti-common-color-primary-hover: var(--ti-base-color-brand-5); // NewCssVar
-  --ti-common-color-primary-active: var(--ti-base-color-brand-5); // NewCssVar
-  --ti-common-color-primary-disabled: #a0cfff; // NewCssVar
+  --ti-common-color-primary-normal: var(--ti-base-color-brand); // NewCssVar
+  --ti-common-color-primary-hover: var(--ti-base-color-brand-1); // NewCssVar
+  --ti-common-color-primary-active: var(--ti-base-color-brand-1); // NewCssVar
+  --ti-common-color-primary-disabled: var(--ti-base-color-bg-1); // NewCssVar
   --ti-common-color-primary-disabled-bgcolor: var(--ti-common-color-bg-disabled); // NewCssVar
-  --ti-common-color-primary-disabled-border: var(--ti-common-color-line-disabled); // NewCssVar
-  --ti-common-color-primary-disabled-text: var(--ti-common-color-text-disabled); // NewCssVar
+  --ti-common-color-primary-disabled-border: var(--ti-base-color-bg-1); // NewCssVar
+  --ti-common-color-primary-disabled-text: var(--ti-base-color-common-3); // NewCssVar
   --ti-common-color-primary-plain-disabled-bg-color: rgba(191, 191, 191, 0.1); // NewCssVar
 
-  --ti-common-color-success-normal: var(--ti-common-color-success); // NewCssVar
-  --ti-common-color-success-hover: var(--ti-common-color-success-border); // NewCssVar
-  --ti-common-color-success-active: var(--ti-common-color-success-border); // NewCssVar
-  --ti-common-color-success-disabled: #a6c3b9; // NewCssVar
+  --ti-common-color-success-normal: var(--ti-base-color-success); // NewCssVar
+  --ti-common-color-success-hover: #b9e683; // NewCssVar
+  --ti-common-color-success-active: #b9e683; // NewCssVar
+  --ti-common-color-success-disabled: var(--ti-base-color-bg-1); // NewCssVar
   --ti-common-color-success-disabled-bgcolor: var(--ti-common-color-bg-disabled); // NewCssVar
-  --ti-common-color-success-disabled-border: var(--ti-common-color-line-disabled); // NewCssVar
-  --ti-common-color-success-disabled-text: var(--ti-common-color-text-disabled); // NewCssVar
+  --ti-common-color-success-disabled-border: var(--ti-base-color-bg-1); // NewCssVar
+  --ti-common-color-success-disabled-text: var(--ti-base-color-common-3); // NewCssVar
   --ti-common-color-success-plain-disabled-bg-color: rgba(166, 195, 185, 0.1); // NewCssVar
 
-  --ti-common-color-warning-normal: var(--ti-common-color-warn); // NewCssVar
-  --ti-common-color-warning-hover: var(--ti-common-color-warn-secondary); // NewCssVar
-  --ti-common-color-warning-active: var(--ti-common-color-warn-secondary); // NewCssVar
-  --ti-common-color-warning-disabled: #d3c6a2; // NewCssVar
+  --ti-common-color-warning-normal: var(--ti-base-color-warn); // NewCssVar
+  --ti-common-color-warning-hover: #fcc98b; // NewCssVar
+  --ti-common-color-warning-active: #fcc98b; // NewCssVar
+  --ti-common-color-warning-disabled: var(--ti-base-color-bg-1); // NewCssVar
   --ti-common-color-warning-disabled-bgcolor: var(--ti-common-color-bg-disabled); // NewCssVar
-  --ti-common-color-warning-disabled-border: var(--ti-common-color-line-disabled); // NewCssVar
-  --ti-common-color-warning-disabled-text: var(--ti-common-color-text-disabled); // NewCssVar
+  --ti-common-color-warning-disabled-border: var(--ti-base-color-bg-1); // NewCssVar
+  --ti-common-color-warning-disabled-text: var(--ti-base-color-common-3); // NewCssVar
   --ti-common-color-warning-plain-disabled-bg-color: rgba(211, 198, 162, 0.1); // NewCssVar
 
-  --ti-common-color-danger-normal: var(--ti-common-bg-primary); // NewCssVar
-  --ti-common-color-danger-hover: var(--ti-common-bg-primary-hover); // NewCssVar
-  --ti-common-color-danger-active: var(--ti-common-bg-primary-active); // NewCssVar
-  --ti-common-color-danger-disabled: #d8bab5; // NewCssVar
+  --ti-common-color-danger-normal: var(--ti-base-color-error); // NewCssVar
+  --ti-common-color-danger-hover: #faa9a5; // NewCssVar
+  --ti-common-color-danger-active: #faa9a5; // NewCssVar
+  --ti-common-color-danger-disabled: var(--ti-base-color-bg-1); // NewCssVar
   --ti-common-color-danger-disabled-bgcolor: var(--ti-common-color-bg-disabled); // NewCssVar
-  --ti-common-color-danger-disabled-border: var(--ti-common-color-line-disabled); // NewCssVar
-  --ti-common-color-danger-disabled-text: var(--ti-common-color-text-disabled); // NewCssVar
+  --ti-common-color-danger-disabled-border: var(--ti-base-color-bg-1); // NewCssVar
+  --ti-common-color-danger-disabled-text: var(--ti-base-color-common-3); // NewCssVar
   --ti-common-color-danger-plain-disabled-bg-color: rgba(216, 186, 181, 0.1); // NewCssVar
 
-  --ti-common-color-info-normal: var(--ti-base-color-common-7); // NewCssVar
-  --ti-common-color-info-hover: var(--ti-base-color-common-4); // NewCssVar
-  --ti-common-color-info-active: var(--ti-base-color-common-4); // NewCssVar
-  --ti-common-color-info-disabled: #bfbfbf; // NewCssVar
+  --ti-common-color-info-normal: var(--ti-base-color-common); // NewCssVar
+  --ti-common-color-info-hover: var(--ti-base-color-common-1); // NewCssVar
+  --ti-common-color-info-active: var(--ti-base-color-common-1); // NewCssVar
+  --ti-common-color-info-disabled: var(--ti-base-color-bg-1); // NewCssVar
   --ti-common-color-info-disabled-bgcolor: var(--ti-common-color-bg-disabled); // NewCssVar
-  --ti-common-color-info-disabled-border: var(--ti-common-color-line-disabled); // NewCssVar
-  --ti-common-color-info-disabled-text: var(--ti-common-color-text-disabled); // NewCssVar
+  --ti-common-color-info-disabled-border: var(--ti-base-color-bg-1); // NewCssVar
+  --ti-common-color-info-disabled-text: var(--ti-base-color-common-3); // NewCssVar
   --ti-common-color-info-plain-disabled-bg-color: rgba(191, 191, 191, 0.1); // NewCssVar
 
   /**
   * 2.4 文本色
   **/
-  --ti-common-color-text-primary: var(--ti-base-color-common-7); // 一级文本色-重要信息/标题颜色/输入类文本颜色
-  --ti-common-color-text-secondary: var(--ti-base-color-common-5); // 二级文本色-次要信息
-  --ti-common-color-text-weaken: var(--ti-base-color-common-3); // 三级文本色-弱化信息/说明文字
-  --ti-common-color-text-disabled: var(--ti-base-color-common-2); // 文本禁用信息
-  --ti-common-color-text-darkbg: var(--ti-base-color-common-2); // 深色背景下文本信息
-  --ti-common-color-text-darkbg-disabled: var(--ti-base-color-common-5); // 深色背景下文本信息禁用色
-  --ti-common-color-text-link: var(--ti-base-color-brand-7); // 链接色
-  --ti-common-color-text-link-hover: var(--ti-base-color-brand-8); // 链接悬浮色
+  --ti-common-color-text-primary: var(--ti-base-color-common); // 一级文本色-重要信息/标题颜色/输入类文本颜色
+  --ti-common-color-text-secondary: var(--ti-base-color-common-1); // 二级文本色-次要信息
+  --ti-common-color-text-weaken: var(--ti-base-color-common-2); // 三级文本色-弱化信息/说明文字
+  --ti-common-color-text-disabled: var(--ti-base-color-common-3); // 文本禁用信息
+  --ti-common-color-text-darkbg: var(--ti-base-color-common-3); // 深色背景下文本信息
+  --ti-common-color-text-darkbg-disabled: var(--ti-base-color-common-1); // 深色背景下文本信息禁用色
+  --ti-common-color-text-link: var(--ti-base-color-brand-2); // 链接色
+  --ti-common-color-text-link-hover: var(--ti-base-color-brand-2); // 链接悬浮色
   --ti-common-color-text-link-darkbg: var(--ti-base-color-brand-4); // 深色背景链接色
-  --ti-common-color-text-link-darkbg-hover: var(--ti-base-color-brand-3); // 深色背景链接悬浮色
-  --ti-common-color-text-highlight: var(--ti-base-color-brand-7); // 文本高亮色
+  --ti-common-color-text-link-darkbg-hover: var(--ti-base-color-brand-5); // 深色背景链接悬浮色
+  --ti-common-color-text-highlight: var(--ti-base-color-brand-2); // 文本高亮色
   --ti-common-color-text-white: var(--ti-base-color-white); // 深色背景或图标上文字色
-  --ti-common-color-text-gray: var(--ti-base-color-white); // 深色背景下的文本色，用于tip
-  --ti-common-color-text-gray-disabled: var(--ti-base-color-common-4); // 深色背景下的灰色文本禁用色，用于tab页签中
-  --ti-common-color-text-important: var(--ti-base-color-error-4); // 文本_金额
+  --ti-common-color-text-gray: var(--ti-base-color-common); // 深色背景下的文本色，用于tip
+  --ti-common-color-text-gray-disabled: var(--ti-base-color-brand-3); // 深色背景下的灰色文本禁用色，用于tab页签中
+  --ti-common-color-text-important: var(--ti-base-color-common); // 文本_金额
   --ti-common-color-placeholder: var(--ti-base-color-common-2); // NewCssVar
-  --ti-common-color-selected-text-color: var(--ti-common-color-light); // NewCssVar 组件或者组件下拉选中时文字的颜色
+  --ti-common-color-selected-text-color: var(--ti-base-color-brand); // NewCssVar 组件或者组件下拉选中时文字的颜色
 
   /**
   * 2.5 图标色
   **/
 
   // 浅底背景图标色
-  --ti-common-color-icon-normal: var(--ti-base-color-common-5);
-  --ti-common-color-icon-hover: var(--ti-base-color-brand-6);
-  --ti-common-color-icon-active: var(--ti-base-color-brand-6);
-  --ti-common-color-icon-disabled: var(--ti-base-color-common-2); // 图标禁用色/状态图标-禁用、停止
+  --ti-common-color-icon: var(--ti-base-color-common);
+  --ti-common-color-icon-normal: var(--ti-base-color-common-2);
+  --ti-common-color-icon-hover: var(--ti-base-color-common);
+  --ti-common-color-icon-active: var(--ti-base-color-common);
+  --ti-common-color-icon-disabled: var(--ti-base-color-common-3); // 图标禁用色/状态图标-禁用、停止
   --ti-common-color-icon-white: var(--ti-base-color-white);
 
   // 灰色背景下图标色
   --ti-common-color-icon-graybg-normal: var(--ti-base-color-common-2);
-  --ti-common-color-icon-graybg-hover: var(--ti-base-color-brand-6);
-  --ti-common-color-icon-graybg-active: var(--ti-base-color-brand-6);
-  --ti-common-color-icon-graybg-disabled: var(--ti-base-color-common-1);
+  --ti-common-color-icon-graybg-hover: var(--ti-base-color-common);
+  --ti-common-color-icon-graybg-active: var(--ti-base-color-common);
+  --ti-common-color-icon-graybg-disabled: var(--ti-base-color-common-3);
 
   // 深底背景图标色
-  --ti-common-color-icon-darkbg-normal: var(--ti-base-color-common-2);
-  --ti-common-color-icon-darkbg-hover: var(--ti-base-color-brand-5);
-  --ti-common-color-icon-darkbg-active: var(--ti-base-color-brand-5);
-  --ti-common-color-icon-darkbg-disabled: var(--ti-base-color-common-5);
+  --ti-common-color-icon-darkbg-normal: var(--ti-base-color-common-3);
+  --ti-common-color-icon-darkbg-hover: var(--ti-base-color-brand-3);
+  --ti-common-color-icon-darkbg-active: var(--ti-base-color-brand-3);
+  --ti-common-color-icon-darkbg-disabled: var(--ti-base-color-common-1);
 
   // 状态图标背景色
   --ti-common-color-icon-info: var(--ti-base-color-icon-info); // 状态图标-常规、信息提示
@@ -227,64 +278,71 @@
   **/
 
   /* 基础背景色 各状态色*/
-  --ti-common-color-bg-normal: var(--ti-base-color-bg-6); // 通用背景-页面背景色/下拉搜索框背景色/标签背景色
-  --ti-common-color-bg-emphasize: var(--ti-base-color-brand-6); // 背景高亮色
-  --ti-common-color-bg-disabled: var(--ti-base-color-bg-5); // 禁用背景色
-  --ti-common-color-bg-hover: var(--ti-base-color-brand-8); // 主色背景悬浮色
-  --ti-common-color-bg-gray: var(--ti-base-color-bg-4); // 新区域组件-悬浮背景色
-  --ti-common-color-bg-secondary: var(--ti-base-color-common-2); // 开关组件-关闭状态-背景色
+  --ti-common-color-bg-normal: var(--ti-base-color-bg); // 通用背景-页面背景色/下拉搜索框背景色/标签背景色
+  --ti-common-color-bg-emphasize: var(--ti-base-color-brand); // 背景高亮色
+  --ti-common-color-bg-disabled: var(--ti-base-color-bg-1); // 禁用背景色
+  --ti-common-color-bg-hover: var(--ti-base-color-brand-1); // 主色背景悬浮色
+  --ti-common-color-bg-gray: var(--ti-base-color-bg-2); // 新区域组件-悬浮背景色
+  --ti-common-color-bg-secondary: var(--ti-base-color-common-3); // 开关组件-关闭状态-背景色
 
-  /* 重要背景色，主要用于重要按钮场景。仅用于NG的button组件*/
-  --ti-common-bg-primary: var(--ti-base-color-bg-8); // 重要按钮背景色
-  --ti-common-bg-primary-hover: var(--ti-base-color-bg-7); // 重要按钮背景悬浮、focus色
-  --ti-common-bg-primary-active: var(--ti-base-color-bg-9); // 重要按钮背景色按下色
+  /* 重要背景色，主要用于重要按钮场景。仅用于NG的button组件 */
+  --ti-common-color-bg-primary: var(--ti-base-color-bg-3); // smb 新增
+  --ti-common-color-bg-primary-hover: var(--ti-base-color-bg-4); // smb 新增
+  --ti-common-color-bg-primary-active: var(--ti-base-color-bg-4); // smb 新增
+  --ti-common-bg-primary: var(--ti-common-color-bg-primary); // 重要按钮背景色
+  --ti-common-bg-primary-hover: var(--ti-common-color-bg-primary-hover); // 重要按钮背景悬浮、focus色
+  --ti-common-bg-primary-active: var(--ti-common-color-bg-primary-active); // 重要按钮背景色按下色
 
-  /* 次要背景色，主要用于次要按钮场景*/
+  /* 次要背景色，主要用于次要按钮场景 */
+  --ti-common-color-bg-minor: var(--ti-base-color-bg-7); // smb 新增
+  --ti-common-color-bg-minor-hover: var(--ti-base-color-bg-4); // smb 新增
+  --ti-common-color-bg-minor-active: var(--ti-base-color-bg-4); // smb 新增
   --ti-common-bg-minor: var(--ti-base-color-bg-2); // 次要按钮背景色
   --ti-common-bg-minor-hover: var(--ti-base-color-bg-1); // 次要按钮背景悬浮、focus色
   --ti-common-bg-minor-active: var(--ti-base-color-bg-3); // 次要按钮背景色按下色
 
   /* 白底背景状态色*/
-  --ti-common-color-bg-white-normal: var(--ti-base-color-white); // 白色背景，用于输入框背景
+  --ti-common-color-bg-white-normal: var(--ti-base-color-bg-7); // 白色背景，用于输入框背景
   --ti-common-color-bg-white-emphasize: var(
-    --ti-base-color-brand-1
+    --ti-base-color-bg-1
   ); // 白色hover或强调色，如表头背景、表格悬浮、下拉选项悬浮背景
 
   /* 浅底背景状态色*/
   --ti-common-color-bg-light-normal: var(
-    --ti-base-color-brand-2
+    --ti-base-color-bg-1
   ); // 滑块slider-背景色/多选快buttongroup-默认背景色/树组件选中背景色
-  --ti-common-color-bg-light-emphasize: var(--ti-base-color-brand-3); // 浅背景hover或强调色，开关组件“开”禁用背景色
+  --ti-common-color-bg-light-emphasize: var(--ti-base-color-brand-7); // 浅背景hover或强调色，开关组件“开”禁用背景色
 
   /* 深色底背景状态色*/
-  --ti-common-color-bg-dark-normal: var(--ti-base-color-common-6); // 一级tab页签背景色
-  --ti-common-color-bg-dark-emphasize: var(--ti-base-color-common-4); // 一级tab页签背景-悬浮色
-  --ti-common-color-bg-dark-active: var(--ti-common-color-bg-normal); // 一级tab页签背景-激活/focus状态背景色
-  --ti-common-color-bg-dark-deep: var(--ti-base-color-common-6); // tip、alert提示背景色
-  --ti-common-color-bg-dark-disabled: var(--ti-base-color-common-1); // 深色背景禁用色，开关组件“关”禁用背景色
+  --ti-common-color-bg-dark-normal: var(--ti-base-color-bg-7); // 一级tab页签背景色
+  --ti-common-color-bg-dark-emphasize: var(--ti-base-color-bg-7); // 一级tab页签背景-悬浮色
+  --ti-common-color-bg-dark-active: var(--ti-base-color-bg-7); // 一级tab页签背景-激活/focus状态背景色
+  --ti-common-color-bg-dark-deep: var(--ti-base-color-white); // tip、alert提示背景色
+  --ti-common-color-bg-dark-disabled: var(--ti-base-color-common-4); // 深色背景禁用色，开关组件“关”禁用背景色
 
   /* 顶部导航背景色,用于navMenu*/
-  --ti-common-color-bg-navigation: var(--ti-base-color-common-8); // 顶部导航背景色/顶部导航下拉悬浮背景色
-  --ti-common-color-bg-dark-select: var(--ti-base-color-common-9); // 顶部导航下拉背景色
+  --ti-common-color-bg-navigation: var(--ti-base-color-bg-5); // 顶部导航背景色/顶部导航下拉悬浮背景色
+  --ti-common-color-bg-dark-select: var(--ti-base-color-white); // 顶部导航下拉背景色
 
   /**
   * 这里类选择组件都使用这里的状态颜色：Select、Autocomplete、Cascader、DatePicker、DropTimes、Search、TimePicker、Roles
   * TimeSelect、Amount、Area、Company、Country、Currency、Dept、DropRoles、Hrapprover、User、Calendar
   **/
-  --ti-common-color-selected-background: var(--ti-base-color-brand-6); // NewCssVar 组件或者组件下拉选中时的背景色
-  --ti-common-color-hover-background: var(--ti-base-color-brand-1); // NewCssVar 组件或者组件下拉选项hover时的背景色
+  --ti-common-color-selected-background: var(--ti-base-color-bg); // NewCssVar 组件或者组件下拉选中时的背景色
+  --ti-common-color-hover-background: var(--ti-base-color-bg); // NewCssVar 组件或者组件下拉选项hover时的背景色
+  --ti-common-color-bg-6: var(--ti-base-color-bg-6); // smb 新增
 
   /**
   * 2.7 图表色
   **/
-  --ti-common-color-data-1: var(--ti-base-color-success-3); // 图表数据色-1
-  --ti-common-color-data-2: var(--ti-base-color-icon-info); // 图表数据色-2
+  --ti-common-color-data-1: var(--ti-base-color-icon-info); // 图表数据色-1
+  --ti-common-color-data-2: var(--ti-base-color-data-2); // 图表数据色-2
   --ti-common-color-data-3: var(--ti-base-color-data-3); // 图表数据色-3
   --ti-common-color-data-4: var(--ti-base-color-data-4); // 图表数据色-4
   --ti-common-color-data-5: var(--ti-base-color-data-5); // 图表数据色-5
-  --ti-common-color-data-6: var(--ti-base-color-warn-3); // 图表数据色-6
-  --ti-common-color-data-7: var(--ti-base-color-warn-4); // 图表数据色-7
-  --ti-common-color-data-8: var(--ti-base-color-error-3); // 图表数据色-8
+  --ti-common-color-data-6: var(--ti-base-color-data-6); // 图表数据色-6
+  --ti-common-color-data-7: var(--ti-base-color-data-7); // 图表数据色-7
+  --ti-common-color-data-8: var(--ti-base-color-data-8); // 图表数据色-8
 
   /**
   * 2.8 行高
@@ -292,14 +350,17 @@
   */
 
   --ti-common-line-height-number: 1.5; // 文字行高倍数，建议组件中设置行高使用该变量，如有特殊情况，请自行定义
-  --ti-common-line-height-base: 12px; // NewCssVar 跟字号保持一致
-  --ti-common-line-height-1: 14px; // NewCssVar
-  --ti-common-line-height-2: 16px; // NewCssVar
-  --ti-common-line-height-3: 18px; // NewCssVar
-  --ti-common-line-height-4: 20px; // NewCssVar
-  --ti-common-line-height-5: 24px; // NewCssVar
-  --ti-common-line-height-6: 32px; // NewCssVar
-  --ti-common-line-height-7: 36px; // NewCssVar
+  --ti-common-line-height-base: 18px; // NewCssVar 跟字号保持一致
+  --ti-common-line-height-1: 22px; // NewCssVar
+  --ti-common-line-height-2: 24px; // NewCssVar
+  --ti-common-line-height-3: 28px; // NewCssVar
+  --ti-common-line-height-4: 30px; // NewCssVar
+  --ti-common-line-height-5: 36px; // NewCssVar
+  --ti-common-line-height-6: 48px; // NewCssVar
+  --ti-common-line-height-7: 54px; // NewCssVar
+  --ti-common-line-height-8: 60px; // NewCssVar
+  --ti-common-line-height-9: 72px; // NewCssVar
+  --ti-common-line-height-10: 84px; // NewCssVar
 
   /**
   * 2.9 间距
@@ -315,34 +376,35 @@
   --ti-common-space-6x: calc(var(--ti-common-space-base) * 6); // 间距-6
   --ti-common-space-8x: calc(var(--ti-common-space-base) * 8); // 间距-7
   --ti-common-space-10x: calc(var(--ti-common-space-base) * 10); // 间距-8
+  --ti-common-space-2: 2px; // smb 新增
 
   /* 其他间距 */
   --ti-common-space-0: 0px; // 其他间距-1
   --ti-common-space-1: 1px; // 其他间距-2
   --ti-common-space-6: 6px; // 其他间距-3
   --ti-common-space-10: 10px; // 其他间距-4
-  --ti-common-dropdown-gap: 2px; // NewCssVar 下拉面板距离上部输入框的间距
+  --ti-common-dropdown-gap: 4px; // NewCssVar 下拉面板距离上部输入框的间距
 
   /**
   * 2.10 阴影
   **/
   --ti-common-shadow-none: none; // NewCssVar 无阴影
-  --ti-common-shadow-1-up: 0 -1px 4px 0 rgba(0, 0, 0, 0.1); // 阴影-1 上
-  --ti-common-shadow-1-down: 0 1px 4px 0 rgba(0, 0, 0, 0.1); // 阴影-1 下
-  --ti-common-shadow-1-left: -1px 0px 4px 0 rgba(0, 0, 0, 0.1); // 阴影-1 左
-  --ti-common-shadow-1-right: 1px 0px 4px 0 rgba(0, 0, 0, 0.1); // 阴影-1 右
-  --ti-common-shadow-2-up: 0 -2px 8px 0 rgba(0, 0, 0, 0.2); // 阴影-2 上
-  --ti-common-shadow-2-down: 0 2px 8px 0 rgba(0, 0, 0, 0.2); // 阴影-2 下
-  --ti-common-shadow-2-left: -2px 0 8px 0 rgba(238, 10, 10, 0.2); // 阴影-2 左
-  --ti-common-shadow-2-right: 2px 0 8px 0 rgba(252, 5, 5, 0.2); // 阴影-2 右
-  --ti-common-shadow-3-up: 0 -4px 16px 0 rgba(0, 0, 0, 0.2); // 阴影-3 上
-  --ti-common-shadow-3-down: 0 4px 16px 0 rgba(0, 0, 0, 0.2); // 阴影-3 下
-  --ti-common-shadow-3-left: -4px 0 16px 0 rgba(0, 0, 0, 0.2); // 阴影-3 左
-  --ti-common-shadow-3-right: 4px 0 16px 0 rgba(0, 0, 0, 0.2); // 阴影-3 右
-  --ti-common-shadow-4-up: 0 -8px 40px 0 rgba(0, 0, 0, 0.2); // 阴影-4 上
-  --ti-common-shadow-4-down: 0 8px 40px 0 rgba(0, 0, 0, 0.2); // 阴影-4 下
-  --ti-common-shadow-4-left: -8px 0 40px 0 rgba(0, 0, 0, 0.2); // 阴影-4 左
-  --ti-common-shadow-4-right: 8px 0 40px 0 rgba(0, 0, 0, 0.2); // 阴影-4 右
+  --ti-common-shadow-1-up: 0 -1px 3px 0 rgba(0, 0, 0, 0.08); // 阴影-1 上
+  --ti-common-shadow-1-down: 0 1px 3px 0 rgba(0, 0, 0, 0.08); // 阴影-1 下
+  --ti-common-shadow-1-left: -1px 0px3px 0 rgba(0, 0, 0, 0.08); // 阴影-1 左
+  --ti-common-shadow-1-right: 1px 0px 3px 0 rgba(0, 0, 0, 0.08); // 阴影-1 右
+  --ti-common-shadow-2-up: 0 -2px 12px 0 rgba(0, 0, 0, 0.16); // 阴影-2 上
+  --ti-common-shadow-2-down: 0 2px 12px 0 rgba(0, 0, 0, 0.16); // 阴影-2 下
+  --ti-common-shadow-2-left: -2px 0 12px 0 rgba(0, 0, 0, 0.16); // 阴影-2 左
+  --ti-common-shadow-2-right: 2px 0 12px 0 rgba(0, 0, 0, 0.16); // 阴影-2 右
+  --ti-common-shadow-3-up: 0 -4px 16px 0 rgba(0, 0, 0, 0.08); // 阴影-3 上
+  --ti-common-shadow-3-down: 0 4px 16px 0 rgba(0, 0, 0, 0.08); // 阴影-3 下
+  --ti-common-shadow-3-left: -4px 0 16px 0 rgba(0, 0, 0, 0.08); // 阴影-3 左
+  --ti-common-shadow-3-right: 4px 0 16px 0 rgba(0, 0, 0, 0.08); // 阴影-3 右
+  --ti-common-shadow-4-up: 0 -8px 24px 0 rgba(0, 0, 0, 0.16); // 阴影-4 上
+  --ti-common-shadow-4-down: 0 8px 24px 0 rgba(0, 0, 0, 0.16); // 阴影-4 下
+  --ti-common-shadow-4-left: -8px 0 24px 0 rgba(0, 0, 0, 0.16); // 阴影-4 左
+  --ti-common-shadow-4-right: 8px 0 24px 0 rgba(0, 0, 0, 0.16); // 阴影-4 右
 
   /* 提示类阴影*/
   --ti-common-shadow-error: 0 1px 3px 0 rgba(199, 54, 54, 0.25); // 错误
@@ -359,7 +421,7 @@
   /**
   * 2.12 字号
   **/
-  --ti-common-font-size-base: 12px; // NewCssVar 正文-常规
+  --ti-common-font-size-base: 14px; // NewCssVar 正文-常规
   --ti-common-font-size-1: 14px; // NewCssVar 标题-小
   --ti-common-font-size-2: 16px; // NewCssVar 标题-中
   --ti-common-font-size-3: 18px; // NewCssVar 标题-大
@@ -367,6 +429,11 @@
   --ti-common-font-size-5: 24px; // NewCssVar 字号-5
   --ti-common-font-size-6: 32px; // NewCssVar 字号-6
   --ti-common-font-size-7: 36px; // NewCssVar 字号-7
+  --ti-common-font-size-0: 12px; // smb 新增
+  --ti-common-font-size-8: 40px; // smb 新增
+  --ti-common-font-size-9: 48px; // smb 新增
+  --ti-common-font-size-10: 56px; // smb 新增
+  --ti-common-line-number: 1.5; // smb 新增
 
   /**
   * 2.13 字重
@@ -380,22 +447,24 @@
   --ti-common-font-weight-7: bold; // 粗体
   --ti-common-font-weight-8: 800; // 中黑
   --ti-common-font-weight-9: 900; // 黑体
-  --ti-common-font-weight-bold: 700; // NewCssVar
+  --ti-common-font-weight-bold: 600; // smb
+  --ti-common-font-weight-light: 100; // smb
+  --ti-common-font-weight-normal: 400; // smb
 
   /**
   * 2.14 线颜色
   * 用于边框，分割线等的颜色使用
   **/
-  --ti-common-color-line-normal: var(--ti-base-color-common-2);
-  --ti-common-color-line-hover: var(--ti-base-color-common-5);
-  --ti-common-color-line-active: var(--ti-base-color-brand-6);
-  --ti-common-color-line-disabled: var(--ti-base-color-common-1);
-  --ti-common-color-line-dividing: var(--ti-base-color-common-1); //分割线颜色
+  --ti-common-color-line-normal: var(--ti-base-color-common-3);
+  --ti-common-color-line-hover: var(--ti-base-color-common);
+  --ti-common-color-line-active: var(--ti-base-color-common);
+  --ti-common-color-line-disabled: var(--ti-base-color-common-4);
+  --ti-common-color-line-dividing: var(--ti-base-color-common-5); //分割线颜色
   /* 虚线 */
-  --ti-common-color-dash-line-normal: var(--ti-base-color-common-5);
-  --ti-common-color-dash-line-hover: var(--ti-base-color-brand-7);
-  --ti-common-color-border: var(--ti-base-color-common-2); // NewCssVar 待整改后删除
-  --ti-common-color-border-hover: var(--ti-base-color-common-5); // NewCssVar 待整改后删除
+  --ti-common-color-dash-line-normal: var(--ti-base-color-common);
+  --ti-common-color-dash-line-hover: var(--ti-base-color-common);
+  --ti-common-color-border: #999999; // NewCssVar 待整改后删除
+  --ti-common-color-border-hover: var(--ti-base-color-brand); // NewCssVar 待整改后删除
 
   /**
   * 2.15 线粗细
@@ -414,11 +483,18 @@
   /**
   * 2.17 圆角
   **/
-  --ti-common-border-radius-normal: 2px; // 常规
-  --ti-common-border-radius-0: 0px; // 直角
-  --ti-common-border-radius-1: 4px; // 圆角-1
-  --ti-common-border-radius-2: 8px; // 圆角-2
-  --ti-common-border-radius-3: 50%; // 圆形
+  --ti-common-border-radius-normal: var(--ti-common-border-radius-3); // 常规
+  --ti-common-border-radius-0: 0; // 直角
+  --ti-common-border-radius-1: 2px; // 圆角-1
+  --ti-common-border-radius-2: 4px; // 圆角-2
+  --ti-common-border-radius-3: 6px; // 圆形
+  --ti-common-border-radius-4: 8px; // smb
+  --ti-common-border-radius-5: 12px; // smb
+  --ti-common-border-radius-6: 16px; // smb
+  --ti-common-border-radius-7: 24px; // smb
+  --ti-common-border-radius-8: 32px; // smb
+  --ti-common-border-radius-9: 48px; // smb
+  --ti-common-border-radius-10: 100px; // smb
 
   /**
   * 2.18 尺寸
@@ -479,22 +555,46 @@
   --ti-common-size-auto: auto; // 其他尺寸-2
 
   /* 以下变量是因为AUI拥有大量的large、medium、normal、minor、samll、mini尺寸， 所以下方是一些抽象尺寸、为了更好的适配AUI (button、tag、alert组件) */
-  --ti-common-size-width-large: var(--ti-common-size-33x); // NewCssVar
-  --ti-common-size-width-medium: var(--ti-common-size-30x); // NewCssVar
-  --ti-common-size-width-normal: var(--ti-common-size-20x); // NewCssVar
+  --ti-common-size-width-large: 152px; // NewCssVar
+  --ti-common-size-width-medium: 120px; // NewCssVar
+  --ti-common-size-width-normal: 104px; // NewCssVar
+  --ti-common-size-width-small: 80px; // NewCssVar
+  --ti-common-size-width-minor: 30px; // NewCssVar
+  --ti-common-size-width-mini: 24px; // NewCssVar
 
-  --ti-common-size-height-large: var(--ti-common-size-12x); // NewCssVar
-  --ti-common-size-height-medium: var(--ti-common-size-10x); // NewCssVar
-  --ti-common-size-height-small: var(--ti-common-size-8x); // NewCssVar
-  --ti-common-size-height-normal: var(--ti-common-size-7x); // NewCssVar
-  --ti-common-size-height-mini: var(--ti-common-size-6x); // NewCssVar
+  --ti-common-size-height-large: 48px; // NewCssVar
+  --ti-common-size-height-medium: 40px; // NewCssVar
+  --ti-common-size-height-small: 24px; // NewCssVar
+  --ti-common-size-height-normal: 32px; // NewCssVar
+  --ti-common-size-height-mini: 24px; // NewCssVar
+  --ti-common-size-height-minor: 30px; // NewCssVar
 
   /*  滚动条 */
   --ti-common-scrollbar-width: 8px;
   --ti-common-scrollbar-height: 8px;
-  --ti-common-scrollbar-track-piece-bg-color: var(--ti-base-color-bg-4);
-  --ti-common-scrollbar-thumb-bg-color: #bfbfbf;
-  --ti-common-scrollbar-thumb-border-radius: 6px;
-  --ti-common-scrollbar-thumb-hover-bg-color: #999999;
-  --ti-common-scrollbar-thumb-active-bg-color: #999999;
+  --ti-common-scrollbar-track-piece-bg-color: var(--ti-base-color-bg-5);
+  --ti-common-scrollbar-thumb-bg-color: var(--ti-base-color-common-4);
+  --ti-common-scrollbar-thumb-border-radius: 4px;
+  --ti-common-scrollbar-thumb-hover-bg-color: var(--ti-base-color-common-4);
+  --ti-common-scrollbar-thumb-active-bg-color: var(--ti-base-color-common-4);
+
+  // smb 新增
+  --ti-base-box-shadow-1: 0px 2px 12px 0px #00000014;
+  --ti-base-text-decoration-underline: underline; // smb
+  --ti-base-display-block: block; // smb
+  --ti-base-opacity-10: 1; // smb
+  --ti-common-text-decoration-underline: var(--ti-base-text-decoration-underline);
+  --ti-common-display-block: var(--ti-base-display-block);
+  --ti-common-opacity-1: var(--ti-base-opacity-10);
+  --ti-common-bg-color-active: var(--ti-base-bg-color-transparent-5);
+  --ti-common-bg-color-hover-40: var(--ti-base-bg-color-transparent-40);
+  --ti-common-bg-color-transparent-15: var(--ti-base-bg-color-transparent-15);
+  --ti-common-bg-color-transparent-50: var(--ti-base-bg-color-transparent-50);
+  --ti-common-bg-color-loading-transparent-50: var(--ti-base-bg-color-loading-transparent-50);
+  --ti-common-bg-color-disabled-transparent-5: var(--ti-base-bg-color-disabled-transparent-5);
+  --ti-common-text-color-active: var(--ti-base-text-color-1);
+  --ti-common-box-shadow-popover: var(--ti-base-box-shadow-1);
+  --ti-common-text-color-disabled: var(--ti-base-text-color-2);
+  --ti-common-border-color-transparent-8: var(--ti-base-bg-color-transparent-8);
+  --ti-common-input-font-family: var(--ti-base-font-family);
 }
diff --git a/packages/theme/src/base/old-basic-vars.less b/packages/theme/src/base/old-basic-vars.less
new file mode 100644
index 000000000..c0e46ce90
--- /dev/null
+++ b/packages/theme/src/base/old-basic-vars.less
@@ -0,0 +1,500 @@
+/**
+* Copyright (c) 2022 - present TinyVue Authors.
+* Copyright (c) 2022 - present Huawei Cloud Computing Technologies Co., Ltd.
+*
+* Use of this source code is governed by an MIT-style license.
+*
+* THE OPEN SOURCE SOFTWARE IN THIS PRODUCT IS DISTRIBUTED IN THE HOPE THAT IT WILL BE USEFUL,
+* BUT WITHOUT ANY WARRANTY, WITHOUT EVEN THE IMPLIED WARRANTY OF MERCHANTABILITY OR FITNESS FOR
+* A PARTICULAR PURPOSE. SEE THE APPLICABLE LICENSES FOR MORE DETAILS.
+*
+*/
+
+/*基础变量定义*/
+:root {
+  /* 基础色 */
+  --ti-base-color-white: #fff; // 纯白
+  --ti-base-color-transparent: transparent; // 透明色
+
+  /* 1.1品牌色*/
+  /* 品牌主色*/
+  --ti-base-color-brand-6: #5e7ce0; // 主色蓝
+  /* 主色衍生色*/
+  --ti-base-color-brand-8: #344899; // 品牌色-8
+  --ti-base-color-brand-7: #526ecc; // 品牌色-7
+  --ti-base-color-brand-5: #7693f5; // 品牌色-5
+  --ti-base-color-brand-4: #96adfa; // 品牌色-4
+  --ti-base-color-brand-3: #beccfa; // 品牌色-3
+  --ti-base-color-brand-2: #e9edfa; // 品牌色-2
+  --ti-base-color-brand-1: #f2f5fc; // 品牌色-1
+
+  /* 1.2 中立色*/
+  /* 公用灰色系，用于文本、图标、线条、背景色*/
+  --ti-base-color-common-9: #181818; // 中立色-9
+  --ti-base-color-common-8: #282b33; // 中立色-8
+  --ti-base-color-common-7: #252b3a; // 中立色-7
+  --ti-base-color-common-6: #464c59; // 中立色-6
+  --ti-base-color-common-5: #575d6c; // 中立色-5
+  --ti-base-color-common-4: #5c6173; // 中立色-4
+  --ti-base-color-common-3: #8a8e99; // 中立色-3
+  --ti-base-color-common-2: #adb0b8; // 中立色-2
+  --ti-base-color-common-1: #dfe1e6; // 中立色-1
+
+  /* 1.3 背景色*/
+  --ti-base-color-bg-9: #b12220; // 背景-9
+  --ti-base-color-bg-8: #c7000b; // 背景-8
+  --ti-base-color-bg-7: #d64a52; // 背景-7
+  --ti-base-color-bg-6: #eef0f5; // 背景-6
+  --ti-base-color-bg-5: #f5f5f6; // 背景-5
+  --ti-base-color-bg-4: #fafafa; // 背景-4
+  --ti-base-color-bg-3: #ffffff; // 背景-3
+  --ti-base-color-bg-2: #ffffff; // 背景-2
+  --ti-base-color-bg-1: #ffffff; // 背景-1
+
+  /* 1.4 功能色*/
+  --ti-base-color-error-4: #de504e; // 错误-4
+  --ti-base-color-error-3: #f66f6a; // 错误-3
+  --ti-base-color-error-2: #ffbcba; // 错误-2
+  --ti-base-color-error-1: #ffeeed; // 错误-1
+
+  --ti-base-color-success-4: #3ac295; // 成功-4
+  --ti-base-color-success-3: #50d4ab; // 成功-3
+  --ti-base-color-success-2: #acf2dc; // 成功-2
+  --ti-base-color-success-1: #edfff9; // 成功-1
+
+  --ti-base-color-warn-5: #e37d29; // 告警-5
+  --ti-base-color-warn-4: #fa9841; // 告警-4
+  --ti-base-color-warn-3: #fac20a; // 告警-3
+  --ti-base-color-warn-2: #ffd0a6; // 告警-2
+  --ti-base-color-warn-1: #fff3e8; // 告警-1
+
+  --ti-base-color-prompt-4: var(--ti-base-color-brand-7); // 提示-4
+  --ti-base-color-prompt-3: var(--ti-base-color-brand-6); // 提示-3
+  --ti-base-color-prompt-2: var(--ti-base-color-brand-3); // 提示-2
+  --ti-base-color-prompt-1: #ebf6ff; // 提示-1
+
+  --ti-base-color-prompt-icon-from: #7769e8; // 渐变图标-提示-起始色*/
+  --ti-base-color-prompt-icon-to: #58bbff; // 渐变图标-提示-终止色*/
+  /* 状态图标色*/
+  --ti-base-color-icon-info: #6cbfff; // 状态图标-常规
+
+  /* 1.5 图表色*/
+  --ti-base-color-data-3: #a6dd82; // 图表数据色-3
+  --ti-base-color-data-4: #f3689a; // 图表数据色-4
+  --ti-base-color-data-5: #a97af8; // 图表数据色-5
+
+  /* 2.公共色：此处颜色为组件场景色，根据使用场景分为以下几大类，具体组件引用以下颜色，如在使用过程中有问题，请自行按类别添加*/
+
+  /**
+    * 2.1 基础色
+    **/
+  --ti-common-color-transparent: var(--ti-base-color-transparent);
+  --ti-common-color-light: #fff;
+  --ti-common-color-dark: #000;
+
+  /**
+    * 2.2 提示类型颜色
+    * 用于 alert组件、Modal（message）组件、Tag 标签组件、Notify 通知组件涉及功能提示的背景、文字、图标等的颜色使用
+    **/
+  --ti-common-color-success: var(--ti-base-color-success-3); // 成功-图标色/状态图标-成功
+  --ti-common-color-text-success: var(--ti-base-color-success-4); // 成功-文字色
+  --ti-common-color-success-bg: var(--ti-base-color-success-1); // 成功-背景色
+  --ti-common-color-success-border: var(--ti-base-color-success-2); // 成功-边框色
+
+  --ti-common-color-error: var(--ti-base-color-error-3); // 错误-图标色/状态图标-危险、错误、失败/深色Tip中的价格文本
+  --ti-common-color-error-text: var(--ti-base-color-error-4); // 错误-文字色
+  --ti-common-color-error-bg: var(--ti-base-color-error-1); // 错误-背景色/校验背景色
+  --ti-common-color-error-border: var(--ti-base-color-error-3); // 错误-校验边框色
+  --ti-common-color-error-border-secondary: var(--ti-base-color-error-2); // 错误-alert边框色
+
+  --ti-common-color-info: var(--ti-base-color-common-7); // 信息-图标色/状态图标-信息
+  --ti-common-color-info-text: var(--ti-base-color-common-7); // 信息-文字色
+  --ti-common-color-info-bg: rgba(51, 51, 51, 0.06); // 信息-背景色
+  --ti-common-color-info-border: #d3d4d6; // 信息-边框色
+
+  --ti-common-color-warn: var(--ti-base-color-warn-4); // 告警-图标色/状态图标-警告
+  --ti-common-color-warn-text: var(--ti-base-color-warn-5); // 告警-文字色
+  --ti-common-color-warn-bg: var(--ti-base-color-warn-1); // 告警-背景色
+  --ti-common-color-warn-border: var(--ti-base-color-warn-2); // 告警-边框色
+  --ti-common-color-warn-secondary: var(--ti-base-color-warn-3); // 次要告警-图标色/状态图标-异常
+
+  --ti-common-color-prompt: var(--ti-base-color-prompt-3); // 提示-图标色
+  --ti-common-color-prompt-text: var(--ti-base-color-prompt-4); // 提示-图标色
+  --ti-common-color-prompt-bg: var(--ti-base-color-prompt-1); // 提示-背景色
+  --ti-common-color-prompt-border: var(--ti-base-color-prompt-2); // 提示-边框色
+  --ti-common-color-prompt-icon-from: var(--ti-base-color-prompt-icon-from); // 渐变图标-提示-起始色
+  --ti-common-color-prompt-icon-to: var(--ti-base-color-prompt-icon-to); // 渐变图标-提示-终止色
+
+  /**
+    * 2.3 交互类型颜色
+    * 用于涉及 primary / success / warning / danger / info 类型区分，拥有状态或交互的组件（没有边框）
+    * 例如：Button组件、Badge 标记、Link 文字链接，需要标识一些交互的状态颜色：hover、active、disabled
+    **/
+  --ti-common-color-primary-normal: var(--ti-base-color-brand-6); // NewCssVar
+  --ti-common-color-primary-hover: var(--ti-base-color-brand-5); // NewCssVar
+  --ti-common-color-primary-active: var(--ti-base-color-brand-5); // NewCssVar
+  --ti-common-color-primary-disabled: #a0cfff; // NewCssVar
+  --ti-common-color-primary-disabled-bgcolor: var(--ti-common-color-bg-disabled); // NewCssVar
+  --ti-common-color-primary-disabled-border: var(--ti-common-color-line-disabled); // NewCssVar
+  --ti-common-color-primary-disabled-text: var(--ti-common-color-text-disabled); // NewCssVar
+  --ti-common-color-primary-plain-disabled-bg-color: rgba(191, 191, 191, 0.1); // NewCssVar
+
+  --ti-common-color-success-normal: var(--ti-common-color-success); // NewCssVar
+  --ti-common-color-success-hover: var(--ti-common-color-success-border); // NewCssVar
+  --ti-common-color-success-active: var(--ti-common-color-success-border); // NewCssVar
+  --ti-common-color-success-disabled: #a6c3b9; // NewCssVar
+  --ti-common-color-success-disabled-bgcolor: var(--ti-common-color-bg-disabled); // NewCssVar
+  --ti-common-color-success-disabled-border: var(--ti-common-color-line-disabled); // NewCssVar
+  --ti-common-color-success-disabled-text: var(--ti-common-color-text-disabled); // NewCssVar
+  --ti-common-color-success-plain-disabled-bg-color: rgba(166, 195, 185, 0.1); // NewCssVar
+
+  --ti-common-color-warning-normal: var(--ti-common-color-warn); // NewCssVar
+  --ti-common-color-warning-hover: var(--ti-common-color-warn-secondary); // NewCssVar
+  --ti-common-color-warning-active: var(--ti-common-color-warn-secondary); // NewCssVar
+  --ti-common-color-warning-disabled: #d3c6a2; // NewCssVar
+  --ti-common-color-warning-disabled-bgcolor: var(--ti-common-color-bg-disabled); // NewCssVar
+  --ti-common-color-warning-disabled-border: var(--ti-common-color-line-disabled); // NewCssVar
+  --ti-common-color-warning-disabled-text: var(--ti-common-color-text-disabled); // NewCssVar
+  --ti-common-color-warning-plain-disabled-bg-color: rgba(211, 198, 162, 0.1); // NewCssVar
+
+  --ti-common-color-danger-normal: var(--ti-common-bg-primary); // NewCssVar
+  --ti-common-color-danger-hover: var(--ti-common-bg-primary-hover); // NewCssVar
+  --ti-common-color-danger-active: var(--ti-common-bg-primary-active); // NewCssVar
+  --ti-common-color-danger-disabled: #d8bab5; // NewCssVar
+  --ti-common-color-danger-disabled-bgcolor: var(--ti-common-color-bg-disabled); // NewCssVar
+  --ti-common-color-danger-disabled-border: var(--ti-common-color-line-disabled); // NewCssVar
+  --ti-common-color-danger-disabled-text: var(--ti-common-color-text-disabled); // NewCssVar
+  --ti-common-color-danger-plain-disabled-bg-color: rgba(216, 186, 181, 0.1); // NewCssVar
+
+  --ti-common-color-info-normal: var(--ti-base-color-common-7); // NewCssVar
+  --ti-common-color-info-hover: var(--ti-base-color-common-4); // NewCssVar
+  --ti-common-color-info-active: var(--ti-base-color-common-4); // NewCssVar
+  --ti-common-color-info-disabled: #bfbfbf; // NewCssVar
+  --ti-common-color-info-disabled-bgcolor: var(--ti-common-color-bg-disabled); // NewCssVar
+  --ti-common-color-info-disabled-border: var(--ti-common-color-line-disabled); // NewCssVar
+  --ti-common-color-info-disabled-text: var(--ti-common-color-text-disabled); // NewCssVar
+  --ti-common-color-info-plain-disabled-bg-color: rgba(191, 191, 191, 0.1); // NewCssVar
+
+  /**
+    * 2.4 文本色
+    **/
+  --ti-common-color-text-primary: var(--ti-base-color-common-7); // 一级文本色-重要信息/标题颜色/输入类文本颜色
+  --ti-common-color-text-secondary: var(--ti-base-color-common-5); // 二级文本色-次要信息
+  --ti-common-color-text-weaken: var(--ti-base-color-common-3); // 三级文本色-弱化信息/说明文字
+  --ti-common-color-text-disabled: var(--ti-base-color-common-2); // 文本禁用信息
+  --ti-common-color-text-darkbg: var(--ti-base-color-common-2); // 深色背景下文本信息
+  --ti-common-color-text-darkbg-disabled: var(--ti-base-color-common-5); // 深色背景下文本信息禁用色
+  --ti-common-color-text-link: var(--ti-base-color-brand-7); // 链接色
+  --ti-common-color-text-link-hover: var(--ti-base-color-brand-8); // 链接悬浮色
+  --ti-common-color-text-link-darkbg: var(--ti-base-color-brand-4); // 深色背景链接色
+  --ti-common-color-text-link-darkbg-hover: var(--ti-base-color-brand-3); // 深色背景链接悬浮色
+  --ti-common-color-text-highlight: var(--ti-base-color-brand-7); // 文本高亮色
+  --ti-common-color-text-white: var(--ti-base-color-white); // 深色背景或图标上文字色
+  --ti-common-color-text-gray: var(--ti-base-color-white); // 深色背景下的文本色，用于tip
+  --ti-common-color-text-gray-disabled: var(--ti-base-color-common-4); // 深色背景下的灰色文本禁用色，用于tab页签中
+  --ti-common-color-text-important: var(--ti-base-color-error-4); // 文本_金额
+  --ti-common-color-placeholder: var(--ti-base-color-common-2); // NewCssVar
+  --ti-common-color-selected-text-color: var(--ti-common-color-light); // NewCssVar 组件或者组件下拉选中时文字的颜色
+
+  /**
+    * 2.5 图标色
+    **/
+
+  // 浅底背景图标色
+  --ti-common-color-icon-normal: var(--ti-base-color-common-5);
+  --ti-common-color-icon-hover: var(--ti-base-color-brand-6);
+  --ti-common-color-icon-active: var(--ti-base-color-brand-6);
+  --ti-common-color-icon-disabled: var(--ti-base-color-common-2); // 图标禁用色/状态图标-禁用、停止
+  --ti-common-color-icon-white: var(--ti-base-color-white);
+
+  // 灰色背景下图标色
+  --ti-common-color-icon-graybg-normal: var(--ti-base-color-common-2);
+  --ti-common-color-icon-graybg-hover: var(--ti-base-color-brand-6);
+  --ti-common-color-icon-graybg-active: var(--ti-base-color-brand-6);
+  --ti-common-color-icon-graybg-disabled: var(--ti-base-color-common-1);
+
+  // 深底背景图标色
+  --ti-common-color-icon-darkbg-normal: var(--ti-base-color-common-2);
+  --ti-common-color-icon-darkbg-hover: var(--ti-base-color-brand-5);
+  --ti-common-color-icon-darkbg-active: var(--ti-base-color-brand-5);
+  --ti-common-color-icon-darkbg-disabled: var(--ti-base-color-common-5);
+
+  // 状态图标背景色
+  --ti-common-color-icon-info: var(--ti-base-color-icon-info); // 状态图标-常规、信息提示
+
+  /**
+    * 2.6 背景色
+    **/
+
+  /* 基础背景色 各状态色*/
+  --ti-common-color-bg-normal: var(--ti-base-color-bg-6); // 通用背景-页面背景色/下拉搜索框背景色/标签背景色
+  --ti-common-color-bg-emphasize: var(--ti-base-color-brand-6); // 背景高亮色
+  --ti-common-color-bg-disabled: var(--ti-base-color-bg-5); // 禁用背景色
+  --ti-common-color-bg-hover: var(--ti-base-color-brand-8); // 主色背景悬浮色
+  --ti-common-color-bg-gray: var(--ti-base-color-bg-4); // 新区域组件-悬浮背景色
+  --ti-common-color-bg-secondary: var(--ti-base-color-common-2); // 开关组件-关闭状态-背景色
+
+  /* 重要背景色，主要用于重要按钮场景。仅用于NG的button组件*/
+  --ti-common-bg-primary: var(--ti-base-color-bg-8); // 重要按钮背景色
+  --ti-common-bg-primary-hover: var(--ti-base-color-bg-7); // 重要按钮背景悬浮、focus色
+  --ti-common-bg-primary-active: var(--ti-base-color-bg-9); // 重要按钮背景色按下色
+
+  /* 次要背景色，主要用于次要按钮场景*/
+  --ti-common-bg-minor: var(--ti-base-color-bg-2); // 次要按钮背景色
+  --ti-common-bg-minor-hover: var(--ti-base-color-bg-1); // 次要按钮背景悬浮、focus色
+  --ti-common-bg-minor-active: var(--ti-base-color-bg-3); // 次要按钮背景色按下色
+
+  /* 白底背景状态色*/
+  --ti-common-color-bg-white-normal: var(--ti-base-color-white); // 白色背景，用于输入框背景
+  --ti-common-color-bg-white-emphasize: var(
+    --ti-base-color-brand-1
+  ); // 白色hover或强调色，如表头背景、表格悬浮、下拉选项悬浮背景
+
+  /* 浅底背景状态色*/
+  --ti-common-color-bg-light-normal: var(
+    --ti-base-color-brand-2
+  ); // 滑块slider-背景色/多选快buttongroup-默认背景色/树组件选中背景色
+  --ti-common-color-bg-light-emphasize: var(--ti-base-color-brand-3); // 浅背景hover或强调色，开关组件“开”禁用背景色
+
+  /* 深色底背景状态色*/
+  --ti-common-color-bg-dark-normal: var(--ti-base-color-common-6); // 一级tab页签背景色
+  --ti-common-color-bg-dark-emphasize: var(--ti-base-color-common-4); // 一级tab页签背景-悬浮色
+  --ti-common-color-bg-dark-active: var(--ti-common-color-bg-normal); // 一级tab页签背景-激活/focus状态背景色
+  --ti-common-color-bg-dark-deep: var(--ti-base-color-common-6); // tip、alert提示背景色
+  --ti-common-color-bg-dark-disabled: var(--ti-base-color-common-1); // 深色背景禁用色，开关组件“关”禁用背景色
+
+  /* 顶部导航背景色,用于navMenu*/
+  --ti-common-color-bg-navigation: var(--ti-base-color-common-8); // 顶部导航背景色/顶部导航下拉悬浮背景色
+  --ti-common-color-bg-dark-select: var(--ti-base-color-common-9); // 顶部导航下拉背景色
+
+  /**
+    * 这里类选择组件都使用这里的状态颜色：Select、Autocomplete、Cascader、DatePicker、DropTimes、Search、TimePicker、Roles
+    * TimeSelect、Amount、Area、Company、Country、Currency、Dept、DropRoles、Hrapprover、User、Calendar
+    **/
+  --ti-common-color-selected-background: var(--ti-base-color-brand-6); // NewCssVar 组件或者组件下拉选中时的背景色
+  --ti-common-color-hover-background: var(--ti-base-color-brand-1); // NewCssVar 组件或者组件下拉选项hover时的背景色
+
+  /**
+    * 2.7 图表色
+    **/
+  --ti-common-color-data-1: var(--ti-base-color-success-3); // 图表数据色-1
+  --ti-common-color-data-2: var(--ti-base-color-icon-info); // 图表数据色-2
+  --ti-common-color-data-3: var(--ti-base-color-data-3); // 图表数据色-3
+  --ti-common-color-data-4: var(--ti-base-color-data-4); // 图表数据色-4
+  --ti-common-color-data-5: var(--ti-base-color-data-5); // 图表数据色-5
+  --ti-common-color-data-6: var(--ti-base-color-warn-3); // 图表数据色-6
+  --ti-common-color-data-7: var(--ti-base-color-warn-4); // 图表数据色-7
+  --ti-common-color-data-8: var(--ti-base-color-error-3); // 图表数据色-8
+
+  /**
+    * 2.8 行高
+    * TinyNG只有一个1.5倍的行高,其余行高抽出来是为了适配AUI，但是全局都是1.5倍行高可以保持风格统一
+    */
+
+  --ti-common-line-height-number: 1.5; // 文字行高倍数，建议组件中设置行高使用该变量，如有特殊情况，请自行定义
+  --ti-common-line-height-base: 12px; // NewCssVar 跟字号保持一致
+  --ti-common-line-height-1: 14px; // NewCssVar
+  --ti-common-line-height-2: 16px; // NewCssVar
+  --ti-common-line-height-3: 18px; // NewCssVar
+  --ti-common-line-height-4: 20px; // NewCssVar
+  --ti-common-line-height-5: 24px; // NewCssVar
+  --ti-common-line-height-6: 32px; // NewCssVar
+  --ti-common-line-height-7: 36px; // NewCssVar
+
+  /**
+    * 2.9 间距
+    * 适用于组件中的margin、padding
+    **/
+
+  /* 基础间距 */
+  --ti-common-space-base: 4px;
+  --ti-common-space-2x: calc(var(--ti-common-space-base) * 2); // 间距-2
+  --ti-common-space-3x: calc(var(--ti-common-space-base) * 3); // 间距-3
+  --ti-common-space-4x: calc(var(--ti-common-space-base) * 4); // 间距-4
+  --ti-common-space-5x: calc(var(--ti-common-space-base) * 5); // 间距-5
+  --ti-common-space-6x: calc(var(--ti-common-space-base) * 6); // 间距-6
+  --ti-common-space-8x: calc(var(--ti-common-space-base) * 8); // 间距-7
+  --ti-common-space-10x: calc(var(--ti-common-space-base) * 10); // 间距-8
+
+  /* 其他间距 */
+  --ti-common-space-0: 0px; // 其他间距-1
+  --ti-common-space-1: 1px; // 其他间距-2
+  --ti-common-space-6: 6px; // 其他间距-3
+  --ti-common-space-10: 10px; // 其他间距-4
+  --ti-common-dropdown-gap: 2px; // NewCssVar 下拉面板距离上部输入框的间距
+
+  /**
+    * 2.10 阴影
+    **/
+  --ti-common-shadow-none: none; // NewCssVar 无阴影
+  --ti-common-shadow-1-up: 0 -1px 4px 0 rgba(0, 0, 0, 0.1); // 阴影-1 上
+  --ti-common-shadow-1-down: 0 1px 4px 0 rgba(0, 0, 0, 0.1); // 阴影-1 下
+  --ti-common-shadow-1-left: -1px 0px 4px 0 rgba(0, 0, 0, 0.1); // 阴影-1 左
+  --ti-common-shadow-1-right: 1px 0px 4px 0 rgba(0, 0, 0, 0.1); // 阴影-1 右
+  --ti-common-shadow-2-up: 0 -2px 8px 0 rgba(0, 0, 0, 0.2); // 阴影-2 上
+  --ti-common-shadow-2-down: 0 2px 8px 0 rgba(0, 0, 0, 0.2); // 阴影-2 下
+  --ti-common-shadow-2-left: -2px 0 8px 0 rgba(238, 10, 10, 0.2); // 阴影-2 左
+  --ti-common-shadow-2-right: 2px 0 8px 0 rgba(252, 5, 5, 0.2); // 阴影-2 右
+  --ti-common-shadow-3-up: 0 -4px 16px 0 rgba(0, 0, 0, 0.2); // 阴影-3 上
+  --ti-common-shadow-3-down: 0 4px 16px 0 rgba(0, 0, 0, 0.2); // 阴影-3 下
+  --ti-common-shadow-3-left: -4px 0 16px 0 rgba(0, 0, 0, 0.2); // 阴影-3 左
+  --ti-common-shadow-3-right: 4px 0 16px 0 rgba(0, 0, 0, 0.2); // 阴影-3 右
+  --ti-common-shadow-4-up: 0 -8px 40px 0 rgba(0, 0, 0, 0.2); // 阴影-4 上
+  --ti-common-shadow-4-down: 0 8px 40px 0 rgba(0, 0, 0, 0.2); // 阴影-4 下
+  --ti-common-shadow-4-left: -8px 0 40px 0 rgba(0, 0, 0, 0.2); // 阴影-4 左
+  --ti-common-shadow-4-right: 8px 0 40px 0 rgba(0, 0, 0, 0.2); // 阴影-4 右
+
+  /* 提示类阴影*/
+  --ti-common-shadow-error: 0 1px 3px 0 rgba(199, 54, 54, 0.25); // 错误
+  --ti-common-shadow-warn: 0 1px 3px 0 rgba(204, 100, 20, 0.25); // 告警
+  --ti-common-shadow-prompt: 0 1px 3px 0 rgba(70, 94, 184, 0.25); // 提示
+  --ti-common-shadow-success: 0 1px 3px 0 rgba(39, 176, 128, 0.25); // 成功
+
+  /**
+    * 2.11 字体
+    **/
+  --ti-common-font-family: 'Helvetica', 'Arial', 'PingFangSC-Regular', 'Hiragino Sans GB', 'Microsoft YaHei', '微软雅黑',
+    'Microsoft JhengHei';
+
+  /**
+    * 2.12 字号
+    **/
+  --ti-common-font-size-base: 12px; // NewCssVar 正文-常规
+  --ti-common-font-size-1: 14px; // NewCssVar 标题-小
+  --ti-common-font-size-2: 16px; // NewCssVar 标题-中
+  --ti-common-font-size-3: 18px; // NewCssVar 标题-大
+  --ti-common-font-size-4: 20px; // NewCssVar 字号-4
+  --ti-common-font-size-5: 24px; // NewCssVar 字号-5
+  --ti-common-font-size-6: 32px; // NewCssVar 字号-6
+  --ti-common-font-size-7: 36px; // NewCssVar 字号-7
+
+  /**
+    * 2.13 字重
+    **/
+  --ti-common-font-weight-1: 100; // 极细
+  --ti-common-font-weight-2: 200; // 纤细
+  --ti-common-font-weight-3: 300; // 细体
+  --ti-common-font-weight-4: normal; // 常规
+  --ti-common-font-weight-5: 500; // 中等
+  --ti-common-font-weight-6: 600; // 半粗
+  --ti-common-font-weight-7: bold; // 粗体
+  --ti-common-font-weight-8: 800; // 中黑
+  --ti-common-font-weight-9: 900; // 黑体
+  --ti-common-font-weight-bold: 700; // NewCssVar
+
+  /**
+    * 2.14 线颜色
+    * 用于边框，分割线等的颜色使用
+    **/
+  --ti-common-color-line-normal: var(--ti-base-color-common-2);
+  --ti-common-color-line-hover: var(--ti-base-color-common-5);
+  --ti-common-color-line-active: var(--ti-base-color-brand-6);
+  --ti-common-color-line-disabled: var(--ti-base-color-common-1);
+  --ti-common-color-line-dividing: var(--ti-base-color-common-1); //分割线颜色
+  /* 虚线 */
+  --ti-common-color-dash-line-normal: var(--ti-base-color-common-5);
+  --ti-common-color-dash-line-hover: var(--ti-base-color-brand-7);
+  --ti-common-color-border: var(--ti-base-color-common-2); // NewCssVar 待整改后删除
+  --ti-common-color-border-hover: var(--ti-base-color-common-5); // NewCssVar 待整改后删除
+
+  /**
+    * 2.15 线粗细
+    **/
+  --ti-common-border-weight-normal: 1px; // 常规
+  --ti-common-border-weight-1: 2px; // 较粗
+  --ti-common-border-weight-2: 3px; // 粗
+
+  /**
+    * 2.16 线样式
+    **/
+  --ti-common-border-style-dashed: dashed; // 虚线
+  --ti-common-border-style-dotted: dotted; // 点线
+  --ti-common-border-style-solid: solid; // 实线
+
+  /**
+    * 2.17 圆角
+    **/
+  --ti-common-border-radius-normal: 2px; // 常规
+  --ti-common-border-radius-0: 0px; // 直角
+  --ti-common-border-radius-1: 4px; // 圆角-1
+  --ti-common-border-radius-2: 8px; // 圆角-2
+  --ti-common-border-radius-3: 50%; // 圆形
+
+  /**
+    * 2.18 尺寸
+    **/
+  --ti-common-size-base: 4px; // 基础尺寸
+  --ti-common-size-2x: calc(var(--ti-common-size-base) * 2); // 尺寸-2
+  --ti-common-size-3x: calc(var(--ti-common-size-base) * 3); // 尺寸-3
+  --ti-common-size-4x: calc(var(--ti-common-size-base) * 4); // 尺寸-4
+  --ti-common-size-5x: calc(var(--ti-common-size-base) * 5); // 尺寸-5
+  --ti-common-size-6x: calc(var(--ti-common-size-base) * 6); // 尺寸-6
+  --ti-common-size-7x: calc(var(--ti-common-size-base) * 7); // 尺寸-7
+  --ti-common-size-8x: calc(var(--ti-common-size-base) * 8); // 尺寸-8
+  --ti-common-size-9x: calc(var(--ti-common-size-base) * 9); // 尺寸-9
+  --ti-common-size-10x: calc(var(--ti-common-size-base) * 10); // 尺寸-10
+  --ti-common-size-11x: calc(var(--ti-common-size-base) * 11); // 尺寸-11
+  --ti-common-size-12x: calc(var(--ti-common-size-base) * 12); // 尺寸-12
+  --ti-common-size-13x: calc(var(--ti-common-size-base) * 13); // 尺寸-13
+  --ti-common-size-14x: calc(var(--ti-common-size-base) * 14); // 尺寸-14
+  --ti-common-size-15x: calc(var(--ti-common-size-base) * 15); // 尺寸-15
+  --ti-common-size-16x: calc(var(--ti-common-size-base) * 16); // 尺寸-16
+  --ti-common-size-17x: calc(var(--ti-common-size-base) * 17); // 尺寸-17
+  --ti-common-size-18x: calc(var(--ti-common-size-base) * 18); // 尺寸-18
+  --ti-common-size-19x: calc(var(--ti-common-size-base) * 19); // 尺寸-19
+  --ti-common-size-20x: calc(var(--ti-common-size-base) * 20); // 尺寸-20
+  --ti-common-size-21x: calc(var(--ti-common-size-base) * 21); // 尺寸-21
+  --ti-common-size-22x: calc(var(--ti-common-size-base) * 22); // 尺寸-22
+  --ti-common-size-23x: calc(var(--ti-common-size-base) * 23); // 尺寸-23
+  --ti-common-size-24x: calc(var(--ti-common-size-base) * 24); // 尺寸-24
+  --ti-common-size-25x: calc(var(--ti-common-size-base) * 25); // 尺寸-25
+  --ti-common-size-26x: calc(var(--ti-common-size-base) * 26); // 尺寸-26
+  --ti-common-size-27x: calc(var(--ti-common-size-base) * 27); // 尺寸-27
+  --ti-common-size-28x: calc(var(--ti-common-size-base) * 28); // 尺寸-28
+  --ti-common-size-29x: calc(var(--ti-common-size-base) * 29); // 尺寸-29
+  --ti-common-size-30x: calc(var(--ti-common-size-base) * 30); // 尺寸-30
+  --ti-common-size-31x: calc(var(--ti-common-size-base) * 31); // 尺寸-31
+  --ti-common-size-32x: calc(var(--ti-common-size-base) * 32); // 尺寸-32
+  --ti-common-size-33x: calc(var(--ti-common-size-base) * 33); // 尺寸-33
+  --ti-common-size-34x: calc(var(--ti-common-size-base) * 34); // 尺寸-34
+  --ti-common-size-35x: calc(var(--ti-common-size-base) * 35); // 尺寸-35
+  --ti-common-size-36x: calc(var(--ti-common-size-base) * 36); // 尺寸-36
+  --ti-common-size-37x: calc(var(--ti-common-size-base) * 37); // 尺寸-37
+  --ti-common-size-38x: calc(var(--ti-common-size-base) * 38); // 尺寸-38
+  --ti-common-size-39x: calc(var(--ti-common-size-base) * 39); // 尺寸-39
+  --ti-common-size-40x: calc(var(--ti-common-size-base) * 40); // 尺寸-40
+  --ti-common-size-41x: calc(var(--ti-common-size-base) * 41); // 尺寸-41
+  --ti-common-size-42x: calc(var(--ti-common-size-base) * 42); // 尺寸-42
+  --ti-common-size-43x: calc(var(--ti-common-size-base) * 43); // 尺寸-43
+  --ti-common-size-44x: calc(var(--ti-common-size-base) * 44); // 尺寸-44
+  --ti-common-size-45x: calc(var(--ti-common-size-base) * 45); // 尺寸-45
+  --ti-common-size-46x: calc(var(--ti-common-size-base) * 46); // 尺寸-46
+  --ti-common-size-47x: calc(var(--ti-common-size-base) * 47); // 尺寸-47
+  --ti-common-size-48x: calc(var(--ti-common-size-base) * 48); // 尺寸-48
+  --ti-common-size-49x: calc(var(--ti-common-size-base) * 49); // 尺寸-49
+  --ti-common-size-50x: calc(var(--ti-common-size-base) * 50); // 尺寸-50
+
+  /*  其他尺寸 */
+  --ti-common-size-0: 0px; // 其他尺寸-1
+  --ti-common-size-auto: auto; // 其他尺寸-2
+
+  /* 以下变量是因为AUI拥有大量的large、medium、normal、minor、samll、mini尺寸， 所以下方是一些抽象尺寸、为了更好的适配AUI (button、tag、alert组件) */
+  --ti-common-size-width-large: var(--ti-common-size-33x); // NewCssVar
+  --ti-common-size-width-medium: var(--ti-common-size-30x); // NewCssVar
+  --ti-common-size-width-normal: var(--ti-common-size-20x); // NewCssVar
+
+  --ti-common-size-height-large: var(--ti-common-size-12x); // NewCssVar
+  --ti-common-size-height-medium: var(--ti-common-size-10x); // NewCssVar
+  --ti-common-size-height-small: var(--ti-common-size-8x); // NewCssVar
+  --ti-common-size-height-normal: var(--ti-common-size-7x); // NewCssVar
+  --ti-common-size-height-mini: var(--ti-common-size-6x); // NewCssVar
+
+  /*  滚动条 */
+  --ti-common-scrollbar-width: 8px;
+  --ti-common-scrollbar-height: 8px;
+  --ti-common-scrollbar-track-piece-bg-color: var(--ti-base-color-bg-4);
+  --ti-common-scrollbar-thumb-bg-color: #bfbfbf;
+  --ti-common-scrollbar-thumb-border-radius: 6px;
+  --ti-common-scrollbar-thumb-hover-bg-color: #999999;
+  --ti-common-scrollbar-thumb-active-bg-color: #999999;
+}
diff --git a/packages/theme/src/base/old-theme.js b/packages/theme/src/base/old-theme.js
new file mode 100644
index 000000000..4a5db23b3
--- /dev/null
+++ b/packages/theme/src/base/old-theme.js
@@ -0,0 +1,277 @@
+export const tinyBaseOldTheme = {
+  'ti-common-scrollbar-thumb-active-bg-color': '#999999',
+  'ti-common-scrollbar-thumb-hover-bg-color': '#999999',
+  'ti-common-scrollbar-thumb-border-radius': '6px',
+  'ti-common-scrollbar-thumb-bg-color': '#bfbfbf',
+  'ti-common-scrollbar-track-piece-bg-color': 'var(--ti-base-color-bg-4)',
+  'ti-common-scrollbar-height': '8px',
+  'ti-common-scrollbar-width': '8px',
+  'ti-common-size-height-mini': 'var(--ti-common-size-6x)',
+  'ti-common-size-height-normal': 'var(--ti-common-size-7x)',
+  'ti-common-size-height-small': 'var(--ti-common-size-8x)',
+  'ti-common-size-height-medium': 'var(--ti-common-size-10x)',
+  'ti-common-size-height-large': 'var(--ti-common-size-12x)',
+  'ti-common-size-width-normal': 'var(--ti-common-size-20x)',
+  'ti-common-size-width-medium': 'var(--ti-common-size-30x)',
+  'ti-common-size-width-large': 'var(--ti-common-size-33x)',
+  'ti-common-size-auto': 'auto',
+  'ti-common-size-0': '0px',
+  'ti-common-size-50x': 'calc(var(--ti-common-size-base) * 50)',
+  'ti-common-size-49x': 'calc(var(--ti-common-size-base) * 49)',
+  'ti-common-size-48x': 'calc(var(--ti-common-size-base) * 48)',
+  'ti-common-size-47x': 'calc(var(--ti-common-size-base) * 47)',
+  'ti-common-size-46x': 'calc(var(--ti-common-size-base) * 46)',
+  'ti-common-size-45x': 'calc(var(--ti-common-size-base) * 45)',
+  'ti-common-size-44x': 'calc(var(--ti-common-size-base) * 44)',
+  'ti-common-size-43x': 'calc(var(--ti-common-size-base) * 43)',
+  'ti-common-size-42x': 'calc(var(--ti-common-size-base) * 42)',
+  'ti-common-size-41x': 'calc(var(--ti-common-size-base) * 41)',
+  'ti-common-size-40x': 'calc(var(--ti-common-size-base) * 40)',
+  'ti-common-size-39x': 'calc(var(--ti-common-size-base) * 39)',
+  'ti-common-size-38x': 'calc(var(--ti-common-size-base) * 38)',
+  'ti-common-size-37x': 'calc(var(--ti-common-size-base) * 37)',
+  'ti-common-size-36x': 'calc(var(--ti-common-size-base) * 36)',
+  'ti-common-size-35x': 'calc(var(--ti-common-size-base) * 35)',
+  'ti-common-size-34x': 'calc(var(--ti-common-size-base) * 34)',
+  'ti-common-size-33x': 'calc(var(--ti-common-size-base) * 33)',
+  'ti-common-size-32x': 'calc(var(--ti-common-size-base) * 32)',
+  'ti-common-size-31x': 'calc(var(--ti-common-size-base) * 31)',
+  'ti-common-size-30x': 'calc(var(--ti-common-size-base) * 30)',
+  'ti-common-size-29x': 'calc(var(--ti-common-size-base) * 29)',
+  'ti-common-size-28x': 'calc(var(--ti-common-size-base) * 28)',
+  'ti-common-size-27x': 'calc(var(--ti-common-size-base) * 27)',
+  'ti-common-size-26x': 'calc(var(--ti-common-size-base) * 26)',
+  'ti-common-size-25x': 'calc(var(--ti-common-size-base) * 25)',
+  'ti-common-size-24x': 'calc(var(--ti-common-size-base) * 24)',
+  'ti-common-size-23x': 'calc(var(--ti-common-size-base) * 23)',
+  'ti-common-size-22x': 'calc(var(--ti-common-size-base) * 22)',
+  'ti-common-size-21x': 'calc(var(--ti-common-size-base) * 21)',
+  'ti-common-size-20x': 'calc(var(--ti-common-size-base) * 20)',
+  'ti-common-size-19x': 'calc(var(--ti-common-size-base) * 19)',
+  'ti-common-size-18x': 'calc(var(--ti-common-size-base) * 18)',
+  'ti-common-size-17x': 'calc(var(--ti-common-size-base) * 17)',
+  'ti-common-size-16x': 'calc(var(--ti-common-size-base) * 16)',
+  'ti-common-size-15x': 'calc(var(--ti-common-size-base) * 15)',
+  'ti-common-size-14x': 'calc(var(--ti-common-size-base) * 14)',
+  'ti-common-size-13x': 'calc(var(--ti-common-size-base) * 13)',
+  'ti-common-size-12x': 'calc(var(--ti-common-size-base) * 12)',
+  'ti-common-size-11x': 'calc(var(--ti-common-size-base) * 11)',
+  'ti-common-size-10x': 'calc(var(--ti-common-size-base) * 10)',
+  'ti-common-size-9x': 'calc(var(--ti-common-size-base) * 9)',
+  'ti-common-size-8x': 'calc(var(--ti-common-size-base) * 8)',
+  'ti-common-size-7x': 'calc(var(--ti-common-size-base) * 7)',
+  'ti-common-size-6x': 'calc(var(--ti-common-size-base) * 6)',
+  'ti-common-size-5x': 'calc(var(--ti-common-size-base) * 5)',
+  'ti-common-size-4x': 'calc(var(--ti-common-size-base) * 4)',
+  'ti-common-size-3x': 'calc(var(--ti-common-size-base) * 3)',
+  'ti-common-size-2x': 'calc(var(--ti-common-size-base) * 2)',
+  'ti-common-size-base': '4px',
+  'ti-common-border-radius-3': '50%',
+  'ti-common-border-radius-2': '8px',
+  'ti-common-border-radius-1': '4px',
+  'ti-common-border-radius-0': '0px',
+  'ti-common-border-radius-normal': '2px',
+  'ti-common-border-weight-1': '2px',
+  'ti-common-border-weight-normal': '1px',
+  'ti-common-color-border-hover': 'var(--ti-base-color-common-5)',
+  'ti-common-color-border': 'var(--ti-base-color-common-2)',
+  'ti-common-color-dash-line-hover': 'var(--ti-base-color-brand-7)',
+  'ti-common-color-dash-line-normal': 'var(--ti-base-color-common-5)',
+  'ti-common-color-line-dividing': 'var(--ti-base-color-common-1)',
+  'ti-common-color-line-disabled': 'var(--ti-base-color-common-1)',
+  'ti-common-color-line-active': 'var(--ti-base-color-brand-6)',
+  'ti-common-color-line-hover': 'var(--ti-base-color-common-5)',
+  'ti-common-color-line-normal': 'var(--ti-base-color-common-2)',
+  'ti-common-font-weight-bold': '700',
+  'ti-common-font-weight-6': '600',
+  'ti-common-font-weight-4': 'normal',
+  'ti-common-font-size-7': '36px',
+  'ti-common-font-size-6': '32px',
+  'ti-common-font-size-5': '24px',
+  'ti-common-font-size-4': '20px',
+  'ti-common-font-size-3': '18px',
+  'ti-common-font-size-2': '16px',
+  'ti-common-font-size-1': '14px',
+  'ti-common-font-size-base': '12px',
+  'ti-common-font-family':
+    "'Helvetica', 'Arial', 'PingFangSC-Regular', 'Hiragino Sans GB', 'Microsoft YaHei', '微软雅黑',\n    'Microsoft JhengHei'",
+  'ti-common-shadow-4-right': '8px 0 40px 0 rgba(0, 0, 0, 0.2)',
+  'ti-common-shadow-4-left': '-8px 0 40px 0 rgba(0, 0, 0, 0.2)',
+  'ti-common-shadow-4-down': '0 8px 40px 0 rgba(0, 0, 0, 0.2)',
+  'ti-common-shadow-4-up': '0 -8px 40px 0 rgba(0, 0, 0, 0.2)',
+  'ti-common-shadow-3-right': '4px 0 16px 0 rgba(0, 0, 0, 0.2)',
+  'ti-common-shadow-3-left': '-4px 0 16px 0 rgba(0, 0, 0, 0.2)',
+  'ti-common-shadow-3-down': '0 4px 16px 0 rgba(0, 0, 0, 0.2)',
+  'ti-common-shadow-3-up': '0 -4px 16px 0 rgba(0, 0, 0, 0.2)',
+  'ti-common-shadow-2-right': '2px 0 8px 0 rgba(252, 5, 5, 0.2)',
+  'ti-common-shadow-2-left': '-2px 0 8px 0 rgba(238, 10, 10, 0.2)',
+  'ti-common-shadow-2-down': '0 2px 8px 0 rgba(0, 0, 0, 0.2)',
+  'ti-common-shadow-2-up': '0 -2px 8px 0 rgba(0, 0, 0, 0.2)',
+  'ti-common-shadow-1-right': '1px 0px 4px 0 rgba(0, 0, 0, 0.1)',
+  'ti-common-shadow-1-left': '-1px 0px 4px 0 rgba(0, 0, 0, 0.1)',
+  'ti-common-shadow-1-down': '0 1px 4px 0 rgba(0, 0, 0, 0.1)',
+  'ti-common-shadow-1-up': '0 -1px 4px 0 rgba(0, 0, 0, 0.1)',
+  'ti-common-dropdown-gap': '2px',
+  'ti-common-space-10': '10px',
+  'ti-common-space-6': '6px',
+  'ti-common-space-0': '0px',
+  'ti-common-space-10x': 'calc(var(--ti-common-space-base) * 10)',
+  'ti-common-space-8x': 'calc(var(--ti-common-space-base) * 8)',
+  'ti-common-space-6x': 'calc(var(--ti-common-space-base) * 6)',
+  'ti-common-space-5x': 'calc(var(--ti-common-space-base) * 5)',
+  'ti-common-space-4x': 'calc(var(--ti-common-space-base) * 4)',
+  'ti-common-space-3x': 'calc(var(--ti-common-space-base) * 3)',
+  'ti-common-space-2x': 'calc(var(--ti-common-space-base) * 2)',
+  'ti-common-space-base': '4px',
+  'ti-common-line-height-7': '36px',
+  'ti-common-line-height-6': '32px',
+  'ti-common-line-height-5': '24px',
+  'ti-common-line-height-4': '20px',
+  'ti-common-line-height-3': '18px',
+  'ti-common-line-height-2': '16px',
+  'ti-common-line-height-1': '14px',
+  'ti-common-line-height-base': '12px',
+  'ti-common-line-height-number': '1.5',
+  'ti-common-color-data-8': 'var(--ti-base-color-error-3)',
+  'ti-common-color-data-7': 'var(--ti-base-color-warn-4)',
+  'ti-common-color-data-6': 'var(--ti-base-color-warn-3)',
+  'ti-common-color-data-5': 'var(--ti-base-color-data-5)',
+  'ti-common-color-data-4': 'var(--ti-base-color-data-4)',
+  'ti-common-color-data-3': 'var(--ti-base-color-data-3)',
+  'ti-common-color-data-2': 'var(--ti-base-color-icon-info)',
+  'ti-common-color-data-1': 'var(--ti-base-color-success-3)',
+  'ti-common-color-hover-background': 'var(--ti-base-color-brand-1)',
+  'ti-common-color-selected-background': 'var(--ti-base-color-brand-6)',
+  'ti-common-color-bg-dark-select': 'var(--ti-base-color-common-9)',
+  'ti-common-color-bg-navigation': 'var(--ti-base-color-common-8)',
+  'ti-common-color-bg-dark-disabled': 'var(--ti-base-color-common-1)',
+  'ti-common-color-bg-dark-deep': 'var(--ti-base-color-common-6)',
+  'ti-common-color-bg-dark-active': 'var(--ti-common-color-bg-normal)',
+  'ti-common-color-bg-dark-emphasize': 'var(--ti-base-color-common-4)',
+  'ti-common-color-bg-dark-normal': 'var(--ti-base-color-common-6)',
+  'ti-common-color-bg-light-emphasize': 'var(--ti-base-color-brand-3)',
+  'ti-common-color-bg-light-normal': 'var(\n    --ti-base-color-brand-2\n  )',
+  'ti-common-color-bg-white-emphasize': 'var(\n    --ti-base-color-brand-1\n  )',
+  'ti-common-color-bg-white-normal': 'var(--ti-base-color-white)',
+  'ti-common-bg-primary-active': 'var(--ti-base-color-bg-9)',
+  'ti-common-bg-primary-hover': 'var(--ti-base-color-bg-7)',
+  'ti-common-bg-primary': 'var(--ti-base-color-bg-8)',
+  'ti-common-color-bg-secondary': 'var(--ti-base-color-common-2)',
+  'ti-common-color-bg-gray': 'var(--ti-base-color-bg-4)',
+  'ti-common-color-bg-hover': 'var(--ti-base-color-brand-8)',
+  'ti-common-color-bg-disabled': 'var(--ti-base-color-bg-5)',
+  'ti-common-color-bg-emphasize': 'var(--ti-base-color-brand-6)',
+  'ti-common-color-bg-normal': 'var(--ti-base-color-bg-6)',
+  'ti-common-color-icon-info': 'var(--ti-base-color-icon-info)',
+  'ti-common-color-icon-darkbg-disabled': 'var(--ti-base-color-common-5)',
+  'ti-common-color-icon-darkbg-active': 'var(--ti-base-color-brand-5)',
+  'ti-common-color-icon-darkbg-hover': 'var(--ti-base-color-brand-5)',
+  'ti-common-color-icon-darkbg-normal': 'var(--ti-base-color-common-2)',
+  'ti-common-color-icon-graybg-disabled': 'var(--ti-base-color-common-1)',
+  'ti-common-color-icon-graybg-active': 'var(--ti-base-color-brand-6)',
+  'ti-common-color-icon-graybg-hover': 'var(--ti-base-color-brand-6)',
+  'ti-common-color-icon-graybg-normal': 'var(--ti-base-color-common-2)',
+  'ti-common-color-icon-white': 'var(--ti-base-color-white)',
+  'ti-common-color-icon-disabled': 'var(--ti-base-color-common-2)',
+  'ti-common-color-icon-active': 'var(--ti-base-color-brand-6)',
+  'ti-common-color-icon-hover': 'var(--ti-base-color-brand-6)',
+  'ti-common-color-icon-normal': 'var(--ti-base-color-common-5)',
+  'ti-common-color-selected-text-color': 'var(--ti-common-color-light)',
+  'ti-common-color-placeholder': 'var(--ti-base-color-common-2)',
+  'ti-common-color-text-important': 'var(--ti-base-color-error-4)',
+  'ti-common-color-text-gray-disabled': 'var(--ti-base-color-common-4)',
+  'ti-common-color-text-gray': 'var(--ti-base-color-white)',
+  'ti-common-color-text-white': 'var(--ti-base-color-white)',
+  'ti-common-color-text-highlight': 'var(--ti-base-color-brand-7)',
+  'ti-common-color-text-link-darkbg-hover': 'var(--ti-base-color-brand-3)',
+  'ti-common-color-text-link-darkbg': 'var(--ti-base-color-brand-4)',
+  'ti-common-color-text-link-hover': 'var(--ti-base-color-brand-8)',
+  'ti-common-color-text-link': 'var(--ti-base-color-brand-7)',
+  'ti-common-color-text-darkbg-disabled': 'var(--ti-base-color-common-5)',
+  'ti-common-color-text-darkbg': 'var(--ti-base-color-common-2)',
+  'ti-common-color-text-disabled': 'var(--ti-base-color-common-2)',
+  'ti-common-color-text-weaken': 'var(--ti-base-color-common-3)',
+  'ti-common-color-text-secondary': 'var(--ti-base-color-common-5)',
+  'ti-common-color-text-primary': 'var(--ti-base-color-common-7)',
+  'ti-common-color-info-disabled-text': 'var(--ti-common-color-text-disabled)',
+  'ti-common-color-info-disabled-border': 'var(--ti-common-color-line-disabled)',
+  'ti-common-color-info-disabled': '#bfbfbf',
+  'ti-common-color-info-active': 'var(--ti-base-color-common-4)',
+  'ti-common-color-info-hover': 'var(--ti-base-color-common-4)',
+  'ti-common-color-info-normal': 'var(--ti-base-color-common-7)',
+  'ti-common-color-danger-disabled-text': 'var(--ti-common-color-text-disabled)',
+  'ti-common-color-danger-disabled-border': 'var(--ti-common-color-line-disabled)',
+  'ti-common-color-danger-disabled': '#d8bab5',
+  'ti-common-color-danger-active': 'var(--ti-common-bg-primary-active)',
+  'ti-common-color-danger-hover': 'var(--ti-common-bg-primary-hover)',
+  'ti-common-color-danger-normal': 'var(--ti-common-bg-primary)',
+  'ti-common-color-warning-disabled-text': 'var(--ti-common-color-text-disabled)',
+  'ti-common-color-warning-disabled-border': 'var(--ti-common-color-line-disabled)',
+  'ti-common-color-warning-disabled': '#d3c6a2',
+  'ti-common-color-warning-active': 'var(--ti-common-color-warn-secondary)',
+  'ti-common-color-warning-hover': 'var(--ti-common-color-warn-secondary)',
+  'ti-common-color-warning-normal': 'var(--ti-common-color-warn)',
+  'ti-common-color-success-disabled-text': 'var(--ti-common-color-text-disabled)',
+  'ti-common-color-success-disabled-border': 'var(--ti-common-color-line-disabled)',
+  'ti-common-color-success-disabled': '#a6c3b9',
+  'ti-common-color-success-active': 'var(--ti-common-color-success-border)',
+  'ti-common-color-success-hover': 'var(--ti-common-color-success-border)',
+  'ti-common-color-success-normal': 'var(--ti-common-color-success)',
+  'ti-common-color-primary-disabled-text': 'var(--ti-common-color-text-disabled)',
+  'ti-common-color-primary-disabled-border': 'var(--ti-common-color-line-disabled)',
+  'ti-common-color-primary-disabled': '#a0cfff',
+  'ti-common-color-primary-active': 'var(--ti-base-color-brand-5)',
+  'ti-common-color-primary-hover': 'var(--ti-base-color-brand-5)',
+  'ti-common-color-primary-normal': 'var(--ti-base-color-brand-6)',
+  'ti-common-color-prompt-icon-to': 'var(--ti-base-color-prompt-icon-to)',
+  'ti-common-color-prompt-icon-from': 'var(--ti-base-color-prompt-icon-from)',
+  'ti-common-color-prompt-border': 'var(--ti-base-color-prompt-2)',
+  'ti-common-color-prompt-bg': 'var(--ti-base-color-prompt-1)',
+  'ti-common-color-prompt-text': 'var(--ti-base-color-prompt-4)',
+  'ti-common-color-prompt': 'var(--ti-base-color-prompt-3)',
+  'ti-common-color-warn-secondary': 'var(--ti-base-color-warn-3)',
+  'ti-common-color-warn-border': 'var(--ti-base-color-warn-2)',
+  'ti-common-color-warn-bg': 'var(--ti-base-color-warn-1)',
+  'ti-common-color-warn-text': 'var(--ti-base-color-warn-5)',
+  'ti-common-color-warn': 'var(--ti-base-color-warn-4)',
+  'ti-common-color-error-border-secondary': 'var(--ti-base-color-error-2)',
+  'ti-common-color-error-border': 'var(--ti-base-color-error-3)',
+  'ti-common-color-error-bg': 'var(--ti-base-color-error-1)',
+  'ti-common-color-error-text': 'var(--ti-base-color-error-4)',
+  'ti-common-color-error': 'var(--ti-base-color-error-3)',
+  'ti-common-color-success-border': 'var(--ti-base-color-success-2)',
+  'ti-common-color-success-bg': 'var(--ti-base-color-success-1)',
+  'ti-common-color-text-success': 'var(--ti-base-color-success-4)',
+  'ti-common-color-success': 'var(--ti-base-color-success-3)',
+  'ti-common-color-dark': '#000',
+  'ti-common-color-light': '#fff',
+  'ti-common-color-transparent': 'var(--ti-base-color-transparent)',
+  'ti-base-color-data-5': '#a97af8',
+  'ti-base-color-data-4': '#f3689a',
+  'ti-base-color-data-3': '#a6dd82',
+  'ti-base-color-icon-info': '#6cbfff',
+  'ti-base-color-prompt-icon-to': '#58bbff',
+  'ti-base-color-prompt-icon-from': '#7769e8',
+  'ti-base-color-warn-1': '#fff3e8',
+  'ti-base-color-bg-1': '#ffffff',
+  'ti-base-color-bg-2': '#ffffff',
+  'ti-base-color-bg-3': '#ffffff',
+  'ti-base-color-bg-4': '#fafafa',
+  'ti-base-color-bg-5': '#f5f5f6',
+  'ti-base-color-bg-6': '#eef0f5',
+  'ti-base-color-bg-7': '#d64a52',
+  'ti-base-color-common-1': '#dfe1e6',
+  'ti-base-color-common-2': '#adb0b8',
+  'ti-base-color-common-3': '#8a8e99',
+  'ti-base-color-common-4': '#5c6173',
+  'ti-base-color-common-5': '#575d6c',
+  'ti-base-color-common-6': '#464c59',
+  'ti-base-color-brand-1': '#f2f5fc',
+  'ti-base-color-brand-2': '#e9edfa',
+  'ti-base-color-brand-3': '#beccfa',
+  'ti-base-color-brand-4': '#96adfa',
+  'ti-base-color-brand-5': '#7693f5',
+  'ti-base-color-brand-7': '#526ecc',
+  'ti-base-color-brand-8': '#344899',
+  'ti-base-color-brand-6': '#5e7ce0'
+}
diff --git a/packages/theme/src/breadcrumb/old-theme.js b/packages/theme/src/breadcrumb/old-theme.js
new file mode 100644
index 000000000..4df8e6d98
--- /dev/null
+++ b/packages/theme/src/breadcrumb/old-theme.js
@@ -0,0 +1,7 @@
+export const tinyBreadcrumbOldTheme = {
+  'ti-breadcrumb-hover-text-decoration': 'none',
+  'ti-breadcrumb-separator-width': 'calc(var(--ti-common-size-base, 4px) + 2px)',
+  'ti-breadcrumb-text-color': 'var(--ti-common-color-text-weaken, #8a8e99)',
+  'ti-breadcrumb-text-line-height': 'var(--ti-common-line-height-3, 18px)',
+  'ti-breadcrumb-font-size': 'var(--ti-common-font-size-base, 12px)'
+}
diff --git a/packages/theme/src/breadcrumb/smb-theme.js b/packages/theme/src/breadcrumb/smb-theme.js
deleted file mode 100644
index d5d938c6a..000000000
--- a/packages/theme/src/breadcrumb/smb-theme.js
+++ /dev/null
@@ -1,7 +0,0 @@
-export const tinyBreadcrumbSmbTheme = {
-  'ti-breadcrumb-text-color': '#191919',
-  'ti-breadcrumb-font-size': 'var(--ti-common-font-size-base)',
-  'ti-breadcrumb-text-line-height': '22px',
-  'ti-breadcrumb-hover-text-decoration': 'underline',
-  'ti-breadcrumb-separator-width': 'var(--ti-common-size-4x)'
-}
diff --git a/packages/theme/src/breadcrumb/vars.less b/packages/theme/src/breadcrumb/vars.less
index 54029920b..9007a5246 100644
--- a/packages/theme/src/breadcrumb/vars.less
+++ b/packages/theme/src/breadcrumb/vars.less
@@ -12,17 +12,17 @@
 
 .component-css-vars-breadcrumb() {
   // 字号
-  --ti-breadcrumb-font-size: var(--ti-common-font-size-base, 12px);
+  --ti-breadcrumb-font-size: var(--ti-common-font-size-base);
   // 文本行高
-  --ti-breadcrumb-text-line-height: var(--ti-common-line-height-3, 18px);
+  --ti-breadcrumb-text-line-height: 22px;
   // 文本色
-  --ti-breadcrumb-text-color: var(--ti-common-color-text-weaken, #8a8e99);
+  --ti-breadcrumb-text-color: #191919;
   // 字族
   --ti-breadcrumb-font-family: var(--ti-common-font-family, 'Helvetica', 'Arial', 'PingFangSC-Regular', 'Hiragino Sans GB', 'Microsoft YaHei', '微软雅黑', 'Microsoft JhengHei');
   // 分隔符填充色
   --ti-breadcrumb-separator-text-color: var(--ti-common-color-placeholder, #adb0b8);
   // 分割箭头宽度
-  --ti-breadcrumb-separator-width: calc(var(--ti-common-size-base, 4px) + 2px);
+  --ti-breadcrumb-separator-width: var(--ti-common-size-4x);
   // 分隔图标的垂直外边距
   --ti-breadcrumb-separator-margin-vertical: var(--ti-common-space-0, 0px);
   // 分隔图标的水平外边距
@@ -30,7 +30,7 @@
   // 悬浮文本色
   --ti-breadcrumb-hover-text-color: var(--ti-common-color-primary-normal, #5e7ce0);
   // 悬浮文本下划线
-  --ti-breadcrumb-hover-text-decoration: none;
+  --ti-breadcrumb-hover-text-decoration: underline;
   // 当前节点字重
   --ti-breadcrumb-text-font-weight: var(--ti-common-font-weight-7, bold);
   // 当前节点文本色
diff --git a/packages/theme/src/bulletin-board/old-theme.js b/packages/theme/src/bulletin-board/old-theme.js
new file mode 100644
index 000000000..a1a05a628
--- /dev/null
+++ b/packages/theme/src/bulletin-board/old-theme.js
@@ -0,0 +1,20 @@
+export const tinyBulletinBoardOldTheme = {
+  'ti-bulletin-board-tabs-item-hover-text-color': 'var(--ti-base-color-brand-6, #5e7ce0)',
+  'ti-bulletin-board-new-font-size': 'var(--ti-common-font-size-1, 14px)',
+  'ti-bulletin-board-more-text-color': 'var(--ti-base-color-brand-6, #5e7ce0)',
+  'ti-bulletin-board-new-border-radius': 'var(--ti-common-border-radius-normal, 2px)',
+  'ti-bulletin-board-new-text-color': 'var(--ti-common-color-light, #fff)',
+  'ti-bulletin-board-new-bg-color': 'var(--ti-base-color-error-3, #f66f6a)',
+  'ti-bulletin-board-item-margin-bottom': 'var(--ti-common-space-6x, 12px)',
+  'ti-bulletin-board-new-font-family':
+    "var(--ti-common-font-family, '宋体', cursive, Helvetica, Arial, 'microsoft yahei')",
+  'ti-bulletin-board-new-margin-left': 'var(--ti-common-space-0, 0)',
+  'ti-bulletin-board-new-padding-left': 'var(--ti-common-space-0, 0)',
+  'ti-bulletin-board-contentr-padding-button': 'var(--ti-common-space-6x, 24px)',
+  'ti-bulletin-board-contentr-padding-right': 'var(--ti-common-space-6x, 24px)',
+  'ti-bulletin-board-tabs-item-text-padding-right': 'var(--ti-common-space-6x, 24px)',
+  'ti-bulletin-board-item-title-font-weight': 'var(--ti-common-font-weight-5, 500)',
+  'ti-bulletin-board-tabs-item-hover-text-font-weight': 'var(--ti-common-font-weight-5, 500)',
+  'ti-bulletin-board-item-title-text-margin-bottom': 'var(--ti-common-dropdown-gap, 2px)',
+  'ti-bulletin-board-item-title-text-color': 'var(--ti-common-color-dark, #000)'
+}
diff --git a/packages/theme/src/bulletin-board/smb-theme.js b/packages/theme/src/bulletin-board/smb-theme.js
deleted file mode 100644
index 88f460e21..000000000
--- a/packages/theme/src/bulletin-board/smb-theme.js
+++ /dev/null
@@ -1,19 +0,0 @@
-export const tinyBulletinBoardSmbTheme = {
-  'ti-bulletin-board-tabs-item-hover-text-color': 'var(--ti-common-color-text-primary)',
-  'ti-bulletin-board-item-title-text-color': 'var(--ti-common-color-text-primary)',
-  'ti-bulletin-board-more-text-color': 'var(--ti-common-color-text-primary)',
-  'ti-bulletin-board-item-title-text-margin-bottom': 'var(--ti-common-space-2x)',
-  'ti-bulletin-board-item-margin-bottom': 'var(--ti-common-space-6x)',
-  'ti-bulletin-board-new-padding-left': 'var(--ti-common-size-base)',
-  'ti-bulletin-board-new-font-family': 'PingFangSC ,PingFangSC-Regular',
-  'ti-bulletin-board-tabs-item-text-padding-right': 'var(--ti-common-space-0)',
-  'ti-bulletin-board-contentr-padding-right': 'var(--ti-common-space-0)',
-  'ti-bulletin-board-new-margin-left': 'var(--ti-common-space-6)',
-  'ti-bulletin-board-contentr-padding-button': 'var(--ti-common-space-0)',
-  'ti-bulletin-board-new-font-size': 'var(--ti-common-font-size-0)',
-  'ti-bulletin-board-item-title-font-weight': 'var(--ti-common-font-weight-bold)',
-  'ti-bulletin-board-new-text-color': 'var(--ti-common-color-error-border)',
-  'ti-bulletin-board-new-bg-color': 'var(--ti-common-color-error-border-secondary)',
-  'ti-bulletin-board-new-border-radius': 'var(--ti-common-border-radius-1)',
-  'ti-bulletin-board-tabs-item-hover-text-font-weight': 'var(--ti-common-font-weight-bold)'
-}
diff --git a/packages/theme/src/bulletin-board/vars.less b/packages/theme/src/bulletin-board/vars.less
index 62ba8145d..082681a63 100644
--- a/packages/theme/src/bulletin-board/vars.less
+++ b/packages/theme/src/bulletin-board/vars.less
@@ -14,29 +14,29 @@
   --ti-bulletin-board-title-font-size: var(--ti-common-font-size-3, 18px);
   --ti-bulletin-board-title-font-weight: var(--ti-common-font-weight-7, bold);
   --ti-bulletin-board-title-text-color: var(--ti-common-color-info-normal, #252b3a);
-  --ti-bulletin-board-item-title-text-color: var(--ti-common-color-dark, #000);
-  --ti-bulletin-board-item-title-text-margin-bottom: var(--ti-common-dropdown-gap, 2px);
-  --ti-bulletin-board-tabs-item-hover-text-font-weight: var(--ti-common-font-weight-5, 500);
-  --ti-bulletin-board-item-title-font-weight: var(--ti-common-font-weight-5, 500);
-  --ti-bulletin-board-tabs-item-text-padding-right: var(--ti-common-space-6x, 24px);
-  --ti-bulletin-board-contentr-padding-right: var(--ti-common-space-6x, 24px);
-  --ti-bulletin-board-contentr-padding-button: var(--ti-common-space-6x, 24px);
-  --ti-bulletin-board-new-padding-left: var(--ti-common-space-0, 0);
-  --ti-bulletin-board-new-margin-left: var(--ti-common-space-0, 0);
-  --ti-bulletin-board-new-font-family: var(--ti-common-font-family, '宋体', cursive, Helvetica, Arial, 'microsoft yahei');
-  --ti-bulletin-board-item-margin-bottom: var(--ti-common-space-6x, 12px);
+  --ti-bulletin-board-item-title-text-color: var(--ti-common-color-text-primary);
+  --ti-bulletin-board-item-title-text-margin-bottom: var(--ti-common-space-2x);
+  --ti-bulletin-board-tabs-item-hover-text-font-weight: var(--ti-common-font-weight-bold);
+  --ti-bulletin-board-item-title-font-weight: var(--ti-common-font-weight-bold);
+  --ti-bulletin-board-tabs-item-text-padding-right: var(--ti-common-space-0);
+  --ti-bulletin-board-contentr-padding-right: var(--ti-common-space-0);
+  --ti-bulletin-board-contentr-padding-button: var(--ti-common-space-0);
+  --ti-bulletin-board-new-padding-left: var(--ti-common-size-base);
+  --ti-bulletin-board-new-margin-left: var(--ti-common-space-6);
+  --ti-bulletin-board-new-font-family: PingFangSC ,PingFangSC-Regular;
+  --ti-bulletin-board-item-margin-bottom: var(--ti-common-space-6x);
   --ti-bulletin-board-item-date-text-color: var(--ti-common-color-placeholder, #adb0b8);
   --ti-bulletin-board-item-date-font-size: var(--ti-common-font-size-base, 12px);
-  --ti-bulletin-board-new-bg-color: var(--ti-base-color-error-3, #f66f6a);
-  --ti-bulletin-board-new-text-color: var(--ti-common-color-light, #fff);
-  --ti-bulletin-board-new-border-radius: var(--ti-common-border-radius-normal, 2px);
-  --ti-bulletin-board-more-text-color: var(--ti-base-color-brand-6, #5e7ce0);
+  --ti-bulletin-board-new-bg-color: var(--ti-common-color-error-border-secondary);
+  --ti-bulletin-board-new-text-color: var(--ti-common-color-error-border);
+  --ti-bulletin-board-new-border-radius: var(--ti-common-border-radius-1);
+  --ti-bulletin-board-more-text-color: var(--ti-common-color-text-primary);
   --ti-bulletin-board-more-hover-text-color: var(--ti-base-color-brand-5, #7693f5);
   --ti-bulletin-board-more-font-size: var(--ti-common-font-size-base, 12px);
   --ti-bulletin-board-more-icon-font-size: var(--ti-common-font-size-1, 14px);
-  --ti-bulletin-board-new-font-size: var(--ti-common-font-size-1, 14px);
+  --ti-bulletin-board-new-font-size: var(--ti-common-font-size-0);
   --ti-bulletin-board-tabs-item-text-color: var(--ti-common-color-info-normal, #252b3a);
-  --ti-bulletin-board-tabs-item-hover-text-color: var(--ti-base-color-brand-6, #5e7ce0);
+  --ti-bulletin-board-tabs-item-hover-text-color: var(--ti-common-color-text-primary);
   --ti-bulletin-board-tabs-item-disabled-text-color: var(--ti-common-color-placeholder, #adb0b8);
   --ti-bulletin-board-tabs-header-border-color: var(--ti-common-color-border, #adb0b8);
 }
diff --git a/packages/theme/src/button-group/old-theme.js b/packages/theme/src/button-group/old-theme.js
new file mode 100644
index 000000000..b16b16b29
--- /dev/null
+++ b/packages/theme/src/button-group/old-theme.js
@@ -0,0 +1,27 @@
+export const tinyButtonGroupOldTheme = {
+  'ti-button-group-mini-line-height': '22px',
+  'ti-button-group-mini-size': '24px',
+  'ti-button-group-small-line-height': '30px',
+  'ti-button-group-small-size': '32px',
+  'ti-button-group-medium-line-height': '40px',
+  'ti-button-group-medium-size': '42px',
+  'ti-button-group-sup-icon-line-height': '18px',
+  'ti-button-group-item-sup-position-top': 'calc(-1 * var(--ti-button-group-item-sup-height) / 2)',
+  'ti-button-group-item-sup-height': 'var(--ti-common-size-4x, 16px)',
+  'ti-button-group-mini-padding-horizontal': 'var(--ti-common-space-3x, 12px)',
+  'ti-button-group-btn-padding-horizontal': 'calc(var(--ti-common-space-10, 10px) * 3)',
+  'ti-button-group-item-li-margin-bottom': 'var(--ti-common-space-base, 4px)',
+  'ti-button-group-item-active-disabled-bg-color': 'var(--ti-common-color-bg-dark-disabled, #dfe1e6)',
+  'ti-button-group-item-btn-active-hover-bg-color': 'var(--ti-common-color-bg-light-emphasize, #beccfa)',
+  'ti-button-group-item-active-bg-color': 'var(--ti-common-color-bg-emphasize, #5e7ce0)',
+  'ti-button-group-item-btn-hover-bg-color': 'var(--ti-common-color-bg-light-emphasize, #beccfa)',
+  'ti-button-group-item-active-disabled-text-color': 'var(--ti-common-color-text-disabled, #adb0b8)',
+  'ti-button-group-item-btn-disabled-bg-color': 'var(--ti-common-color-bg-disabled, #f5f5f6)',
+  'ti-button-group-item-btn-width': 'var(--ti-common-size-width-normal, 80px)',
+  'ti-button-group-item-btn-text-color': 'var(--ti-common-color-text-primary, #252b3a)',
+  'ti-button-group-item-bg-color': 'var(--ti-common-color-bg-light-normal, #e9edfa)',
+  'ti-button-group-left-border-radius': 'var(--ti-common-border-radius-0, 0px)',
+  'ti-button-group-middle-border-radius': 'var(--ti-common-border-radius-0, 0px)',
+  'ti-button-group-right-border-radius': 'var(--ti-common-border-radius-0, 0px)',
+  'ti-button-group-mini-side-border-radius': 'var(--ti-common-border-radius-normal, 2px)'
+}
diff --git a/packages/theme/src/button-group/smb-theme.js b/packages/theme/src/button-group/smb-theme.js
deleted file mode 100644
index 591106a8a..000000000
--- a/packages/theme/src/button-group/smb-theme.js
+++ /dev/null
@@ -1,27 +0,0 @@
-export const tinyButtonGroupTheme = {
-  'ti-button-group-item-li-margin-bottom': 'var(--ti-common-space-2)',
-  'ti-button-group-right-border-radius': 'var(--ti-common-border-radius-normal)',
-  'ti-button-group-middle-border-radius': 'var(--ti-common-border-radius-normal)',
-  'ti-button-group-left-border-radius': 'var(--ti-common-border-radius-normal)',
-  'ti-button-group-item-btn-text-color': 'var(--ti-common-color-text-secondary)',
-  'ti-button-group-item-active-bg-color': 'var(--ti-common-color-prompt)',
-  'ti-button-group-item-btn-hover-bg-color': '#DEECFF',
-  'ti-button-group-item-btn-disabled-bg-color': '#F0F0F0',
-  'ti-button-group-item-active-disabled-bg-color': 'var(--ti-common-color-bg-dark-disabled)',
-  'ti-button-group-btn-padding-horizontal': 'var(--ti-common-space-6x)',
-  'ti-button-group-mini-padding-horizontal': 'var(--ti-common-space-4x)',
-  'ti-button-group-item-bg-color': 'var(--ti-common-color-bg-normal)',
-  'ti-button-group-item-btn-active-hover-bg-color': 'var(--ti-common-color-prompt)',
-  'ti-button-group-item-btn-width': 'var(--ti-common-size-auto)',
-  'ti-button-group-item-active-disabled-text-color': 'var(--ti-common-color-text-weaken)',
-  'ti-button-group-item-sup-position-top': 'var(--ti-common-space-0)',
-  'ti-button-group-item-sup-height': 'var(--ti-common-line-height-base)',
-  'ti-button-group-mini-side-border-radius': 'var(--ti-button-group-mini-border-radius)',
-  'ti-button-group-sup-icon-line-height': '22px',
-  'ti-button-group-medium-size': '32px',
-  'ti-button-group-medium-line-height': '30px',
-  'ti-button-group-small-size': '28px',
-  'ti-button-group-small-line-height': '26px',
-  'ti-button-group-mini-size': '24px',
-  'ti-button-group-mini-line-height': '22px'
-}
diff --git a/packages/theme/src/button-group/vars.less b/packages/theme/src/button-group/vars.less
index 97e104ba6..b625e78e6 100644
--- a/packages/theme/src/button-group/vars.less
+++ b/packages/theme/src/button-group/vars.less
@@ -18,15 +18,15 @@
   // 按钮组圆角
   --ti-button-group-border-radius: var(--ti-common-border-radius-normal, 2px);
   // 小尺寸按钮组左右端侧圆角
-  --ti-button-group-mini-side-border-radius: var(--ti-common-border-radius-normal, 2px);
+  --ti-button-group-mini-side-border-radius: var(--ti-button-group-mini-border-radius);
   // 按钮组第一个按钮右侧圆角
-  --ti-button-group-right-border-radius: var(--ti-common-border-radius-0, 0px);
+  --ti-button-group-right-border-radius: var(--ti-common-border-radius-normal);
   // 小尺寸按钮组第一个按钮右侧圆角
   --ti-button-group-mini-right-border-radius: var(--ti-button-group-mini-border-radius, 0px);
   // 按钮组中间按钮圆角
-  --ti-button-group-middle-border-radius: var(--ti-common-border-radius-0, 0px);
+  --ti-button-group-middle-border-radius: var(--ti-common-border-radius-normal);
   // 按钮组最后一个按钮左侧圆角
-  --ti-button-group-left-border-radius: var(--ti-common-border-radius-0, 0px);
+  --ti-button-group-left-border-radius: var(--ti-common-border-radius-normal);
   // 小尺寸按钮组最后一个按钮左侧圆角
   --ti-button-group-mini-left-border-radius: var(--ti-button-group-mini-border-radius, 0px);
   // 默认插槽尾部按钮的左边框色
@@ -36,25 +36,25 @@
   // 禁用色（没有使用）
   --ti-button-group-disabled-text-color: var(--ti-common-color-text-disabled, #adb0b8);
   // 默认按钮未选中项背景色
-  --ti-button-group-item-bg-color: var(--ti-common-color-bg-light-normal, #e9edfa);
+  --ti-button-group-item-bg-color: var(--ti-common-color-bg-normal);
   // 按钮非选中项文本色
-  --ti-button-group-item-btn-text-color: var(--ti-common-color-text-primary, #252b3a);
+  --ti-button-group-item-btn-text-color: var(--ti-common-color-text-secondary);
   // 按钮项宽度
-  --ti-button-group-item-btn-width: var(--ti-common-size-width-normal, 80px);
+  --ti-button-group-item-btn-width: var(--ti-common-size-auto);
   // 未指定尺寸的按钮项高度
   --ti-button-group-item-btn-height: var(--ti-common-size-height-normal, 28px);
   // 按钮组默认字号
   --ti-button-group-item-btn-font-size: var(--ti-common-font-size-base, 12px);
   // 按钮项禁用背景色
-  --ti-button-group-item-btn-disabled-bg-color: var(--ti-common-color-bg-disabled, #f5f5f6);
+  --ti-button-group-item-btn-disabled-bg-color: #F0F0F0;
   // 按钮项禁用边框色
   --ti-button-group-item-btn-disabled-border-color: var(--ti-common-color-border, #adb0b8);
   // 按钮项禁用文本色
   --ti-button-group-item-disabled-text-color: var(--ti-common-color-text-disabled, #adb0b8);
   // 按钮选中项禁用文本色(new)
-  --ti-button-group-item-active-disabled-text-color: var(--ti-common-color-text-disabled, #adb0b8);
+  --ti-button-group-item-active-disabled-text-color: var(--ti-common-color-text-weaken);
   // 默认按钮项悬浮背景色
-  --ti-button-group-item-btn-hover-bg-color: var(--ti-common-color-bg-light-emphasize, #beccfa);
+  --ti-button-group-item-btn-hover-bg-color: #DEECFF;
   // 按钮项悬浮边框色
   --ti-button-group-item-btn-hover-border-color: var(--ti-common-color-primary-hover, #7693f5);
   // 默认按钮非选中项悬浮文本色
@@ -66,25 +66,25 @@
   // 朴素按钮非选中项悬浮边框色
   --ti-button-group-item-btn-plain-border-color: var(--ti-common-color-bg-emphasize, #5e7ce0);
   // 默认按钮选中项背景色
-  --ti-button-group-item-active-bg-color: var(--ti-common-color-bg-emphasize, #5e7ce0);
+  --ti-button-group-item-active-bg-color: var(--ti-common-color-prompt);
   // 默认按钮选中项悬浮背景色
-  --ti-button-group-item-btn-active-hover-bg-color: var(--ti-common-color-bg-light-emphasize, #beccfa);
+  --ti-button-group-item-btn-active-hover-bg-color: var(--ti-common-color-prompt);
   // 朴素按钮选中项文本颜色
   --ti-button-group-plain-active-text-color: var(--ti-common-color-bg-emphasize, #5e7ce0);
   // 默认按钮选中项禁用时背景色
-  --ti-button-group-item-active-disabled-bg-color: var(--ti-common-color-bg-dark-disabled, #dfe1e6);
+  --ti-button-group-item-active-disabled-bg-color: var(--ti-common-color-bg-dark-disabled);
   // 默认按钮选中项文本色
   --ti-button-group-item-active-text-color: var(--ti-common-color-light, #fff);
   // 默认按钮右侧外边距
   --ti-button-group-item-li-margin-right: calc(var(--ti-common-space-base, 4px) / 2);
   // 默认按钮下侧外边距
-  --ti-button-group-item-li-margin-bottom: var(--ti-common-space-base, 4px);
+  --ti-button-group-item-li-margin-bottom: var(--ti-common-space-2);
   // 默认按钮选中边框色
   --ti-button-group-item-active-border-color: var(--ti-common-color-bg-emphasize, #5e7ce0);
   // 默认按钮选中边框色
   --ti-button-group-active-hover-border-color: var(--ti-common-color-primary-hover, #7693f5);
   // 默认按钮内间距
-  --ti-button-group-btn-padding-horizontal: calc(var(--ti-common-space-10, 10px) * 3);
+  --ti-button-group-btn-padding-horizontal: var(--ti-common-space-6x);
   // 按钮组按钮上间距
   --ti-button-group-margin-top: var(--ti-common-space-0, 0px);
   // 按钮组各个按钮的上间距
@@ -100,7 +100,7 @@
   // 无边框按钮组按钮禁用状态下背景色
   --ti-button-group-no-border-disabled-bg-color: var(--ti-common-color-light, #ffffff);
   // 小尺寸按钮内间距
-  --ti-button-group-mini-padding-horizontal: var(--ti-common-space-3x, 12px);
+  --ti-button-group-mini-padding-horizontal: var(--ti-common-space-4x);
   // 小尺寸按钮圆角
   --ti-button-group-mini-border-radius: calc(var(--ti-common-border-radius-normal, 2px) - 2px);
   // 无边框按钮悬浮边框色
@@ -108,20 +108,20 @@
   // 选中按钮组按钮悬浮边框色
   --ti-button-group-no-border-border-color: var(--ti-common-color-transparent, transparent);
   // 按钮角标高度
-  --ti-button-group-item-sup-height: var(--ti-common-size-4x, 16px);
+  --ti-button-group-item-sup-height: var(--ti-common-line-height-base);
   // 按钮角标上边距(hide)
-  --ti-button-group-item-sup-position-top: calc(-1 * var(--ti-button-group-item-sup-height) / 2);
+  --ti-button-group-item-sup-position-top: var(--ti-common-space-0);
   // 按钮角标字体颜色
   --ti-button-group-item-sup-font-color: var(--ti-common-color-text-white, #fff);
   // 按钮角标字体大小
   --ti-button-group-item-sup-font-size: var(--ti-common-font-size-base, 12px);
   // icon角标
-  --ti-button-group-sup-icon-line-height: 18px;
+  --ti-button-group-sup-icon-line-height: 22px;
   // 尺寸大小
-  --ti-button-group-medium-size: 42px;
-  --ti-button-group-medium-line-height: 40px;
-  --ti-button-group-small-size: 32px;
-  --ti-button-group-small-line-height: 30px;
+  --ti-button-group-medium-size: 32px;
+  --ti-button-group-medium-line-height: 30px;
+  --ti-button-group-small-size: 28px;
+  --ti-button-group-small-line-height: 26px;
   --ti-button-group-mini-size: 24px;
   --ti-button-group-mini-line-height: 22px;
 }
diff --git a/packages/theme/src/button/old-theme.js b/packages/theme/src/button/old-theme.js
new file mode 100644
index 000000000..228e1972b
--- /dev/null
+++ b/packages/theme/src/button/old-theme.js
@@ -0,0 +1,188 @@
+export const tinyButtonOldTheme = {
+  'ti-button-only-icon-disabled-border-color': 'var(--ti-common-color-line-disabled, #dfe1e6)',
+  'ti-button-only-icon-hover-border-color': 'var(--ti-common-color-primary-normal, #5e7ce0)',
+  'ti-button-only-icon-border-color': 'var(--ti-common-color-border, #adb0b8)',
+  'ti-button-only-icon-border-radius': '2px',
+  'ti-button-only-icon-padding-horizontal': '7px',
+  'ti-button-only-icon-text-width': 'unset',
+  'ti-button-only-icon-min-width': 'unset',
+  'ti-button-only-icon-width': 'var(ti-common-size-width-minor, 30px)',
+  'ti-button-icon-font-size': 'var(--ti-common-font-size-0, 12px)',
+  'ti-button-text-size-mini-svg-height': '1em',
+  'ti-button-text-size-mini-svg-width': '1em',
+  'ti-button-text-size-mini-height': 'var(--ti-common-size-height-mini, 24px)',
+  'ti-button-text-size-mini-min-width': 'var(--ti-common-size-16x, 64px)',
+  'ti-button-text-size-small-svg-height': '1em',
+  'ti-button-text-size-small-svg-width': '1em',
+  'ti-button-text-size-small-height': 'var(--ti-common-size-height-small, 32px)',
+  'ti-button-text-size-small-min-width': 'var(--ti-common-size-18x, 72px)',
+  'ti-button-text-size-default-svg-height': '1em',
+  'ti-button-text-size-default-svg-width': '1em',
+  'ti-button-text-size-default-height': 'var(--ti-common-size-height-normal, 28px)',
+  'ti-button-text-size-default-min-width': 'var(--ti-common-size-20x, 80px)',
+  'ti-button-text-size-medium-svg-height': '1em',
+  'ti-button-text-size-medium-svg-width': '1em',
+  'ti-button-text-size-medium-height': 'var(--ti-common-size-height-medium, 40px)',
+  'ti-button-text-size-medium-min-width': 'var(--ti-common-size-22x, 88px)',
+  'ti-button-text-size-large-svg-height': '1em',
+  'ti-button-text-size-large-svg-width': '1em',
+  'ti-button-text-size-large-height': 'var(--ti-common-size-height-large, 48px)',
+  'ti-button-text-size-large-min-width': 'var(--ti-common-size-24x, 96px)',
+  'ti-button-size-normal-padding': 'var(--ti-common-space-2x, 8px)',
+  'ti-button-danger-ghost-disabled-border-color': 'var(--ti-common-color-text-disabled, #adb0b8)',
+  'ti-button-danger-ghost-disabled-text-color': 'var(--ti-common-color-text-disabled, #adb0b8)',
+  'ti-button-danger-ghost-hover-border-color': 'var(--ti-common-color-danger-hover, #d64a52)',
+  'ti-button-danger-ghost-hover-text-color': 'var(--ti-common-color-danger-hover, #d64a52)',
+  'ti-button-danger-ghost-border-color': 'var(--ti-common-color-danger-normal, #c7000b)',
+  'ti-button-danger-ghost-text-color': 'var(--ti-common-color-danger-normal, #c7000b)',
+  'ti-button-warning-ghost-disabled-border-color': 'var(--ti-common-color-text-disabled, #adb0b8)',
+  'ti-button-warning-ghost-disabled-text-color': 'var(--ti-common-color-text-disabled, #adb0b8)',
+  'ti-button-warning-ghost-hover-border-color': 'var(--ti-common-color-warning-active, #fac20a)',
+  'ti-button-warning-ghost-hover-text-color': 'var(--ti-common-color-warning-active, #fac20a)',
+  'ti-button-warning-ghost-border-color': 'var(--ti-common-color-warning-normal, #fa9841)',
+  'ti-button-warning-ghost-text-color': 'var(--ti-common-color-warning-normal, #fa9841)',
+  'ti-button-info-ghost-disabled-border-color': 'var(--ti-common-color-text-disabled, #adb0b8)',
+  'ti-button-info-ghost-disabled-text-color': 'var(--ti-common-color-text-disabled, #adb0b8)',
+  'ti-button-info-ghost-hover-border-color': 'var(--ti-common-color-info-hover, #5c6173)',
+  'ti-button-info-ghost-hover-text-color': 'var(--ti-common-color-info-hover, #5c6173)',
+  'ti-button-info-ghost-border-color': 'var(--ti-common-color-info-normal, #252b3a)',
+  'ti-button-info-ghost-text-color': 'var(--ti-common-color-info-normal, #252b3a)',
+  'ti-button-success-ghost-disabled-border-color': 'var(--ti-common-color-text-disabled, #adb0b8)',
+  'ti-button-success-ghost-disabled-text-color': 'var(--ti-common-color-text-disabled, #adb0b8)',
+  'ti-button-success-ghost-hover-border-color': 'var(--ti-common-color-success-active, #acf2dc)',
+  'ti-button-success-ghost-hover-text-color': 'var(--ti-common-color-success-active, #acf2dc)',
+  'ti-button-success-ghost-border-color': 'var(--ti-common-color-success-normal, #50d4ab)',
+  'ti-button-success-ghost-text-color': 'var(--ti-common-color-success-normal, #50d4ab)',
+  'ti-button-primary-ghost-disabled-border-color': 'var(--ti-common-color-text-disabled, #adb0b8)',
+  'ti-button-primary-ghost-disabled-text-color': 'var(--ti-common-color-text-disabled, #adb0b8)',
+  'ti-button-primary-ghost-hover-border-color': 'var(--ti-common-color-primary-hover, #7693f5)',
+  'ti-button-primary-ghost-hover-text-color': 'var(--ti-common-color-primary-hover, #7693f5)',
+  'ti-button-primary-ghost-border-color': 'var(--ti-common-color-primary-normal, #5e7ce0)',
+  'ti-button-primary-ghost-text-color': 'var(--ti-common-color-primary-normal, #5e7ce0)',
+  'ti-button-ghost-disabled-border-color': 'var(--ti-common-color-text-disabled, #adb0b8)',
+  'ti-button-ghost-disabled-text-color': 'var(--ti-common-color-text-disabled, #adb0b8)',
+  'ti-button-ghost-hover-border-color': 'var(--ti-common-color-primary-normal, #5e7ce0)',
+  'ti-button-info-plain-disabled-bg-color':
+    'var(\n    --ti-common-color-info-plain-disabled-bg-color,\n    rgba(191, 191, 191, 0.1)\n  )',
+  'ti-button-info-plain-hover-border-color': 'var(--ti-common-color-info-normal, #252b3a)',
+  'ti-button-info-plain-border-color': 'var(--ti-common-color-info-normal, #252b3a)',
+  'ti-button-info-plain-hover-bg-color': 'var(--ti-common-color-info-normal, #252b3a)',
+  'ti-button-info-plain-bg-color': 'var(--ti-common-color-info-bg, rgba(51, 51, 51, 0.06))',
+  'ti-button-info-plain-hover-text-color': 'var(--ti-common-color-light, #fff)',
+  'ti-button-info-plain-text-color': 'var(--ti-common-color-info-normal, #252b3a)',
+  'ti-button-info-disabled-border-color': 'var(--ti-common-color-info-disabled-border, #dfe1e6)',
+  'ti-button-info-disabled-text-color': 'var(--ti-common-color-info-disabled-text, #adb0b8)',
+  'ti-button-info-text-color': 'var(--ti-common-color-light, #fff)',
+  'ti-button-info-disabled-bg-color': 'var(--ti-common-color-info-disabled-bgcolor, #f5f5f6)',
+  'ti-button-info-active-bg-color': 'var(--ti-common-color-info-active, #5c6173)',
+  'ti-button-info-hover-border-color': 'var(--ti-common-color-info-hover, #5c6173)',
+  'ti-button-info-hover-bg-color': 'var(--ti-common-color-info-hover, #5c6173)',
+  'ti-button-info-normal-border-color': 'var(--ti-common-color-info-normal, #252b3a)',
+  'ti-button-info-normal-bg-color': 'var(--ti-common-color-info-normal, #252b3a)',
+  'ti-button-danger-plain-disabled-border-color': 'var(--ti-common-color-danger-disabled-bgcolor, #f5f5f6)',
+  'ti-button-danger-plain-disabled-bg-color': 'var(--ti-common-color-danger-disabled-bgcolor, #f5f5f6)',
+  'ti-button-danger-plain-hover-border-color': 'var(--ti-common-color-danger-normal, #c7000b)',
+  'ti-button-danger-plain-border-color': 'var(--ti-common-color-danger-normal, #c7000b)',
+  'ti-button-danger-plain-hover-bg-color': 'var(--ti-common-color-danger-normal, #c7000b)',
+  'ti-button-danger-plain-bg-color': 'var(--ti-common-color-error-bg, #ffeeed)',
+  'ti-button-danger-plain-hover-text-color': 'var(--ti-common-color-light, #fff)',
+  'ti-button-danger-plain-text-color': 'var(--ti-common-color-danger-normal, #c7000b)',
+  'ti-button-danger-disabled-border-color': 'var(--ti-common-color-danger-disabled-border, #dfe1e6)',
+  'ti-button-danger-disabled-text-color': 'var(--ti-common-color-danger-disabled-text, #adb0b8)',
+  'ti-button-danger-text-color': 'var(--ti-common-color-light, #fff)',
+  'ti-button-danger-disabled-bg-color': 'var(--ti-common-color-danger-disabled-bgcolor, #f5f5f6)',
+  'ti-button-danger-active-bg-color': 'var(--ti-common-color-danger-active, #b12220)',
+  'ti-button-danger-hover-border-color': 'var(--ti-common-color-danger-hover, #d64a52)',
+  'ti-button-danger-hover-bg-color': 'var(--ti-common-color-danger-hover, #d64a52)',
+  'ti-button-danger-normal-border-color': 'var(--ti-common-color-danger-normal, #c7000b)',
+  'ti-button-danger-normal-bg-color': 'var(--ti-common-color-danger-normal, #c7000b)',
+  'ti-button-warning-plain-disabled-bg-color':
+    'var(\n    --ti-common-color-warning-plain-disabled-bg-color,\n    rgba(211, 198, 162, 0.1)\n  )',
+  'ti-button-warning-plain-hover-border-color': 'var(--ti-common-color-warning-normal, #fa9841)',
+  'ti-button-warning-plain-border-color': 'var(--ti-common-color-warning-normal, #fa9841)',
+  'ti-button-warning-plain-hover-bg-color': 'var(--ti-common-color-warning-normal, #fa9841)',
+  'ti-button-warning-plain-bg-color': 'var(--ti-common-color-warn-bg, #fff3e8)',
+  'ti-button-warning-plain-hover-text-color': 'var(--ti-common-color-light, #fff)',
+  'ti-button-warning-plain-text-color': 'var(--ti-common-color-warning-normal, #fa9841)',
+  'ti-button-warning-disabled-border-color': 'var(--ti-common-color-warning-disabled-border, #dfe1e6)',
+  'ti-button-warning-disabled-text-color': 'var(--ti-common-color-warning-disabled-text, #adb0b8)',
+  'ti-button-warning-text-color': 'var(--ti-common-color-light, #fff)',
+  'ti-button-warning-disabled-bg-color': 'var(--ti-common-color-warning-disabled-bgcolor, #f5f5f6)',
+  'ti-button-warning-active-bg-color': 'var(--ti-common-color-warning-active, #fac20a)',
+  'ti-button-warning-hover-bg-color': 'var(--ti-common-color-warning-hover, #fac20a)',
+  'ti-button-warning-normal-border-color': 'var(--ti-common-color-warning-normal, #fa9841)',
+  'ti-button-warning-normal-bg-color': 'var(--ti-common-color-warning-normal, #fa9841)',
+  'ti-button-success-plain-disabled-bg-color':
+    'var(\n    --ti-common-color-success-plain-disabled-bg-color,\n    rgba(166, 195, 185, 0.1)\n  )',
+  'ti-button-success-plain-hover-border-color': 'var(--ti-common-color-success-normal, #50d4ab)',
+  'ti-button-success-plain-border-color': 'var(--ti-common-color-success-normal, #50d4ab)',
+  'ti-button-success-plain-hover-bg-color': 'var(--ti-common-color-success-normal, #50d4ab)',
+  'ti-button-success-plain-bg-color': 'var(--ti-common-color-success-bg, #edfff9)',
+  'ti-button-success-plain-hover-text-color': 'var(--ti-common-color-light, #fff)',
+  'ti-button-success-plain-text-color': 'var(--ti-common-color-success-normal, #50d4ab)',
+  'ti-button-success-disabled-border-color': 'var(--ti-common-color-success-disabled-border, #dfe1e6)',
+  'ti-button-success-disabled-text-color': 'var(--ti-common-color-success-disabled-text, #adb0b8)',
+  'ti-button-success-text-color': 'var(--ti-common-color-light, #fff)',
+  'ti-button-success-disabled-bg-color': 'var(--ti-common-color-success-disabled-bgcolor, #f5f5f6)',
+  'ti-button-success-active-bg-color': 'var(--ti-common-color-success-active, #acf2dc)',
+  'ti-button-success-hover-border-color': 'var(--ti-common-color-success-hover, #acf2dc)',
+  'ti-button-success-hover-bg-color': 'var(--ti-common-color-success-hover, #acf2dc)',
+  'ti-button-success-normal-border-color': 'var(--ti-common-color-success-normal, #50d4ab)',
+  'ti-button-success-normal-bg-color': 'var(--ti-common-color-success-normal, #50d4ab)',
+  'ti-button-primary-plain-disabled-bg-color':
+    'var(\n    --ti-common-color-primary-plain-disabled-bg-color,\n    rgba(191, 191, 191, 0.1)\n  )',
+  'ti-button-primary-plain-hover-border-color': 'var(--ti-common-color-primary-normal, #5e7ce0)',
+  'ti-button-primary-plain-border-color': 'var(--ti-common-color-primary-normal, #5e7ce0)',
+  'ti-button-primary-plain-hover-bg-color': 'var(--ti-common-color-primary-normal, #5e7ce0)',
+  'ti-button-primary-plain-bg-color': 'var(--ti-common-color-prompt-bg, #ebf6ff)',
+  'ti-button-primary-plain-hover-text-color': 'var(--ti-common-color-light, #fff)',
+  'ti-button-primary-plain-text-color': 'var(--ti-common-color-primary-normal, #5e7ce0)',
+  'ti-button-primary-disabled-border-color': 'var(--ti-common-color-primary-disabled-border, #dfe1e6)',
+  'ti-button-primary-disabled-text-color': 'var(--ti-common-color-primary-disabled-text, #adb0b8)',
+  'ti-button-primary-text-color': 'var(--ti-common-color-light, #fff)',
+  'ti-button-primary-active-bg-color': 'var(--ti-common-color-primary-active, #7693f5)',
+  'ti-button-primary-hover-border-color': 'var(--ti-common-color-primary-hover, #7693f5)',
+  'ti-button-primary-hover-bg-color': 'var(--ti-common-color-primary-hover, #7693f5)',
+  'ti-button-primary-normal-border-color': 'var(--ti-common-color-primary-normal, #5e7ce0)',
+  'ti-button-primary-normal-bg-color': 'var(--ti-common-color-primary-normal, #5e7ce0)',
+  'ti-button-text-svg-padding-horizontal': 'var(--ti-common-size-2x, 8px)',
+  'ti-button-text-has-svg-hover-text-color': 'var(--ti-common-color-text-link, #526ecc)',
+  'ti-button-text-has-svg-text-color': 'var(--ti-common-color-text-primary, #252b3a)',
+  'ti-button-text-has-svg-icon-margin-right': 'var(--ti-common-size-2x, 8px)',
+  'ti-button-text-svg-disabled-fill-color': 'var(--ti-common-color-text-disabled, #adb0b8)',
+  'ti-button-text-svg-hover-fill-color': 'var(--ti-button-text-color-hover)',
+  'ti-button-text-svg-fill-color': 'var(--ti-common-color-text-secondary, #575d6c)',
+  'ti-button-text-hover-border-radius': '0px',
+  'ti-button-text-only-icon-hover-bg-color': 'transparent',
+  'ti-button-text-hover-bg-color': 'transparent',
+  'ti-button-text-svg-height': '1em',
+  'ti-button-text-svg-width': '1em',
+  'ti-button-text-hover-weight': 'var(--ti-common-font-weight-4, normal)',
+  'ti-button-text-color-hover': 'var(--ti-common-color-text-link-hover, #344899)',
+  'ti-button-text-hover-text-decoration': 'none',
+  'ti-button-text-color': 'var(--ti-common-color-primary-normal, #5e7ce0)',
+  'ti-button-plain-disabled-border-color': 'var(--ti-common-color-line-disabled, #dfe1e6)',
+  'ti-button-plain-border-color': 'var(--ti-common-color-border, #adb0b8)',
+  'ti-button-normal-disabled-border-color': 'var(--ti-common-color-line-disabled, #dfe1e6)',
+  'ti-button-normal-hover-border-color': 'var(--ti-common-color-primary-normal, #5e7ce0)',
+  'ti-button-normal-border-color': 'var(--ti-common-color-border, #adb0b8)',
+  'ti-button-normal-text-color': 'var(--ti-common-color-text-primary, #252b3a)',
+  'ti-button-size-mini-min-width': 'var(--ti-common-size-16x, 64px)',
+  'ti-button-size-mini-font-size': 'var(--ti-common-font-size-base, 12px)',
+  'ti-button-size-small-margin-left': '8px',
+  'ti-button-size-small-min-width': 'var(--ti-common-size-18x, 72px)',
+  'ti-button-size-small-padding-horizontal': 'var(--ti-common-size-3x, 12px)',
+  'ti-button-size-small-font-size': 'var(--ti-common-font-size-1, 14px)',
+  'ti-button-size-medium-margin-left': '8px',
+  'ti-button-size-medium-min-width': 'var(--ti-common-size-22x, 88px)',
+  'ti-button-size-medium-padding-horizontal': 'var(--ti-common-size-7x, 28px)',
+  'ti-button-size-large-margin-left': '8px',
+  'ti-button-size-large-min-width': 'var(--ti-common-size-24x, 96px)',
+  'ti-button-size-large-padding-horizontal': 'var(--ti-common-size-8x, 32px)',
+  'ti-button-size-large-font-size': 'var(--ti-common-font-size-2, 16px)',
+  'ti-button-size-normal-padding-horizontal': 'var(--ti-common-size-5x, 20px)',
+  'ti-button-size-normal-min-width': 'var(--ti-common-size-width-normal, 80px)',
+  'ti-button-loading-font-size': 'var(--ti-common-font-size-1)',
+  'ti-button-loading-bg-color': 'rgba(255, 255, 255, 0.35)',
+  'ti-button-border-radius': 'var(--ti-common-border-radius-normal, 2px)'
+}
diff --git a/packages/theme/src/button/smb-theme.js b/packages/theme/src/button/smb-theme.js
deleted file mode 100644
index 2ea88e7cb..000000000
--- a/packages/theme/src/button/smb-theme.js
+++ /dev/null
@@ -1,197 +0,0 @@
-export const tinyButtonSmbTheme = {
-  'ti-button-normal-text-color': '#191919',
-  'ti-button-normal-border-color': '#595959',
-  'ti-button-border-radius': '25px',
-  'ti-button-text-color': 'var(--ti-common-color-text-highlight)',
-  'ti-button-text-hover-weight': 'var(--ti-common-font-weight-4)',
-  'ti-button-text-color-hover': 'var(--ti-common-color-text-highlight)',
-  'ti-button-normal-disabled-border-color': 'transparent',
-  'ti-common-color-primary-disabled-border': 'transparent',
-  'ti-common-color-success-disabled-border': 'transparent',
-  'ti-common-color-warning-disabled-border': 'transparent',
-  'ti-common-color-danger-disabled-border': 'transparent',
-  'ti-common-color-info-disabled-border': 'transparent',
-  'ti-button-size-large-padding-horizontal': 'var(--ti-common-size-12x)',
-  'ti-button-size-medium-padding-horizontal': 'var(--ti-common-size-8x)',
-  'ti-button-size-normal-padding-horizontal': 'var(--ti-common-size-6x)',
-  'ti-button-size-small-padding-horizontal': 'var(--ti-common-size-4x)',
-  'ti-button-danger-plain-bg-color': 'transparent',
-  'ti-button-size-large-min-width': 'var(--ti-common-size-31x)',
-  'ti-button-size-medium-min-width': 'var(--ti-common-size-28x)',
-  'ti-button-size-normal-min-width': 'var(--ti-common-size-24x)',
-  'ti-button-size-small-min-width': 'var(--ti-common-size-18x)',
-  'ti-button-danger-plain-disabled-border-color': 'transparent',
-  'ti-button-normal-hover-border-color': '#C2C2C2',
-  'ti-button-size-large-font-size': 'var(--ti-common-font-size-base)',
-  'ti-button-size-mini-min-width': '24px',
-  'ti-button-text-svg-width': '16px',
-  'ti-button-text-svg-height': '16px',
-  'ti-button-text-hover-bg-color': 'transparent',
-  'ti-button-text-only-icon-hover-bg-color': '#0000000D',
-  'ti-button-text-hover-border-radius': '4px',
-  'ti-button-text-svg-fill-color': '#191919',
-  'ti-button-text-svg-hover-fill-color': '#191919',
-  'ti-button-text-has-svg-text-color': '#191919',
-  'ti-button-text-has-svg-hover-text-color': '#191919',
-  'ti-button-text-has-svg-icon-margin-right': '4px',
-  'ti-button-text-svg-disabled-fill-color': '#C2C2C2',
-  'ti-button-text-svg-padding-horizontal': '0px',
-  'ti-button-size-small-font-size': '12px',
-  'ti-button-loading-bg-color': 'rgba(255, 255, 255, 0.5)',
-  'ti-button-loading-font-size': 'var(--ti-common-font-size-2)',
-  'ti-button-size-mini-font-size': '12px',
-  'ti-button-size-large-margin-left': '16px',
-  'ti-button-size-medium-margin-left': '16px',
-  'ti-button-size-small-margin-left': '8px',
-  'ti-button-text-size-large-min-width': '56px',
-  'ti-button-text-size-large-height': '56px',
-  'ti-button-text-size-large-svg-width': '48px',
-  'ti-button-text-size-large-svg-height': '48px',
-  'ti-button-text-size-medium-min-width': '40px',
-  'ti-button-text-size-medium-height': '40px',
-  'ti-button-text-size-medium-svg-width': '32px',
-  'ti-button-text-size-medium-svg-height': '32px',
-  'ti-button-text-size-default-min-width': '24px',
-  'ti-button-text-size-default-height': '24px',
-  'ti-button-text-size-default-svg-width': '16px',
-  'ti-button-text-size-default-svg-height': '16px',
-  'ti-button-text-size-small-min-width': '24px',
-  'ti-button-text-size-small-height': '24px',
-  'ti-button-text-size-small-svg-width': '16px',
-  'ti-button-text-size-small-svg-height': '16px',
-  'ti-button-text-size-mini-min-width': '24px',
-  'ti-button-text-size-mini-height': '24px',
-  'ti-button-text-size-mini-svg-width': '16px',
-  'ti-button-text-size-mini-svg-height': '16px',
-  'ti-button-text-hover-text-decoration': 'underline',
-  'ti-button-only-icon-min-width': 'unset',
-  'ti-button-icon-font-size': 'var(--ti-common-font-size-2)',
-  'ti-button-only-icon-width': 'var(--ti-common-size-8x)',
-  'ti-button-only-icon-text-width': 'var(--ti-common-size-6x)',
-  'ti-button-only-icon-padding-horizontal': '7px',
-  'ti-button-only-icon-border-radius': 'var(--ti-common-border-radius-1)',
-  'ti-button-only-icon-border-color': '#c2c2c2',
-  'ti-button-only-icon-hover-border-color': '#191919',
-  'ti-button-only-icon-disabled-border-color': '#dbdbdb',
-  'ti-button-ghost-disabled-text-color': '#c2c2c2',
-  'ti-button-ghost-disabled-border-color': '#dbdbdb',
-  'ti-button-ghost-hover-border-color': '#c2c2c2',
-  'ti-button-size-normal-padding': 'var(--ti-common-space-6)',
-
-  'ti-button-primary-text-color': 'var(--ti-common-color-text-white)',
-  'ti-button-primary-normal-bg-color': '#191919',
-  'ti-button-primary-normal-border-color': '#191919',
-  'ti-button-primary-hover-bg-color': '#595959',
-  'ti-button-primary-hover-border-color': '#595959',
-  'ti-button-primary-active-bg-color': '#191919',
-  'ti-button-primary-disabled-text-color': '#C2C2C2',
-  'ti-button-primary-plain-text-color': '#191919',
-  'ti-button-primary-plain-hover-text-color': '#191919',
-  'ti-button-primary-plain-bg-color': 'var(--ti-common-color-bg-minor)',
-  'ti-button-primary-plain-border-color': '#595959',
-  'ti-button-primary-plain-hover-border-color': '#FFFFFF',
-  'ti-button-primary-plain-hover-bg-color': 'var(--ti-common-color-bg-minor)',
-  'ti-button-primary-plain-disabled-bg-color': '#F0F0F0',
-  'ti-button-primary-disabled-border-color': '#F0F0F0',
-  'ti-button-primary-ghost-text-color': '#191919',
-  'ti-button-primary-ghost-hover-text-color': '#191919',
-  'ti-button-primary-ghost-disabled-text-color': '#C2C2C2',
-  'ti-button-primary-ghost-border-color': '#595959',
-  'ti-button-primary-ghost-hover-border-color': '#C2C2C2',
-  'ti-button-primary-ghost-disabled-border-color': '#F0F0F0',
-
-  'ti-button-plain-border-color': '#C2C2C2',
-  'ti-button-plain-hover-border-color': '#F5F5F5',
-  'ti-button-plain-disabled-border-color': '#F0F0F0',
-
-  'ti-button-success-text-color': 'var(--ti-common-color-text-white)',
-  'ti-button-success-normal-bg-color': '#5CB300',
-  'ti-button-success-normal-border-color': '#5CB300',
-  'ti-button-success-hover-bg-color': '#7DCC29',
-  'ti-button-success-hover-border-color': '#7DCC29',
-  'ti-button-success-active-bg-color': '#5CB300',
-  'ti-button-success-disabled-text-color': '#C2C2C2',
-  'ti-button-success-disabled-bg-color': '#F0F0F0',
-  'ti-button-success-plain-text-color': '#5CB300',
-  'ti-button-success-plain-hover-text-color': '#5CB300',
-  'ti-button-success-plain-bg-color': '#EDF7DF',
-  'ti-button-success-plain-hover-bg-color': '#EDF7DF',
-  'ti-button-success-plain-border-color': '#DAF2BB',
-  'ti-button-success-plain-hover-border-color': '#EDF7DF',
-  'ti-button-success-plain-disabled-bg-color': '#F0F0F0',
-  'ti-button-success-disabled-border-color': '#F0F0F0',
-  'ti-button-success-ghost-text-color': '#5CB300',
-  'ti-button-success-ghost-hover-text-color': '#5CB300',
-  'ti-button-success-ghost-disabled-text-color': '#C2C2C2',
-  'ti-button-success-ghost-border-color': '#5CB300',
-  'ti-button-success-ghost-hover-border-color': '#DAF2BB',
-  'ti-button-success-ghost-disabled-border-color': '#F0F0F0',
-
-  'ti-button-info-text-color': 'var(--ti-common-color-text-white)',
-  'ti-button-info-normal-bg-color': '#1476FF',
-  'ti-button-info-normal-border-color': '#1476FF',
-  'ti-button-info-hover-bg-color': '#4191FA',
-  'ti-button-info-hover-border-color': '#4191FA',
-  'ti-button-info-active-bg-color': '#1476FF',
-  'ti-button-info-disabled-text-color': '#C2C2C2',
-  'ti-button-info-disabled-bg-color': '#F0F0F0',
-  'ti-button-info-plain-text-color': '#1476FF',
-  'ti-button-info-plain-hover-text-color': '#1476FF',
-  'ti-button-info-plain-bg-color': '#F0F7FF',
-  'ti-button-info-plain-border-color': '#DEECFF',
-  'ti-button-info-plain-hover-bg-color': '#F0F7FF',
-  'ti-button-info-plain-hover-border-color': '#F0F7FF',
-  'ti-button-info-plain-disabled-bg-color': '#F0F0F0',
-  'ti-button-info-ghost-text-color': '#1476FF',
-  'ti-button-info-ghost-hover-text-color': '#1476FF',
-  'ti-button-info-ghost-disabled-text-color': '#C2C2C2',
-  'ti-button-info-ghost-border-color': '#1476FF',
-  'ti-button-info-ghost-hover-border-color': '#FAFAFA',
-  'ti-button-info-disabled-border-color': '#F0F0F0',
-  'ti-button-info-ghost-disabled-border-color': '#F0F0F0',
-
-  'ti-button-warning-text-color': 'var(--ti-common-color-text-white)',
-  'ti-button-warning-normal-bg-color': '#FF8800',
-  'ti-button-warning-normal-border-color': '#FF8800',
-  'ti-button-warning-hover-bg-color': '#FF9A2E',
-  'ti-button-warning-hover-border-color': '#FF9A2E',
-  'ti-button-warning-active-bg-color': '#FF8800',
-  'ti-button-warning-disabled-text-color': '#C2C2C2',
-  'ti-button-warning-disabled-bg-color': '#F0F0F0',
-  'ti-button-warning-plain-text-color': '#FF8800',
-  'ti-button-warning-plain-hover-text-color': '#FF8800',
-  'ti-button-warning-plain-bg-color': '#FFF4E8',
-  'ti-button-warning-plain-hover-bg-color': '#FFF4E8',
-  'ti-button-warning-plain-border-color': '#FFEBD1',
-  'ti-button-warning-plain-hover-border-color': '#FFF4E8',
-  'ti-button-warning-plain-disabled-bg-color': '#F0F0F0',
-  'ti-button-warning-disabled-border-color': '#F0F0F0',
-  'ti-button-warning-ghost-text-color': '#FF8800',
-  'ti-button-warning-ghost-hover-text-color': '#FF8800',
-  'ti-button-warning-ghost-disabled-text-color': '#C2C2C2',
-  'ti-button-warning-ghost-border-color': '#FF8800',
-  'ti-button-warning-ghost-hover-border-color': '#FFEBD1',
-  'ti-button-warning-ghost-disabled-border-color': '#F0F0F0',
-
-  'ti-button-danger-text-color': 'var(--ti-common-color-text-white)',
-  'ti-button-danger-normal-bg-color': '#F23030',
-  'ti-button-danger-normal-border-color': '#F23030',
-  'ti-button-danger-hover-bg-color': '#F76360',
-  'ti-button-danger-hover-border-color': '#F76360',
-  'ti-button-danger-active-bg-color': '#F23030',
-  'ti-button-danger-disabled-text-color': '#C2C2C2',
-  'ti-button-danger-disabled-bg-color': '#F0F0F0',
-  'ti-button-danger-plain-text-color': '#F23030',
-  'ti-button-danger-plain-hover-text-color': '#F23030',
-  'ti-button-danger-plain-hover-bg-color': '#FFF1F0',
-  'ti-button-danger-plain-border-color': '#FCE2E0',
-  'ti-button-danger-plain-hover-border-color': '#FFF1F0',
-  'ti-button-danger-plain-disabled-bg-color': '#F0F0F0',
-  'ti-button-danger-disabled-border-color': '#F0F0F0',
-  'ti-button-danger-ghost-text-color': '#F23030',
-  'ti-button-danger-ghost-hover-text-color': '#F23030',
-  'ti-button-danger-ghost-disabled-text-color': '#C2C2C2',
-  'ti-button-danger-ghost-border-color': '#F23030',
-  'ti-button-danger-ghost-hover-border-color': '#FCE2E0',
-  'ti-button-danger-ghost-disabled-border-color': '#F0F0F0'
-}
diff --git a/packages/theme/src/button/vars.less b/packages/theme/src/button/vars.less
index 411e87e41..7f2d8961a 100644
--- a/packages/theme/src/button/vars.less
+++ b/packages/theme/src/button/vars.less
@@ -12,7 +12,7 @@
 
 .component-css-vars-button() {
   // 按钮圆角
-  --ti-button-border-radius: var(--ti-common-border-radius-normal, 2px);
+  --ti-button-border-radius: 25px;
   // 按钮字号
   --ti-button-font-size: var(--ti-common-font-size-base, 12px);
   // 朴素类按钮禁用文本色(非默认)
@@ -22,70 +22,70 @@
   // 按钮边框样式
   --ti-button-border-style: var(--ti-common-border-style-solid, solid);
   // 按钮加载时背景色
-  --ti-button-loading-bg-color: rgba(255, 255, 255, 0.35);
-  --ti-button-loading-font-size: var(--ti-common-font-size-1);
+  --ti-button-loading-bg-color: rgba(255, 255, 255, 0.5);
+  --ti-button-loading-font-size: var(--ti-common-font-size-2);
 
   // 默认按钮最小宽度
-  --ti-button-size-normal-min-width: var(--ti-common-size-width-normal, 80px);
+  --ti-button-size-normal-min-width: var(--ti-common-size-24x);
   // 默认按钮最大宽度
   --ti-button-size-normal-max-width: var(--ti-common-size-width-medium, 120px);
   // 默认按钮的高度
   --ti-button-size-normal-height: var(--ti-common-size-height-normal, 28px);
   // 默认按钮水平内边距
-  --ti-button-size-normal-padding-horizontal: var(--ti-common-size-5x, 20px);
+  --ti-button-size-normal-padding-horizontal: var(--ti-common-size-6x);
 
   // 超大按钮高度
   --ti-button-size-large-height: var(--ti-common-size-height-large, 48px);
   // 超大按钮字号
-  --ti-button-size-large-font-size: var(--ti-common-font-size-2, 16px);
+  --ti-button-size-large-font-size: var(--ti-common-font-size-base);
   // 超大按钮水平内边距
-  --ti-button-size-large-padding-horizontal: var(--ti-common-size-8x, 32px);
+  --ti-button-size-large-padding-horizontal: var(--ti-common-size-12x);
   // 超大按钮最小宽度
-  --ti-button-size-large-min-width: var(--ti-common-size-24x, 96px);
+  --ti-button-size-large-min-width: var(--ti-common-size-31x);
   // 超大按钮左侧外边距
-  --ti-button-size-large-margin-left: 8px;
+  --ti-button-size-large-margin-left: 16px;
 
   // 中等按钮高度
   --ti-button-size-medium-height: var(--ti-common-size-height-medium, 40px);
   // 中等按钮字号
   --ti-button-size-medium-font-size: var(--ti-common-font-size-1, 14px);
   // 中等按钮水平内边距
-  --ti-button-size-medium-padding-horizontal: var(--ti-common-size-7x, 28px);
+  --ti-button-size-medium-padding-horizontal: var(--ti-common-size-8x);
   // 中等按钮最小宽度
-  --ti-button-size-medium-min-width: var(--ti-common-size-22x, 88px);
+  --ti-button-size-medium-min-width: var(--ti-common-size-28x);
   // 中等按钮左侧外边距
-  --ti-button-size-medium-margin-left: 8px;
+  --ti-button-size-medium-margin-left: 16px;
 
   // 小型按钮高度
   --ti-button-size-small-height: var(--ti-common-size-height-small, 32px);
   // 小型按钮字号
-  --ti-button-size-small-font-size: var(--ti-common-font-size-1, 14px);
+  --ti-button-size-small-font-size: 12px;
   // 小尺寸按钮水平内边距
-  --ti-button-size-small-padding-horizontal: var(--ti-common-size-3x, 12px);
+  --ti-button-size-small-padding-horizontal: var(--ti-common-size-4x);
   // 小尺寸按钮最小宽度
-  --ti-button-size-small-min-width: var(--ti-common-size-18x, 72px);
+  --ti-button-size-small-min-width: var(--ti-common-size-18x);
   // 小尺寸按钮左侧外边距
   --ti-button-size-small-margin-left: 8px;
 
   // 迷你尺寸按钮高度
   --ti-button-size-mini-height: var(--ti-common-size-height-mini, 24px);
   // 迷你尺寸按钮字号
-  --ti-button-size-mini-font-size: var(--ti-common-font-size-base, 12px);
+  --ti-button-size-mini-font-size: 12px;
   // 迷你尺寸按钮水平内边距
   --ti-button-size-mini-padding-horizontal: var(--ti-common-size-2x, 8px);
   // 迷你尺寸按钮最小宽度
-  --ti-button-size-mini-min-width: var(--ti-common-size-16x, 64px);
+  --ti-button-size-mini-min-width: 24px;
 
   // 默认按钮文本色
-  --ti-button-normal-text-color: var(--ti-common-color-text-primary, #252b3a);
+  --ti-button-normal-text-color: #191919;
   // 默认按钮边框色
-  --ti-button-normal-border-color: var(--ti-common-color-border, #adb0b8);
+  --ti-button-normal-border-color: #595959;
   // 默认按钮背景色
   --ti-button-normal-background-color: var(--ti-common-color-light, #fff);
   // 默认按钮悬浮文本色
   --ti-button-normal-hover-text-color: var(--ti-common-color-primary-normal, #5e7ce0);
   // 默认按钮悬浮边框色
-  --ti-button-normal-hover-border-color: var(--ti-common-color-primary-normal, #5e7ce0);
+  --ti-button-normal-hover-border-color: #C2C2C2;
   // 默认按钮悬浮背景色
   --ti-button-normal-hover-bg-color: var(--ti-common-color-light, #fff);
   // 默认按钮点击瞬间文本色
@@ -97,227 +97,215 @@
   // 默认按钮禁用文本色
   --ti-button-normal-disabled-text-color: var(--ti-common-color-text-disabled, #adb0b8);
   // 默认按钮禁用边框色
-  --ti-button-normal-disabled-border-color: var(--ti-common-color-line-disabled, #dfe1e6);
+  --ti-button-normal-disabled-border-color: transparent;
   // 禁用类默认按钮背景色
   --ti-button-normal-disabled-bg-color: var(--ti-common-color-bg-disabled, #f5f5f6);
   // 默认 朴素 边框色
-  --ti-button-plain-border-color: var(--ti-common-color-border, #adb0b8);
+  --ti-button-plain-border-color: #C2C2C2;
   // 默认 朴素 禁用边框色
-  --ti-button-plain-disabled-border-color: var(--ti-common-color-line-disabled, #dfe1e6);
+  --ti-button-plain-disabled-border-color: #F0F0F0;
 
   // 文字按钮文本色
-  --ti-button-text-color: var(--ti-common-color-primary-normal, #5e7ce0);
+  --ti-button-text-color: var(--ti-common-color-text-highlight);
   // 文字按钮悬浮文本修饰(hide)
-  --ti-button-text-hover-text-decoration: none;
+  --ti-button-text-hover-text-decoration: underline;
   // 文字按钮悬浮文本色
-  --ti-button-text-color-hover: var(--ti-common-color-text-link-hover, #344899);
+  --ti-button-text-color-hover: var(--ti-common-color-text-highlight);
   // 文字按钮悬浮文本字重
-  --ti-button-text-hover-weight: var(--ti-common-font-weight-4, normal);
+  --ti-button-text-hover-weight: var(--ti-common-font-weight-4);
   // 文字按钮点击瞬间文本色
   --ti-button-text-color-active: var(--ti-common-color-primary-active, #7693f5);
   // 文字按钮禁用文本色
   --ti-button-text-color-disabled: var(--ti-common-color-text-disabled, #adb0b8);
   // 文字按钮图标宽度
-  --ti-button-text-svg-width: 1em;
+  --ti-button-text-svg-width: 16px;
   // 文字按钮图标高度
-  --ti-button-text-svg-height: 1em;
+  --ti-button-text-svg-height: 16px;
   // 文字按钮悬浮背景色
   --ti-button-text-hover-bg-color: transparent;
   // 文字按钮只有图标悬浮背景色
-  --ti-button-text-only-icon-hover-bg-color: transparent;
+  --ti-button-text-only-icon-hover-bg-color: #0000000D;
   // 文字按钮悬浮圆角
-  --ti-button-text-hover-border-radius: 0px;
+  --ti-button-text-hover-border-radius: 4px;
   // 文字按钮图标填充色
-  --ti-button-text-svg-fill-color: var(--ti-common-color-text-secondary, #575d6c);
+  --ti-button-text-svg-fill-color: #191919;
   // 文字按钮图标悬浮填充色
-  --ti-button-text-svg-hover-fill-color: var(--ti-button-text-color-hover);
+  --ti-button-text-svg-hover-fill-color: #191919;
   // 文字按钮禁用时图标填充色
-  --ti-button-text-svg-disabled-fill-color: var(--ti-common-color-text-disabled, #adb0b8);
+  --ti-button-text-svg-disabled-fill-color: #C2C2C2;
   // 图标加文字按钮图标右侧外边距
-  --ti-button-text-has-svg-icon-margin-right: var(--ti-common-size-2x, 8px);
+  --ti-button-text-has-svg-icon-margin-right: 4px;
   // 图标加文字按钮字体颜色
-  --ti-button-text-has-svg-text-color: var(--ti-common-color-text-primary, #252b3a);
+  --ti-button-text-has-svg-text-color: #191919;
   // 图标加文字按钮悬浮时字体颜色
-  --ti-button-text-has-svg-hover-text-color: var(--ti-common-color-text-link, #526ecc);
+  --ti-button-text-has-svg-hover-text-color: #191919;
   // 文字按钮只有svg时水平内边距
-  --ti-button-text-svg-padding-horizontal: var(--ti-common-size-2x, 8px);
+  --ti-button-text-svg-padding-horizontal: 0px;
 
   // 主要按钮的主题类背景色+朴素类文本边框色
-  --ti-button-primary-normal-bg-color: var(--ti-common-color-primary-normal, #5e7ce0);
+  --ti-button-primary-normal-bg-color: #191919;
   // 主要按钮的主题类边框色
-  --ti-button-primary-normal-border-color: var(--ti-common-color-primary-normal, #5e7ce0);
+  --ti-button-primary-normal-border-color: #191919;
   // 主题类主要按钮悬浮背景色
-  --ti-button-primary-hover-bg-color: var(--ti-common-color-primary-hover, #7693f5);
+  --ti-button-primary-hover-bg-color: #595959;
   // 主题类主要按钮悬浮边框色
-  --ti-button-primary-hover-border-color: var(--ti-common-color-primary-hover, #7693f5);
+  --ti-button-primary-hover-border-color: #595959;
   // 主要按钮点击瞬间背景色
-  --ti-button-primary-active-bg-color: var(--ti-common-color-primary-active, #7693f5);
+  --ti-button-primary-active-bg-color: #191919;
   // 主要按钮的禁用主题类背景色+禁用朴素类边框色
   --ti-button-primary-disabled-bg-color: var(--ti-common-color-primary-disabled-bgcolor, #f5f5f6);
   // 主题类主要按钮文本色
-  --ti-button-primary-text-color: var(--ti-common-color-light, #fff);
+  --ti-button-primary-text-color: var(--ti-common-color-text-white);
   // 禁用主题类主要按钮文本色
-  --ti-button-primary-disabled-text-color: var(--ti-common-color-primary-disabled-text, #adb0b8);
+  --ti-button-primary-disabled-text-color: #C2C2C2;
   // 禁用主题类主要按钮边框色
-  --ti-button-primary-disabled-border-color: var(--ti-common-color-primary-disabled-border, #dfe1e6);
+  --ti-button-primary-disabled-border-color: #F0F0F0;
   // 朴素类主要按钮文本色
-  --ti-button-primary-plain-text-color: var(--ti-common-color-primary-normal, #5e7ce0);
+  --ti-button-primary-plain-text-color: #191919;
   // 朴素类主要按钮悬浮文本色
-  --ti-button-primary-plain-hover-text-color: var(--ti-common-color-light, #fff);
+  --ti-button-primary-plain-hover-text-color: #191919;
   // 朴素类主要按钮背景色
-  --ti-button-primary-plain-bg-color: var(--ti-common-color-prompt-bg, #ebf6ff);
+  --ti-button-primary-plain-bg-color: var(--ti-common-color-bg-minor);
   // 朴素类主要按钮悬浮背景色
-  --ti-button-primary-plain-hover-bg-color: var(--ti-common-color-primary-normal, #5e7ce0);
+  --ti-button-primary-plain-hover-bg-color: var(--ti-common-color-bg-minor);
   // 朴素类主要按钮边框色
-  --ti-button-primary-plain-border-color: var(--ti-common-color-primary-normal, #5e7ce0);
+  --ti-button-primary-plain-border-color: #595959;
   // 朴素类主要按钮悬浮边框色
-  --ti-button-primary-plain-hover-border-color: var(--ti-common-color-primary-normal, #5e7ce0);
+  --ti-button-primary-plain-hover-border-color: #FFFFFF;
   // 禁用朴素类主要按钮背景色
-  --ti-button-primary-plain-disabled-bg-color: var(
-    --ti-common-color-primary-plain-disabled-bg-color,
-    rgba(191, 191, 191, 0.1)
-  );
+  --ti-button-primary-plain-disabled-bg-color: #F0F0F0;
 
   // 成功按钮的主题类背景色+朴素类文本边框色
-  --ti-button-success-normal-bg-color: var(--ti-common-color-success-normal, #50d4ab);
+  --ti-button-success-normal-bg-color: #5CB300;
   // 成功按钮的主题类边框色
-  --ti-button-success-normal-border-color: var(--ti-common-color-success-normal, #50d4ab);
+  --ti-button-success-normal-border-color: #5CB300;
   // 成功按钮悬浮背景色
-  --ti-button-success-hover-bg-color: var(--ti-common-color-success-hover, #acf2dc);
+  --ti-button-success-hover-bg-color: #7DCC29;
   // 成功按钮悬浮边框色
-  --ti-button-success-hover-border-color: var(--ti-common-color-success-hover, #acf2dc);
+  --ti-button-success-hover-border-color: #7DCC29;
   // 成功按钮点击瞬间背景色
-  --ti-button-success-active-bg-color: var(--ti-common-color-success-active, #acf2dc);
+  --ti-button-success-active-bg-color: #5CB300;
   // 成功按钮的禁用主题类背景色+禁用朴素类边框色
-  --ti-button-success-disabled-bg-color: var(--ti-common-color-success-disabled-bgcolor, #f5f5f6);
+  --ti-button-success-disabled-bg-color: #F0F0F0;
   // 成功按钮文本色
-  --ti-button-success-text-color: var(--ti-common-color-light, #fff);
+  --ti-button-success-text-color: var(--ti-common-color-text-white);
   // 禁用主题类成功按钮文本色
-  --ti-button-success-disabled-text-color: var(--ti-common-color-success-disabled-text, #adb0b8);
+  --ti-button-success-disabled-text-color: #C2C2C2;
   // 禁用主题类成功按钮边框色
-  --ti-button-success-disabled-border-color: var(--ti-common-color-success-disabled-border, #dfe1e6);
+  --ti-button-success-disabled-border-color: #F0F0F0;
   // 朴素类成功按钮文本色
-  --ti-button-success-plain-text-color: var(--ti-common-color-success-normal, #50d4ab);
+  --ti-button-success-plain-text-color: #5CB300;
   // 朴素类成功按钮悬浮文本色
-  --ti-button-success-plain-hover-text-color: var(--ti-common-color-light, #fff);
+  --ti-button-success-plain-hover-text-color: #5CB300;
   // 朴素类成功按钮背景色
-  --ti-button-success-plain-bg-color: var(--ti-common-color-success-bg, #edfff9);
+  --ti-button-success-plain-bg-color: #EDF7DF;
   // 朴素类成功按钮悬浮背景色
-  --ti-button-success-plain-hover-bg-color: var(--ti-common-color-success-normal, #50d4ab);
+  --ti-button-success-plain-hover-bg-color: #EDF7DF;
   // 朴素类成功按钮边框色
-  --ti-button-success-plain-border-color: var(--ti-common-color-success-normal, #50d4ab);
+  --ti-button-success-plain-border-color: #DAF2BB;
   // 朴素类成功按钮悬浮边框色
-  --ti-button-success-plain-hover-border-color: var(--ti-common-color-success-normal, #50d4ab);
+  --ti-button-success-plain-hover-border-color: #EDF7DF;
   // 禁用朴素类成功按钮背景色
-  --ti-button-success-plain-disabled-bg-color: var(
-    --ti-common-color-success-plain-disabled-bg-color,
-    rgba(166, 195, 185, 0.1)
-  );
+  --ti-button-success-plain-disabled-bg-color: #F0F0F0;
 
   // 警告按钮背景色|朴素类警告按钮悬浮背景色
-  --ti-button-warning-normal-bg-color: var(--ti-common-color-warning-normal, #fa9841);
+  --ti-button-warning-normal-bg-color: #FF8800;
   // 警告按钮的主题类边框色
-  --ti-button-warning-normal-border-color: var(--ti-common-color-warning-normal, #fa9841);
+  --ti-button-warning-normal-border-color: #FF8800;
   // 警告按钮悬浮背景色
-  --ti-button-warning-hover-bg-color: var(--ti-common-color-warning-hover, #fac20a);
+  --ti-button-warning-hover-bg-color: #FF9A2E;
   // 警告按钮点击瞬间背景色
-  --ti-button-warning-active-bg-color: var(--ti-common-color-warning-active, #fac20a);
+  --ti-button-warning-active-bg-color: #FF8800;
   // 警告按钮的禁用主题类背景色+禁用朴素类边框色
-  --ti-button-warning-disabled-bg-color: var(--ti-common-color-warning-disabled-bgcolor, #f5f5f6);
+  --ti-button-warning-disabled-bg-color: #F0F0F0;
   // 警告按钮文本色
-  --ti-button-warning-text-color: var(--ti-common-color-light, #fff);
+  --ti-button-warning-text-color: var(--ti-common-color-text-white);
   // 禁用警告按钮文本色
-  --ti-button-warning-disabled-text-color: var(--ti-common-color-warning-disabled-text, #adb0b8);
+  --ti-button-warning-disabled-text-color: #C2C2C2;
   // 禁用主题类警告按钮边框色
-  --ti-button-warning-disabled-border-color: var(--ti-common-color-warning-disabled-border, #dfe1e6);
+  --ti-button-warning-disabled-border-color: #F0F0F0;
   // 朴素类主要按钮文本色
-  --ti-button-warning-plain-text-color: var(--ti-common-color-warning-normal, #fa9841);
+  --ti-button-warning-plain-text-color: #FF8800;
   // 朴素类主要按钮悬浮文本色
-  --ti-button-warning-plain-hover-text-color: var(--ti-common-color-light, #fff);
+  --ti-button-warning-plain-hover-text-color: #FF8800;
   // 朴素类警告按钮背景色
-  --ti-button-warning-plain-bg-color: var(--ti-common-color-warn-bg, #fff3e8);
+  --ti-button-warning-plain-bg-color: #FFF4E8;
   // 朴素类警告按钮悬浮背景色
-  --ti-button-warning-plain-hover-bg-color: var(--ti-common-color-warning-normal, #fa9841);
+  --ti-button-warning-plain-hover-bg-color: #FFF4E8;
   // 朴素类警告按钮边框色
-  --ti-button-warning-plain-border-color: var(--ti-common-color-warning-normal, #fa9841);
+  --ti-button-warning-plain-border-color: #FFEBD1;
   // 朴素类警告按钮悬浮边框色
-  --ti-button-warning-plain-hover-border-color: var(--ti-common-color-warning-normal, #fa9841);
+  --ti-button-warning-plain-hover-border-color: #FFF4E8;
   // 禁用朴素类警告按钮背景色
-  --ti-button-warning-plain-disabled-bg-color: var(
-    --ti-common-color-warning-plain-disabled-bg-color,
-    rgba(211, 198, 162, 0.1)
-  );
+  --ti-button-warning-plain-disabled-bg-color: #F0F0F0;
 
   // 危险按钮默认背景色|朴素类危险按钮边框色
-  --ti-button-danger-normal-bg-color: var(--ti-common-color-danger-normal, #c7000b);
+  --ti-button-danger-normal-bg-color: #F23030;
   // 危险按钮的主题类边框色
-  --ti-button-danger-normal-border-color: var(--ti-common-color-danger-normal, #c7000b);
+  --ti-button-danger-normal-border-color: #F23030;
   // 危险按钮悬浮背景色
-  --ti-button-danger-hover-bg-color: var(--ti-common-color-danger-hover, #d64a52);
+  --ti-button-danger-hover-bg-color: #F76360;
   // 危险按钮悬浮边框色
-  --ti-button-danger-hover-border-color: var(--ti-common-color-danger-hover, #d64a52);
+  --ti-button-danger-hover-border-color: #F76360;
   // 危险按钮点击瞬间背景色
-  --ti-button-danger-active-bg-color: var(--ti-common-color-danger-active, #b12220);
+  --ti-button-danger-active-bg-color: #F23030;
   // 危险按钮的禁用主题类背景色+禁用朴素类边框色
-  --ti-button-danger-disabled-bg-color: var(--ti-common-color-danger-disabled-bgcolor, #f5f5f6);
+  --ti-button-danger-disabled-bg-color: #F0F0F0;
   // 危险按钮文本色
-  --ti-button-danger-text-color: var(--ti-common-color-light, #fff);
+  --ti-button-danger-text-color: var(--ti-common-color-text-white);
   // 禁用主题类危险按钮文本色
-  --ti-button-danger-disabled-text-color: var(--ti-common-color-danger-disabled-text, #adb0b8);
+  --ti-button-danger-disabled-text-color: #C2C2C2;
   // 禁用主题类危险按钮边框色
-  --ti-button-danger-disabled-border-color: var(--ti-common-color-danger-disabled-border, #dfe1e6);
+  --ti-button-danger-disabled-border-color: #F0F0F0;
   // 朴素类危险按钮文本色
-  --ti-button-danger-plain-text-color: var(--ti-common-color-danger-normal, #c7000b);
+  --ti-button-danger-plain-text-color: #F23030;
   // 朴素类危险按钮悬浮文本色
-  --ti-button-danger-plain-hover-text-color: var(--ti-common-color-light, #fff);
+  --ti-button-danger-plain-hover-text-color: #F23030;
   // 朴素类危险按钮背景色
-  --ti-button-danger-plain-bg-color: var(--ti-common-color-error-bg, #ffeeed);
+  --ti-button-danger-plain-bg-color: transparent;
   // 朴素类危险按钮悬浮背景色
-  --ti-button-danger-plain-hover-bg-color: var(--ti-common-color-danger-normal, #c7000b);
+  --ti-button-danger-plain-hover-bg-color: #FFF1F0;
   // 朴素类危险按钮边框色
-  --ti-button-danger-plain-border-color: var(--ti-common-color-danger-normal, #c7000b);
+  --ti-button-danger-plain-border-color: #FCE2E0;
   // 朴素类危险按钮悬浮边框色
-  --ti-button-danger-plain-hover-border-color: var(--ti-common-color-danger-normal, #c7000b);
+  --ti-button-danger-plain-hover-border-color: #FFF1F0;
   // 禁用朴素类危险按钮背景色
-  --ti-button-danger-plain-disabled-bg-color: var(--ti-common-color-danger-disabled-bgcolor, #f5f5f6);
+  --ti-button-danger-plain-disabled-bg-color: #F0F0F0;
   // 禁用朴素类危险按钮边框色
-  --ti-button-danger-plain-disabled-border-color: var(--ti-common-color-danger-disabled-bgcolor, #f5f5f6);
+  --ti-button-danger-plain-disabled-border-color: transparent;
 
   // 信息按钮背景色|朴素类信息按钮边框色
-  --ti-button-info-normal-bg-color: var(--ti-common-color-info-normal, #252b3a);
+  --ti-button-info-normal-bg-color: #1476FF;
   // 信息按钮的主题类边框色
-  --ti-button-info-normal-border-color: var(--ti-common-color-info-normal, #252b3a);
+  --ti-button-info-normal-border-color: #1476FF;
   // 信息按钮悬浮背景色
-  --ti-button-info-hover-bg-color: var(--ti-common-color-info-hover, #5c6173);
+  --ti-button-info-hover-bg-color: #4191FA;
   // 信息按钮悬浮边框色
-  --ti-button-info-hover-border-color: var(--ti-common-color-info-hover, #5c6173);
+  --ti-button-info-hover-border-color: #4191FA;
   // 信息按钮点击瞬间背景色
-  --ti-button-info-active-bg-color: var(--ti-common-color-info-active, #5c6173);
+  --ti-button-info-active-bg-color: #1476FF;
   // 信息按钮的禁用主题类背景色+禁用朴素类边框色
-  --ti-button-info-disabled-bg-color: var(--ti-common-color-info-disabled-bgcolor, #f5f5f6);
+  --ti-button-info-disabled-bg-color: #F0F0F0;
   // 信息按钮文本色
-  --ti-button-info-text-color: var(--ti-common-color-light, #fff);
+  --ti-button-info-text-color: var(--ti-common-color-text-white);
   // 禁用信息按钮文本色
-  --ti-button-info-disabled-text-color: var(--ti-common-color-info-disabled-text, #adb0b8);
+  --ti-button-info-disabled-text-color: #C2C2C2;
   // 禁用信息按钮边框色
-  --ti-button-info-disabled-border-color: var(--ti-common-color-info-disabled-border, #dfe1e6);
+  --ti-button-info-disabled-border-color: #F0F0F0;
   // 朴素类信息按钮文本色
-  --ti-button-info-plain-text-color: var(--ti-common-color-info-normal, #252b3a);
+  --ti-button-info-plain-text-color: #1476FF;
   // 朴素类信息按钮悬浮文本色
-  --ti-button-info-plain-hover-text-color: var(--ti-common-color-light, #fff);
+  --ti-button-info-plain-hover-text-color: #1476FF;
   // 朴素类信息按钮背景色
-  --ti-button-info-plain-bg-color: var(--ti-common-color-info-bg, rgba(51, 51, 51, 0.06));
+  --ti-button-info-plain-bg-color: #F0F7FF;
   // 朴素类信息按钮悬浮背景色
-  --ti-button-info-plain-hover-bg-color: var(--ti-common-color-info-normal, #252b3a);
+  --ti-button-info-plain-hover-bg-color: #F0F7FF;
   // 朴素类信息按钮边框色
-  --ti-button-info-plain-border-color: var(--ti-common-color-info-normal, #252b3a);
+  --ti-button-info-plain-border-color: #DEECFF;
   // 朴素类信息按钮悬浮边框色
-  --ti-button-info-plain-hover-border-color: var(--ti-common-color-info-normal, #252b3a);
+  --ti-button-info-plain-hover-border-color: #F0F7FF;
   // 禁用朴素类信息按钮背景色
-  --ti-button-info-plain-disabled-bg-color: var(
-    --ti-common-color-info-plain-disabled-bg-color,
-    rgba(191, 191, 191, 0.1)
-  );
+  --ti-button-info-plain-disabled-bg-color: #F0F0F0;
 
   // 默认类型幽灵按钮文本色
   --ti-button-ghost-text-color: var(--ti-common-color-text-primary, #252b3a);
@@ -326,137 +314,137 @@
   // 默认类型幽灵按钮悬浮文本色
   --ti-button-ghost-hover-text-color: var(--ti-common-color-primary-normal, #5e7ce0);
   // 默认类型幽灵按钮悬浮边框色
-  --ti-button-ghost-hover-border-color: var(--ti-common-color-primary-normal, #5e7ce0);
+  --ti-button-ghost-hover-border-color: #c2c2c2;
   // 默认类型幽灵按钮禁用文本色
-  --ti-button-ghost-disabled-text-color: var(--ti-common-color-text-disabled, #adb0b8);
+  --ti-button-ghost-disabled-text-color: #c2c2c2;
   // 默认类型幽灵按钮禁用边框色
-  --ti-button-ghost-disabled-border-color: var(--ti-common-color-text-disabled, #adb0b8);
+  --ti-button-ghost-disabled-border-color: #dbdbdb;
   // 主要类型幽灵按钮文本色
-  --ti-button-primary-ghost-text-color: var(--ti-common-color-primary-normal, #5e7ce0);
+  --ti-button-primary-ghost-text-color: #191919;
   // 主要类型幽灵按钮边框色
-  --ti-button-primary-ghost-border-color: var(--ti-common-color-primary-normal, #5e7ce0);
+  --ti-button-primary-ghost-border-color: #595959;
   // 主要类型幽灵按钮悬浮文本色
-  --ti-button-primary-ghost-hover-text-color: var(--ti-common-color-primary-hover, #7693f5);
+  --ti-button-primary-ghost-hover-text-color: #191919;
   // 主要类型幽灵按钮悬浮边框色
-  --ti-button-primary-ghost-hover-border-color: var(--ti-common-color-primary-hover, #7693f5);
+  --ti-button-primary-ghost-hover-border-color: #C2C2C2;
   // 主要类型幽灵按钮禁用文本色
-  --ti-button-primary-ghost-disabled-text-color: var(--ti-common-color-text-disabled, #adb0b8);
+  --ti-button-primary-ghost-disabled-text-color: #C2C2C2;
   // 主要类型幽灵按钮禁用边框色
-  --ti-button-primary-ghost-disabled-border-color: var(--ti-common-color-text-disabled, #adb0b8);
+  --ti-button-primary-ghost-disabled-border-color: #F0F0F0;
   // 成功类型幽灵按钮文本色
-  --ti-button-success-ghost-text-color: var(--ti-common-color-success-normal, #50d4ab);
+  --ti-button-success-ghost-text-color: #5CB300;
   // 成功类型幽灵按钮边框色
-  --ti-button-success-ghost-border-color: var(--ti-common-color-success-normal, #50d4ab);
+  --ti-button-success-ghost-border-color: #5CB300;
   // 成功类型幽灵按钮悬浮文本色
-  --ti-button-success-ghost-hover-text-color: var(--ti-common-color-success-active, #acf2dc);
+  --ti-button-success-ghost-hover-text-color: #5CB300;
   // 成功类型幽灵按钮悬浮边框色
-  --ti-button-success-ghost-hover-border-color: var(--ti-common-color-success-active, #acf2dc);
+  --ti-button-success-ghost-hover-border-color: #DAF2BB;
   // 成功类型幽灵按钮禁用文本色
-  --ti-button-success-ghost-disabled-text-color: var(--ti-common-color-text-disabled, #adb0b8);
+  --ti-button-success-ghost-disabled-text-color: #C2C2C2;
   // 成功类型幽灵按钮禁用边框色
-  --ti-button-success-ghost-disabled-border-color: var(--ti-common-color-text-disabled, #adb0b8);
+  --ti-button-success-ghost-disabled-border-color: #F0F0F0;
   // 信息类型幽灵按钮文本色
-  --ti-button-info-ghost-text-color: var(--ti-common-color-info-normal, #252b3a);
+  --ti-button-info-ghost-text-color: #1476FF;
   // 信息类型幽灵按钮边框色
-  --ti-button-info-ghost-border-color: var(--ti-common-color-info-normal, #252b3a);
+  --ti-button-info-ghost-border-color: #1476FF;
   // 信息类型幽灵按钮悬浮文本色
-  --ti-button-info-ghost-hover-text-color: var(--ti-common-color-info-hover, #5c6173);
+  --ti-button-info-ghost-hover-text-color: #1476FF;
   // 信息类型幽灵按钮悬浮边框色
-  --ti-button-info-ghost-hover-border-color: var(--ti-common-color-info-hover, #5c6173);
+  --ti-button-info-ghost-hover-border-color: #FAFAFA;
   // 信息类型幽灵按钮禁用文本色
-  --ti-button-info-ghost-disabled-text-color: var(--ti-common-color-text-disabled, #adb0b8);
+  --ti-button-info-ghost-disabled-text-color: #C2C2C2;
   // 信息类型幽灵按钮禁用边框色
-  --ti-button-info-ghost-disabled-border-color: var(--ti-common-color-text-disabled, #adb0b8);
+  --ti-button-info-ghost-disabled-border-color: #F0F0F0;
   // 告警类型幽灵按钮文本色
-  --ti-button-warning-ghost-text-color: var(--ti-common-color-warning-normal, #fa9841);
+  --ti-button-warning-ghost-text-color: #FF8800;
   // 告警类型幽灵按钮边框色
-  --ti-button-warning-ghost-border-color: var(--ti-common-color-warning-normal, #fa9841);
+  --ti-button-warning-ghost-border-color: #FF8800;
   // 告警类型幽灵按钮悬浮文本色
-  --ti-button-warning-ghost-hover-text-color: var(--ti-common-color-warning-active, #fac20a);
+  --ti-button-warning-ghost-hover-text-color: #FF8800;
   // 告警类型幽灵按钮悬浮边框色
-  --ti-button-warning-ghost-hover-border-color: var(--ti-common-color-warning-active, #fac20a);
+  --ti-button-warning-ghost-hover-border-color: #FFEBD1;
   // 告警类型幽灵按钮禁用文本色
-  --ti-button-warning-ghost-disabled-text-color: var(--ti-common-color-text-disabled, #adb0b8);
+  --ti-button-warning-ghost-disabled-text-color: #C2C2C2;
   // 告警类型幽灵按钮禁用边框色
-  --ti-button-warning-ghost-disabled-border-color: var(--ti-common-color-text-disabled, #adb0b8);
+  --ti-button-warning-ghost-disabled-border-color: #F0F0F0;
   // 危险类型幽灵按钮文本色
-  --ti-button-danger-ghost-text-color: var(--ti-common-color-danger-normal, #c7000b);
+  --ti-button-danger-ghost-text-color: #F23030;
   // 危险类型幽灵按钮边框色
-  --ti-button-danger-ghost-border-color: var(--ti-common-color-danger-normal, #c7000b);
+  --ti-button-danger-ghost-border-color: #F23030;
   // 危险类型幽灵按钮悬浮文本色
-  --ti-button-danger-ghost-hover-text-color: var(--ti-common-color-danger-hover, #d64a52);
+  --ti-button-danger-ghost-hover-text-color: #F23030;
   // 危险类型幽灵按钮悬浮边框色
-  --ti-button-danger-ghost-hover-border-color: var(--ti-common-color-danger-hover, #d64a52);
+  --ti-button-danger-ghost-hover-border-color: #FCE2E0;
   // 危险类型幽灵按钮禁用文本色
-  --ti-button-danger-ghost-disabled-text-color: var(--ti-common-color-text-disabled, #adb0b8);
+  --ti-button-danger-ghost-disabled-text-color: #C2C2C2;
   // 危险类型幽灵按钮禁用边框色
-  --ti-button-danger-ghost-disabled-border-color: var(--ti-common-color-text-disabled, #adb0b8);
+  --ti-button-danger-ghost-disabled-border-color: #F0F0F0;
 
   // 按钮垂直内边距
   --ti-button-padding-vertical: var(--ti-common-space-0, 0px);
   // 默认圆形按钮内边距
-  --ti-button-size-normal-padding: var(--ti-common-space-2x, 8px);
+  --ti-button-size-normal-padding: var(--ti-common-space-6);
 
   // 纯文本按钮超大尺寸最小宽度
-  --ti-button-text-size-large-min-width: var(--ti-common-size-24x, 96px);
+  --ti-button-text-size-large-min-width: 56px;
   // 纯文本按钮超大尺寸高度
-  --ti-button-text-size-large-height: var(--ti-common-size-height-large, 48px);
+  --ti-button-text-size-large-height: 56px;
   // 纯文本按钮超大尺寸图标宽度
-  --ti-button-text-size-large-svg-width: 1em;
+  --ti-button-text-size-large-svg-width: 48px;
   // 纯文本按钮超大尺寸图标高度
-  --ti-button-text-size-large-svg-height: 1em;
+  --ti-button-text-size-large-svg-height: 48px;
   // 纯文本按钮水平内边距
   --ti-button-text-padding-horizontal: var(--ti-common-space-0, 0px);
   // 纯文本按钮中等尺寸最小宽度
-  --ti-button-text-size-medium-min-width: var(--ti-common-size-22x, 88px);
+  --ti-button-text-size-medium-min-width: 40px;
   // 纯文本按钮中等尺寸高度
-  --ti-button-text-size-medium-height: var(--ti-common-size-height-medium, 40px);
+  --ti-button-text-size-medium-height: 40px;
   // 纯文本按钮中等尺寸图标宽度
-  --ti-button-text-size-medium-svg-width: 1em;
+  --ti-button-text-size-medium-svg-width: 32px;
   // 纯文本按钮中等尺寸图标高度
-  --ti-button-text-size-medium-svg-height: 1em;
+  --ti-button-text-size-medium-svg-height: 32px;
 
   // 纯文本按钮默认尺寸最小宽度
-  --ti-button-text-size-default-min-width: var(--ti-common-size-20x, 80px);
+  --ti-button-text-size-default-min-width: 24px;
   // 纯文本按钮默认尺寸高度
-  --ti-button-text-size-default-height: var(--ti-common-size-height-normal, 28px);
+  --ti-button-text-size-default-height: 24px;
   // 纯文本按钮默认尺寸图标宽度
-  --ti-button-text-size-default-svg-width: 1em;
+  --ti-button-text-size-default-svg-width: 16px;
   // 纯文本按钮默认尺寸图标高度
-  --ti-button-text-size-default-svg-height: 1em;
+  --ti-button-text-size-default-svg-height: 16px;
 
   // 纯文本按钮小尺寸最小宽度
-  --ti-button-text-size-small-min-width: var(--ti-common-size-18x, 72px);
+  --ti-button-text-size-small-min-width: 24px;
   // 纯文本按钮小尺寸高度
-  --ti-button-text-size-small-height: var(--ti-common-size-height-small, 32px);
+  --ti-button-text-size-small-height: 24px;
   // 纯文本按钮小尺寸图标宽度
-  --ti-button-text-size-small-svg-width: 1em;
+  --ti-button-text-size-small-svg-width: 16px;
   // 纯文本按钮小尺寸图标高度
-  --ti-button-text-size-small-svg-height: 1em;
+  --ti-button-text-size-small-svg-height: 16px;
 
   // 纯文本按钮迷你尺寸最小宽度
-  --ti-button-text-size-mini-min-width: var(--ti-common-size-16x, 64px);
+  --ti-button-text-size-mini-min-width: 24px;
   // 纯文本按钮迷你尺寸高度
-  --ti-button-text-size-mini-height: var(--ti-common-size-height-mini, 24px);
+  --ti-button-text-size-mini-height: 24px;
   // 纯文本按钮迷你尺寸图标宽度
-  --ti-button-text-size-mini-svg-width: 1em;
+  --ti-button-text-size-mini-svg-width: 16px;
   // 纯文本按钮迷你尺寸图标高度
-  --ti-button-text-size-mini-svg-height: 1em;
+  --ti-button-text-size-mini-svg-height: 16px;
 
   // 纯图标按钮最小宽度
-  --ti-button-icon-font-size: var(--ti-common-font-size-0, 12px);
+  --ti-button-icon-font-size: var(--ti-common-font-size-2);
   // 纯图标/文字按钮宽度
-  --ti-button-only-icon-width: var(ti-common-size-width-minor, 30px);
+  --ti-button-only-icon-width: var(--ti-common-size-8x);
   --ti-button-only-icon-min-width: unset;
-  --ti-button-only-icon-text-width: unset;
+  --ti-button-only-icon-text-width: var(--ti-common-size-6x);
   // 纯图标按钮水平内边距
   --ti-button-only-icon-padding-horizontal: 7px;
   // 纯图标按钮边框圆角
-  --ti-button-only-icon-border-radius: 2px;
+  --ti-button-only-icon-border-radius: var(--ti-common-border-radius-1);
   // 纯图标按钮边框颜色
-  --ti-button-only-icon-border-color: var(--ti-common-color-border, #adb0b8);
+  --ti-button-only-icon-border-color: #c2c2c2;
   // 纯图标按钮悬浮时边框颜色
-  --ti-button-only-icon-hover-border-color: var(--ti-common-color-primary-normal, #5e7ce0);
+  --ti-button-only-icon-hover-border-color: #191919;
   // 纯图标按钮禁用时边框颜色
-  --ti-button-only-icon-disabled-border-color: var(--ti-common-color-line-disabled, #dfe1e6);
+  --ti-button-only-icon-disabled-border-color: #dbdbdb;
 }
diff --git a/packages/theme/src/calendar-view/old-theme.js b/packages/theme/src/calendar-view/old-theme.js
new file mode 100644
index 000000000..ef8036ff3
--- /dev/null
+++ b/packages/theme/src/calendar-view/old-theme.js
@@ -0,0 +1,30 @@
+export const tinyCalendarViewOldTheme = {
+  'ti-calendar-view-not-selected-hover-color': 'rgba(0,103,209,0.05)',
+  'ti-calendar-view-is-selected-hover-color': 'rgba(0,103,209,0.1)',
+  'ti-calendar-view-events-grey-item-color': '#8D959E',
+  'ti-calendar-view-events-cyan-item-color': '#00A2B5',
+  'ti-calendar-view-events-purple-item-color': '#745EF7',
+  'ti-calendar-view-events-yellow-item-color': '#F36900',
+  'ti-calendar-view-events-red-item-color': '#EB171F',
+  'ti-calendar-view-events-green-item-color': '#00A874',
+  'ti-calendar-view-events-blue-item-color': '#1890ff',
+  'ti-calendar-view-events-item-font-weight': 'var(--ti-common-font-weight-4)',
+  'ti-calendar-view-events-item-font-size': 'var(--ti-common-font-size-0)',
+  'ti-calendar-view-header-right-svg-fill': 'unset',
+  'ti-calendar-view-header-left-svg-fill': 'unset',
+  'ti-calendar-view-tooltip-content-text-color': '#8d959e',
+  'ti-calendar-view-tooltip-date-text-color': '#8d959e',
+  'ti-calendar-view-tooltip-title-font-weight': 'var(--ti-common-font-weight-5)',
+  'ti-calendar-view-tooltip-title-font-size': 'var(--ti-common-font-size-base)',
+  'ti-calendar-view-day-selected-svg-top': '-6px',
+  'ti-calendar-view-day-selected-svg-right': '-1px',
+  'ti-calendar-view-day-selected-border-radius': 'var(--ti-common-space-2x, 8px)',
+  'ti-calendar-view-header-main-text-color': '#161e26',
+  'ti-calendar-view-radio-button-inner': 'var(--ti-common-color-text-white)',
+  'ti-calendar-view-radio-active-inner-hover': '#0a0b0e',
+  'ti-calendar-view-radio-active-inner': 'var(--ti-base-color-brand-6)',
+  'ti-calendar-view-radio-active-fill': 'var(--ti-common-color-text-white)',
+  'ti-calendar-view-tool-display': 'flex',
+  'ti-calendar-view-tool-first-display': 'none',
+  'ti-calendar-view-header-margin-bottom': 'var(--ti-common-space-3x, 12px)'
+}
diff --git a/packages/theme/src/calendar-view/smb-theme.js b/packages/theme/src/calendar-view/smb-theme.js
deleted file mode 100644
index ed251b137..000000000
--- a/packages/theme/src/calendar-view/smb-theme.js
+++ /dev/null
@@ -1,42 +0,0 @@
-/**
- * Copyright (c) 2022 - present TinyVue Authors.
- * Copyright (c) 2022 - present Huawei Cloud Computing Technologies Co., Ltd.
- *
- * Use of this source code is governed by an MIT-style license.
- *
- * THE OPEN SOURCE SOFTWARE IN THIS PRODUCT IS DISTRIBUTED IN THE HOPE THAT IT WILL BE USEFUL,
- * BUT WITHOUT ANY WARRANTY, WITHOUT EVEN THE IMPLIED WARRANTY OF MERCHANTABILITY OR FITNESS FOR
- * A PARTICULAR PURPOSE. SEE THE APPLICABLE LICENSES FOR MORE DETAILS.
- *
- */
-
-export const tinyCalendarViewSmbTheme = {
-  'ti-calendar-view-header-margin-bottom': 'var(--ti-common-space-8x)',
-  'ti-calendar-view-tool-first-display': 'flex',
-  'ti-calendar-view-tool-display': 'none',
-  'ti-calendar-view-radio-active-fill': 'var(--ti-common-color-text-primary)',
-  'ti-calendar-view-radio-active-inner': 'var(--ti-common-color-bg-white-normal)',
-  'ti-calendar-view-radio-active-inner-hover': 'var(--ti-common-color-bg-white-normal)',
-  'ti-calendar-view-radio-button-inner': '#ebebeb',
-  'ti-calendar-view-header-main-text-color': 'var(--ti-common-color-text-weaken)',
-  'ti-calendar-view-tooltip-title-font-size': 'var(--ti-common-font-size-2)',
-  'ti-calendar-view-tooltip-title-font-weight': 'var(--ti-common-font-weight-bold)',
-  'ti-calendar-view-tooltip-content-text-color': 'var(--ti-common-color-text-primary)',
-  'ti-calendar-view-tooltip-date-text-color': 'var(--ti-common-color-text-secondary)',
-  'ti-calendar-view-day-selected-border-radius': 'unset',
-  'ti-calendar-view-day-selected-svg-right': 'unset',
-  'ti-calendar-view-day-selected-svg-top': 'unset',
-  'ti-calendar-view-header-left-svg-fill': '#D8D8D8',
-  'ti-calendar-view-header-right-svg-fill': '#D8D8D8',
-  'ti-calendar-view-events-item-font-size': 'var(--ti-common-font-size-1)',
-  'ti-calendar-view-events-item-font-weight': 'var(--ti-common-font-weight-bold)',
-  'ti-calendar-view-events-blue-item-color': 'var(--ti-common-color-text-primary)',
-  'ti-calendar-view-events-green-item-color': 'var(--ti-common-color-text-primary)',
-  'ti-calendar-view-events-red-item-color': 'var(--ti-common-color-text-primary)',
-  'ti-calendar-view-events-yellow-item-color': 'var(--ti-common-color-text-primary)',
-  'ti-calendar-view-events-purple-item-color': 'var(--ti-common-color-text-primary)',
-  'ti-calendar-view-events-cyan-item-color': 'var(--ti-common-color-text-primary)',
-  'ti-calendar-view-events-grey-item-color': 'var(--ti-common-color-text-primary)',
-  'ti-calendar-view-is-selected-hover-color': 'rgba(240,248,255,0.7)',
-  'ti-calendar-view-not-selected-hover-color': 'rgba(240,248,255,0.5)'
-}
diff --git a/packages/theme/src/calendar-view/vars.less b/packages/theme/src/calendar-view/vars.less
index 96f96cb57..4c30b6506 100644
--- a/packages/theme/src/calendar-view/vars.less
+++ b/packages/theme/src/calendar-view/vars.less
@@ -12,38 +12,38 @@
 
 .component-css-vars-calendar-view() {
     // header下边距
-    --ti-calendar-view-header-margin-bottom: var(--ti-common-space-3x, 12px);
+    --ti-calendar-view-header-margin-bottom: var(--ti-common-space-8x);
     // 占位
-    --ti-calendar-view-tool-first-display: none;
-    --ti-calendar-view-tool-display: flex;
+    --ti-calendar-view-tool-first-display: flex;
+    --ti-calendar-view-tool-display: none;
     // radio 填充
-    --ti-calendar-view-radio-active-fill: var(--ti-common-color-text-white);
-    --ti-calendar-view-radio-active-inner: var(--ti-base-color-brand-6);
-    --ti-calendar-view-radio-active-inner-hover: #0a0b0e;
-    --ti-calendar-view-radio-button-inner: var(--ti-common-color-text-white);
-    --ti-calendar-view-header-main-text-color: #161e26;
+    --ti-calendar-view-radio-active-fill: var(--ti-common-color-text-primary);
+    --ti-calendar-view-radio-active-inner: var(--ti-common-color-bg-white-normal);
+    --ti-calendar-view-radio-active-inner-hover: var(--ti-common-color-bg-white-normal);
+    --ti-calendar-view-radio-button-inner: #ebebeb;
+    --ti-calendar-view-header-main-text-color: var(--ti-common-color-text-weaken);
     //选中
-    --ti-calendar-view-day-selected-border-radius: var(--ti-common-space-2x, 8px);
-    --ti-calendar-view-day-selected-svg-right: -1px;
-    --ti-calendar-view-day-selected-svg-top: -6px;
+    --ti-calendar-view-day-selected-border-radius: unset;
+    --ti-calendar-view-day-selected-svg-right: unset;
+    --ti-calendar-view-day-selected-svg-top: unset;
     // 提示
-    --ti-calendar-view-tooltip-title-font-size: var(--ti-common-font-size-base);
-    --ti-calendar-view-tooltip-title-font-weight: var(--ti-common-font-weight-5);
-    --ti-calendar-view-tooltip-date-text-color: #8d959e;
-    --ti-calendar-view-tooltip-content-text-color: #8d959e;
+    --ti-calendar-view-tooltip-title-font-size: var(--ti-common-font-size-2);
+    --ti-calendar-view-tooltip-title-font-weight: var(--ti-common-font-weight-bold);
+    --ti-calendar-view-tooltip-date-text-color: var(--ti-common-color-text-secondary);
+    --ti-calendar-view-tooltip-content-text-color: var(--ti-common-color-text-primary);
     // 箭头
-    --ti-calendar-view-header-left-svg-fill: unset;
-    --ti-calendar-view-header-right-svg-fill: unset;
+    --ti-calendar-view-header-left-svg-fill: #D8D8D8;
+    --ti-calendar-view-header-right-svg-fill: #D8D8D8;
     // 日程
-    --ti-calendar-view-events-item-font-size: var(--ti-common-font-size-0);
-    --ti-calendar-view-events-item-font-weight: var(--ti-common-font-weight-4);
-    --ti-calendar-view-events-blue-item-color: #1890ff;
-    --ti-calendar-view-events-green-item-color: #00A874;
-    --ti-calendar-view-events-red-item-color: #EB171F;
-    --ti-calendar-view-events-yellow-item-color: #F36900;
-    --ti-calendar-view-events-purple-item-color: #745EF7;
-    --ti-calendar-view-events-cyan-item-color: #00A2B5;
-    --ti-calendar-view-events-grey-item-color: #8D959E;
-    --ti-calendar-view-is-selected-hover-color: rgba(0,103,209,0.1);
-    --ti-calendar-view-not-selected-hover-color: rgba(0,103,209,0.05);
+    --ti-calendar-view-events-item-font-size: var(--ti-common-font-size-1);
+    --ti-calendar-view-events-item-font-weight: var(--ti-common-font-weight-bold);
+    --ti-calendar-view-events-blue-item-color: var(--ti-common-color-text-primary);
+    --ti-calendar-view-events-green-item-color: var(--ti-common-color-text-primary);
+    --ti-calendar-view-events-red-item-color: var(--ti-common-color-text-primary);
+    --ti-calendar-view-events-yellow-item-color: var(--ti-common-color-text-primary);
+    --ti-calendar-view-events-purple-item-color: var(--ti-common-color-text-primary);
+    --ti-calendar-view-events-cyan-item-color: var(--ti-common-color-text-primary);
+    --ti-calendar-view-events-grey-item-color: var(--ti-common-color-text-primary);
+    --ti-calendar-view-is-selected-hover-color: rgba(240,248,255,0.7);
+    --ti-calendar-view-not-selected-hover-color: rgba(240,248,255,0.5);
 }
diff --git a/packages/theme/src/calendar/old-theme.js b/packages/theme/src/calendar/old-theme.js
new file mode 100644
index 000000000..9dc6f3b70
--- /dev/null
+++ b/packages/theme/src/calendar/old-theme.js
@@ -0,0 +1,3 @@
+export const tinyCalendarOldTheme = {
+  'ti-calendar-text-color-primary': 'var(--ti-base-color-brand-6, #5e7ce0)'
+}
diff --git a/packages/theme/src/calendar/smb-theme.js b/packages/theme/src/calendar/smb-theme.js
deleted file mode 100644
index 2f62d7ba4..000000000
--- a/packages/theme/src/calendar/smb-theme.js
+++ /dev/null
@@ -1,3 +0,0 @@
-export const tinyCalendarSmbTheme = {
-  'ti-calendar-text-color-primary': '#1890ff'
-}
diff --git a/packages/theme/src/calendar/vars.less b/packages/theme/src/calendar/vars.less
index 711e14292..9d98c65ff 100644
--- a/packages/theme/src/calendar/vars.less
+++ b/packages/theme/src/calendar/vars.less
@@ -15,7 +15,7 @@
   --ti-calendar-list-item-selected-text-color: var(--ti-common-color-light, #fff);
   --ti-calendar-hover-text-color: var(--ti-base-color-brand-5, #7693f5);
   --ti-calendar-border-color: var(--ti-common-color-border, #adb0b8);
-  --ti-calendar-text-color-primary: var(--ti-base-color-brand-6, #5e7ce0);
+  --ti-calendar-text-color-primary: #1890ff;
   --ti-calendar-background-color-primary: rgba(24, 144, 255, 0.1);
   --ti-calendar-bg-color-success: var(--ti-common-color-success-normal, #50d4ab);
   --ti-calendar-bg-color-warning: var(--ti-common-color-warning-normal, #fa9841);
diff --git a/packages/theme/src/card/old-theme.js b/packages/theme/src/card/old-theme.js
new file mode 100644
index 000000000..de0834f2b
--- /dev/null
+++ b/packages/theme/src/card/old-theme.js
@@ -0,0 +1,20 @@
+export const tinyCardOldTheme = {
+  'ti-card-title-mg-bottom': 'var(--ti-common-space-3x)',
+  'ti-card-option-top-border-color': 'var(--ti-base-color-common-1)',
+  'ti-card-option-font-size': 'var(--ti-common-font-size-1)',
+  'ti-card-option-text-color': 'var(--ti-base-color-common-9)',
+  'ti-card-main-text-color': 'var(--ti-base-color-common-6)',
+  'ti-card-main-font-size': 'var(--ti-common-font-size-base)',
+  'ti-card-title-font-weight': 'var(--ti-common-font-weight-4)',
+  'ti-card-title-text-color': 'var(--ti-base-color-common-9)',
+  'ti-card-title-font-size': 'var(--ti-common-font-size-1)',
+  'ti-card-mini-body-padding': 'var(--ti-common-space-2x)',
+  'ti-card-small-body-padding': 'var(--ti-common-space-3x)',
+  'ti-card-medium-body-padding': 'var(--ti-common-space-3x)',
+  'ti-card-large-body-padding': 'var(--ti-common-space-4x)',
+  'ti-card-checked-border-color': 'var(--ti-common-color-line-active)',
+  'ti-card-default-border-color': 'var(--ti-base-color-common-1)',
+  'ti-card-large-border-radius': 'var(--ti-common-border-radius-2)',
+  'ti-card-box-shadow': 'var(--ti-common-shadow-3-down)',
+  'ti-card-bg-color': 'var(--ti-base-color-bg-1)'
+}
diff --git a/packages/theme/src/card/smb-theme.js b/packages/theme/src/card/smb-theme.js
deleted file mode 100644
index 2e9647c7f..000000000
--- a/packages/theme/src/card/smb-theme.js
+++ /dev/null
@@ -1,20 +0,0 @@
-export const tinyCardSmbTheme = {
-  'ti-card-checked-border-color': 'var(--ti-common-color-text-highlight)',
-  'ti-card-bg-color': 'var(--ti-common-color-bg-navigation)', // 白色背景
-  'ti-card-box-shadow': 'none', // 无阴影
-  'ti-card-default-border-color': 'var(--ti-common-color-light)', // 白色边框
-  'ti-card-title-font-size': 'var(--ti-common-font-size-2)', // 标题字体
-  'ti-card-title-text-color': 'var(--ti-common-color-selected-text-color)', // 标题字体色
-  'ti-card-title-font-weight': 'bold', // 标题字重
-  'ti-card-main-font-size': 'var(--ti-common-font-size-1)', // 正文字体
-  'ti-card-main-text-color': 'var(--ti-common-color-text-weaken)', // 正文字体色
-  'ti-card-option-top-border-color': 'var(--ti-common-color-primary-disabled)',
-  'ti-card-option-text-color': 'var(--ti-common-color-selected-text-color)',
-  'ti-card-option-font-size': 'var(--ti-common-font-size-2)',
-  'ti-card-large-body-padding': 'var(--ti-common-space-6x)',
-  'ti-card-medium-body-padding': 'var(--ti-common-space-6x)',
-  'ti-card-small-body-padding': 'var(--ti-common-space-4x)',
-  'ti-card-mini-body-padding': 'var(--ti-common-space-3x)',
-  'ti-card-large-border-radius': 'var(--ti-common-border-radius-4)',
-  'ti-card-title-mg-bottom': 'var(--ti-common-space-4x)'
-}
diff --git a/packages/theme/src/card/vars.less b/packages/theme/src/card/vars.less
index 9b3f2ee0d..02df58bd3 100644
--- a/packages/theme/src/card/vars.less
+++ b/packages/theme/src/card/vars.less
@@ -12,9 +12,9 @@
 
 .component-css-vars-amount() {
   // 卡片背景色
-  --ti-card-bg-color: var(--ti-base-color-bg-1);
+  --ti-card-bg-color: var(--ti-common-color-bg-navigation);
   // 卡片阴影
-  --ti-card-box-shadow: var(--ti-common-shadow-3-down);
+  --ti-card-box-shadow: none;
 
   // 卡片最小宽度
   --ti-card-min-width: var(--ti-common-size-auto);
@@ -28,7 +28,7 @@
   --ti-card-mini-width: calc(var(--ti-common-size-base) * 54);
 
   // 大尺寸卡片的圆角
-  --ti-card-large-border-radius: var(--ti-common-border-radius-2);
+  --ti-card-large-border-radius: var(--ti-common-border-radius-4);
   // 中尺寸卡片的圆角
   --ti-card-medium-border-radius: var(--ti-common-border-radius-2);
   // 小尺寸卡片的圆角
@@ -45,43 +45,43 @@
   // 危险状态的卡片的边框颜色
   --ti-card-danger-border-color: var(--ti-base-color-error-4);
   // 默认状态的卡片的边框颜色
-  --ti-card-default-border-color: var(--ti-base-color-common-1);
+  --ti-card-default-border-color: var(--ti-common-color-light);
 
   // 选中状态的卡片的边框颜色
-  --ti-card-checked-border-color: var(--ti-common-color-line-active);
+  --ti-card-checked-border-color: var(--ti-common-color-text-highlight);
   // 禁用状态的卡片的背景颜色
   --ti-card-disabled-bg-color: var(--ti-common-color-bg-disabled);
 
   // 大尺寸卡片的logo状态下，body区域的padding值
-  --ti-card-large-body-padding: var(--ti-common-space-4x);
+  --ti-card-large-body-padding: var(--ti-common-space-6x);
   // 中尺寸卡片的logo状态下，body区域的padding值
-  --ti-card-medium-body-padding: var(--ti-common-space-3x);
+  --ti-card-medium-body-padding: var(--ti-common-space-6x);
   // 小尺寸卡片的logo状态下，body区域的padding值
-  --ti-card-small-body-padding: var(--ti-common-space-3x);
+  --ti-card-small-body-padding: var(--ti-common-space-4x);
   // 迷你尺寸卡片的logo状态下，body区域的padding值
-  --ti-card-mini-body-padding: var(--ti-common-space-2x);
+  --ti-card-mini-body-padding: var(--ti-common-space-3x);
 
   // 卡片的标题的字体大小
-  --ti-card-title-font-size: var(--ti-common-font-size-1);
+  --ti-card-title-font-size: var(--ti-common-font-size-2);
   // 卡片的标题的字体颜色
-  --ti-card-title-text-color: var(--ti-base-color-common-9);
+  --ti-card-title-text-color: var(--ti-common-color-selected-text-color);
   // 卡片的标题的字重
-  --ti-card-title-font-weight: var(--ti-common-font-weight-4);
+  --ti-card-title-font-weight: bold;
   // 卡片的正文的字体大小
-  --ti-card-main-font-size: var(--ti-common-font-size-base);
+  --ti-card-main-font-size: var(--ti-common-font-size-1);
   // 卡片的正文的字体颜色
-  --ti-card-main-text-color: var(--ti-base-color-common-6);
+  --ti-card-main-text-color: var(--ti-common-color-text-weaken);
 
   // 卡片的选项的文本色
-  --ti-card-option-text-color: var(--ti-base-color-common-9);
+  --ti-card-option-text-color: var(--ti-common-color-selected-text-color);
   // 卡片的选项的文本大小
-  --ti-card-option-font-size: var(--ti-common-font-size-1);
+  --ti-card-option-font-size: var(--ti-common-font-size-2);
   // 卡片的选项的文本大小
-  --ti-card-option-top-border-color: var(--ti-base-color-common-1);
+  --ti-card-option-top-border-color: var(--ti-common-color-primary-disabled);
   // 卡片的选项禁用时的文本色
   --ti-card-option-disabled-text-color: var(--ti-common-color-text-disabled);
   // 卡片的'更多'的字体颜色
   --ti-card-footer-more-text-color: var(--ti-base-color-common-9);
   // 卡片标题下边距
-  --ti-card-title-mg-bottom: var(--ti-common-space-3x);
+  --ti-card-title-mg-bottom: var(--ti-common-space-4x);
 }
diff --git a/packages/theme/src/carousel-item/old-theme.js b/packages/theme/src/carousel-item/old-theme.js
new file mode 100644
index 000000000..da45ea2a4
--- /dev/null
+++ b/packages/theme/src/carousel-item/old-theme.js
@@ -0,0 +1,3 @@
+export const tinyCarouselItemOldTheme = {
+  'ti-carousel-item-title-bg-color': 'rgba(0, 0, 0, 0.3)'
+}
diff --git a/packages/theme/src/carousel-item/smb-theme.js b/packages/theme/src/carousel-item/smb-theme.js
deleted file mode 100644
index 1b98441e3..000000000
--- a/packages/theme/src/carousel-item/smb-theme.js
+++ /dev/null
@@ -1,4 +0,0 @@
-export const tinyCarouselItemSmbTheme = {
-  // SMB主题
-  'ti-carousel-item-title-bg-color': 'var(--ti-common-color-bg-dark-disabled)'
-}
diff --git a/packages/theme/src/carousel-item/vars.less b/packages/theme/src/carousel-item/vars.less
index f2574d8fc..8b2806ee4 100644
--- a/packages/theme/src/carousel-item/vars.less
+++ b/packages/theme/src/carousel-item/vars.less
@@ -13,7 +13,7 @@
 .component-css-vars-carousel-item() {
   --ti-carousel-item-title-height: var(--ti-common-size-height-small, 32px);
   --ti-carousel-item-title-text-color: var(--ti-common-color-light, #fff);
-  --ti-carousel-item-title-bg-color: rgba(0, 0, 0, 0.3);
+  --ti-carousel-item-title-bg-color: var(--ti-common-color-bg-dark-disabled);
   --ti-carousel-item-title-span-font-size: var(--ti-common-font-size-base, 12px);
   --ti-carousel-mask-bg-color: var(--ti-common-color-light, #fff);
 }
diff --git a/packages/theme/src/carousel/old-theme.js b/packages/theme/src/carousel/old-theme.js
new file mode 100644
index 000000000..0cd0335f2
--- /dev/null
+++ b/packages/theme/src/carousel/old-theme.js
@@ -0,0 +1,22 @@
+export const tinyCarouselOldTheme = {
+  'ti-carousel-arrow-hover-text-color': '#808080',
+  'ti-carousel-hover-opacity': '0.6',
+  'ti-carousel-opacity': '1',
+  'ti-carousel-outside-button-active-bg-color': 'var(--ti-common-color-bg-dark-deep, #464c59)',
+  'ti-carousel-indicator-active-border-radius': 'var(--ti-carousel-indicators-border-radius)',
+  'ti-carousel-indicator-active-button-width': 'var(--ti-carousel-indicator-button-width)',
+  'ti-carousel-indicator-active-background-color': 'var(--ti-base-color-transparent, transparent)',
+  'ti-carousel-indicator-padding-horizontal': 'calc(var(--ti-common-space-1, 1px) * 2)',
+  'ti-carousel-indicator-active-width': 'var(--ti-common-size-3x, 12px)',
+  'ti-carousel-indicator-margin-right': 'var(--ti-common-space-0, 0px)',
+  'ti-carousel-indicator-button-bg-color': 'var(--ti-common-color-info-disabled, #bfbfbf)',
+  'ti-carousel-indicator-active-text-color': 'var(--ti-common-color-light, #fff)',
+  'ti-carousel-indicators-height': 'var(--ti-common-size-4x, 16px)',
+  'ti-carousel-indicators-bg-color': 'rgba(3, 2, 2, 0.3)',
+  'ti-carousel-arrow-text-color': 'var(--ti-common-color-light, #fff)',
+  'ti-carousel-arrow-bg-color': 'rgba(0, 0, 0, 0.3)',
+  'ti-carousel-arrow-hover-bg-color': 'rgba(0, 0, 0, 0.6)',
+  'ti-carousel-arrow-font-size': 'var(--ti-common-font-size-base, 12px)',
+  'ti-carousel-arrow-width': 'var(--ti-common-size-7x, 28px)',
+  'ti-carousel-arrow-height': 'var(--ti-common-size-height-normal, 28px)'
+}
diff --git a/packages/theme/src/carousel/smb-theme.js b/packages/theme/src/carousel/smb-theme.js
deleted file mode 100644
index 8deba2d64..000000000
--- a/packages/theme/src/carousel/smb-theme.js
+++ /dev/null
@@ -1,24 +0,0 @@
-export const tinyCarouselSmbTheme = {
-  // SMB主题
-  'ti-carousel-arrow-height': 'var(--ti-common-size-8x)',
-  'ti-carousel-arrow-width': 'var(--ti-common-size-8x)',
-  'ti-carousel-arrow-font-size': 'var(--ti-common-font-size-2)',
-  'ti-carousel-arrow-bg-color': '#F0F0F0',
-  'ti-carousel-indicator-active-text-color': 'var(--ti-common-color-text-primary)',
-  'ti-carousel-arrow-text-color': 'var(--ti-common-color-text-weaken)',
-  'ti-carousel-arrow-hover-text-color': 'var(--ti-common-color-text-primary)',
-  'ti-carousel-arrow-disabled-text-color': 'var(--ti-common-color-text-link-darkbg-hover)',
-  'ti-carousel-indicator-active-button-width': 'var(--ti-common-size-5x)',
-  'ti-carousel-indicators-height': '8px',
-  'ti-carousel-indicator-active-background-color': 'var(--ti-common-color-primary-active)',
-  'ti-carousel-indicator-button-bg-color': 'var(--ti-common-color-text-secondary)',
-  'ti-carousel-outside-button-active-bg-color': 'var(--ti-common-color-primary-active)',
-  'ti-carousel-indicator-active-border-radius': 'var(--ti-common-space-base)',
-  'ti-carousel-indicator-padding-horizontal': 'var(--ti-common-space-0)',
-  'ti-carousel-indicator-margin-right': 'var(--ti-common-space-3x)',
-  'ti-carousel-indicator-active-width': 'var(--ti-common-size-5x)',
-  'ti-carousel-indicators-bg-color': 'none',
-  'ti-carousel-opacity': '0.5',
-  'ti-carousel-hover-opacity': '0.8',
-  'ti-carousel-arrow-hover-bg-color': '#E6E6E6'
-}
diff --git a/packages/theme/src/carousel/vars.less b/packages/theme/src/carousel/vars.less
index 6032e6b74..07805eba5 100644
--- a/packages/theme/src/carousel/vars.less
+++ b/packages/theme/src/carousel/vars.less
@@ -12,67 +12,67 @@
 
 .component-css-vars-carousel() {
   // 箭头按钮背景高度
-  --ti-carousel-arrow-height: var(--ti-common-size-height-normal, 28px);
+  --ti-carousel-arrow-height: var(--ti-common-size-8x);
   // 箭头按钮背景宽度
-  --ti-carousel-arrow-width: var(--ti-common-size-7x, 28px);
+  --ti-carousel-arrow-width: var(--ti-common-size-8x);
   // 左右箭头的字号
-  --ti-carousel-arrow-font-size: var(--ti-common-font-size-base, 12px);
+  --ti-carousel-arrow-font-size: var(--ti-common-font-size-2);
   // 左右箭头按钮悬浮背景色
-  --ti-carousel-arrow-hover-bg-color: rgba(0, 0, 0, 0.6);
+  --ti-carousel-arrow-hover-bg-color: #E6E6E6;
   // 左右箭头按钮背景色
-  --ti-carousel-arrow-bg-color: rgba(0, 0, 0, 0.3);
+  --ti-carousel-arrow-bg-color: #F0F0F0;
   // 左右箭头阴影(hide)
   --ti-carousel-arrow-box-shadow: var(--ti-common-shadow-none, none);
   // 箭头正常颜色
-  --ti-carousel-arrow-text-color: var(--ti-common-color-light, #fff);
+  --ti-carousel-arrow-text-color: var(--ti-common-color-text-weaken);
   // 箭头点击瞬间文本色(hide)
   --ti-carousel-arrow-active-text-color: var(--ti-common-color-light, #fff);
   // 指示器盒子的背景色
-  --ti-carousel-indicators-bg-color: rgba(3, 2, 2, 0.3);
+  --ti-carousel-indicators-bg-color: none;
   // 指示器盒子的圆角大小
   --ti-carousel-indicators-border-radius: 13px;
   // 指示器盒子的高度
-  --ti-carousel-indicators-height: var(--ti-common-size-4x, 16px);
+  --ti-carousel-indicators-height: 8px;
   // 指示器圆角的背景色(hide)
   --ti-carousel-indicators-radius-bg-color: rgba(0, 0, 0, 0.3);
   // 幻灯片内的当前指示器图标色
-  --ti-carousel-indicator-active-text-color: var(--ti-common-color-light, #fff);
+  --ti-carousel-indicator-active-text-color: var(--ti-common-color-text-primary);
   // 指示器按钮宽度
   --ti-carousel-indicator-button-width: var(--ti-common-size-2x, 8px);
   // 指示器按钮高度
   --ti-carousel-indicator-button-height: var(--ti-common-size-2x, 8px);
   // 非当前指示器背景色
-  --ti-carousel-indicator-button-bg-color: var(--ti-common-color-info-disabled, #bfbfbf);
+  --ti-carousel-indicator-button-bg-color: var(--ti-common-color-text-secondary);
   // 指示器项右外边距
-  --ti-carousel-indicator-margin-right: var(--ti-common-space-0, 0px);
+  --ti-carousel-indicator-margin-right: var(--ti-common-space-3x);
   // 当前指示器右边距
-  --ti-carousel-indicator-active-width: var(--ti-common-size-3x, 12px);
+  --ti-carousel-indicator-active-width: var(--ti-common-size-5x);
   // 指示器项垂直内边距(hide)
   --ti-carousel-indicator-padding-vertical: var(--ti-common-space-0, 0px);
   // 指示器项水平内边距
-  --ti-carousel-indicator-padding-horizontal: calc(var(--ti-common-space-1, 1px) * 2);
+  --ti-carousel-indicator-padding-horizontal: var(--ti-common-space-0);
   // 当前指示器动画属性(hide)
   --ti-carousel-indicator-active-transition-property: none;
   // 当前指示器背景色
-  --ti-carousel-indicator-active-background-color: var(--ti-base-color-transparent, transparent);
+  --ti-carousel-indicator-active-background-color: var(--ti-common-color-primary-active);
   // 当前指示器的宽度
-  --ti-carousel-indicator-active-button-width: var(--ti-carousel-indicator-button-width);
+  --ti-carousel-indicator-active-button-width: var(--ti-common-size-5x);
   // 当前指示器圆角
-  --ti-carousel-indicator-active-border-radius: var(--ti-carousel-indicators-border-radius);
+  --ti-carousel-indicator-active-border-radius: var(--ti-common-space-base);
   //  幻灯片外的指示器动画(hide)
   --ti-carousel-indicator-active-transition: none;
   // 幻灯片外的指示器默认背景色
   --ti-carousel-outside-button-bg-color: var(--ti-common-color-dark, #000);
   // 幻灯片外的当前指示器背景色
-  --ti-carousel-outside-button-active-bg-color: var(--ti-common-color-bg-dark-deep, #464c59);
+  --ti-carousel-outside-button-active-bg-color: var(--ti-common-color-primary-active);
   // 标签按钮的字号(hide)
   --ti-carousel-labels-button-font-size: var(--ti-common-font-size-base, 12px);
   // 正常透明度颜色
-  --ti-carousel-opacity: 1;
+  --ti-carousel-opacity: 0.5;
   // 幻灯片悬浮时的透明度(hide)
-  --ti-carousel-hover-opacity: 0.6;
+  --ti-carousel-hover-opacity: 0.8;
   // 箭头悬浮文本颜色(hide)
-  --ti-carousel-arrow-hover-text-color: #808080;
+  --ti-carousel-arrow-hover-text-color: var(--ti-common-color-text-primary);
   // 左侧箭头背景色
   --ti-carousel-arrow-left-bg-color: #f5f5f5;
   // 右侧箭头背景色
diff --git a/packages/theme/src/cascader-menu/old-theme.js b/packages/theme/src/cascader-menu/old-theme.js
new file mode 100644
index 000000000..fc56f27e9
--- /dev/null
+++ b/packages/theme/src/cascader-menu/old-theme.js
@@ -0,0 +1,4 @@
+export const tinyCascaderMenuOldTheme = {
+  'ti-cascader-menu-width': '180px',
+  'ti-cascader-menu-border-color': 'var(--ti-common-color-line-disabled, #dfe1e6)'
+}
diff --git a/packages/theme/src/cascader-menu/smb-theme.js b/packages/theme/src/cascader-menu/smb-theme.js
deleted file mode 100644
index 9624e288f..000000000
--- a/packages/theme/src/cascader-menu/smb-theme.js
+++ /dev/null
@@ -1,4 +0,0 @@
-export const tinyCascaderMenuSmbTheme = {
-  'ti-cascader-menu-border-color': '#f5f5f5',
-  'ti-cascader-menu-width': '159px'
-}
diff --git a/packages/theme/src/cascader-menu/vars.less b/packages/theme/src/cascader-menu/vars.less
index b10c02a92..2b8a3b5ac 100644
--- a/packages/theme/src/cascader-menu/vars.less
+++ b/packages/theme/src/cascader-menu/vars.less
@@ -14,7 +14,7 @@
   // 下拉菜单文本色
   --ti-cascader-menu-text-color: var(--ti-common-color-text-primary, #252b3a);
   // 下拉菜单边框色
-  --ti-cascader-menu-border-color: var(--ti-common-color-line-disabled, #dfe1e6);
+  --ti-cascader-menu-border-color: #f5f5f5;
   // 下拉菜单为空时的文本色
   --ti-cascader-menu-empty-text-color: var(--ti-common-color-text-weaken, #8a8e99);
   // 下拉菜单列表垂直方向的内边距
@@ -26,5 +26,5 @@
   // 下拉菜单列表水平方向的外边距
   --ti-cascader-menu-list-padding-horizontal: var(--ti-common-space-0, 0px);
   // 下拉菜单的宽度
-  --ti-cascader-menu-width: 180px;
+  --ti-cascader-menu-width: 159px;
 }
diff --git a/packages/theme/src/cascader-node/old-theme.js b/packages/theme/src/cascader-node/old-theme.js
new file mode 100644
index 000000000..bd5b99357
--- /dev/null
+++ b/packages/theme/src/cascader-node/old-theme.js
@@ -0,0 +1,16 @@
+export const tinyCascaderNodeOldTheme = {
+  'ti-cascader-node-active-font-weight': 'normal',
+  'ti-cascader-node-label-max-width': '360px',
+  'ti-cascader-node-postfix-right': '10px',
+  'ti-cascader-node-selectable-active-bg-color': 'var(--ti-common-color-selected-background, #5e7ce0)',
+  'ti-cascader-node-label-padding-horizontal': 'var(--ti-common-space-10, 10px)',
+  'ti-cascader-node-prefix-display': "'inline-block'",
+  'ti-cascader-node-active-icon-color': 'var(--ti-common-color-icon-white, #fff)',
+  'ti-cascader-node-disabled-icon-color': 'var(--ti-common-color-icon-normal, #575d6c)',
+  'ti-cascader-node-icon-color': 'var(--ti-common-color-icon-normal, #575d6c)',
+  'ti-cascader-node-icon-font-size': 'calc(var(--ti-common-font-size-1, 14px) - 4px)',
+  'ti-cascader-node-disabled-bg-color': 'var(--ti-common-color-bg-disabled, #f5f5f6)',
+  'ti-cascader-node-selectable-text-color': 'var(--ti-common-color-selected-text-color, #fff)',
+  'ti-cascader-node-text-color': 'var(--ti-common-color-text-white, #fff)',
+  'ti-cascader-node-hover-text-color': 'var(--ti-common-color-text-highlight, #526ecc)'
+}
diff --git a/packages/theme/src/cascader-node/smb-theme.js b/packages/theme/src/cascader-node/smb-theme.js
deleted file mode 100644
index 3cdfecb75..000000000
--- a/packages/theme/src/cascader-node/smb-theme.js
+++ /dev/null
@@ -1,17 +0,0 @@
-export const tinyCascaderNodeSmbTheme = {
-  'ti-cascader-node-label-padding-horizontal': 'var(--ti-common-space-0)',
-  'ti-cascader-node-postfix-right': 'var(--ti-common-space-4x)',
-  'ti-cascader-node-disabled-bg-color': 'var(--ti-common-color-bg-disabled)',
-  'ti-cascader-node-disabled-icon-color': 'var(--ti-common-color-text-link-darkbg-hover)',
-  'ti-cascader-node-label-max-width': 'calc(var(--ti-common-space-2) * 53 + 1px)',
-  'ti-cascader-node-selectable-active-bg-color': 'var(--ti-common-color-bg-navigation)',
-  'ti-cascader-node-active-font-weight': 'var(--ti-common-font-weight-bold)',
-  'ti-cascader-node-hover-text-color': 'var(--ti-common-color-primary-normal)',
-  'ti-cascader-node-prefix-display': 'none',
-  'ti-cascader-node-icon-color': 'var(--ti-common-color-icon-normal)',
-  'ti-cascader-node-text-color': 'var(--ti-common-color-primary-normal)',
-  'ti-cascader-node-selectable-text-color': 'var(--ti-common-color-text-highlight)',
-  'ti-cascader-node-icon-font-size': 'var(--ti-common-font-size-0)',
-  'ti-cascader-menu-list-padding-vertical': 'var(--ti-common-space-2x)',
-  'ti-cascader-node-active-icon-color': 'var(--ti-common-color-primary-normal)'
-}
diff --git a/packages/theme/src/cascader-node/vars.less b/packages/theme/src/cascader-node/vars.less
index 9d8ba5a24..cb18ac900 100644
--- a/packages/theme/src/cascader-node/vars.less
+++ b/packages/theme/src/cascader-node/vars.less
@@ -14,39 +14,39 @@
   // 下拉列表子项的背景色
   --ti-cascader-node-hover-bg-color: var(--ti-common-color-bg-white-emphasize, #f2f5fc);
   // 下拉列表子项悬浮时的文本色
-  --ti-cascader-node-hover-text-color: var(--ti-common-color-text-highlight, #526ecc);
+  --ti-cascader-node-hover-text-color: var(--ti-common-color-primary-normal);
   // 下拉列表子项的文本色
-  --ti-cascader-node-text-color: var(--ti-common-color-text-white, #fff);
+  --ti-cascader-node-text-color: var(--ti-common-color-primary-normal);
   // 下拉列表子项选中后悬浮时的背景色
   --ti-cascader-node-selectable-hover-bg-color: var(--ti-common-color-selected-background, #5e7ce0);
   // 下拉列表子项选中时的文本色
-  --ti-cascader-node-selectable-text-color: var(--ti-common-color-selected-text-color, #fff);
+  --ti-cascader-node-selectable-text-color: var(--ti-common-color-text-highlight);
   // 下拉列表子项禁用状态时的文本色
   --ti-cascader-node-disabled-text-color: var(--ti-common-color-text-disabled, #adb0b8);
   // 下拉列表子项禁用状态时的背景色
-  --ti-cascader-node-disabled-bg-color: var(--ti-common-color-bg-disabled, #f5f5f6);
+  --ti-cascader-node-disabled-bg-color: var(--ti-common-color-bg-disabled);
   // 下拉列表子项的icon图标的字体大小
-  --ti-cascader-node-icon-font-size: calc(var(--ti-common-font-size-1, 14px) - 4px);
+  --ti-cascader-node-icon-font-size: var(--ti-common-font-size-0);
   // 下拉列表子项的icon图标的色
-  --ti-cascader-node-icon-color: var(--ti-common-color-icon-normal, #575d6c);
+  --ti-cascader-node-icon-color: var(--ti-common-color-icon-normal);
   // 下拉列表子项禁用时的icon图标的色
-  --ti-cascader-node-disabled-icon-color: var(--ti-common-color-icon-normal, #575d6c);
+  --ti-cascader-node-disabled-icon-color: var(--ti-common-color-text-link-darkbg-hover);
   // 下拉列表子项的选中时icon图标的色
-  --ti-cascader-node-active-icon-color: var(--ti-common-color-icon-white, #fff);
+  --ti-cascader-node-active-icon-color: var(--ti-common-color-primary-normal);
   // 下拉列表子项的前缀display
-  --ti-cascader-node-prefix-display: 'inline-block';
+  --ti-cascader-node-prefix-display: none;
   // 下拉列表子项的标签的垂直方向的内边距
   --ti-cascader-node-label-padding-vertical: var(--ti-common-space-0, 0px);
   // 下拉列表子项的标签的水平方向的内边距
-  --ti-cascader-node-label-padding-horizontal: var(--ti-common-space-10, 10px);
+  --ti-cascader-node-label-padding-horizontal: var(--ti-common-space-0);
   // 下拉列表子项的单选按钮右侧外边距
   --ti-cascader-node-radio-margin-right: var(--ti-common-space-base, 4px);
   // 下拉列表子项聚焦时的背景色
-  --ti-cascader-node-selectable-active-bg-color: var(--ti-common-color-selected-background, #5e7ce0);
+  --ti-cascader-node-selectable-active-bg-color: var(--ti-common-color-bg-navigation);
   // 下拉列表子项icon距离右侧距离
-  --ti-cascader-node-postfix-right: 10px;
+  --ti-cascader-node-postfix-right: var(--ti-common-space-4x);
   // 下拉列表子项最大宽度
-  --ti-cascader-node-label-max-width: 360px;
+  --ti-cascader-node-label-max-width: calc(var(--ti-common-space-2) * 53 + 1px);
   // 下拉列表子项高亮时字重
-  --ti-cascader-node-active-font-weight: normal;
+  --ti-cascader-node-active-font-weight: var(--ti-common-font-weight-bold);
 }
diff --git a/packages/theme/src/cascader-panel/old-theme.js b/packages/theme/src/cascader-panel/old-theme.js
new file mode 100644
index 000000000..f195cd94c
--- /dev/null
+++ b/packages/theme/src/cascader-panel/old-theme.js
@@ -0,0 +1,5 @@
+export const tinyCascaderPanelOldTheme = {
+  'ti-cascader-panel-node-border-radius': 'var(--ti-common-border-radius-normal, 2px)',
+  'ti-cascader-panel-node-label-padding-left': 'var(--ti-common-space-5x, 20px)',
+  'ti-cascader-panel-node-label-padding-right': 'calc(var(--ti-common-space-8x, 32px) - 2px)'
+}
diff --git a/packages/theme/src/cascader-panel/smb-theme.js b/packages/theme/src/cascader-panel/smb-theme.js
deleted file mode 100644
index 8a1906446..000000000
--- a/packages/theme/src/cascader-panel/smb-theme.js
+++ /dev/null
@@ -1,5 +0,0 @@
-export const tinyCascaderPanelSmbTheme = {
-  'ti-cascader-panel-node-label-padding-left': '16px',
-  'ti-cascader-panel-node-label-padding-right': '16px',
-  'ti-cascader-panel-node-border-radius': '0px'
-}
diff --git a/packages/theme/src/cascader-panel/vars.less b/packages/theme/src/cascader-panel/vars.less
index e585d84f1..0a3b0ca20 100644
--- a/packages/theme/src/cascader-panel/vars.less
+++ b/packages/theme/src/cascader-panel/vars.less
@@ -24,9 +24,9 @@
   // 下拉菜单面板中子项的垂直方向的外边距
   --ti-cascader-panel-node-label-padding-vertical: var(--ti-common-space-0, 0px);
   // 下拉菜单面板中子项的标签的右侧内边距
-  --ti-cascader-panel-node-label-padding-right: calc(var(--ti-common-space-8x, 32px) - 2px);
+  --ti-cascader-panel-node-label-padding-right: 16px;
   // 下拉菜单面板中子项的标签的左侧内边距
-  --ti-cascader-panel-node-label-padding-left: var(--ti-common-space-5x, 20px);
+  --ti-cascader-panel-node-label-padding-left: 16px;
   // 下拉菜单面板中子项的边框圆角
-  --ti-cascader-panel-node-border-radius: var(--ti-common-border-radius-normal, 2px);
+  --ti-cascader-panel-node-border-radius: 0px;
 }
diff --git a/packages/theme/src/cascader/old-theme.js b/packages/theme/src/cascader/old-theme.js
new file mode 100644
index 000000000..b0817d636
--- /dev/null
+++ b/packages/theme/src/cascader/old-theme.js
@@ -0,0 +1,7 @@
+export const tinyCascaderOldTheme = {
+  'ti-cascader-close-hover-icon-color': 'var(--ti-common-color-border-hover, #575d6c)',
+  'ti-cascader-dropdown-margin-bottom': 'calc(var(--ti-common-space-6, 6px) - 1px)',
+  'ti-cascader-dropdown-margin-top': 'calc(var(--ti-common-space-6, 6px) - 1px)',
+  'ti-cascader-list-text-color': 'var(--ti-common-color-text-secondary, #575d6c)',
+  'ti-cascader-border-radius': 'var(--ti-common-border-radius-1, 4px)'
+}
diff --git a/packages/theme/src/cascader/smb-theme.js b/packages/theme/src/cascader/smb-theme.js
deleted file mode 100644
index 11ec60e63..000000000
--- a/packages/theme/src/cascader/smb-theme.js
+++ /dev/null
@@ -1,7 +0,0 @@
-export const tinyCascaderSmbTheme = {
-  'ti-cascader-list-text-color': '#191919',
-  'ti-cascader-close-hover-icon-color': '#191919',
-  'ti-cascader-border-radius': '6px',
-  'ti-cascader-dropdown-margin-top': '4px',
-  'ti-cascader-dropdown-margin-bottom': '4px'
-}
diff --git a/packages/theme/src/cascader/vars.less b/packages/theme/src/cascader/vars.less
index 4c7129ff2..674b4a64d 100644
--- a/packages/theme/src/cascader/vars.less
+++ b/packages/theme/src/cascader/vars.less
@@ -20,7 +20,7 @@
   // 聚焦时显示的边框色
   --ti-cascader-focus-border-color: var(--ti-common-color-line-active, #5e7ce0);
   // 边框圆角
-  --ti-cascader-border-radius: var(--ti-common-border-radius-1, 4px);
+  --ti-cascader-border-radius: 6px;
   // icon图标色
   --ti-cascader-icon-color: var(--ti-common-color-icon-graybg-normal, #adb0b8);
   // medium尺寸时的字体大小
@@ -48,7 +48,7 @@
   // 输入框标签的icon图标悬浮时显示的背景色
   --ti-cascader-tag-icon-hover-bg-color: var(--ti-common-color-icon-graybg-normal, #adb0b8);
   // 下拉列表的文本色（没有生效）
-  --ti-cascader-list-text-color: var(--ti-common-color-text-secondary, #575d6c);
+  --ti-cascader-list-text-color: #191919;
   // 下拉列表子项的高度（没有生效）
   --ti-cascader-item-height: var(--ti-common-size-height-normal, 28px);
   // 下拉列表子项悬浮时的背景色（没有生效）
@@ -70,9 +70,9 @@
   // 下拉框的右侧侧外边距
   --ti-cascader-dropdown-margin-right: var(--ti-common-space-0, 0px);
   // 下拉框的顶部外边距
-  --ti-cascader-dropdown-margin-top: calc(var(--ti-common-space-6, 6px) - 1px);
+  --ti-cascader-dropdown-margin-top: 4px;
   // 下拉框的底部外边距
-  --ti-cascader-dropdown-margin-bottom: calc(var(--ti-common-space-6, 6px) - 1px);
+  --ti-cascader-dropdown-margin-bottom: 4px;
   // 输入框标签左侧外边距
   --ti-cascader-tag-margin-left: var(--ti-common-space-6, 6px);
   // 输入框标签右侧外边距
@@ -114,5 +114,5 @@
   // 搜索框的字体大小（没有生效）
   --ti-cascader-search-input-font-size: var(--ti-common-font-size-base, 12px);
   // 输入框关闭图标hover时的颜色
-  --ti-cascader-close-hover-icon-color: var(--ti-common-color-border-hover, #575d6c);
+  --ti-cascader-close-hover-icon-color: #191919;
 }
diff --git a/packages/theme/src/checkbox-button/old-theme.js b/packages/theme/src/checkbox-button/old-theme.js
new file mode 100644
index 000000000..2dce2d640
--- /dev/null
+++ b/packages/theme/src/checkbox-button/old-theme.js
@@ -0,0 +1,30 @@
+export const tinyCheckboxButtonOldTheme = {
+  'ti-checkbox-button-left-border-radius': '0',
+  'ti-checkbox-button-right-border-radius': '0',
+  'ti-checkbox-button-mini-last-right-border-radius': 'var(--ti-common-border-radius-normal, 2px)',
+  'ti-checkbox-button-mini-last-left-border-radius': '0',
+  'ti-checkbox-button-mini-right-border-radius': '0',
+  'ti-checkbox-button-mini-left-border-radius': 'var(--ti-common-border-radius-normal, 2px)',
+  'ti-checkbox-button-mini-padding-horizontal': '12px',
+  'ti-checkbox-button-margin-top': '8px',
+  'ti-checkbox-button-checked-display': 'none',
+  'ti-checkbox-button-small-font-size': 'var(--ti-common-font-size-base)',
+  'ti-checkbox-button-size-medium-height': '44px',
+  'ti-checkbox-button-size-small-height': '30px',
+  'ti-checkbox-button-size-small-padding-horizontal': '15px',
+  'ti-checkbox-button-size-mini-border-radius': '0',
+  'ti-checkbox-button-size-mini-font-size': 'var(--ti-common-font-size-base, 12px)',
+  'ti-checkbox-button-mini-margin-horizontal': '2px',
+  'ti-checkbox-button-margin-horizontal': '2px',
+  'ti-checkbox-button-height': '24px',
+  'ti-checkbox-button-padding-vertical': '5px',
+  'ti-checkbox-button-border-radius': '0',
+  'ti-checkbox-button-border-color-hover': '#c2c2c2',
+  'ti-checkbox-button-border-color': '#e9edfa',
+  'ti-checkbox-button-bg-color-hover': 'var(--ti-common-color-bg-hover, #344899)',
+  'ti-checkbox-button-disabled-bg-color': 'var(--ti-common-color-bg-disabled, #f5f5f6)',
+  'ti-checkbox-button-checked-border-color': 'var(--ti-common-color-line-active, #5e7ce0)',
+  'ti-checkbox-button-hover-text-color': 'var(--ti-common-color-text-white, #fff)',
+  'ti-checkbox-shadow-color': '#dfe1e6',
+  'ti-checkbox-button-bg-color': 'var(--ti-common-color-bg-light-normal, #e9edfa)'
+}
diff --git a/packages/theme/src/checkbox-button/smb-theme.js b/packages/theme/src/checkbox-button/smb-theme.js
deleted file mode 100644
index 36da83185..000000000
--- a/packages/theme/src/checkbox-button/smb-theme.js
+++ /dev/null
@@ -1,33 +0,0 @@
-export const tinyCheckboxButtonSmbTheme = {
-  'ti-checkbox-button-bg-color': '#fff',
-  'ti-checkbox-button-bg-color-hover': '#fff',
-  'ti-checkbox-button-hover-text-color': '#1476FF',
-  'ti-checkbox-button-border-color': '#C2C2C2',
-  'ti-checkbox-button-border-color-hover': '#1476FF',
-  'ti-checkbox-button-right-border-radius': '6px',
-  'ti-checkbox-button-left-border-radius': '6px',
-  'ti-checkbox-button-border-radius': '6px',
-  'ti-checkbox-button-mini-padding-horizontal': '16px',
-  'ti-checkbox-button-padding-vertical': '1px',
-  'ti-checkbox-button-height': '24px',
-  'ti-checkbox-button-margin-horizontal': '4px',
-  'ti-checkbox-button-mini-margin-horizontal': '2px',
-  'ti-checkbox-button-size-mini-font-size': 'var(--ti-common-font-size-0)',
-  'ti-checkbox-button-size-mini-border-radius': '4px',
-  'ti-checkbox-button-size-small-padding-horizontal': 'var(--ti-common-space-6x)',
-  'ti-checkbox-button-size-small-height': '28px',
-  'ti-checkbox-button-size-medium-height': '40px',
-  'ti-checkbox-button-checked-display': 'block',
-  'ti-checkbox-button-disabled-bg-color': 'rgba(0,0,0,0.05)',
-  'ti-checkbox-button-checked-disabled-bg-color': 'rgba(0,0,0,0.05)',
-  'ti-checkbox-button-checked-disabled-border-color': '#dbdbdb',
-  'ti-checkbox-button-checked-disabled-text-color': '#C2C2C2',
-  'ti-checkbox-button-margin-top': '8px',
-  'ti-checkbox-button-mini-left-border-radius': '4px',
-  'ti-checkbox-button-mini-right-border-radius': '4px',
-  'ti-checkbox-button-mini-last-left-border-radius': '4px',
-  'ti-checkbox-button-mini-last-right-border-radius': '4px',
-  'ti-checkbox-button-checked-border-color': '#1476FF',
-  'ti-checkbox-shadow-color': 'transparent',
-  'ti-checkbox-button-small-font-size': 'var(--ti-common-font-size-0)'
-}
diff --git a/packages/theme/src/checkbox-button/vars.less b/packages/theme/src/checkbox-button/vars.less
index 305925778..74667dc3d 100644
--- a/packages/theme/src/checkbox-button/vars.less
+++ b/packages/theme/src/checkbox-button/vars.less
@@ -12,21 +12,21 @@
 
 .component-css-vars-checkbox-button() {
   // 按钮形式复选框背景色
-  --ti-checkbox-button-bg-color: var(--ti-common-color-bg-light-normal, #e9edfa);
+  --ti-checkbox-button-bg-color: #fff;
   // 按钮形式复选框选中项左边框阴影色(水平方向首个除外)
-  --ti-checkbox-shadow-color: #dfe1e6;
+  --ti-checkbox-shadow-color: transparent;
   // 按钮形式复选框字号
   --ti-checkbox-button-font-size: var(--ti-common-font-size-base, 12px);
   // 按钮形式复选框未选中项悬浮文本色
-  --ti-checkbox-button-hover-text-color: var(--ti-common-color-text-white, #fff);
+  --ti-checkbox-button-hover-text-color: #1476FF;
   // 按钮形式选中项边框色
-  --ti-checkbox-button-checked-border-color: var(--ti-common-color-line-active, #5e7ce0);
+  --ti-checkbox-button-checked-border-color: #1476FF;
   // 按钮形式复选框禁用文本色
   --ti-checkbox-button-disabled-text-color: var(--ti-common-color-text-disabled, #adb0b8);
   // 按钮形式复选框垂直布局，选中项禁用时的背景色
   --ti-checkbox-disabled-bg-color: var(--ti-common-color-bg-disabled, #f5f5f6);
   // 按钮形式复选框禁用背景色
-  --ti-checkbox-button-disabled-bg-color: var(--ti-common-color-bg-disabled, #f5f5f6);
+  --ti-checkbox-button-disabled-bg-color: rgba(0,0,0,0.05);
   // 按钮形式复选框未选中项文本色
   --ti-checkbox-button-text-color: var(--ti-common-color-info-normal, #252b3a);
   // 按钮形式复选框选中项文本色
@@ -34,57 +34,57 @@
   // 按钮形式复选框选中项背景色
   --ti-checkbox-button-checked-bg-color: var(--ti-common-color-bg-emphasize, #5e7ce0);
   // 按钮形式复选框悬浮背景色
-  --ti-checkbox-button-bg-color-hover: var(--ti-common-color-bg-hover, #344899);
+  --ti-checkbox-button-bg-color-hover: #fff;
   // 按钮形式复选框边框色
-  --ti-checkbox-button-border-color: #e9edfa;
+  --ti-checkbox-button-border-color: #C2C2C2;
   // 按钮形式复选框悬浮默认边框色
-  --ti-checkbox-button-border-color-hover: #c2c2c2;
+  --ti-checkbox-button-border-color-hover: #1476FF;
   // 按钮组按钮圆角
-  --ti-checkbox-button-border-radius: 0;
+  --ti-checkbox-button-border-radius: 6px;
   // 按钮组禁用边框色
   --ti-checkbox-disabled-border-color: #dbdbdb;
   // 按钮组小尺寸垂直间距、
-  --ti-checkbox-button-padding-vertical: 5px;
+  --ti-checkbox-button-padding-vertical: 1px;
   // 按钮组按钮高度
   --ti-checkbox-button-height: 24px;
   // 按钮组按钮外边距
-  --ti-checkbox-button-margin-horizontal: 2px;
+  --ti-checkbox-button-margin-horizontal: 4px;
   // 按钮组小按钮外边距
   --ti-checkbox-button-mini-margin-horizontal: 2px;
   // 按钮组小按钮字号
-  --ti-checkbox-button-size-mini-font-size: var(--ti-common-font-size-base, 12px);
+  --ti-checkbox-button-size-mini-font-size: var(--ti-common-font-size-0);
   // 按钮组小按钮圆角
-  --ti-checkbox-button-size-mini-border-radius: 0;
+  --ti-checkbox-button-size-mini-border-radius: 4px;
   // 按钮组small按钮内间距
-  --ti-checkbox-button-size-small-padding-horizontal: 15px;
+  --ti-checkbox-button-size-small-padding-horizontal: var(--ti-common-space-6x);
   // 按钮组small按钮高度
-  --ti-checkbox-button-size-small-height: 30px;
+  --ti-checkbox-button-size-small-height: 28px;
   //按钮组mini按钮高度
   --ti-checkbox-button-size-mini-height: 24px;
   //按钮组medium按钮高度
-  --ti-checkbox-button-size-medium-height: 44px;
+  --ti-checkbox-button-size-medium-height: 40px;
   // 按钮组medium按钮字体
   --ti-checkbox-button-medium-font-size: var(--ti-common-font-size-1);
   // 按钮组default按钮字体
   --ti-checkbox-button-default-font-size: var(--ti-common-font-size-1);
   // 按钮组small按钮字体
-  --ti-checkbox-button-small-font-size: var(--ti-common-font-size-base);
+  --ti-checkbox-button-small-font-size: var(--ti-common-font-size-0);
   // 按钮组按钮默认情况下选中隐藏
-  --ti-checkbox-button-checked-display: none;
+  --ti-checkbox-button-checked-display: block;
   // 按钮组按钮上边距
   --ti-checkbox-button-margin-top: 8px;
   // 小尺寸按钮组按钮内间距
-  --ti-checkbox-button-mini-padding-horizontal: 12px;
+  --ti-checkbox-button-mini-padding-horizontal: 16px;
   // 小尺寸按钮左侧圆角
-  --ti-checkbox-button-mini-left-border-radius: var(--ti-common-border-radius-normal, 2px);
+  --ti-checkbox-button-mini-left-border-radius: 4px;
   // 小尺寸按钮右侧圆角
-  --ti-checkbox-button-mini-right-border-radius: 0;
+  --ti-checkbox-button-mini-right-border-radius: 4px;
   // 小尺寸按钮组最后一个按钮顶部左侧圆角
-  --ti-checkbox-button-mini-last-left-border-radius: 0;
+  --ti-checkbox-button-mini-last-left-border-radius: 4px;
   // 小尺寸按钮组最后一个按钮右侧圆角
-  --ti-checkbox-button-mini-last-right-border-radius: var(--ti-common-border-radius-normal, 2px);
+  --ti-checkbox-button-mini-last-right-border-radius: 4px;
   // 默认按钮组右侧按钮圆角
-  --ti-checkbox-button-right-border-radius: 0;
+  --ti-checkbox-button-right-border-radius: 6px;
   // 默认按钮组第一个按钮左侧按钮圆角
-  --ti-checkbox-button-left-border-radius: 0;
+  --ti-checkbox-button-left-border-radius: 6px;
 }
diff --git a/packages/theme/src/checkbox-group/old-theme.js b/packages/theme/src/checkbox-group/old-theme.js
new file mode 100644
index 000000000..aef0a5a43
--- /dev/null
+++ b/packages/theme/src/checkbox-group/old-theme.js
@@ -0,0 +1,6 @@
+export const tinyCheckboxGroupOldTheme = {
+  'ti-checkbox-group-last-child-border-radius': 'var(--ti-common-space-0, 0px)',
+  'ti-checkbox-group-1st-child-border-radius': 'var(--ti-common-space-0, 0px)',
+  'ti-checkbox-group-flex-wrap': 'wrap',
+  'ti-checkbox-group-margin-bottom': 'var(--ti-common-space-2x, 8px)'
+}
diff --git a/packages/theme/src/checkbox-group/smb-theme.js b/packages/theme/src/checkbox-group/smb-theme.js
deleted file mode 100644
index ef7373a17..000000000
--- a/packages/theme/src/checkbox-group/smb-theme.js
+++ /dev/null
@@ -1,6 +0,0 @@
-export const tinyCheckboxGroupSmbTheme = {
-  'ti-checkbox-group-margin-bottom': '16px',
-  'ti-checkbox-group-flex-wrap': 'wrap',
-  'ti-checkbox-group-1st-child-border-radius': '6px',
-  'ti-checkbox-group-last-child-border-radius': '6px'
-}
diff --git a/packages/theme/src/checkbox-group/vars.less b/packages/theme/src/checkbox-group/vars.less
index fff6df414..ebfa54606 100644
--- a/packages/theme/src/checkbox-group/vars.less
+++ b/packages/theme/src/checkbox-group/vars.less
@@ -12,13 +12,13 @@
 
 .component-css-vars-checkbox-group() {
   // 垂直复选框和行间距(hide)
-  --ti-checkbox-group-margin-bottom: var(--ti-common-space-2x, 8px);
+  --ti-checkbox-group-margin-bottom: 16px;
   // 默认换行
   --ti-checkbox-group-flex-wrap: wrap;
   // 按钮组按钮外边距
   --ti-checkbox-group-margin-top: var(--ti-common-space-0, 0px);
   // 垂直按钮组第一个子元素边框圆角
-  --ti-checkbox-group-1st-child-border-radius: var(--ti-common-space-0, 0px);
+  --ti-checkbox-group-1st-child-border-radius: 6px;
   // 垂直按钮组最后一个子元素边框圆角
-  --ti-checkbox-group-last-child-border-radius: var(--ti-common-space-0, 0px);
+  --ti-checkbox-group-last-child-border-radius: 6px;
 }
diff --git a/packages/theme/src/checkbox/old-theme.js b/packages/theme/src/checkbox/old-theme.js
new file mode 100644
index 000000000..ec5319280
--- /dev/null
+++ b/packages/theme/src/checkbox/old-theme.js
@@ -0,0 +1,18 @@
+export const tinyCheckboxOldTheme = {
+  'ti-checkbox-label-margin-right': 'var(--ti-common-space-5x, 20px)',
+  'ti-checkbox-checkline-width': 'var(--ti-common-border-weight-1, 2px)',
+  'ti-checkbox-outline-border-radius': 'var(--ti-common-border-radius-2)',
+  'ti-checkbox-border-radius': 'var(--ti-common-border-radius-normal, 2px)',
+  'ti-checkbox-border-color-checked-disabled': 'var(--ti-common-color-line-disabled, #dfe1e6)',
+  'ti-checkbox-bg-color-checked-disabled': 'var(--ti-common-color-bg-disabled, #f5f5f6)',
+  'ti-checkbox-label-text-color-disabled': 'var(--ti-common-color-text-disabled, #adb0b8)',
+  'ti-checkbox-icon-color-disabled': 'var(--ti-common-color-text-disabled, #adb0b8)',
+  'ti-checkbox-bg-color-disable': 'var(--ti-common-color-bg-disabled, #f5f5f6)',
+  'ti-checkbox-icon-margin-top': 'var(--ti-common-space-0, 0px)',
+  'ti-checkbox-icon-margin-left': 'var(--ti-common-space-base, 4px)',
+  'ti-checkbox-border-color-hover-checked': 'var(--ti-common-color-bg-hover, #344899)',
+  'ti-checkbox-bg-color-hover-checked': 'var(--ti-common-color-bg-hover, #344899)',
+  'ti-checkbox-border-color': 'var(--ti-common-color-line-normal, #adb0b8)',
+  'ti-checkbox-border-color-checked': 'var(--ti-common-color-line-active, #5e7ce0)',
+  'ti-checkbox-bg-color-checked': 'var(--ti-common-color-bg-emphasize, #5e7ce0)'
+}
diff --git a/packages/theme/src/checkbox/smb-theme.js b/packages/theme/src/checkbox/smb-theme.js
deleted file mode 100644
index 5894926d2..000000000
--- a/packages/theme/src/checkbox/smb-theme.js
+++ /dev/null
@@ -1,23 +0,0 @@
-export const tinyCheckboxSmbTheme = {
-  'ti-checkbox-border-radius': 'var(--ti-common-border-radius-2)',
-  'ti-checkbox-outline-border-radius': 'var(--ti-common-border-radius-3)',
-  'ti-checkbox-label-text-color-disabled': 'var(--ti-common-color-text-disabled)',
-  'ti-checkbox-bg-color-disable': 'var(--ti-common-color-bg-disabled)',
-  'ti-checkbox-icon-color-disabled': '#fff',
-  'ti-checkbox-bg-color-checked-disabled': '#dbdbdb',
-  'ti-checkbox-border-color-checked-disabled': '#dbdbdb',
-  'ti-checkbox-checkline-width': 'var(--ti-common-border-weight-normal)',
-  'ti-checkbox-label-margin-right': 'var(--ti-common-space-6x)',
-  'ti-checkbox-icon-margin-top': '1px',
-  'ti-checkbox-icon-margin-left': '4.5px',
-  'ti-checkbox-button-checked-bg-color': '#FFFFFF',
-  'ti-checkbox-button-checked-text-color': '#1476FF',
-  'ti-checkbox-button-text-color': '#595959',
-  'ti-checkbox-button-bg-color-hover': '#FFFFFF',
-  'ti-checkbox-button-hover-text-color': '#191919',
-  'ti-checkbox-bg-color-checked': '#1476ff',
-  'ti-checkbox-border-color-checked': '#1476FF',
-  'ti-checkbox-bg-color-hover-checked': '#1476FF',
-  'ti-checkbox-border-color-hover-checked': 'var(--ti-common-color-prompt)',
-  'ti-checkbox-border-color': 'var(--ti-common-color-line-normal)'
-}
diff --git a/packages/theme/src/checkbox/vars.less b/packages/theme/src/checkbox/vars.less
index 319b0cd29..58b72c4aa 100644
--- a/packages/theme/src/checkbox/vars.less
+++ b/packages/theme/src/checkbox/vars.less
@@ -26,16 +26,16 @@
   // 默认复选框未选中项背景色
   --ti-checkbox-bg-color: var(--ti-common-color-transparent, transparent);
   // 默认复选框选中项背景色
-  --ti-checkbox-bg-color-checked: var(--ti-common-color-bg-emphasize, #5e7ce0);
+  --ti-checkbox-bg-color-checked: #1476ff;
   // 默认复选框选中项边框色
-  --ti-checkbox-border-color-checked: var(--ti-common-color-line-active, #5e7ce0);
+  --ti-checkbox-border-color-checked: #1476FF;
   // 默认复选框未选中项边框色
-  --ti-checkbox-border-color: var(--ti-common-color-line-normal, #adb0b8);
+  --ti-checkbox-border-color: var(--ti-common-color-line-normal);
 
   // 默认复选框选中项悬浮背景色 +
-  --ti-checkbox-bg-color-hover-checked: var(--ti-common-color-bg-hover, #344899);
+  --ti-checkbox-bg-color-hover-checked: #1476FF;
   // 默认复选框选中项悬浮边框色 +
-  --ti-checkbox-border-color-hover-checked: var(--ti-common-color-bg-hover, #344899);
+  --ti-checkbox-border-color-hover-checked: var(--ti-common-color-prompt);
 
   // 默认复选框未选中项悬浮边框色
   --ti-checkbox-border-color-hover: var(--ti-common-color-line-active, #5e7ce0);
@@ -54,29 +54,29 @@
   // 默认复选框选中项图标宽度
   --ti-checkbox-icon-width: var(--ti-common-size-base, 4px);
   // 默认复选框对勾的左边距
-  --ti-checkbox-icon-margin-left: var(--ti-common-space-base, 4px);
+  --ti-checkbox-icon-margin-left: 4.5px;
   // 默认复选框对勾的顶边距
-  --ti-checkbox-icon-margin-top: var(--ti-common-space-0, 0px);
+  --ti-checkbox-icon-margin-top: 1px;
   // 默认复选框禁用时，未选中时背景色
-  --ti-checkbox-bg-color-disable: var(--ti-common-color-bg-disabled, #f5f5f6);
+  --ti-checkbox-bg-color-disable: var(--ti-common-color-bg-disabled);
   // 默认复选框禁用时，选中项对勾颜色以及半选时中间方框颜色
-  --ti-checkbox-icon-color-disabled: var(--ti-common-color-text-disabled, #adb0b8);
+  --ti-checkbox-icon-color-disabled: #fff;
   // 默认复选框未选中项禁用边框色
   --ti-checkbox-border-color-unchecked-disabled: var(--ti-common-color-line-disabled, #dfe1e6);
   // 默认复选框禁用时，label文本色
-  --ti-checkbox-label-text-color-disabled: var(--ti-common-color-text-disabled, #adb0b8);
+  --ti-checkbox-label-text-color-disabled: var(--ti-common-color-text-disabled);
   // 默认复选框禁用时，选中项背景颜色
-  --ti-checkbox-bg-color-checked-disabled: var(--ti-common-color-bg-disabled, #f5f5f6);
+  --ti-checkbox-bg-color-checked-disabled: #dbdbdb;
   // 默认复选框禁用时，选中项边框颜色
-  --ti-checkbox-border-color-checked-disabled: var(--ti-common-color-line-disabled, #dfe1e6);
+  --ti-checkbox-border-color-checked-disabled: #dbdbdb;
 
   // 默认复选框边框圆角
-  --ti-checkbox-border-radius: var(--ti-common-border-radius-normal, 2px);
+  --ti-checkbox-border-radius: var(--ti-common-border-radius-2);
   // 默认复选框外边框圆角
-  --ti-checkbox-outline-border-radius: var(--ti-common-border-radius-2);
+  --ti-checkbox-outline-border-radius: var(--ti-common-border-radius-3);
   // 默认复选框边框圆角
-  --ti-checkbox-checkline-width: var(--ti-common-border-weight-1, 2px);
+  --ti-checkbox-checkline-width: var(--ti-common-border-weight-normal);
 
   // 默认复选框的右侧外边距
-  --ti-checkbox-label-margin-right: var(--ti-common-space-5x, 20px);
+  --ti-checkbox-label-margin-right: var(--ti-common-space-6x);
 }
diff --git a/packages/theme/src/collapse-item/old-theme.js b/packages/theme/src/collapse-item/old-theme.js
new file mode 100644
index 000000000..dd5491c94
--- /dev/null
+++ b/packages/theme/src/collapse-item/old-theme.js
@@ -0,0 +1,25 @@
+export const tinyCollapseItemOldTheme = {
+  'ti-collapse-item-title-right-fill': 'var(--ti-common-color-text-primary, #252b3a)',
+  'ti-collapse-item-title-right-color': 'var(--ti-common-color-text-primary, #252b3a)',
+  'ti-collapse-item-content-padding-bottom': 'var(--ti-common-space-3x, 12px)',
+  'ti-collapse-item-content-padding-right': 'var(--ti-common-space-4x, 16px)',
+  'ti-collapse-item-content-padding-left': 'var(--ti-common-space-4x, 16px)',
+  'ti-collapse-item-content-padding-top': 'var(--ti-common-space-3x, 12px)',
+  'ti-collapse-item-content-border-color-top': 'var(--ti-collapse-item-border-color)',
+  'ti-collapse-item-content-border-color': 'var(--ti-common-color-transparent, transparent)',
+  'ti-collapse-item-header-border-color-right': 'var(--ti-collapse-item-header-border-color)',
+  'ti-collapse-item-header-border-color-left': 'var(--ti-collapse-item-header-border-color)',
+  'ti-collapse-item-header-border-color': 'var(--ti-common-color-transparent, transparent)',
+  'ti-collapse-item-header-bg-color': 'var(--ti-common-color-bg-white-emphasize, #f2f5fc)',
+  'ti-collapse-item-header-padding-horizontal': 'var(--ti-common-space-4x, 16px)',
+  'ti-collapse-item-header-padding-vertical': 'var(--ti-common-space-0, 0px)',
+  'ti-collapse-item-arrow-hover-text-color': 'var(--ti-common-color-info, #252b3a)',
+  'ti-collapse-item-arrow-margin-right': 'var(--ti-common-space-3x, 12px)',
+  'ti-collapse-item-wrap-bg-color': 'var(--ti-common-color-light, #fff)',
+  'ti-collapse-item-icon-color': 'var(--ti-common-color-icon-normal, #575d6c)',
+  'ti-collapse-item-header-min-height': 'var(--ti-common-size-8x, 32px)',
+  'ti-collapse-item-margin-top': 'var(--ti-common-space-2x, 8px)',
+  'ti-collapse-item-border-radius': 'var(--ti-common-border-radius-normal, 2px)',
+  'ti-collapse-item-border-length': 'var(--ti-common-border-weight-normal, 1px)',
+  'ti-collapse-item-border-color': 'var(--ti-common-color-line-dividing, #dfe1e6)'
+}
diff --git a/packages/theme/src/collapse-item/smb-theme.js b/packages/theme/src/collapse-item/smb-theme.js
deleted file mode 100644
index 66289e95e..000000000
--- a/packages/theme/src/collapse-item/smb-theme.js
+++ /dev/null
@@ -1,25 +0,0 @@
-export const tinyCollapseItemSmbTheme = {
-  'ti-collapse-item-border-radius': '0',
-  'ti-collapse-item-header-padding-vertical': 'var(--ti-common-size-3x)',
-  'ti-collapse-item-header-padding-horizontal': 'var(--ti-common-space-5x)',
-  'ti-collapse-item-header-min-height': 'var(--ti-common-size-height-medium)',
-  'ti-collapse-item-icon-color': '#808080',
-  'ti-collapse-item-border-color': 'transparent',
-  'ti-collapse-item-content-border-color': 'var(--ti-common-color-light)',
-  'ti-collapse-item-content-border-color-top': 'var(--ti-common-color-light)',
-  'ti-collapse-item-border-length': 'var(--ti-common-border-radius-0)',
-  'ti-collapse-item-content-padding-top': 'var(--ti-common-space-6x)',
-  'ti-collapse-item-content-padding-right': 'var(--ti-common-space-5x)',
-  'ti-collapse-item-content-padding-bottom': 'var(--ti-common-space-6x)',
-  'ti-collapse-item-content-padding-left': 'var(--ti-common-space-5x)',
-  'ti-collapse-item-arrow-hover-text-color': 'var(--ti-base-color-brand)',
-  'ti-collapse-item-header-border-color': 'var(--ti-base-color-common-5)',
-  'ti-collapse-item-title-right-color': '#1476ff',
-  'ti-collapse-item-title-right-fill': '#1476ff',
-  'ti-collapse-item-header-bg-color': 'var(--ti-common-color-bg-white-normal)',
-  'ti-collapse-item-wrap-bg-color': 'var(--ti-common-bg-minor)',
-  'ti-collapse-item-header-border-color-left': 'var(--ti-common-color-light)',
-  'ti-collapse-item-header-border-color-right': 'var(--ti-common-color-light)',
-  'ti-collapse-item-margin-top': 'calc(var(--ti-common-space-0) - 2px )',
-  'ti-collapse-item-arrow-margin-right': 'var(--ti-common-space-3x)'
-}
diff --git a/packages/theme/src/collapse-item/vars.less b/packages/theme/src/collapse-item/vars.less
index f8d3c758f..369976b2d 100644
--- a/packages/theme/src/collapse-item/vars.less
+++ b/packages/theme/src/collapse-item/vars.less
@@ -16,9 +16,9 @@
   // 面板背景色
   --ti-collapse-item-bg-color: var(--ti-common-color-bg-white-normal, #fff);
   // 面板边框色
-  --ti-collapse-item-border-color: var(--ti-common-color-line-dividing, #dfe1e6);
+  --ti-collapse-item-border-color: transparent;
   // 面板边大小
-  --ti-collapse-item-border-length: var(--ti-common-border-weight-normal, 1px);
+  --ti-collapse-item-border-length: var(--ti-common-border-radius-0);
   // 面板左边框色
   --ti-collapse-item-border-color-left: var(--ti-collapse-item-border-color);
   // 面板右边框色
@@ -32,15 +32,15 @@
   // 面板禁用时上边框色
   --ti-collapse-item-disabled-border-color-top: var(--ti-collapse-item-border-color);
   // 面板圆角
-  --ti-collapse-item-border-radius: var(--ti-common-border-radius-normal, 2px);
+  --ti-collapse-item-border-radius: 0;
   // 面板顶部外边距
-  --ti-collapse-item-margin-top: var(--ti-common-space-2x, 8px);
+  --ti-collapse-item-margin-top: calc(var(--ti-common-space-0) - 2px );
   // 面板头部最小高度
-  --ti-collapse-item-header-min-height: var(--ti-common-size-8x, 32px);
+  --ti-collapse-item-header-min-height: var(--ti-common-size-height-medium);
   // 面板头部向下箭头图标色
-  --ti-collapse-item-icon-color: var(--ti-common-color-icon-normal, #575d6c);
+  --ti-collapse-item-icon-color: #808080;
   // 面板内容背景色
-  --ti-collapse-item-wrap-bg-color: var(--ti-common-color-light, #fff);
+  --ti-collapse-item-wrap-bg-color: var(--ti-common-bg-minor);
   // 面板禁用文本色
   --ti-collapse-item-disabled-text-color: var(--ti-common-color-text-disabled, #adb0b8);
   // 面板禁用背景色
@@ -54,9 +54,9 @@
   // 面板头部箭头尺寸(hide)
   --ti-collapse-item-arrow-font-size: var(--ti-common-font-size-base, 12px);
   // 面板头部箭头右外边距
-  --ti-collapse-item-arrow-margin-right: var(--ti-common-space-3x, 12px);
+  --ti-collapse-item-arrow-margin-right: var(--ti-common-space-3x);
   // 面板头部向上箭头图标色|箭头悬浮色
-  --ti-collapse-item-arrow-hover-text-color: var(--ti-common-color-info, #252b3a);
+  --ti-collapse-item-arrow-hover-text-color: var(--ti-base-color-brand);
   // 面板头部箭头尺寸
   --ti-collapse-item-icon-font-size: var(--ti-common-font-size-2, 16px);
   // 面板头部箭头旋转角度
@@ -66,37 +66,37 @@
   // 面板展开头部箭头图标色
   --ti-collapse-item-is-active-arrow-text-color: var(--ti-collapse-item-icon-color);
   // 面板头部垂直内边距
-  --ti-collapse-item-header-padding-vertical: var(--ti-common-space-0, 0px);
+  --ti-collapse-item-header-padding-vertical: var(--ti-common-size-3x);
   // 面板头部水平内边距
-  --ti-collapse-item-header-padding-horizontal: var(--ti-common-space-4x, 16px);
+  --ti-collapse-item-header-padding-horizontal: var(--ti-common-space-5x);
   // 面板头部背景色
-  --ti-collapse-item-header-bg-color: var(--ti-common-color-bg-white-emphasize, #f2f5fc);
+  --ti-collapse-item-header-bg-color: var(--ti-common-color-bg-white-normal);
   // 面板头部边框色
-  --ti-collapse-item-header-border-color: var(--ti-common-color-transparent, transparent);
+  --ti-collapse-item-header-border-color: var(--ti-base-color-common-5);
   // 面板头部左边框色
-  --ti-collapse-item-header-border-color-left: var(--ti-collapse-item-header-border-color);
+  --ti-collapse-item-header-border-color-left: var(--ti-common-color-light);
   // 面板头部右边框色
-  --ti-collapse-item-header-border-color-right: var(--ti-collapse-item-header-border-color);
+  --ti-collapse-item-header-border-color-right: var(--ti-common-color-light);
   // 面板内容边框色
-  --ti-collapse-item-content-border-color: var(--ti-common-color-transparent, transparent);
+  --ti-collapse-item-content-border-color: var(--ti-common-color-light);
   // 面板内容左边框色
   --ti-collapse-item-content-border-color-left: var(--ti-collapse-item-content-border-color);
   // 面板内容右边框色
   --ti-collapse-item-content-border-color-right: var(--ti-collapse-item-content-border-color);
   // 面板内容顶部边框色
-  --ti-collapse-item-content-border-color-top: var(--ti-collapse-item-border-color);
+  --ti-collapse-item-content-border-color-top: var(--ti-common-color-light);
   // 面板内容顶部内边距
-  --ti-collapse-item-content-padding-top: var(--ti-common-space-3x, 12px);
+  --ti-collapse-item-content-padding-top: var(--ti-common-space-6x);
   // 面板内容左内边距
-  --ti-collapse-item-content-padding-left: var(--ti-common-space-4x, 16px);
+  --ti-collapse-item-content-padding-left: var(--ti-common-space-5x);
   // 面板内容右内边距
-  --ti-collapse-item-content-padding-right: var(--ti-common-space-4x, 16px);
+  --ti-collapse-item-content-padding-right: var(--ti-common-space-5x);
   // 面板内容底部内边距
-  --ti-collapse-item-content-padding-bottom: var(--ti-common-space-3x, 12px);
+  --ti-collapse-item-content-padding-bottom: var(--ti-common-space-6x);
   // 面板内容字号
   --ti-collapse-item-content-font-size: var(--ti-common-font-size-base, 12px);
   // 面板右侧标题颜色
-  --ti-collapse-item-title-right-color: var(--ti-common-color-text-primary, #252b3a);
+  --ti-collapse-item-title-right-color: #1476ff;
   // 面板右侧图标颜色
-  --ti-collapse-item-title-right-fill: var(--ti-common-color-text-primary, #252b3a);
+  --ti-collapse-item-title-right-fill: #1476ff;
 }
diff --git a/packages/theme/src/color-select-panel/smb-theme.js b/packages/theme/src/color-select-panel/old-theme.js
similarity index 65%
rename from packages/theme/src/color-select-panel/smb-theme.js
rename to packages/theme/src/color-select-panel/old-theme.js
index 29d6c39d0..0d3e34cfa 100644
--- a/packages/theme/src/color-select-panel/smb-theme.js
+++ b/packages/theme/src/color-select-panel/old-theme.js
@@ -1,8 +1,8 @@
-export const tinyColorSelectPanelSmbTheme = {
-  'ti-color-select-panel-border-radius-xs': 'var(--ti-common-border-radius-4)',
-  'ti-color-select-panel-border-radius-sm': 'var(--ti-common-border-radius-2)',
-  'ti-color-select-panel-tools-line-height': 'var(--ti-common-size-height-medium)',
-  'ti-color-select-panel-btn-margin': '8px',
+export const tinyColorSelectPanelOldTheme = {
   'ti-color-select-panel-collapse-color': 'var(--ti-common-color-primary-normal)',
-  'ti-color-select-panel-btn-border-hover-color': 'var(--ti-common-color-border-hover)'
+  'ti-color-select-panel-btn-margin': '9px',
+  'ti-color-select-panel-tools-line-height': 'var(--ti-common-size-height-large)',
+  'ti-color-select-panel-btn-border-hover-color': 'var(--ti-common-color-border-hover)',
+  'ti-color-select-panel-border-radius-sm': 'var(--ti-common-border-radius-1, 4px)',
+  'ti-color-select-panel-border-radius-xs': 'var(--ti-common-border-radius-normal, 2px)'
 }
diff --git a/packages/theme/src/color-select-panel/vars.less b/packages/theme/src/color-select-panel/vars.less
index 70bbaaf74..7d3d48ad9 100644
--- a/packages/theme/src/color-select-panel/vars.less
+++ b/packages/theme/src/color-select-panel/vars.less
@@ -6,9 +6,9 @@
   // 弹出框边框厚度(hide)
   --ti-color-select-panel-border-weight: var(--ti-common-border-weight-normal, 1px);
   // 弹出框右侧色调框圆角
-  --ti-color-select-panel-border-radius-xs: var(--ti-common-border-radius-normal, 2px);
+  --ti-color-select-panel-border-radius-xs: var(--ti-common-border-radius-4);
   // 历史记录展开框颜色块圆角
-  --ti-color-select-panel-border-radius-sm: var(--ti-common-border-radius-1, 4px);
+  --ti-color-select-panel-border-radius-sm: var(--ti-common-border-radius-2);
   // 无用(hide)
   --ti-color-select-panel-border-radius: var(--ti-common-border-radius-2, 8px);
   // 弹出框各元素快间隙(hide)
@@ -30,9 +30,9 @@
   // 弹窗按钮悬浮颜色
   --ti-color-select-panel-btn-border-hover-color: var(--ti-common-color-border-hover);
   // 颜色工具栏高度
-  --ti-color-select-panel-tools-line-height: var(--ti-common-size-height-large);
+  --ti-color-select-panel-tools-line-height: var(--ti-common-size-height-medium);
   // 弹窗按钮外边距
-  --ti-color-select-panel-btn-margin: 9px;
+  --ti-color-select-panel-btn-margin: 8px;
   // 弹窗折叠字体颜色
   --ti-color-select-panel-collapse-color: var(--ti-common-color-primary-normal);
 }
\ No newline at end of file
diff --git a/packages/theme/src/date-panel/old-theme.js b/packages/theme/src/date-panel/old-theme.js
new file mode 100644
index 000000000..5e6f1fc1b
--- /dev/null
+++ b/packages/theme/src/date-panel/old-theme.js
@@ -0,0 +1,15 @@
+export const tinyDatePanelOldTheme = {
+  'ti-picker-panel-link-btn-hover-border-color': 'var(--ti-common-color-primary-hover, #7693f5)',
+  'ti-picker-panel-link-btn-hover-bg-color': 'var(--ti-common-color-primary-hover, #7693f5)',
+  'ti-picker-panel-link-btn-border-color': 'var(--ti-common-color-primary-normal, #5e7ce0)',
+  'ti-picker-panel-link-btn-text-color': 'var(--ti-common-color-light, #fff)',
+  'ti-picker-panel-link-btn-bg-color': 'var(--ti-common-color-primary-normal, #5e7ce0)',
+  'ti-picker-panel-footer-padding-verticals': 'var(--ti-common-space-6)',
+  'ti-picker-panel-svg-fill': 'var(--ti-common-color-icon-normal)',
+  'ti-picker-panel-icon-btn-line-height': '30px',
+  'ti-picker-panel-content-padding-right': '0',
+  'ti-picker-panel-content-padding-left': '0',
+  'ti-picker-panel-content-padding-top': '0',
+  'ti-picker-panel-content-border-color': 'transparent',
+  'ti-picker-panel-font-size': 'var(--ti-common-font-size-base, 12px)'
+}
diff --git a/packages/theme/src/date-panel/smb-theme.js b/packages/theme/src/date-panel/smb-theme.js
deleted file mode 100644
index 9605e5b24..000000000
--- a/packages/theme/src/date-panel/smb-theme.js
+++ /dev/null
@@ -1,16 +0,0 @@
-export const tinyDatePanelSmbTheme = {
-  'ti-picker-panel-content-border-color': 'var(--ti-base-color-common-5, #f0f0f0)',
-  'ti-picker-panel-content-padding-top': '12px',
-  'ti-picker-panel-content-padding-left': '16px',
-  'ti-picker-panel-content-padding-right': '16px',
-  'ti-picker-panel-icon-btn-line-height': '20px',
-  'ti-picker-panel-font-size': 'var(--ti-common-font-size-2)',
-  'ti-picker-panel-svg-fill': 'var(--ti-common-color-text-weaken)',
-  'ti-picker-panel-svg-hover-fill': 'var(--ti-common-color-text-primary)',
-  'ti-picker-panel-footer-padding-verticals': '16px',
-  'ti-picker-panel-link-btn-bg-color': 'var(--ti-common-color-bg-minor)',
-  'ti-picker-panel-link-btn-hover-bg-color': 'var(--ti-common-color-bg-minor-hover)',
-  'ti-picker-panel-link-btn-text-color': 'var(--ti-common-color-text-primary)',
-  'ti-picker-panel-link-btn-border-color': 'var(--ti-common-color-bg-primary-hover)',
-  'ti-picker-panel-link-btn-hover-border-color': 'var(--ti-common-color-line-normal)'
-}
diff --git a/packages/theme/src/date-panel/vars.less b/packages/theme/src/date-panel/vars.less
index db5920314..53fdcd627 100644
--- a/packages/theme/src/date-panel/vars.less
+++ b/packages/theme/src/date-panel/vars.less
@@ -17,7 +17,7 @@
   --ti-picker-panel-icon-color-btn-hover: var(--ti-common-color-icon-hover, #5e7ce0);
   --ti-picker-panel-icon-color-btn-disabled: var(--ti-common-color-icon-disabled, #adb0b8);
   --ti-picker-panel-box-shadow: 2px 3px 7px rgba(0, 0, 0, 0.15);
-  --ti-picker-panel-font-size: var(--ti-common-font-size-base, 12px);
+  --ti-picker-panel-font-size: var(--ti-common-font-size-2);
   --ti-picker-panel-text-color: var(--ti-common-color-info-normal, #252b3a);
   --ti-picker-panel-bg-color: var(--ti-common-color-light, #fff);
   --ti-picker-panel-selected-bg-color: #f2f2f3;
@@ -25,24 +25,24 @@
   --ti-picker-panel-border-color: var(--ti-common-color-line-dividing, #dfe1e6);
   --ti-picker-panel-hover-bg-color: var(--ti-common-color-selected-background, #5e7ce0);
   --ti-picker-panel-disabled-text-color: var(--ti-common-color-text-disabled, #adb0b8);
-  --ti-picker-panel-content-border-color: transparent;
-  --ti-picker-panel-content-padding-top: 0;
-  --ti-picker-panel-content-padding-left: 0;
-  --ti-picker-panel-content-padding-right: 0;
-  --ti-picker-panel-icon-btn-line-height: 30px;
+  --ti-picker-panel-content-border-color: var(--ti-base-color-common-5, #f0f0f0);
+  --ti-picker-panel-content-padding-top: 12px;
+  --ti-picker-panel-content-padding-left: 16px;
+  --ti-picker-panel-content-padding-right: 16px;
+  --ti-picker-panel-icon-btn-line-height: 20px;
   --ti--picker-panel-footer-padding-verticals: 6px;
   // 无用(hide)
   --ti-picker-panel-shortcut-selected-text-color: var(--ti-common-color-selected-text-color, #fff);
   // 无用(hide)
   --ti-picker-panel-shortcut-selected-bg-color: var(--ti-common-color-selected-background, #5e7ce0);
   // svg
-  --ti-picker-panel-svg-fill: var(--ti-common-color-icon-normal);
+  --ti-picker-panel-svg-fill: var(--ti-common-color-text-weaken);
   --ti--picker-panel-svg-hover-fill: var(--ti-common-color-icon-hover, #5e7ce0);
   // footer btn
-  --ti-picker-panel-footer-padding-verticals: var(--ti-common-space-6);
-  --ti-picker-panel-link-btn-bg-color: var(--ti-common-color-primary-normal, #5e7ce0);
-  --ti-picker-panel-link-btn-text-color: var(--ti-common-color-light, #fff);
-  --ti-picker-panel-link-btn-border-color: var(--ti-common-color-primary-normal, #5e7ce0);
-  --ti-picker-panel-link-btn-hover-bg-color: var(--ti-common-color-primary-hover, #7693f5);
-  --ti-picker-panel-link-btn-hover-border-color: var(--ti-common-color-primary-hover, #7693f5);
+  --ti-picker-panel-footer-padding-verticals: 16px;
+  --ti-picker-panel-link-btn-bg-color: var(--ti-common-color-bg-minor);
+  --ti-picker-panel-link-btn-text-color: var(--ti-common-color-text-primary);
+  --ti-picker-panel-link-btn-border-color: var(--ti-common-color-bg-primary-hover);
+  --ti-picker-panel-link-btn-hover-bg-color: var(--ti-common-color-bg-minor-hover);
+  --ti-picker-panel-link-btn-hover-border-color: var(--ti-common-color-line-normal);
 }
diff --git a/packages/theme/src/date-picker/old-theme.js b/packages/theme/src/date-picker/old-theme.js
new file mode 100644
index 000000000..3ff2ae229
--- /dev/null
+++ b/packages/theme/src/date-picker/old-theme.js
@@ -0,0 +1,7 @@
+export const tinyDatePickerOldTheme = {
+  'ti-date-picker-header-margin-horizontals': 'var(--ti-common-space-3x)',
+  'ti-date-picker-header-line-height': '32px',
+  'ti-date-picker-header-label-hover-text-color': 'var(--ti-base-color-brand-7, #526ecc)',
+  'ti-date-picker-border-color': 'var(--ti-common-color-line-dividing, #dfe1e6)',
+  'ti-date-picker-width': '280px'
+}
diff --git a/packages/theme/src/date-picker/smb-theme.js b/packages/theme/src/date-picker/smb-theme.js
deleted file mode 100644
index 6e3e89ee1..000000000
--- a/packages/theme/src/date-picker/smb-theme.js
+++ /dev/null
@@ -1,19 +0,0 @@
-/**
- * Copyright (c) 2022 - present TinyVue Authors.
- * Copyright (c) 2022 - present Huawei Cloud Computing Technologies Co., Ltd.
- *
- * Use of this source code is governed by an MIT-style license.
- *
- * THE OPEN SOURCE SOFTWARE IN THIS PRODUCT IS DISTRIBUTED IN THE HOPE THAT IT WILL BE USEFUL,
- * BUT WITHOUT ANY WARRANTY, WITHOUT EVEN THE IMPLIED WARRANTY OF MERCHANTABILITY OR FITNESS FOR
- * A PARTICULAR PURPOSE. SEE THE APPLICABLE LICENSES FOR MORE DETAILS.
- *
- */
-
-export const tinyDatePickerSmbTheme = {
-  'ti-date-picker-width': '284px',
-  'ti-date-picker-header-line-height': '20px',
-  'ti-date-picker-header-label-hover-text-color': 'var(--ti-base-color-brand-2)',
-  'ti-date-picker-border-color': 'transparent',
-  'ti-date-picker-header-margin-horizontals': 'var(--ti-common-space-4x)'
-}
diff --git a/packages/theme/src/date-picker/vars.less b/packages/theme/src/date-picker/vars.less
index 5abb1a6fc..792cb9c0e 100644
--- a/packages/theme/src/date-picker/vars.less
+++ b/packages/theme/src/date-picker/vars.less
@@ -11,12 +11,12 @@
 */
 
 .component-css-vars-date-picker() {
-  --ti-date-picker-width: 280px;
+  --ti-date-picker-width: 284px;
   --ti-date-picker-font-size: var(--ti-common-font-size-base, 12px);
   --ti-date-picker-text-color: var(--ti-common-color-info-normal, #252b3a);
   --ti-date-picker-bg-color: var(--ti-common-color-light, #fff);
   --ti-date-picker-border-radius: var(--ti-common-border-radius-normal, 2px);
-  --ti-date-picker-border-color: var(--ti-common-color-line-dividing, #dfe1e6);
+  --ti-date-picker-border-color: transparent;
   --ti-date-picker-hover-bg-color: var(--ti-base-color-brand-2, #e9edfa);
   --ti-date-picker-disabled-text-color: var(--ti-common-color-text-disabled, #adb0b8);
   --ti-date-picker-disabled-bg-color: var(--ti-common-color-bg-disabled, #f5f5f6);
@@ -27,7 +27,7 @@
   --ti-date-picker-current-border-radius: 0;
   --ti-date-picker-range-bg-color: var(--ti-base-color-brand-2, #e9edfa);
   --ti-date-picker-range-hover-bg-color: var(--ti-base-color-brand-2, #e9edfa);
-  --ti-date-picker-header-label-hover-text-color: var(--ti-base-color-brand-7, #526ecc);
-  --ti-date-picker-header-line-height: 32px;
-  --ti-date-picker-header-margin-horizontals: var(--ti-common-space-3x);
+  --ti-date-picker-header-label-hover-text-color: var(--ti-base-color-brand-2);
+  --ti-date-picker-header-line-height: 20px;
+  --ti-date-picker-header-margin-horizontals: var(--ti-common-space-4x);
 }
diff --git a/packages/theme/src/date-range/old-theme.js b/packages/theme/src/date-range/old-theme.js
new file mode 100644
index 000000000..ed0fbd7d2
--- /dev/null
+++ b/packages/theme/src/date-range/old-theme.js
@@ -0,0 +1,5 @@
+export const tinyDateRangeOldTheme = {
+  'ti-date-range-picker-header-margin-bottom': 'unset',
+  'ti-date-range-picker-header-line-height': 'var(--ti-common-line-height-3)',
+  'ti-date-range-picker-header-height': 'var(--ti-common-line-height-3)'
+}
diff --git a/packages/theme/src/date-range/smb-theme.js b/packages/theme/src/date-range/smb-theme.js
deleted file mode 100644
index 920c077bd..000000000
--- a/packages/theme/src/date-range/smb-theme.js
+++ /dev/null
@@ -1,17 +0,0 @@
-/**
- * Copyright (c) 2022 - present TinyVue Authors.
- * Copyright (c) 2022 - present Huawei Cloud Computing Technologies Co., Ltd.
- *
- * Use of this source code is governed by an MIT-style license.
- *
- * THE OPEN SOURCE SOFTWARE IN THIS PRODUCT IS DISTRIBUTED IN THE HOPE THAT IT WILL BE USEFUL,
- * BUT WITHOUT ANY WARRANTY, WITHOUT EVEN THE IMPLIED WARRANTY OF MERCHANTABILITY OR FITNESS FOR
- * A PARTICULAR PURPOSE. SEE THE APPLICABLE LICENSES FOR MORE DETAILS.
- *
- */
-
-export const tinyDateRangeSmbTheme = {
-  'ti-date-range-picker-header-height': 'calc(var(--ti-common-size-height-normal) + 2px)',
-  'ti-date-range-picker-header-line-height': 'var(--ti-common-line-height-1)',
-  'ti-date-range-picker-header-margin-bottom': 'var(--ti-common-space-3x)'
-}
diff --git a/packages/theme/src/date-range/vars.less b/packages/theme/src/date-range/vars.less
index 2e76dcbf5..3ee402936 100644
--- a/packages/theme/src/date-range/vars.less
+++ b/packages/theme/src/date-range/vars.less
@@ -14,7 +14,7 @@
   --ti-date-range-picker-header-font-size: var(--ti-common-font-size-2, 16px);
   --ti-date-range-picker-time-header-icon-color: #303133;
   // header 高度
-  --ti-date-range-picker-header-height: var(--ti-common-line-height-3);
-  --ti-date-range-picker-header-line-height: var(--ti-common-line-height-3);
-  --ti-date-range-picker-header-margin-bottom: unset;
+  --ti-date-range-picker-header-height: calc(var(--ti-common-size-height-normal) + 2px);
+  --ti-date-range-picker-header-line-height: var(--ti-common-line-height-1);
+  --ti-date-range-picker-header-margin-bottom: var(--ti-common-space-3x);
 }
diff --git a/packages/theme/src/date-table/old-theme.js b/packages/theme/src/date-table/old-theme.js
new file mode 100644
index 000000000..83ae88253
--- /dev/null
+++ b/packages/theme/src/date-table/old-theme.js
@@ -0,0 +1,27 @@
+export const tinyDateTableOldTheme = {
+  'ti-date-table-week-height': 'var(--ti-common-size-height-normal)',
+  'ti-date-table-td-row-disabled-border-radius': '0',
+  'ti-date-table-td-disabled-border-radius': '0',
+  'ti-date-table-tr-line-height': '32px',
+  'ti-date-table-cell-selected-border-radius': '0',
+  'ti-date-table-start-date-border-radius': '0',
+  'ti-date-table-td-span-top': '5px',
+  'ti-date-table-td-div-width': '36px',
+  'ti-date-table-td-div-height': '24px',
+  'ti-date-table-td-today-circle-border-width': '0',
+  'ti-date-table-td-today-circle-border-color': 'transparent',
+  'ti-date-table-td-today-border-radius': '0',
+  'ti-date-table-td-today-height': '24px',
+  'ti-date-table-td-today-width': '36px',
+  'ti-date-table-border-radius-current-select': '0',
+  'ti-date-table-bg-color-current-select': 'var(--ti-base-color-brand-6, #5e7ce0)',
+  'ti-date-table-range-hover-bg-color': 'var(--ti-base-color-brand-2, #e9edfa)',
+  'ti-date-table-range-bg-color': 'var(--ti-base-color-brand-2, #e9edfa)',
+  'ti-date-table-hover-bg-color': 'var(--ti-common-color-selected-background, #5e7ce0)',
+  'ti-date-table-week-bg-color-current-hover': 'var(--ti-base-color-brand-3, #beccfa)',
+  'ti-date-table-week-bg-color-current-select': 'var(--ti-base-color-brand-2, #e9edfa)',
+  'ti-date-table-td-today-border-color': 'var(--ti-base-color-brand-6, #5e7ce0)',
+  'ti-date-table-td-border-radius': '0',
+  'ti-date-table-td-span-height': '24px',
+  'ti-date-table-td-span-width': '36px'
+}
diff --git a/packages/theme/src/date-table/smb-theme.js b/packages/theme/src/date-table/smb-theme.js
deleted file mode 100644
index 8b392abd4..000000000
--- a/packages/theme/src/date-table/smb-theme.js
+++ /dev/null
@@ -1,28 +0,0 @@
-export const tinyDateTableSmbTheme = {
-  'ti-date-table-border-radius-current-select': '14px',
-  'ti-date-table-td-span-width': '28px',
-  'ti-date-table-td-span-height': '28px',
-  'ti-date-table-bg-color-current-select': 'var(--ti-base-color-brand-2)',
-  'ti-date-table-week-bg-color-current-select': 'var(--ti-base-color-brand-8)',
-  'ti-date-table-week-bg-color-current-hover': 'var(--ti-base-color-brand-8)',
-  'ti-date-table-td-today-width': 'calc(var(--ti-common-size-width-mini) + 4px)',
-  'ti-date-table-td-today-height': 'calc(var(--ti-common-size-height-mini) + 4px)',
-  'ti-date-table-td-today-border-radius': '13px',
-  'ti-date-table-td-today-circle-border-color': 'var(--ti-base-color-brand)',
-  'ti-date-table-td-today-circle-border-width': '1px',
-  'ti-date-table-hover-bg-color': 'var(--ti-base-color-brand-8)',
-
-  'ti-date-table-range-bg-color': 'var(--ti-base-color-brand-8)',
-  'ti-date-table-td-div-height': '28px',
-  'ti-date-table-td-div-width': '28px',
-  'ti-date-table-range-hover-bg-color': 'var(--ti-base-color-brand-8)',
-  'ti-date-table-td-border-radius': '14px',
-  'ti-date-table-td-span-top': '3px',
-  'ti-date-table-start-date-border-radius': '14px',
-  'ti-date-table-td-today-border-color': 'transparent',
-  'ti-date-table-cell-selected-border-radius': '14px',
-  'ti-date-table-week-height': 'var(--ti-common-size-height-normal)',
-  'ti-date-table-tr-line-height': 'var(--ti-common-line-height-1)',
-  'ti-date-table-td-disabled-border-radius': '50%',
-  'ti-date-table-td-row-disabled-border-radius': 'unset'
-}
diff --git a/packages/theme/src/date-table/vars.less b/packages/theme/src/date-table/vars.less
index 7d297f88d..7801afed7 100644
--- a/packages/theme/src/date-table/vars.less
+++ b/packages/theme/src/date-table/vars.less
@@ -15,41 +15,41 @@
   --ti-date-table-td-height: 34px;
   --ti-date-table-td-padding-vertical: 4px;
   --ti-date-table-td-padding-horizontal: 0;
-  --ti-date-table-td-span-width: 36px;
-  --ti-date-table-td-span-height: 24px;
+  --ti-date-table-td-span-width: 28px;
+  --ti-date-table-td-span-height: 28px;
   --ti-date-table-th-text-color: var(--ti-base-color-common-2, #adb0b8);
-  --ti-date-table-td-border-radius: 0;
+  --ti-date-table-td-border-radius: 14px;
   --ti-date-table-td-pre-month-text-color: var(--ti-base-color-common-2, #adb0b8);
   // 选中日期文本色
   --ti-date-table-td-normal-text-color: var(--ti-common-color-light, #fff);
   --ti-date-table-td-range-bg-color: #f2f6fc;
-  --ti-date-table-td-today-border-color: var(--ti-base-color-brand-6, #5e7ce0);
+  --ti-date-table-td-today-border-color: transparent;
   --ti-date-table-td-today-text-color: var(--ti-common-color-info-normal, #252b3a);
-  --ti-date-table-week-bg-color-current-select: var(--ti-base-color-brand-2, #e9edfa);
-  --ti-date-table-week-bg-color-current-hover: var(--ti-base-color-brand-3, #beccfa);
+  --ti-date-table-week-bg-color-current-select: var(--ti-base-color-brand-8);
+  --ti-date-table-week-bg-color-current-hover: var(--ti-base-color-brand-8);
   --ti-date-table-font-size: var(--ti-common-font-size-base, 12px);
-  --ti-date-table-hover-bg-color: var(--ti-common-color-selected-background, #5e7ce0);
+  --ti-date-table-hover-bg-color: var(--ti-base-color-brand-8);
   --ti-date-table-current-border-color: var(--ti-base-color-brand-6, #5e7ce0);
   --ti-date-table-disabled-text-color: var(--ti-common-color-text-disabled, #adb0b8);
   --ti-date-table-disabled-bg-color: var(--ti-common-color-bg-disabled, #f5f5f6);
-  --ti-date-table-range-bg-color: var(--ti-base-color-brand-2, #e9edfa);
-  --ti-date-table-range-hover-bg-color: var(--ti-base-color-brand-2, #e9edfa);
-  --ti-date-table-bg-color-current-select: var(--ti-base-color-brand-6, #5e7ce0);
+  --ti-date-table-range-bg-color: var(--ti-base-color-brand-8);
+  --ti-date-table-range-hover-bg-color: var(--ti-base-color-brand-8);
+  --ti-date-table-bg-color-current-select: var(--ti-base-color-brand-2);
   --ti-date-table-text-color: var(--ti-common-color-info-normal, #252b3a);
-  --ti-date-table-border-radius-current-select: 0;
-  --ti-date-table-td-today-width: 36px;
-  --ti-date-table-td-today-height: 24px;
-  --ti-date-table-td-today-border-radius: 0;
-  --ti-date-table-td-today-circle-border-color: transparent;
-  --ti-date-table-td-today-circle-border-width: 0;
+  --ti-date-table-border-radius-current-select: 14px;
+  --ti-date-table-td-today-width: calc(var(--ti-common-size-width-mini) + 4px);
+  --ti-date-table-td-today-height: calc(var(--ti-common-size-height-mini) + 4px);
+  --ti-date-table-td-today-border-radius: 13px;
+  --ti-date-table-td-today-circle-border-color: var(--ti-base-color-brand);
+  --ti-date-table-td-today-circle-border-width: 1px;
 
-  --ti-date-table-td-div-height: 24px;
-  --ti-date-table-td-div-width: 36px;
-  --ti-date-table-td-span-top: 5px;
-  --ti-date-table-start-date-border-radius: 0;
-  --ti-date-table-cell-selected-border-radius: 0;
-  --ti-date-table-tr-line-height: 32px;
-  --ti-date-table-td-disabled-border-radius: 0;
-  --ti-date-table-td-row-disabled-border-radius: 0;
+  --ti-date-table-td-div-height: 28px;
+  --ti-date-table-td-div-width: 28px;
+  --ti-date-table-td-span-top: 3px;
+  --ti-date-table-start-date-border-radius: 14px;
+  --ti-date-table-cell-selected-border-radius: 14px;
+  --ti-date-table-tr-line-height: var(--ti-common-line-height-1);
+  --ti-date-table-td-disabled-border-radius: 50%;
+  --ti-date-table-td-row-disabled-border-radius: unset;
   --ti-date-table-week-height: var(--ti-common-size-height-normal);
 }
diff --git a/packages/theme/src/dialog-box/old-theme.js b/packages/theme/src/dialog-box/old-theme.js
new file mode 100644
index 000000000..183c47ecf
--- /dev/null
+++ b/packages/theme/src/dialog-box/old-theme.js
@@ -0,0 +1,18 @@
+export const tinyDialogBoxOldTheme = {
+  'ti-dialog-box-resize-icon-size': 'var(--ti-common-font-size-1)',
+  'ti-dialog-box-resize-icon-color-hover': 'var(--ti-common-color-icon-normal)',
+  'ti-dialog-box-resize-icon-color': 'var(--ti-common-color-icon-normal)',
+  'ti-dialog-box-footer-align': 'center',
+  'ti-dialog-box-drawer-divider-border-color': 'var(--ti-common-color-line-dividing, #dfe1e6)',
+  'ti-dialog-box-drawer-padding-right': 'var(--ti-common-space-10x, 40px)',
+  'ti-dialog-box-footer-margin-bottom': 'var(--ti-common-space-8x, 32px)',
+  'ti-dialog-box-footer-padding-top': 'calc(var(--ti-common-space-base, 4px) * 7)',
+  'ti-dialog-box-body-text-color': 'var(--ti-common-color-text-primary, #252b3a)',
+  'ti-dialog-box-close-icon-color-hover': 'var(--ti-common-color-icon-hover, #5e7ce0)',
+  'ti-dialog-box-close-icon-color': 'var(--ti-common-color-icon-normal, #575d6c)',
+  'ti-dialog-box-close-icon-size': 'var(--ti-common-font-size-1, 14px)',
+  'ti-dialog-box-head-title-font-size': 'var(--ti-common-font-size-3, 18px)',
+  'ti-dialog-box-head-padding-bottom': 'calc(var(--ti-common-space-base, 4px) * 7)',
+  'ti-dialog-box-shadow': 'var(--ti-common-shadow-4-down, 0 8px 40px 0 rgba(0, 0, 0, 0.2))',
+  'ti-dialog-box-border-radius': 'var(--ti-common-border-radius-normal, 2px)'
+}
diff --git a/packages/theme/src/dialog-box/smb-theme.js b/packages/theme/src/dialog-box/smb-theme.js
deleted file mode 100644
index 0b054c935..000000000
--- a/packages/theme/src/dialog-box/smb-theme.js
+++ /dev/null
@@ -1,21 +0,0 @@
-export const tinyDialogBoxSmbTheme = {
-  'ti-dialog-box-drawer-padding-right': 'var(--ti-common-space-8x)',
-  'ti-dialog-box-border-radius': 'var(--ti-common-border-radius-4)',
-  'ti-dialog-box-shadow': 'var(--ti-common-shadow-4-down)',
-  'ti-dialog-box-head-title-font-size': 'var(--ti-common-font-size-4)',
-  'ti-dialog-box-head-padding-bottom': 'var(--ti-common-space-6x)',
-  'ti-dialog-box-close-icon-size': 'var(--ti-common-font-size-5)',
-  'ti-dialog-box-close-icon-color': 'var(--ti-common-color-icon-normal)',
-  'ti-dialog-box-close-icon-color-hover': 'var(--ti-common-color-icon-hover)',
-  'ti-dialog-box-body-text-color': 'var(--ti-common-color-text-primary)',
-  'ti-dialog-box-footer-btn-min-width': 'calc(var(--ti-common-space-base) * 24)',
-  'ti-dialog-box-drawer-divider-border-color': 'transparent',
-  'ti-dialog-box-footer-margin-bottom': 'var(--ti-common-space-8x)',
-  'ti-dialog-box-footer-align': 'right',
-  'ti-dialog-box-footer-padding-top': 'var(--ti-common-space-6x)',
-  'ti-dialog-box-resize-icon-color': 'var(--ti-common-color-icon-normal)',
-  'ti-dialog-box-resize-icon-color-hover': 'var(--ti-common-color-icon-normal)',
-  'ti-dialog-box-resize-icon-size': 'var(--ti-common-font-size-2)',
-  'ti-dialog-box-btn-tools-position-top': 'var(--ti-common-size-3x)',
-  'ti-dialog-box-btn-tools-position-right': 'var(--ti-common-size-3x)'
-}
diff --git a/packages/theme/src/dialog-box/vars.less b/packages/theme/src/dialog-box/vars.less
index a78685fc5..d822ff631 100644
--- a/packages/theme/src/dialog-box/vars.less
+++ b/packages/theme/src/dialog-box/vars.less
@@ -14,9 +14,9 @@
   // 对话框背景色
   --ti-dialog-box-bg-color: var(--ti-common-color-bg-white-normal, #fff);
   // 对话框圆角
-  --ti-dialog-box-border-radius: var(--ti-common-border-radius-normal, 2px);
+  --ti-dialog-box-border-radius: var(--ti-common-border-radius-4);
   // 对话框阴影
-  --ti-dialog-box-shadow: var(--ti-common-shadow-4-down, 0 8px 40px 0 rgba(0, 0, 0, 0.2));
+  --ti-dialog-box-shadow: var(--ti-common-shadow-4-down);
 
   // 头部边框色(hide)
   --ti-dialog-box-head-border-color: var(--ti-common-color-line-normal, #adb0b8);
@@ -27,9 +27,9 @@
   // 头部水平内边距
   --ti-dialog-box-head-padding-horizontal: var(--ti-common-space-8x, 32px);
   // 头部下内边距
-  --ti-dialog-box-head-padding-bottom: calc(var(--ti-common-space-base, 4px) * 7);
+  --ti-dialog-box-head-padding-bottom: var(--ti-common-space-6x);
   // 头部字号
-  --ti-dialog-box-head-title-font-size: var(--ti-common-font-size-3, 18px);
+  --ti-dialog-box-head-title-font-size: var(--ti-common-font-size-4);
   // 头部字重
   --ti-dialog-box-head-title-font-weight: var(--ti-common-font-weight-7, bold);
   // 头部文本色
@@ -52,11 +52,11 @@
   // 关闭按钮圆角
   --ti-dialog-box-btn-border-radius: var(--ti-common-border-radius-1, 4px);
   // 关闭按钮图标尺寸
-  --ti-dialog-box-close-icon-size: var(--ti-common-font-size-1, 14px);
+  --ti-dialog-box-close-icon-size: var(--ti-common-font-size-5);
   // 关闭按钮图标色
-  --ti-dialog-box-close-icon-color: var(--ti-common-color-icon-normal, #575d6c);
+  --ti-dialog-box-close-icon-color: var(--ti-common-color-icon-normal);
   // 关闭按钮悬浮图标色
-  --ti-dialog-box-close-icon-color-hover: var(--ti-common-color-icon-hover, #5e7ce0);
+  --ti-dialog-box-close-icon-color-hover: var(--ti-common-color-icon-hover);
   // 关闭按钮悬浮背景色
   --ti-dialog-box-btn-background-color-hover: none;
   // 关闭按钮与上边框的距离(hide)
@@ -67,18 +67,18 @@
   // 内容字号
   --ti-dialog-box-body-font-size: var(--ti-common-font-size-base, 12px);
   // 内容字体色
-  --ti-dialog-box-body-text-color: var(--ti-common-color-text-primary, #252b3a);
+  --ti-dialog-box-body-text-color: var(--ti-common-color-text-primary);
   // 内容垂直内边距
   --ti-dialog-box-body-padding-vertical: var(--ti-common-space-0, 0px);
   // 内容水平内边距
   --ti-dialog-box-body-padding-horizontal: var(--ti-common-space-8x, 32px);
 
   // 底部上内边距
-  --ti-dialog-box-footer-padding-top: calc(var(--ti-common-space-base, 4px) * 7);
+  --ti-dialog-box-footer-padding-top: var(--ti-common-space-6x);
   // 底部水平内边距
   --ti-dialog-box-footer-padding-horizontal: var(--ti-common-space-8x, 32px);
   // 底部下内边距
-  --ti-dialog-box-footer-margin-bottom: var(--ti-common-space-8x, 32px);
+  --ti-dialog-box-footer-margin-bottom: var(--ti-common-space-8x);
 
   // 抽屉最小宽度
   --ti-dialog-box-drawer-min-width: calc(var(--ti-common-space-10, 10px) * 50);
@@ -87,7 +87,7 @@
   // 抽屉左内边距
   --ti-dialog-box-drawer-padding-left: var(--ti-common-space-8x, 32px);
   // 抽屉右内边距
-  --ti-dialog-box-drawer-padding-right: var(--ti-common-space-10x, 40px);
+  --ti-dialog-box-drawer-padding-right: var(--ti-common-space-8x);
   // 抽屉头部上内边距
   --ti-dialog-box-drawer-header-padding-top: var(--ti-common-space-8x, 32px);
   // 抽屉头部下内边距
@@ -119,7 +119,7 @@
   // 抽屉底部右外边距
   --ti-dialog-box-drawer-footer-margin-right: var(--ti-common-space-10x, 40px);
   // 抽屉头部与底部边框颜色
-  --ti-dialog-box-drawer-divider-border-color: var(--ti-common-color-line-dividing, #dfe1e6);
+  --ti-dialog-box-drawer-divider-border-color: transparent;
   // 抽屉边框圆角
   --ti-dialog-box-drawer-radius: var(--ti-common-space-0, 0px);
   // 弹窗布局模式(hide)
@@ -127,11 +127,11 @@
   // 弹窗垂直布局(hide)
   --ti-dialog-box-wrapper-align-items: normal;
   // 底部布局显示
-  --ti-dialog-box-footer-align: center;
+  --ti-dialog-box-footer-align: right;
   // 缩放按钮
   --ti-dialog-box-resize-icon-color: var(--ti-common-color-icon-normal);
   // 缩放按钮悬浮状态
   --ti-dialog-box-resize-icon-color-hover: var(--ti-common-color-icon-normal);
   // 缩放按钮大小
-  --ti-dialog-box-resize-icon-size: var(--ti-common-font-size-1);
+  --ti-dialog-box-resize-icon-size: var(--ti-common-font-size-2);
 }
diff --git a/packages/theme/src/divider/old-theme.js b/packages/theme/src/divider/old-theme.js
new file mode 100644
index 000000000..2630ff462
--- /dev/null
+++ b/packages/theme/src/divider/old-theme.js
@@ -0,0 +1,7 @@
+export const tinyDividerOldTheme = {
+  'ti-divider-vertical-opacity': '0.8',
+  'ti-divider-horizontal-opacity': '0.8',
+  'ti-divider-text-color': 'var(--ti-common-color-text-primary, #252b3a)',
+  'ti-divider-text-bg-color': 'var(--ti-base-color-bg-1, #ffffff)',
+  'ti-divider-dividing-line': '1px solid var(--ti-common-color-border, #adb0b8)'
+}
diff --git a/packages/theme/src/divider/smb-theme.js b/packages/theme/src/divider/smb-theme.js
deleted file mode 100644
index e0ea2a06c..000000000
--- a/packages/theme/src/divider/smb-theme.js
+++ /dev/null
@@ -1,7 +0,0 @@
-export const tinyDividerSmbTheme = {
-  'ti-divider-dividing-line': 'var(--ti-common-color-bg-dark-disabled)',
-  'ti-divider-horizontal-opacity': 0.5,
-  'ti-divider-vertical-opacity': 0.5,
-  'ti-divider-text-color': 'var(--ti-common-color-text-primary)',
-  'ti-divider-text-bg-color': 'var(--ti-common-color-line-dividing)'
-}
diff --git a/packages/theme/src/divider/vars.less b/packages/theme/src/divider/vars.less
index e8fdbe398..86919b903 100644
--- a/packages/theme/src/divider/vars.less
+++ b/packages/theme/src/divider/vars.less
@@ -1,12 +1,12 @@
 .component-css-vars-divider() {
   // 不开放(hide)
-  --ti-divider-dividing-line: 1px solid var(--ti-common-color-border, #adb0b8);
+  --ti-divider-dividing-line: var(--ti-common-color-bg-dark-disabled);
   // 文案背景色
-  --ti-divider-text-bg-color: var(--ti-base-color-bg-1, #ffffff);
+  --ti-divider-text-bg-color: var(--ti-common-color-line-dividing);
   // 文案文本色
-  --ti-divider-text-color: var(--ti-common-color-text-primary, #252b3a);
+  --ti-divider-text-color: var(--ti-common-color-text-primary);
   //分割线横向透明度
-  --ti-divider-horizontal-opacity: 0.8;
+  --ti-divider-horizontal-opacity: 0.5;
   //分割线纵向透明度
-  --ti-divider-vertical-opacity: 0.8;
+  --ti-divider-vertical-opacity: 0.5;
 }
diff --git a/packages/theme/src/drawer/old-theme.js b/packages/theme/src/drawer/old-theme.js
new file mode 100644
index 000000000..3d31cf380
--- /dev/null
+++ b/packages/theme/src/drawer/old-theme.js
@@ -0,0 +1,21 @@
+export const tinyDrawerOldTheme = {
+  'ti-drawer-padding-bottom': 'var(--ti-common-space-6x)',
+  'ti-drawer-padding-top': 'var(--ti-common-space-6x)',
+  'ti-drawer-divider-footer-border-color': 'var(--ti-drawer-divider-border-color, #dfe1e6)',
+  'ti-drawer-footer-padding-top': 'var(--ti-common-space-5x, 20px)',
+  'ti-drawer-divider-body-border-color': 'var(--ti-common-color-transparent)',
+  'ti-drawer-help-icon-color': 'var(--ti-common-color-info, #252b3a)',
+  'ti-drawer-btn-position-right': 'var(--ti-common-space-5x, 20px)',
+  'ti-drawer-btn-position-top': 'var(--ti-common-space-5x, 20px)',
+  'ti-drawer-close-icon-color': 'var(--ti-common-color-icon-normal, #575d6c)',
+  'ti-drawer-close-icon-size': 'var(--ti-common-font-size-1, 14px)',
+  'ti-drawer-btn-height': 'var(--ti-drawer-btn-width)',
+  'ti-drawer-btn-width': 'var(--ti-common-size-8x, 32px)',
+  'ti-drawer-head-title-text-color': 'var(--ti-common-text-primary, #252b3a)',
+  'ti-drawer-head-title-font-size': 'var(--ti-common-font-size-2, 16px)',
+  'ti-drawer-header-padding-bottom': 'var(--ti-common-space-5x, 20px)',
+  'ti-drawer-divider-border-color': 'var(--ti-common-color-line-dividing, #dfe1e6)',
+  'ti-drawer-shadow': 'var(--ti-common-shadow-4-down, 0 8px 40px 0 rgba(0, 0, 0, 0.2))',
+  'ti-drawer-mask-bg-color': 'rgba(0, 0, 0, 0.3)',
+  'ti-drawer-padding-right': 'var(--ti-common-space-10x, 40px)'
+}
diff --git a/packages/theme/src/drawer/smb-theme.js b/packages/theme/src/drawer/smb-theme.js
deleted file mode 100644
index 748e80310..000000000
--- a/packages/theme/src/drawer/smb-theme.js
+++ /dev/null
@@ -1,21 +0,0 @@
-export const tinyDrawerSmbTheme = {
-  'ti-drawer-mask-bg-color': 'rgba(0, 0, 0, 16%)',
-  'ti-drawer-shadow': '0 8px 24px rgba(0, 0, 0, 30%)',
-  'ti-drawer-head-title-font-size': 'var(--ti-common-font-size-4)',
-  'ti-drawer-padding-right': 'var(--ti-common-space-8x)',
-  'ti-drawer-footer-padding-top': 'var(--ti-common-space-6x)',
-  'ti-drawer-divider-border-color': 'transparent',
-  'ti-drawer-divider-body-border-color': 'var(--ti-common-color-line-dividing)',
-  'ti-drawer-divider-footer-border-color': 'var(--ti-common-color-transparent)',
-  'ti-drawer-close-icon-size': 'var(--ti-common-font-size-5)',
-  'ti-drawer-help-icon-color': 'var(--ti-common-color-icon)',
-  'ti-drawer-close-icon-color': 'var(--ti-common-color-icon-normal)',
-  'ti-drawer-head-title-text-color': 'var(--ti-common-color-text-gray)',
-  'ti-drawer-header-padding-bottom': 'var(--ti-common-space-6x)',
-  'ti-drawer-padding-top': '0px',
-  'ti-drawer-padding-bottom': '0px',
-  'ti-drawer-btn-position-top': 'var(--ti-common-space-5x)',
-  'ti-drawer-btn-position-right': 'var(--ti-common-space-5x)',
-  'ti-drawer-btn-width': 'var(--ti-common-size-width-mini)',
-  'ti-drawer-btn-height': 'var(--ti-common-size-width-mini)'
-}
diff --git a/packages/theme/src/drawer/vars.less b/packages/theme/src/drawer/vars.less
index 7f43a23e3..75a40f686 100644
--- a/packages/theme/src/drawer/vars.less
+++ b/packages/theme/src/drawer/vars.less
@@ -20,13 +20,13 @@
   // 左内边距
   --ti-drawer-padding-left: var(--ti-common-space-8x, 32px);
   // 右内边距
-  --ti-drawer-padding-right: var(--ti-common-space-10x, 40px);
+  --ti-drawer-padding-right: var(--ti-common-space-8x);
   // 遮罩层背景色
-  --ti-drawer-mask-bg-color: rgba(0, 0, 0, 0.3);
+  --ti-drawer-mask-bg-color: rgba(0, 0, 0, 16%);
   // 阴影
-  --ti-drawer-shadow: var(--ti-common-shadow-4-down, 0 8px 40px 0 rgba(0, 0, 0, 0.2));
+  --ti-drawer-shadow: 0 8px 24px rgba(0, 0, 0, 30%);
   // 头部与底部边框颜色
-  --ti-drawer-divider-border-color: var(--ti-common-color-line-dividing, #dfe1e6);
+  --ti-drawer-divider-border-color: transparent;
   // 边框圆角
   --ti-drawer-radius: var(--ti-common-space-0, 0);
   // 遮罩层背景色
@@ -35,41 +35,41 @@
   // 头部上内边距
   --ti-drawer-header-padding-top: var(--ti-common-space-8x, 32px);
   // 头部下内边距
-  --ti-drawer-header-padding-bottom: var(--ti-common-space-5x, 20px);
+  --ti-drawer-header-padding-bottom: var(--ti-common-space-6x);
   // 头部左内边距
   --ti-drawer-header-padding-left: var(--ti-common-space-0, 0);
   // 头部右内边距
   --ti-drawer-body-padding-right: var(--ti-common-space-0, 0);
   // 头部字号
-  --ti-drawer-head-title-font-size: var(--ti-common-font-size-2, 16px);
+  --ti-drawer-head-title-font-size: var(--ti-common-font-size-4);
   // 头部文本色(hide)
   --ti-drawer-head-text-color: var(--ti-common-color-text-primary, #252b3a);
   // 头部标题字重
   --ti-drawer-head-title-font-weight: var(--ti-common-font-weight-7, bold);
   // 头部标题字体色
-  --ti-drawer-head-title-text-color: var(--ti-common-text-primary, #252b3a);
+  --ti-drawer-head-title-text-color: var(--ti-common-color-text-gray);
   // 关闭按钮宽度
-  --ti-drawer-btn-width: var(--ti-common-size-8x, 32px);
+  --ti-drawer-btn-width: var(--ti-common-size-width-mini);
   // 关闭按钮高度
-  --ti-drawer-btn-height: var(--ti-drawer-btn-width);
+  --ti-drawer-btn-height: var(--ti-common-size-width-mini);
   // 关闭按钮图标尺寸
-  --ti-drawer-close-icon-size: var(--ti-common-font-size-1, 14px);
+  --ti-drawer-close-icon-size: var(--ti-common-font-size-5);
   // 关闭按钮圆角
   --ti-drawer-btn-border-radius: var(--ti-common-border-radius-1, 4px);
   // 关闭按钮图标色
-  --ti-drawer-close-icon-color: var(--ti-common-color-icon-normal, #575d6c);
+  --ti-drawer-close-icon-color: var(--ti-common-color-icon-normal);
   // 关闭按钮悬浮图标色
   --ti-drawer-close-icon-color-hover: var(--ti-common-color-icon-hover, #5e7ce0);
   // 关闭按钮与上边框的距离(hide)
-  --ti-drawer-btn-position-top: var(--ti-common-space-5x, 20px);
+  --ti-drawer-btn-position-top: var(--ti-common-space-5x);
   // 关闭按钮与右边框的距离(hide)
-  --ti-drawer-btn-position-right: var(--ti-common-space-5x, 20px);
+  --ti-drawer-btn-position-right: var(--ti-common-space-5x);
   // 标题与帮助图标间距
   --ti-drawer-help-icon-margin-left: var(--ti-common-space-2x, 8px);
   // 帮助图标宽高
   --ti-drawer-help-icon-width-height: var(--ti-common-space-4x, 16px);
   // 帮助图标色
-  --ti-drawer-help-icon-color: var(--ti-common-color-info, #252b3a);
+  --ti-drawer-help-icon-color: var(--ti-common-color-icon);
 
   // 内容上内边距
   --ti-drawer-body-padding-top: var(--ti-common-space-0, 0);
@@ -80,11 +80,11 @@
   // 内容右内边距
   --ti-drawer-header-padding-right: var(--ti-common-space-0, 0);
   // 内容底部边框色(hide)
-  --ti-drawer-divider-body-border-color: var(--ti-common-color-transparent);
+  --ti-drawer-divider-body-border-color: var(--ti-common-color-line-dividing);
   // 底部按钮对齐方式
   --ti-drawer-footer-justify-content: flex-end;
   // 底部上内边距
-  --ti-drawer-footer-padding-top: var(--ti-common-space-5x, 20px);
+  --ti-drawer-footer-padding-top: var(--ti-common-space-6x);
   // 底部下内边距
   --ti-drawer-footer-padding-bottom: var(--ti-common-space-8x, 32px);
   // 底部左内边距
@@ -98,9 +98,9 @@
   // 底部按钮间距
   --ti-drawer-divider-footer-button-margin-left: var(--ti-common-space-2x, 8px);
   // 底部边框色(hide)
-  --ti-drawer-divider-footer-border-color: var(--ti-drawer-divider-border-color, #dfe1e6);
+  --ti-drawer-divider-footer-border-color: var(--ti-common-color-transparent);
   // 内容区域上边距
-  --ti-drawer-padding-top: var(--ti-common-space-6x);
+  --ti-drawer-padding-top: 0px;
   // 内容区域下边距
-  --ti-drawer-padding-bottom: var(--ti-common-space-6x);
+  --ti-drawer-padding-bottom: 0px;
 }
diff --git a/packages/theme/src/drop-times/old-theme.js b/packages/theme/src/drop-times/old-theme.js
new file mode 100644
index 000000000..d7b1567fc
--- /dev/null
+++ b/packages/theme/src/drop-times/old-theme.js
@@ -0,0 +1,7 @@
+export const tinyDropTimesOldTheme = {
+  'ti-drop-times-item-hover-bg-color': 'var(--ti-common-color-hover-background)',
+  'ti-drop-times-item-selected-color': 'var(--ti-common-color-selected-text-color)',
+  'ti-drop-times-item-selected-font-weight': 'var(--ti-common-font-weight-4)',
+  'ti-drop-times-item-padding': '0 var(--ti-common-space-4x)',
+  'ti-drop-times-item-font-size': 'var(--ti-common-font-size-0)'
+}
diff --git a/packages/theme/src/drop-times/smb-theme.js b/packages/theme/src/drop-times/smb-theme.js
deleted file mode 100644
index 2e93540b1..000000000
--- a/packages/theme/src/drop-times/smb-theme.js
+++ /dev/null
@@ -1,19 +0,0 @@
-/**
- * Copyright (c) 2022 - present TinyVue Authors.
- * Copyright (c) 2022 - present Huawei Cloud Computing Technologies Co., Ltd.
- *
- * Use of this source code is governed by an MIT-style license.
- *
- * THE OPEN SOURCE SOFTWARE IN THIS PRODUCT IS DISTRIBUTED IN THE HOPE THAT IT WILL BE USEFUL,
- * BUT WITHOUT ANY WARRANTY, WITHOUT EVEN THE IMPLIED WARRANTY OF MERCHANTABILITY OR FITNESS FOR
- * A PARTICULAR PURPOSE. SEE THE APPLICABLE LICENSES FOR MORE DETAILS.
- *
- */
-export const tinyDropTimesSmbTheme = {
-  'ti-drop-times-item-hover-bg-color': 'var(--ti-common-color-bg-disabled)',
-  'ti-drop-times-item-selected-color': 'var(--ti-common-color-text-link)',
-  'ti-drop-times-item-padding-horizontal': '16px',
-  'ti-drop-times-item-font-size': '14px',
-  'ti-drop-times-item-padding': '0 16px',
-  'ti-drop-times-item-selected-font-weight': '500'
-}
diff --git a/packages/theme/src/drop-times/vars.less b/packages/theme/src/drop-times/vars.less
index a903f8b00..75b8e498e 100644
--- a/packages/theme/src/drop-times/vars.less
+++ b/packages/theme/src/drop-times/vars.less
@@ -12,15 +12,15 @@
 
 .component-css-vars-drop-times() {
   // 时间选择选项字号
-  --ti-drop-times-item-font-size: var(--ti-common-font-size-0);
+  --ti-drop-times-item-font-size: 14px;
   // 时间选择选项左右内边距
-  --ti-drop-times-item-padding: 0 var(--ti-common-space-4x);
+  --ti-drop-times-item-padding: 0 16px;
   // 时间选择选项字体字重
-  --ti-drop-times-item-selected-font-weight: var(--ti-common-font-weight-4);
+  --ti-drop-times-item-selected-font-weight: 500;
   // 时间选择选项字体色(选中项)
-  --ti-drop-times-item-selected-color: var(--ti-common-color-selected-text-color);
+  --ti-drop-times-item-selected-color: var(--ti-common-color-text-link);
   // 时间选择选项悬浮背景色(选中项)
   --ti-drop-times-item-select-hover-bg-color: var(--ti-common-color-selected-background);
   // 时间选择选项悬浮背景色
-  --ti-drop-times-item-hover-bg-color: var(--ti-common-color-hover-background);
+  --ti-drop-times-item-hover-bg-color: var(--ti-common-color-bg-disabled);
 }
\ No newline at end of file
diff --git a/packages/theme/src/dropdown-item/old-theme.js b/packages/theme/src/dropdown-item/old-theme.js
new file mode 100644
index 000000000..abfa3a2c8
--- /dev/null
+++ b/packages/theme/src/dropdown-item/old-theme.js
@@ -0,0 +1,26 @@
+export const tinyDropdownItemOldTheme = {
+  'ti-dropdown-item-expand-icon-size': '8px',
+  'ti-dropdown-item-before-height': '6px',
+  'ti-dropdown-item-before-bg-color': 'var(--ti-common-color-bg-white-normal, #fff)',
+  'ti-dropdown-item-divided-border-color': 'var(--ti-common-color-line-dividing, #dfe1e6)',
+  'ti-dropdown-item-content-bg-hover': 'var(--ti-common-color-bg-white-emphasize)',
+  'ti-dropdown-item-content-text-hover': 'var(--ti-common-color-text-highlight)',
+  'ti-dropdown-item-content-font-weight-hover': 'var(--ti-common-font-weight-4, normal)',
+  'ti-dropdown-item-content-margin-left': 'var(--ti-common-space-0, 0px)',
+  'ti-dropdown-item-expand-svg-margin-right': 'var(--ti-common-space-0, 0px)',
+  'ti-dropdown-item-expand-svg-margin-left':
+    'calc(\n    -1 * (var(--ti-common-space-base, 4px) + var(--ti-dropdown-item-expand-icon-size))\n  )',
+  'ti-dropdown-item-icon-color-hover': 'var(--ti-common-color-icon-hover, #5e7ce0)',
+  'ti-dropdown-item-icon-color': 'var(--ti-common-color-icon-normal, #575d6c)',
+  'ti-dropdown-item-max-width': 'var(--ti-common-size-33x, 132px)',
+  'ti-dropdown-item-padding-horizontal': 'var(--ti-common-space-5x, 20px)',
+  'ti-dropdown-item-padding-vertical': 'var(--ti-common-space-6, 6px)',
+  'ti-dropdown-item-active-text-color': 'var(--ti-common-color-text-white, #fff)',
+  'ti-dropdown-item-active-bg-color': 'var(--ti-common-color-bg-emphasize, #5e7ce0)',
+  'ti-dropdown-item-hover-text-color': 'var(--ti-common-color-text-highlight, #526ecc)',
+  'ti-dropdown-item-text-color-selected': 'var(--ti-common-color-text-white, #fff)',
+  'ti-dropdown-item-font-weight-selected': 'var(--ti-common-font-weight-4, normal)',
+  'ti-dropdown-item-bg-color-selected': 'var(--ti-common-color-selected-background, #5e7ce0)',
+  'ti-dropdown-item-hover-bg-color': 'var(--ti-common-color-bg-white-emphasize, #f2f5fc)',
+  'ti-dropdown-item-height': '30px'
+}
diff --git a/packages/theme/src/dropdown-item/smb-theme.js b/packages/theme/src/dropdown-item/smb-theme.js
deleted file mode 100644
index 238e50b22..000000000
--- a/packages/theme/src/dropdown-item/smb-theme.js
+++ /dev/null
@@ -1,25 +0,0 @@
-export const tinyDropdownItemSmbTheme = {
-  'ti-dropdown-item-expand-icon-size': 'var(--ti-common-font-size-2)',
-  'ti-dropdown-item-padding-vertical': 'var(--ti-common-space-0)',
-  'ti-dropdown-item-padding-horizontal': 'var(--ti-common-space-4x)',
-  'ti-dropdown-item-hover-text-color': 'var(--ti-common-color-text-primary)',
-  'ti-dropdown-item-expand-svg-margin-left': 'var(--ti-common-space-0)',
-  'ti-dropdown-item-expand-svg-margin-right': 'var(--ti-common-space-2x)',
-  'ti-dropdown-item-content-margin-left': 'calc(var(--ti-dropdown-item-expand-icon-size) + var(--ti-common-space-2x))',
-  'ti-dropdown-item-max-width': 'var(--ti-common-size-auto)',
-  'ti-dropdown-item-height': 'var(--ti-common-size-height-normal)',
-  'ti-dropdown-item-icon-color': 'var(--ti-common-color-icon-normal)',
-  'ti-dropdown-item-icon-color-hover': 'var(--ti-common-color-icon-hover)',
-  'ti-dropdown-item-content-font-weight-hover': 'var(--ti-common-font-weight-4)',
-  'ti-dropdown-item-active-bg-color': 'var(--ti-common-color-bg-white-normal)',
-  'ti-dropdown-item-active-text-color': '#1476FF',
-  'ti-dropdown-item-content-text-hover': '#1476FF',
-  'ti-dropdown-item-before-bg-color': 'transparent',
-  'ti-dropdown-item-divided-border-color': 'var(--ti-common-color-line-dividing)',
-  'ti-dropdown-item-content-bg-hover': 'transparent',
-  'ti-dropdown-item-before-height': '0',
-  'ti-dropdown-item-bg-color-selected': 'var(--ti-common-color-bg-white-normal)',
-  'ti-dropdown-item-text-color-selected': '#1476FF',
-  'ti-dropdown-item-font-weight-selected': 'var(--ti-common-font-weight-6)',
-  'ti-dropdown-item-hover-bg-color': 'var(--ti-common-color-bg-normal)'
-}
diff --git a/packages/theme/src/dropdown-item/vars.less b/packages/theme/src/dropdown-item/vars.less
index ee4c47378..dadcf9392 100644
--- a/packages/theme/src/dropdown-item/vars.less
+++ b/packages/theme/src/dropdown-item/vars.less
@@ -12,21 +12,21 @@
 
 .component-css-vars-dropdown-item() {
   // 下拉菜单项高度
-  --ti-dropdown-item-height: 30px;
+  --ti-dropdown-item-height: var(--ti-common-size-height-normal);
   // 下拉菜单项悬浮背景色
-  --ti-dropdown-item-hover-bg-color: var(--ti-common-color-bg-white-emphasize, #f2f5fc);
+  --ti-dropdown-item-hover-bg-color: var(--ti-common-color-bg-normal);
   // 下拉菜单项选中背景色
-  --ti-dropdown-item-bg-color-selected: var(--ti-common-color-selected-background, #5e7ce0);
+  --ti-dropdown-item-bg-color-selected: var(--ti-common-color-bg-white-normal);
   // 下拉菜单项选中文本字重
-  --ti-dropdown-item-font-weight-selected: var(--ti-common-font-weight-4, normal);
+  --ti-dropdown-item-font-weight-selected: var(--ti-common-font-weight-6);
   // 下拉菜单项选中文本色
-  --ti-dropdown-item-text-color-selected: var(--ti-common-color-text-white, #fff);
+  --ti-dropdown-item-text-color-selected: #1476FF;
   // 下拉菜单非禁用项悬浮文本色
-  --ti-dropdown-item-hover-text-color: var(--ti-common-color-text-highlight, #526ecc);
+  --ti-dropdown-item-hover-text-color: var(--ti-common-color-text-primary);
   // 下拉菜单项点击瞬间背景色
-  --ti-dropdown-item-active-bg-color: var(--ti-common-color-bg-emphasize, #5e7ce0);
+  --ti-dropdown-item-active-bg-color: var(--ti-common-color-bg-white-normal);
   // 下拉菜单项点击瞬间文本色
-  --ti-dropdown-item-active-text-color: var(--ti-common-color-text-white, #fff);
+  --ti-dropdown-item-active-text-color: #1476FF;
   // 下拉菜单项禁用文本色
   --ti-dropdown-item-disabled-text-color: var(--ti-common-color-text-disabled, #adb0b8);
   // 下拉菜单项文本色
@@ -36,9 +36,9 @@
   // 默认尺寸下拉菜单项的行高
   --ti-dropdown-item-line-height: var(--ti-common-line-height-number, 1.5);
   // 下拉菜单项垂直内边距
-  --ti-dropdown-item-padding-vertical: var(--ti-common-space-6, 6px);
+  --ti-dropdown-item-padding-vertical: var(--ti-common-space-0);
   // 下拉菜单项水平内边距
-  --ti-dropdown-item-padding-horizontal: var(--ti-common-space-5x, 20px);
+  --ti-dropdown-item-padding-horizontal: var(--ti-common-space-4x);
   // 拉菜单项底部外边距
   --ti-dropdown-item-margin-bottom: var(--ti-common-space-0, 0px);
   // 拉菜单项左边外边距
@@ -50,37 +50,35 @@
   // 下拉菜单项边框圆角
   --ti-dropdown-item-border-radius: var(--ti-common-border-radius-0, 0px);
   // 下拉菜单项最大宽度
-  --ti-dropdown-item-max-width: var(--ti-common-size-33x, 132px);
+  --ti-dropdown-item-max-width: var(--ti-common-size-auto);
   // 下拉项图标默认填充色
-  --ti-dropdown-item-icon-color: var(--ti-common-color-icon-normal, #575d6c);
+  --ti-dropdown-item-icon-color: var(--ti-common-color-icon-normal);
   //下拉项图标悬浮填充色
-  --ti-dropdown-item-icon-color-hover: var(--ti-common-color-icon-hover, #5e7ce0);
+  --ti-dropdown-item-icon-color-hover: var(--ti-common-color-icon-hover);
   // 下拉项图标激活时填充色
   --ti-dropdown-item-icon-color-active: var(--ti-common-color-icon-white, #fff);
   // 下拉项图标禁用填充色
   --ti-dropdown-item-icon-color-disabled: var(--ti-common-color-icon-disabled, #adb0b8);
   // 下拉项展开图标的左侧外边距
-  --ti-dropdown-item-expand-svg-margin-left: calc(
-    -1 * (var(--ti-common-space-base, 4px) + var(--ti-dropdown-item-expand-icon-size))
-  );
+  --ti-dropdown-item-expand-svg-margin-left: var(--ti-common-space-0);
   // 下拉项展开图标的右侧外边距
-  --ti-dropdown-item-expand-svg-margin-right: var(--ti-common-space-0, 0px);
+  --ti-dropdown-item-expand-svg-margin-right: var(--ti-common-space-2x);
   // 下拉项内容的左侧外边距
-  --ti-dropdown-item-content-margin-left: var(--ti-common-space-0, 0px);
+  --ti-dropdown-item-content-margin-left: calc(var(--ti-dropdown-item-expand-icon-size) + var(--ti-common-space-2x));
   // 下拉项内容悬浮时的字重
-  --ti-dropdown-item-content-font-weight-hover: var(--ti-common-font-weight-4, normal);
+  --ti-dropdown-item-content-font-weight-hover: var(--ti-common-font-weight-4);
   // 有二级菜单下拉项内容悬浮时的文本色
-  --ti-dropdown-item-content-text-hover: var(--ti-common-color-text-highlight);
+  --ti-dropdown-item-content-text-hover: #1476FF;
   // 有二级菜单下拉项内容悬浮时的背景色
-  --ti-dropdown-item-content-bg-hover: var(--ti-common-color-bg-white-emphasize);
+  --ti-dropdown-item-content-bg-hover: transparent;
   // 下拉项分割线尺寸
   --ti-dropdown-item-divided-border-weight: var(--ti-common-border-weight-normal, 1px);
   // 下拉项分割线样式
   --ti-dropdown-item-divided-border-style: var(--ti-common-border-style-solid, solid);
   // 下拉项分割线颜色
-  --ti-dropdown-item-divided-border-color: var(--ti-common-color-line-dividing, #dfe1e6);
+  --ti-dropdown-item-divided-border-color: var(--ti-common-color-line-dividing);
   // 下拉项前置伪元素的填充色
-  --ti-dropdown-item-before-bg-color: var(--ti-common-color-bg-white-normal, #fff);
+  --ti-dropdown-item-before-bg-color: transparent;
   // 下拉项前置伪元素的垂直外边距
   --ti-dropdown-item-before-margin-vertical: var(--ti-common-space-0, 0px);
   // 下拉项前置伪元素的水平外边距
@@ -92,7 +90,7 @@
   //  迷你尺寸下拉项前置伪元素的水平外边距
   --ti-dropdown-item-mini-before-margin-horizontal: var(--ti-common-space-0, 0px);
   // 下拉项前置伪元素的高度
-  --ti-dropdown-item-before-height: 6px; // TINY-TODO 等设计图出来再优化为变量
+  --ti-dropdown-item-before-height: 0; // TINY-TODO 等设计图出来再优化为变量
   // 中尺寸下拉项前置伪元素的高度
   --ti-dropdown-item-medium-before-height: 6px;
   // 小尺寸下拉项前置伪元素的高度
@@ -130,5 +128,5 @@
   // 迷你尺寸下拉菜单菜单项分割线的顶部外边距
   --ti-dropdown-item-mini-divided-margin-top: calc(var(--ti-common-space-1, 1px) * 3);
   // 展开图标尺寸
-  --ti-dropdown-item-expand-icon-size: 8px;
+  --ti-dropdown-item-expand-icon-size: var(--ti-common-font-size-2);
 }
diff --git a/packages/theme/src/dropdown-menu/old-theme.js b/packages/theme/src/dropdown-menu/old-theme.js
new file mode 100644
index 000000000..3ad75de5b
--- /dev/null
+++ b/packages/theme/src/dropdown-menu/old-theme.js
@@ -0,0 +1,4 @@
+export const tinyDropdownMenuOldTheme = {
+  'ti-dropdown-menu-padding-vertical': 'var(--ti-common-space-base, 4px)',
+  'ti-dropdown-menu-min-width': 'var(--ti-common-size-9x, 36px)'
+}
diff --git a/packages/theme/src/dropdown-menu/smb-theme.js b/packages/theme/src/dropdown-menu/smb-theme.js
deleted file mode 100644
index 41c4add0b..000000000
--- a/packages/theme/src/dropdown-menu/smb-theme.js
+++ /dev/null
@@ -1,4 +0,0 @@
-export const tinyDropdownMenuSmbTheme = {
-  'ti-dropdown-menu-padding-vertical': 'var(--ti-common-space-2x)',
-  'ti-dropdown-menu-min-width': '124px'
-}
diff --git a/packages/theme/src/dropdown-menu/vars.less b/packages/theme/src/dropdown-menu/vars.less
index fb3b601b8..38c2de582 100644
--- a/packages/theme/src/dropdown-menu/vars.less
+++ b/packages/theme/src/dropdown-menu/vars.less
@@ -22,11 +22,11 @@
   // 下拉菜单弹框的圆角
   --ti-dropdown-menu-border-radius: var(--ti-common-border-radius-normal, 2px);
   // 下拉菜单的最小宽度
-  --ti-dropdown-menu-min-width: var(--ti-common-size-9x, 36px);
+  --ti-dropdown-menu-min-width: 124px;
   // 下拉菜单弹框与触发按钮的距离
   --ti-dropdown-menu-margin-vertical: var(--ti-common-space-base, 4px);
   // 下拉菜单弹框的垂直内边距
-  --ti-dropdown-menu-padding-vertical: var(--ti-common-space-base, 4px);
+  --ti-dropdown-menu-padding-vertical: var(--ti-common-space-2x);
   // 下拉菜单弹框的水平内边距
   --ti-dropdown-menu-padding-horizontal: var(--ti-common-space-0, 0px);
   // 下拉菜单中尺寸的弹框垂直内边距
diff --git a/packages/theme/src/dropdown/old-theme.js b/packages/theme/src/dropdown/old-theme.js
new file mode 100644
index 000000000..93b9fcce5
--- /dev/null
+++ b/packages/theme/src/dropdown/old-theme.js
@@ -0,0 +1,20 @@
+export const tinyDropdownOldTheme = {
+  'ti-dropdown-suffix-icon-margin-vertical': 'calc(var(--ti-common-space-2x, 8px) - 1px)',
+  'ti-dropdown-title-button-padding-left': 'var(--ti-common-space-5x, 20px)',
+  'ti-dropdown-title-button-padding-right': 'var(--ti-common-space-5x, 20px)',
+  'ti-dropdown-caret-svg-margin-horizontal': 'var(--ti-common-space-base, 4px)',
+  'ti-dropdown-caret-line-width': 'var(--ti-common-border-weight-normal, 1px)',
+  'ti-dropdown-caret-button-padding-right': 'var(--ti-common-space-base, 4px)',
+  'ti-dropdown-trigger-svg-margin-bottom': '1px',
+  'ti-dropdown-trigger-svg-margin-top': '1px',
+  'ti-dropdown-button-icon-size': 'var(--ti-common-font-size-1, 14px)',
+  'ti-dropdown-trigger-only-svg-hover-radius': 'var(--ti-common-border-radius-normal)',
+  'ti-dropdown-trigger-only-svg-hover-bg-color': 'var(--ti-common-color-bg-white-emphasize, #f2f5fc)',
+  'ti-dropdown-trigger-only-svg-height': 'var(--ti-common-size-4x)',
+  'ti-dropdown-trigger-only-svg-width': 'var(--ti-common-size-4x)',
+  'ti-dropdown-icon-color-hover': 'var(--ti-common-color-text-link-hover, #344899)',
+  'ti-dropdown-icon-color': 'var(--ti-common-color-text-link, #526ecc)',
+  'ti-dropdown-icon-size': '10px',
+  'ti-dropdown-line-height': 'var(--ti-common-line-height-number, 1.5)',
+  'ti-dropdown-text-color-hover': 'var(--ti-common-color-text-link-hover, #344899)'
+}
diff --git a/packages/theme/src/dropdown/smb-theme.js b/packages/theme/src/dropdown/smb-theme.js
deleted file mode 100644
index 84a31c95b..000000000
--- a/packages/theme/src/dropdown/smb-theme.js
+++ /dev/null
@@ -1,20 +0,0 @@
-export const tinyDropdownSmbTheme = {
-  'ti-dropdown-icon-size': 'var(--ti-common-font-size-2)',
-  'ti-dropdown-text-color-hover': 'var(--ti-common-color-text-link)',
-  'ti-dropdown-icon-color': 'var(--ti-common-color-text-link)',
-  'ti-dropdown-icon-color-hover': 'var(--ti-common-color-text-link)',
-  'ti-dropdown-caret-svg-margin-horizontal': 'var(--ti-common-space-0)',
-  'ti-dropdown-caret-button-padding-right': 'var(--ti-common-space-6x)',
-  'ti-dropdown-caret-line-width': 'var(--ti-common-size-0)',
-  'ti-dropdown-title-button-padding-left': 'var(--ti-common-space-6x)',
-  'ti-dropdown-title-button-padding-right': 'var(--ti-common-space-0)',
-  'ti-dropdown-button-icon-size': 'var(--ti-common-font-size-2)',
-  'ti-dropdown-trigger-svg-margin-top': 'var(--ti-common-space-0)',
-  'ti-dropdown-trigger-svg-margin-bottom': 'var(--ti-common-space-0)',
-  'ti-dropdown-trigger-only-svg-width': 'var(--ti-common-size-4x)',
-  'ti-dropdown-trigger-only-svg-height': 'var(--ti-common-size-4x)',
-  'ti-dropdown-trigger-only-svg-hover-bg-color': 'rgba(0,0,0,0.05)',
-  'ti-dropdown-trigger-only-svg-hover-radius': 'var(--ti-common-border-radius-2)',
-  'ti-dropdown-line-height': 'var(--ti-common-line-height-1)',
-  'ti-dropdown-suffix-icon-margin-vertical': 'var(--ti-common-space-2x)'
-}
diff --git a/packages/theme/src/dropdown/vars.less b/packages/theme/src/dropdown/vars.less
index 88fc7921c..de0ef7b7c 100644
--- a/packages/theme/src/dropdown/vars.less
+++ b/packages/theme/src/dropdown/vars.less
@@ -4,27 +4,27 @@
   // 下拉菜单触发元素的文字颜色
   --ti-dropdown-text-color: var(--ti-common-color-text-link, #526ecc);
   // 下拉菜单触发元素悬浮时的文字颜色
-  --ti-dropdown-text-color-hover: var(--ti-common-color-text-link-hover, #344899);
+  --ti-dropdown-text-color-hover: var(--ti-common-color-text-link);
   // 下拉菜单触发元素的行高
-  --ti-dropdown-line-height: var(--ti-common-line-height-number, 1.5);
+  --ti-dropdown-line-height: var(--ti-common-line-height-1);
   // 下拉菜单触发元素的图标尺寸
-  --ti-dropdown-icon-size: 10px;
+  --ti-dropdown-icon-size: var(--ti-common-font-size-2);
   // 下拉菜单触发元素的图标颜色
-  --ti-dropdown-icon-color: var(--ti-common-color-text-link, #526ecc);
+  --ti-dropdown-icon-color: var(--ti-common-color-text-link);
   // 下拉菜单触发元素悬浮时的图标颜色
-  --ti-dropdown-icon-color-hover: var(--ti-common-color-text-link-hover, #344899);
+  --ti-dropdown-icon-color-hover: var(--ti-common-color-text-link);
   // 下拉菜单触发元素只有图标时的图标宽度
   --ti-dropdown-trigger-only-svg-width: var(--ti-common-size-4x);
   // 下拉菜单触发元素只有图标时的图标高度
   --ti-dropdown-trigger-only-svg-height: var(--ti-common-size-4x);
   // 下拉菜单触发元素只有图标时的图标悬浮背景色
-  --ti-dropdown-trigger-only-svg-hover-bg-color: var(--ti-common-color-bg-white-emphasize, #f2f5fc);
+  --ti-dropdown-trigger-only-svg-hover-bg-color: rgba(0,0,0,0.05);
   // 下拉菜单触发元素只有图标时的图标圆角
-  --ti-dropdown-trigger-only-svg-hover-radius: var(--ti-common-border-radius-normal);
+  --ti-dropdown-trigger-only-svg-hover-radius: var(--ti-common-border-radius-2);
   // 下拉菜单触发元素按钮类型时图标颜色
   --ti-dropdown-button-icon-color: var(--ti-common-color-icon-white, #fff);
   // 下拉菜单触发元素按钮类型时图标尺寸
-  --ti-dropdown-button-icon-size: var(--ti-common-font-size-1, 14px);
+  --ti-dropdown-button-icon-size: var(--ti-common-font-size-2);
   // 下拉菜单触发元素的文本禁用色
   --ti-dropdown-text-color-disabled: var(--ti-common-color-text-disabled, #adb0b8);
   // 下拉菜单触发源图标的右侧外边距
@@ -32,13 +32,13 @@
   // 下拉菜单触发源图标的左侧外边距
   --ti-dropdown-trigger-svg-margin-left: var(--ti-common-space-base, 4px);
   // 下拉菜单触发源图标的上侧外边距
-  --ti-dropdown-trigger-svg-margin-top: 1px;
+  --ti-dropdown-trigger-svg-margin-top: var(--ti-common-space-0);
   // 下拉菜单触发源图标的下侧外边距
-  --ti-dropdown-trigger-svg-margin-bottom: 1px;
+  --ti-dropdown-trigger-svg-margin-bottom: var(--ti-common-space-0);
   // 下拉菜触发元素为按钮组时，下拉按钮的左侧内边距
   --ti-dropdown-caret-button-padding-left: var(--ti-common-space-base, 4px);
   // 下拉菜单触发元素为按钮组时，下拉按钮的右侧侧内边距
-  --ti-dropdown-caret-button-padding-right: var(--ti-common-space-base, 4px);
+  --ti-dropdown-caret-button-padding-right: var(--ti-common-space-6x);
   // 下拉菜单触发元素为按钮组时，下拉按钮的最小宽度
   --ti-dropdown-caret-button-min-width: var(--ti-common-size-6x, 24px);
   // 下拉菜单触发元素为按钮组时，按钮之间分割线的颜色
@@ -52,7 +52,7 @@
   // 下拉菜单触发元素为按钮组且悬浮时，按钮之间分割线的底部外边距
   --ti-dropdown-caret-line-margin-bottom-hover: var(--ti-common-space-0, 0px);
   // 下拉菜单触发元素为按钮组时，按钮之间分割线的宽度
-  --ti-dropdown-caret-line-width: var(--ti-common-border-weight-normal, 1px);
+  --ti-dropdown-caret-line-width: var(--ti-common-size-0);
   // 下拉菜单触发元素为按钮组且默认类型时，按钮之间分割线的颜色
   --ti-dropdown-caret-line-bg-color-default: var(--ti-common-color-line-normal, #adb0b8);
   // 下拉菜单触发元素为按钮组且默认类型时，按钮之间分割线的悬浮色
@@ -60,13 +60,13 @@
   // 下拉菜单触发元素为按钮组时，图标的垂直外边距
   --ti-dropdown-caret-svg-margin-vertical: var(--ti-common-space-0, 0px);
   // 下拉菜单触发元素为按钮组时，图标的水平外边距
-  --ti-dropdown-caret-svg-margin-horizontal: var(--ti-common-space-base, 4px);
+  --ti-dropdown-caret-svg-margin-horizontal: var(--ti-common-space-0);
   // 下拉菜单触发元素为按钮组时，图标的左侧内边距
   --ti-dropdown-caret-svg-padding-left: var(--ti-common-space-0, 0px);
   // 下拉菜单文字按钮的左侧内边距
-  --ti-dropdown-title-button-padding-right: var(--ti-common-space-5x, 20px);
+  --ti-dropdown-title-button-padding-right: var(--ti-common-space-0);
   // 下拉菜单文字按钮的右侧内边距
-  --ti-dropdown-title-button-padding-left: var(--ti-common-space-5x, 20px);
+  --ti-dropdown-title-button-padding-left: var(--ti-common-space-6x);
   // 下拉图标垂直内边距
-  --ti-dropdown-suffix-icon-margin-vertical: calc(var(--ti-common-space-2x, 8px) - 1px);
+  --ti-dropdown-suffix-icon-margin-vertical: var(--ti-common-space-2x);
 }
diff --git a/packages/theme/src/fall-menu/old-theme.js b/packages/theme/src/fall-menu/old-theme.js
new file mode 100644
index 000000000..aa771efc8
--- /dev/null
+++ b/packages/theme/src/fall-menu/old-theme.js
@@ -0,0 +1,10 @@
+export const tinyFallMenuOldTheme = {
+  'ti-fall-menu-li-color-hover': 'var(--ti-common-color-line-dividing)',
+  'ti-fall-menu-box-hover-text-color': 'var(--ti-common-color-primary-active, #7693f5)',
+  'ti-fall-menu-box-text-color': 'var(--ti-base-color-brand-6, #5e7ce0)',
+  'ti-fall-menu-box-title-text-color': 'var(--ti-common-color-placeholder, #adb0b8)',
+  'ti-fall-menu-slot-bg-color': 'var(--ti-common-color-light, #fff)',
+  'ti-fall-menu-slot-text-color': 'var(--ti-common-color-light, #fff)',
+  'ti-fall-menu-bg-color-hover': 'var(--ti-base-color-brand-5, #7693f5)',
+  'ti-fall-menu-bg-color-normal': 'var(--ti-base-color-brand-6, #5e7ce0)'
+}
diff --git a/packages/theme/src/fall-menu/smb-theme.js b/packages/theme/src/fall-menu/smb-theme.js
deleted file mode 100644
index 6ef8901d6..000000000
--- a/packages/theme/src/fall-menu/smb-theme.js
+++ /dev/null
@@ -1,10 +0,0 @@
-export const tinyFallMenuSmbTheme = {
-  'ti-fall-menu-bg-color-normal': 'var(--ti-common-color-bg-navigation)',
-  'ti-fall-menu-bg-color-hover': 'var(--ti-common-color-hover-background)',
-  'ti-fall-menu-slot-text-color': 'var(--ti-common-color-text-gray)',
-  'ti-fall-menu-slot-bg-color': 'var(--ti-common-color-bg-navigation)',
-  'ti-fall-menu-box-text-color': 'var(--ti-common-color-text-secondary)',
-  'ti-fall-menu-box-title-text-color': 'var(--ti-common-color-text-gray)',
-  'ti-fall-menu-box-hover-text-color': 'var(--ti-common-color-text-gray)',
-  'ti-fall-menu-li-color-hover': 'var(--ti-common-color-line-active)'
-}
diff --git a/packages/theme/src/fall-menu/vars.less b/packages/theme/src/fall-menu/vars.less
index f6753ec72..2dfb54474 100644
--- a/packages/theme/src/fall-menu/vars.less
+++ b/packages/theme/src/fall-menu/vars.less
@@ -14,21 +14,21 @@
   // 菜单列表高度
   --ti-fall-menu-menu-height: var(--ti-common-size-height-large, 48px);
   // 菜单背景色
-  --ti-fall-menu-bg-color-normal: var(--ti-base-color-brand-6, #5e7ce0);
+  --ti-fall-menu-bg-color-normal: var(--ti-common-color-bg-navigation);
   // 菜单项悬浮背景色
-  --ti-fall-menu-bg-color-hover: var(--ti-base-color-brand-5, #7693f5);
+  --ti-fall-menu-bg-color-hover: var(--ti-common-color-hover-background);
   // 左右图标大小
   --ti-fall-menu-icon-font-size: var(--ti-common-font-size-base, 12px);
   // 菜单项文本色
-  --ti-fall-menu-slot-text-color: var(--ti-common-color-light, #fff);
+  --ti-fall-menu-slot-text-color: var(--ti-common-color-text-gray);
   // 悬浮下拉框背景色
-  --ti-fall-menu-slot-bg-color: var(--ti-common-color-light, #fff);
+  --ti-fall-menu-slot-bg-color: var(--ti-common-color-bg-navigation);
   // 菜单项字号
   --ti-fall-menu-title-font-size: var(--ti-common-font-size-2, 16px);
   // 下拉框标题文本色
-  --ti-fall-menu-box-title-text-color: var(--ti-common-color-placeholder, #adb0b8);
+  --ti-fall-menu-box-title-text-color: var(--ti-common-color-text-gray);
   // 下拉框文本色
-  --ti-fall-menu-box-text-color: var(--ti-base-color-brand-6, #5e7ce0);
+  --ti-fall-menu-box-text-color: var(--ti-common-color-text-secondary);
   // 下拉框标题字号
   --ti-fall-menu-box-font-size: var(--ti-common-font-size-1, 14px);
   // 下拉框标题高度
@@ -36,7 +36,7 @@
   // 下拉框内容高度
   --ti-fall-menu-box-content-height: 26px;
   // 下拉框悬浮文本色
-  --ti-fall-menu-box-hover-text-color: var(--ti-common-color-primary-active, #7693f5);
+  --ti-fall-menu-box-hover-text-color: var(--ti-common-color-text-gray);
   // 标签下边框颜色值
-  --ti-fall-menu-li-color-hover: var(--ti-common-color-line-dividing);
+  --ti-fall-menu-li-color-hover: var(--ti-common-color-line-active);
 }
diff --git a/packages/theme/src/filter-box/old-theme.js b/packages/theme/src/filter-box/old-theme.js
new file mode 100644
index 000000000..b7165ca34
--- /dev/null
+++ b/packages/theme/src/filter-box/old-theme.js
@@ -0,0 +1,14 @@
+export const tinyFilterBoxOldTheme = {
+  'ti-filter-box-expand-btn-icon-size': 'var(--ti-common-font-size-base, 12px)',
+  'ti-filter-box-expand-btn-icon-color': '#78828d',
+  'ti-filter-box-help-btn-position-top': '-1px',
+  'ti-filter-box-help-btn-margin-right': 'var(--ti-common-space-base, 4px)',
+  'ti-filter-box-help-btn-icon-color': '#8d959e',
+  'ti-filter-box-btn-title-line-height': 'inherit',
+  'ti-filter-box-btn-hover-text-color': '#1890ff',
+  'ti-filter-box-btn-text-color': '#78828d',
+  'ti-filter-box-btn-padding-horizontal': 'var(--ti-common-space-6, 6px)',
+  'ti-filter-box-btn-hover-bg-color': 'rgba(92, 172, 255, 0.1)',
+  'ti-filter-box-btn-bg-color': '#f5f6f8',
+  'ti-filter-box-btn-height': 'var(--ti-common-size-7x, 28px)'
+}
diff --git a/packages/theme/src/filter-box/smb-theme.js b/packages/theme/src/filter-box/smb-theme.js
deleted file mode 100644
index 3c8b19289..000000000
--- a/packages/theme/src/filter-box/smb-theme.js
+++ /dev/null
@@ -1,14 +0,0 @@
-export const tinyFilterBoxSmbTheme = {
-  'ti-filter-box-btn-height': 'var(--ti-common-size-height-small)',
-  'ti-filter-box-btn-bg-color': 'var(--ti-common-color-bg-6)',
-  'ti-filter-box-btn-hover-bg-color': 'var(--ti-common-color-bg-6)',
-  'ti-filter-box-btn-padding-horizontal': 'var(--ti-common-space-2x)',
-  'ti-filter-box-btn-text-color': 'var(--ti-common-color-text-primary)',
-  'ti-filter-box-btn-hover-text-color': 'var(--ti-common-color-text-primary)',
-  'ti-filter-box-help-btn-icon-color': 'var(--ti-common-color-text-primary)',
-  'ti-filter-box-expand-btn-icon-color': 'var(--ti-common-color-info-active)',
-  'ti-filter-box-btn-title-line-height': 'var(--ti-common-line-height-number)',
-  'ti-filter-box-help-btn-position-top': 'var(--ti-common-space-base)',
-  'ti-filter-box-expand-btn-icon-size': 'var(--ti-common-font-size-2)',
-  'ti-filter-box-help-btn-margin-right': 'var(--ti-common-space-base)'
-}
diff --git a/packages/theme/src/filter-box/vars.less b/packages/theme/src/filter-box/vars.less
index 56108e20e..5bcca825f 100644
--- a/packages/theme/src/filter-box/vars.less
+++ b/packages/theme/src/filter-box/vars.less
@@ -11,29 +11,29 @@
 */
 .component-css-vars-filter-box() {
   // 按钮高度
-  --ti-filter-box-btn-height: var(--ti-common-size-7x, 28px);
+  --ti-filter-box-btn-height: var(--ti-common-size-height-small);
   // 按钮背景色
-  --ti-filter-box-btn-bg-color: #f5f6f8;
+  --ti-filter-box-btn-bg-color: var(--ti-common-color-bg-6);
   // 按钮展开图标尺寸
-  --ti-filter-box-btn-hover-bg-color: rgba(92, 172, 255, 0.1);
+  --ti-filter-box-btn-hover-bg-color: var(--ti-common-color-bg-6);
   // 按钮水平内边距
-  --ti-filter-box-btn-padding-horizontal: var(--ti-common-space-6, 6px);
+  --ti-filter-box-btn-padding-horizontal: var(--ti-common-space-2x);
   // 按钮文本色
-  --ti-filter-box-btn-text-color: #78828d;
+  --ti-filter-box-btn-text-color: var(--ti-common-color-text-primary);
   // 按钮悬浮文本色和图标色
-  --ti-filter-box-btn-hover-text-color: #1890ff;
+  --ti-filter-box-btn-hover-text-color: var(--ti-common-color-text-primary);
   // 按钮文本字号
   --ti-filter-box-btn-font-size: var(--ti-common-font-size-base, 12px);
   // 按钮文本行高
-  --ti-filter-box-btn-title-line-height: inherit;
+  --ti-filter-box-btn-title-line-height: var(--ti-common-line-height-number);
   // 按钮问号图标色
-  --ti-filter-box-help-btn-icon-color: #8d959e;
+  --ti-filter-box-help-btn-icon-color: var(--ti-common-color-text-primary);
   // 按钮帮助图标右边距
-  --ti-filter-box-help-btn-margin-right: var(--ti-common-space-base, 4px);
+  --ti-filter-box-help-btn-margin-right: var(--ti-common-space-base);
   // 按钮问号top定位(hide)
-  --ti-filter-box-help-btn-position-top: -1px;
+  --ti-filter-box-help-btn-position-top: var(--ti-common-space-base);
   // 按钮展开图标色
-  --ti-filter-box-expand-btn-icon-color: #78828d;
+  --ti-filter-box-expand-btn-icon-color: var(--ti-common-color-info-active);
   // 按钮展开图标尺寸
-  --ti-filter-box-expand-btn-icon-size: var(--ti-common-font-size-base, 12px);
+  --ti-filter-box-expand-btn-icon-size: var(--ti-common-font-size-2);
 }
diff --git a/packages/theme/src/filter-panel/old-theme.js b/packages/theme/src/filter-panel/old-theme.js
new file mode 100644
index 000000000..532b84b1c
--- /dev/null
+++ b/packages/theme/src/filter-panel/old-theme.js
@@ -0,0 +1,7 @@
+export const tinyFilterPanelOldTheme = {
+  'ti-filter-panel-top-box-shadow': '4px 0 12px 0 rgba(0, 0, 0, 0.16)',
+  'ti-filter-panel-bottom-box-shadow': '0 4px 12px 0 rgba(0, 0, 0, 0.16)',
+  'ti-filter-panel-padding-horizontal': 'var(--ti-common-space-4x, 16px)',
+  'ti-filter-panel-padding-vertical': 'var(--ti-common-space-4x, 16px)',
+  'ti-filter-panel-margin-top': 'var(--ti-common-space-base, 4px)'
+}
diff --git a/packages/theme/src/filter-panel/smb-theme.js b/packages/theme/src/filter-panel/smb-theme.js
deleted file mode 100644
index 64aef4812..000000000
--- a/packages/theme/src/filter-panel/smb-theme.js
+++ /dev/null
@@ -1,7 +0,0 @@
-export const tinyFilterPanelSmbTheme = {
-  'ti-filter-panel-margin-top': 'var(--ti-common-space-2x)',
-  'ti-filter-panel-padding-vertical': 'var(--ti-common-space-6x)',
-  'ti-filter-panel-padding-horizontal': 'var(--ti-common-space-6x)',
-  'ti-filter-panel-bottom-box-shadow': '0px 8px 24px 0px rgba(0, 0, 0, 0.18)',
-  'ti-filter-panel-top-box-shadow': '8px 0px 24px 0px rgba(0, 0, 0, 0.18)'
-}
diff --git a/packages/theme/src/filter-panel/vars.less b/packages/theme/src/filter-panel/vars.less
index ee114ad65..8b5d80bd5 100644
--- a/packages/theme/src/filter-panel/vars.less
+++ b/packages/theme/src/filter-panel/vars.less
@@ -11,13 +11,13 @@
 */
 .component-css-vars-filter-panel() {
   // 面板上外边距
-  --ti-filter-panel-margin-top: var(--ti-common-space-base, 4px);
+  --ti-filter-panel-margin-top: var(--ti-common-space-2x);
   // 面板垂直内边距
-  --ti-filter-panel-padding-vertical: var(--ti-common-space-4x, 16px);
+  --ti-filter-panel-padding-vertical: var(--ti-common-space-6x);
   // 面板水平内边距
-  --ti-filter-panel-padding-horizontal: var(--ti-common-space-4x, 16px);
+  --ti-filter-panel-padding-horizontal: var(--ti-common-space-6x);
   // 朝下的面板阴影
-  --ti-filter-panel-bottom-box-shadow: 0 4px 12px 0 rgba(0, 0, 0, 0.16);
+  --ti-filter-panel-bottom-box-shadow: 0px 8px 24px 0px rgba(0, 0, 0, 0.18);
   // 朝上的面板阴影
-  --ti-filter-panel-top-box-shadow: 4px 0 12px 0 rgba(0, 0, 0, 0.16);
+  --ti-filter-panel-top-box-shadow: 8px 0px 24px 0px rgba(0, 0, 0, 0.18);
 }
diff --git a/packages/theme/src/float-button/old-theme.js b/packages/theme/src/float-button/old-theme.js
new file mode 100644
index 000000000..ea1e6c577
--- /dev/null
+++ b/packages/theme/src/float-button/old-theme.js
@@ -0,0 +1 @@
+export const tinyFloatButtonOldTheme = {}
diff --git a/packages/theme/src/float-button/smb-theme.js b/packages/theme/src/float-button/smb-theme.js
deleted file mode 100644
index e52ac20d4..000000000
--- a/packages/theme/src/float-button/smb-theme.js
+++ /dev/null
@@ -1 +0,0 @@
-export const tinyFloatButtonSmbTheme = {}
diff --git a/packages/theme/src/floatbar/old-theme.js b/packages/theme/src/floatbar/old-theme.js
new file mode 100644
index 000000000..a773a2902
--- /dev/null
+++ b/packages/theme/src/floatbar/old-theme.js
@@ -0,0 +1,16 @@
+export const tinyFloatbarOldTheme = {
+  'ti-float-bar-list-hover-bg-color': 'rgba(24, 144, 255, 0.06)',
+  'ti-float-bar-list-text-color': 'var(--ti-common-color-info-normal, #252b3a)',
+  'ti-float-bar-list-line-height': 'var(--ti-common-size-10x, 40px)',
+  'ti-float-bar-list-item-min-width': 'var(--ti-common-size-20x, 80px)',
+  'ti-float-bar-list-item-min-height': 'var(--ti-common-size-10x, 40px)',
+  'ti-float-bar-li-margin-horizontal': 'unset',
+  'ti-float-bar-li-margin-vertical': 'unset',
+  'ti-float-bar-ul-padding-horizontal': 'unset',
+  'ti-float-bar-ul-padding-vertical': 'unset',
+  'ti-float-bar-box-shadow': '2px 3px 7px rgba(0, 0, 0, 0.15)',
+  'ti-float-bar-list-bg-color': 'var(--ti-common-color-bg-white-normal, #fff)',
+  'ti-float-bar-font-size': 'var(--ti-common-font-size-1, 14px)',
+  'ti-float-bar-border-radius': 'var(--ti-common-border-radius-normal, 2px)',
+  'ti-float-bar-border-color': 'var(--ti-common-color-border, #adb0b8)'
+}
diff --git a/packages/theme/src/floatbar/smb-theme.js b/packages/theme/src/floatbar/smb-theme.js
deleted file mode 100644
index efb24c180..000000000
--- a/packages/theme/src/floatbar/smb-theme.js
+++ /dev/null
@@ -1,30 +0,0 @@
-/**
- * Copyright (c) 2022 - present TinyVue Authors.
- * Copyright (c) 2022 - present Huawei Cloud Computing Technologies Co., Ltd.
- *
- * Use of this source code is governed by an MIT-style license.
- *
- * THE OPEN SOURCE SOFTWARE IN THIS PRODUCT IS DISTRIBUTED IN THE HOPE THAT IT WILL BE USEFUL,
- * BUT WITHOUT ANY WARRANTY, WITHOUT EVEN THE IMPLIED WARRANTY OF MERCHANTABILITY OR FITNESS FOR
- * A PARTICULAR PURPOSE. SEE THE APPLICABLE LICENSES FOR MORE DETAILS.
- *
- */
-
-export const tinyFloatbarSmbTheme = {
-  'ti-float-bar-border-color': 'unset',
-  'ti-float-bar-border-radius': 'var(--ti-common-border-radius-4)',
-  'ti-float-bar-list-bg-color': 'var(--ti-common-color-bg-navigation)',
-  'ti-float-bar-box-shadow': '0px 4px 16px 0px rgba(0, 0, 0, 0.08)',
-
-  'ti-float-bar-ul-padding-vertical': 'var(--ti-common-space-2x)',
-  'ti-float-bar-ul-padding-horizontal': 'var(--ti-common-space-0)',
-  'ti-float-bar-li-margin-vertical': 'var(--ti-common-space-2x)',
-  'ti-float-bar-li-margin-horizontal': 'var(--ti-common-space-0)',
-
-  'ti-float-bar-list-text-color': 'var(--ti-common-color-text-primary)',
-  'ti-float-bar-font-size': 'var(--ti-common-font-size-base)',
-  'ti-float-bar-list-item-min-width': 'var(--ti-common-size-width-normal)',
-  'ti-float-bar-list-item-min-height': 'var(--ti-common-size-height-normal)',
-  'ti-float-bar-list-line-height': 'var(--ti-common-size-height-normal)',
-  'ti-float-bar-list-hover-bg-color': 'rgba(0, 0, 0, 0.05)'
-}
diff --git a/packages/theme/src/floatbar/vars.less b/packages/theme/src/floatbar/vars.less
index 355f1f077..987c1fbc1 100644
--- a/packages/theme/src/floatbar/vars.less
+++ b/packages/theme/src/floatbar/vars.less
@@ -12,31 +12,31 @@
 
 .component-css-vars-floatbar() {
   // 浮动块边框色
-  --ti-float-bar-border-color: var(--ti-common-color-border, #adb0b8);
+  --ti-float-bar-border-color: unset;
   // 浮动块圆角
-  --ti-float-bar-border-radius: var(--ti-common-border-radius-normal, 2px);
+  --ti-float-bar-border-radius: var(--ti-common-border-radius-4);
   // 浮动块字号
-  --ti-float-bar-font-size: var(--ti-common-font-size-1, 14px);
+  --ti-float-bar-font-size: var(--ti-common-font-size-base);
   // 浮动块背景色
-  --ti-float-bar-list-bg-color: var(--ti-common-color-bg-white-normal, #fff);
+  --ti-float-bar-list-bg-color: var(--ti-common-color-bg-navigation);
   // 浮动块阴影:
-  --ti-float-bar-box-shadow: 2px 3px 7px rgba(0, 0, 0, 0.15);
+  --ti-float-bar-box-shadow: 0px 4px 16px 0px rgba(0, 0, 0, 0.08);
   // ul,li边距
-  --ti-float-bar-ul-padding-vertical: unset;
-  --ti-float-bar-ul-padding-horizontal: unset;
-  --ti-float-bar-li-margin-vertical: unset;
-  --ti-float-bar-li-margin-horizontal: unset;
+  --ti-float-bar-ul-padding-vertical: var(--ti-common-space-2x);
+  --ti-float-bar-ul-padding-horizontal: var(--ti-common-space-0);
+  --ti-float-bar-li-margin-vertical: var(--ti-common-space-2x);
+  --ti-float-bar-li-margin-horizontal: var(--ti-common-space-0);
   
   // 列表项最小高度
-  --ti-float-bar-list-item-min-height: var(--ti-common-size-10x, 40px);
+  --ti-float-bar-list-item-min-height: var(--ti-common-size-height-normal);
   // 列表项最小宽度
-  --ti-float-bar-list-item-min-width: var(--ti-common-size-20x, 80px);
+  --ti-float-bar-list-item-min-width: var(--ti-common-size-width-normal);
   // 列表项行高
-  --ti-float-bar-list-line-height: var(--ti-common-size-10x, 40px);
+  --ti-float-bar-list-line-height: var(--ti-common-size-height-normal);
   // 列表项文本色
-  --ti-float-bar-list-text-color: var(--ti-common-color-info-normal, #252b3a);
+  --ti-float-bar-list-text-color: var(--ti-common-color-text-primary);
   // 列表项悬浮文本色
   --ti-float-bar-list-hover-text-color: var(--ti-common-color-primary-normal, #5e7ce0);
   // 列表项悬浮背景色
-  --ti-float-bar-list-hover-bg-color: rgba(24, 144, 255, 0.06);
+  --ti-float-bar-list-hover-bg-color: rgba(0, 0, 0, 0.05);
 }
diff --git a/packages/theme/src/form-item/old-theme.js b/packages/theme/src/form-item/old-theme.js
new file mode 100644
index 000000000..9dc3d19f9
--- /dev/null
+++ b/packages/theme/src/form-item/old-theme.js
@@ -0,0 +1,13 @@
+export const tinyFormItemOldTheme = {
+  'ti-form-item-margin-bottom-medium': 'var(--ti-common-space-5x, 20px)',
+  'ti-form-item-margin-bottom-small': 'var(--ti-common-space-5x, 20px)',
+  'ti-form-item-margin-bottom-mini': 'var(--ti-common-space-4x, 16px)',
+  'ti-form-item-margin-bottom-default': 'var(--ti-common-space-5x, 20px)',
+  'ti-form-item-input-medium-height': 'var(--ti-common-size-10x, 40px)',
+  'ti-form-item-input-small-height': 'var(--ti-common-size-8x, 32px)',
+  'ti-form-item-input-mini-height': 'var(--ti-common-size-6x, 24px)',
+  'ti-form-item-label-padding-right': 'var(--ti-common-space-2x, 8px)',
+  'ti-form-item-mini-line-height': 'var(--ti-common-line-height-5, 24px)',
+  'ti-form-item-medium-line-height': 'calc(var(--ti-common-line-height-7, 36px) + 4px)',
+  'ti-form-item-small-line-height': 'var(--ti-common-line-height-6, 32px)'
+}
diff --git a/packages/theme/src/form-item/smb-theme.js b/packages/theme/src/form-item/smb-theme.js
deleted file mode 100644
index b3d07182b..000000000
--- a/packages/theme/src/form-item/smb-theme.js
+++ /dev/null
@@ -1,13 +0,0 @@
-export const tinyFormItemSmbTheme = {
-  'ti-form-item-margin-bottom-default': 'var(--ti-common-space-6x)',
-  'ti-form-item-margin-bottom-mini': 'var(--ti-common-space-5x)',
-  'ti-form-item-margin-bottom-small': 'var(--ti-common-space-6x)',
-  'ti-form-item-margin-bottom-medium': 'var(--ti-common-space-6x)',
-  'ti-form-item-input-mini-height': 'var(--ti-common-size-6x)',
-  'ti-form-item-input-small-height': '28px',
-  'ti-form-item-input-medium-height': 'var(--ti-common-size-10x)',
-  'ti-form-item-mini-line-height': '24px',
-  'ti-form-item-small-line-height': '28px',
-  'ti-form-item-medium-line-height': 'var(--ti-common-size-10x)',
-  'ti-form-item-label-padding-right': 'var(--ti-common-space-6x)'
-}
diff --git a/packages/theme/src/form-item/vars.less b/packages/theme/src/form-item/vars.less
index 39fb2e89c..505b73319 100644
--- a/packages/theme/src/form-item/vars.less
+++ b/packages/theme/src/form-item/vars.less
@@ -12,21 +12,21 @@
 
 .component-css-vars-form-item() {
   // 小型尺寸表单输入框左侧行高(hide)
-  --ti-form-item-small-line-height: var(--ti-common-line-height-6, 32px);
+  --ti-form-item-small-line-height: 28px;
   // 中等尺寸表单输入框左侧行高(hide)
-  --ti-form-item-medium-line-height: calc(var(--ti-common-line-height-7, 36px) + 4px);
+  --ti-form-item-medium-line-height: var(--ti-common-size-10x);
   // 迷你尺寸表单输入框左侧行高(hide)
-  --ti-form-item-mini-line-height: var(--ti-common-line-height-5, 24px);
+  --ti-form-item-mini-line-height: 24px;
   // 表单输入框左侧文本行高
   --ti-form-item-label-line-height: var(--ti-common-size-height-normal, 28px);
   // 表单输入框左侧文本内边距
-  --ti-form-item-label-padding-right: var(--ti-common-space-2x, 8px);
+  --ti-form-item-label-padding-right: var(--ti-common-space-6x);
   // 迷你尺寸表单的输入框高度
-  --ti-form-item-input-mini-height: var(--ti-common-size-6x, 24px);
+  --ti-form-item-input-mini-height: var(--ti-common-size-6x);
   // 小型尺寸表单的输入框高度
-  --ti-form-item-input-small-height: var(--ti-common-size-8x, 32px);
+  --ti-form-item-input-small-height: 28px;
   // 中等尺寸表单的输入框高度
-  --ti-form-item-input-medium-height: var(--ti-common-size-10x, 40px);
+  --ti-form-item-input-medium-height: var(--ti-common-size-10x);
   // 表单输入框左侧字号
   --ti-form-item-label-font-size: var(--ti-common-font-size-1, 14px);
   // 表单输入框左侧文本色
@@ -44,13 +44,13 @@
   --ti-form-item-error-bg-color: var(--ti-common-color-error-bg, #ffeeed);
 
   // 小型尺寸表单的行间距
-  --ti-form-item-margin-bottom-default: var(--ti-common-space-5x, 20px);
+  --ti-form-item-margin-bottom-default: var(--ti-common-space-6x);
   // 迷你尺寸表单的行间距
-  --ti-form-item-margin-bottom-mini: var(--ti-common-space-4x, 16px);
+  --ti-form-item-margin-bottom-mini: var(--ti-common-space-5x);
   // 小型尺寸表单的行间距
-  --ti-form-item-margin-bottom-small: var(--ti-common-space-5x, 20px);
+  --ti-form-item-margin-bottom-small: var(--ti-common-space-6x);
   // 中等尺寸表单的行间距
-  --ti-form-item-margin-bottom-medium: var(--ti-common-space-5x, 20px);
+  --ti-form-item-margin-bottom-medium: var(--ti-common-space-6x);
   // 表单校验错误时星号的显示(hide)
   --ti-form-item-error-star-display: inline-block;
   // 表单校验图标右侧外边距
diff --git a/packages/theme/src/form/old-theme.js b/packages/theme/src/form/old-theme.js
new file mode 100644
index 000000000..2a1422200
--- /dev/null
+++ b/packages/theme/src/form/old-theme.js
@@ -0,0 +1,6 @@
+export const tinyFormOldTheme = {
+  'ti-form-display-label-padding-bottom': 'var(--ti-common-space-2x, 8px)',
+  'ti-form-label-top-label-height': 'var(--ti-common-size-height-normal, 28px)',
+  'ti-form-label-top-label-line-height': 'var(--ti-common-size-height-normal, 28px)',
+  'ti-form-label-top-margin-bottom': 'var(--ti-common-space-4x, 16px)'
+}
diff --git a/packages/theme/src/form/smb-theme.js b/packages/theme/src/form/smb-theme.js
deleted file mode 100644
index 7aadb8fee..000000000
--- a/packages/theme/src/form/smb-theme.js
+++ /dev/null
@@ -1,8 +0,0 @@
-export const tinyFormSmbTheme = {
-  'ti-form-label-top-margin-bottom': 'var(--ti-common-space-4x)',
-  // smb要求行高为1.5
-  'ti-form-label-top-label-line-height': '1.5',
-  // border-box需要加上内边距
-  'ti-form-label-top-label-height': 'calc(1.5em + 8px)',
-  'ti-form-display-label-padding-bottom': 'var(--ti-common-space-base)'
-}
diff --git a/packages/theme/src/form/vars.less b/packages/theme/src/form/vars.less
index f31433f16..79f7eb71b 100644
--- a/packages/theme/src/form/vars.less
+++ b/packages/theme/src/form/vars.less
@@ -19,13 +19,13 @@
   --ti-form-item-margin-right: calc(var(--ti-common-space-2x, 8px) + 2px);
 
   // 表单项垂直排列时的下边距(hide)
-  --ti-form-label-top-margin-bottom: var(--ti-common-space-4x, 16px);
+  --ti-form-label-top-margin-bottom: var(--ti-common-space-4x);
   // 表单项垂直排列时的表单项标签行高(hide)
-  --ti-form-label-top-label-line-height: var(--ti-common-size-height-normal, 28px);
+  --ti-form-label-top-label-line-height: 1.5;
   // 表单项垂直排列时的表单项标签高度(hide)
-  --ti-form-label-top-label-height: var(--ti-common-size-height-normal, 28px);
+  --ti-form-label-top-label-height: calc(1.5em + 8px);
   // 仅展示表单文本颜色
   --ti-form-display-label-color: var(--ti-common-color-text-weaken, #8a8e99);
   // 仅展示表单文本下侧边距
-  --ti-form-display-label-padding-bottom: var(--ti-common-space-2x, 8px);
+  --ti-form-display-label-padding-bottom: var(--ti-common-space-base);
 }
diff --git a/packages/theme/src/grid/old-theme.js b/packages/theme/src/grid/old-theme.js
new file mode 100644
index 000000000..28a9c19c3
--- /dev/null
+++ b/packages/theme/src/grid/old-theme.js
@@ -0,0 +1,48 @@
+export const tinyGridOldTheme = {
+  'ti-grid-filter-checkbox-color': 'var(--ti-grid-primary-color)',
+  'ti-grid-filter-checkbox-font-size': 'var(--ti-common-font-size-2)',
+  'ti-grid-header-cell-text-width': '100%',
+  'ti-grid-tree-expand-icon-translate-x': '-4px',
+  'ti-grid-tree-expand-icon-padding-right': '0',
+  'ti-grid-tree-expand-icon-font-size': 'var(--ti-common-font-size-1, 14px)',
+  'ti-grid-expand-background-color': "''",
+  'ti-grid-toolbar-icon-btn-border-radius': 'calc(var(--ti-common-size-base, 4px) - 1px)',
+  'ti-grid-toolbar-icon-btn-border-color': 'var(--ti-common-color-line-dividing, #dfe1e6)',
+  'ti-grid-toolbar-icon-btn-width': 'calc(var(--ti-common-size-7x, 28px) + 2px)',
+  'ti-grid-toolbar-icon-btn-height': 'calc(var(--ti-common-size-7x, 28px) + 2px)',
+  'ti-grid-toolbar-btn-hover-border-color': 'var(--ti-common-color-primary-normal, #5e7ce0)',
+  'ti-grid-toolbar-btn-min-width': 'none',
+  'ti-grid-toolbar-btn-border-radius': 'calc(var(--ti-common-size-base, 4px) - 2px)',
+  'ti-grid-toolbar-btn-border-color': 'var(--ti-common-color-line-dividing, #dfe1e6)',
+  'ti-grid-toolbar-btn-line-height': 'var(--ti-common-space-7x, 28px)',
+  'ti-grid-toolbar-btn-padding-horizontal': 'var(--ti-common-space-3x, 12px)',
+  'ti-grid-nodata-td-bg-img-url': "url('data:image/png",
+  'ti-grid-mini-td-padding-horizontal': 'var(--ti-common-space-2x, 8px)',
+  'ti-grid-mini-td-padding-vertical': 'var(--ti-common-space-2x, 8px)',
+  'ti-grid-td-padding-horizontal': 'var(--ti-common-space-2x, 8px)',
+  'ti-grid-td-padding-vertical': 'var(--ti-common-space-2x, 8px)',
+  'ti-grid-mini-column-height': 'var(--ti-common-size-7x, 28px)',
+  'ti-grid-small-column-height': 'var(--ti-common-size-9x, 36px)',
+  'ti-grid-default-column-height': 'calc(var(--ti-common-space-10x, 40px) + 2px)',
+  'ti-grid-medium-column-height': 'var(--ti-common-size-13x, 52px)',
+  'ti-grid-mini-header-column-height': 'var(--ti-common-size-height-normal, 28px)',
+  'ti-grid-small-header-column-height': 'var(--ti-common-size-height-normal, 28px)',
+  'ti-grid-default-header-column-height': 'var(--ti-common-size-height-normal, 28px)',
+  'ti-grid-medium-header-column-height': 'var(--ti-common-size-height-normal, 28px)',
+  'ti-grid-loading-background-color': 'rgba(0, 0, 0, 0.2)',
+  'ti-grid-row-hover-background-color': 'var(--ti-common-color-hover-background, #f2f5fc)',
+  'ti-grid-row-selected-background-color': 'var(--ti-common-color-bg-white-normal, #fff)',
+  'ti-grid-header-resizable-line-height': '100%',
+  'ti-grid-header-resizable-bg-color': 'var(--ti-common-color-text-white, #fff)',
+  'ti-grid-header-background-color': 'var(--ti-common-color-bg-white-emphasize, #f2f5fc)',
+  'ti-grid-checkbox-border-radius': 'var(--ti-common-border-radius-normal, 2px)',
+  'ti-grid-checkbox-icon-size': 'var(--ti-common-font-size-1, 14px)',
+  'ti-grid-checkbox-bg-color-checked': 'var(--ti-grid-primary-color)',
+  'ti-grid-select-icon-font-size': 'var(--ti-common-font-size-2, 16px)',
+  'ti-grid-checkbox-border-color': 'var(--ti-common-color-line-normal, #adb0b8)',
+  'ti-grid-radio-bg-color-checked': 'var(--ti-grid-primary-color)',
+  'ti-grid-header-repair-border-color': 'var(--ti-common-color-transparent, transparent)',
+  'ti-grid-icon-color': 'var(--ti-common-color-info-normal, #252b3a)',
+  'ti-grid-header-font-weight': 'var(--ti-common-font-weight-4, normal)',
+  'ti-grid-header-text-color': 'var(--ti-common-color-info-normal, #252b3a)'
+}
diff --git a/packages/theme/src/grid/smb-theme.js b/packages/theme/src/grid/smb-theme.js
deleted file mode 100644
index 259124c0a..000000000
--- a/packages/theme/src/grid/smb-theme.js
+++ /dev/null
@@ -1,49 +0,0 @@
-export const tinyGridSmbTheme = {
-  'ti-grid-header-background-color': '#F5F5F5',
-  'ti-grid-header-font-weight': 'bold',
-  'ti-grid-medium-header-column-height': '46px',
-  'ti-grid-default-header-column-height': 'var(--ti-common-size-height-medium)',
-  'ti-grid-small-header-column-height': 'var(--ti-common-size-height-normal)',
-  'ti-grid-mini-header-column-height': '32px',
-  'ti-grid-medium-column-height': '52px',
-  'ti-grid-default-column-height': 'var(--ti-common-size-height-large)',
-  'ti-grid-small-column-height': 'var(--ti-common-size-height-medium)',
-  'ti-grid-mini-column-height': 'var(--ti-common-size-height-minor)',
-  'ti-grid-header-resizable-bg-color': 'rgba(0,0,0,0.15)',
-  'ti-grid-header-resizable-line-height': '16px',
-  'ti-grid-checkbox-border-color': 'var(--ti-common-color-line-normal)',
-  'ti-grid-checkbox-border-radius': 'var(--ti-common-border-radius-2)',
-  'ti-grid-header-repair-border-color': 'var(--ti-common-color-transparent)',
-  'ti-grid-header-text-color': 'var(--ti-common-color-text-secondary)',
-  'ti-grid-row-hover-background-color': '#F5F5F5',
-  'ti-grid-icon-color': 'var(--ti-common-color-icon)',
-  'ti-grid-checkbox-icon-size': 'var(--ti-common-font-size-2)',
-  'ti-grid-checkbox-bg-color-checked': '#1476FF',
-  'ti-grid-radio-bg-color-checked': '#1476FF',
-  'ti-grid-toolbar-icon-btn-height': 'var(--ti-common-size-8x)',
-  'ti-grid-toolbar-icon-btn-width': 'var(--ti-common-size-8x)',
-  'ti-grid-toolbar-icon-btn-border-color': 'var(--ti-common-color-line-normal)',
-  'ti-grid-toolbar-icon-btn-border-radius': 'calc(var(--ti-common-size-base) + 2px)',
-  'ti-grid-toolbar-btn-min-width': 'calc(var(--ti-common-size-base) * 24)',
-  'ti-grid-toolbar-btn-padding-horizontal': 'var(--ti-common-space-6x)',
-  'ti-grid-toolbar-btn-line-height': '30px',
-  'ti-grid-toolbar-btn-border-color': '#595959', // 缺少#595959的边框公共变量
-  'ti-grid-toolbar-btn-hover-border-color': 'var(--ti-common-color-line-normal)', // 缺少#595959的边框公共变量
-  'ti-grid-toolbar-btn-border-radius': 'var(--ti-common-size-4x)',
-  'ti-grid-select-icon-font-size': 'var(--ti-common-font-size-3)',
-  'ti-grid-row-selected-background-color': '#f0f7ff',
-  'ti-grid-expand-background-color': '#fafafa',
-  'ti-grid-loading-background-color': 'rgba(255, 255, 255, 0.67)',
-  'ti-grid-tree-expand-icon-font-size': 'var(--ti-common-font-size-2)',
-  'ti-grid-tree-expand-icon-translate-x': '0',
-  'ti-grid-tree-expand-icon-padding-right': 'var(--ti-common-space-2x)',
-  'ti-grid-td-padding-horizontal': 'var(--ti-common-space-4x)',
-  'ti-grid-td-padding-vertical': 'var(--ti-common-space-3x)',
-  'ti-grid-mini-td-padding-horizontal': 'var(--ti-common-space-4x)',
-  'ti-grid-mini-td-padding-vertical': 'var(--ti-common-space-2x)',
-  'ti-grid-header-cell-text-width': 'auto',
-  'ti-grid-nodata-td-bg-img-url':
-    'url(data:image/svg+xml;base64,PHN2ZyB3aWR0aD0iODAiIGhlaWdodD0iODAiIGZpbGw9Im5vbmUiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+PGRlZnM+PGNsaXBQYXRoIGlkPSJhIj48cGF0aCBmaWxsPSIjZmZmIiBmaWxsLW9wYWNpdHk9IjAiIGQ9Ik0wIDBoODB2ODBIMHoiLz48L2NsaXBQYXRoPjwvZGVmcz48ZyBjbGlwLXBhdGg9InVybCgjYSkiPjxwYXRoIGQ9Ik03My42MSAzOS4zOXYzMC42N2MwIDIuMTctMS43NiAzLjkzLTMuOTQgMy45M0g1Mi41OXYtLjg3aDE3LjA4YzEuNyAwIDMuMDctMS4zNyAzLjA3LTMuMDZWMzkuMzloLjg3eiIgZmlsbD0iZ3JheSIvPjxwYXRoIGQ9Ik03My42MSAzOS4zOXYzMC42N2MwIDIuMTctMS43NiAzLjkzLTMuOTQgMy45M0g1Mi41OXYtLjg3aDE3LjA4YzEuNyAwIDMuMDctMS4zNyAzLjA3LTMuMDZWMzkuMzloLjg3eiIgZmlsbD0iZ3JheSIvPjxwYXRoIGQ9Ik01Ni45MiAyNXY0NS4wNmMwIDIuMTctMS43NyAzLjkzLTMuOTUgMy45M0gxMC45NEEzLjk0IDMuOTQgMCAwIDEgNyA3MC4wNlYzOS4zOWguODh2MzAuNjdhMy4wNiAzLjA2IDAgMCAwIDMuMDYgMy4wNmg0Mi4wM2MxLjcgMCAzLjA3LTEuMzcgMy4wNy0zLjA2VjI1Ljg3SDEwLjY3VjI1aDQ2LjI1eiIgZmlsbD0iZ3JheSIvPjxwYXRoIGQ9Ik05LjQzIDI1Yy0uNiAwLTEuMTUuMzEtMS40Ni44MkwuMTMgMzguNjRjLS4yNi40Mi0uMTMuOTYuMjcgMS4yMi4xNC4wOS4yOS4xNC40Ni4xNGg0NC44MmMxLjE3IDAgMi4yNi0uNjEgMi45LTEuNjJMNTcuMDQgMjVIOS40M3ptLjIyIDFoNDUuNTJsLTcuNTIgMTEuODFjLS40Ny43NC0xLjI4IDEuMTktMi4xNCAxLjE5SDEuMTdsNy43NS0xMi42Yy4xNi0uMjUuNDMtLjQuNzMtLjR6IiBmaWxsPSJncmF5Ii8+PHBhdGggZD0iTTcwLjc1IDI1Yy41NiAwIDEuMDguMyAxLjM5LjhsNy43MiAxMi43MmMuMjUuNDEuMTQuOTUtLjI1IDEuMjEtLjEzLjA5LS4yOC4xNC0uNDQuMTRINjYuMTRjLTEuMTcgMC0yLjI1LS42Ni0yLjg1LTEuNzNMNTUuOTggMjVoMTQuNzd6bS0uMDMgMUg1Ny44bDYuMzggMTEuNzFjLjQzLjggMS4yMiAxLjI5IDIuMDggMS4yOWgxMi42M0w3MS40IDI2LjM5YS44MDIuODAyIDAgMCAwLS42OC0uMzl6IiBmaWxsPSJncmF5Ii8+PHJlY3QgeD0iMTMuNSIgeT0iNTYiIHJ4PSIxLjg4NiIgd2lkdGg9IjE0IiBoZWlnaHQ9IjQiIGZpbGw9IiMxNDc2RkYiLz48cGF0aCBkPSJNMjMuNTYgNjNjLjI0IDAgLjQ0LjIyLjQ0LjUgMCAuMjctLjIuNS0uNDQuNWgtOS42M2MtLjI0IDAtLjQzLS4yMy0uNDMtLjUgMC0uMjguMTktLjUuNDMtLjVoOS42M3oiIGZpbGw9ImdyYXkiLz48cmVjdCB4PSIxMy41IiB5PSI2NiIgcng9Ii41IiB3aWR0aD0iNSIgaGVpZ2h0PSIxIiBmaWxsPSJncmF5Ii8+PHBhdGggZD0iTTQwIDZjLjI3IDAgLjUuMTkuNS40NHY2LjE2YzAgLjI1LS4yMy40NC0uNS40NC0uMjggMC0uNTEtLjE5LS41MS0uNDRWNi40NGMwLS4yNS4yMy0uNDQuNTEtLjQ0ek01Ni41NSA4LjY0Yy4yNC4xNC4zMy40Mi4yMS42M2wtMy4wOCA1LjM0Yy0uMTIuMjEtLjQyLjI3LS42Ni4xMy0uMjQtLjE0LS4zMy0uNDItLjIxLS42M2wzLjA4LTUuMzRjLjEyLS4yMS40Mi0uMjcuNjYtLjEzek0yMy40NCA4LjY0Yy4yNC0uMTQuNTQtLjA4LjY2LjEzbDMuMDggNS4zNGMuMTIuMjEuMDMuNDktLjIxLjYzcy0uNTQuMDgtLjY2LS4xM2wtMy4wOC01LjM0Yy0uMTItLjIxLS4wMy0uNDkuMjEtLjYzeiIgZmlsbD0iZ3JheSIvPjwvZz48L3N2Zz4=)',
-  'ti-grid-filter-checkbox-font-size': '18px',
-  'ti-grid-filter-checkbox-color': '#1476FF'
-}
diff --git a/packages/theme/src/grid/vars.less b/packages/theme/src/grid/vars.less
index 0c88c17c4..433ebc3b2 100644
--- a/packages/theme/src/grid/vars.less
+++ b/packages/theme/src/grid/vars.less
@@ -23,13 +23,13 @@
     'Microsoft JhengHei'
   );
   // 默认表头文本色
-  --ti-grid-header-text-color: var(--ti-common-color-info-normal, #252b3a);
+  --ti-grid-header-text-color: var(--ti-common-color-text-secondary);
   // 默认表头字体权重
-  --ti-grid-header-font-weight: var(--ti-common-font-weight-4, normal);
+  --ti-grid-header-font-weight: bold;
   // 默认表体文本色
   --ti-grid-text-color: var(--ti-common-color-info-normal, #252b3a);
   // 默认按钮图标悬浮色
-  --ti-grid-icon-color: var(--ti-common-color-info-normal, #252b3a);
+  --ti-grid-icon-color: var(--ti-common-color-icon);
   // 表格亮色
   --ti-grid-light-color: var(--ti-common-color-light, #fff);
   // 表格错误色
@@ -54,26 +54,26 @@
   --ti-grid-body-td-border-color: var(--ti-common-color-line-dividing, #dfe1e6);
 
   // 表头x轴虚拟滚动元素边框颜色
-  --ti-grid-header-repair-border-color: var(--ti-common-color-transparent, transparent);
+  --ti-grid-header-repair-border-color: var(--ti-common-color-transparent);
 
   // 表格内部单选按钮边框色
   --ti-grid-radio-border-color: var(--ti-common-color-line-normal, #adb0b8);
   // 表格单选框选中背景色
-  --ti-grid-radio-bg-color-checked: var(--ti-grid-primary-color);
+  --ti-grid-radio-bg-color-checked: #1476ff;
 
   // 表格内部多选按钮边框色
-  --ti-grid-checkbox-border-color: var(--ti-common-color-line-normal, #adb0b8);
+  --ti-grid-checkbox-border-color: var(--ti-common-color-line-normal);
   // 表格内部多选按钮大小
-  --ti-grid-select-icon-font-size: var(--ti-common-font-size-2, 16px);
+  --ti-grid-select-icon-font-size: var(--ti-common-font-size-3);
   // 表格多选框选中背景色
-  --ti-grid-checkbox-bg-color-checked: var(--ti-grid-primary-color);
+  --ti-grid-checkbox-bg-color-checked: #1476ff;
   // 表格复选框字号
-  --ti-grid-checkbox-icon-size: var(--ti-common-font-size-1, 14px);
+  --ti-grid-checkbox-icon-size: var(--ti-common-font-size-2);
   // 表格内部多选按钮边框圆角
-  --ti-grid-checkbox-border-radius: var(--ti-common-border-radius-normal, 2px);
+  --ti-grid-checkbox-border-radius: var(--ti-common-border-radius-2);
 
   // 表格头部默认背景色
-  --ti-grid-header-background-color: var(--ti-common-color-bg-white-emphasize, #f2f5fc);
+  --ti-grid-header-background-color: #f5f5f5;
   // 新增行背景颜色
   --ti-grid-new-row-background-color: var(--ti-common-color-bg-white-emphasize, #f2f5fc);
   // 表格主色调色
@@ -90,9 +90,9 @@
   // 自定义内容列表高度（没有效果）
   --ti-grid-custom-body-list-height: var(--ti-common-size-height-small, 32px);
   // 表格列拖拽分割线背景颜色
-  --ti-grid-header-resizable-bg-color: var(--ti-common-color-text-white, #fff);
+  --ti-grid-header-resizable-bg-color: rgba(0, 0, 0, 0.15);
   // 表格列拖拽分割线高度
-  --ti-grid-header-resizable-line-height: 100%;
+  --ti-grid-header-resizable-line-height: 16px;
 
   // (单选|复选)框禁用背景色
   --ti-grid-input-disabled-bg-color: var(--ti-common-color-bg-disabled, #f5f5f6);
@@ -114,11 +114,11 @@
   // 行默认背景色
   --ti-grid-row-background-color: var(--ti-common-color-bg-white-normal, #fff);
   // 行被勾选时背景色
-  --ti-grid-row-selected-background-color: var(--ti-common-color-bg-white-normal, #fff);
+  --ti-grid-row-selected-background-color: #f0f7ff;
   // 斑马纹行背景色
   --ti-grid-row-striped-background-color: #fafafa;
   // 行悬浮默认背景色
-  --ti-grid-row-hover-background-color: var(--ti-common-color-hover-background, #f2f5fc);
+  --ti-grid-row-hover-background-color: #f5f5f5;
 
   // 高亮悬停列悬浮表头背景色
   --ti-grid-column-hover-background-color: #d7effb;
@@ -131,7 +131,7 @@
   // 鼠标配置项选中项边框厚度
   --ti-grid-column-checked-border-width: var(--ti-common-border-weight-1, 2px);
   // 表格加载中背景色
-  --ti-grid-loading-background-color: rgba(0, 0, 0, 0.2);
+  --ti-grid-loading-background-color: rgba(255, 255, 255, 0.67);
   // 表格加载中图标长度尺寸
   --ti-grid-loading-width-size: var(--ti-common-size-6x, 24px);
   // 表格加载中图标宽度尺寸
@@ -140,62 +140,62 @@
   --ti-grid-line-height-number: var(--ti-common-line-height-number, 1.5);
 
   // 中等尺寸表头高度
-  --ti-grid-medium-header-column-height: var(--ti-common-size-height-normal, 28px);
+  --ti-grid-medium-header-column-height: 46px;
   // 默认尺寸表头高度
-  --ti-grid-default-header-column-height: var(--ti-common-size-height-normal, 28px);
+  --ti-grid-default-header-column-height: var(--ti-common-size-height-medium);
   // 小尺寸表头高度
-  --ti-grid-small-header-column-height: var(--ti-common-size-height-normal, 28px);
+  --ti-grid-small-header-column-height: var(--ti-common-size-height-normal);
   // 超小尺寸表头高度
-  --ti-grid-mini-header-column-height: var(--ti-common-size-height-normal, 28px);
+  --ti-grid-mini-header-column-height: 32px;
 
   // 中等尺寸表格单元格高度
-  --ti-grid-medium-column-height: var(--ti-common-size-13x, 52px);
+  --ti-grid-medium-column-height: 52px;
   // 默认尺寸表格单元格高度
-  --ti-grid-default-column-height: calc(var(--ti-common-space-10x, 40px) + 2px);
+  --ti-grid-default-column-height: var(--ti-common-size-height-large);
   // 小尺寸表格单元格高度
-  --ti-grid-small-column-height: var(--ti-common-size-9x, 36px);
+  --ti-grid-small-column-height: var(--ti-common-size-height-medium);
   // 超小尺寸表格单元格高度
-  --ti-grid-mini-column-height: var(--ti-common-size-7x, 28px);
+  --ti-grid-mini-column-height: var(--ti-common-size-height-minor);
   // 表头单元格垂直内边距
   --ti-grid-mini-th-padding-vertical: var(--ti-common-space-base, 4px);
   // 表头单元格垂直内边距
   --ti-grid-th-padding-vertical: var(--ti-common-space-2x, 8px);
   // 默认单元格垂直内边距
-  --ti-grid-td-padding-vertical: var(--ti-common-space-2x, 8px);
+  --ti-grid-td-padding-vertical: var(--ti-common-space-3x);
   // 单元格水平内边距
-  --ti-grid-td-padding-horizontal: var(--ti-common-space-2x, 8px);
+  --ti-grid-td-padding-horizontal: var(--ti-common-space-4x);
   // mini单元格垂直内边距
-  --ti-grid-mini-td-padding-vertical: var(--ti-common-space-2x, 8px);
+  --ti-grid-mini-td-padding-vertical: var(--ti-common-space-2x);
   // mini单元格水平内边距
-  --ti-grid-mini-td-padding-horizontal: var(--ti-common-space-2x, 8px);
+  --ti-grid-mini-td-padding-horizontal: var(--ti-common-space-4x);
   // 表头排序图标尺寸
   --ti-grid-header-icon-font-size: var(--ti-common-font-size-2, 16px);
   // 表头排序图标尺寸缩放比例
   --ti-grid-column-icon-scale-size: 1;
   // 表格无数据背景图片
-  --ti-grid-nodata-td-bg-img-url: url('data:image/png;base64,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');
+  --ti-grid-nodata-td-bg-img-url: url('data:image/svg+xml;base64,PHN2ZyB3aWR0aD0iODAiIGhlaWdodD0iODAiIGZpbGw9Im5vbmUiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+PGRlZnM+PGNsaXBQYXRoIGlkPSJhIj48cGF0aCBmaWxsPSIjZmZmIiBmaWxsLW9wYWNpdHk9IjAiIGQ9Ik0wIDBoODB2ODBIMHoiLz48L2NsaXBQYXRoPjwvZGVmcz48ZyBjbGlwLXBhdGg9InVybCgjYSkiPjxwYXRoIGQ9Ik03My42MSAzOS4zOXYzMC42N2MwIDIuMTctMS43NiAzLjkzLTMuOTQgMy45M0g1Mi41OXYtLjg3aDE3LjA4YzEuNyAwIDMuMDctMS4zNyAzLjA3LTMuMDZWMzkuMzloLjg3eiIgZmlsbD0iZ3JheSIvPjxwYXRoIGQ9Ik03My42MSAzOS4zOXYzMC42N2MwIDIuMTctMS43NiAzLjkzLTMuOTQgMy45M0g1Mi41OXYtLjg3aDE3LjA4YzEuNyAwIDMuMDctMS4zNyAzLjA3LTMuMDZWMzkuMzloLjg3eiIgZmlsbD0iZ3JheSIvPjxwYXRoIGQ9Ik01Ni45MiAyNXY0NS4wNmMwIDIuMTctMS43NyAzLjkzLTMuOTUgMy45M0gxMC45NEEzLjk0IDMuOTQgMCAwIDEgNyA3MC4wNlYzOS4zOWguODh2MzAuNjdhMy4wNiAzLjA2IDAgMCAwIDMuMDYgMy4wNmg0Mi4wM2MxLjcgMCAzLjA3LTEuMzcgMy4wNy0zLjA2VjI1Ljg3SDEwLjY3VjI1aDQ2LjI1eiIgZmlsbD0iZ3JheSIvPjxwYXRoIGQ9Ik05LjQzIDI1Yy0uNiAwLTEuMTUuMzEtMS40Ni44MkwuMTMgMzguNjRjLS4yNi40Mi0uMTMuOTYuMjcgMS4yMi4xNC4wOS4yOS4xNC40Ni4xNGg0NC44MmMxLjE3IDAgMi4yNi0uNjEgMi45LTEuNjJMNTcuMDQgMjVIOS40M3ptLjIyIDFoNDUuNTJsLTcuNTIgMTEuODFjLS40Ny43NC0xLjI4IDEuMTktMi4xNCAxLjE5SDEuMTdsNy43NS0xMi42Yy4xNi0uMjUuNDMtLjQuNzMtLjR6IiBmaWxsPSJncmF5Ii8+PHBhdGggZD0iTTcwLjc1IDI1Yy41NiAwIDEuMDguMyAxLjM5LjhsNy43MiAxMi43MmMuMjUuNDEuMTQuOTUtLjI1IDEuMjEtLjEzLjA5LS4yOC4xNC0uNDQuMTRINjYuMTRjLTEuMTcgMC0yLjI1LS42Ni0yLjg1LTEuNzNMNTUuOTggMjVoMTQuNzd6bS0uMDMgMUg1Ny44bDYuMzggMTEuNzFjLjQzLjggMS4yMiAxLjI5IDIuMDggMS4yOWgxMi42M0w3MS40IDI2LjM5YS44MDIuODAyIDAgMCAwLS42OC0uMzl6IiBmaWxsPSJncmF5Ii8+PHJlY3QgeD0iMTMuNSIgeT0iNTYiIHJ4PSIxLjg4NiIgd2lkdGg9IjE0IiBoZWlnaHQ9IjQiIGZpbGw9IiMxNDc2RkYiLz48cGF0aCBkPSJNMjMuNTYgNjNjLjI0IDAgLjQ0LjIyLjQ0LjUgMCAuMjctLjIuNS0uNDQuNWgtOS42M2MtLjI0IDAtLjQzLS4yMy0uNDMtLjUgMC0uMjguMTktLjUuNDMtLjVoOS42M3oiIGZpbGw9ImdyYXkiLz48cmVjdCB4PSIxMy41IiB5PSI2NiIgcng9Ii41IiB3aWR0aD0iNSIgaGVpZ2h0PSIxIiBmaWxsPSJncmF5Ii8+PHBhdGggZD0iTTQwIDZjLjI3IDAgLjUuMTkuNS40NHY2LjE2YzAgLjI1LS4yMy40NC0uNS40NC0uMjggMC0uNTEtLjE5LS41MS0uNDRWNi40NGMwLS4yNS4yMy0uNDQuNTEtLjQ0ek01Ni41NSA4LjY0Yy4yNC4xNC4zMy40Mi4yMS42M2wtMy4wOCA1LjM0Yy0uMTIuMjEtLjQyLjI3LS42Ni4xMy0uMjQtLjE0LS4zMy0uNDItLjIxLS42M2wzLjA4LTUuMzRjLjEyLS4yMS40Mi0uMjcuNjYtLjEzek0yMy40NCA4LjY0Yy4yNC0uMTQuNTQtLjA4LjY2LjEzbDMuMDggNS4zNGMuMTIuMjEuMDMuNDktLjIxLjYzcy0uNTQuMDgtLjY2LS4xM2wtMy4wOC01LjM0Yy0uMTItLjIxLS4wMy0uNDkuMjEtLjYzeiIgZmlsbD0iZ3JheSIvPjwvZz48L3N2Zz4=');
 
   // 工具栏按钮水平内边距
-  --ti-grid-toolbar-btn-padding-horizontal: var(--ti-common-space-3x, 12px);
+  --ti-grid-toolbar-btn-padding-horizontal: var(--ti-common-space-6x);
   // 工具栏按钮行高
-  --ti-grid-toolbar-btn-line-height: var(--ti-common-space-7x, 28px);
+  --ti-grid-toolbar-btn-line-height: 30px;
   // 工具栏按钮边框颜色
-  --ti-grid-toolbar-btn-border-color: var(--ti-common-color-line-dividing, #dfe1e6);
+  --ti-grid-toolbar-btn-border-color: #595959;
   // 工具栏按钮边框圆角
-  --ti-grid-toolbar-btn-border-radius: calc(var(--ti-common-size-base, 4px) - 2px);
+  --ti-grid-toolbar-btn-border-radius: var(--ti-common-size-4x);
   // 工具栏按钮最小宽度
-  --ti-grid-toolbar-btn-min-width: none;
+  --ti-grid-toolbar-btn-min-width: calc(var(--ti-common-size-base) * 24);
   // 工具栏按钮悬浮边框颜色
-  --ti-grid-toolbar-btn-hover-border-color: var(--ti-common-color-primary-normal, #5e7ce0);
+  --ti-grid-toolbar-btn-hover-border-color: var(--ti-common-color-line-normal);
 
   // 工具栏图标按钮高度
-  --ti-grid-toolbar-icon-btn-height: calc(var(--ti-common-size-7x, 28px) + 2px);
+  --ti-grid-toolbar-icon-btn-height: var(--ti-common-size-8x);
   // 工具栏图标按钮宽度
-  --ti-grid-toolbar-icon-btn-width: calc(var(--ti-common-size-7x, 28px) + 2px);
+  --ti-grid-toolbar-icon-btn-width: var(--ti-common-size-8x);
   // 工具栏图标按钮边框色
-  --ti-grid-toolbar-icon-btn-border-color: var(--ti-common-color-line-dividing, #dfe1e6);
+  --ti-grid-toolbar-icon-btn-border-color: var(--ti-common-color-line-normal);
   // 工具栏图标按钮边框圆角
-  --ti-grid-toolbar-icon-btn-border-radius: calc(var(--ti-common-size-base, 4px) - 1px);
+  --ti-grid-toolbar-icon-btn-border-radius: calc(var(--ti-common-size-base) + 2px);
   // 工具栏垂直边距
   --ti-grid-toolbar-padding-vertical: var(--ti-common-size-4x, 16px);
   // 排序按钮定位方式
@@ -203,19 +203,19 @@
   // 排序按钮右侧定位
   --ti-grid-sort-icon-right: unset;
   // 表格展开行背景颜色
-  --ti-grid-expand-background-color: '';
+  --ti-grid-expand-background-color: #fafafa;
   // 表格树表展开行图标大小
-  --ti-grid-tree-expand-icon-font-size: var(--ti-common-font-size-1, 14px);
+  --ti-grid-tree-expand-icon-font-size: var(--ti-common-font-size-2);
   // 表格树表展开行图标右侧边距
-  --ti-grid-tree-expand-icon-padding-right: 0;
+  --ti-grid-tree-expand-icon-padding-right: var(--ti-common-space-2x);
   // 表格树表展开行图标向左偏移量(hide)
-  --ti-grid-tree-expand-icon-translate-x: -4px;
+  --ti-grid-tree-expand-icon-translate-x: 0;
   // 表头单元格宽度
-  --ti-grid-header-cell-text-width: 100%;
+  --ti-grid-header-cell-text-width: auto;
   // 表格过滤面板checkbox大小
-  --ti-grid-filter-checkbox-font-size: var(--ti-common-font-size-2);
+  --ti-grid-filter-checkbox-font-size: 18px;
   // 表格过滤面板checkbox颜色
-  --ti-grid-filter-checkbox-color: var(--ti-grid-primary-color);
+  --ti-grid-filter-checkbox-color: #1476ff;
 
   // selection的dropdown插槽左偏移量(hide)
   --ti-grid-selection-dropdown-left-offset: var(--ti-common-size-3x, 12px);
diff --git a/packages/theme/src/guide/old-theme.js b/packages/theme/src/guide/old-theme.js
new file mode 100644
index 000000000..d3db2c921
--- /dev/null
+++ b/packages/theme/src/guide/old-theme.js
@@ -0,0 +1,33 @@
+export const tinyGuideOldTheme = {
+  'ti-guide-progresss-text-color': 'var(--ti-common-color-text-primary, #252b3a)',
+  'ti-guide-button-height': 'var(--ti-common-size-height-normal, 32px)',
+  'ti-guide-button-width': 'calc(var(--ti-common-line-height-6, 48px) * 2)',
+  'ti-guide-button-active-bg-color': 'var(--ti-common-color-primary-active, #7693f5)',
+  'ti-guide-button-focus-bg-color': 'var(--ti-common-color-primary-active, #7693f5)',
+  'ti-guide-button-hover-border-color': 'var(--ti-common-color-primary-normal, #5e7ce0)',
+  'ti-guide-button-hover-bg-color': 'var(--ti-common-color-primary-hover, #7693f5)',
+  'ti-guide-button-bg-color': 'var(--ti-common-color-primary-normal, #5e7ce0)',
+  'ti-guide-button-border-radius': 'var(--ti-common-border-radius-normal, 2px)',
+  'ti-guide-button-border': 'var(--ti-common-color-text-white, #fff)',
+  'ti-guide-button-text-color': 'var(--ti-common-color-text-white, #fff)',
+  'ti-guide-footer-padding-bottom': 'var(--ti-common-space-6x, 24px)',
+  'ti-guide-footer-padding-right': 'var(--ti-common-space-6x, 24px)',
+  'ti-guide-footer-padding-left': 'var(--ti-common-space-6x, 24px)',
+  'ti-guide-footer-border-bottom-left-radius': 'var(--ti-common-border-radius-1, 4px)',
+  'ti-guide-footer-border-bottom-right-radius': 'var(--ti-common-border-radius-1, 4px)',
+  'ti-guide-text-padding-bottom': 'calc(var(--ti-common-space-base, 4px) * 5.5)',
+  'ti-guide-text-padding-horizontal': 'var(--ti-common-space-6x, 24px)',
+  'ti-guide-text-padding-top': 'var(--ti-common-space-6x, 24px)',
+  'ti-guide-text-line-height': 'var(--ti-common-line-height-4, 20px)',
+  'ti-guide-text-text-color': 'var(--ti-common-color-text-primary, #252b3a)',
+  'ti-guide-progress-style-left': 'var(--ti-common-space-6x, 24px)',
+  'ti-guide-cancel-icon-margin-right': 'var(--ti-common-space-0, 0px)',
+  'ti-guide-cancel-icon-margin-top': '-6px',
+  'ti-guide-title-text-font-size': 'var(--ti-common-font-size-3, 18px)',
+  'ti-guide-title-line-height': 'var(--ti-common-line-height-6, 32px)',
+  'ti-guide-header-padding-top': 'var(--ti-common-space-6x, 24px)',
+  'ti-guide-header-padding-right': 'var(--ti-common-space-6x, 24px)',
+  'ti-guide-header-padding-left': 'var(--ti-common-space-6x, 24px)',
+  'ti-guide-header-border-top-right-radius': 'var(--ti-common-border-radius-1, 4px)',
+  'ti-guide-header-border-top-left-radius': 'var(--ti-common-border-radius-1, 4px)'
+}
diff --git a/packages/theme/src/guide/smb-theme.js b/packages/theme/src/guide/smb-theme.js
deleted file mode 100644
index 0da321985..000000000
--- a/packages/theme/src/guide/smb-theme.js
+++ /dev/null
@@ -1,33 +0,0 @@
-export const tinyGuideSmbTheme = {
-  'ti-guide-header-padding-top': 'var(--ti-common-space-6x)',
-  'ti-guide-header-padding-left': 'var(--ti-common-space-6x)',
-  'ti-guide-header-padding-right': 'var(--ti-common-space-6x)',
-  'ti-guide-footer-padding-left': 'var(--ti-common-space-6x)',
-  'ti-guide-footer-padding-right': 'var(--ti-common-space-6x)',
-  'ti-guide-footer-padding-bottom': 'var(--ti-common-space-6x)',
-  'ti-guide-text-padding-horizontal': 'var(--ti-common-space-6x)',
-  'ti-guide-text-padding-bottom': 'var(--ti-common-space-6x)',
-  'ti-guide-text-padding-top': 'var(--ti-common-space-2x)',
-  'ti-guide-button-width': 'calc(var(--ti-common-line-height-8) + 8px)',
-  'ti-guide-button-height': 'var(--ti-common-line-height-2)',
-  'ti-guide-progress-style-left': 'var(--ti-common-space-6x)',
-  'ti-guide-title-text-font-size': 'var(--ti-common-font-size-2)',
-  'ti-guide-title-line-height': 'var(--ti-common-line-height-2)',
-  'ti-guide-text-line-height': 'var(--ti-common-line-height-2)',
-  'ti-guide-button-bg-color': 'var(--ti-common-color-light)',
-  'ti-guide-button-text-color': '#191919',
-  'ti-guide-button-hover-bg-color': 'var(--ti-common-color-light)',
-  'ti-guide-button-active-bg-color': 'var(--ti-common-color-light)',
-  'ti-guide-button-focus-bg-color': 'var(--ti-common-color-light)',
-  'ti-guide-button-hover-border-color': '#C2C2C2',
-  'ti-guide-button-border': '#595959',
-  'ti-guide-text-text-color': '#595959',
-  'ti-guide-progresss-text-color': '#808080',
-  'ti-guide-cancel-icon-margin-top': 'calc(var(--ti-common-space-base) * (-6))',
-  'ti-guide-cancel-icon-margin-right': 'calc(var(--ti-common-space-base) * (-2))',
-  'ti-guide-header-border-top-left-radius': 'var(--ti-common-border-radius-4)',
-  'ti-guide-header-border-top-right-radius': 'var(--ti-common-border-radius-4)',
-  'ti-guide-footer-border-bottom-right-radius': 'var(--ti-common-border-radius-4)',
-  'ti-guide-footer-border-bottom-left-radius': 'var(--ti-common-border-radius-4)',
-  'ti-guide-button-border-radius': 'var(--ti-common-size-25x)'
-}
diff --git a/packages/theme/src/guide/vars.less b/packages/theme/src/guide/vars.less
index 6469a860f..324caaedd 100644
--- a/packages/theme/src/guide/vars.less
+++ b/packages/theme/src/guide/vars.less
@@ -4,27 +4,27 @@
   // 引导框箭头宽度
   --ti-guide-arrow-width: var(--ti-common-size-4x, 16px);
   // 引导框头部左上边框圆角
-  --ti-guide-header-border-top-left-radius: var(--ti-common-border-radius-1, 4px);
+  --ti-guide-header-border-top-left-radius: var(--ti-common-border-radius-4);
   // 引导框头部右上边框圆角
-  --ti-guide-header-border-top-right-radius: var(--ti-common-border-radius-1, 4px);
+  --ti-guide-header-border-top-right-radius: var(--ti-common-border-radius-4);
   // 引导框头部行高
   --ti-guide-header-line-height: var(--ti-common-line-height-6, 32px);
   // 引导框头部左内边距
-  --ti-guide-header-padding-left: var(--ti-common-space-6x, 24px);
+  --ti-guide-header-padding-left: var(--ti-common-space-6x);
   // 引导框头部右内边距
-  --ti-guide-header-padding-right: var(--ti-common-space-6x, 24px);
+  --ti-guide-header-padding-right: var(--ti-common-space-6x);
   // 引导框头部顶部内边距
-  --ti-guide-header-padding-top: var(--ti-common-space-6x, 24px);
+  --ti-guide-header-padding-top: var(--ti-common-space-6x);
   // 引导框头部背景色
   --ti-guide-header-bg-color: var(--ti-common-color-bg-white-normal, #fff);
   // 引导框标题文本色
   --ti-guide-title-text-color: var(--ti-common-color-text-primary, #252b3a);
   // 引导框标题行高
-  --ti-guide-title-line-height: var(--ti-common-line-height-6, 32px);
+  --ti-guide-title-line-height: var(--ti-common-line-height-2);
   // 引导框标题字重
   --ti-guide-title-font-weight: var(--ti-common-font-weight-7, bold);
   // 引导框标题字号
-  --ti-guide-title-text-font-size: var(--ti-common-font-size-3, 18px);
+  --ti-guide-title-text-font-size: var(--ti-common-font-size-2);
   // 引导框关闭按钮图标字号
   --ti-guide-cancel-icon-font-size: var(--ti-common-font-size-5, 24px);
   // 引导框关闭按钮图标宽度
@@ -38,25 +38,25 @@
   // 引导框关闭按钮图标字重
   --ti-guide-cancel-icon-font-weight: var(--ti-common-font-weight-1, 100);
   // 引导框关闭按钮图标顶部外边距
-  --ti-guide-cancel-icon-margin-top: -6px;
+  --ti-guide-cancel-icon-margin-top: calc(var(--ti-common-space-base) * (-6));
   // 引导框关闭按钮图标顶部外边距
-  --ti-guide-cancel-icon-margin-right: var(--ti-common-space-0, 0px);
+  --ti-guide-cancel-icon-margin-right: calc(var(--ti-common-space-base) * (-2));
   // 引导框关闭按钮图标顶部外边距
-  --ti-guide-progress-style-left: var(--ti-common-space-6x, 24px);
+  --ti-guide-progress-style-left: var(--ti-common-space-6x);
   // 引导框关闭按钮图标悬浮色
   --ti-guide-cancel-hover-icon-color: var(--ti-common-color-icon-hover, #5e7ce0);
   // 引导框内容文本色
-  --ti-guide-text-text-color: var(--ti-common-color-text-primary, #252b3a);
+  --ti-guide-text-text-color: #595959;
   // 引导框内容行高
-  --ti-guide-text-line-height: var(--ti-common-line-height-4, 20px);
+  --ti-guide-text-line-height: var(--ti-common-line-height-2);
   // 引导框内容字号
   --ti-guide-text-font-size: var(--ti-common-font-size-1, 14px);
   // 引导框内容上内边距
-  --ti-guide-text-padding-top: var(--ti-common-space-6x, 24px);
+  --ti-guide-text-padding-top: var(--ti-common-space-2x);
   // 引导框内容水平内边距
-  --ti-guide-text-padding-horizontal: var(--ti-common-space-6x, 24px);
+  --ti-guide-text-padding-horizontal: var(--ti-common-space-6x);
   // 引导框内容底部内边距
-  --ti-guide-text-padding-bottom: calc(var(--ti-common-space-base, 4px) * 5.5);
+  --ti-guide-text-padding-bottom: var(--ti-common-space-6x);
   // 引导框内容滚动wrap左内边距
   --ti-guide-text-scrollbox-padding-right: var(--ti-common-space-2x, 8px);
   // 引导框内容滚动条宽度
@@ -68,33 +68,33 @@
   // 引导框内容滚动条边框色
   --ti-guide-text-scrollbar-border-color: var(--ti-common-scrollbar-thumb-active-bg-color, #999999);
   // 引导框底部右下圆角
-  --ti-guide-footer-border-bottom-right-radius: var(--ti-common-border-radius-1, 4px);
+  --ti-guide-footer-border-bottom-right-radius: var(--ti-common-border-radius-4);
   // 引导框底部左下圆角
-  --ti-guide-footer-border-bottom-left-radius: var(--ti-common-border-radius-1, 4px);
+  --ti-guide-footer-border-bottom-left-radius: var(--ti-common-border-radius-4);
   // 引导框底部左内边距
-  --ti-guide-footer-padding-left: var(--ti-common-space-6x, 24px);
+  --ti-guide-footer-padding-left: var(--ti-common-space-6x);
   // 引导框底部右内边距
-  --ti-guide-footer-padding-right: var(--ti-common-space-6x, 24px);
+  --ti-guide-footer-padding-right: var(--ti-common-space-6x);
   // 引导框底部底部内边距
-  --ti-guide-footer-padding-bottom: var(--ti-common-space-6x, 24px);
+  --ti-guide-footer-padding-bottom: var(--ti-common-space-6x);
   // 引导框进度条文本颜色
   --ti-guide-progress-text-color: var(--ti-common-color-primary-normal, #5e7ce0);
   // 引导框按钮默认样式文本色
-  --ti-guide-button-text-color: var(--ti-common-color-text-white, #fff);
+  --ti-guide-button-text-color: #191919;
   // 引导框按钮默认样式文本色
-  --ti-guide-button-border: var(--ti-common-color-text-white, #fff);
+  --ti-guide-button-border: #595959;
   // 引导框按钮默认样式圆角
-  --ti-guide-button-border-radius: var(--ti-common-border-radius-normal, 2px);
+  --ti-guide-button-border-radius: var(--ti-common-size-25x);
   // 引导框按钮默认样式背景色
-  --ti-guide-button-bg-color: var(--ti-common-color-primary-normal, #5e7ce0);
+  --ti-guide-button-bg-color: var(--ti-common-color-light);
   // 引导框按钮默认样式悬浮背景色
-  --ti-guide-button-hover-bg-color: var(--ti-common-color-primary-hover, #7693f5);
+  --ti-guide-button-hover-bg-color: var(--ti-common-color-light);
   // 引导框按钮默认样式悬浮背景色
-  --ti-guide-button-hover-border-color: var(--ti-common-color-primary-normal, #5e7ce0);
+  --ti-guide-button-hover-border-color: #C2C2C2;
   // 引导框按钮默认样式聚焦背景色
-  --ti-guide-button-focus-bg-color: var(--ti-common-color-primary-active, #7693f5);
+  --ti-guide-button-focus-bg-color: var(--ti-common-color-light);
   // 引导框按钮默认样式激活背景色
-  --ti-guide-button-active-bg-color: var(--ti-common-color-primary-active, #7693f5);
+  --ti-guide-button-active-bg-color: var(--ti-common-color-light);
   // 引导框按钮默认样式禁用背景色
   --ti-guide-button-disable-bg-color: var(--ti-common-color-primary-disabled-bgcolor, #f5f5f6);
   // 引导框按钮默认样式禁用文本色
@@ -118,11 +118,11 @@
   // 引导框按钮透明样式禁用边框色
   --ti-guide-button-secondary-disabled-border-color: var(--ti-common-color-line-disabled, #dfe1e6);
   // 引导框按钮宽度
-  --ti-guide-button-width: calc(var(--ti-common-line-height-6, 48px) * 2);
+  --ti-guide-button-width: calc(var(--ti-common-line-height-8) + 8px);
   // 引导框按钮高度
-  --ti-guide-button-height: var(--ti-common-size-height-normal, 32px);
+  --ti-guide-button-height: var(--ti-common-line-height-2);
   // 引导框边框圆角
   --ti-guide-shepherd-element-border-radius: var(--ti-common-border-radius-1, 4px);
   // 分页提示文字颜色
-  --ti-guide-progresss-text-color: var(--ti-common-color-text-primary, #252b3a);
+  --ti-guide-progresss-text-color: #808080;
 }
diff --git a/packages/theme/src/image-viewer/old-theme.js b/packages/theme/src/image-viewer/old-theme.js
new file mode 100644
index 000000000..376444598
--- /dev/null
+++ b/packages/theme/src/image-viewer/old-theme.js
@@ -0,0 +1,15 @@
+export const tinyImageViewerOldTheme = {
+  'ti-image-viewer-next-right': 'var(--ti-common-size-10x)',
+  'ti-image-viewer-prev-left': 'var(--ti-common-size-10x)',
+  'ti-image-viewer-actions-divider-display': "'inline-block'",
+  'ti-image-viewer-actions-count-margin-left': '10px',
+  'ti-image-viewer-actions-count-font-size': 'var(--ti-common-font-size-4)',
+  'ti-image-viewer-actions-icon-size': '1rem',
+  'ti-image-viewer-actions-icon-margin-right': 'var(--ti-common-size-5x)',
+  'ti-image-viewer-mask-bg-color': 'rgba(0, 0, 0, 0.5)',
+  'ti-image-viewer-btn-opacity': '0.8',
+  'ti-image-viewer-actions-bottom': '30px',
+  'ti-image-viewer-actions-height': '44px',
+  'ti-image-viewer-actions-width': '282px',
+  'ti-image-viewer-close-bg-color': '#606266'
+}
diff --git a/packages/theme/src/image-viewer/smb-theme.js b/packages/theme/src/image-viewer/smb-theme.js
deleted file mode 100644
index 73838b8f6..000000000
--- a/packages/theme/src/image-viewer/smb-theme.js
+++ /dev/null
@@ -1,15 +0,0 @@
-export const tinyImageViewerSmbTheme = {
-  'ti-image-viewer-close-bg-color': 'rgba(0,0,0,0.10)',
-  'ti-image-viewer-mask-bg-color': 'var(--ti-common-border-color-transparent-8)',
-  'ti-image-viewer-actions-height': 'var(--ti-common-size-10x)',
-  'ti-image-viewer-actions-width': 'calc(var(--ti-common-size-50x) + var(--ti-common-size-12x))',
-  'ti-image-viewer-actions-icon-margin-right': 'var(--ti-common-size-0)',
-  'ti-image-viewer-actions-icon-size': 'var(--ti-common-font-size-2)',
-  'ti-image-viewer-actions-count-font-size': 'var(--ti-common-font-size-1)',
-  'ti-image-viewer-actions-count-margin-left': 'var(--ti-common-size-0)',
-  'ti-image-viewer-actions-divider-display': 'none',
-  'ti-image-viewer-btn-opacity': '1',
-  'ti-image-viewer-prev-left': 'var(--ti-common-size-8x)',
-  'ti-image-viewer-next-right': 'var(--ti-common-size-8x)',
-  'ti-image-viewer-actions-bottom': 'var(--ti-common-size-8x)'
-}
diff --git a/packages/theme/src/image-viewer/vars.less b/packages/theme/src/image-viewer/vars.less
index 50e652833..01b1955e3 100644
--- a/packages/theme/src/image-viewer/vars.less
+++ b/packages/theme/src/image-viewer/vars.less
@@ -14,7 +14,7 @@
   --ti-image-viewer-text-color: var(--ti-common-color-light, #fff);
   --ti-image-viewer-actions-inner-text-color: var(--ti-common-color-light, #fff);
   --ti-image-viewer-close-font-size: var(--ti-common-font-size-4, 20px);
-  --ti-image-viewer-close-bg-color: #606266;
+  --ti-image-viewer-close-bg-color: rgba(0,0,0,0.10);
   --ti-image-viewer-close-top: 40px;
   --ti-image-viewer-close-right: 40px;
   --ti-image-viewer-close-width: 40px;
@@ -22,21 +22,21 @@
   --ti-image-viewer-close-bg-color-hover: #606266;
   --ti-image-viewer-actions-border-radius: 22px;
   --ti-image-viewer-actions-inner-font-size: 23px;
-  --ti-image-viewer-actions-width: 282px;
-  --ti-image-viewer-actions-height: 44px;
-  --ti-image-viewer-actions-bottom: 30px;
+  --ti-image-viewer-actions-width: calc(var(--ti-common-size-50x) + var(--ti-common-size-12x));
+  --ti-image-viewer-actions-height: var(--ti-common-size-10x);
+  --ti-image-viewer-actions-bottom: var(--ti-common-size-8x);
   --ti-image-viewer-actions-inner-justify-content: space-around;
   --ti-image-viewer-next-font-size: var(--ti-common-font-size-5, 24px);
   --ti-image-viewer-next-width: 44px;
   --ti-image-viewer-next-height: 44px;
   --ti-image-viewer-mask-wrap-bg-color: none;
-  --ti-image-viewer-btn-opacity: 0.8;
-  --ti-image-viewer-mask-bg-color: rgba(0, 0, 0, 0.5);
-  --ti-image-viewer-actions-icon-margin-right: var(--ti-common-size-5x);
-  --ti-image-viewer-actions-icon-size: 1rem;
-  --ti-image-viewer-actions-count-font-size: var(--ti-common-font-size-4);
-  --ti-image-viewer-actions-count-margin-left: 10px;
-  --ti-image-viewer-actions-divider-display: 'inline-block';
-  --ti-image-viewer-prev-left: var(--ti-common-size-10x);
-  --ti-image-viewer-next-right: var(--ti-common-size-10x);
+  --ti-image-viewer-btn-opacity: 1;
+  --ti-image-viewer-mask-bg-color: var(--ti-common-border-color-transparent-8);
+  --ti-image-viewer-actions-icon-margin-right: var(--ti-common-size-0);
+  --ti-image-viewer-actions-icon-size: var(--ti-common-font-size-2);
+  --ti-image-viewer-actions-count-font-size: var(--ti-common-font-size-1);
+  --ti-image-viewer-actions-count-margin-left: var(--ti-common-size-0);
+  --ti-image-viewer-actions-divider-display: none;
+  --ti-image-viewer-prev-left: var(--ti-common-size-8x);
+  --ti-image-viewer-next-right: var(--ti-common-size-8x);
 }
diff --git a/packages/theme/src/image/old-theme.js b/packages/theme/src/image/old-theme.js
new file mode 100644
index 000000000..85e4e1645
--- /dev/null
+++ b/packages/theme/src/image/old-theme.js
@@ -0,0 +1,7 @@
+export const tinyImageOldTheme = {
+  'ti-image-error-bg-image-url': "url('data:image/jpeg",
+  'ti-image-error-display': 'none',
+  'ti-image-error-line-height': 'var(--ti-common-line-height-number, 1.5)',
+  'ti-image-error-bg-color': 'var(--ti-common-color-bg-disabled, #f5f5f6)',
+  'ti-image-error-text-color': 'var(--ti-common-color-bg-secondary, #adb0b8)'
+}
diff --git a/packages/theme/src/image/smb-theme.js b/packages/theme/src/image/smb-theme.js
deleted file mode 100644
index 9099a5ab6..000000000
--- a/packages/theme/src/image/smb-theme.js
+++ /dev/null
@@ -1,7 +0,0 @@
-export const tinyImageSmbTheme = {
-  'ti-image-error-bg-color': 'var(--ti-common-color-bg-normal)',
-  'ti-image-error-bg-image-url': 'none',
-  'ti-image-error-text-color': 'var(--ti-common-color-text-weaken)',
-  'ti-image-error-display': 'inlin-block',
-  'ti-image-error-line-height': 'var(--ti-common-line-height-1)'
-}
diff --git a/packages/theme/src/image/vars.less b/packages/theme/src/image/vars.less
index 631761a82..f90b401cf 100644
--- a/packages/theme/src/image/vars.less
+++ b/packages/theme/src/image/vars.less
@@ -14,13 +14,13 @@
   // 图片错误字号
   --ti-image-error-font-size: var(--ti-common-font-size-1, 14px);
   // 图片错误色
-  --ti-image-error-text-color: var(--ti-common-color-bg-secondary, #adb0b8);
+  --ti-image-error-text-color: var(--ti-common-color-text-weaken);
   // 图片错误背景色
-  --ti-image-error-bg-color: var(--ti-common-color-bg-disabled, #f5f5f6);
+  --ti-image-error-bg-color: var(--ti-common-color-bg-normal);
   // 图片错误文本行高
-  --ti-image-error-line-height: var(--ti-common-line-height-number, 1.5);
+  --ti-image-error-line-height: var(--ti-common-line-height-1);
   // 图片错误icon和文本是否显示
-  --ti-image-error-display: none;
+  --ti-image-error-display: inlin-block;
   // 图片错误背景图
-  --ti-image-error-bg-image-url: url('data:image/jpeg;base64,/9j/4AAQSkZJRgABAQAASABIAAD/4QBYRXhpZgAATU0AKgAAAAgAAgESAAMAAAABAAEAAIdpAAQAAAABAAAAJgAAAAAAA6ABAAMAAAABAAEAAKACAAQAAAABAAABIKADAAQAAAABAAABIAAAAAD/7QA4UGhvdG9zaG9wIDMuMAA4QklNBAQAAAAAAAA4QklNBCUAAAAAABDUHYzZjwCyBOmACZjs+EJ+/8AAEQgBIAEgAwERAAIRAQMRAf/EAB8AAAEFAQEBAQEBAAAAAAAAAAABAgMEBQYHCAkKC//EALUQAAIBAwMCBAMFBQQEAAABfQECAwAEEQUSITFBBhNRYQcicRQygZGhCCNCscEVUtHwJDNicoIJChYXGBkaJSYnKCkqNDU2Nzg5OkNERUZHSElKU1RVVldYWVpjZGVmZ2hpanN0dXZ3eHl6g4SFhoeIiYqSk5SVlpeYmZqio6Slpqeoqaqys7S1tre4ubrCw8TFxsfIycrS09TV1tfY2drh4uPk5ebn6Onq8fLz9PX29/j5+v/EAB8BAAMBAQEBAQEBAQEAAAAAAAABAgMEBQYHCAkKC//EALURAAIBAgQEAwQHBQQEAAECdwABAgMRBAUhMQYSQVEHYXETIjKBCBRCkaGxwQkjM1LwFWJy0QoWJDThJfEXGBkaJicoKSo1Njc4OTpDREVGR0hJSlNUVVZXWFlaY2RlZmdoaWpzdHV2d3h5eoKDhIWGh4iJipKTlJWWl5iZmqKjpKWmp6ipqrKztLW2t7i5usLDxMXGx8jJytLT1NXW19jZ2uLj5OXm5+jp6vLz9PX29/j5+v/bAEMAAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAf/bAEMBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAf/dAAQAJP/aAAwDAQACEQMRAD8A/v4oAKACgAoAKACgAoAKACgAoAKACgAoAKACgAoAKACgAoAKACgAoAKACgAoAKACgAoAKACgAoAKACgAoAKACgD/0P7+KACgAoAKACgAoAKACgAoAKACgAoAKACgAoAKACgAoAKACgAoAKACgAoAKACgAoAKACgAoAKACgAoAKACgAoA/9H+/igAoAKACgAoAKACgAoAKACgAoAKACgAoAKACgAoAKACgAoAKACgAoAKACgAoAKACgAoAKACgAoAKACgAoAKAP/S/v4oAKACgAoAKACgAoAKACgAoAKACgAoAKACgAoAKACgAoAKACgAoAKACgAoAKACgAoAKACgAoAKACgAoAKACgD/0/7+KACgAoAKACgAoAKACgAoAKACgAoAKACgAoAKACgAoAKACgAoAKACgAoAKACgAoAKACgAoAKACgAoAKACgAoA/9T+/igAoAKACgAoAKACgAoAKACgAoAKACgAoAKACgAoAKACgAoAKACgAoAKACgAoAKACgAoAKACgAoAKACgAoAKAP/V/v4oAKACgAoAKAOH134jeBvDMpg1vxVo9jcp/rLM3P2i9j/662los91DnP8Ay2i4OeCRQByL/tA/CJSQfF2Sv93RPEb/AMtGbnt/jyKAE/4aD+EX/Q3j/wAJ/wAT/wDymoAP+Gg/hF/0N4/8J/xP/wDKagA/4aD+EX/Q3j/wn/E//wApqAD/AIaD+EX/AEN4/wDCf8T/APymoAP+Gg/hF/0N4/8ACf8AE/8A8pqAD/hoP4Rf9DeP/Cf8T/8AymoAP+Gg/hF/0N4/8J/xP/8AKagA/wCGg/hF/wBDeP8Awn/E/wD8pqAD/hoP4Rf9DeP/AAn/ABP/APKagA/4aD+EX/Q3j/wn/E//AMpqAD/hoP4Rf9DeP/Cf8T//ACmoAP8AhoP4Rf8AQ3j/AMJ/xP8A/KagA/4aD+EX/Q3j/wAJ/wAT/wDymoAP+Gg/hF/0N4/8J/xP/wDKagA/4aD+EX/Q3j/wn/E//wApqAD/AIaD+EX/AEN4/wDCf8T/APymoAP+Gg/hF/0N4/8ACf8AE/8A8pqAD/hoP4Rf9DeP/Cf8T/8AymoAP+Gg/hF/0N4/8J/xP/8AKagA/wCGg/hF/wBDeP8Awn/E/wD8pqAJIvj78JJn2J4viDD/AJ7aP4it4/8Av7Po8UXA9+3X+6AegaH4s8N+J4jNoGu6Xq6qu50sLyGedB0zLbBvPh5Ix50S+m09VAOjoAKACgAoAKACgAoA/9b+/igAoAKAK000dtDLcTyrFbwpJNNLNJ5ccUSfvJJZJH2iOOKMEk5UAZzgBmUA+CPi18ftX8R3d1ong27udJ8ORPJC+pW0klvqGuZ/dGXzQons9NmPMEEAFzc2/Nz/AMfJt4AD5ys7G+1K4W20+zvNQupPuW9nby3lxJ/2yiMkwx9fyz8wB04+HPxBYAr4D8ZsG/6ljWP/AJBPp3A+v8NAB/wrj4h/9CH4y/8ACY1//wCRKAD/AIVx8Q/+hD8Zf+Exr/8A8iUAH/CuPiH/ANCH4y/8JjX/AP5EoAP+FcfEP/oQ/GX/AITGv/8AyJQAf8K4+If/AEIfjL/wmNf/APkSgA/4Vx8Q/wDoQ/GX/hMa/wD/ACJQAf8ACuPiH/0IfjL/AMJjX/8A5EoAP+FcfEP/AKEPxl/4TGv/APyJQAf8K4+If/Qh+Mv/AAmNf/8AkSgA/wCFcfEP/oQ/GX/hMa//APIlAB/wrj4h/wDQh+Mv/CY1/wD+RKAD/hXHxD/6EPxl/wCExr//AMiUAH/CuPiH/wBCH4y/8JjX/wD5EoAP+FcfEP8A6EPxl/4TGv8A/wAiUAH/AArj4h/9CH4y/wDCY1//AORKAD/hXHxD/wChD8Zf+Exr/wD8iUAH/CuPiH/0IfjL/wAJjX//AJEoAP8AhXHxD/6EPxl/4TGv/wDyJQAf8K4+If8A0IfjL/wmNf8A/kSgA/4Vx8Q/+hD8Zf8AhMa//wDIlAEc3w/8eW6NLceCfFtvCn35ZvDWsxxx/wDbWS0OeeOg9CeDQBz1ne6jpF7HeWF1eadqFnNvhubaSWzvLeSP/njLF9nmh6/X6DJoA+4fgn8dZPFE9v4R8YyQprhTZpWs/u7ePV3j62t1EMRRal18iaAm3vz/AKOP9LC/aAD6qoAKACgAoAKACgD/1/7+KACgAoA+ZP2m/GM+h+E7Lw1ZTeXc+Kpp0vGXl/7H08Qy3cQGf+XyaaC3I4+0W4ubcA5JUA+Ovh54JvfiB4psfDtnJ9njk8y51K8EYk+waZB/x83IiwB55PkQQc4+03FsOM7qAP0z8LeDfDvgrTY9K8O6bFYwKsYml2CS8vZU6XN/dH97dzZHVjthzttxDAQqAHW0AFABQAUAFABQAUAFABQAUAFABQAUAFABQAUAFABQAUAFABQAUAeO/FH4RaD8Q9OnlS3t9P8AFEMUj6drcUXlySSIP3VpqZiA+2WcxxDmYvPbZM9tjE9vOAfmvLFf6LqUkMgmsdU0m/kV8fu7i01HTpenbyJoZoT3PsOBQB+p/wAOPFI8a+CvD/iKTy/tV7aFb9UACrqNpLJaXxEWCYRLNDLNDCSCIJl4wA1AHd0AFABQAUAFAH//0P7+KACgAoA+B/2rLhm8caDa5/dweFbe5Tr/AKy41nWI5B064tBx+uOKAOi/ZKtIZL3xzfMv+kW9toFpDJ/073kusSS8f9ddNh7cY5zkUAfa1ABQAUAFABQAUAFABQAUAFABQAUAFABQAUAFABQAUAFABQAUAFABQAUAfmH8drSGy+LPjCGBdqSXOn3j7Cf9ZqGjabf3WTyP3800/b88UAfVP7Llw8/w4vYm+7a+K9Tt0/65vpmj3fHT/lrdt39uOaAPpOgAoAKACgAoA//R/v4oAKACgD8/v2qf+Sh6P/2Jmn/+n7xJQB2v7I3/ADUH/uVP/dloA+zKACgAoAKAMjV9b0fQbJ9R1nU7PTLGPAe5v7hLePcQcRgyhfNlbbgRKTMccZP3gDyO7/aK+FVtP5K67eXQVtjzW2j6o8APQYaWyi83pk+Ru+ozigDtvDHxJ8EeM3MPh3xFY311sLfYX82z1EeXzIRYX0UF5KIT1mhhmgyPvnALAHe0AFABQAUAFABQAUAFABQAUAFABQAUAFABQAUAFAH5nftBf8ld8X/Xw/8A+oxo1AH0v+yn/wAk81n/ALHK+/8ATB4boA+mqACgAoAKACgD/9L+/igAoAKAPz+/ap/5KHo//Ymaf/6fvElAHa/sjf8ANQf+5U/92WgD7MoAKACgDkfG3i3T/BHhvUvEepZeGxh/dWyOElvLuT93a2kWc8zTMNx/5YQC4uSpFuRQB+YnjPxx4h8d6xNrGvXkkzZlS0s1zHp+n2//AD62Nr83kw9hP/x8T4Fxc3NxcgGgDkKAJIpZbeWOeCR4ZoXjeGaGTy5I5I+IpYpYifJmH5e54oA++fgH8X7rxlC/hXxLN5viLTbYXFlfucPrFhF+6k87vNqNmcCeYY+1W+Lhg09tcXFwAfTdABQAUAFABQAUAFABQAUAFABQAUAFABQAUAFAH5nftBf8ld8X/Xw//wCoxo1AH0v+yn/yTzWf+xyvv/TB4boA+mqACgAoAKACgD//0/7+KACgAoA/P79qn/koej/9iZp//p+8SUAdr+yN/wA1B/7lT/3ZaAPsygAoAKAPjT9rLWJlj8IaCjbbeR9T1e5QdJZLfybWx7f8sopr8cnH7/tn5gD4yoAKACgDtvhtrE+hePPCOpwNtaHXtPhm9rO9uobC/iHXPnWc9xBx+mc0AfrFQAUAFABQAUAFABQAUAFABQAUAFABQAUAFABQB+Z37QX/ACV3xf8AXw//AOoxo1AH0v8Asp/8k81n/scr7/0weG6APpqgAoAKACgAoA//1P7+KACgAoA/P79qn/koej/9iZp//p+8SUAdr+yN/wA1B/7lT/3ZaAPsygAoAKAPkL9rDQZ7jTPCviWGN2h0+6vdKvHQ48v7fFFdWEsv/THz7OeD/r4uLegD4koAKACgD0P4UaDP4j+IfhPToY3ZY9Ys9SvJMf6uz0uX7fdebyT/AKmEwen2i4zk5NAH6q0AFABQAUAFABQAUAFABQAUAFABQAUAFABQAUAfmd+0F/yV3xf9fD//AKjGjUAfS/7Kf/JPNZ/7HK+/9MHhugD6aoAKACgAoAKAP//V/v4oAKACgD8/v2qf+Sh6P/2Jmn/+n7xJQB2v7I3/ADUH/uVP/dloA+zKACgAoAwfEWgaZ4p0bUtA1iHz9P1O2Ntcxqdki8+bFNDL1ingmWKeCbok8Kna3SgD81viN8J/E/w8vpvtdrLf6C0n+ga7bRyfY5Ek/wBVDd4OLO9BGPIn9P8ARhc22aAPLqANTR9E1fxBfQ6Zomm3mqahMfktrOCW5k56yyjjyYYR/r55ybe37bck0AfoZ8FfhEnw60+bUdVaK48U6tCkN60Pz2+l2eVlGl20vDTfv/399ccrcTrCIMQWy3F0Ae8UAFABQAUAFABQAUAFAHyH8Y/2gb/QNXu/C3gZrZb3T28nWNdmjhvBbXkZ/fWFhbSiS0M1mT5N7cXMNwRcMbYWq+QbhgDx7w/+0Z8SNIvo59U1KHxFp+/FzYX9nY2/mR/8tfst3p9lDNDN/wA8P+Pi3Ha2ucDaAfeXhDxXpHjXQrTX9EuPPtbpSJIm4uLK6jx51hdx9YriFuueGUrcQFreeFqAOroAKACgAoAKAPzO/aC/5K74v+vh/wD9RjRqAPpf9lP/AJJ5rP8A2OV9/wCmDw3QB9NUAFABQAUAFAH/1v7+KACgAoA/P79qn/koej/9iZp//p+8SUAdr+yN/wA1B/7lT/3ZaAPsygAoAKACgCGSOOaNopUSRJF2PHIm9HQ9njPHrwT9M4oA4S6+Fnw6vJjcXHgnw4ZnbczJplrBvf1ljtliilPfLDsPrQB1Ok6DougwfZtF0jTdIg6vDptjbWcbnHBkFtHEJD9QT2PagDYoAKACgAoAKACgAoAKAPD/AI3/ABKT4f8AhpoNPmQ+JdcSW20iNeZLOMjFzrEmDgCyHNsOs9+0GQbeG62gH5su7yO0kjPJJI+93f8AeSSSSf59fwb+EAbQB6j8KfidqXw215LpPOutB1B44ta0pP8Alvbn/VXVrwIv7TsxxBtINwCba4I+1brcA/TDR9Y07XtMstY0m7hvtP1CCO5tLmE5jkjkH5xzR4aCa3lCz286tbzhXXawBr0AFABQAUAfCnxk+EfxE8TfETxD4g0Pw4+o6TfHSBbXKaho8Rl+xaFptpL/AKLNqFvefuruCeH99Bj+JcqcsAe2/s6+Gdf8KeC9V03xFpdzpN9J4pvLxLa58svJbS6PoUUcsflfL5QlhmgBz1g7ZoA9+oAKACgAoAKAP//X/v4oAKACgD8/v2qf+Sh6P/2Jmn/+n7xJQB2v7I3/ADUH/uVP/dloA+zKACgAoAKACgAoAKACgAoAKACgAoAKACgDD1/XNN8M6PqGvavcC207TLaS5un43nHEUUQ4Ms00pEEEP/LeeZQCM4UA/LPx14y1Lx34l1DxFqTYNw/k2dn5nmR6fp8f/HrYxYHWGLJuO1zcfarn5Tc5oA4+gAoAKAPefgn8XZvAGpjSdYmml8I6nN/pCjLnR7yQiP8AtS1jBB8gkf8AEwts4Nv/AKRATc2wtrgA/RiKWKeNJopEkhlRJIpEO+N0k5idCMjBBByP0zmgCegAoAwL3xR4a01vL1HxDoVhIv8ABe6xYWj/AE2zzQn9B79toBRj8e+BpjiLxp4Tlb+5H4j0eQn/AL5us/y9+mGAOjtbu1vYvPs7q3u4m/5a2s8U8XT/AJ6wnHr/AHiP1oAtUAFABQAUAFAH/9D+/igAoAKAPz+/ap/5KHo//Ymaf/6fvElAHa/sjf8ANQf+5U/92WgD7MoAKACgAoAKACgAoAKACgAoAKACgAoAKAPgD9on4nf8JLrH/CHaNPnQ9Cuf9PlhlPl6nrEf7uUH+Ga007PkQkcG5+0z/MBalQD5moAKACgC3YWF7qt7a6bptrNfX15NHbW1nbR+ZcXMkv8Ayyii/wDr/ng0Afe3wp/Z/wBK8Kx2mu+K4odY8TDZPFZSeXPpmiuATEIIseVeXkR63E4eG2m/49ATALucA948QeJNC8K6fLqviHVrbS7GPOZLl8SSP08m2ijBmu5h2gt4Z5z12EUAfI3jP9qa7keS08DaUkEQ+T+2Nbj8yd8/8tbXS4pRDFjpm+mnyD81pARuYA+b9f8AiB418TtIdd8TaxqEcn37N7yW308n/pnYW3lWcOe/7nPHOaAOPoAKALVnfXunTrdafeXNjdRn5LmzuJbe4j7/AOti8mb/ADjJyAoB7N4W/aC+I/hto0udUTxJYpnfba9H9suPLPJ8rU4TBqPnjHW4muIB2tv4qAPrXwD8efB3jh4dPnZ/DmuzbETTdTlj8i7lP/LPT9TxDDMQRxDPDa3E+cW1vOCdwB7nQAUAFAH/0f7+KACgAoA/P79qn/koej/9iZp//p+8SUAdr+yN/wA1B/7lT/3ZaAPsygAoAKACgAoA84+IPxK8OfDfTY73WpZJ7y68xdN0q02Nf3jpzLIPMZVgtYSAZ7ibhRwq3FwVt2APBLD9rOwkvVTU/BdzZ2DN89zZazFf3ccf/PUWs2nafBN+N9B3HOM0AfTPhjxh4c8Zacup+G9UttRtjt85I/kubSSQZEV7ayYuLSfr8s8SHgnkDNAHU0AFABQAUAFAHgPx5+Jv/CDeHjpGlXHl+JfEEUsNo6OPM0zT/wDVXWqZ+YxTD/U2J248/wA+4GfspKgH5zEknJ/z/L+XvxmgBKACgCSGGW5ljggjeaaZ44YoII/Mkkkk/dRRRQ4/fTTf/X+XJLAH6K/BL4QweAtMj1fWbeCbxbqMWZn/AHcn9j2sg3DS7aTGPNxzfXER/fkC2BNvADOAdL8Uvito3w10zdNt1DxBexSNpWjK+HlGdn2u+6m106KVguSRNcMDDbAYuZrUA/Orxd4x8ReONVk1fxFqDXlwfkhh/wBVZ6fbk/8AHrYWv+pih79BcXH/AC83Vxc4NAHLUAFABQAUAFABQAUAfUfwh+P97oUtr4d8b3U2oaBmOG01h/Mn1DSMf6pbuU5lvNMiHB4a5t1/49vtFuq26gH3XBcQXcEN1bSxT21xFHNbzQyeZHPFJH5kUsUicSxyRkMuMgjkbvlDAFqgD//S/v4oAKACgD8/v2qf+Sh6P/2Jmn/+n7xJQB2v7I3/ADUH/uVP/dloA+zKACgAoAKAOd8TeJNM8J6HqGv6xMIbHToTLIAP3s0nEcNtbREZlnu5SIYFySS3AABagD8uPHPjLVPHfiS98Raq22S4fybOzSXzLfT9Pj/49bCIYBHlf8t+T9ouPtVycfaaAOQoA2NC8Qa14a1GHVdA1K80vUIfuXNnJ5fmR/8APKWLmGWH/nvDNbXFtP8A8+pz8oB9mfDr9pjTdR+z6X48hTSb5tiJrtpFMdLuCR11C2zLPp0pIyZoftGn5JJbTrYA0AfVNtc2t7bRXVncQ3VrOglhubaWOe3njfpJFLEWilj5PzAtnGe9AFugAoA5zxR4k0zwloWo+INWl8uy023MzgMBJPIf3dtbW4wcz3kzLDCB/ERnAJZQD8sPF/irU/GviHUvEerSbrrUJt6QxyHy7Ozj/wCPWwteD+5tIf3Bzg3H/H1/x83INAHM0AFABQB9Zfs0fDddSvn8fatAGs9KmktdBhkj4uNVj/4+r/vmLThN5Nv8pB1AfaD/AKTp2VAPqr4h+OdO+H3hq81+9HmzJ/o2m2O8I+o6nMn+jWoOV/dnBmuZxkQW8E7nONjAH5feIfEOreKtYvtd1u6e81C+m3yu/wDq44/+WVraxY/cwwwgwQQYHkW/PFAGJQAUAFAH1p8BPgzo/iTTf+Ez8WWxv7J7meLRNJdvLsrj7JKYrq+vvL2yTxfa1aCG33iFfs8/2oXIYFgD6N8QfBf4ca/p0li/hfSdKkZAsF/odlbaXeW8g4jlV7OJIpyOyXsVxb9vIJOKAPzj8X+Grzwd4l1jw1fN5lxpN59m85I/LiuLaSLzbW68r/lj9ss5oJs5/wCXjHBoA5qgAoAKAPq39nn4syaVfW/gLxDc7tKv5fJ8PXM0mf7Mv5JD/wAS8y8f6HqUx/ccgwahwSBdsLcA+66AP//T/v4oAKACgD8/v2qf+Sh6P/2Jmn/+n7xJQB2v7I3/ADUH/uVP/dloA+zKACgAoAYzKiszNtVfmZm6Y/QdscD24oA/Ob47fFNvHWuf2NpFxnwroc0iW2w5j1TUE/dy6nKdo/cAkwWPXFt9puQB9pxQB4HQAUAFABQB6N4F+Kfi/wCH06nRdQ87TWfzLnRb/wA2fS7jn97+75+xzZ/5b2Atrg/8vP2rJ2gH3P8AD344+EPHgispJv8AhH/ED4j/ALH1KeLZcydMaZfjyob32gP2e/HQ2uAWUA9hubm2sreW6u7iG1tbdPNmuLmWOC3gjT/lpJNKRFFGMckhcZzxg7gD88/jz8VY/HWsQ6JodzJJ4W0Z96zIdkesapzHLfdiYIYSYLDIHH2m54Fzi3APn2gAoAKANHSNLutb1TTdIsY/Mu9Tv7OwtlP/AD3u5YYojnj/AJ7ei/rQB+s3hjw9Z+FPD+keHtNX/RdKs47dXI2PPJ/rLm6lxx515cNNcznj99OTzgmgD8+vj549k8ZeNLqwtZ/M0Pwy8+l2Maf6ue7j41S+xlh++vIBBDODg29tbEZ+1fKAeG0AFABQAUAfpV+zzdpcfCbw2g4a0m1m3bPr/bWo3I7f88pxjPX0WgD26gD8x/j3dLd/Fnxc6/dSbS7f3/0PRtNtpcev76HPb05x8oB4/QAUAFACqzRspRtpHzxun+HP8x9KAP05+C/jtvHngmxvLuYPrOmMdK1ok4eS6t4wYb0jHP220MMxzt/fm5A/1JFAH//U/v4oAKACgD8/v2qf+Sh6P/2Jmn/+n7xJQB2v7I3/ADUH/uVP/dloA+zKACgAoA+TP2jPir/ZFpL4A0C5C6nqEOPEV1A48yw0+4izFpkWP+XvU4yfP5/0aw9RclrcA+GqACgAoAKACgAoAKAL0+p6ldQx211qF/cW8f3IZryV7eP/AK5RSzeSe/t79qAKNABQAUAFAH0L+zT4fXVviKupTIWh8N6Veaim4fu/ttz5NhaxZ7YF5PcQdP8Aj378BgD7V+JviVvCPgTxLrsTFbq0094rCTgbdQv5YbCwlH3uIry7hmIGCRCSMchQD8piSTk/5/l/L34zQAlABQAUAFAH6Cfst3Yn+Hl/bE/NY+J9Rg2/9M5LHTLnj6zTz9v4e/NAH0pQB+UHxNvPtvxE8bXG7creJ9chSQf887e/mtYv/IMP5cYPVQDhqACgAoAKAPpD9mPxLJpPju40CST/AEXxRYSRbM/8xDS4pr+1lIweln9ugGMc3A+tAH//1f7+KACgAoA/P79qn/koej/9iZp//p+8SUAdr+yN/wA1B/7lT/3ZaAPsygAoA8q+LHxHtPhz4akvtyTa3f8AmWeg2LdZrvy8vdSx8k2dkP385A5Jgt8r9oBUA/Me/vbzVL261DULia8vr65kuby5mk8x7i4uJfNlll6Z6dMj8cYYAqUAFABQAUAFABQAUAFABQAUAFABQB9tfsm6cqaX4y1UrzdX+lacrf8AXlbXd1IO3OdSHf8ALIoA2/2qdTNt4L0TS0ba+p+IUlfp+8ttPsLvzY+Dzma7t5uf7uAM80AfBVABQAUAFABQB9t/sl3e/S/Glhu5t9Q0e72+n221vIv9of8ALl2PPvjCgH17QB+O+rXf2/VdSvvvfbL+8u//AAIuppeoIzxN6f8AAjQBn0AFABQAUAdX4E1RtG8a+E9TDGJbHxDo802P+ff7fD9pi/7bQ+fB16+maAP/1v7+KACgAoA/P79qn/koej/9iZp//p+8SUAdr+yN/wA1B/7lT/3ZaAPsygDF13XNM8O6RqOt6tcpbadplvJc3UzkcRx4/dRjKmWeWTEMEAOZp2WAYLfMAfl18Q/HWpfEHxLea7f74oP+PbS7AyeYlhpccv7q1PAHnf8ALaeYf6+e4uQMAAKAcNQAUAFABQAUAFABQAUAFABQAUAFABQB9+fsqAf8IDrjdz4wvc/+CbQvc/yGPfmgDlP2t2YQeBEH+rafxI7j/ppHHoXlfTknsfXjGGAPi6gAoAKACgAoA+s/2TbzZ4h8XWG7/j60izvNvp9ivjFn351LHb6DpQB9leI7v+zvD2v3+dv2LRtTvA3p9msZpvz/AHXt+mWAPyCoAKACgAoAKAJrdmS4hdP9Ys0bp/1083p6DH4n6cGgD//X/v4oAKACgD8/v2qf+Sh6P/2Jmn/+n7xJQB2v7I3/ADUH/uVP/dloA+zKAPzz+P8A8Vf+Ew1f/hGNDnz4a0S5/fTQy/u9Y1SPMUtyeMTWll/qLEf8vBN1cg4+zGgD5zoAKACgAoAKACgAoAKACgAoAKACgAoAKAPuf9k69EnhrxVp27Jtdas7w4x/y/2Hlf7Q5Gnen55+UAP2sbAyeGvC2qA/LZ63eWL+/wDaNh5o/wDTYf8AJoA+GKACgAoAKACgD1D4RePovh14wi1q7gmudOurK40rVVthH9pFpcSwy+daRSGCGaeG8s4J/IUgz2+cEGgD6S+J/wC0D4NvvB2q6J4UuLvV9T17T59Mkd7G70+3sLS8h8rUJpZL+GCSWb7HPcQQi3E6m4/5eBtAnAPh2gAoAKACgAoA3PDFg2q+JfD+lpw2pa3pdgmR/wA/d/DFx8xzxP8A15zhgD//0P7+KACgAoA+DP2rbSRPGfh6+K5juPDMdmj+klnqmpSy9v8AqJW/r16jJoA1v2TNRgj1XxnpLNtuL6w0e/hX+/HplzqcVyfz1i2+n4UAd5+0N8Vv+Eb01/BmhXW3XtYt8ardQyAyaPpc3HkjH+pvNSiz1Obewzcnb9ptrigD4IoAKACgAoAKACgAoAKACgAoAKACgAoAKACgD6g/ZX1xbHxjrGiSNtTXtH82HnO+80eXzYou3SzvL6fo3pkUAfTnxw8PN4j+GniO2hi8y806GPW7PH3xJpcv2m58rHHmzaaL+AfL/wAt+c9KAPzDoAKACgAoAKAJoLee6mjt7WGe4uJ32QwxRyyXEkn/ADyiii/ezc+2PrjcoBr6n4X8TaLCtxrPhzXtJt5PuTalo9/YW8n/AFyluoYIen1wOx5oAwqACgAoAKACgD3L9njw62u/EzS7lo/MtfD8N5rdz/zzElvF9lsevSb+0ruCfp/y7npQB//R/v4oAKACgD57/aL8ET+K/Ba6pp8Pnan4Vmn1FIUj8ySfTJ4fK1SGMZx5sQht78e9hgk4UMAfB3hPxTq3gzXrHxFoskcd7ZPJ8ksfmW9xbyxeTLa3MQ8gzQzw5wQQR/x822Lk0AZmq6rf61qV9q+qXD3moahcyXN5czf6ySST+X/TCDH+jW/TGaAM+gAoAKACgAoAKACgAoAKACgAoAKACgAoAKAOn8GeI5vCPirQfEcO9jpOpW9xMiH95PZ48q/tc8czWU08H4Zyc7KAP1ktri01Oxt7q3dLmx1C1iuYHHzx3FpeQ+bFIPu5jmhlyM8YPQAYYA/LX4o+DJfAnjTVtCEcn9n+f9v0eZ+DcaXd5ktT5uB5/wBj/wCPGY8Znt7jGeDQB59QAUAFABQB+jfwC8AaZ4Z8GaTr72sMviDxHaR6ncX7xiSeDTrwebYWFrLyYYPspt57gDm4uP8Aj4yLa3S1APcrq1tr22mtLy3hura4R4ri1uYo57eeOT/WRTQy5jljweVYEHodvIoA/Mn40eCrXwJ46vtL01fL0q+trfWNKhf959ns7yWaKa1wcEQw3tnPBB3+zm1yy4oA8ooAKACgAoA/Qr9m3wQ/hzwdJr97CYtS8VyRXio/+st9Ht/N/sz+6T9sE099uBxPBcWpONvzAH//0v7+KACgAoAKAPjH4s/s7XNxd3PiP4fwK4uZJLm/8NmSK38uST95LLo5k8uARTdDYzEi3P8Ax67gRBbgHyHqGm6hpNzJZapY3mm3kZ+e2v7eWzuI/aWKUxTf1Oc+gUAo0AFABQAUAFABQAUAFABQAUAFABQAUAFABQAUAfeP7NPxBXWNCfwRqU4OqeH0M2lGQ/vLvRJJOIoxg5k02abyScj/AECe0wuba5egDt/jd8NB8QfDazaci/8ACTaH58+kk8f2hBLzdaTLINwAuvKWa3bkQXECKWggubg0Afm1JHJDJJDNG8M0DyJNC8flyRyR/wCtilix/rjk+ufUZoAZQAUAFAH6N/ALx/pnibwZpOgPdQxeIPDlpHplxYPII559Osx5Vhf2sXBmg+yi3guCObe4/wCPjAubd7oA9yurq2sraa7vLiG1trdHluLq5ljgt4I4/wDWSzTS4jijwOWYgDqd3JoA/Mn40eNbXx346vtU01vM0qxtrfR9Kmf939os7OWaWa6yckwzXt5PPB3+zi1yrZoA8ooAKACgD2T4L/DKf4heI45L2F18NaRJHca1c9Y7gn97Fo0UgyTLeE/6R2tbb7USRP8AZxOAfpbFEkSJHFGscUaoiIieWiJH/q0SPtjoOmMcKSQFAP/T/v4oAKACgAoAKAM6/wBK0zVoxFqmnWGowryqX9nbXkefaO5imAPvj8TyGAOcb4c/D5juPgTwazH+JvDGi/rmxJH4nr6ZoAP+Fc/D3/oQfBv/AITGg/8AyJQAf8K5+Hv/AEIPg3/wmNB/+RKAD/hXPw9/6EHwb/4TGg//ACJQAf8ACufh7/0IPg3/AMJjQf8A5EoAP+Fc/D3/AKEHwb/4TGg//IlAB/wrn4e/9CD4N/8ACY0H/wCRKAD/AIVz8Pf+hB8G/wDhMaD/APIlAB/wrn4e/wDQg+Df/CY0H/5EoAP+Fc/D3/oQfBv/AITGg/8AyJQAf8K5+Hv/AEIPg3/wmNB/+RKAD/hXPw9/6EHwb/4TGg//ACJQAf8ACufh7/0IPg3/AMJjQf8A5EoAP+Fc/D3/AKEHwb/4TGg//IlAB/wrn4e/9CD4N/8ACY0H/wCRKAD/AIVz8Pf+hB8G/wDhMaD/APIlAFrT/BXg/SbuPUNK8J+GtLv4d3k3mn6Fpdldx+bF5Unl3VrawSxebF+5baeV4OeKAOqoA+Wfjf8AAz/hJ/tHi7whEkfiBV8zVNKT93HrYj5+02pGPJ1fHE3H/EwC4OLrP2oA+Ep4J7aaa3uYZre4t5JIZoZo5o7i3kj/ANbDLFNiaGaH6+wxQBFQAUATQXE9rNHcWs09vcQPvhmikljuI5P+esUsX72Hn3x9M7WANfU/FHibWoVt9Z8R69q1vH9yHUtYv7+3j/65RXU08PT6ZHcc0AYVABQAUAem/DX4X6/8SNUWCyiksdFt5Marr0sf+j26f887b/n71GYYMEMPTH+k/ZrbigD9JfCvhfR/CGiWWg6JafZbKzQqM48+4nP+turqUYM13P8A8tpz9IQIQoQA6agD/9T+/igAoAKACgAoAKACgAoAKACgAoAKACgAoAKACgAoAKACgAoAKACgAoAKACgDx34jfBnwt8Q1ku50Oj+IPL2xa3YxJ5smz/VRapat+61GAE9CYblRxBdKBuYA+I/GfwU8e+DHkluNKfWNLXOzWNEjlvLcx55+1Q+T9ssiDjIngNuD/wAe11c9WAPJaACgAoAKANfRtA1vxFdrY6DpV/q103/LGws5Z/L5/wBbL5R/cwn/AJ7z/wCj/wC70YA+qfAP7MN27w6j8QblYIB5bjw7ps/mXEnby9Q1SL9zEATnyLD7QcD5dSt+lAH2Jpek6domn22maVZW1hYWcfk21pbReVBFGM8KMnPrJKwJlPJ3NgUAalABQB//1f7+KACgAoAKACgAoAKACgAoAKACgAoAKACgAoAKACgAoAKACgAoAKACgAoAKACgAoA4fX/hv4F8TtJJrfhXR7y4kI33i2wtL+TjkSX9ibe9/wDJjGMdM0AeZXv7M3wyun3QQ67pqf8APKz1fzF/A6ha6lL/AORT+uaAKEf7LXw5Q5bUPFs+OdkmqaYP0i0WH2HHPfnkKAddpHwD+FmkmKVfDSahNF/Hqt/f6hE3/XW0mn/s6XH+1Y+5oA9W0/TdN0m3Sz0vT7PTbRfuW1hZw2Vun0gtoo4h7/yOcqAaFABQAUAFAH//1v7+KACgAoAKACgAoAKACgAoAKACgAoAKACgAoAKACgAoAKACgAoAKACgAoAKACgAoAKACgAoAKACgAoAKACgAoA/9f+/igAoAKACgAoAKACgAoAKACgAoAKACgAoAKACgAoAKACgAoAKACgAoAKACgAoAKACgAoAKACgAoAKACgAoAKAP/Q/v4oAKACgAoAKACgAoAKACgAoAKACgAoAKACgAoAKACgAoAKACgAoAKACgAoAKACgAoAKACgAoAKACgAoAKACgD/0f7+KACgAoAKACgAoAKACgAoAKACgAoAKACgAoAKACgAoAKACgAoAKACgAoAKACgAoAKACgAoAKACgAoAKACgAoA/9L+/igAoAKACgAoAKACgAoAKACgAoAKACgAoAKACgAoAKACgAoAKACgAoAKACgAoAKACgAoAKACgAoAKACgAoAKAP/Z');
+  --ti-image-error-bg-image-url: none;base64,/9j/4AAQSkZJRgABAQAASABIAAD/4QBYRXhpZgAATU0AKgAAAAgAAgESAAMAAAABAAEAAIdpAAQAAAABAAAAJgAAAAAAA6ABAAMAAAABAAEAAKACAAQAAAABAAABIKADAAQAAAABAAABIAAAAAD/7QA4UGhvdG9zaG9wIDMuMAA4QklNBAQAAAAAAAA4QklNBCUAAAAAABDUHYzZjwCyBOmACZjs+EJ+/8AAEQgBIAEgAwERAAIRAQMRAf/EAB8AAAEFAQEBAQEBAAAAAAAAAAABAgMEBQYHCAkKC//EALUQAAIBAwMCBAMFBQQEAAABfQECAwAEEQUSITFBBhNRYQcicRQygZGhCCNCscEVUtHwJDNicoIJChYXGBkaJSYnKCkqNDU2Nzg5OkNERUZHSElKU1RVVldYWVpjZGVmZ2hpanN0dXZ3eHl6g4SFhoeIiYqSk5SVlpeYmZqio6Slpqeoqaqys7S1tre4ubrCw8TFxsfIycrS09TV1tfY2drh4uPk5ebn6Onq8fLz9PX29/j5+v/EAB8BAAMBAQEBAQEBAQEAAAAAAAABAgMEBQYHCAkKC//EALURAAIBAgQEAwQHBQQEAAECdwABAgMRBAUhMQYSQVEHYXETIjKBCBRCkaGxwQkjM1LwFWJy0QoWJDThJfEXGBkaJicoKSo1Njc4OTpDREVGR0hJSlNUVVZXWFlaY2RlZmdoaWpzdHV2d3h5eoKDhIWGh4iJipKTlJWWl5iZmqKjpKWmp6ipqrKztLW2t7i5usLDxMXGx8jJytLT1NXW19jZ2uLj5OXm5+jp6vLz9PX29/j5+v/bAEMAAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAf/bAEMBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAf/dAAQAJP/aAAwDAQACEQMRAD8A/v4oAKACgAoAKACgAoAKACgAoAKACgAoAKACgAoAKACgAoAKACgAoAKACgAoAKACgAoAKACgAoAKACgAoAKACgD/0P7+KACgAoAKACgAoAKACgAoAKACgAoAKACgAoAKACgAoAKACgAoAKACgAoAKACgAoAKACgAoAKACgAoAKACgAoA/9H+/igAoAKACgAoAKACgAoAKACgAoAKACgAoAKACgAoAKACgAoAKACgAoAKACgAoAKACgAoAKACgAoAKACgAoAKAP/S/v4oAKACgAoAKACgAoAKACgAoAKACgAoAKACgAoAKACgAoAKACgAoAKACgAoAKACgAoAKACgAoAKACgAoAKACgD/0/7+KACgAoAKACgAoAKACgAoAKACgAoAKACgAoAKACgAoAKACgAoAKACgAoAKACgAoAKACgAoAKACgAoAKACgAoA/9T+/igAoAKACgAoAKACgAoAKACgAoAKACgAoAKACgAoAKACgAoAKACgAoAKACgAoAKACgAoAKACgAoAKACgAoAKAP/V/v4oAKACgAoAKAOH134jeBvDMpg1vxVo9jcp/rLM3P2i9j/662los91DnP8Ay2i4OeCRQByL/tA/CJSQfF2Sv93RPEb/AMtGbnt/jyKAE/4aD+EX/Q3j/wAJ/wAT/wDymoAP+Gg/hF/0N4/8J/xP/wDKagA/4aD+EX/Q3j/wn/E//wApqAD/AIaD+EX/AEN4/wDCf8T/APymoAP+Gg/hF/0N4/8ACf8AE/8A8pqAD/hoP4Rf9DeP/Cf8T/8AymoAP+Gg/hF/0N4/8J/xP/8AKagA/wCGg/hF/wBDeP8Awn/E/wD8pqAD/hoP4Rf9DeP/AAn/ABP/APKagA/4aD+EX/Q3j/wn/E//AMpqAD/hoP4Rf9DeP/Cf8T//ACmoAP8AhoP4Rf8AQ3j/AMJ/xP8A/KagA/4aD+EX/Q3j/wAJ/wAT/wDymoAP+Gg/hF/0N4/8J/xP/wDKagA/4aD+EX/Q3j/wn/E//wApqAD/AIaD+EX/AEN4/wDCf8T/APymoAP+Gg/hF/0N4/8ACf8AE/8A8pqAD/hoP4Rf9DeP/Cf8T/8AymoAP+Gg/hF/0N4/8J/xP/8AKagA/wCGg/hF/wBDeP8Awn/E/wD8pqAJIvj78JJn2J4viDD/AJ7aP4it4/8Av7Po8UXA9+3X+6AegaH4s8N+J4jNoGu6Xq6qu50sLyGedB0zLbBvPh5Ix50S+m09VAOjoAKACgAoAKACgAoA/9b+/igAoAKAK000dtDLcTyrFbwpJNNLNJ5ccUSfvJJZJH2iOOKMEk5UAZzgBmUA+CPi18ftX8R3d1ong27udJ8ORPJC+pW0klvqGuZ/dGXzQons9NmPMEEAFzc2/Nz/AMfJt4AD5ys7G+1K4W20+zvNQupPuW9nby3lxJ/2yiMkwx9fyz8wB04+HPxBYAr4D8ZsG/6ljWP/AJBPp3A+v8NAB/wrj4h/9CH4y/8ACY1//wCRKAD/AIVx8Q/+hD8Zf+Exr/8A8iUAH/CuPiH/ANCH4y/8JjX/AP5EoAP+FcfEP/oQ/GX/AITGv/8AyJQAf8K4+If/AEIfjL/wmNf/APkSgA/4Vx8Q/wDoQ/GX/hMa/wD/ACJQAf8ACuPiH/0IfjL/AMJjX/8A5EoAP+FcfEP/AKEPxl/4TGv/APyJQAf8K4+If/Qh+Mv/AAmNf/8AkSgA/wCFcfEP/oQ/GX/hMa//APIlAB/wrj4h/wDQh+Mv/CY1/wD+RKAD/hXHxD/6EPxl/wCExr//AMiUAH/CuPiH/wBCH4y/8JjX/wD5EoAP+FcfEP8A6EPxl/4TGv8A/wAiUAH/AArj4h/9CH4y/wDCY1//AORKAD/hXHxD/wChD8Zf+Exr/wD8iUAH/CuPiH/0IfjL/wAJjX//AJEoAP8AhXHxD/6EPxl/4TGv/wDyJQAf8K4+If8A0IfjL/wmNf8A/kSgA/4Vx8Q/+hD8Zf8AhMa//wDIlAEc3w/8eW6NLceCfFtvCn35ZvDWsxxx/wDbWS0OeeOg9CeDQBz1ne6jpF7HeWF1eadqFnNvhubaSWzvLeSP/njLF9nmh6/X6DJoA+4fgn8dZPFE9v4R8YyQprhTZpWs/u7ePV3j62t1EMRRal18iaAm3vz/AKOP9LC/aAD6qoAKACgAoAKACgD/1/7+KACgAoA+ZP2m/GM+h+E7Lw1ZTeXc+Kpp0vGXl/7H08Qy3cQGf+XyaaC3I4+0W4ubcA5JUA+Ovh54JvfiB4psfDtnJ9njk8y51K8EYk+waZB/x83IiwB55PkQQc4+03FsOM7qAP0z8LeDfDvgrTY9K8O6bFYwKsYml2CS8vZU6XN/dH97dzZHVjthzttxDAQqAHW0AFABQAUAFABQAUAFABQAUAFABQAUAFABQAUAFABQAUAFABQAUAeO/FH4RaD8Q9OnlS3t9P8AFEMUj6drcUXlySSIP3VpqZiA+2WcxxDmYvPbZM9tjE9vOAfmvLFf6LqUkMgmsdU0m/kV8fu7i01HTpenbyJoZoT3PsOBQB+p/wAOPFI8a+CvD/iKTy/tV7aFb9UACrqNpLJaXxEWCYRLNDLNDCSCIJl4wA1AHd0AFABQAUAFAH//0P7+KACgAoA+B/2rLhm8caDa5/dweFbe5Tr/AKy41nWI5B064tBx+uOKAOi/ZKtIZL3xzfMv+kW9toFpDJ/073kusSS8f9ddNh7cY5zkUAfa1ABQAUAFABQAUAFABQAUAFABQAUAFABQAUAFABQAUAFABQAUAFABQAUAfmH8drSGy+LPjCGBdqSXOn3j7Cf9ZqGjabf3WTyP3800/b88UAfVP7Llw8/w4vYm+7a+K9Tt0/65vpmj3fHT/lrdt39uOaAPpOgAoAKACgAoA//R/v4oAKACgD8/v2qf+Sh6P/2Jmn/+n7xJQB2v7I3/ADUH/uVP/dloA+zKACgAoAKAMjV9b0fQbJ9R1nU7PTLGPAe5v7hLePcQcRgyhfNlbbgRKTMccZP3gDyO7/aK+FVtP5K67eXQVtjzW2j6o8APQYaWyi83pk+Ru+ozigDtvDHxJ8EeM3MPh3xFY311sLfYX82z1EeXzIRYX0UF5KIT1mhhmgyPvnALAHe0AFABQAUAFABQAUAFABQAUAFABQAUAFABQAUAFAH5nftBf8ld8X/Xw/8A+oxo1AH0v+yn/wAk81n/ALHK+/8ATB4boA+mqACgAoAKACgD/9L+/igAoAKAPz+/ap/5KHo//Ymaf/6fvElAHa/sjf8ANQf+5U/92WgD7MoAKACgDkfG3i3T/BHhvUvEepZeGxh/dWyOElvLuT93a2kWc8zTMNx/5YQC4uSpFuRQB+YnjPxx4h8d6xNrGvXkkzZlS0s1zHp+n2//AD62Nr83kw9hP/x8T4Fxc3NxcgGgDkKAJIpZbeWOeCR4ZoXjeGaGTy5I5I+IpYpYifJmH5e54oA++fgH8X7rxlC/hXxLN5viLTbYXFlfucPrFhF+6k87vNqNmcCeYY+1W+Lhg09tcXFwAfTdABQAUAFABQAUAFABQAUAFABQAUAFABQAUAFAH5nftBf8ld8X/Xw//wCoxo1AH0v+yn/yTzWf+xyvv/TB4boA+mqACgAoAKACgD//0/7+KACgAoA/P79qn/koej/9iZp//p+8SUAdr+yN/wA1B/7lT/3ZaAPsygAoAKAPjT9rLWJlj8IaCjbbeR9T1e5QdJZLfybWx7f8sopr8cnH7/tn5gD4yoAKACgDtvhtrE+hePPCOpwNtaHXtPhm9rO9uobC/iHXPnWc9xBx+mc0AfrFQAUAFABQAUAFABQAUAFABQAUAFABQAUAFABQB+Z37QX/ACV3xf8AXw//AOoxo1AH0v8Asp/8k81n/scr7/0weG6APpqgAoAKACgAoA//1P7+KACgAoA/P79qn/koej/9iZp//p+8SUAdr+yN/wA1B/7lT/3ZaAPsygAoAKAPkL9rDQZ7jTPCviWGN2h0+6vdKvHQ48v7fFFdWEsv/THz7OeD/r4uLegD4koAKACgD0P4UaDP4j+IfhPToY3ZY9Ys9SvJMf6uz0uX7fdebyT/AKmEwen2i4zk5NAH6q0AFABQAUAFABQAUAFABQAUAFABQAUAFABQAUAfmd+0F/yV3xf9fD//AKjGjUAfS/7Kf/JPNZ/7HK+/9MHhugD6aoAKACgAoAKAP//V/v4oAKACgD8/v2qf+Sh6P/2Jmn/+n7xJQB2v7I3/ADUH/uVP/dloA+zKACgAoAwfEWgaZ4p0bUtA1iHz9P1O2Ntcxqdki8+bFNDL1ingmWKeCbok8Kna3SgD81viN8J/E/w8vpvtdrLf6C0n+ga7bRyfY5Ek/wBVDd4OLO9BGPIn9P8ARhc22aAPLqANTR9E1fxBfQ6Zomm3mqahMfktrOCW5k56yyjjyYYR/r55ybe37bck0AfoZ8FfhEnw60+bUdVaK48U6tCkN60Pz2+l2eVlGl20vDTfv/399ccrcTrCIMQWy3F0Ae8UAFABQAUAFABQAUAFAHyH8Y/2gb/QNXu/C3gZrZb3T28nWNdmjhvBbXkZ/fWFhbSiS0M1mT5N7cXMNwRcMbYWq+QbhgDx7w/+0Z8SNIvo59U1KHxFp+/FzYX9nY2/mR/8tfst3p9lDNDN/wA8P+Pi3Ha2ucDaAfeXhDxXpHjXQrTX9EuPPtbpSJIm4uLK6jx51hdx9YriFuueGUrcQFreeFqAOroAKACgAoAKAPzO/aC/5K74v+vh/wD9RjRqAPpf9lP/AJJ5rP8A2OV9/wCmDw3QB9NUAFABQAUAFAH/1v7+KACgAoA/P79qn/koej/9iZp//p+8SUAdr+yN/wA1B/7lT/3ZaAPsygAoAKACgCGSOOaNopUSRJF2PHIm9HQ9njPHrwT9M4oA4S6+Fnw6vJjcXHgnw4ZnbczJplrBvf1ljtliilPfLDsPrQB1Ok6DougwfZtF0jTdIg6vDptjbWcbnHBkFtHEJD9QT2PagDYoAKACgAoAKACgAoAKAPD/AI3/ABKT4f8AhpoNPmQ+JdcSW20iNeZLOMjFzrEmDgCyHNsOs9+0GQbeG62gH5su7yO0kjPJJI+93f8AeSSSSf59fwb+EAbQB6j8KfidqXw215LpPOutB1B44ta0pP8Alvbn/VXVrwIv7TsxxBtINwCba4I+1brcA/TDR9Y07XtMstY0m7hvtP1CCO5tLmE5jkjkH5xzR4aCa3lCz286tbzhXXawBr0AFABQAUAfCnxk+EfxE8TfETxD4g0Pw4+o6TfHSBbXKaho8Rl+xaFptpL/AKLNqFvefuruCeH99Bj+JcqcsAe2/s6+Gdf8KeC9V03xFpdzpN9J4pvLxLa58svJbS6PoUUcsflfL5QlhmgBz1g7ZoA9+oAKACgAoAKAP//X/v4oAKACgD8/v2qf+Sh6P/2Jmn/+n7xJQB2v7I3/ADUH/uVP/dloA+zKACgAoAKACgAoAKACgAoAKACgAoAKACgDD1/XNN8M6PqGvavcC207TLaS5un43nHEUUQ4Ms00pEEEP/LeeZQCM4UA/LPx14y1Lx34l1DxFqTYNw/k2dn5nmR6fp8f/HrYxYHWGLJuO1zcfarn5Tc5oA4+gAoAKAPefgn8XZvAGpjSdYmml8I6nN/pCjLnR7yQiP8AtS1jBB8gkf8AEwts4Nv/AKRATc2wtrgA/RiKWKeNJopEkhlRJIpEO+N0k5idCMjBBByP0zmgCegAoAwL3xR4a01vL1HxDoVhIv8ABe6xYWj/AE2zzQn9B79toBRj8e+BpjiLxp4Tlb+5H4j0eQn/AL5us/y9+mGAOjtbu1vYvPs7q3u4m/5a2s8U8XT/AJ6wnHr/AHiP1oAtUAFABQAUAFAH/9D+/igAoAKAPz+/ap/5KHo//Ymaf/6fvElAHa/sjf8ANQf+5U/92WgD7MoAKACgAoAKACgAoAKACgAoAKACgAoAKAPgD9on4nf8JLrH/CHaNPnQ9Cuf9PlhlPl6nrEf7uUH+Ga007PkQkcG5+0z/MBalQD5moAKACgC3YWF7qt7a6bptrNfX15NHbW1nbR+ZcXMkv8Ayyii/wDr/ng0Afe3wp/Z/wBK8Kx2mu+K4odY8TDZPFZSeXPpmiuATEIIseVeXkR63E4eG2m/49ATALucA948QeJNC8K6fLqviHVrbS7GPOZLl8SSP08m2ijBmu5h2gt4Z5z12EUAfI3jP9qa7keS08DaUkEQ+T+2Nbj8yd8/8tbXS4pRDFjpm+mnyD81pARuYA+b9f8AiB418TtIdd8TaxqEcn37N7yW308n/pnYW3lWcOe/7nPHOaAOPoAKALVnfXunTrdafeXNjdRn5LmzuJbe4j7/AOti8mb/ADjJyAoB7N4W/aC+I/hto0udUTxJYpnfba9H9suPLPJ8rU4TBqPnjHW4muIB2tv4qAPrXwD8efB3jh4dPnZ/DmuzbETTdTlj8i7lP/LPT9TxDDMQRxDPDa3E+cW1vOCdwB7nQAUAFAH/0f7+KACgAoA/P79qn/koej/9iZp//p+8SUAdr+yN/wA1B/7lT/3ZaAPsygAoAKACgAoA84+IPxK8OfDfTY73WpZJ7y68xdN0q02Nf3jpzLIPMZVgtYSAZ7ibhRwq3FwVt2APBLD9rOwkvVTU/BdzZ2DN89zZazFf3ccf/PUWs2nafBN+N9B3HOM0AfTPhjxh4c8Zacup+G9UttRtjt85I/kubSSQZEV7ayYuLSfr8s8SHgnkDNAHU0AFABQAUAFAHgPx5+Jv/CDeHjpGlXHl+JfEEUsNo6OPM0zT/wDVXWqZ+YxTD/U2J248/wA+4GfspKgH5zEknJ/z/L+XvxmgBKACgCSGGW5ljggjeaaZ44YoII/Mkkkk/dRRRQ4/fTTf/X+XJLAH6K/BL4QweAtMj1fWbeCbxbqMWZn/AHcn9j2sg3DS7aTGPNxzfXER/fkC2BNvADOAdL8Uvito3w10zdNt1DxBexSNpWjK+HlGdn2u+6m106KVguSRNcMDDbAYuZrUA/Orxd4x8ReONVk1fxFqDXlwfkhh/wBVZ6fbk/8AHrYWv+pih79BcXH/AC83Vxc4NAHLUAFABQAUAFABQAUAfUfwh+P97oUtr4d8b3U2oaBmOG01h/Mn1DSMf6pbuU5lvNMiHB4a5t1/49vtFuq26gH3XBcQXcEN1bSxT21xFHNbzQyeZHPFJH5kUsUicSxyRkMuMgjkbvlDAFqgD//S/v4oAKACgD8/v2qf+Sh6P/2Jmn/+n7xJQB2v7I3/ADUH/uVP/dloA+zKACgAoAKAOd8TeJNM8J6HqGv6xMIbHToTLIAP3s0nEcNtbREZlnu5SIYFySS3AABagD8uPHPjLVPHfiS98Raq22S4fybOzSXzLfT9Pj/49bCIYBHlf8t+T9ouPtVycfaaAOQoA2NC8Qa14a1GHVdA1K80vUIfuXNnJ5fmR/8APKWLmGWH/nvDNbXFtP8A8+pz8oB9mfDr9pjTdR+z6X48hTSb5tiJrtpFMdLuCR11C2zLPp0pIyZoftGn5JJbTrYA0AfVNtc2t7bRXVncQ3VrOglhubaWOe3njfpJFLEWilj5PzAtnGe9AFugAoA5zxR4k0zwloWo+INWl8uy023MzgMBJPIf3dtbW4wcz3kzLDCB/ERnAJZQD8sPF/irU/GviHUvEerSbrrUJt6QxyHy7Ozj/wCPWwteD+5tIf3Bzg3H/H1/x83INAHM0AFABQB9Zfs0fDddSvn8fatAGs9KmktdBhkj4uNVj/4+r/vmLThN5Nv8pB1AfaD/AKTp2VAPqr4h+OdO+H3hq81+9HmzJ/o2m2O8I+o6nMn+jWoOV/dnBmuZxkQW8E7nONjAH5feIfEOreKtYvtd1u6e81C+m3yu/wDq44/+WVraxY/cwwwgwQQYHkW/PFAGJQAUAFAH1p8BPgzo/iTTf+Ez8WWxv7J7meLRNJdvLsrj7JKYrq+vvL2yTxfa1aCG33iFfs8/2oXIYFgD6N8QfBf4ca/p0li/hfSdKkZAsF/odlbaXeW8g4jlV7OJIpyOyXsVxb9vIJOKAPzj8X+Grzwd4l1jw1fN5lxpN59m85I/LiuLaSLzbW68r/lj9ss5oJs5/wCXjHBoA5qgAoAKAPq39nn4syaVfW/gLxDc7tKv5fJ8PXM0mf7Mv5JD/wAS8y8f6HqUx/ccgwahwSBdsLcA+66AP//T/v4oAKACgD8/v2qf+Sh6P/2Jmn/+n7xJQB2v7I3/ADUH/uVP/dloA+zKACgAoAYzKiszNtVfmZm6Y/QdscD24oA/Ob47fFNvHWuf2NpFxnwroc0iW2w5j1TUE/dy6nKdo/cAkwWPXFt9puQB9pxQB4HQAUAFABQB6N4F+Kfi/wCH06nRdQ87TWfzLnRb/wA2fS7jn97+75+xzZ/5b2Atrg/8vP2rJ2gH3P8AD344+EPHgispJv8AhH/ED4j/ALH1KeLZcydMaZfjyob32gP2e/HQ2uAWUA9hubm2sreW6u7iG1tbdPNmuLmWOC3gjT/lpJNKRFFGMckhcZzxg7gD88/jz8VY/HWsQ6JodzJJ4W0Z96zIdkesapzHLfdiYIYSYLDIHH2m54Fzi3APn2gAoAKANHSNLutb1TTdIsY/Mu9Tv7OwtlP/AD3u5YYojnj/AJ7ei/rQB+s3hjw9Z+FPD+keHtNX/RdKs47dXI2PPJ/rLm6lxx515cNNcznj99OTzgmgD8+vj549k8ZeNLqwtZ/M0Pwy8+l2Maf6ue7j41S+xlh++vIBBDODg29tbEZ+1fKAeG0AFABQAUAfpV+zzdpcfCbw2g4a0m1m3bPr/bWo3I7f88pxjPX0WgD26gD8x/j3dLd/Fnxc6/dSbS7f3/0PRtNtpcev76HPb05x8oB4/QAUAFACqzRspRtpHzxun+HP8x9KAP05+C/jtvHngmxvLuYPrOmMdK1ok4eS6t4wYb0jHP220MMxzt/fm5A/1JFAH//U/v4oAKACgD8/v2qf+Sh6P/2Jmn/+n7xJQB2v7I3/ADUH/uVP/dloA+zKACgAoA+TP2jPir/ZFpL4A0C5C6nqEOPEV1A48yw0+4izFpkWP+XvU4yfP5/0aw9RclrcA+GqACgAoAKACgAoAKAL0+p6ldQx211qF/cW8f3IZryV7eP/AK5RSzeSe/t79qAKNABQAUAFAH0L+zT4fXVviKupTIWh8N6Veaim4fu/ttz5NhaxZ7YF5PcQdP8Aj378BgD7V+JviVvCPgTxLrsTFbq0094rCTgbdQv5YbCwlH3uIry7hmIGCRCSMchQD8piSTk/5/l/L34zQAlABQAUAFAH6Cfst3Yn+Hl/bE/NY+J9Rg2/9M5LHTLnj6zTz9v4e/NAH0pQB+UHxNvPtvxE8bXG7creJ9chSQf887e/mtYv/IMP5cYPVQDhqACgAoAKAPpD9mPxLJpPju40CST/AEXxRYSRbM/8xDS4pr+1lIweln9ugGMc3A+tAH//1f7+KACgAoA/P79qn/koej/9iZp//p+8SUAdr+yN/wA1B/7lT/3ZaAPsygAoA8q+LHxHtPhz4akvtyTa3f8AmWeg2LdZrvy8vdSx8k2dkP385A5Jgt8r9oBUA/Me/vbzVL261DULia8vr65kuby5mk8x7i4uJfNlll6Z6dMj8cYYAqUAFABQAUAFABQAUAFABQAUAFABQB9tfsm6cqaX4y1UrzdX+lacrf8AXlbXd1IO3OdSHf8ALIoA2/2qdTNt4L0TS0ba+p+IUlfp+8ttPsLvzY+Dzma7t5uf7uAM80AfBVABQAUAFABQB9t/sl3e/S/Glhu5t9Q0e72+n221vIv9of8ALl2PPvjCgH17QB+O+rXf2/VdSvvvfbL+8u//AAIuppeoIzxN6f8AAjQBn0AFABQAUAdX4E1RtG8a+E9TDGJbHxDo802P+ff7fD9pi/7bQ+fB16+maAP/1v7+KACgAoA/P79qn/koej/9iZp//p+8SUAdr+yN/wA1B/7lT/3ZaAPsygDF13XNM8O6RqOt6tcpbadplvJc3UzkcRx4/dRjKmWeWTEMEAOZp2WAYLfMAfl18Q/HWpfEHxLea7f74oP+PbS7AyeYlhpccv7q1PAHnf8ALaeYf6+e4uQMAAKAcNQAUAFABQAUAFABQAUAFABQAUAFABQB9+fsqAf8IDrjdz4wvc/+CbQvc/yGPfmgDlP2t2YQeBEH+rafxI7j/ppHHoXlfTknsfXjGGAPi6gAoAKACgAoA+s/2TbzZ4h8XWG7/j60izvNvp9ivjFn351LHb6DpQB9leI7v+zvD2v3+dv2LRtTvA3p9msZpvz/AHXt+mWAPyCoAKACgAoAKAJrdmS4hdP9Ys0bp/1083p6DH4n6cGgD//X/v4oAKACgD8/v2qf+Sh6P/2Jmn/+n7xJQB2v7I3/ADUH/uVP/dloA+zKAPzz+P8A8Vf+Ew1f/hGNDnz4a0S5/fTQy/u9Y1SPMUtyeMTWll/qLEf8vBN1cg4+zGgD5zoAKACgAoAKACgAoAKACgAoAKACgAoAKAPuf9k69EnhrxVp27Jtdas7w4x/y/2Hlf7Q5Gnen55+UAP2sbAyeGvC2qA/LZ63eWL+/wDaNh5o/wDTYf8AJoA+GKACgAoAKACgD1D4RePovh14wi1q7gmudOurK40rVVthH9pFpcSwy+daRSGCGaeG8s4J/IUgz2+cEGgD6S+J/wC0D4NvvB2q6J4UuLvV9T17T59Mkd7G70+3sLS8h8rUJpZL+GCSWb7HPcQQi3E6m4/5eBtAnAPh2gAoAKACgAoA3PDFg2q+JfD+lpw2pa3pdgmR/wA/d/DFx8xzxP8A15zhgD//0P7+KACgAoA+DP2rbSRPGfh6+K5juPDMdmj+klnqmpSy9v8AqJW/r16jJoA1v2TNRgj1XxnpLNtuL6w0e/hX+/HplzqcVyfz1i2+n4UAd5+0N8Vv+Eb01/BmhXW3XtYt8ardQyAyaPpc3HkjH+pvNSiz1Obewzcnb9ptrigD4IoAKACgAoAKACgAoAKACgAoAKACgAoAKACgD6g/ZX1xbHxjrGiSNtTXtH82HnO+80eXzYou3SzvL6fo3pkUAfTnxw8PN4j+GniO2hi8y806GPW7PH3xJpcv2m58rHHmzaaL+AfL/wAt+c9KAPzDoAKACgAoAKAJoLee6mjt7WGe4uJ32QwxRyyXEkn/ADyiii/ezc+2PrjcoBr6n4X8TaLCtxrPhzXtJt5PuTalo9/YW8n/AFyluoYIen1wOx5oAwqACgAoAKACgD3L9njw62u/EzS7lo/MtfD8N5rdz/zzElvF9lsevSb+0ruCfp/y7npQB//R/v4oAKACgD57/aL8ET+K/Ba6pp8Pnan4Vmn1FIUj8ySfTJ4fK1SGMZx5sQht78e9hgk4UMAfB3hPxTq3gzXrHxFoskcd7ZPJ8ksfmW9xbyxeTLa3MQ8gzQzw5wQQR/x822Lk0AZmq6rf61qV9q+qXD3moahcyXN5czf6ySST+X/TCDH+jW/TGaAM+gAoAKACgAoAKACgAoAKACgAoAKACgAoAKAOn8GeI5vCPirQfEcO9jpOpW9xMiH95PZ48q/tc8czWU08H4Zyc7KAP1ktri01Oxt7q3dLmx1C1iuYHHzx3FpeQ+bFIPu5jmhlyM8YPQAYYA/LX4o+DJfAnjTVtCEcn9n+f9v0eZ+DcaXd5ktT5uB5/wBj/wCPGY8Znt7jGeDQB59QAUAFABQB+jfwC8AaZ4Z8GaTr72sMviDxHaR6ncX7xiSeDTrwebYWFrLyYYPspt57gDm4uP8Aj4yLa3S1APcrq1tr22mtLy3hura4R4ri1uYo57eeOT/WRTQy5jljweVYEHodvIoA/Mn40eCrXwJ46vtL01fL0q+trfWNKhf959ns7yWaKa1wcEQw3tnPBB3+zm1yy4oA8ooAKACgAoA/Qr9m3wQ/hzwdJr97CYtS8VyRXio/+st9Ht/N/sz+6T9sE099uBxPBcWpONvzAH//0v7+KACgAoAKAPjH4s/s7XNxd3PiP4fwK4uZJLm/8NmSK38uST95LLo5k8uARTdDYzEi3P8Ax67gRBbgHyHqGm6hpNzJZapY3mm3kZ+e2v7eWzuI/aWKUxTf1Oc+gUAo0AFABQAUAFABQAUAFABQAUAFABQAUAFABQAUAfeP7NPxBXWNCfwRqU4OqeH0M2lGQ/vLvRJJOIoxg5k02abyScj/AECe0wuba5egDt/jd8NB8QfDazaci/8ACTaH58+kk8f2hBLzdaTLINwAuvKWa3bkQXECKWggubg0Afm1JHJDJJDNG8M0DyJNC8flyRyR/wCtilix/rjk+ufUZoAZQAUAFAH6N/ALx/pnibwZpOgPdQxeIPDlpHplxYPII559Osx5Vhf2sXBmg+yi3guCObe4/wCPjAubd7oA9yurq2sraa7vLiG1trdHluLq5ljgt4I4/wDWSzTS4jijwOWYgDqd3JoA/Mn40eNbXx346vtU01vM0qxtrfR9Kmf939os7OWaWa6yckwzXt5PPB3+zi1yrZoA8ooAKACgD2T4L/DKf4heI45L2F18NaRJHca1c9Y7gn97Fo0UgyTLeE/6R2tbb7USRP8AZxOAfpbFEkSJHFGscUaoiIieWiJH/q0SPtjoOmMcKSQFAP/T/v4oAKACgAoAKAM6/wBK0zVoxFqmnWGowryqX9nbXkefaO5imAPvj8TyGAOcb4c/D5juPgTwazH+JvDGi/rmxJH4nr6ZoAP+Fc/D3/oQfBv/AITGg/8AyJQAf8K5+Hv/AEIPg3/wmNB/+RKAD/hXPw9/6EHwb/4TGg//ACJQAf8ACufh7/0IPg3/AMJjQf8A5EoAP+Fc/D3/AKEHwb/4TGg//IlAB/wrn4e/9CD4N/8ACY0H/wCRKAD/AIVz8Pf+hB8G/wDhMaD/APIlAB/wrn4e/wDQg+Df/CY0H/5EoAP+Fc/D3/oQfBv/AITGg/8AyJQAf8K5+Hv/AEIPg3/wmNB/+RKAD/hXPw9/6EHwb/4TGg//ACJQAf8ACufh7/0IPg3/AMJjQf8A5EoAP+Fc/D3/AKEHwb/4TGg//IlAB/wrn4e/9CD4N/8ACY0H/wCRKAD/AIVz8Pf+hB8G/wDhMaD/APIlAFrT/BXg/SbuPUNK8J+GtLv4d3k3mn6Fpdldx+bF5Unl3VrawSxebF+5baeV4OeKAOqoA+Wfjf8AAz/hJ/tHi7whEkfiBV8zVNKT93HrYj5+02pGPJ1fHE3H/EwC4OLrP2oA+Ep4J7aaa3uYZre4t5JIZoZo5o7i3kj/ANbDLFNiaGaH6+wxQBFQAUATQXE9rNHcWs09vcQPvhmikljuI5P+esUsX72Hn3x9M7WANfU/FHibWoVt9Z8R69q1vH9yHUtYv7+3j/65RXU08PT6ZHcc0AYVABQAUAem/DX4X6/8SNUWCyiksdFt5Marr0sf+j26f887b/n71GYYMEMPTH+k/ZrbigD9JfCvhfR/CGiWWg6JafZbKzQqM48+4nP+turqUYM13P8A8tpz9IQIQoQA6agD/9T+/igAoAKACgAoAKACgAoAKACgAoAKACgAoAKACgAoAKACgAoAKACgAoAKACgDx34jfBnwt8Q1ku50Oj+IPL2xa3YxJ5smz/VRapat+61GAE9CYblRxBdKBuYA+I/GfwU8e+DHkluNKfWNLXOzWNEjlvLcx55+1Q+T9ssiDjIngNuD/wAe11c9WAPJaACgAoAKANfRtA1vxFdrY6DpV/q103/LGws5Z/L5/wBbL5R/cwn/AJ7z/wCj/wC70YA+qfAP7MN27w6j8QblYIB5bjw7ps/mXEnby9Q1SL9zEATnyLD7QcD5dSt+lAH2Jpek6domn22maVZW1hYWcfk21pbReVBFGM8KMnPrJKwJlPJ3NgUAalABQB//1f7+KACgAoAKACgAoAKACgAoAKACgAoAKACgAoAKACgAoAKACgAoAKACgAoAKACgAoA4fX/hv4F8TtJJrfhXR7y4kI33i2wtL+TjkSX9ibe9/wDJjGMdM0AeZXv7M3wyun3QQ67pqf8APKz1fzF/A6ha6lL/AORT+uaAKEf7LXw5Q5bUPFs+OdkmqaYP0i0WH2HHPfnkKAddpHwD+FmkmKVfDSahNF/Hqt/f6hE3/XW0mn/s6XH+1Y+5oA9W0/TdN0m3Sz0vT7PTbRfuW1hZw2Vun0gtoo4h7/yOcqAaFABQAUAFAH//1v7+KACgAoAKACgAoAKACgAoAKACgAoAKACgAoAKACgAoAKACgAoAKACgAoAKACgAoAKACgAoAKACgAoAKACgAoA/9f+/igAoAKACgAoAKACgAoAKACgAoAKACgAoAKACgAoAKACgAoAKACgAoAKACgAoAKACgAoAKACgAoAKACgAoAKAP/Q/v4oAKACgAoAKACgAoAKACgAoAKACgAoAKACgAoAKACgAoAKACgAoAKACgAoAKACgAoAKACgAoAKACgAoAKACgD/0f7+KACgAoAKACgAoAKACgAoAKACgAoAKACgAoAKACgAoAKACgAoAKACgAoAKACgAoAKACgAoAKACgAoAKACgAoA/9L+/igAoAKACgAoAKACgAoAKACgAoAKACgAoAKACgAoAKACgAoAKACgAoAKACgAoAKACgAoAKACgAoAKACgAoAKAP/Z');
 }
diff --git a/packages/theme/src/input/old-theme.js b/packages/theme/src/input/old-theme.js
new file mode 100644
index 000000000..b05d89fd6
--- /dev/null
+++ b/packages/theme/src/input/old-theme.js
@@ -0,0 +1,29 @@
+export const tinyInputOldTheme = {
+  'ti-input-placeholder-color': 'var(--ti-common-color-placeholder, #adb0b8)',
+  'ti-input-suffix-icon-height': '1em',
+  'ti-input-suffix-icon-width': '1em',
+  'ti-input-count-textlength-color': 'var(--ti-common-color-text-weaken, #8a8e99)',
+  'ti-input-suffix-right': 'var(--ti-common-space-3x, 8px)',
+  'ti-input-prefix-padding-left': 'calc(var(--ti-common-space-8x, 32px) - 2px)',
+  'ti-input-prefix-padding-right': 'calc(var(--ti-common-space-8x, 32px) - 4px)',
+  'ti-input-suffix-padding-left': 'var(--ti-common-space-2x, 8px)',
+  'ti-input-suffix-padding-right': 'calc(var(--ti-common-space-8x, 32px) - 2px)',
+  'ti-input-padding-horizontal': 'var(--ti-common-space-2x, 8px)',
+  'ti-input-icon-close-text-color': 'var(--ti-common-color-icon-normal, #5e7ce0)',
+  'ti-input-icon-font-size': 'var(--ti-common-font-size-1, 14px)',
+  'ti-input-exceed-text-color': 'var(--ti-common-bg-primary, #c7000b)',
+  'ti-input-small-height': 'var(--ti-common-size-height-small, 32px)',
+  'ti-input-disabled-text-color': 'var(--ti-common-color-text-disabled, #adb0b8)',
+  'ti-input-suffix-icon-color': 'var(--ti-common-color-icon-normal)',
+  'ti-input-suffix-top-mini': '50%',
+  'ti-input-suffix-top-small': '50%',
+  'ti-input-suffix-top-medium': '50%',
+  'ti-input-suffix-top': '50%',
+  'ti-input-focus-icon-color': 'var(--ti-common-color-border-hover, #575d6c)',
+  'ti-input-icon-color': 'var(--ti-common-color-border-hover, #575d6c)',
+  'ti-input-hover-border-color': 'var(--ti-common-color-border-hover, #575d6c)',
+  'ti-input-border-color': 'var(--ti-common-color-border, #adb0b8)',
+  'ti-input-border-radius': 'var(--ti-common-border-radius-normal, 2px)',
+  'ti-input-count-font-size': 'var(--ti-common-font-size-base, 12px)',
+  'ti-input-font-size': 'var(--ti-common-font-size-base, 12px)'
+}
diff --git a/packages/theme/src/input/smb-theme.js b/packages/theme/src/input/smb-theme.js
deleted file mode 100644
index bd9c739b4..000000000
--- a/packages/theme/src/input/smb-theme.js
+++ /dev/null
@@ -1,29 +0,0 @@
-export const tinyInputSmbTheme = {
-  'ti-input-border-color': 'var(--ti-common-color-line-normal)',
-  'ti-input-hover-border-color': 'var(--ti-common-color-line-hover)',
-  'ti-input-border-radius': 'var(--ti-common-border-radius-3)',
-  'ti-input-padding-horizontal': 'var(--ti-common-space-3x)',
-  'ti-input-icon-color': 'var(--ti-base-color-common-2)',
-  'ti-input-focus-icon-color': 'var(--ti-common-color-icon-normal)',
-  'ti-input-count-font-size': 'var(--ti-common-font-size-0)',
-  'ti-input-suffix-right': 'var(--ti-common-font-size-0)',
-  'ti-input-suffix-icon-color': 'var(--ti-base-color-common-2)',
-  'ti-input-count-textlength-color': 'var(--ti-common-color-text-primary)',
-  'ti-input-suffix-padding-left': 'var(--ti-common-space-3x)',
-  'ti-input-disabled-text-color': 'var(--ti-common-color-text-disabled)',
-  'ti-input-suffix-icon-width': 'var(--ti-common-font-size-2)',
-  'ti-input-suffix-icon-height': 'var(--ti-common-font-size-2)',
-  'ti-input-icon-close-text-color': 'var(--ti-base-color-common-2)',
-  'ti-input-icon-font-size': 'var(--ti-common-font-size-2)',
-  'ti-input-font-size': 'var(--ti-common-font-size-1)',
-  'ti-input-placeholder-color': 'var(--ti-base-color-common-2)',
-  'ti-input-exceed-text-color': '#c7000b',
-  'ti-input-suffix-top': 'var(--ti-common-space-4x)',
-  'ti-input-suffix-top-medium': 'var(--ti-common-space-5x)',
-  'ti-input-suffix-top-small': 'var(--ti-common-space-4x)',
-  'ti-input-suffix-top-mini': 'var(--ti-common-space-3x)',
-  'ti-input-prefix-padding-left': 'var(--ti-common-space-10x)',
-  'ti-input-prefix-padding-right': 'var(--ti-common-space-10x)',
-  'ti-input-suffix-padding-right': 'var(--ti-common-space-10x)',
-  'ti-input-small-height': '28px'
-}
diff --git a/packages/theme/src/input/vars.less b/packages/theme/src/input/vars.less
index ccc44d018..35603a231 100644
--- a/packages/theme/src/input/vars.less
+++ b/packages/theme/src/input/vars.less
@@ -16,41 +16,41 @@
   // 输入框背景颜色
   --ti-input-bg-color: var(--ti-common-color-icon-white, #fff);
   // 输入框字体大小
-  --ti-input-font-size: var(--ti-common-font-size-base, 12px);
+  --ti-input-font-size: var(--ti-common-font-size-1);
   // 输入框计数器字体大小
-  --ti-input-count-font-size: var(--ti-common-font-size-base, 12px);
+  --ti-input-count-font-size: var(--ti-common-font-size-0);
   // 输入框高度
   --ti-input-height: var(--ti-common-size-height-normal, 28px);
   // 输入框边框圆角
-  --ti-input-border-radius: var(--ti-common-border-radius-normal, 2px);
+  --ti-input-border-radius: var(--ti-common-border-radius-3);
   // 输入框边框色
-  --ti-input-border-color: var(--ti-common-color-border, #adb0b8);
+  --ti-input-border-color: var(--ti-common-color-line-normal);
   // 输入框hover时边框色
-  --ti-input-hover-border-color: var(--ti-common-color-border-hover, #575d6c);
+  --ti-input-hover-border-color: var(--ti-common-color-line-hover);
   // 输入框active时边框色
   --ti-input-active-border-color: var(--ti-common-color-line-active, #5e7ce0);
   // icon颜色
-  --ti-input-icon-color: var(--ti-common-color-border-hover, #575d6c);
+  --ti-input-icon-color: var(--ti-base-color-common-2);
   // 输入框聚焦时icon颜色
-  --ti-input-focus-icon-color: var(--ti-common-color-border-hover, #575d6c);
+  --ti-input-focus-icon-color: var(--ti-common-color-icon-normal);
   // suffix元素的顶部高度
-  --ti-input-suffix-top: 50%;
+  --ti-input-suffix-top: var(--ti-common-space-4x);
   // 中尺寸 suffix元素的顶部高度
-  --ti-input-suffix-top-medium: 50%;
+  --ti-input-suffix-top-medium: var(--ti-common-space-5x);
   // 小尺寸 suffix元素的顶部高度
-  --ti-input-suffix-top-small: 50%;
+  --ti-input-suffix-top-small: var(--ti-common-space-4x);
   // 迷你 suffix元素的顶部高度
-  --ti-input-suffix-top-mini: 50%;
+  --ti-input-suffix-top-mini: var(--ti-common-space-3x);
   // suffix图标颜色
-  --ti-input-suffix-icon-color: var(--ti-common-color-icon-normal);
+  --ti-input-suffix-icon-color: var(--ti-base-color-common-2);
   // 输入框占位符文本颜色
   --ti-input-placeholder-text-color: var(--ti-common-color-placeholder, #adb0b8);
   // 输入框disabled时的文本颜色
-  --ti-input-disabled-text-color: var(--ti-common-color-text-disabled, #adb0b8);
+  --ti-input-disabled-text-color: var(--ti-common-color-text-disabled);
   // 输入框medium尺寸的高度
   --ti-input-medium-height: var(--ti-common-size-height-medium, 40px);
   // 输入框small尺寸的高度
-  --ti-input-small-height: var(--ti-common-size-height-small, 32px);
+  --ti-input-small-height: 28px;
   // 输入框mini尺寸的高度
   --ti-input-mini-height: var(--ti-common-size-height-mini, 24px);
   // 输入框disabled时的背景颜色
@@ -58,13 +58,13 @@
   // 输入框disabled时的边框颜色
   --ti-input-disabled-border-color: var(--ti-common-color-line-disabled, #dfe1e6);
   // 输入框exceed时的文本颜色
-  --ti-input-exceed-text-color: var(--ti-common-bg-primary, #c7000b);
+  --ti-input-exceed-text-color: #c7000b;
   // 输入框的清除icon图标的文本颜色
   --ti-input-clear-text-color: var(--ti-common-color-icon-graybg-normal, #adb0b8);
   // 输入框的icon图标的字体大小
-  --ti-input-icon-font-size: var(--ti-common-font-size-1, 14px);
+  --ti-input-icon-font-size: var(--ti-common-font-size-2);
   // 输入框的关闭icon图标的文本颜色
-  --ti-input-icon-close-text-color: var(--ti-common-color-icon-normal, #5e7ce0);
+  --ti-input-icon-close-text-color: var(--ti-base-color-common-2);
   // 输入框的清除icon图标hover时的文本颜色
   --ti-input-clear-text-color-hover: var(--ti-common-color-icon-hover, #5e7ce0);
   // 文本框计数器的颜色
@@ -78,25 +78,25 @@
   // 输入框垂直方向内边距
   --ti-input-padding-vertical: var(--ti-common-space-0, 0);
   // 输入框水平方向内边距
-  --ti-input-padding-horizontal: var(--ti-common-space-2x, 8px);
+  --ti-input-padding-horizontal: var(--ti-common-space-3x);
   // 输入框配置suffix时的右侧内边距
-  --ti-input-suffix-padding-right: calc(var(--ti-common-space-8x, 32px) - 2px);
+  --ti-input-suffix-padding-right: var(--ti-common-space-10x);
   // 输入框配置suffix时的左侧内边距
-  --ti-input-suffix-padding-left: var(--ti-common-space-2x, 8px);
+  --ti-input-suffix-padding-left: var(--ti-common-space-3x);
   // 输入框配置prefix时的右侧外边距
-  --ti-input-prefix-padding-right: calc(var(--ti-common-space-8x, 32px) - 4px);
+  --ti-input-prefix-padding-right: var(--ti-common-space-10x);
   // 输入框配置prefix时的左侧外边距
-  --ti-input-prefix-padding-left: calc(var(--ti-common-space-8x, 32px) - 2px);
+  --ti-input-prefix-padding-left: var(--ti-common-space-10x);
   // suffix图标的右侧边距
-  --ti-input-suffix-right: var(--ti-common-space-3x, 8px);
+  --ti-input-suffix-right: var(--ti-common-font-size-0);
   // 计数器文本字数颜色
-  --ti-input-count-textlength-color: var(--ti-common-color-text-weaken, #8a8e99);
+  --ti-input-count-textlength-color: var(--ti-common-color-text-primary);
   // 输入框suffix的宽度
-  --ti-input-suffix-icon-width: 1em;
+  --ti-input-suffix-icon-width: var(--ti-common-font-size-2);
   // 输入框suffix的高度
-  --ti-input-suffix-icon-height: 1em;
+  --ti-input-suffix-icon-height: var(--ti-common-font-size-2);
   // 输入框placeholder颜色
-  --ti-input-placeholder-color: var(--ti-common-color-placeholder, #adb0b8);
+  --ti-input-placeholder-color: var(--ti-base-color-common-2);
   // displayOnly 时文本行高
   --ti-input-display-content-line-height: var(--ti-common-line-height-number);
 }
diff --git a/packages/theme/src/ip-address/old-theme.js b/packages/theme/src/ip-address/old-theme.js
new file mode 100644
index 000000000..8b9536362
--- /dev/null
+++ b/packages/theme/src/ip-address/old-theme.js
@@ -0,0 +1,13 @@
+export const tinyIpAddressOldTheme = {
+  'ti-ip-address-input-width': 'var(--ti-common-size-8x, 32px)',
+  'ti-ip-address-disabled-bg-color': 'var(--ti-common-color-bg-disabled, #f5f5f6)',
+  'ti-ip-address-line-height': 'var(--ti-common-line-height-2, 16px)',
+  'ti-ip-address-normal-font-family':
+    "var(--ti-common-font-family, 'Helvetica', 'Arial', 'PingFangSC-Regular', 'Hiragino Sans GB', 'Microsoft YaHei', '微软雅黑', 'Microsoft JhengHei')",
+  'ti-ip-address-font-size': 'var(--ti-common-font-size-base, 12px)',
+  'ti-ip-address-normal-border-color': 'var(--ti-common-color-border, #adb0b8)',
+  'ti-ip-address-ipv6-delimiter-margin-right': 'var(--ti-common-space-0, 0)',
+  'ti-ip-address-padding-horizontal': 'var(--ti-common-space-0, 0)',
+  'ti-ip-address-normal-width': 'calc(var(--ti-common-size-base, 4px) * 40)',
+  'ti-ip-address-normal-height': 'var(--ti-common-size-7x, 28px)'
+}
diff --git a/packages/theme/src/ip-address/smb-theme.js b/packages/theme/src/ip-address/smb-theme.js
deleted file mode 100644
index 97fbb95de..000000000
--- a/packages/theme/src/ip-address/smb-theme.js
+++ /dev/null
@@ -1,12 +0,0 @@
-export const tinyIpAddressSmbTheme = {
-  'ti-ip-address-normal-width': 'calc(var(--ti-common-size-base) * 45.5)',
-  'ti-ip-address-normal-height': 'var(--ti-common-size-8x)',
-  'ti-ip-address-font-size': 'var(--ti-common-font-size-1)',
-  'ti-ip-address-line-height': 'var(--ti-common-line-height-1)',
-  'ti-ip-address-input-width': 'var(--ti-common-size-8x)',
-  'ti-ip-address-disabled-bg-color': 'var(--ti-common-color-bg-disabled)',
-  'ti-ip-address-normal-font-family': '"Manrop","Manrope-Medium"',
-  'ti-ip-address-normal-border-color': 'var(--ti-common-color-line-normal)',
-  'ti-ip-address-padding-horizontal': 'var(--ti-common-space-3x)',
-  'ti-ip-address-ipv6-delimiter-margin-right': 'var(--ti-common-space-base)'
-}
diff --git a/packages/theme/src/ip-address/vars.less b/packages/theme/src/ip-address/vars.less
index 51f7d27ef..52310227e 100644
--- a/packages/theme/src/ip-address/vars.less
+++ b/packages/theme/src/ip-address/vars.less
@@ -12,13 +12,13 @@
 
 .component-css-vars-ip-address() {
   // IP地址输入框高度
-  --ti-ip-address-normal-height: var(--ti-common-size-7x, 28px);
+  --ti-ip-address-normal-height: var(--ti-common-size-8x);
   // IP地址输入框宽度
-  --ti-ip-address-normal-width: calc(var(--ti-common-size-base, 4px) * 40);
+  --ti-ip-address-normal-width: calc(var(--ti-common-size-base) * 45.5);
   // IP地址输入框默认水平内边距
-  --ti-ip-address-padding-horizontal: var(--ti-common-space-0, 0);
+  --ti-ip-address-padding-horizontal: var(--ti-common-space-3x);
   // Ip6单个内容左margin
-  --ti-ip-address-ipv6-delimiter-margin-right: var(--ti-common-space-0, 0);
+  --ti-ip-address-ipv6-delimiter-margin-right: var(--ti-common-space-base);
   // IP地址输入框默认文本色
   --ti-ip-address-normal-text-color: var(--ti-common-color-info-normal, #252b3a);
   // IP地址输入框图标文本色
@@ -28,25 +28,25 @@
   // IP地址输入框禁用文本色
   --ti-ip-address-normal-disabled-text-color: var(--ti-common-color-text-disabled, #adb0b8);
   // IP地址输入框默认边框色
-  --ti-ip-address-normal-border-color: var(--ti-common-color-border, #adb0b8);
+  --ti-ip-address-normal-border-color: var(--ti-common-color-line-normal);
   // IP地址输入框默认背景色
   --ti-ip-address-normal-bg-color: var(--ti-common-color-light, #fff);
   // IP地址输入框圆角
   --ti-ip-address-border-radius: var(--ti-common-border-radius-normal, 2px);
   // IP地址输入框字号
-  --ti-ip-address-font-size: var(--ti-common-font-size-base, 12px);
+  --ti-ip-address-font-size: var(--ti-common-font-size-1);
   // IP地址输入框字族
-  --ti-ip-address-normal-font-family: var(--ti-common-font-family, 'Helvetica', 'Arial', 'PingFangSC-Regular', 'Hiragino Sans GB', 'Microsoft YaHei', '微软雅黑', 'Microsoft JhengHei');
+  --ti-ip-address-normal-font-family: "Manrop","Manrope-Medium";
   // IP地址输入框行高
-  --ti-ip-address-line-height: var(--ti-common-line-height-2, 16px);
+  --ti-ip-address-line-height: var(--ti-common-line-height-1);
   // IP地址输入框聚焦边框色
   --ti-ip-address-border-color-focus: var(--ti-common-color-line-active, #5e7ce0);
   // IP地址输入框悬浮边框色
   --ti-ip-address-border-color-hover: var(--ti-common-color-line-hover, #575d6c);
   // IP地址输入框禁用背景色
-  --ti-ip-address-disabled-bg-color: var(--ti-common-color-bg-disabled, #f5f5f6);
+  --ti-ip-address-disabled-bg-color: var(--ti-common-color-bg-disabled);
   // IP地址输入框禁用边框色
   --ti-ip-address-disabled-border-color: var(--ti-common-color-line-disabled, #dfe1e6);
   // Ip地址输入框item宽度
-  --ti-ip-address-input-width: var(--ti-common-size-8x, 32px);
+  --ti-ip-address-input-width: var(--ti-common-size-8x);
 }
diff --git a/packages/theme/src/link-menu/old-theme.js b/packages/theme/src/link-menu/old-theme.js
new file mode 100644
index 000000000..7408b4aa6
--- /dev/null
+++ b/packages/theme/src/link-menu/old-theme.js
@@ -0,0 +1,7 @@
+export const tinyLinkMenuOldTheme = {
+  'ti-link-menu-btn-size': 'var(--ti-common-font-size-3)',
+  'ti-link-menu-btn-border-radius': 'var(--ti-common-border-radius-2)',
+  'ti-link-menu-btn-border-color': 'var(--ti-common-border-color-transparent-8)',
+  'ti-link-menu-btn-bg-color': 'var(--ti-common-color-light, #fff)',
+  'ti-link-menu-nav-item-text-color': 'var(--ti-base-color-brand-6, #5e7ce0)'
+}
diff --git a/packages/theme/src/link-menu/smb-theme.js b/packages/theme/src/link-menu/smb-theme.js
deleted file mode 100644
index 1d0e0dd8a..000000000
--- a/packages/theme/src/link-menu/smb-theme.js
+++ /dev/null
@@ -1,7 +0,0 @@
-export const tinyLinkMenuSmbTheme = {
-  'ti-link-menu-nav-item-text-color': 'var(--ti-common-color-text-gray)',
-  'ti-link-menu-btn-bg-color': 'var(--ti-common-color-light)',
-  'ti-link-menu-btn-border-color': 'var(--ti-common-color-line-normal)',
-  'ti-link-menu-btn-border-radius': 'var(--ti-common-border-radius-3)',
-  'ti-link-menu-btn-size': 'var(--ti-common-font-size-2)'
-}
diff --git a/packages/theme/src/link-menu/vars.less b/packages/theme/src/link-menu/vars.less
index 4f638b42c..f5d573ac5 100644
--- a/packages/theme/src/link-menu/vars.less
+++ b/packages/theme/src/link-menu/vars.less
@@ -12,13 +12,13 @@
 
 .component-css-vars-link-menu() {
   // 收藏夹设置按钮图标色(和取消按钮文本色)
-  --ti-link-menu-nav-item-text-color: var(--ti-base-color-brand-6, #5e7ce0);
+  --ti-link-menu-nav-item-text-color: var(--ti-common-color-text-gray);
   // 收藏夹菜单导航右边框色
   --ti-link-menu-nav-item-border-color: #c4c4c4;
   // 收藏夹菜单按钮文本色
   --ti-link-menu-btn-text-color: rgba(24, 144, 255, 0.8);
   // 收藏夹设置按钮,弹出框输入框和取消按钮的背景色
-  --ti-link-menu-btn-bg-color: var(--ti-common-color-light, #fff);
+  --ti-link-menu-btn-bg-color: var(--ti-common-color-light);
   // 收藏夹弹出框的输入框高度
   --ti-link-menu-input-height: var(--ti-common-size-height-normal, 28px);
   // 收藏夹弹出框字号
@@ -32,9 +32,9 @@
   // 收藏夹弹出框列表项的节点文本色
   --ti-link-menu-tree-node-text-color: var(--ti-common-color-text-disabled, #adb0b8);
   // 按钮边框颜色
-  --ti-link-menu-btn-border-color: var(--ti-common-border-color-transparent-8);
+  --ti-link-menu-btn-border-color: var(--ti-common-color-line-normal);
   // 按钮圆角
-  --ti-link-menu-btn-border-radius: var(--ti-common-border-radius-2);
+  --ti-link-menu-btn-border-radius: var(--ti-common-border-radius-3);
   // 按钮大小
-  --ti-link-menu-btn-size: var(--ti-common-font-size-3);
+  --ti-link-menu-btn-size: var(--ti-common-font-size-2);
 }
diff --git a/packages/theme/src/link/old-theme.js b/packages/theme/src/link/old-theme.js
new file mode 100644
index 000000000..dd40df563
--- /dev/null
+++ b/packages/theme/src/link/old-theme.js
@@ -0,0 +1,27 @@
+export const tinyLinkOldTheme = {
+  'ti-link-svg-padding-bottom': 'unset',
+  'ti-link-has-svg-hover-text-color': 'var(--ti-common-color-text-link, #526ecc)',
+  'ti-link-info-disabled-text-color': 'var(--ti-common-color-info-disabled, #bfbfbf)',
+  'ti-link-info-hover-text-color': 'var(--ti-common-color-info-hover, #5c6173)',
+  'ti-link-warning-disabled-text-color': 'var(--ti-common-color-warning-disabled, #d3c6a2)',
+  'ti-link-warning-hover-text-color': 'var(--ti-common-color-warning-hover, #fac20a)',
+  'ti-link-success-disabled-text-color': 'var(--ti-common-color-success-disabled, #a6c3b9)',
+  'ti-link-success-hover-text-color': 'var(--ti-common-color-success-hover, #acf2dc)',
+  'ti-link-danger-disabled-text-color': 'var(--ti-common-color-danger-disabled, #d8bab5)',
+  'ti-link-danger-hover-text-color': 'var(--ti-common-bg-primary-hover, #d64a52)',
+  'ti-link-danger-border-color': 'var(--ti-common-bg-primary, #c7000b)',
+  'ti-link-danger-text-color': 'var(--ti-common-bg-primary, #c7000b)',
+  'ti-link-primary-disabled-text-color': 'var(--ti-common-color-primary-disabled, #a0cfff)',
+  'ti-link-primary-hover-text-color': 'var(--ti-common-color-primary-hover, #7693f5)',
+  'ti-link-default-hover-border-color': 'var(--ti-link-default-hover-text-color)',
+  'ti-link-default-disabled-text-color': 'var(--ti-common-color-info-disabled, #bfbfbf)',
+  'ti-link-default-hover-text-color': 'var(--ti-common-color-text-link, #526ecc)',
+  'ti-link-default-border-color': 'var(--ti-common-color-line-active, #5e7ce0)',
+  'ti-link-default-text-color': 'var(--ti-common-color-info-text, #252b3a)',
+  'ti-link-icon-hover-text-weight': 'var(--ti-common-font-weight-5, 500)',
+  'ti-link-svg-margin-right': '0px',
+  'ti-link-svg-height': '1em',
+  'ti-link-svg-width': '1em',
+  'ti-link-has-icon-underline-width': '100%',
+  'ti-link-font-weight': 'var(--ti-common-font-weight-5, 500)'
+}
diff --git a/packages/theme/src/link/smb-theme.js b/packages/theme/src/link/smb-theme.js
deleted file mode 100644
index 00ca12c4e..000000000
--- a/packages/theme/src/link/smb-theme.js
+++ /dev/null
@@ -1,27 +0,0 @@
-export const tinyLinkSmbTheme = {
-  'ti-link-svg-width': '16px',
-  'ti-link-svg-height': 'var(--ti-common-size-5x)',
-  'ti-link-svg-margin-right': '4px',
-  'ti-link-font-weight': 'var(--ti-common-font-weight-4)',
-  'ti-link-default-hover-border-color': '#595959',
-  'ti-link-default-hover-text-color': 'var(--ti-common-color-text-highlight)',
-  'ti-link-default-text-color': 'var(--ti-common-color-text-highlight)',
-  'ti-link-default-disabled-text-color': '#C2C2C2',
-  'ti-link-icon-hover-text-weight': 'var(--ti-common-font-weight-4)',
-  'ti-link-default-border-color': '#1476FF',
-  'ti-link-has-icon-underline-width': 'calc(100% - 20px)',
-  'ti-link-has-svg-hover-text-color': '#1476FF',
-  'ti-link-primary-disabled-text-color': 'var(--ti-common-color-primary-disabled-text)',
-  'ti-link-danger-disabled-text-color': 'var(--ti-common-color-danger-disabled-text)',
-  'ti-link-success-disabled-text-color': 'var(--ti-common-color-success-disabled-text)',
-  'ti-link-warning-disabled-text-color': 'var(--ti-common-color-warning-disabled-text)',
-  'ti-link-info-disabled-text-color': 'var(--ti-common-color-info-disabled-text)',
-  'ti-link-danger-text-color': '#c7000b',
-  'ti-link-danger-border-color': '#c7000b',
-  'ti-link-svg-padding-bottom': 'var(--ti-common-space-2)',
-  'ti-link-primary-hover-text-color': 'var(--ti-common-color-text-primary)',
-  'ti-link-success-hover-text-color': 'var(--ti-common-color-success)',
-  'ti-link-warning-hover-text-color': 'var(--ti-common-color-warn-text)',
-  'ti-link-danger-hover-text-color': '#C7000B',
-  'ti-link-info-hover-text-color': 'var(--ti-common-color-text-primary)'
-}
diff --git a/packages/theme/src/link/vars.less b/packages/theme/src/link/vars.less
index b596578bb..d12a30705 100644
--- a/packages/theme/src/link/vars.less
+++ b/packages/theme/src/link/vars.less
@@ -14,35 +14,35 @@
   // 链接字号
   --ti-link-font-size: var(--ti-common-font-size-1, 14px);
   // 链接字重
-  --ti-link-font-weight: var(--ti-common-font-weight-5, 500);
+  --ti-link-font-weight: var(--ti-common-font-weight-4);
   // 链接下划线色(hide)
   --ti-link-border-color: var(--ti-common-color-line-active, #5e7ce0);
   // 链接有图标时下划线宽度(hide)
-  --ti-link-has-icon-underline-width: 100%;
+  --ti-link-has-icon-underline-width: calc(100% - 20px);
   // 链接只有文字时下划线宽度(hide)
   --ti-link-only-text-underline-width: 100%;
   // 链接是否显示
   --ti-link-display: inline;
   // 链接图标宽度
-  --ti-link-svg-width: 1em;
+  --ti-link-svg-width: 16px;
   // 链接图标高度
-  --ti-link-svg-height: 1em;
+  --ti-link-svg-height: var(--ti-common-size-5x);
   // 链接图标右侧外边距
-  --ti-link-svg-margin-right: 0px;
+  --ti-link-svg-margin-right: 4px;
 
   // 链接图标悬浮字重
-  --ti-link-icon-hover-text-weight: var(--ti-common-font-weight-5, 500);
+  --ti-link-icon-hover-text-weight: var(--ti-common-font-weight-4);
 
   // 默认链接文本色
-  --ti-link-default-text-color: var(--ti-common-color-info-text, #252b3a);
+  --ti-link-default-text-color: var(--ti-common-color-text-highlight);
   // 默认链接悬浮下划线色
-  --ti-link-default-border-color: var(--ti-common-color-line-active, #5e7ce0);
+  --ti-link-default-border-color: #1476FF;
   // 默认链接悬浮文本色
-  --ti-link-default-hover-text-color: var(--ti-common-color-text-link, #526ecc);
+  --ti-link-default-hover-text-color: var(--ti-common-color-text-highlight);
   // 默认链接禁用文本色
-  --ti-link-default-disabled-text-color: var(--ti-common-color-info-disabled, #bfbfbf);
+  --ti-link-default-disabled-text-color: #C2C2C2;
   // 默认链接悬浮下划线色
-  --ti-link-default-hover-border-color: var(--ti-link-default-hover-text-color);
+  --ti-link-default-hover-border-color: #595959;
 
   // 主要链接文本色
   --ti-link-primary-text-color: var(--ti-common-color-primary-normal, #5e7ce0);
@@ -50,48 +50,48 @@
   // 主要链接悬浮下划线色
   --ti-link-primary-border-color: var(--ti-common-color-line-active, #5e7ce0);
   // 主要链接悬浮文本色
-  --ti-link-primary-hover-text-color: var(--ti-common-color-primary-hover, #7693f5);
+  --ti-link-primary-hover-text-color: var(--ti-common-color-text-primary);
   // 主要链接禁用文本色
-  --ti-link-primary-disabled-text-color: var(--ti-common-color-primary-disabled, #a0cfff);
+  --ti-link-primary-disabled-text-color: var(--ti-common-color-primary-disabled-text);
 
   // 危险链接文本色
-  --ti-link-danger-text-color: var(--ti-common-bg-primary, #c7000b);
+  --ti-link-danger-text-color: #c7000b;
   // 危险链接悬浮下划线色
-  --ti-link-danger-border-color: var(--ti-common-bg-primary, #c7000b);
+  --ti-link-danger-border-color: #c7000b;
   // 危险链接悬浮文本色
-  --ti-link-danger-hover-text-color: var(--ti-common-bg-primary-hover, #d64a52);
+  --ti-link-danger-hover-text-color: #C7000B;
   // 危险链接禁用文本色
-  --ti-link-danger-disabled-text-color: var(--ti-common-color-danger-disabled, #d8bab5);
+  --ti-link-danger-disabled-text-color: var(--ti-common-color-danger-disabled-text);
 
   // 成功链接文本色
   --ti-link-success-text-color: var(--ti-common-color-success-normal, #50d4ab);
   // 成功链接悬浮下划线色
   --ti-link-success-border-color: var(--ti-common-color-success-normal, #50d4ab);
   // 成功链接悬浮文本色
-  --ti-link-success-hover-text-color: var(--ti-common-color-success-hover, #acf2dc);
+  --ti-link-success-hover-text-color: var(--ti-common-color-success);
   // 成功链接禁用文本色
-  --ti-link-success-disabled-text-color: var(--ti-common-color-success-disabled, #a6c3b9);
+  --ti-link-success-disabled-text-color: var(--ti-common-color-success-disabled-text);
 
   // 警告链接文本色
   --ti-link-warning-text-color: var(--ti-common-color-warning-normal, #fa9841);
   // 警告链接悬浮下划线色
   --ti-link-warning-border-color: var(--ti-common-color-warning-normal, #fa9841);
   // 警告链接悬浮文本色
-  --ti-link-warning-hover-text-color: var(--ti-common-color-warning-hover, #fac20a);
+  --ti-link-warning-hover-text-color: var(--ti-common-color-warn-text);
   // 警告链接禁用文本色
-  --ti-link-warning-disabled-text-color: var(--ti-common-color-warning-disabled, #d3c6a2);
+  --ti-link-warning-disabled-text-color: var(--ti-common-color-warning-disabled-text);
 
   // 信息链接文本色
   --ti-link-info-text-color: var(--ti-common-color-info-normal, #252b3a);
   // 信息链接悬浮下划线色
   --ti-link-info-border-color: var(--ti-common-color-info-normal, #252b3a);
   // 信息链接悬浮文本色
-  --ti-link-info-hover-text-color: var(--ti-common-color-info-hover, #5c6173);
+  --ti-link-info-hover-text-color: var(--ti-common-color-text-primary);
   // 信息链接禁用文本色
-  --ti-link-info-disabled-text-color: var(--ti-common-color-info-disabled, #bfbfbf);
+  --ti-link-info-disabled-text-color: var(--ti-common-color-info-disabled-text);
 
   // 带有图标的链接悬浮文本色
-  --ti-link-has-svg-hover-text-color: var(--ti-common-color-text-link, #526ecc);
+  --ti-link-has-svg-hover-text-color: #1476FF;
   // SVG
-  --ti-link-svg-padding-bottom: unset;
+  --ti-link-svg-padding-bottom: var(--ti-common-space-2);
 }
diff --git a/packages/theme/src/loading/old-theme.js b/packages/theme/src/loading/old-theme.js
new file mode 100644
index 000000000..d0a302139
--- /dev/null
+++ b/packages/theme/src/loading/old-theme.js
@@ -0,0 +1,17 @@
+export const tinyLoadingOldTheme = {
+  'ti-loading-spinner-large-width': 'var(--ti-common-size-10x, 40px)',
+  'ti-loading-spinner-medium-width': 'var(--ti-common-size-8x, 32px)',
+  'ti-loading-spinner-small-width': 'var(--ti-common-size-4x, 16px)',
+  'ti-loading-spinner-large-height': 'var(--ti-common-size-10x, 40px)',
+  'ti-loading-spinner-medium-height': 'var(--ti-common-size-8x, 32px)',
+  'ti-loading-spinner-small-height': 'var(--ti-common-size-4x, 16px)',
+  'ti-loading-fullscreen-large-height': 'var(--ti-common-size-10x, 40px)',
+  'ti-loading-fullscreen-medium-height': 'var(--ti-common-size-8x, 32px)',
+  'ti-loading-fullscreen-small-height': 'var(--ti-common-size-4x, 16px)',
+  'ti-loading-fullscreen-large-width': 'var(--ti-common-size-10x, 40px)',
+  'ti-loading-fullscreen-medium-width': 'var(--ti-common-size-8x, 32px)',
+  'ti-loading-fullscreen-small-width': 'var(--ti-common-size-4x, 16px)',
+  'ti-loading-text-margin-vertical': 'calc(var(--ti-common-space-base, 4px) - 1px)',
+  'ti-loading-text-font-size': 'var(--ti-common-font-size-1, 14px)',
+  'ti-loading-text-color': 'var(--ti-common-color-icon-active, #5e7ce0)'
+}
diff --git a/packages/theme/src/loading/smb-theme.js b/packages/theme/src/loading/smb-theme.js
deleted file mode 100644
index 5015c7765..000000000
--- a/packages/theme/src/loading/smb-theme.js
+++ /dev/null
@@ -1,21 +0,0 @@
-export const tinyLoadingSmbTheme = {
-  'ti-loading-text-color': 'var(--ti-common-color-text-secondary)',
-  'ti-loading-text-font-size': 'var(--ti-common-font-size-2)',
-  'ti-loading-text-margin-vertical': 'var(--ti-common-space-4x)',
-  'ti-loading-spinner-width': '16px',
-  'ti-loading-spinner-height': '16px',
-  'ti-loading-fullscreen-height': '16px',
-  'ti-loading-fullscreen-width': '16px',
-  'ti-loading-fullscreen-small-width': '16px',
-  'ti-loading-fullscreen-medium-width': '24px',
-  'ti-loading-fullscreen-large-width': '32px',
-  'ti-loading-fullscreen-small-height': '16px',
-  'ti-loading-fullscreen-medium-height': '24px',
-  'ti-loading-fullscreen-large-height': '32px',
-  'ti-loading-spinner-small-height': '16px',
-  'ti-loading-spinner-medium-height': '24px',
-  'ti-loading-spinner-large-height': '32px',
-  'ti-loading-spinner-small-width': '16px',
-  'ti-loading-spinner-medium-width': '24px',
-  'ti-loading-spinner-large-width': '32px'
-}
diff --git a/packages/theme/src/loading/vars.less b/packages/theme/src/loading/vars.less
index 94bf8ba1a..2c790dab2 100644
--- a/packages/theme/src/loading/vars.less
+++ b/packages/theme/src/loading/vars.less
@@ -14,39 +14,39 @@
   // 加载图标色
   --ti-loading-icon-color: var(--ti-common-color-icon-active, #5e7ce0);
   // 加载文本色
-  --ti-loading-text-color: var(--ti-common-color-icon-active, #5e7ce0);
+  --ti-loading-text-color: var(--ti-common-color-text-secondary);
   // 加载背景色
   --ti-loading-mask-bg-color: var(--ti-common-bg-minor, #ffffff);
   // 加载文本字号
-  --ti-loading-text-font-size: var(--ti-common-font-size-1, 14px);
+  --ti-loading-text-font-size: var(--ti-common-font-size-2);
   // 加载图标自定义加载图标顶部外边距
   --ti-loading-spinner-margin-top: calc(var(--ti-common-space-0, 0px) - 21px);
   // 加载图标文本垂直方向外边距
-  --ti-loading-text-margin-vertical: calc(var(--ti-common-space-base, 4px) - 1px);
+  --ti-loading-text-margin-vertical: var(--ti-common-space-4x);
   // 加载图标文本水平方向外边距
   --ti-loading-text-margin-horizontal: var(--ti-common-space-0, 0px);
   // 全屏加载图标small尺寸时的宽度
-  --ti-loading-fullscreen-small-width: var(--ti-common-size-4x, 16px);
+  --ti-loading-fullscreen-small-width: 16px;
   // 全屏加载图标medium尺寸时的宽度
-  --ti-loading-fullscreen-medium-width: var(--ti-common-size-8x, 32px);
+  --ti-loading-fullscreen-medium-width: 24px;
   // 全屏加载图标large尺寸时的宽度
-  --ti-loading-fullscreen-large-width: var(--ti-common-size-10x, 40px);
+  --ti-loading-fullscreen-large-width: 32px;
   // 全屏加载图标small尺寸时的高度
-  --ti-loading-fullscreen-small-height: var(--ti-common-size-4x, 16px);
+  --ti-loading-fullscreen-small-height: 16px;
   // 全屏加载图标medium尺寸时的高度
-  --ti-loading-fullscreen-medium-height: var(--ti-common-size-8x, 32px);
+  --ti-loading-fullscreen-medium-height: 24px;
   // 全屏加载图标large尺寸时的高度
-  --ti-loading-fullscreen-large-height: var(--ti-common-size-10x, 40px);
+  --ti-loading-fullscreen-large-height: 32px;
   // 默认加载图标small尺寸时的高度
-  --ti-loading-spinner-small-height: var(--ti-common-size-4x, 16px);
+  --ti-loading-spinner-small-height: 16px;
   // 默认加载图标medium尺寸时的高度
-  --ti-loading-spinner-medium-height: var(--ti-common-size-8x, 32px);
+  --ti-loading-spinner-medium-height: 24px;
   // 默认加载图标large尺寸时的高度
-  --ti-loading-spinner-large-height: var(--ti-common-size-10x, 40px);
+  --ti-loading-spinner-large-height: 32px;
   // 默认加载图标small尺寸时的宽度
-  --ti-loading-spinner-small-width: var(--ti-common-size-4x, 16px);
+  --ti-loading-spinner-small-width: 16px;
   // 默认加载图标medium尺寸时的宽度
-  --ti-loading-spinner-medium-width: var(--ti-common-size-8x, 32px);
+  --ti-loading-spinner-medium-width: 24px;
   // 默认加载图标large尺寸时的宽度
-  --ti-loading-spinner-large-width: var(--ti-common-size-10x, 40px);
+  --ti-loading-spinner-large-width: 32px;
 }
diff --git a/packages/theme/src/milestone/old-theme.js b/packages/theme/src/milestone/old-theme.js
new file mode 100644
index 000000000..e77fca400
--- /dev/null
+++ b/packages/theme/src/milestone/old-theme.js
@@ -0,0 +1,31 @@
+export const tinyMilestoneOldTheme = {
+  'ti-milestone-dot-display': 'block',
+  'ti-milestone-flag-line-bg-color': '#333',
+  'ti-milestone-flag-line-margin-left': '50%',
+  'ti-milestone-flag-desc-line-height': '14px',
+  'ti-milestone-flag-line-height': '14px',
+  'ti-milestone-flag-desc-font-size': 'var(--ti-common-font-size-base, 12px)',
+  'ti-milestone-text-color': 'var(--ti-common-color-light, #fff)',
+  'ti-milestone-flag-desc-text-color': 'var(--ti-common-color-light, #fff)',
+  'ti-milestone-flag-name-font-weight': 'var(--ti-common-font-weight-4)',
+  'ti-milestone-flag-content-bg-color': '#333',
+  'ti-milestone-flag-content-border-radius': 'var(--ti-common-border-radius-1, 4px)',
+  'ti-milestone-flag-padding': 'var(--ti-common-size-0, 0px) var(--ti-common-size-base, 4px)',
+  'ti-milestone-flag-height': '34px',
+  'ti-milestone-flag-width': '50px',
+  'ti-milestone-status-font-size': 'var(--ti-common-font-size-1)',
+  'ti-milestone-line-top': '-8px',
+  'ti-milestone-line-left': '50%',
+  'ti-milestone-line-width': '100%',
+  'ti-milestone-line-height': 'var(--ti-common-size-base, 4px)',
+  'ti-milestone-line-bg-color-completed': '#dbdbdb',
+  'ti-milestone-line-bg-color': '#dbdbdb',
+  'ti-milestone-icon-top': 'var(--ti-common-size-base, 4px)',
+  'ti-milestone-icon-left': "~'calc(50% - 10px)'",
+  'ti-milestone-icon-color': '#1890ff',
+  'ti-milestone-icon-size': 'var(--ti-common-font-size-base)',
+  'ti-milestone-icon-border-width-completed': 'var(--ti-common-border-weight-1)',
+  'ti-milestone-icon-border-width': 'var(--ti-common-size-0)',
+  'ti-milestone-icon-height': 'var(--ti-common-size-5x, 20px)',
+  'ti-milestone-icon-width': 'var(--ti-common-size-5x, 20px)'
+}
diff --git a/packages/theme/src/milestone/smb-theme.js b/packages/theme/src/milestone/smb-theme.js
deleted file mode 100644
index 6845b8070..000000000
--- a/packages/theme/src/milestone/smb-theme.js
+++ /dev/null
@@ -1,35 +0,0 @@
-export const tinyMilestoneSmbTheme = {
-  'ti-milestone-text-color': 'var(--ti-common-color-text-primary)',
-  'ti-milestone-icon-width': 'var(--ti-common-size-8x)',
-  'ti-milestone-icon-height': 'var(--ti-common-size-8x)',
-  'ti-milestone-icon-border-width': 'var(--ti-common-border-weight-normal)',
-  'ti-milestone-icon-border-width-completed': '1px',
-  'ti-milestone-icon-size': 'var(--ti-common-font-size-5)',
-  'ti-milestone-icon-color': 'var(--ti-common-color-icon)',
-  'ti-milestone-icon-left': 'calc(50% - 16px)',
-  'ti-milestone-icon-top': 'var(--ti-common-size-0)',
-  'ti-milestone-status-font-size': 'var(--ti-common-font-size-0)',
-
-  'ti-milestone-line-left': 'calc(50% + 24px)',
-  'ti-milestone-line-top': '-16px',
-
-  'ti-milestone-line-width': 'calc(100% - 48px)',
-  'ti-milestone-line-height': 'var(--ti-common-border-weight-normal)',
-  'ti-milestone-line-bg-color': 'var(--ti-common-color-bg-dark-disabled)',
-  'ti-milestone-line-bg-color-completed': 'var(--ti-common-color-bg-primary)',
-
-  'ti-milestone-flag-width': '88px',
-  'ti-milestone-flag-height': '46px',
-  'ti-milestone-flag-padding': 'var(--ti-common-size-base)',
-  'ti-milestone-flag-content-bg-color': 'var(--ti-common-color-bg-normal)',
-  'ti-milestone-flag-content-border-radius':
-    'var(--ti-common-border-radius-0) var(--ti-common-border-radius-4) var(--ti-common-border-radius-4) var(--ti-common-border-radius-0)',
-  'ti-milestone-flag-line-margin-left': 'var(--ti-common-size-0)',
-  'ti-milestone-flag-line-bg-color': 'var(--ti-common-color-bg-normal)',
-  'ti-milestone-flag-name-font-weight': 'var(--ti-common-font-weight-bold)',
-  'ti-milestone-flag-desc-text-color': 'var(--ti-common-color-text-secondary)',
-  'ti-milestone-flag-desc-font-size': 'var(--ti-common-font-size-0)',
-  'ti-milestone-flag-desc-line-height': 'var(--ti-common-line-height-base)',
-  'ti-milestone-flag-line-height': 'var(--ti-common-line-height-1)',
-  'ti-milestone-dot-display': 'none'
-}
diff --git a/packages/theme/src/milestone/vars.less b/packages/theme/src/milestone/vars.less
index 95e98a33d..484123bcf 100644
--- a/packages/theme/src/milestone/vars.less
+++ b/packages/theme/src/milestone/vars.less
@@ -16,47 +16,47 @@
   // 节点实心显示光晕背景色
   --ti-milestone-bg-color: var(--ti-common-color-icon-white, #fff);
   // 节点宽度
-  --ti-milestone-icon-width: var(--ti-common-size-5x, 20px);
+  --ti-milestone-icon-width: var(--ti-common-size-8x);
   // 节点高度
-  --ti-milestone-icon-height: var(--ti-common-size-5x, 20px);
+  --ti-milestone-icon-height: var(--ti-common-size-8x);
   // 节点默认边框色
   --ti-milestone-icon-border-color: var(--ti-common-color-line-active);
   // 节点默认边框粗细
-  --ti-milestone-icon-border-width: var(--ti-common-size-0);
+  --ti-milestone-icon-border-width: var(--ti-common-border-weight-normal);
   // 完成节点边框粗细
-  --ti-milestone-icon-border-width-completed: var(--ti-common-border-weight-1);
+  --ti-milestone-icon-border-width-completed: 1px;
   // 节点图标大小
-  --ti-milestone-icon-size: var(--ti-common-font-size-base);
+  --ti-milestone-icon-size: var(--ti-common-font-size-5);
   // 完成节点图标颜色
-  --ti-milestone-icon-color: #1890ff; // 保留原来样式，暂未适配默认主题 var(--ti-common-color-icon);
+  --ti-milestone-icon-color: var(--ti-common-color-icon); // 保留原来样式，暂未适配默认主题 var(--ti-common-color-icon);
   // 节点绝对定位左侧间距
-  --ti-milestone-icon-left: ~'calc(50% - 10px)';
+  --ti-milestone-icon-left: calc(50% - 16px);
   // 节点绝对定位顶部间距
-  --ti-milestone-icon-top: var(--ti-common-size-base, 4px);
+  --ti-milestone-icon-top: var(--ti-common-size-0);
 
   // 未完成线路背景色
-  --ti-milestone-line-bg-color: #dbdbdb;
+  --ti-milestone-line-bg-color: var(--ti-common-color-bg-dark-disabled);
   // 完成节点线路背景色
-  --ti-milestone-line-bg-color-completed: #dbdbdb;
+  --ti-milestone-line-bg-color-completed: var(--ti-common-color-bg-primary);
   // 线高度
-  --ti-milestone-line-height: var(--ti-common-size-base, 4px);
+  --ti-milestone-line-height: var(--ti-common-border-weight-normal);
   // 线宽度
-  --ti-milestone-line-width: 100%;
+  --ti-milestone-line-width: calc(100% - 48px);
   // 线绝对定位左侧偏移
-  --ti-milestone-line-left: 50%;
+  --ti-milestone-line-left: calc(50% + 24px);
   // 线绝对定位顶部偏移
-  --ti-milestone-line-top: -8px;
+  --ti-milestone-line-top: -16px;
   // 节点下方日期文本色
   --ti-milestone-status-text-color: var(--ti-common-color-placeholder, #adb0b8);
   // 节点下方日期文本字号
-  --ti-milestone-status-font-size: var(--ti-common-font-size-1);
+  --ti-milestone-status-font-size: var(--ti-common-font-size-0);
 
   // 旗子宽度
-  --ti-milestone-flag-width: 50px;
+  --ti-milestone-flag-width: 88px;
   // 旗子高度
-  --ti-milestone-flag-height: 34px;
+  --ti-milestone-flag-height: 46px;
   // 旗子内间距
-  --ti-milestone-flag-padding: var(--ti-common-size-0, 0px) var(--ti-common-size-base, 4px);
+  --ti-milestone-flag-padding: var(--ti-common-size-base);
   // 提示行高(hide)
   --ti-milestone-flag-tip-line-height: var(--ti-common-line-height-4, 20px);
   // 提示背景色(hide)
@@ -64,30 +64,30 @@
   // 提示圆角(hide)
   --ti-milestone-flag-tip-border-radius: var(--ti-common-border-radius-normal, 2px);
   // 旗子圆角
-  --ti-milestone-flag-content-border-radius: var(--ti-common-border-radius-1, 4px);
+  --ti-milestone-flag-content-border-radius: var(--ti-common-border-radius-0) var(--ti-common-border-radius-4) var(--ti-common-border-radius-4) var(--ti-common-border-radius-0);
   // 旗子默认字号(hide)
   --ti-milestone-flag-content-font-size: var(--ti-common-font-size-1, 14px);
   // 旗子背景色
-  --ti-milestone-flag-content-bg-color: #333;
+  --ti-milestone-flag-content-bg-color: var(--ti-common-color-bg-normal);
   // 旗子标题字重
-  --ti-milestone-flag-name-font-weight: var(--ti-common-font-weight-4);
+  --ti-milestone-flag-name-font-weight: var(--ti-common-font-weight-bold);
   // 旗子描述文本色
-  --ti-milestone-flag-desc-text-color: var(--ti-common-color-light, #fff);
+  --ti-milestone-flag-desc-text-color: var(--ti-common-color-text-secondary);
   // 旗子文本色
-  --ti-milestone-text-color: var(--ti-common-color-light, #fff);
+  --ti-milestone-text-color: var(--ti-common-color-text-primary);
   // 旗子字号
   --ti-milestone-flag-font-size: var(--ti-common-font-size-base, 12px);
   // 旗子描述字号大小
-  --ti-milestone-flag-desc-font-size: var(--ti-common-font-size-base, 12px);
+  --ti-milestone-flag-desc-font-size: var(--ti-common-font-size-0);
   // 旗子行高
-  --ti-milestone-flag-line-height: 14px;
+  --ti-milestone-flag-line-height: var(--ti-common-line-height-1);
   // 旗子描述行高
-  --ti-milestone-flag-desc-line-height: 14px;
+  --ti-milestone-flag-desc-line-height: var(--ti-common-line-height-base);
 
   // 旗子线绝对定位左侧间距
-  --ti-milestone-flag-line-margin-left: 50%;
+  --ti-milestone-flag-line-margin-left: var(--ti-common-size-0);
   // 旗子线背景色
-  --ti-milestone-flag-line-bg-color: #333;
+  --ti-milestone-flag-line-bg-color: var(--ti-common-color-bg-normal);
   // 旗子圆圈是否显示
-  --ti-milestone-dot-display: block;
+  --ti-milestone-dot-display: none;
 }
diff --git a/packages/theme/src/modal/old-theme.js b/packages/theme/src/modal/old-theme.js
new file mode 100644
index 000000000..c5d398525
--- /dev/null
+++ b/packages/theme/src/modal/old-theme.js
@@ -0,0 +1,22 @@
+export const tinyModalOldTheme = {
+  'ti-modal-zoom-btn-right': 'var(--ti-common-space-10x, 40px)',
+  'ti-modal-close-btn-hover-icon-color': 'var(--ti-common-color-icon-hover, #5e7ce0)',
+  'ti-modal-close-btn-icon-color': 'var(--ti-common-color-text-secondary, #575d6c)',
+  'ti-modal-close-btn-font-size': 'var(--ti-common-font-size-1, 14px)',
+  'ti-modal-message-icon-box-height': 'var(--ti-common-size-4x, 16px)',
+  'ti-modal-message-body-padding-horizontal': 'var(--ti-common-space-8x, 32px)',
+  'ti-modal-message-padding-vertical': 'var(--ti-common-space-6x, 24px)',
+  'ti-modal-message-padding-right': 'var(--ti-common-space-6x, 24px)',
+  'ti-modal-message-padding-left': 'var(--ti-common-space-6x, 24px)',
+  'ti-modal-message-font-size': 'var(--ti-common-font-size-3, 18px)',
+  'ti-modal-notification-header-padding-bottom': 'var(--ti-common-space-3x, 12px)',
+  'ti-modal-footer-btn-min-width': 'var(--ti-common-size-16x, 64px)',
+  'ti-modal-footer-btn-border-radius': 'var(--ti-common-border-radius-normal, 2px)',
+  'ti-modal-footer-align': 'center',
+  'ti-modal-footer-padding-top': 'calc(var(--ti-common-space-base, 4px) * 7)',
+  'ti-modal-body-text-color': 'var(--ti-common-color-text-primary, #252b3a)',
+  'ti-modal-header-padding-bottom': 'calc(var(--ti-common-space-base, 4px) * 7)',
+  'ti-modal-header-font-size': 'var(--ti-common-font-size-3, 18px)',
+  'ti-modal-box-border-radius': 'var(--ti-common-border-radius-normal, 2px)',
+  'ti-modal-box-shadow': '0 10px 40px 0 rgba(0, 0, 0, 0.1)'
+}
diff --git a/packages/theme/src/modal/smb-theme.js b/packages/theme/src/modal/smb-theme.js
deleted file mode 100644
index 01cfa0da2..000000000
--- a/packages/theme/src/modal/smb-theme.js
+++ /dev/null
@@ -1,24 +0,0 @@
-export const tinyModalSmbTheme = {
-  'ti-modal-box-shadow': 'var(--ti-common-shadow-4-down)',
-  'ti-modal-header-font-size': 'var(--ti-common-font-size-4)',
-  'ti-modal-header-padding-bottom': 'var(--ti-common-space-4x)',
-  'ti-modal-box-border-radius': 'var(--ti-common-border-radius-4)',
-  'ti-modal-close-btn-font-size': 'var(--ti-common-font-size-5)',
-  'ti-modal-close-btn-icon-color': 'var(--ti-common-color-icon-normal)',
-  'ti-modal-close-btn-hover-icon-color': 'var(--ti-common-color-icon-hover)',
-  'ti-modal-zoom-btn-right': 'calc(var(--ti-common-space-base) * 12)',
-  'ti-modal-footer-padding-top': 'var(--ti-common-space-6x)',
-  'ti-modal-footer-btn-min-width': 'calc(var(--ti-common-space-base) * 24)',
-  'ti-modal-footer-btn-border-radius': 'calc(var(--ti-common-space-10) * 5)',
-  'ti-modal-small-text-color': 'var(--ti-common-color-text-secondary)',
-  'ti-modal-message-font-size': 'var(--ti-common-font-size-base)',
-  'ti-modal-message-padding-left': 'var(--ti-common-space-4x)',
-  'ti-modal-message-padding-right': 'var(--ti-common-space-3x)',
-  'ti-modal-message-padding-vertical': 'calc(var(--ti-common-space-10) - 0.5px)',
-  'ti-modal-message-body-padding-horizontal': 'var(--ti-common-space-0)',
-  'ti-modal-message-icon-box-height': 'calc(var(--ti-common-space-5x) - 1px)',
-  'ti-modal-notification-header-padding-bottom': 'var(--ti-common-space-6x)',
-  'ti-modal-footer-align': 'right',
-  'ti-modal-body-text-color': 'var(--ti-common-color-text-secondary)',
-  'ti-modal-body-text-bottom': 'var(--ti-common-space-4x)'
-}
diff --git a/packages/theme/src/modal/vars.less b/packages/theme/src/modal/vars.less
index 90a64dd53..3b647535c 100644
--- a/packages/theme/src/modal/vars.less
+++ b/packages/theme/src/modal/vars.less
@@ -14,20 +14,20 @@
   // 默认宽度
   --ti-modal-box-width: calc(var(--ti-common-space-10, 10px) * 40);
   // 模态框阴影
-  --ti-modal-box-shadow: 0 10px 40px 0 rgba(0, 0, 0, 0.1);
+  --ti-modal-box-shadow: var(--ti-common-shadow-4-down);
   // 字体族(hide)
   --ti-modal-font-family: var(--ti-common-font-family, 'Helvetica', 'Arial', 'PingFangSC-Regular', 'Hiragino Sans GB', 'Microsoft YaHei', '微软雅黑', 'Microsoft JhengHei');
   // 背景色
   --ti-modal-box-background-color: var(--ti-common-color-bg-white-normal, #fff);
   // 边框圆角
-  --ti-modal-box-border-radius: var(--ti-common-border-radius-normal, 2px);
+  --ti-modal-box-border-radius: var(--ti-common-border-radius-4);
   // 边框色
   --ti-modal-border-color: transparent;
   // 图标尺寸
   --ti-modal-alert-icon-size: var(--ti-common-font-size-5, 24px);
 
   // 标题字号
-  --ti-modal-header-font-size: var(--ti-common-font-size-3, 18px);
+  --ti-modal-header-font-size: var(--ti-common-font-size-4);
   // 标题文本色
   --ti-modal-header-text-color: var(--ti-common-color-text-primary, #252b3a);
   // 标题字重
@@ -37,7 +37,7 @@
   // 标题水平内边距
   --ti-modal-header-padding-horizontal: var(--ti-common-space-8x, 32px);
   // 标题下内边距
-  --ti-modal-header-padding-bottom: calc(var(--ti-common-space-base, 4px) * 7);
+  --ti-modal-header-padding-bottom: var(--ti-common-space-4x);
 
   // 内容上内边距
   --ti-modal-body-padding-top: var(--ti-common-space-0, 0px);
@@ -48,38 +48,38 @@
   // 内容字号
   --ti-modal-body-font-size: var(--ti-common-font-size-base, 12px);
   // 内容文本色
-  --ti-modal-body-text-color: var(--ti-common-color-text-primary, #252b3a);
+  --ti-modal-body-text-color: var(--ti-common-color-text-secondary);
   // 内容行高
   --ti-modal-body-line-height: var(--ti-common-line-height-number, 1.5);
 
   // 底部上内边距
-  --ti-modal-footer-padding-top: calc(var(--ti-common-space-base, 4px) * 7);
+  --ti-modal-footer-padding-top: var(--ti-common-space-6x);
   // 底部水平内边距
   --ti-modal-footer-padding-horizontal: var(--ti-common-space-8x, 32px);
   // 底部下内边距
   --ti-modal-footer-padding-bottom: var(--ti-common-space-8x, 32px);
   // 底部按钮位置
-  --ti-modal-footer-align: center;
+  --ti-modal-footer-align: right;
   // 底部按钮圆角
-  --ti-modal-footer-btn-border-radius: var(--ti-common-border-radius-normal, 2px);
+  --ti-modal-footer-btn-border-radius: calc(var(--ti-common-space-10) * 5);
   // 底部按钮最小宽度
-  --ti-modal-footer-btn-min-width: var(--ti-common-size-16x, 64px);
+  --ti-modal-footer-btn-min-width: calc(var(--ti-common-space-base) * 24);
 
   // 信息提示弹窗标题下边距
-  --ti-modal-notification-header-padding-bottom: var(--ti-common-space-3x, 12px);
+  --ti-modal-notification-header-padding-bottom: var(--ti-common-space-6x);
 
   // message字号
-  --ti-modal-message-font-size: var(--ti-common-font-size-3, 18px);
+  --ti-modal-message-font-size: var(--ti-common-font-size-base);
   // message阴影
   --ti-modal-message-box-shadow: var(--ti-modal-box-shadow);
   // message左内边距
-  --ti-modal-message-padding-left: var(--ti-common-space-6x, 24px);
+  --ti-modal-message-padding-left: var(--ti-common-space-4x);
   // message右内边距
-  --ti-modal-message-padding-right: var(--ti-common-space-6x, 24px);
+  --ti-modal-message-padding-right: var(--ti-common-space-3x);
   // message垂直内边距
-  --ti-modal-message-padding-vertical: var(--ti-common-space-6x, 24px);
+  --ti-modal-message-padding-vertical: calc(var(--ti-common-space-10) - 0.5px);
   // message内容水平内边距(hide)
-  --ti-modal-message-body-padding-horizontal: var(--ti-common-space-8x, 32px);
+  --ti-modal-message-body-padding-horizontal: var(--ti-common-space-0);
   // message状态图标尺寸
   --ti-modal-message-status-icon-size: var(--ti-common-font-size-2, 16px);
   // message状态图标右边距
@@ -87,7 +87,7 @@
   // message关闭图标尺寸
   --ti-modal-message-close-icon-size: var(--ti-common-space-4x, 16px);
   // message图标父组件高度（hide)
-  --ti-modal-message-icon-box-height: var(--ti-common-size-4x, 16px);
+  --ti-modal-message-icon-box-height: calc(var(--ti-common-space-5x) - 1px);
   // message关闭图标左边距
   --ti-modal-message-close-icon-margin-left: var(--ti-common-space-3x, 12px);
 
@@ -105,21 +105,21 @@
   --ti-modal-status-icon-padding-right: var(--ti-common-space-2x, 8px);
 
   // 关闭按钮字号
-  --ti-modal-close-btn-font-size: var(--ti-common-font-size-1, 14px);
+  --ti-modal-close-btn-font-size: var(--ti-common-font-size-5);
   // 关闭按钮与上边框的距离(hide)
   --ti-modal-close-btn-top: var(--ti-common-space-5x, 20px);
   // 关闭按钮内边距
   --ti-modal-close-btn-padding-horizontal-vertical: var(--ti-common-space-0, 0px);
   // 关闭按钮图标色
-  --ti-modal-close-btn-icon-color: var(--ti-common-color-text-secondary, #575d6c);
+  --ti-modal-close-btn-icon-color: var(--ti-common-color-icon-normal);
   // 关闭按钮悬浮图标色
-  --ti-modal-close-btn-hover-icon-color: var(--ti-common-color-icon-hover, #5e7ce0);
+  --ti-modal-close-btn-hover-icon-color: var(--ti-common-color-icon-hover);
   // 关闭按钮悬浮背景色
   --ti-modal-close-btn-background-color-hover: var(--ti-common-color-bg-white-normal, #fff);
   // 关闭按钮与右边框的距离(hide)
   --ti-modal-close-btn-right: var(--ti-common-space-5x, 20px);
   // 缩放按钮与右边框的距离(hide)
-  --ti-modal-zoom-btn-right: var(--ti-common-space-10x, 40px);
+  --ti-modal-zoom-btn-right: calc(var(--ti-common-space-base) * 12);
   // 头部底线边框设置(hide)
   --ti-modal-header-border-bottom: none;
   // 关闭按钮颜色
diff --git a/packages/theme/src/month-table/old-theme.js b/packages/theme/src/month-table/old-theme.js
new file mode 100644
index 000000000..b0a0053e7
--- /dev/null
+++ b/packages/theme/src/month-table/old-theme.js
@@ -0,0 +1,10 @@
+export const tinyMonthTableOldTheme = {
+  'ti-month-table-td-div-height': '32px',
+  'ti-month-table-cell-hover-bg-color': 'var(--ti-base-color-brand-2)',
+  'ti-month-table-cell-today-border-color': 'transparent',
+  'ti-month-table-cell-border-radius': '2px',
+  'ti-month-table-cell-height': '32px',
+  'ti-month-table-cell-today-font-weight': '700',
+  'ti-month-table-cell-today-text-color': 'var(--ti-common-color-info-normal, #252b3a)',
+  'ti-month-table-td-text-bg-color': 'var(--ti-base-color-brand-7, #526ecc)'
+}
diff --git a/packages/theme/src/month-table/smb-theme.js b/packages/theme/src/month-table/smb-theme.js
deleted file mode 100644
index e45f25e23..000000000
--- a/packages/theme/src/month-table/smb-theme.js
+++ /dev/null
@@ -1,10 +0,0 @@
-export const tinyMonthTableSmbTheme = {
-  'ti-month-table-td-text-bg-color': 'var(--ti-base-color-brand-2)',
-  'ti-month-table-cell-today-font-weight': 'normal',
-  'ti-month-table-cell-height': '28px',
-  'ti-month-table-cell-border-radius': '14px',
-  'ti-month-table-cell-today-text-color': 'var(--ti-common-color-info-normal)',
-  'ti-month-table-cell-today-border-color': 'var(--ti-base-color-brand)',
-  'ti-month-table-cell-hover-bg-color': 'var(--ti-base-color-brand-8)',
-  'ti-month-table-td-div-height': '28px'
-}
diff --git a/packages/theme/src/month-table/vars.less b/packages/theme/src/month-table/vars.less
index aadae7b10..59140f957 100644
--- a/packages/theme/src/month-table/vars.less
+++ b/packages/theme/src/month-table/vars.less
@@ -11,15 +11,15 @@
 */
 
 .component-css-vars-month-table() {
-  --ti-month-table-td-text-bg-color: var(--ti-base-color-brand-7, #526ecc);
-  --ti-month-table-cell-today-text-color: var(--ti-common-color-info-normal, #252b3a);
+  --ti-month-table-td-text-bg-color: var(--ti-base-color-brand-2);
+  --ti-month-table-cell-today-text-color: var(--ti-common-color-info-normal);
   --ti-month-table-td-range-bg-color: #f2f6fc;
   --ti-month-table-td-date-text-color: var(--ti-common-color-light, #fff);
   --ti-month-table-td-date-border-radius: 24px;
-  --ti-month-table-cell-today-font-weight: 700;
-  --ti-month-table-cell-height: 32px;
-  --ti-month-table-cell-border-radius: 2px;
-  --ti-month-table-cell-today-border-color: transparent;
-  --ti-month-table-cell-hover-bg-color: var(--ti-base-color-brand-2);
-  --ti-month-table-td-div-height: 32px;
+  --ti-month-table-cell-today-font-weight: normal;
+  --ti-month-table-cell-height: 28px;
+  --ti-month-table-cell-border-radius: 14px;
+  --ti-month-table-cell-today-border-color: var(--ti-base-color-brand);
+  --ti-month-table-cell-hover-bg-color: var(--ti-base-color-brand-8);
+  --ti-month-table-td-div-height: 28px;
 }
diff --git a/packages/theme/src/nav-menu/old-theme.js b/packages/theme/src/nav-menu/old-theme.js
new file mode 100644
index 000000000..f4c4e8eb0
--- /dev/null
+++ b/packages/theme/src/nav-menu/old-theme.js
@@ -0,0 +1,29 @@
+export const tinyNavMenuOldTheme = {
+  'ti-nav-menu-popmenu-node-item-padding-button': 'var(--ti-common-space-base, 4px)',
+  'ti-nav-menu-popmenu-node-item-padding-top': 'var(--ti-common-space-base, 4px)',
+  'ti-nav-menu-submenu-group-margin-top': 'var(--ti-common-space-4x, 18px)',
+  'ti-nav-menu-popmenu-text-font-size': 'var(--ti-common-font-size-1, 14px)',
+  'ti-nav-menu-popmenu-node-title-margin-bottom': 'var(--ti-common-space-3x, 12px)',
+  'ti-nav-menu-submenu-padding-horizontal': 'calc(var(--ti-common-space-base, 4px) * 21.5)',
+  'ti-nav-menu-popmenu-more-item-active-bg-color': 'var(--ti-common-color-selected-background, #5e7ce0)',
+  'ti-nav-menu-popmenu-more-item-hover-bg-color': 'var(--ti-common-color-hover-background, #f2f5fc)',
+  'ti-nav-menu-popmenu-more-item-selected-bg-color': 'var(--ti-common-color-bg-white-emphasize, #f2f5fc)',
+  'ti-nav-menu-popmenu-more-item-hover-text-color': 'var(--ti-common-color-primary-normal, #5e7ce0)',
+  'ti-nav-menu-popmenu-more-item-icon-color': 'var(--ti-common-color-info-normal, #252b3a)',
+  'ti-nav-menu-popmenu-border-color': 'var(--ti-common-color-border, #adb0b8)',
+  'ti-nav-menu-popmenu-text-color': 'var(--ti-common-color-info-normal, #252b3a)',
+  'ti-nav-menu-popmenu-selected-font-weight': 'var(--ti-common-font-weight-4, normal)',
+  'ti-nav-menu-popmenu-box-shadow': '0 0 4px var(--ti-nav-menu-popmenu-border-color)',
+  'ti-nav-menu-item-selected-underline-bg-color': 'var(--ti-common-color-light, #fff)',
+  'ti-nav-menu-item-selected-underline-height': 'calc(var(--ti-common-size-base, 4px) - 1)',
+  'ti-nav-menu-item-hover-bg-color': '#474c5e',
+  'ti-nav-menu-item-text-font-weight': 'var(--ti-common-font-weight-4, normal)',
+  'ti-nav-menu-item-more-button-fill': 'var(--ti-common-color-light, #fff)',
+  'ti-nav-menu-item-text-color': 'var(--ti-common-color-light, #fff)',
+  'ti-nav-menu-padding': 'var(--ti-common-size-6x, 24px)',
+  'ti-nav-menu-slot-logo-margin-right': 'var(--ti-common-size-25x, 100px)',
+  'ti-nav-menu-slot-logo-margin-left': 'var(--ti-common-space-0, 0)',
+  'ti-nav-menu-item-li-margin': 'var(--ti-common-size-3x, 12px)',
+  'ti-nav-menu-item-font-size': 'var(--ti-common-font-size-2, 16px)',
+  'ti-nav-menu-bg-color': 'var(--ti-common-color-bg-navigation, #282b33)'
+}
diff --git a/packages/theme/src/nav-menu/smb-theme.js b/packages/theme/src/nav-menu/smb-theme.js
deleted file mode 100644
index ee0a0f6c1..000000000
--- a/packages/theme/src/nav-menu/smb-theme.js
+++ /dev/null
@@ -1,30 +0,0 @@
-export const tinyNavMenuSmbTheme = {
-  'ti-nav-menu-bg-color': 'var(--ti-common-color-bg-navigation)',
-  'ti-nav-menu-item-text-color': 'var(--ti-common-color-text-primary)',
-  'ti-nav-menu-item-more-button-fill': 'var(--ti-common-color-text-primary)',
-  'ti-nav-menu-popmenu-more-item-icon-color': 'var(--ti-common-color-icon-normal)',
-  'ti-nav-menu-popmenu-more-item-hover-text-color': 'var(--ti-common-color-primary-normal)',
-  'ti-nav-menu-popmenu-text-color': 'var(--ti-common-color-text-secondary)',
-  'ti-nav-menu-item-hover-bg-color': 'var(--ti-common-color-bg-navigation)',
-  'ti-nav-menu-item-text-font-weight': 'var(--ti-common-font-weight-bold)',
-  'ti-nav-menu-popmenu-selected-font-weight': 'var(--ti-common-font-weight-bold)',
-  'ti-nav-menu-item-selected-underline-height': 'var(--ti-common-border-weight-1)',
-  'ti-nav-menu-item-selected-underline-bg-color': 'var(--ti-common-color-text-primary)',
-  'ti-nav-menu-submenu-group-margin-top': 'var(--ti-common-size-9x)',
-  'ti-nav-menu-padding': 'var(--ti-common-size-4x)',
-  'ti-nav-menu-item-li-margin': 'var(--ti-common-size-4x)',
-  'ti-nav-menu-slot-logo-margin-left': 'var(--ti-common-size-4x)',
-  'ti-nav-menu-slot-logo-margin-right': 'var(--ti-common-size-12x)',
-  'ti-nav-menu-popmenu-node-item-padding-top': 'var(--ti-common-space-0)',
-  'ti-nav-menu-popmenu-node-item-padding-button': 'calc(var(--ti-common-space-3x) + 2px)',
-  'ti-nav-menu-submenu-padding-horizontal': 'calc(var(--ti-common-space-base) * 20.5)',
-  'ti-nav-menu-popmenu-node-title-margin-bottom': 'calc(var(--ti-common-space-4x) + 2px)',
-  'ti-nav-menu-popmenu-text-font-size': 'var(--ti-common-font-size-0)',
-  // SMB未定义颜色
-  'ti-nav-menu-popmenu-more-item-hover-bg-color': '#F5F5F5',
-  'ti-nav-menu-popmenu-more-item-active-bg-color': 'var(--ti-common-color-bg-navigation)',
-  'ti-nav-menu-popmenu-more-item-selected-bg-color': 'var(--ti-common-color-bg-navigation)',
-  'ti-nav-menu-popmenu-border-color': 'var(--ti-common-color-bg-navigation)',
-  'ti-nav-menu-popmenu-box-shadow': 'var(--ti-common-shadow-2-down)',
-  'ti-nav-menu-item-font-size': 'var(--ti-common-font-size-base)'
-}
diff --git a/packages/theme/src/nav-menu/vars.less b/packages/theme/src/nav-menu/vars.less
index d882386bd..8076084b7 100644
--- a/packages/theme/src/nav-menu/vars.less
+++ b/packages/theme/src/nav-menu/vars.less
@@ -14,69 +14,69 @@
   // 导航菜单栏高度
   --ti-nav-menu-height: var(--ti-common-size-height-large, 48px);
   // 导航菜单栏背景色
-  --ti-nav-menu-bg-color: var(--ti-common-color-bg-navigation, #282b33);
+  --ti-nav-menu-bg-color: var(--ti-common-color-bg-navigation);
   // 导航菜单栏字号
-  --ti-nav-menu-item-font-size: var(--ti-common-font-size-2, 16px);
+  --ti-nav-menu-item-font-size: var(--ti-common-font-size-base);
   // 单个导航菜单外边距
-  --ti-nav-menu-item-li-margin: var(--ti-common-size-3x, 12px);
+  --ti-nav-menu-item-li-margin: var(--ti-common-size-4x);
   // 自定义图标外左边距
-  --ti-nav-menu-slot-logo-margin-left: var(--ti-common-space-0, 0);
+  --ti-nav-menu-slot-logo-margin-left: var(--ti-common-size-4x);
   // 自定义图标外右边距
-  --ti-nav-menu-slot-logo-margin-right: var(--ti-common-size-25x, 100px);
+  --ti-nav-menu-slot-logo-margin-right: var(--ti-common-size-12x);
   // 导航菜单栏内边距
-  --ti-nav-menu-padding: var(--ti-common-size-6x, 24px);
+  --ti-nav-menu-padding: var(--ti-common-size-4x);
   // 导航菜单栏文本色
-  --ti-nav-menu-item-text-color: var(--ti-common-color-light, #fff);
+  --ti-nav-menu-item-text-color: var(--ti-common-color-text-primary);
   // 导航菜单栏更多图标
-  --ti-nav-menu-item-more-button-fill: var(--ti-common-color-light, #fff);
+  --ti-nav-menu-item-more-button-fill: var(--ti-common-color-text-primary);
   // 导航菜单栏选中后字体大小
-  --ti-nav-menu-item-text-font-weight: var(--ti-common-font-weight-4, normal);
+  --ti-nav-menu-item-text-font-weight: var(--ti-common-font-weight-bold);
   // 导航菜单栏项悬浮背景色
-  --ti-nav-menu-item-hover-bg-color: #474c5e;
+  --ti-nav-menu-item-hover-bg-color: var(--ti-common-color-bg-navigation);
   // 导航菜单栏项选中下划线高度
-  --ti-nav-menu-item-selected-underline-height: calc(var(--ti-common-size-base, 4px) - 1);
+  --ti-nav-menu-item-selected-underline-height: var(--ti-common-border-weight-1);
   // 导航菜单栏项选中下划线圆角
   --ti-nav-menu-item-selected-border-radius: var(--ti-common-border-radius-0, 0);
   // 导航菜单栏项选中下划线固定定位底部距离(hide)
   --ti-nav-menu-item-selected-position-bottom: var(--ti-common-space-0, 0);
   // 导航菜单栏项选中下划线背景色
-  --ti-nav-menu-item-selected-underline-bg-color: var(--ti-common-color-light, #fff);
+  --ti-nav-menu-item-selected-underline-bg-color: var(--ti-common-color-text-primary);
   // 导航菜单设置图标大小
   --ti-nav-menu-setting-font-size: calc(var(--ti-common-size-base, 4px) * 5.5);
   // 导航菜单菜单栏下拉框阴影
-  --ti-nav-menu-popmenu-box-shadow: 0 0 4px var(--ti-nav-menu-popmenu-border-color);
+  --ti-nav-menu-popmenu-box-shadow: var(--ti-common-shadow-2-down);
   // 导航菜单菜单栏下拉框选中文本色
   --ti-nav-menu-popmenu-selected-text-color: var(--ti-common-color-info-normal, #252b3a);
   // 导航菜单菜单栏下拉框选中字重
-  --ti-nav-menu-popmenu-selected-font-weight: var(--ti-common-font-weight-4, normal);
+  --ti-nav-menu-popmenu-selected-font-weight: var(--ti-common-font-weight-bold);
   // 导航菜单菜单栏下拉框文本色
-  --ti-nav-menu-popmenu-text-color: var(--ti-common-color-info-normal, #252b3a);
+  --ti-nav-menu-popmenu-text-color: var(--ti-common-color-text-secondary);
   // 导航菜单下拉框边框色
-  --ti-nav-menu-popmenu-border-color: var(--ti-common-color-border, #adb0b8);
+  --ti-nav-menu-popmenu-border-color: var(--ti-common-color-bg-navigation);
   // 导航菜单更多按钮展示的下拉框右边框色
   --ti-nav-menu-popmenu-more-menu-border-color-right: var(--ti-common-color-border, #adb0b8);
   // 导航菜单更多按钮展示的下拉框高度
   --ti-nav-menu-popmenu-more-item-height: var(--ti-common-space-10x, 40px);
   // 导航菜单更多按钮展示的下拉框列表项图标文本色
-  --ti-nav-menu-popmenu-more-item-icon-color: var(--ti-common-color-info-normal, #252b3a);
+  --ti-nav-menu-popmenu-more-item-icon-color: var(--ti-common-color-icon-normal);
   // 导航菜单更多按钮展示的下拉框列表项文本色
   --ti-nav-menu-popmenu-more-item-text-color: var(--ti-common-color-info-normal, #252b3a);
   // 导航菜单更多按钮展示的下拉框列表项图标悬浮文本色
   --ti-nav-menu-popmenu-more-item-hover-icon-color: var(--ti-common-color-primary-normal, #5e7ce0);
   // 导航菜单更多按钮展示的下拉框列表项 悬浮 文本色
-  --ti-nav-menu-popmenu-more-item-hover-text-color: var(--ti-common-color-primary-normal, #5e7ce0);
+  --ti-nav-menu-popmenu-more-item-hover-text-color: var(--ti-common-color-primary-normal);
   // 导航菜单更多按钮展示的下拉框列表项选中背景色
-  --ti-nav-menu-popmenu-more-item-selected-bg-color: var(--ti-common-color-bg-white-emphasize, #f2f5fc);
+  --ti-nav-menu-popmenu-more-item-selected-bg-color: var(--ti-common-color-bg-navigation);
   // 导航菜单更多按钮展示的下拉框列表项选中分割线粗细
   --ti-nav-menu-popmenu-more-item-before-width: 0;
   // 导航菜单下拉框可点选项的 悬浮 背景色
-  --ti-nav-menu-popmenu-more-item-hover-bg-color: var(--ti-common-color-hover-background, #f2f5fc);
+  --ti-nav-menu-popmenu-more-item-hover-bg-color: #F5F5F5;
   // 导航菜单下拉框非标题选项点击瞬间背景色
-  --ti-nav-menu-popmenu-more-item-active-bg-color: var(--ti-common-color-selected-background, #5e7ce0);
+  --ti-nav-menu-popmenu-more-item-active-bg-color: var(--ti-common-color-bg-navigation);
   // 导航菜单下拉框副菜单区域垂直内边距
   --ti-nav-menu-submenu-padding-vertical: var(--ti-common-space-0, 0px);
   // 导航菜单下拉框副菜单区域水平内边距
-  --ti-nav-menu-submenu-padding-horizontal: calc(var(--ti-common-space-base, 4px) * 21.5);
+  --ti-nav-menu-submenu-padding-horizontal: calc(var(--ti-common-space-base) * 20.5);
   // 导航菜单下拉框标题底部内边距
   --ti-nav-menu-popmenu-node-title-padding-bottom: var(--ti-common-space-0, 0px);
   // 导航菜单下拉框标题顶部外边距
@@ -84,7 +84,7 @@
   // 导航菜单下拉框标题右边外边距
   --ti-nav-menu-popmenu-node-title-margin-right: var(--ti-common-space-8x, 32px);
   // 导航菜单下拉框标题底部外边距
-  --ti-nav-menu-popmenu-node-title-margin-bottom: var(--ti-common-space-3x, 12px);
+  --ti-nav-menu-popmenu-node-title-margin-bottom: calc(var(--ti-common-space-4x) + 2px);
   // 导航菜单下拉框标题左边外边距
   --ti-nav-menu-popmenu-node-title-margin-left: var(--ti-common-space-0, 0px);
   // 导航菜单下拉框标题底部边框宽度
@@ -94,13 +94,13 @@
   // 导航菜单下拉框标题字号
   --ti-nav-menu-popmenu-node-title-font-size: var(--ti-common-font-size-1, 14px);
   // 导航菜单下拉框标题字号
-  --ti-nav-menu-popmenu-text-font-size: var(--ti-common-font-size-1, 14px);
+  --ti-nav-menu-popmenu-text-font-size: var(--ti-common-font-size-0);
   // 导航菜单下拉框非标题项字号
   --ti-nav-menu-popmenu-node-item-font-size: var(--ti-common-font-size-base, 12px);
   // 导航菜单下拉框外边距
-  --ti-nav-menu-submenu-group-margin-top: var(--ti-common-space-4x, 18px);
+  --ti-nav-menu-submenu-group-margin-top: var(--ti-common-size-9x);
   // 导航菜单下拉框外上边距
-  --ti-nav-menu-popmenu-node-item-padding-top: var(--ti-common-space-base, 4px);
+  --ti-nav-menu-popmenu-node-item-padding-top: var(--ti-common-space-0);
   // 导航菜单下拉框外下边距
-  --ti-nav-menu-popmenu-node-item-padding-button: var(--ti-common-space-base, 4px);
+  --ti-nav-menu-popmenu-node-item-padding-button: calc(var(--ti-common-space-3x) + 2px);
 }
diff --git a/packages/theme/src/notify/old-theme.js b/packages/theme/src/notify/old-theme.js
new file mode 100644
index 000000000..838d85dec
--- /dev/null
+++ b/packages/theme/src/notify/old-theme.js
@@ -0,0 +1,22 @@
+export const tinyNotifyOldTheme = {
+  'ti-notify-icon-transform': 'translate(0, -2px)',
+  'ti-notify-position-bottom-right': '10px',
+  'ti-notify-position-top-right': '10px',
+  'ti-notify-position-bottom-left': '10px',
+  'ti-notify-position-top-left': '10px',
+  'ti-notify-close-hover-icon-color': 'var(--ti-base-color-common-7, #252b3a)',
+  'ti-notify-close-icon-font-size': 'var(--ti-common-font-size-2, 16px)',
+  'ti-notify-box-shadow': 'var(--ti-common-shadow-4-down, 0 8px 40px 0 rgba(0, 0, 0, 0.2))',
+  'ti-notify-max-width': '400px',
+  'ti-notify-close-icon-color': 'var(--ti-base-color-common-7, #252b3a)',
+  'ti-notify-message-margin-left': 'var(--ti-common-space-10, 10px)',
+  'ti-notify-message-margin-right': 'var(--ti-common-space-0, 0px)',
+  'ti-notify-title-font-weight': 'var(--ti-common-font-weight-7, bold)',
+  'ti-notify-title-font-size': 'var(--ti-common-font-size-1, 14px)',
+  'ti-notify-content-text-color': 'var(--ti-common-color-info-normal, #252b3a)',
+  'ti-notify-border-radius': 'var(--ti-common-border-radius-normal, 2px)',
+  'ti-notify-success-bg-color': 'var(--ti-common-color-success-bg, #edfff9)',
+  'ti-notify-error-bg-color': 'var(--ti-common-color-error-bg, #ffeeed)',
+  'ti-notify-warning-bg-color': 'var(--ti-common-color-warn-bg, #fff3e8)',
+  'ti-notify-info-bg-color': 'var(--ti-common-color-prompt-bg, #ebf6ff)'
+}
diff --git a/packages/theme/src/notify/smb-theme.js b/packages/theme/src/notify/smb-theme.js
deleted file mode 100644
index 03fe3e651..000000000
--- a/packages/theme/src/notify/smb-theme.js
+++ /dev/null
@@ -1,22 +0,0 @@
-export const tinyNotifySmbTheme = {
-  'ti-notify-max-width': '340px',
-  'ti-notify-message-margin-left': 'var(--ti-common-space-2x)',
-  'ti-notify-info-bg-color': 'var(--ti-common-color-bg-navigation)',
-  'ti-notify-border-radius': 'var(--ti-common-border-radius-4)',
-  'ti-notify-box-shadow': '0px 2px 12px 0px rgba(0,0,0,0.08)',
-  'ti-notify-close-icon-font-size': 'var(--ti-common-font-size-4)',
-  'ti-notify-close-icon-color': 'var(--ti-common-color-icon-normal)',
-  'ti-notify-title-font-size': 'var(--ti-common-font-size-2)',
-  'ti-notify-title-font-weight': '600',
-  'ti-notify-content-text-color': 'var(--ti-common-color-text-secondary)',
-  'ti-notify-message-margin-right': 'var(--ti-common-space-3x)',
-  'ti-notify-close-hover-icon-color': 'var(--ti-common-color-icon-hover)',
-  'ti-notify-position-top-left': 'var(--ti-common-space-6x)',
-  'ti-notify-position-bottom-left': 'var(--ti-common-space-6x)',
-  'ti-notify-position-top-right': 'var(--ti-common-space-6x)',
-  'ti-notify-position-bottom-right': 'var(--ti-common-space-6x)',
-  'ti-notify-success-bg-color': 'var(--ti-common-color-bg-navigation)',
-  'ti-notify-error-bg-color': 'var(--ti-common-color-bg-navigation)',
-  'ti-notify-warning-bg-color': 'var(--ti-common-color-bg-navigation)',
-  'ti-notify-icon-transform': 'translate(0,-1px)'
-}
diff --git a/packages/theme/src/notify/vars.less b/packages/theme/src/notify/vars.less
index 5e0ed2039..3f6bd6ef9 100644
--- a/packages/theme/src/notify/vars.less
+++ b/packages/theme/src/notify/vars.less
@@ -14,33 +14,33 @@
   // 通知背景色
   --ti-notify-bg-color: var(--ti-common-color-prompt-bg, #ebf6ff);
   // info类型弹框背景色
-  --ti-notify-info-bg-color: var(--ti-common-color-prompt-bg, #ebf6ff);
+  --ti-notify-info-bg-color: var(--ti-common-color-bg-navigation);
   // info类型弹框左侧图标色
   --ti-notify-info-icon-color: var(--ti-common-color-prompt, #5e7ce0);
   // warning类型弹框背景色
-  --ti-notify-warning-bg-color: var(--ti-common-color-warn-bg, #fff3e8);
+  --ti-notify-warning-bg-color: var(--ti-common-color-bg-navigation);
   // warning类型弹框左侧图标色
   --ti-notify-warning-icon-color: var(--ti-common-color-warn, #fa9841);
   // error类型弹框背景色
-  --ti-notify-error-bg-color: var(--ti-common-color-error-bg, #ffeeed);
+  --ti-notify-error-bg-color: var(--ti-common-color-bg-navigation);
   // error类型弹框左侧图标色
   --ti-notify-error-icon-color: var(--ti-common-color-error, #f66f6a);
   // success类型弹框背景色
-  --ti-notify-success-bg-color: var(--ti-common-color-success-bg, #edfff9);
+  --ti-notify-success-bg-color: var(--ti-common-color-bg-navigation);
   // success类型弹框左侧图标色
   --ti-notify-success-icon-color: var(--ti-common-color-success, #50d4ab);
   // 通知文本色（没有效果）
   --ti-notify-text-color: var(--ti-common-color-bg-emphasize, #5e7ce0);
   // 弹框圆角
-  --ti-notify-border-radius: var(--ti-common-border-radius-normal, 2px);
+  --ti-notify-border-radius: var(--ti-common-border-radius-4);
   // 弹框文本色
   --ti-notify-title-text-color: var(--ti-common-color-info-normal, #252b3a);
   // 内容文本色
-  --ti-notify-content-text-color: var(--ti-common-color-info-normal, #252b3a);
+  --ti-notify-content-text-color: var(--ti-common-color-text-secondary);
   // 弹框标题字号
-  --ti-notify-title-font-size: var(--ti-common-font-size-1, 14px);
+  --ti-notify-title-font-size: var(--ti-common-font-size-2);
   // 通知标题字重（没有效果）
-  --ti-notify-title-font-weight: var(--ti-common-font-weight-7, bold);
+  --ti-notify-title-font-weight: 600;
   // 弹框标题顶部外边距
   --ti-notify-title-margin-top: var(--ti-common-space-0, 0px);
   // 弹框标题水平外边距
@@ -56,33 +56,33 @@
   // 弹框文字底部外边距
   --ti-notify-message-margin-bottom: var(--ti-common-space-0, 0px);
   // 弹框文字右外边距
-  --ti-notify-message-margin-right: var(--ti-common-space-0, 0px);
+  --ti-notify-message-margin-right: var(--ti-common-space-3x);
   // 弹框文字左外边距
-  --ti-notify-message-margin-left: var(--ti-common-space-10, 10px);
+  --ti-notify-message-margin-left: var(--ti-common-space-2x);
   // 弹框左侧图标尺寸
   --ti-notify-icon-size: var(--ti-common-font-size-5, 24px);
   // 弹框关闭图标色
-  --ti-notify-close-icon-color: var(--ti-base-color-common-7, #252b3a);
+  --ti-notify-close-icon-color: var(--ti-common-color-icon-normal);
   // 弹框最大宽度
-  --ti-notify-max-width: 400px;
+  --ti-notify-max-width: 340px;
   // 弹框阴影
-  --ti-notify-box-shadow: var(--ti-common-shadow-4-down, 0 8px 40px 0 rgba(0, 0, 0, 0.2));
+  --ti-notify-box-shadow: 0px 2px 12px 0px rgba(0,0,0,0.08);
   // 弹框垂直方向内边距
   --ti-notify-padding-vertical: var(--ti-common-space-4x, 16px);
   // 弹框水平方向内边距
   --ti-notify-padding-horizontal: var(--ti-common-space-4x, 16px);
   // 关闭图标大小
-  --ti-notify-close-icon-font-size: var(--ti-common-font-size-2, 16px);
+  --ti-notify-close-icon-font-size: var(--ti-common-font-size-4);
   // 关闭图标悬浮时颜色
-  --ti-notify-close-hover-icon-color: var(--ti-base-color-common-7, #252b3a);
+  --ti-notify-close-hover-icon-color: var(--ti-common-color-icon-hover);
   // 弹框为top-left方向时左边距
-  --ti-notify-position-top-left: 10px;
+  --ti-notify-position-top-left: var(--ti-common-space-6x);
   // 弹框为bottom-left方向时左边距
-  --ti-notify-position-bottom-left: 10px;
+  --ti-notify-position-bottom-left: var(--ti-common-space-6x);
   // 弹框为top-right方向时右边距
-  --ti-notify-position-top-right: 10px;
+  --ti-notify-position-top-right: var(--ti-common-space-6x);
   // 弹框为bottom-right方向时右边距
-  --ti-notify-position-bottom-right: 10px;
+  --ti-notify-position-bottom-right: var(--ti-common-space-6x);
   // 关闭图标位移
-  --ti-notify-icon-transform: translate(0, -2px);
+  --ti-notify-icon-transform: translate(0,-1px);
 }
diff --git a/packages/theme/src/numeric/old-theme.js b/packages/theme/src/numeric/old-theme.js
new file mode 100644
index 000000000..a432a5682
--- /dev/null
+++ b/packages/theme/src/numeric/old-theme.js
@@ -0,0 +1,15 @@
+export const tinyNumericOldTheme = {
+  'ti-numeric-input-divider-height-mini': 'var(--ti-numeric-input-height-mini)',
+  'ti-numeric-input-divider-height-small': 'var(--ti-numeric-input-height-small)',
+  'ti-numeric-input-width-small': 'var(--ti-common-size-50x, 200px)',
+  'ti-numeric-input-divider-height-medium': 'var(--ti-numeric-input-height-medium)',
+  'ti-numeric-input-width-medium': 'calc(var(--ti-common-space-10, 10px) * 27)',
+  'ti-numeric-input-btn-border-color-disabled': 'var(--ti-common-color-line-disabled, #dfe1e6)',
+  'ti-numeric-input-btn-disabled-bg-color': 'var(--ti-common-color-bg-disabled, #f5f5f6)',
+  'ti-numeric-input-disabled-bg-color': 'var(--ti-common-color-bg-disabled, #f5f5f6)',
+  'ti-numeric-input-disabled-text-color': 'var(--ti-common-color-text-disabled, #adb0b8)',
+  'ti-numeric-input-dividing-border-display': "'block'",
+  'ti-numeric-input-dividing-border-height': 'var(--ti-numeric-input-normal-height)',
+  'ti-numeric-input-dividing-border-color': 'var(--ti-common-color-line-normal, #adb0b8)',
+  'ti-numeric-input-width': 'var(--ti-common-size-45x, 180px)'
+}
diff --git a/packages/theme/src/numeric/smb-theme.js b/packages/theme/src/numeric/smb-theme.js
deleted file mode 100644
index c5cc1c3b7..000000000
--- a/packages/theme/src/numeric/smb-theme.js
+++ /dev/null
@@ -1,15 +0,0 @@
-export const tinyNumericSmbTheme = {
-  'ti-numeric-input-width-medium': 'calc(var(--ti-common-size-width-large, 152px) + 6px)',
-  'ti-numeric-input-width-small': 'calc(var(--ti-common-size-34x, 136px) + 6px)',
-  'ti-numeric-input-width': 'calc(var(--ti-common-size-width-medium, 120px) + 6px)',
-  'ti-numeric-input-btn-border-color-disabled': 'var(--ti-common-color-transparent)',
-  'ti-numeric-input-dividing-border-height': 'var(--ti-common-space-5x)',
-  'ti-numeric-input-dividing-border-display': 'none',
-  'ti-numeric-input-divider-height-medium': 'var(--ti-common-space-6x)',
-  'ti-numeric-input-divider-height-small': 'calc(var(--ti-common-space-5x) - 2px)',
-  'ti-numeric-input-divider-height-mini': 'calc(var(--ti-common-space-4x) - 1px)',
-  'ti-numeric-input-disabled-bg-color': 'var(--ti-common-color-bg-disabled)',
-  'ti-numeric-input-btn-disabled-bg-color': 'var(--ti-common-color-bg-disabled)',
-  'ti-numeric-input-dividing-border-color': 'var(--ti-common-border-color-transparent-8)',
-  'ti-numeric-input-disabled-text-color': 'var(--ti-common-color-primary-disabled-text)'
-}
diff --git a/packages/theme/src/numeric/vars.less b/packages/theme/src/numeric/vars.less
index 5cfd77241..37a56b771 100644
--- a/packages/theme/src/numeric/vars.less
+++ b/packages/theme/src/numeric/vars.less
@@ -12,7 +12,7 @@
 
 .component-css-vars-numeric() {
   // 默认宽度
-  --ti-numeric-input-width: var(--ti-common-size-45x, 180px);
+  --ti-numeric-input-width: calc(var(--ti-common-size-width-medium, 120px) + 6px);
   // 默认高度
   --ti-numeric-input-normal-height: var(--ti-common-size-height-normal, 28px);
   // 边框圆角
@@ -20,11 +20,11 @@
   // 边框默认色
   --ti-numeric-input-normal-border-color: var(--ti-common-color-line-normal, #adb0b8);
   // 分隔线颜色
-  --ti-numeric-input-dividing-border-color: var(--ti-common-color-line-normal, #adb0b8);
+  --ti-numeric-input-dividing-border-color: var(--ti-common-border-color-transparent-8);
   // 分割线高度
-  --ti-numeric-input-dividing-border-height: var(--ti-numeric-input-normal-height);
+  --ti-numeric-input-dividing-border-height: var(--ti-common-space-5x);
   // 禁用时分割线display(hide)
-  --ti-numeric-input-dividing-border-display: 'block';
+  --ti-numeric-input-dividing-border-display: none;
   // 输入框字号
   --ti-numeric-input-normal-font-size: var(--ti-common-font-size-base, 12px);
   // 输入框字体色
@@ -49,18 +49,18 @@
   --ti-numeric-input-icon-size: calc(var(--ti-common-font-size-base, 12px) + 2px);
 
   // 禁用文本色
-  --ti-numeric-input-disabled-text-color: var(--ti-common-color-text-disabled, #adb0b8);
+  --ti-numeric-input-disabled-text-color: var(--ti-common-color-primary-disabled-text);
   // 禁用背景色
-  --ti-numeric-input-disabled-bg-color: var(--ti-common-color-bg-disabled, #f5f5f6);
+  --ti-numeric-input-disabled-bg-color: var(--ti-common-color-bg-disabled);
   // 禁用时边框色
   --ti-numeric-input-border-color-disabled: var(--ti-common-color-line-disabled, #dfe1e6);
   // 按钮禁用时背景色
-  --ti-numeric-input-btn-disabled-bg-color: var(--ti-common-color-bg-disabled, #f5f5f6);
+  --ti-numeric-input-btn-disabled-bg-color: var(--ti-common-color-bg-disabled);
   // 按钮禁用时分隔线颜色
-  --ti-numeric-input-btn-border-color-disabled: var(--ti-common-color-line-disabled, #dfe1e6);
+  --ti-numeric-input-btn-border-color-disabled: var(--ti-common-color-transparent);
 
   // medium尺寸宽度
-  --ti-numeric-input-width-medium: calc(var(--ti-common-space-10, 10px) * 27);
+  --ti-numeric-input-width-medium: calc(var(--ti-common-size-width-large, 152px) + 6px);
   // medium尺寸高度
   --ti-numeric-input-height-medium: var(--ti-common-size-height-medium, 40px);
   // medium尺寸按钮宽度
@@ -68,10 +68,10 @@
   // medium尺寸图标大小
   --ti-numeric-input-icon-size-medium: var(--ti-common-font-size-2, 16px);
   // medium尺寸分割线高度
-  --ti-numeric-input-divider-height-medium: var(--ti-numeric-input-height-medium);
+  --ti-numeric-input-divider-height-medium: var(--ti-common-space-6x);
 
   // small尺寸宽度
-  --ti-numeric-input-width-small: var(--ti-common-size-50x, 200px);
+  --ti-numeric-input-width-small: calc(var(--ti-common-size-34x, 136px) + 6px);
   // small尺寸高度
   --ti-numeric-input-height-small: var(--ti-common-size-9x, 36px);
   // small尺寸按钮宽度
@@ -79,7 +79,7 @@
   // small尺寸图标大小
   --ti-numeric-input-icon-size-small: var(--ti-common-font-size-1, 14px);
   // small尺寸分割线高度
-  --ti-numeric-input-divider-height-small: var(--ti-numeric-input-height-small);
+  --ti-numeric-input-divider-height-small: calc(var(--ti-common-space-5x) - 2px);
 
   // mini尺寸宽度
   --ti-numeric-input-width-mini: calc(var(--ti-common-space-10, 10px) * 13);
@@ -90,7 +90,7 @@
   // mini尺寸图标大小
   --ti-numeric-input-icon-size-mini: var(--ti-common-font-size-base, 12px);
   // mini尺寸分割线高度
-  --ti-numeric-input-divider-height-mini: var(--ti-numeric-input-height-mini);
+  --ti-numeric-input-divider-height-mini: calc(var(--ti-common-space-4x) - 1px);
 
   // 单位内容宽度
   --ti-numeric-input-unit-width: calc(var(--ti-common-space-10, 10px) * 5);
diff --git a/packages/theme/src/option-group/smb-theme.js b/packages/theme/src/option-group/old-theme.js
similarity index 55%
rename from packages/theme/src/option-group/smb-theme.js
rename to packages/theme/src/option-group/old-theme.js
index 81e7b11c7..5e3c1f491 100644
--- a/packages/theme/src/option-group/smb-theme.js
+++ b/packages/theme/src/option-group/old-theme.js
@@ -1,11 +1,11 @@
-export const tinyOptionGroupSmbTheme = {
-  'ti-option-group-title-font-size': 'var(--ti-common-font-size-0)',
-  'ti-option-group-title-font-weight': 'var(--ti-common-font-weight-normal)',
-  'ti-option-group-title-text-color': 'var(--ti-common-color-text-weaken)',
-  'ti-option-group-title-padding-horizontal': 'var(--ti-common-space-4x)',
-  'ti-option-group-title-margin-top-first': 'var(--ti-common-space-base)',
-  'ti-option-group-title-margin-top': 'var(--ti-common-space-2x)',
-  'ti-option-group-title-margin-bottom': 'var(--ti-common-space-2)',
-  'ti-option-group-title-line-height': 'var(--ti-common-line-height-base)',
-  'ti-option-group-title-height': 'var(--ti-common-size-auto)'
+export const tinyOptionGroupOldTheme = {
+  'ti-option-group-title-margin-top-first': 'var(--ti-common-space-0, 0px)',
+  'ti-option-group-title-margin-bottom': 'var(--ti-common-space-0, 0px)',
+  'ti-option-group-title-margin-top': 'var(--ti-common-space-0, 0px)',
+  'ti-option-group-title-padding-horizontal': 'var(--ti-common-space-10, 10px)',
+  'ti-option-group-title-height': '30px',
+  'ti-option-group-title-line-height': '30px',
+  'ti-option-group-title-text-color': 'var(--ti-common-color-text-weaken, #8a8e99)',
+  'ti-option-group-title-font-weight': 'var(--ti-common-font-weight-bold, 700)',
+  'ti-option-group-title-font-size': 'var(--ti-common-font-size-base, 12px)'
 }
diff --git a/packages/theme/src/option-group/vars.less b/packages/theme/src/option-group/vars.less
index 709f4cd20..4763a0543 100644
--- a/packages/theme/src/option-group/vars.less
+++ b/packages/theme/src/option-group/vars.less
@@ -14,23 +14,23 @@
   // 分组分割线填充色
   --ti-option-group-line-dividing-bg-color: var(--ti-common-color-line-dividing, #dfe1e6);
   // 分组标题字号
-  --ti-option-group-title-font-size: var(--ti-common-font-size-base, 12px);
+  --ti-option-group-title-font-size: var(--ti-common-font-size-0);
   // 分组标题字重
-  --ti-option-group-title-font-weight: var(--ti-common-font-weight-bold, 700);
+  --ti-option-group-title-font-weight: var(--ti-common-font-weight-normal);
   // 分组标题字体颜色
-  --ti-option-group-title-text-color: var(--ti-common-color-text-weaken, #8a8e99);
+  --ti-option-group-title-text-color: var(--ti-common-color-text-weaken);
   // 分组标题行高
-  --ti-option-group-title-line-height: 30px;
+  --ti-option-group-title-line-height: var(--ti-common-line-height-base);
   // 分组标题高度
-  --ti-option-group-title-height: 30px;
+  --ti-option-group-title-height: var(--ti-common-size-auto);
   // 分组标题水平方向外边距
-  --ti-option-group-title-padding-horizontal: var(--ti-common-space-10, 10px);
+  --ti-option-group-title-padding-horizontal: var(--ti-common-space-4x);
   // 分组标题顶部外边距
-  --ti-option-group-title-margin-top: var(--ti-common-space-0, 0px);
+  --ti-option-group-title-margin-top: var(--ti-common-space-2x);
   // 分组标题底部外边距
-  --ti-option-group-title-margin-bottom: var(--ti-common-space-0, 0px);
+  --ti-option-group-title-margin-bottom: var(--ti-common-space-2);
   // 分组第一个标题顶部外边距
-  --ti-option-group-title-margin-top-first: var(--ti-common-space-0, 0px);
+  --ti-option-group-title-margin-top-first: var(--ti-common-space-base);
   // 分组分割线高度
   --ti-option-group-line-dividing-height: var(--ti-common-size-0, 0px);
   // 分组底部内边距
diff --git a/packages/theme/src/option/old-theme.js b/packages/theme/src/option/old-theme.js
new file mode 100644
index 000000000..44dcaef4d
--- /dev/null
+++ b/packages/theme/src/option/old-theme.js
@@ -0,0 +1,20 @@
+export const tinyOptionOldTheme = {
+  'ti-option-multi-svg-hover-border-color': 'var(--ti-common-color-line-normal, #adb0b8)',
+  'ti-option-multi-svg-border-color': 'var(--ti-common-color-line-normal, #adb0b8)',
+  'ti-option-multi-svg-icon-color': 'var(--ti-common-color-icon-hover, #526ecc)',
+  'ti-option-highlight-selected-text-color': 'var(--ti-common-color-text-white, #fff)',
+  'ti-option-padding-horizontal-group': 'calc((var(--ti-common-space-10, 10px) + var(--ti-common-space-1, 1px)) * 2)',
+  'ti-option-padding-horizontal': 'var(--ti-common-space-10, 10px)',
+  'ti-option-icon-color-selected': 'var(--ti-common-color-selected-background, #5e7ce0)',
+  'ti-option-checkbox-all-select-border-color-hover': 'var(--ti-common-color-line-normal, #adb0b8)',
+  'ti-option-checkbox-border-color-hover': 'var(--ti-common-color-line-normal, #adb0b8)',
+  'ti-option-selected-text-color': 'var(--ti-common-color-selected-text-color, #fff)',
+  'ti-option-selected-font-weight': 'var(--ti-common-font-weight-4, normal)',
+  'ti-option-selected-bg-color': 'var(--ti-common-color-selected-background, #5e7ce0)',
+  'ti-option-selected-bg-color-hover': 'var(--ti-common-color-selected-background, #5e7ce0)',
+  'ti-option-hover-bg-color': 'var(--ti-common-color-hover-background, #f2f5fc)',
+  'ti-option-border-radius': 'var(--ti-common-border-radius-normal, 2px)',
+  'ti-option-disabled-text-color': 'var(--ti-common-color-text-disabled, #adb0b8)',
+  'ti-option-height': '30px',
+  'ti-option-font-size': 'var(--ti-common-font-size-base, 12px)'
+}
diff --git a/packages/theme/src/option/smb-theme.js b/packages/theme/src/option/smb-theme.js
deleted file mode 100644
index b95133e3b..000000000
--- a/packages/theme/src/option/smb-theme.js
+++ /dev/null
@@ -1,20 +0,0 @@
-export const tinyOptionSmbTheme = {
-  'ti-option-height': 'var(--ti-common-size-height-normal)',
-  'ti-option-font-size': 'var(--ti-common-font-size-1)',
-  'ti-option-border-radius': 'var(--ti-common-border-radius-0)',
-  'ti-option-selected-font-weight': 'var(--ti-common-font-weight-6)',
-  'ti-option-padding-horizontal': 'var(--ti-common-space-4x)',
-  'ti-option-padding-horizontal-group': 'var(--ti-common-space-4x)',
-  'ti-option-icon-color-selected': 'var(--ti-common-color-icon-graybg-active)',
-  'ti-option-checkbox-border-color-hover': '#191919',
-  'ti-option-disabled-text-color': 'var(--ti-common-color-text-disabled)',
-  'ti-option-hover-bg-color': 'var(--ti-common-color-bg-normal)',
-  'ti-option-selected-bg-color': 'var(--ti-common-color-bg-white-normal)',
-  'ti-option-selected-bg-color-hover': 'var(--ti-common-color-bg-white-emphasize)',
-  'ti-option-highlight-selected-text-color': 'var(--ti-common-color-text-highlight)',
-  'ti-option-selected-text-color': '#1476FF',
-  'ti-option-checkbox-all-select-border-color-hover': '#1476FF',
-  'ti-option-multi-svg-icon-color': '#1476FF',
-  'ti-option-multi-svg-border-color': '#c2c2c2',
-  'ti-option-multi-svg-hover-border-color': '#191919'
-}
diff --git a/packages/theme/src/option/vars.less b/packages/theme/src/option/vars.less
index 48a807fac..d4174931f 100644
--- a/packages/theme/src/option/vars.less
+++ b/packages/theme/src/option/vars.less
@@ -14,58 +14,58 @@
   // 选择器下拉选项文本色
   --ti-option-text-color: var(--ti-common-color-info-normal, #252b3a);
   // 选择器下拉选项字号
-  --ti-option-font-size: var(--ti-common-font-size-base, 12px);
+  --ti-option-font-size: var(--ti-common-font-size-1);
   // 选择器下拉选项高度
-  --ti-option-height: 30px;
+  --ti-option-height: var(--ti-common-size-height-normal);
   // 选择器下拉选项行高
   --ti-option-line-height: var(--ti-common-line-height-number, 1.5);
   // 选择器下拉选项禁用色
-  --ti-option-disabled-text-color: var(--ti-common-color-text-disabled, #adb0b8);
+  --ti-option-disabled-text-color: var(--ti-common-color-text-disabled);
   // 选择器下拉选项圆角
-  --ti-option-border-radius: var(--ti-common-border-radius-normal, 2px);
+  --ti-option-border-radius: var(--ti-common-border-radius-0);
   // 选择器下拉选项禁用背景色
   --ti-option-disabled-bg-color: var(--ti-common-color-light, #fff);
   // 选择器下拉选项背景色
   --ti-option-bg-color-selected: var(--ti-common-color-light, #fff);
   // 选择器下拉选项悬浮背景色
-  --ti-option-hover-bg-color: var(--ti-common-color-hover-background, #f2f5fc);
+  --ti-option-hover-bg-color: var(--ti-common-color-bg-normal);
   // 选择器下拉选项选中项背景色
   --ti-option-hover-bg-color-selected: var(--ti-common-color-hover-background, #f2f5fc);
   // 选择器下拉已选项悬浮背景色
-  --ti-option-selected-bg-color-hover: var(--ti-common-color-selected-background, #5e7ce0);
+  --ti-option-selected-bg-color-hover: var(--ti-common-color-bg-white-emphasize);
   // 选择器下拉选项选中背景色
-  --ti-option-selected-bg-color: var(--ti-common-color-selected-background, #5e7ce0);
+  --ti-option-selected-bg-color: var(--ti-common-color-bg-white-normal);
   // 选择器下拉选项选中字重
-  --ti-option-selected-font-weight: var(--ti-common-font-weight-4, normal);
+  --ti-option-selected-font-weight: var(--ti-common-font-weight-6);
   // 选择下拉框选项已选色
-  --ti-option-selected-text-color: var(--ti-common-color-selected-text-color, #fff);
+  --ti-option-selected-text-color: #1476FF;
   // 选择器下拉选项复选框悬浮色
-  --ti-option-checkbox-border-color-hover: var(--ti-common-color-line-normal, #adb0b8);
+  --ti-option-checkbox-border-color-hover: #191919;
   // 选择器下拉选项复选框悬浮色
-  --ti-option-checkbox-all-select-border-color-hover: var(--ti-common-color-line-normal, #adb0b8);
+  --ti-option-checkbox-all-select-border-color-hover: #1476FF;
   // 选择器选中下拉选项图标和文本色
-  --ti-option-icon-color-selected: var(--ti-common-color-selected-background, #5e7ce0);
+  --ti-option-icon-color-selected: var(--ti-common-color-icon-graybg-active);
   // 选择下拉框选项垂直内边距
   --ti-option-padding-vertical: var(--ti-common-space-0, 0px);
   // 选择下拉框选项水平内边距
-  --ti-option-padding-horizontal: var(--ti-common-space-10, 10px);
+  --ti-option-padding-horizontal: var(--ti-common-space-4x);
   // 分组场景选择下拉框选项水平内边距
-  --ti-option-padding-horizontal-group: calc((var(--ti-common-space-10, 10px) + var(--ti-common-space-1, 1px)) * 2);
+  --ti-option-padding-horizontal-group: var(--ti-common-space-4x);
   // 选择下拉框选项顶部外边距
   --ti-option-margin-top: var(--ti-common-size-0, 0px);
   // 选择器下拉选项高亮文本色
   --ti-option-highlight-text-color: var(--ti-common-color-text-highlight, #526ecc);
   // 选择器下拉选项已选项高亮文本色
-  --ti-option-highlight-selected-text-color: var(--ti-common-color-text-white, #fff);
+  --ti-option-highlight-selected-text-color: var(--ti-common-color-text-highlight);
   // 选择器下拉选项图标右侧外边距
   --ti-option-icon-margin-right: var(--ti-common-space-2x, 8px);
   // 选择器下拉选项图标尺寸
   --ti-option-icon-size: var(--ti-common-font-size-2, 16px);
 
   // 选择器下拉多选svg的颜色
-  --ti-option-multi-svg-icon-color: var(--ti-common-color-icon-hover, #526ecc);
+  --ti-option-multi-svg-icon-color: #1476FF;
   // 选择器下拉多选svg的border 颜色
-  --ti-option-multi-svg-border-color: var(--ti-common-color-line-normal, #adb0b8);
+  --ti-option-multi-svg-border-color: #c2c2c2;
   // 选择器下拉多选svg的border hover 颜色
-  --ti-option-multi-svg-hover-border-color: var(--ti-common-color-line-normal, #adb0b8);
+  --ti-option-multi-svg-hover-border-color: #191919;
 }
diff --git a/packages/theme/src/pager/old-theme.js b/packages/theme/src/pager/old-theme.js
new file mode 100644
index 000000000..ff9e808e6
--- /dev/null
+++ b/packages/theme/src/pager/old-theme.js
@@ -0,0 +1,46 @@
+export const tinyPagerOldTheme = {
+  'ti-pager-sizes-num-margin-right': 'var(--ti-common-space-base, 4px)',
+  'ti-pager-mini-min-width': '18px',
+  'ti-pager-selector-padding-vertical': 'var(--ti-common-space-3x, 12px)',
+  'ti-pager-input-btn-padding-horizontal': '6px',
+  'ti-pager-sizes-input-hover-text-color': 'var(--ti-common-color-info-normal, #252b3a)',
+  'ti-pager-group-sizes-margin-right': '16px',
+  'ti-pager-prev-next-hover-bg-color': 'var(--ti-common-color-hover-background, #f2f5fc)',
+  'ti-pager-dot-is-popup-svg-font-size': '14px',
+  'ti-pager-svg-font-size': 'var(--ti-pager-font-size)',
+  'ti-pager-total-svg-fill-color': 'var(--ti-common-color-info-normal, #252b3a)',
+  'ti-pager-total-line-height': '24px',
+  'ti-pager-total-height': '24px',
+  'ti-pager-total-font-size': '12px',
+  'ti-pager-btn-svg-fill-color': 'var(--ti-common-color-info-normal, #252b3a)',
+  'ti-pager-next-margin-left': '6px',
+  'ti-pager-next-margin-right': '6px',
+  'ti-pager-next-padding-right': '4px',
+  'ti-pager-prev-margin-right': '4px',
+  'ti-pager-prev-margin-left': '4px',
+  'ti-pager-prev-padding-right': '6px',
+  'ti-pager-prev-padding-left': '6px',
+  'ti-pager-goto-btn-text-hover-color': 'var(--ti-common-color-text-highlight, #526ecc)',
+  'ti-pager-poplist-item-min-height': '30px',
+  'ti-pager-pop-body-margin-top': '4px',
+  'ti-pager-poplist-item-selected-bg-color': 'var(--ti-common-color-selected-background, #5e7ce0)',
+  'ti-pager-poplist-item-hover-text-color': 'var(--ti-common-color-text-highlight, #526ecc)',
+  'ti-pager-poplist-item-hover-bg-color': 'var(--ti-common-color-hover-background, #f2f5fc)',
+  'ti-pager-li-item-hover-font-weight': 'var(--ti-common-font-weight-normal)',
+  'ti-pager-li-item-hover-text-color': 'var(--ti-common-color-text-highlight, #526ecc)',
+  'ti-pager-li-border-radius': 'var(--ti-common-border-radius-normal, 2px)',
+  'ti-pager-poplist-item-padding-horizontal': 'var(--ti-common-space-6, 6px)',
+  'ti-pager-input-padding-horizontal': '0',
+  'ti-pager-input-width': '40px',
+  'ti-pager-min-width': 'auto',
+  'ti-pager-height': 'var(--ti-common-size-height-mini, 24px)',
+  'ti-pager-normal-text-padding-left': 'calc(var(--ti-common-space-base) * 3 + 2px, 14px)',
+  'ti-pager-mini-font-size': 'var(--ti-common-font-size-base, 12px)',
+  'ti-pager-input-padding-vertical': '10px',
+  'ti-pager-input-height': 'var(--ti-common-size-height-mini, 24px)',
+  'ti-pager-input-border-color': 'var(--ti-common-color-border, #adb0b8)',
+  'ti-pager-active-font-weight': 'var(--ti-common-font-weight-normal)',
+  'ti-pager-active-bg-color': 'var(--ti-common-color-primary-normal, #5e7ce0)',
+  'ti-pager-active-font-color': 'var(--ti-common-color-text-white, #fff)',
+  'ti-pager-primary-bg-color': 'var(--ti-common-color-primary-normal, #5e7ce0)'
+}
diff --git a/packages/theme/src/pager/smb-theme.js b/packages/theme/src/pager/smb-theme.js
deleted file mode 100644
index 4af8064d3..000000000
--- a/packages/theme/src/pager/smb-theme.js
+++ /dev/null
@@ -1,47 +0,0 @@
-export const tinyPagerSmbTheme = {
-  'ti-pager-primary-bg-color': 'var(--ti-common-color-bg-white-emphasize)',
-  // 缺少f5f5f5common变量
-  'ti-pager-active-bg-color': '#F5F5F5',
-  'ti-pager-li-border-radius': 'var(--ti-common-border-radius-6)',
-  'ti-pager-height': 'var(--ti-common-size-height-normal)',
-  'ti-pager-input-height': 'var(--ti-common-size-height-normal)',
-  'ti-pager-poplist-item-padding-horizontal': 'var(--ti-common-space-2x)',
-  'ti-pager-active-font-color': 'var(--ti-common-color-text-primary)',
-  'ti-pager-li-item-hover-text-color': 'var(--ti-pager-text-color)',
-  'ti-pager-goto-btn-text-hover-color': 'var(--ti-common-color-selected-text-color)',
-  'ti-pager-total-font-size': 'var(--ti-common-font-size-base)',
-  'ti-pager-total-height': 'var(--ti-common-line-height-2)',
-  'ti-pager-total-line-height': 'var(--ti-common-line-height-2)',
-  'ti-pager-input-border-color': 'var(--ti-common-color-line-normal)',
-  'ti-pager-total-svg-fill-color': 'var(--ti-common-color-icon-normal)',
-  'ti-pager-input-padding-vertical': 'var(--ti-common-space-3x)',
-  'ti-pager-svg-font-size': 'var(--ti-common-font-size-2)',
-  'ti-pager-prev-padding-left': 'var(--ti-common-space-0)',
-  'ti-pager-prev-padding-right': 'var(--ti-common-space-0)',
-  'ti-pager-prev-margin-left': 'var(--ti-common-space-4x)',
-  'ti-pager-prev-margin-right': 'var(--ti-common-space-2x)',
-  'ti-pager-next-margin-left': 'var(--ti-common-space-2x)',
-  'ti-pager-next-margin-right': 'var(--ti-common-space-0)',
-  'ti-pager-next-padding-right': 'var(--ti-common-space-0)',
-  'ti-pager-btn-svg-fill-color': 'var(--ti-common-color-icon-normal)',
-  'ti-pager-active-font-weight': 'var(--ti-common-font-weight-bold)',
-  'ti-pager-dot-is-popup-svg-font-size': 'var(--ti-common-font-size-2)',
-  'ti-pager-poplist-item-hover-bg-color': '#F5F5F5',
-  'ti-pager-poplist-item-hover-text-color': 'var(--ti-common-color-text-primary)',
-  'ti-pager-li-item-hover-font-weight': 'var(--ti-common-font-weight-6)',
-  'ti-pager-min-width': 'var(--ti-common-size-height-normal)',
-  'ti-pager-prev-next-hover-bg-color': 'transparent',
-  'ti-pager-group-sizes-margin-right': 'var(--ti-common-space-0)',
-  'ti-pager-sizes-input-hover-text-color': '#595959',
-  'ti-pager-input-btn-padding-horizontal': 'var(--ti-common-size-2x)',
-  'ti-pager-selector-padding-vertical': 'var(--ti-common-space-2x)',
-  'ti-pager-pop-body-margin-top': 'var(--ti-common-space-base)',
-  'ti-pager-poplist-item-selected-bg-color': '#F5F5F5',
-  'ti-pager-poplist-item-min-height': 'var(--ti-common-line-height-6)',
-  'ti-pager-mini-min-width': 'var(--ti-common-size-width-mini)',
-  'ti-pager-sizes-num-margin-right': 'var(--ti-common-dropdown-gap)',
-  'ti-pager-normal-text-padding-left': 'var(--ti-common-space-4x)',
-  'ti-pager-input-width': '48px',
-  'ti-pager-input-padding-horizontal': 'var(--it-common-space-2x)',
-  'ti-pager-mini-font-size': 'var(--ti-common-font-size-0)'
-}
diff --git a/packages/theme/src/pager/vars.less b/packages/theme/src/pager/vars.less
index ac2d143a9..3b67f7f06 100644
--- a/packages/theme/src/pager/vars.less
+++ b/packages/theme/src/pager/vars.less
@@ -14,11 +14,11 @@
   // 分页默认文本色(不含前往按钮|页码项)
   --ti-pager-normal-text-color: var(--ti-common-color-info-normal, #252b3a);
   // 分页页码选中项背景色
-  --ti-pager-primary-bg-color: var(--ti-common-color-primary-normal, #5e7ce0);
+  --ti-pager-primary-bg-color: var(--ti-common-color-bg-white-emphasize);
   // 分页页码选中项文字色
-  --ti-pager-active-font-color: var(--ti-common-color-text-white, #fff);
+  --ti-pager-active-font-color: var(--ti-common-color-text-primary);
   // 分页页码选中项背景色
-  --ti-pager-active-bg-color: var(--ti-common-color-primary-normal, #5e7ce0);
+  --ti-pager-active-bg-color: #F5F5F5;
   // 自定义上下页按钮文本色
   --ti-pager-primary-text-color: var(--ti-common-color-text-link, #526ecc);
   // 分页跳转输入框激活颜色
@@ -26,14 +26,14 @@
   // 分页主色调悬浮色
   --ti-pager-primary-hover-text-color: var(--ti-common-color-primary-hover, #7693f5);
   // 分页页码选中字重
-  --ti-pager-active-font-weight: var(--ti-common-font-weight-normal);
+  --ti-pager-active-font-weight: var(--ti-common-font-weight-bold);
   // 分页禁用状态下字体颜色
   --ti-pager-disabled-text-color: var(--ti-common-color-text-disabled, #adb0b8);
   // 分页禁用状态下边框颜色
   --ti-pager-disabled-border-color: transparent;
 
   // 分页输入框和选项框边框色
-  --ti-pager-input-border-color: var(--ti-common-color-border, #adb0b8);
+  --ti-pager-input-border-color: var(--ti-common-color-line-normal);
   // 分页输入框和选择框悬浮边框色
   --ti-pager-input-hover-border-color: var(--ti-common-color-line-hover, #575d6c);
   // 分页输入框渐变结束点色值
@@ -43,53 +43,53 @@
   // 分页输入框圆角
   --ti-pager-input-border-radius: var(--ti-common-border-radius-normal, 2px);
   // 分页选择框|输入框|前往按钮高度
-  --ti-pager-input-height: var(--ti-common-size-height-mini, 24px);
+  --ti-pager-input-height: var(--ti-common-size-height-normal);
   // mini分页选择框|输入框|前往按钮高度
   --ti-pager-mini-input-height: var(--ti-common-size-height-mini, 24px);
   // 分页输入框纵向内边距
-  --ti-pager-input-padding-vertical: 10px;
+  --ti-pager-input-padding-vertical: var(--ti-common-space-3x);
   // 分页字号
   --ti-pager-font-size: var(--ti-common-font-size-base, 12px);
   // mini分页字号
-  --ti-pager-mini-font-size: var(--ti-common-font-size-base, 12px);
+  --ti-pager-mini-font-size: var(--ti-common-font-size-0);
   // 分页文字左边内边距
-  --ti-pager-normal-text-padding-left: calc(var(--ti-common-space-base) * 3 + 2px, 14px);
+  --ti-pager-normal-text-padding-left: var(--ti-common-space-4x);
   // 分页前往按钮|页码项文本色
   --ti-pager-text-color: var(--ti-common-color-text-secondary, #575d6c);
   // 分页下拉框按钮图标色
   --ti-pager-normal-icon-color: var(--ti-common-color-icon-normal, #575d6c);
   // 分页页码项高度
-  --ti-pager-height: var(--ti-common-size-height-mini, 24px);
+  --ti-pager-height: var(--ti-common-size-height-normal);
   // 分页页码项宽度
   --ti-pager-width: auto;
   // 分页页码项最小宽度
-  --ti-pager-min-width: auto;
+  --ti-pager-min-width: var(--ti-common-size-height-normal);
   // 分页输入框宽度
-  --ti-pager-input-width: 40px;
+  --ti-pager-input-width: 48px;
   // 分页输入框水平内边距
-  --ti-pager-input-padding-horizontal: 0;
+  --ti-pager-input-padding-horizontal: var(--it-common-space-2x);
   // 分页页码项垂直内边距
   --ti-pager-poplist-item-padding-vertical: var(--ti-common-space-0, 0);
   // 分页页码项水平内边距
-  --ti-pager-poplist-item-padding-horizontal: var(--ti-common-space-6, 6px);
+  --ti-pager-poplist-item-padding-horizontal: var(--ti-common-space-2x);
   // 分页未选中页码项悬浮阴影
   --ti-pager-poplist-item-unchecked-box-shadow: none;
 
   // 分页项圆角
-  --ti-pager-li-border-radius: var(--ti-common-border-radius-normal, 2px);
+  --ti-pager-li-border-radius: var(--ti-common-border-radius-6);
   // 分页项边框颜色
   --ti-pager-li-border-color: var(--ti-common-color-transparent, transparent);
   // 分页项悬浮颜色
-  --ti-pager-li-item-hover-text-color: var(--ti-common-color-text-highlight, #526ecc);
+  --ti-pager-li-item-hover-text-color: var(--ti-pager-text-color);
   // 分页项悬浮字重
-  --ti-pager-li-item-hover-font-weight: var(--ti-common-font-weight-normal);
+  --ti-pager-li-item-hover-font-weight: var(--ti-common-font-weight-6);
 
   // 分页项默认悬浮背景色
-  --ti-pager-poplist-item-hover-bg-color: var(--ti-common-color-hover-background, #f2f5fc);
+  --ti-pager-poplist-item-hover-bg-color: #F5F5F5;
   // 分页下拉框项|列表项悬浮文本色
-  --ti-pager-poplist-item-hover-text-color: var(--ti-common-color-text-highlight, #526ecc);
+  --ti-pager-poplist-item-hover-text-color: var(--ti-common-color-text-primary);
   // 分页下拉框选中项默认背景色
-  --ti-pager-poplist-item-selected-bg-color: var(--ti-common-color-selected-background, #5e7ce0);
+  --ti-pager-poplist-item-selected-bg-color: #F5F5F5;
   // 分页下拉框项选中字体颜色
   --ti-pager-poplist-item-selected-text-color: var(--ti-common-color-selected-text-color, #fff);
   // 分页页码项默认悬浮边框色
@@ -97,9 +97,9 @@
   // 分页下拉框圆角
   --ti-pager-pop-body-border-radius: var(--ti-common-border-radius-normal, 2px);
   // 分页下拉框顶部外边距
-  --ti-pager-pop-body-margin-top: 4px;
+  --ti-pager-pop-body-margin-top: var(--ti-common-space-base);
   // 分页下拉项最小高度
-  --ti-pager-poplist-item-min-height: 30px;
+  --ti-pager-poplist-item-min-height: var(--ti-common-line-height-6);
 
   // 分页下一页文字禁用色
   --ti-pager-prev-next-text-color-disabled: var(--ti-common-color-text-disabled, #adb0b8);
@@ -108,58 +108,58 @@
   // 分页跳转输入框边框悬浮颜色
   --ti-pager-goto-btn-border-hover-color: var(--ti-common-color-border-hover, #575d6c);
   // 分页跳转输入框文字颜色
-  --ti-pager-goto-btn-text-hover-color: var(--ti-common-color-text-highlight, #526ecc);
+  --ti-pager-goto-btn-text-hover-color: var(--ti-common-color-selected-text-color);
   // 分页上一页左侧内边距
-  --ti-pager-prev-padding-left: 6px;
+  --ti-pager-prev-padding-left: var(--ti-common-space-0);
   // 分页上一页右侧内边距
-  --ti-pager-prev-padding-right: 6px;
+  --ti-pager-prev-padding-right: var(--ti-common-space-0);
   // 分页上一页左侧外边距
-  --ti-pager-prev-margin-left: 4px;
+  --ti-pager-prev-margin-left: var(--ti-common-space-4x);
   // 分页上一页右侧外边距
-  --ti-pager-prev-margin-right: 4px;
+  --ti-pager-prev-margin-right: var(--ti-common-space-2x);
   // 分页下一页右侧内边距
-  --ti-pager-next-padding-right: 4px;
+  --ti-pager-next-padding-right: var(--ti-common-space-0);
   // 分页下一页右侧外边距
-  --ti-pager-next-margin-right: 6px;
+  --ti-pager-next-margin-right: var(--ti-common-space-0);
   // 分页下一页左侧外边距
-  --ti-pager-next-margin-left: 6px;
+  --ti-pager-next-margin-left: var(--ti-common-space-2x);
   // 分页上一页和下一页图标填充
-  --ti-pager-btn-svg-fill-color: var(--ti-common-color-info-normal, #252b3a);
+  --ti-pager-btn-svg-fill-color: var(--ti-common-color-icon-normal);
 
   // 分页总条数字体大小
-  --ti-pager-total-font-size: 12px;
+  --ti-pager-total-font-size: var(--ti-common-font-size-base);
   // 分页总条数高度
-  --ti-pager-total-height: 24px;
+  --ti-pager-total-height: var(--ti-common-line-height-2);
   // 分页总条数行高
-  --ti-pager-total-line-height: 24px;
+  --ti-pager-total-line-height: var(--ti-common-line-height-2);
   // 分页总条数图标填充色
-  --ti-pager-total-svg-fill-color: var(--ti-common-color-info-normal, #252b3a);
+  --ti-pager-total-svg-fill-color: var(--ti-common-color-icon-normal);
   // 分页图标大小
-  --ti-pager-svg-font-size: var(--ti-pager-font-size);
+  --ti-pager-svg-font-size: var(--ti-common-font-size-2);
 
   // 分页页码折叠时svg显示
   --ti-pager-dot-is-popup-display: inline;
   // 分页页码折叠时svg大小
-  --ti-pager-dot-is-popup-svg-font-size: 14px;
+  --ti-pager-dot-is-popup-svg-font-size: var(--ti-common-font-size-2);
 
   // 分页前进和后退按钮悬浮背景色
-  --ti-pager-prev-next-hover-bg-color: var(--ti-common-color-hover-background, #f2f5fc);
+  --ti-pager-prev-next-hover-bg-color: transparent;
   // 分页页码项右侧外边距
-  --ti-pager-group-sizes-margin-right: 16px;
+  --ti-pager-group-sizes-margin-right: var(--ti-common-space-0);
   // 分页页码选项框宽度
   --ti-pager-sizes-input-min-width: var(--ti-common-size-10x, 80px);
   // 分页选择框悬浮文本色
-  --ti-pager-sizes-input-hover-text-color: var(--ti-common-color-info-normal, #252b3a);
+  --ti-pager-sizes-input-hover-text-color: #595959;
   // 分页选择框右侧下拉按钮水平内边距
-  --ti-pager-input-btn-padding-horizontal: 6px;
+  --ti-pager-input-btn-padding-horizontal: var(--ti-common-size-2x);
 
   // 分页下拉弹出框纵向内边距
-  --ti-pager-selector-padding-vertical: var(--ti-common-space-3x, 12px);
+  --ti-pager-selector-padding-vertical: var(--ti-common-space-2x);
 
   // 小尺寸分页最小宽度
-  --ti-pager-mini-min-width: 18px;
+  --ti-pager-mini-min-width: var(--ti-common-size-width-mini);
   // 分页大小数字右侧外边距
-  --ti-pager-sizes-num-margin-right: var(--ti-common-space-base, 4px);
+  --ti-pager-sizes-num-margin-right: var(--ti-common-dropdown-gap);
   // 页码悬浮文本色
   --ti-pager-list-item-hover-text-color: var(--ti-common-color-text-primary, #252b3a);
 }
diff --git a/packages/theme/src/picker/old-theme.js b/packages/theme/src/picker/old-theme.js
new file mode 100644
index 000000000..12b25b62b
--- /dev/null
+++ b/packages/theme/src/picker/old-theme.js
@@ -0,0 +1,6 @@
+export const tinyPickerOldTheme = {
+  'ti-date-editor-input-icon-color-fill': '#575d6c',
+  'ti-date-editor-input-border-color': 'var(--ti-base-color-brand-6, #5e7ce0)',
+  'ti-date-editor-input-small-height': '36px',
+  'ti-date-editor-input-medium-height': '42px'
+}
diff --git a/packages/theme/src/picker/smb-theme.js b/packages/theme/src/picker/smb-theme.js
deleted file mode 100644
index 6c02e0883..000000000
--- a/packages/theme/src/picker/smb-theme.js
+++ /dev/null
@@ -1,6 +0,0 @@
-export const tinyPickerSmbTheme = {
-  'ti-date-editor-input-icon-color-fill': 'var(--ti-base-color-common-2)',
-  'ti-date-editor-input-medium-height': 'var(--ti-common-size-height-medium)',
-  'ti-date-editor-input-border-color': 'var(--ti-common-color-line-hover)',
-  'ti-date-editor-input-small-height': 'var(--ti-common-line-height-3)'
-}
diff --git a/packages/theme/src/picker/vars.less b/packages/theme/src/picker/vars.less
index 892a1dbe0..e4eb33920 100644
--- a/packages/theme/src/picker/vars.less
+++ b/packages/theme/src/picker/vars.less
@@ -12,8 +12,8 @@
 
 .component-css-vars-picker() {
   --ti-range-separator-text-color: #303133;
-  --ti-date-editor-input-medium-height: 42px;
-  --ti-date-editor-input-small-height: 36px;
-  --ti-date-editor-input-border-color: var(--ti-base-color-brand-6, #5e7ce0);
-  --ti-date-editor-input-icon-color-fill: #575d6c;
+  --ti-date-editor-input-medium-height: var(--ti-common-size-height-medium);
+  --ti-date-editor-input-small-height: var(--ti-common-line-height-3);
+  --ti-date-editor-input-border-color: var(--ti-common-color-line-hover);
+  --ti-date-editor-input-icon-color-fill: var(--ti-base-color-common-2);
 }
diff --git a/packages/theme/src/pop-upload/old-theme.js b/packages/theme/src/pop-upload/old-theme.js
new file mode 100644
index 000000000..a9b516cb6
--- /dev/null
+++ b/packages/theme/src/pop-upload/old-theme.js
@@ -0,0 +1,7 @@
+export const tinyPopUploadOldTheme = {
+  'ti-popupload-table-item-border-color': 'var(--ti-common-color-transparent, transparent)',
+  'ti-popupload-table-item-even-bg-color': 'var(--ti-common-color-info-bg, rgba(51, 51, 51, 0.06))',
+  'ti-popupload-dialog-table-line-height': 'var(--ti-common-size-height-normal, 28px)',
+  'ti-popupload-dialog-table-line-bg-color': 'var(--ti-common-color-line-normal, #adb0b8)',
+  'ti-popupload-dialog-table-border-color': 'var(--ti-common-color-line-normal, #adb0b8)'
+}
diff --git a/packages/theme/src/pop-upload/smb-theme.js b/packages/theme/src/pop-upload/smb-theme.js
deleted file mode 100644
index 83d0a632d..000000000
--- a/packages/theme/src/pop-upload/smb-theme.js
+++ /dev/null
@@ -1,7 +0,0 @@
-export const tinyPopUploadSmbTheme = {
-  'ti-popupload-dialog-table-border-color': 'var(--ti-common-color-transparent)',
-  'ti-popupload-dialog-table-line-bg-color': 'var(--ti-common-bg-color-transparent-15)',
-  'ti-popupload-dialog-table-line-height': 'var(--ti-common-size-4x)',
-  'ti-popupload-table-item-even-bg-color': 'var(--ti-common-color-bg-white-normal)',
-  'ti-popupload-table-item-border-color': 'var(--ti-common-border-color-transparent-8)'
-}
diff --git a/packages/theme/src/pop-upload/vars.less b/packages/theme/src/pop-upload/vars.less
index 921079d70..f38a767ab 100644
--- a/packages/theme/src/pop-upload/vars.less
+++ b/packages/theme/src/pop-upload/vars.less
@@ -22,11 +22,11 @@
   // 弹窗表格顶部外边距
   --ti-popupload-dialog-margin-top: var(--ti-common-space-10, 10px);
   // 弹窗表格头部横向分割线颜色
-  --ti-popupload-dialog-table-border-color: var(--ti-common-color-line-normal, #adb0b8);
+  --ti-popupload-dialog-table-border-color: var(--ti-common-color-transparent);
   // 弹窗表格头部竖向分割线颜色(new)
-  --ti-popupload-dialog-table-line-bg-color: var(--ti-common-color-line-normal, #adb0b8);
+  --ti-popupload-dialog-table-line-bg-color: var(--ti-common-bg-color-transparent-15);
   // 弹窗表格头部竖向分割线高度(new)
-  --ti-popupload-dialog-table-line-height: var(--ti-common-size-height-normal, 28px);
+  --ti-popupload-dialog-table-line-height: var(--ti-common-size-4x);
   // 弹窗表格头部高度
   --ti-popupload-dialog-table-header-height: var(--ti-common-size-height-small, 32px);
   // 弹窗表格头部文本色
@@ -50,9 +50,9 @@
   // 弹窗表格内容item行高
   --ti-popupload-table-body-col-line-height: var(--ti-common-line-height-4, 20px);
   // 弹窗表格内容偶数行背景色
-  --ti-popupload-table-item-even-bg-color: var(--ti-common-color-info-bg, rgba(51, 51, 51, 0.06));
+  --ti-popupload-table-item-even-bg-color: var(--ti-common-color-bg-white-normal);
   // 弹窗表格每行底部边框色(new)
-  --ti-popupload-table-item-border-color: var(--ti-common-color-transparent, transparent);
+  --ti-popupload-table-item-border-color: var(--ti-common-border-color-transparent-8);
   // 弹窗表格底部内边距
   --ti-popupload-dialog-table-body-padding-bottom: var(--ti-common-space-10, 10px);
   // 弹窗底部内边距
diff --git a/packages/theme/src/popconfirm/old-theme.js b/packages/theme/src/popconfirm/old-theme.js
new file mode 100644
index 000000000..9ac629e23
--- /dev/null
+++ b/packages/theme/src/popconfirm/old-theme.js
@@ -0,0 +1,12 @@
+export const tinyPopconfirmOldTheme = {
+  'ti-popconfirm-popover-text-color': '#5c6976',
+  'ti-popconfirm-popover-title-font-weight': 'var(--ti-common-font-weight-normal, 400)',
+  'ti-popconfirm-popover-title-font-size': 'var(--ti-common-font-size-1)',
+  'ti-popconfirm-popover-icon-margin-right': 'var(--ti-common-space-2x, 8px)',
+  'ti-popconfirm-popover-icon-margin-bottom': 'unset',
+  'ti-popconfirm-popover-icon-width': 'calc(var(--ti-common-size-3x) + 2px)',
+  'ti-popconfirm-popover-container-padding-vertical': 'var(--ti-common-space-base, 4px)',
+  'ti-popconfirm-popover-footer-font-color': '#161e26',
+  'ti-popconfirm-popover-footer-justify-content': 'flex-end',
+  'ti-popconfirm-popover-line-height': 'var(--ti-common-size-6x, 24px)'
+}
diff --git a/packages/theme/src/popconfirm/smb-theme.js b/packages/theme/src/popconfirm/smb-theme.js
deleted file mode 100644
index 7deff623e..000000000
--- a/packages/theme/src/popconfirm/smb-theme.js
+++ /dev/null
@@ -1,14 +0,0 @@
-export const tinyPopconfirmSmbTheme = {
-  'ti-popconfirm-margin-right': 'var(--ti-common-space-6x)',
-  'ti-popconfirm-popover-footer-justify-content': 'right',
-  'ti-popconfirm-popover-container-padding-vertical': 'unset',
-  'ti-popconfirm-popover-footer-font-color': '#191919',
-  'ti-popconfirm-popover-icon-width': 'var(--ti-common-size-4x)',
-  'ti-popconfirm-popover-title-font-weight': 'var(--ti-common-font-weight-bold)',
-  'ti-popconfirm-popover-title-font-size': 'var(--ti-common-font-size-2)',
-  'ti-popconfirm-popover-icon-margin-right': 'var(--ti-common-space-base)',
-  'ti-popconfirm-popover-margin-bottom': '8px',
-  'ti-popconfirm-popover-text-color': '#191919',
-  'ti-popconfirm-popover-line-height': '1.5',
-  'ti-popconfirm-popover-icon-margin-bottom': '2px'
-}
diff --git a/packages/theme/src/popconfirm/vars.less b/packages/theme/src/popconfirm/vars.less
index af3b1df0f..107d18481 100644
--- a/packages/theme/src/popconfirm/vars.less
+++ b/packages/theme/src/popconfirm/vars.less
@@ -12,24 +12,24 @@
 
 .component-css-vars-popconfirm() {
   // 提示弹窗字体行高
-  --ti-popconfirm-popover-line-height: var(--ti-common-size-6x, 24px);
+  --ti-popconfirm-popover-line-height: 1.5;
   // 底部按钮flex排列方式
-  --ti-popconfirm-popover-footer-justify-content: flex-end;
+  --ti-popconfirm-popover-footer-justify-content: right;
   // 提示弹窗字体大小
   --ti-popconfirm-popover-footer-font-size: var(--ti-common-font-size-base, 12px);
   // 提示弹窗字体颜色
-  --ti-popconfirm-popover-footer-font-color: #161e26;
+  --ti-popconfirm-popover-footer-font-color: #191919;
   // 提示弹窗容器垂直内边距
-  --ti-popconfirm-popover-container-padding-vertical: var(--ti-common-space-base, 4px);
+  --ti-popconfirm-popover-container-padding-vertical: unset;
   // 提示弹窗图标大小
-  --ti-popconfirm-popover-icon-width: calc(var(--ti-common-size-3x) + 2px);
-  --ti-popconfirm-popover-icon-margin-bottom: unset;
+  --ti-popconfirm-popover-icon-width: var(--ti-common-size-4x);
+  --ti-popconfirm-popover-icon-margin-bottom: 2px;
   // 提示弹窗图标上侧外边距
-  --ti-popconfirm-popover-icon-margin-right: var(--ti-common-space-2x, 8px);
+  --ti-popconfirm-popover-icon-margin-right: var(--ti-common-space-base);
   // 提示弹窗底部按钮容器上侧外边距
   --ti-popconfirm-popover-footer-margin-top: var(--ti-common-space-4x, 16px);
   // 标题字重、大小
-  --ti-popconfirm-popover-title-font-size: var(--ti-common-font-size-1);
-  --ti-popconfirm-popover-title-font-weight: var(--ti-common-font-weight-normal, 400);
-  --ti-popconfirm-popover-text-color: #5c6976;
+  --ti-popconfirm-popover-title-font-size: var(--ti-common-font-size-2);
+  --ti-popconfirm-popover-title-font-weight: var(--ti-common-font-weight-bold);
+  --ti-popconfirm-popover-text-color: #191919;
 }
diff --git a/packages/theme/src/popeditor/old-theme.js b/packages/theme/src/popeditor/old-theme.js
new file mode 100644
index 000000000..7832cd5f8
--- /dev/null
+++ b/packages/theme/src/popeditor/old-theme.js
@@ -0,0 +1,34 @@
+export const tinyPopeditorOldTheme = {
+  'ti-popeditor-tree-input-sufffix-visibility': 'visible',
+  'ti-popeditor-tree-input-prefix-visibility': 'hidden',
+  'ti-popeditor-tree-input-padding-right': 'calc(var(--ti-common-space-8x, 32px) - 4px)',
+  'ti-popeditor-tree-input-padding-left': 'var(--ti-common-space-2x, 8px)',
+  'ti-popeditor-search-footer-text-align': 'center',
+  'ti-popeditor-search-item-padding-left': 'var(--ti-common-space-0, 0px)',
+  'ti-popeditor-search-item-padding-right': 'var(--ti-common-space-0, 0px)',
+  'ti-popeditor-search-item-text-align': 'right',
+  'ti-popeditor-search-item-width': '160px',
+  'ti-popeditor-footer-padding-top': 'var(--ti-common-space-7x, 28px)',
+  'ti-popeditor-footer-text-align': 'center',
+  'ti-popeditor-pager-padding-top': 'var(--ti-common-space-6x, 24px)',
+  'ti-popeditor-tabs-header-padding-horizontal': 'var(--ti-common-space-10, 10px)',
+  'ti-popeditor-tabs-body-item-padding-horizontal': 'var(--ti-common-space-3x, 12px)',
+  'ti-popeditor-tabs-body-item-padding-top': 'var(--ti-common-space-3x, 12px)',
+  'ti-popeditor-tabs-body-right-padding-left': 'var(--ti-common-space-base, 4px)',
+  'ti-popeditor-tabs-body-right-padding-bottom': 'var(--ti-common-space-0, 0px)',
+  'ti-popeditor-tabs-body-right-padding-right': 'var(--ti-common-space-base, 4px)',
+  'ti-popeditor-tabs-body-right-padding-top': 'var(--ti-common-space-0, 0px)',
+  'ti-popeditor-tabs-body-left-padding-left': 'var(--ti-common-space-base, 4px)',
+  'ti-popeditor-tabs-body-left-padding-bottom': 'var(--ti-common-space-0, 0px)',
+  'ti-popeditor-tabs-body-left-padding-right': 'var(--ti-common-space-base, 4px)',
+  'ti-popeditor-tabs-body-left-padding-top': 'var(--ti-common-space-0, 0px)',
+  'ti-popeditor-tabs-li-margin-right': 'var(--ti-common-space-0, 0px)',
+  'ti-popeditor-tabs-li-padding-horizontal': 'var(--ti-common-space-5x, 20px)',
+  'ti-popeditor-search-footer-margin-bottom': 'var(--ti-common-space-3x, 12px)',
+  'ti-popeditor-search-footer-margin-top': 'var(--ti-common-space-3x, 12px)',
+  'ti-popeditor-search-item-margin-bottom': 'var(--ti-common-space-3x, 12px)',
+  'ti-popeditor-tabs-font-size': 'var(--ti-common-font-size-1)',
+  'ti-popeditor-tabs-li-line-height': 'var(--ti-common-size-10x, 40px)',
+  'ti-popeditor-tabs-li-height': 'var(--ti-common-size-10x, 40px)',
+  'ti-popeditor-border-color': 'var(--ti-common-color-border, #adb0b8)'
+}
diff --git a/packages/theme/src/popeditor/smb-theme.js b/packages/theme/src/popeditor/smb-theme.js
deleted file mode 100644
index a2e91ed66..000000000
--- a/packages/theme/src/popeditor/smb-theme.js
+++ /dev/null
@@ -1,34 +0,0 @@
-export const tinyPopeditorSmbTheme = {
-  'ti-popeditor-pager-padding-top': 'var(--ti-common-space-3x)',
-  'ti-popeditor-tabs-body-item-padding-top': 'var(--ti-common-space-4x)',
-  'ti-popeditor-footer-text-align': 'right',
-  'ti-popeditor-footer-padding-top': 'var(--ti-common-space-6x)',
-  'ti-popeditor-tabs-li-padding-horizontal': 'var(--ti-common-space-0)',
-  'ti-popeditor-border-color': 'var(--ti-common-border-color-transparent-8)',
-  'ti-popeditor-tabs-header-padding-horizontal': 'var(--ti-common-space-0)',
-  'ti-popeditor-tabs-body-item-padding-horizontal': 'var(--ti-common-space-0)',
-  'ti-popeditor-search-item-width': '80px',
-  'ti-popeditor-search-item-text-align': 'left',
-  'ti-popeditor-search-item-padding-right': 'var(--ti-common-space-4x)',
-  'ti-popeditor-search-item-padding-left': 'var(--ti-common-space-4x)',
-  'ti-popeditor-search-footer-text-align': 'right',
-  'ti-popeditor-search-item-margin-bottom': 'var(--ti-common-space-6x)',
-  'ti-popeditor-search-footer-margin-top': 'var(--ti-common-space-0)',
-  'ti-popeditor-search-footer-margin-bottom': 'var(--ti-common-space-6x)',
-  'ti-popeditor-tabs-li-height': 'calc(var(--ti-common-size-8x) + 2px)',
-  'ti-popeditor-tabs-li-line-height': 'var(--ti-common-line-height-2)',
-  'ti-popeditor-tabs-li-margin-right': 'var(--ti-common-space-8x)',
-  'ti-popeditor-tabs-font-size': 'var(--ti-common-font-size-2)',
-  'ti-popeditor-tabs-body-left-padding-top': 'var(--ti-common-space-0)',
-  'ti-popeditor-tabs-body-left-padding-right': 'var(--ti-common-space-4x)',
-  'ti-popeditor-tabs-body-left-padding-bottom': 'var(--ti-common-space-0)',
-  'ti-popeditor-tabs-body-left-padding-left': 'var(--ti-common-space-0)',
-  'ti-popeditor-tabs-body-right-padding-top': 'var(--ti-common-space-0)',
-  'ti-popeditor-tabs-body-right-padding-right': 'var(--ti-common-space-0)',
-  'ti-popeditor-tabs-body-right-padding-bottom': 'var(--ti-common-space-0)',
-  'ti-popeditor-tabs-body-right-padding-left': 'var(--ti-common-space-4x)',
-  'ti-popeditor-tree-input-padding-left': 'calc(var(--ti-common-space-8x, 32px) - 4px)',
-  'ti-popeditor-tree-input-padding-right': 'var(--ti-common-space-2x, 8px)',
-  'ti-popeditor-tree-input-prefix-visibility': 'visible',
-  'ti-popeditor-tree-input-sufffix-visibility': 'hidden'
-}
diff --git a/packages/theme/src/popeditor/vars.less b/packages/theme/src/popeditor/vars.less
index ee59bcba9..d180f6afc 100644
--- a/packages/theme/src/popeditor/vars.less
+++ b/packages/theme/src/popeditor/vars.less
@@ -12,7 +12,7 @@
 
 .component-css-vars-popeditor() {
   // 弹出框标题底部边框色和输入框边框色
-  --ti-popeditor-border-color: var(--ti-common-color-border, #adb0b8);
+  --ti-popeditor-border-color: var(--ti-common-border-color-transparent-8);
   // 输入框左内边距
   --ti-popeditor-input-padding-left: var(--ti-common-space-2x, 8px);
   // 输入框右侧默认图标色
@@ -30,19 +30,19 @@
   // 弹出框头部标题选中文本色和边框色
   --ti-popeditor-tabs-selected-text-color: var(--ti-common-color-line-active, #5e7ce0);
   // 弹出框头部标题高度
-  --ti-popeditor-tabs-li-height: var(--ti-common-size-10x, 40px);
+  --ti-popeditor-tabs-li-height: calc(var(--ti-common-size-8x) + 2px);
   // 出框头部标题行高
-  --ti-popeditor-tabs-li-line-height: var(--ti-common-size-10x, 40px);
+  --ti-popeditor-tabs-li-line-height: var(--ti-common-line-height-2);
   // 出框头部标题字体大小
-  --ti-popeditor-tabs-font-size: var(--ti-common-font-size-1);
+  --ti-popeditor-tabs-font-size: var(--ti-common-font-size-2);
   // 弹出框头部标题选中文本字重
   --ti-popeditor-tabs-selected-font-weight: var(--ti-common-font-weight-bold, 700);
   // 弹出框查询条件item底部外边距
-  --ti-popeditor-search-item-margin-bottom: var(--ti-common-space-3x, 12px);
+  --ti-popeditor-search-item-margin-bottom: var(--ti-common-space-6x);
   // 弹出框查询条件页脚顶部外边距
-  --ti-popeditor-search-footer-margin-top: var(--ti-common-space-3x, 12px);
+  --ti-popeditor-search-footer-margin-top: var(--ti-common-space-0);
   // 弹出框查询条件页脚底部外边距
-  --ti-popeditor-search-footer-margin-bottom: var(--ti-common-space-3x, 12px);
+  --ti-popeditor-search-footer-margin-bottom: var(--ti-common-space-6x);
   // 弹出框查询条件页脚水平外边距
   --ti-popeditor-search-footer-margin-horizontal: auto;
   // 弹出编辑头部标签页文本色(hide)
@@ -50,55 +50,55 @@
   // 弹出表格头部标签页item垂直内边距
   --ti-popeditor-tabs-li-padding-vertical: var(--ti-common-space-0, 0px);
   // 弹出表格头部标签页item水平内边距
-  --ti-popeditor-tabs-li-padding-horizontal: var(--ti-common-space-5x, 20px);
+  --ti-popeditor-tabs-li-padding-horizontal: var(--ti-common-space-0);
   // 弹出表格头部标签页item右侧外边距
-  --ti-popeditor-tabs-li-margin-right: var(--ti-common-space-0, 0px);
+  --ti-popeditor-tabs-li-margin-right: var(--ti-common-space-8x);
   // 弹出表格(左侧）标签页内容区顶部内边距
-  --ti-popeditor-tabs-body-left-padding-top: var(--ti-common-space-0, 0px);
+  --ti-popeditor-tabs-body-left-padding-top: var(--ti-common-space-0);
   // 弹出表格(左侧）标签页内容区右侧内边距
-  --ti-popeditor-tabs-body-left-padding-right: var(--ti-common-space-base, 4px);
+  --ti-popeditor-tabs-body-left-padding-right: var(--ti-common-space-4x);
   // 弹出表格(左侧）标签页内容区底部内边距
-  --ti-popeditor-tabs-body-left-padding-bottom: var(--ti-common-space-0, 0px);
+  --ti-popeditor-tabs-body-left-padding-bottom: var(--ti-common-space-0);
   // 弹出表格(左侧）标签页内容区左侧内边距
-  --ti-popeditor-tabs-body-left-padding-left: var(--ti-common-space-base, 4px);
+  --ti-popeditor-tabs-body-left-padding-left: var(--ti-common-space-0);
   // 弹出表格(右侧）标签页内容区顶部内边距
-  --ti-popeditor-tabs-body-right-padding-top: var(--ti-common-space-0, 0px);
+  --ti-popeditor-tabs-body-right-padding-top: var(--ti-common-space-0);
   // 弹出表格(右侧）标签页内容区右侧内边距
-  --ti-popeditor-tabs-body-right-padding-right: var(--ti-common-space-base, 4px);
+  --ti-popeditor-tabs-body-right-padding-right: var(--ti-common-space-0);
   // 弹出表格(右侧）标签页内容区底部内边距
-  --ti-popeditor-tabs-body-right-padding-bottom: var(--ti-common-space-0, 0px);
+  --ti-popeditor-tabs-body-right-padding-bottom: var(--ti-common-space-0);
   // 弹出表格(右侧）标签页内容区左侧内边距
-  --ti-popeditor-tabs-body-right-padding-left: var(--ti-common-space-base, 4px);
+  --ti-popeditor-tabs-body-right-padding-left: var(--ti-common-space-4x);
   // 弹出表格内容顶部内边距
-  --ti-popeditor-tabs-body-item-padding-top: var(--ti-common-space-3x, 12px);
+  --ti-popeditor-tabs-body-item-padding-top: var(--ti-common-space-4x);
   // 弹出表格内容水平内边距
-  --ti-popeditor-tabs-body-item-padding-horizontal: var(--ti-common-space-3x, 12px);
+  --ti-popeditor-tabs-body-item-padding-horizontal: var(--ti-common-space-0);
   // 弹出表格内容底部内边距
   --ti-popeditor-tabs-body-item-padding-bottom: var(--ti-common-space-0, 0px);
   // 弹出表格标签页水平方向内边距
-  --ti-popeditor-tabs-header-padding-horizontal: var(--ti-common-space-10, 10px);
+  --ti-popeditor-tabs-header-padding-horizontal: var(--ti-common-space-0);
   // 弹出表格分页顶部内边距
-  --ti-popeditor-pager-padding-top: var(--ti-common-space-6x, 24px);
+  --ti-popeditor-pager-padding-top: var(--ti-common-space-3x);
   // 弹框底部对齐方式
-  --ti-popeditor-footer-text-align: center;
+  --ti-popeditor-footer-text-align: right;
   // 弹框底部顶部内边距
-  --ti-popeditor-footer-padding-top: var(--ti-common-space-7x, 28px);
+  --ti-popeditor-footer-padding-top: var(--ti-common-space-6x);
   // 弹出表格搜索项左侧标签文本默认宽度
-  --ti-popeditor-search-item-width: 160px;
+  --ti-popeditor-search-item-width: 80px;
   // 弹出表格搜索项左侧标签文本对齐方式
-  --ti-popeditor-search-item-text-align: right;
+  --ti-popeditor-search-item-text-align: left;
   // 弹出表格搜索项左侧标签文本右侧内边距
-  --ti-popeditor-search-item-padding-right: var(--ti-common-space-0, 0px);
+  --ti-popeditor-search-item-padding-right: var(--ti-common-space-4x);
   // 弹出表格搜索项左侧标签文本左侧内边距
-  --ti-popeditor-search-item-padding-left: var(--ti-common-space-0, 0px);
+  --ti-popeditor-search-item-padding-left: var(--ti-common-space-4x);
   // 弹出表格搜索底部按钮对齐方式
-  --ti-popeditor-search-footer-text-align: center;
+  --ti-popeditor-search-footer-text-align: right;
   // 弹出树搜索框左侧内边距
-  --ti-popeditor-tree-input-padding-left: var(--ti-common-space-2x, 8px);
+  --ti-popeditor-tree-input-padding-left: calc(var(--ti-common-space-8x, 32px) - 4px);
   // 弹出树搜索框右侧内边距
-  --ti-popeditor-tree-input-padding-right: calc(var(--ti-common-space-8x, 32px) - 4px);
+  --ti-popeditor-tree-input-padding-right: var(--ti-common-space-2x, 8px);
   // 弹出树搜索框是否显示前置图标
-  --ti-popeditor-tree-input-prefix-visibility: hidden;
+  --ti-popeditor-tree-input-prefix-visibility: visible;
   // 弹出树搜索框是否显示后置图标
-  --ti-popeditor-tree-input-sufffix-visibility: visible;
+  --ti-popeditor-tree-input-sufffix-visibility: hidden;
 }
diff --git a/packages/theme/src/popover/old-theme.js b/packages/theme/src/popover/old-theme.js
new file mode 100644
index 000000000..fdacf6710
--- /dev/null
+++ b/packages/theme/src/popover/old-theme.js
@@ -0,0 +1,14 @@
+export const tinyPopoverOldTheme = {
+  'ti-popover-padding-horizontal': 'var(--ti-common-space-4x, 16px)',
+  'ti-popover-padding-vertical': 'var(--ti-common-space-3x, 12px)',
+  'ti-popover-arrow-border-color': 'var(--ti-common-color-line-dividing, #dfe1e6)',
+  'ti-popover-box-shadow': 'var(--ti-common-shadow-1-down, 0 1px 4px 0 rgba(0, 0, 0, 0.1))',
+  'ti-popover-arrow-height': 'var(--ti-popover-arrow-border-width)',
+  'ti-popover-title-padding-bottom': 'var(--ti-common-font-size-3, 12px)',
+  'ti-popover-title-weight': 'normal',
+  'ti-popover-line-height': '1.4',
+  'ti-popover-font-size': 'var(--ti-common-font-size-1, 14px)',
+  'ti-popover-border-radius': 'var(--ti-common-border-radius-1, 4px)',
+  'ti-popover-border-color': 'var(--ti-common-color-line-dividing, #dfe1e6)',
+  'ti-popover-font-weight': '400'
+}
diff --git a/packages/theme/src/popover/smb-theme.js b/packages/theme/src/popover/smb-theme.js
deleted file mode 100644
index e020ed0db..000000000
--- a/packages/theme/src/popover/smb-theme.js
+++ /dev/null
@@ -1,14 +0,0 @@
-export const tinyPopperSmbTheme = {
-  'ti-popover-box-shadow': '0px 2px 12px 0px rgba(0,0,0,0.08)',
-  'ti-popover-border-radius': 'var(--ti-common-border-radius-4)',
-  'ti-popover-padding-vertical': 'var(--ti-common-space-3x)',
-  'ti-popover-padding-horizontal': 'var(--ti-common-space-4x)',
-  'ti-popover-border-color': 'transparent',
-  'ti-popover-arrow-border-color': 'transparent',
-  'ti-popover-arrow-height': 'var(--ti-common-space-2x)',
-  'ti-popover-line-height': '20px',
-  'ti-popover-title-weight': '600',
-  'ti-popover-title-padding-bottom': '8px',
-  'ti-popover-font-weight': '400',
-  'ti-popover-font-size': '14px'
-}
diff --git a/packages/theme/src/popover/vars.less b/packages/theme/src/popover/vars.less
index dc8cb38a3..3d9a11145 100644
--- a/packages/theme/src/popover/vars.less
+++ b/packages/theme/src/popover/vars.less
@@ -20,25 +20,25 @@
   // 弹框内容文本色
   --ti-popover-text-color: var(--ti-common-color-text-secondary, #575d6c);
   // 弹框边框色
-  --ti-popover-border-color: var(--ti-common-color-line-dividing, #dfe1e6);
+  --ti-popover-border-color: transparent;
   // 弹框圆角
-  --ti-popover-border-radius: var(--ti-common-border-radius-1, 4px);
+  --ti-popover-border-radius: var(--ti-common-border-radius-4);
   // 弹框内容字号
-  --ti-popover-font-size: var(--ti-common-font-size-1, 14px);
+  --ti-popover-font-size: 14px;
   // 弹框内容行高
-  --ti-popover-line-height: 1.4;
+  --ti-popover-line-height: 20px;
   // 弹框标题文本色
   --ti-popover-title-text-color: var(--ti-common-color-text-primary, #252b3a);
   // 弹框标题字号
   --ti-popover-title-font-size: var(--ti-common-font-size-2, 16px);
   // 弹框标题字重
-  --ti-popover-title-weight: normal;
+  --ti-popover-title-weight: 600;
   // 弹框标题字重
-  --ti-popover-title-padding-bottom: var(--ti-common-font-size-3, 12px);
+  --ti-popover-title-padding-bottom: 8px;
   // 弹出框小箭头边框厚度
   --ti-popover-arrow-border-width: calc(var(--ti-common-border-weight-2, 3px) * 2);
   // 弹出框小箭头高度
-  --ti-popover-arrow-height: var(--ti-popover-arrow-border-width);
+  --ti-popover-arrow-height: var(--ti-common-space-2x);
   // 弹出框垂直外边距
   --ti-popover-placement-margin-vertical: var(--ti-common-space-3x, 12px);
   // 弹出框小箭头水平外边距(hide)
@@ -46,11 +46,11 @@
   // 弹框小箭头填充色
   --ti-popover-placement-arrow-after-border-color: var(--ti-common-color-light, #fff);
   // 弹框阴影
-  --ti-popover-box-shadow: var(--ti-common-shadow-1-down, 0 1px 4px 0 rgba(0, 0, 0, 0.1));
+  --ti-popover-box-shadow: 0px 2px 12px 0px rgba(0,0,0,0.08);
   // 弹框小箭头边框色
-  --ti-popover-arrow-border-color: var(--ti-common-color-line-dividing, #dfe1e6);
+  --ti-popover-arrow-border-color: transparent;
   // 弹框垂直内边距
-  --ti-popover-padding-vertical: var(--ti-common-space-3x, 12px);
+  --ti-popover-padding-vertical: var(--ti-common-space-3x);
   // 弹框水平内边距
-  --ti-popover-padding-horizontal: var(--ti-common-space-4x, 16px);
+  --ti-popover-padding-horizontal: var(--ti-common-space-4x);
 }
diff --git a/packages/theme/src/progress/old-theme.js b/packages/theme/src/progress/old-theme.js
new file mode 100644
index 000000000..7f99c5f8b
--- /dev/null
+++ b/packages/theme/src/progress/old-theme.js
@@ -0,0 +1,6 @@
+export const tinyProgressOldTheme = {
+  'ti-progress-exception-bg-color': 'var(--ti-common-bg-primary, #c7000b)',
+  'ti-progress-bar-text-margin-left': 'var(--ti-common-space-2x, 8px)',
+  'ti-progress-bar-inner-bg-color': 'var(--ti-common-color-bg-emphasize, #5e7ce0)',
+  'ti-progress-bar-outer-bg-color': 'var(--ti-common-color-bg-disabled, #f5f5f6)'
+}
diff --git a/packages/theme/src/progress/smb-theme.js b/packages/theme/src/progress/smb-theme.js
deleted file mode 100644
index c988b0e9a..000000000
--- a/packages/theme/src/progress/smb-theme.js
+++ /dev/null
@@ -1,6 +0,0 @@
-export const tinyProgresSMBTheme = {
-  'ti-progress-bar-inner-bg-color': 'var(--ti-common-color-data-4)',
-  'ti-progress-bar-text-margin-left': 'var(--ti-common-space-3x)',
-  'ti-progress-exception-bg-color': '#c7000b',
-  'ti-progress-bar-outer-bg-color': '#E6E6E6'
-}
diff --git a/packages/theme/src/progress/vars.less b/packages/theme/src/progress/vars.less
index 0b81f8f46..e794652c2 100644
--- a/packages/theme/src/progress/vars.less
+++ b/packages/theme/src/progress/vars.less
@@ -16,17 +16,17 @@
   // 进度条内层文本字号
   --ti-progress-text-font-size: var(--ti-common-font-size-base, 12px);
   // 横向条未完成部分背景色
-  --ti-progress-bar-outer-bg-color: var(--ti-common-color-bg-disabled, #f5f5f6);
+  --ti-progress-bar-outer-bg-color: #E6E6E6;
   // 横向条已完成部分背景色
-  --ti-progress-bar-inner-bg-color: var(--ti-common-color-bg-emphasize, #5e7ce0);
+  --ti-progress-bar-inner-bg-color: var(--ti-common-color-data-4);
   // 横向条内层文本色
   --ti-progress-bar-inner-text-color: var(--ti-common-color-light, #fff);
   // 横向条右侧文字左外边距
-  --ti-progress-bar-text-margin-left: var(--ti-common-space-2x, 8px);
+  --ti-progress-bar-text-margin-left: var(--ti-common-space-3x);
   // success状态横向条已完成部分背景色
   --ti-progress-success-bg-color: var(--ti-common-color-success-normal, #50d4ab);
   // warning状态横向条已完成部分背景色
   --ti-progress-warning-bg-color: var(--ti-common-color-warning-normal, #fa9841);
   // exception状态横向条已完成部分背景色
-  --ti-progress-exception-bg-color: var(--ti-common-bg-primary, #c7000b);
+  --ti-progress-exception-bg-color: #c7000b;
 }
diff --git a/packages/theme/src/radio-button/old-theme.js b/packages/theme/src/radio-button/old-theme.js
new file mode 100644
index 000000000..3b73876f3
--- /dev/null
+++ b/packages/theme/src/radio-button/old-theme.js
@@ -0,0 +1,22 @@
+export const tinyRadioButtonOldTheme = {
+  'ti-radio-button-checked-disabled-bg-color': '#bfbfbf',
+  'ti-radio-button-active-disabled-bg-color': 'var(--ti-common-color-bg-dark-disabled)',
+  'ti-radio-button-active-disabled-color': 'var(--ti-common-color-text-weaken)',
+  'ti-radio-button-padding-verticals': 'var(--ti-common-space-3x)',
+  'ti-radio-button-child-right-border-radius': '0',
+  'ti-radio-button-child-left-border-radius': 'var(--ti-common-space-2)',
+  'ti-radio-button-border-left': '1px',
+  'ti-radio-button-margin-right': 'unset',
+  'ti-radio-button-disabled-bg-color': 'var(--ti-common-color-bg-disabled, #f5f5f6)',
+  'ti-radio-button-disabled-checked-text-color': 'var(--ti-common-color-text-weaken, #808080)',
+  'ti-radio-button-checked-hover-box-shadow': '-1px 0 0 0 var(--ti-common-color-primary-hover, #7693f5)',
+  'ti-radio-button-checked-hover-border-color': 'var(--ti-common-color-primary-hover, #7693f5)',
+  'ti-radio-button-checked-hover-bg-color': 'var(--ti-common-color-primary-hover, #7693f5)',
+  'ti-radio-button-checked-normal-box-shadow': '-1px 0 0 0 var(--ti-common-color-primary-normal, #5e7ce0)',
+  'ti-radio-button-checked-normal-border-color': 'var(--ti-common-color-primary-normal, #5e7ce0)',
+  'ti-radio-button-checked-normal-bg-color': 'var(--ti-common-color-primary-normal, #5e7ce0)',
+  'ti-radio-button-bg-color': 'var(--ti-common-color-light, #fff)',
+  'ti-radio-button-border-radius': '0',
+  'ti-radio-button-hover-text-color': 'var(--ti-common-color-light, #fff)',
+  'ti-radio-button-text-color': 'var(--ti-common-color-info-normal, #252b3a)'
+}
diff --git a/packages/theme/src/radio-button/smb-theme.js b/packages/theme/src/radio-button/smb-theme.js
deleted file mode 100644
index f8bf705a1..000000000
--- a/packages/theme/src/radio-button/smb-theme.js
+++ /dev/null
@@ -1,35 +0,0 @@
-/**
- * Copyright (c) 2022 - present TinyVue Authors.
- * Copyright (c) 2022 - present Huawei Cloud Computing Technologies Co., Ltd.
- *
- * Use of this source code is governed by an MIT-style license.
- *
- * THE OPEN SOURCE SOFTWARE IN THIS PRODUCT IS DISTRIBUTED IN THE HOPE THAT IT WILL BE USEFUL,
- * BUT WITHOUT ANY WARRANTY, WITHOUT EVEN THE IMPLIED WARRANTY OF MERCHANTABILITY OR FITNESS FOR
- * A PARTICULAR PURPOSE. SEE THE APPLICABLE LICENSES FOR MORE DETAILS.
- *
- */
-
-export const tinyRadioButtonSmbTheme = {
-  'ti-radio-button-checked-normal-bg-color': '#1476FF',
-  'ti-radio-button-checked-normal-border-color': '#1476FF',
-  'ti-radio-button-checked-normal-box-shadow': '#1476FF',
-  'ti-radio-button-checked-hover-bg-color': 'var(--ti-common-color-prompt-bg)',
-  'ti-radio-button-hover-text-color': 'var(--ti-common-color-bg-emphasize)',
-  'ti-radio-button-checked-hover-border-color': '#1293ff',
-  'ti-radio-button-checked-hover-box-shadow': '#1293ff',
-  'ti-radio-button-margin-right': 'var(--ti-common-space-2)',
-  'ti-radio-button-border-radius': 'var(--ti-common-space-6)',
-  'ti-radio-button-border-left': 0,
-  'ti-radio-button-child-left-border-radius': 'var(--ti-common-space-6)',
-  'ti-radio-button-child-right-border-radius': 'var(--ti-common-space-6)',
-  'ti-radio-button-padding-verticals': '5px',
-  'ti-radio-button-active-disabled-color': 'var(--ti-common-color-text-weaken)',
-  'ti-radio-button-active-disabled-bg-color': 'var(--ti-common-color-bg-dark-disabled)',
-  'ti-radio-button-checked-disabled-border-color': 'unset',
-  'ti-radio-button-bg-color': 'var(--ti-common-color-bg-normal)',
-  'ti-radio-button-checked-disabled-bg-color': 'var(--ti-common-color-bg-dark-disabled)',
-  'ti-radio-button-disabled-bg-color': 'var(--ti-common-color-bg-disabled)',
-  'ti-radio-button-disabled-checked-text-color': 'var(--ti-common-color-text-weaken)',
-  'ti-radio-button-text-color': 'var(--ti-common-color-text-secondary)'
-}
diff --git a/packages/theme/src/radio-button/vars.less b/packages/theme/src/radio-button/vars.less
index 6bb6c8f00..78be6eab3 100644
--- a/packages/theme/src/radio-button/vars.less
+++ b/packages/theme/src/radio-button/vars.less
@@ -11,28 +11,28 @@
 */
 
 .component-css-vars-radio-button() {
-  --ti-radio-button-text-color: var(--ti-common-color-info-normal, #252b3a);
-  --ti-radio-button-hover-text-color: var(--ti-common-color-light, #fff);
+  --ti-radio-button-text-color: var(--ti-common-color-text-secondary);
+  --ti-radio-button-hover-text-color: var(--ti-common-color-bg-emphasize);
   --ti-radio-button-border-color: var(--ti-common-color-border, #adb0b8);
-  --ti-radio-button-border-radius: 0;
+  --ti-radio-button-border-radius: var(--ti-common-space-6);
   --ti-radio-button-font-size: var(--ti-common-font-size-base, 12px);
-  --ti-radio-button-bg-color: var(--ti-common-color-light, #fff);
-  --ti-radio-button-checked-normal-bg-color: var(--ti-common-color-primary-normal, #5e7ce0);
-  --ti-radio-button-checked-normal-border-color: var(--ti-common-color-primary-normal, #5e7ce0);
-  --ti-radio-button-checked-normal-box-shadow: -1px 0 0 0 var(--ti-common-color-primary-normal, #5e7ce0);
-  --ti-radio-button-checked-hover-bg-color: var(--ti-common-color-primary-hover, #7693f5);
-  --ti-radio-button-checked-hover-border-color: var(--ti-common-color-primary-hover, #7693f5);
-  --ti-radio-button-checked-hover-box-shadow: -1px 0 0 0 var(--ti-common-color-primary-hover, #7693f5);
+  --ti-radio-button-bg-color: var(--ti-common-color-bg-normal);
+  --ti-radio-button-checked-normal-bg-color: #1476FF;
+  --ti-radio-button-checked-normal-border-color: #1476FF;
+  --ti-radio-button-checked-normal-box-shadow: #1476FF;
+  --ti-radio-button-checked-hover-bg-color: var(--ti-common-color-prompt-bg);
+  --ti-radio-button-checked-hover-border-color: #1293ff;
+  --ti-radio-button-checked-hover-box-shadow: #1293ff;
   --ti-radio-button-disabled-text-color: var(--ti-common-color-text-disabled, #adb0b8);
-  --ti-radio-button-disabled-checked-text-color: var(--ti-common-color-text-weaken, #808080);
-  --ti-radio-button-disabled-bg-color: var(--ti-common-color-bg-disabled, #f5f5f6);
+  --ti-radio-button-disabled-checked-text-color: var(--ti-common-color-text-weaken);
+  --ti-radio-button-disabled-bg-color: var(--ti-common-color-bg-disabled);
   --ti-radio-button-medium-font-size: var(--ti-common-font-size-1, 14px);
-  --ti-radio-button-margin-right: unset;
-  --ti-radio-button-border-left: 1px;
-  --ti-radio-button-child-left-border-radius: var(--ti-common-space-2);
-  --ti-radio-button-child-right-border-radius: 0;
-  --ti-radio-button-padding-verticals: var(--ti-common-space-3x);
+  --ti-radio-button-margin-right: var(--ti-common-space-2);
+  --ti-radio-button-border-left: 0;
+  --ti-radio-button-child-left-border-radius: var(--ti-common-space-6);
+  --ti-radio-button-child-right-border-radius: var(--ti-common-space-6);
+  --ti-radio-button-padding-verticals: 5px;
   --ti-radio-button-active-disabled-color: var(--ti-common-color-text-weaken);
   --ti-radio-button-active-disabled-bg-color: var(--ti-common-color-bg-dark-disabled);
-  --ti-radio-button-checked-disabled-bg-color: #bfbfbf;
+  --ti-radio-button-checked-disabled-bg-color: var(--ti-common-color-bg-dark-disabled);
 }
diff --git a/packages/theme/src/radio-group/old-theme.js b/packages/theme/src/radio-group/old-theme.js
new file mode 100644
index 000000000..f0cd8ffa6
--- /dev/null
+++ b/packages/theme/src/radio-group/old-theme.js
@@ -0,0 +1,8 @@
+export const tinyRadioGroupOldTheme = {
+  'ti-radio-button-border-top': 'var(--ti-common-border-weight-normal)',
+  'ti-radio-button-bottom-border-radius': '0',
+  'ti-radio-button-top-border-radius': 'var(--ti-common-space-2)',
+  'ti-radio-button-margin-bottom': '0',
+  'ti-radio-button-border-radius': 'unset',
+  'ti-radio-group-margin-bottom': 'var(--ti-common-space-2x)'
+}
diff --git a/packages/theme/src/radio-group/smb-theme.js b/packages/theme/src/radio-group/smb-theme.js
deleted file mode 100644
index 9305fbf11..000000000
--- a/packages/theme/src/radio-group/smb-theme.js
+++ /dev/null
@@ -1,20 +0,0 @@
-/**
- * Copyright (c) 2022 - present TinyVue Authors.
- * Copyright (c) 2022 - present Huawei Cloud Computing Technologies Co., Ltd.
- *
- * Use of this source code is governed by an MIT-style license.
- *
- * THE OPEN SOURCE SOFTWARE IN THIS PRODUCT IS DISTRIBUTED IN THE HOPE THAT IT WILL BE USEFUL,
- * BUT WITHOUT ANY WARRANTY, WITHOUT EVEN THE IMPLIED WARRANTY OF MERCHANTABILITY OR FITNESS FOR
- * A PARTICULAR PURPOSE. SEE THE APPLICABLE LICENSES FOR MORE DETAILS.
- *
- */
-export const tinyRadioGroupSmbTheme = {
-  'ti-radio-group-margin-bottom': '16px',
-  'ti-radio-button-border-color': 'none',
-  'ti-radio-button-border-radius': '6px',
-  'ti-radio-button-margin-bottom': '2px',
-  'ti-radio-button-top-border-radius': '6px',
-  'ti-radio-button-bottom-border-radius': '6px',
-  'ti-radio-button-border-top': 0
-}
diff --git a/packages/theme/src/radio-group/vars.less b/packages/theme/src/radio-group/vars.less
index a4f97c3f1..1dcdca770 100644
--- a/packages/theme/src/radio-group/vars.less
+++ b/packages/theme/src/radio-group/vars.less
@@ -10,10 +10,10 @@
 *
 */
 .component-css-vars-radio-group() {
-  --ti-radio-group-margin-bottom: var(--ti-common-space-2x);
-  --ti-radio-button-border-radius: unset;
-  --ti-radio-button-margin-bottom: 0;
-  --ti-radio-button-top-border-radius: var(--ti-common-space-2);
-  --ti-radio-button-bottom-border-radius: 0;
-  --ti-radio-button-border-top: var(--ti-common-border-weight-normal);
+  --ti-radio-group-margin-bottom: 16px;
+  --ti-radio-button-border-radius: 6px;
+  --ti-radio-button-margin-bottom: 2px;
+  --ti-radio-button-top-border-radius: 6px;
+  --ti-radio-button-bottom-border-radius: 6px;
+  --ti-radio-button-border-top: 0;
 }
\ No newline at end of file
diff --git a/packages/theme/src/radio/old-theme.js b/packages/theme/src/radio/old-theme.js
new file mode 100644
index 000000000..5917b3128
--- /dev/null
+++ b/packages/theme/src/radio/old-theme.js
@@ -0,0 +1,14 @@
+export const tinyRadioOldTheme = {
+  'ti-radio-button-margin-bottom': 'var(--ti-common-space-2x, 8px)',
+  'ti-radio-inner-checked-hover-bg-color': 'var(--ti-common-color-bg-emphasize, #5e7ce0)',
+  'ti-radio-margin-right': 'calc(var(--ti-common-space-8x, 32px) - 2px)',
+  'ti-radio-inner-checked-disabled-bg-color': 'var(--ti-common-color-bg-secondary, #adb0b8)',
+  'ti-radio-inner-checked-bg-color': 'var(--ti-common-color-bg-emphasize, #5e7ce0)',
+  'ti-radio-input-checked-disabled-bg-color': 'var(--ti-common-color-bg-disabled, #f5f5f6)',
+  'ti-radio-bordered-checked-hover-border-color': 'var(--ti-common-color-line-active, #5e7ce0)',
+  'ti-radio-bordered-hover-border-color': 'var(--ti-common-color-line-active, #5e7ce0)',
+  'ti-radio-bordered-checked-border-color': 'var(--ti-common-color-line-active, #5e7ce0)',
+  'ti-radio-bordered-border-color': 'var(--ti-common-color-line-normal, #adb0b8)',
+  'ti-radio-bordered-height': 'var(--ti-common-size-10x, 40px)',
+  'ti-radio-font-size': 'var(--ti-common-font-size-base, 12px)'
+}
diff --git a/packages/theme/src/radio/smb-theme.js b/packages/theme/src/radio/smb-theme.js
deleted file mode 100644
index 1d1198328..000000000
--- a/packages/theme/src/radio/smb-theme.js
+++ /dev/null
@@ -1,27 +0,0 @@
-/**
- * Copyright (c) 2022 - present TinyVue Authors.
- * Copyright (c) 2022 - present Huawei Cloud Computing Technologies Co., Ltd.
- *
- * Use of this source code is governed by an MIT-style license.
- *
- * THE OPEN SOURCE SOFTWARE IN THIS PRODUCT IS DISTRIBUTED IN THE HOPE THAT IT WILL BE USEFUL,
- * BUT WITHOUT ANY WARRANTY, WITHOUT EVEN THE IMPLIED WARRANTY OF MERCHANTABILITY OR FITNESS FOR
- * A PARTICULAR PURPOSE. SEE THE APPLICABLE LICENSES FOR MORE DETAILS.
- *
- */
-export const tinyRadioSmbTheme = {
-  'ti-radio-margin-right': 'var(--ti-common-space-6x)',
-  'ti-radio-bordered-border-color': 'var(--ti-common-color-line-normal)',
-  'ti-radio-bordered-checked-hover-border-color': '#1476FF',
-  'ti-radio-bordered-hover-border-color': 'var(--ti-common-color-info-hover)',
-  'ti-radio-inner-checked-hover-bg-color': '#1476FF',
-  'ti-radio-input-checked-disabled-bg-color': '#fff',
-  'ti-radio-inner-checked-disabled-bg-color': 'var(--ti-common-color-bg-dark-disabled)',
-  'ti-common-font-size-base': 'var(--ti-common-font-size-1)',
-  'ti-radio-button-margin-bottom': 'var(--ti-common-space-4x)',
-  'ti-radio-inner-checked-bg-color': '#1476FF',
-  'ti-radio-bordered-checked-border-color': '#1476FF',
-  'ti-radio-font-size': 'var(--ti-common-font-size-0)',
-  'ti-radio-button-font-size': 'var(--ti-common-font-size-0)',
-  'ti-radio-bordered-height': 'var(--ti-common-size-height-normal)'
-}
diff --git a/packages/theme/src/radio/vars.less b/packages/theme/src/radio/vars.less
index e3d294bb1..0ce45592e 100644
--- a/packages/theme/src/radio/vars.less
+++ b/packages/theme/src/radio/vars.less
@@ -14,29 +14,29 @@
   // 单选框默认文本色
   --ti-radio-text-color: var(--ti-common-color-text-primary, #252b3a);
   // 单选框字号
-  --ti-radio-font-size: var(--ti-common-font-size-base, 12px);
+  --ti-radio-font-size: var(--ti-common-font-size-0);
   // 带边框类单选框默认高度
-  --ti-radio-bordered-height: var(--ti-common-size-10x, 40px);
+  --ti-radio-bordered-height: var(--ti-common-size-height-normal);
   // 带边框类单选框圆角
   --ti-radio-bordered-border-radius: var(--ti-common-border-radius-normal, 2px);
   // 单选框默认边框色
-  --ti-radio-bordered-border-color: var(--ti-common-color-line-normal, #adb0b8);
+  --ti-radio-bordered-border-color: var(--ti-common-color-line-normal);
   // 单选框默认禁用边框色
   --ti-radio-input-disabled-border-color: var(--ti-common-color-line-disabled, #dfe1e6);
   // 单选框的选中状态时的边框色
-  --ti-radio-bordered-checked-border-color: var(--ti-common-color-line-active, #5e7ce0);
+  --ti-radio-bordered-checked-border-color: #1476FF;
   // 单选框的选中状态时的背景色
   --ti-radio-bordered-checked-background-color: var(--ti-common-color-bg-white-normal, #fff);
   // 单选框的带有边框时悬浮时的边框色
-  --ti-radio-bordered-hover-border-color: var(--ti-common-color-line-active, #5e7ce0);
+  --ti-radio-bordered-hover-border-color: var(--ti-common-color-info-hover);
   // 单选框的带有边框时选中时的边框色
-  --ti-radio-bordered-checked-hover-border-color: var(--ti-common-color-line-active, #5e7ce0);
+  --ti-radio-bordered-checked-hover-border-color: #1476FF;
   // 单选框的带有边框时激活时的边框色
   --ti-radio-bordered-active-border-color: var(--ti-common-color-line-active, #5e7ce0);
   // 单选框的禁用状态时的背景色
   --ti-radio-input-disabled-bg-color: var(--ti-common-color-bg-disabled, #f5f5f6);
   // 单选框为选中且禁用状态时的背景色
-  --ti-radio-input-checked-disabled-bg-color: var(--ti-common-color-bg-disabled, #f5f5f6);
+  --ti-radio-input-checked-disabled-bg-color: #fff;
   // 单选框为选中且禁用状态时的边框色
   --ti-radio-input-checked-disabled-border-color: var(--ti-common-color-line-disabled, #dfe1e6);
   // 单选框为输入框样式时禁用状态时的文本色
@@ -44,11 +44,11 @@
   // 单选框单选按钮的背景色
   --ti-radio-inner-bg-color: var(--ti-common-color-bg-white-normal, #fff);
   // 单选框单选按钮选中时的背景色
-  --ti-radio-inner-checked-bg-color: var(--ti-common-color-bg-emphasize, #5e7ce0);
+  --ti-radio-inner-checked-bg-color: #1476FF;
   // 单选框单选按钮的尺寸
   --ti-radio-inner-size: var(--ti-common-size-2x, 8px);
   // 单选框单选按钮为选中且禁用状态时的背景色
-  --ti-radio-inner-checked-disabled-bg-color: var(--ti-common-color-bg-secondary, #adb0b8);
+  --ti-radio-inner-checked-disabled-bg-color: var(--ti-common-color-bg-dark-disabled);
   // 单选按钮为medium尺寸时的高度
   --ti-radio-medium-height: var(--ti-common-size-height-small, 32px);
   // 单选框单选按钮为medium尺寸时的高度
@@ -84,9 +84,9 @@
   // 单选框单选按钮宽度
   --ti-radio-inner-height: var(--ti-common-size-4x, 16px);
   // 单选组每个选项之间的间距
-  --ti-radio-margin-right: calc(var(--ti-common-space-8x, 32px) - 2px);
+  --ti-radio-margin-right: var(--ti-common-space-6x);
   // 单选框单选按钮选中后悬浮时的背景色
-  --ti-radio-inner-checked-hover-bg-color: var(--ti-common-color-bg-emphasize, #5e7ce0);
+  --ti-radio-inner-checked-hover-bg-color: #1476FF;
   // 单选按钮底部外边距
-  --ti-radio-button-margin-bottom: var(--ti-common-space-2x, 8px);
+  --ti-radio-button-margin-bottom: var(--ti-common-space-4x);
 }
diff --git a/packages/theme/src/scrollbar/old-theme.js b/packages/theme/src/scrollbar/old-theme.js
new file mode 100644
index 000000000..b61a01484
--- /dev/null
+++ b/packages/theme/src/scrollbar/old-theme.js
@@ -0,0 +1,7 @@
+export const tinyScrollbarOldTheme = {
+  'ti-scrollbar-thumb-border-radius': 'inherit',
+  'ti-scrollbar-thumb-hover-bg-color': 'rgba(144, 147, 153, 0.5)',
+  'ti-scrollbar-thumb-bg-color': 'rgba(144, 147, 153, 0.3)',
+  'ti-scrollbar-vertical-width': '6px',
+  'ti-scrollbar-vertical-right': '2px'
+}
diff --git a/packages/theme/src/scrollbar/smb-theme.js b/packages/theme/src/scrollbar/smb-theme.js
deleted file mode 100644
index 0ae1c41d6..000000000
--- a/packages/theme/src/scrollbar/smb-theme.js
+++ /dev/null
@@ -1,7 +0,0 @@
-export const tinyScrollbarSmbTheme = {
-  'ti-scrollbar-vertical-right': '4px',
-  'ti-scrollbar-vertical-width': '8px',
-  'ti-scrollbar-thumb-bg-color': 'var(--ti-common-scrollbar-thumb-bg-color)',
-  'ti-scrollbar-thumb-hover-bg-color': 'var(--ti-common-scrollbar-thumb-bg-color)',
-  'ti-scrollbar-thumb-border-radius': 'var(--ti-common-scrollbar-thumb-border-radius)'
-}
diff --git a/packages/theme/src/scrollbar/vars.less b/packages/theme/src/scrollbar/vars.less
index 5c7c15411..0ba2a303a 100644
--- a/packages/theme/src/scrollbar/vars.less
+++ b/packages/theme/src/scrollbar/vars.less
@@ -24,13 +24,13 @@
 
 .component-css-vars-scrollbar() {
   // 垂直滚动条距离右侧距离
-  --ti-scrollbar-vertical-right: 2px;
+  --ti-scrollbar-vertical-right: 4px;
   // 垂直滚动条宽度
-  --ti-scrollbar-vertical-width: 6px;
+  --ti-scrollbar-vertical-width: 8px;
   // 垂直滚动条滑块背景色
-  --ti-scrollbar-thumb-bg-color: rgba(144, 147, 153, 0.3);
+  --ti-scrollbar-thumb-bg-color: var(--ti-common-scrollbar-thumb-bg-color);
   // 垂直滚动条滑块悬浮时背景色
-  --ti-scrollbar-thumb-hover-bg-color: rgba(144, 147, 153, 0.5);
+  --ti-scrollbar-thumb-hover-bg-color: var(--ti-common-scrollbar-thumb-bg-color);
   // 垂直滚动条滑块圆角
-  --ti-scrollbar-thumb-border-radius: inherit;
+  --ti-scrollbar-thumb-border-radius: var(--ti-common-scrollbar-thumb-border-radius);
 }
diff --git a/packages/theme/src/search/old-theme.js b/packages/theme/src/search/old-theme.js
new file mode 100644
index 000000000..8adf726b8
--- /dev/null
+++ b/packages/theme/src/search/old-theme.js
@@ -0,0 +1,11 @@
+export const tinySearchOldTheme = {
+  'ti-search-selector-box-shadow': 'var(--ti-common-shadow-2-down, 0 2px 8px 0 rgba(0, 0, 0, 0.2))',
+  'ti-search-input-left-svg-margin-right': 'var(--ti-common-space-0, 0px)',
+  'ti-search-input-btn-icon-position-right': 'var(--ti-common-space-10, 10px)',
+  'ti-search-input-btn-close-display': 'none',
+  'ti-search-input-btn-close-margin-right': 'var(--ti-common-space-0, 0px)',
+  'ti-search-input-btn-width': 'var(--ti-common-size-6x, 24px)',
+  'ti-search-input-btn-icon-size': 'var(--ti-common-font-size-1, 14px)',
+  'ti-search-input-btn-hover-icon-color': 'var(--ti-common-color-icon-hover, #5e7ce0)',
+  'ti-search-input-padding-left': 'var(--ti-common-space-2x, 8px)'
+}
diff --git a/packages/theme/src/search/smb-theme.js b/packages/theme/src/search/smb-theme.js
deleted file mode 100644
index 2988195e1..000000000
--- a/packages/theme/src/search/smb-theme.js
+++ /dev/null
@@ -1,12 +0,0 @@
-export const tinySearchSmbTheme = {
-  'ti-search-input-btn-hover-icon-color': 'var(--ti-common-color-icon-hover)',
-  'ti-search-input-padding-left': 'var(--ti-common-space-3x)',
-  'ti-search-input-btn-icon-position-right': 'var(--ti-common-space-3x)',
-  'ti-search-selector-box-shadow': 'var(--ti-common-shadow-3-up)',
-  'ti-search-input-btn-icon-size': 'var(--ti-common-font-size-2)',
-  'ti-search-input-placeholder-text-color': 'var(--ti-common-color-placeholder)',
-  'ti-search-input-left-svg-margin-right': 'calc(0px - var(--ti-common-space-2x))',
-  'ti-search-input-btn-width': 'var(--ti-common-size-7x)',
-  'ti-search-input-btn-close-display': 'inline-block',
-  'ti-search-input-btn-close-margin-right': '-3px'
-}
diff --git a/packages/theme/src/search/vars.less b/packages/theme/src/search/vars.less
index 98ca88e2b..69501aebd 100644
--- a/packages/theme/src/search/vars.less
+++ b/packages/theme/src/search/vars.less
@@ -16,7 +16,7 @@
   // 搜索框高度
   --ti-search-input-height: var(--ti-common-size-height-normal, 28px);
   // 搜索框左内边距
-  --ti-search-input-padding-left: var(--ti-common-space-2x, 8px);
+  --ti-search-input-padding-left: var(--ti-common-space-3x);
   // 搜索框边框色
   --ti-search-input-border-color: var(--ti-common-color-line-normal, #adb0b8);
   // 搜索框聚焦时边框色
@@ -35,23 +35,23 @@
   // 搜索按钮图标色
   --ti-search-input-btn-icon-color: var(--ti-common-color-icon-normal, #575d6c);
   // 搜索按钮悬浮图标色
-  --ti-search-input-btn-hover-icon-color: var(--ti-common-color-icon-hover, #5e7ce0);
+  --ti-search-input-btn-hover-icon-color: var(--ti-common-color-icon-hover);
   // 搜索按钮图标尺寸
-  --ti-search-input-btn-icon-size: var(--ti-common-font-size-1, 14px);
+  --ti-search-input-btn-icon-size: var(--ti-common-font-size-2);
   // 搜索按钮宽度(hide)
-  --ti-search-input-btn-width: var(--ti-common-size-6x, 24px);
+  --ti-search-input-btn-width: var(--ti-common-size-7x);
   // 搜索关闭按钮右边距(hide)
-  --ti-search-input-btn-close-margin-right: var(--ti-common-space-0, 0px);
+  --ti-search-input-btn-close-margin-right: -3px;
   // 搜索关闭按钮显示方式(hide)
-  --ti-search-input-btn-close-display: none;
+  --ti-search-input-btn-close-display: inline-block;
   // 搜索框按钮行高(hide)
   --ti-search-input-btn-line-height: var(--ti-search-input-height);
   // 搜索图标边框色(hide)
   --ti-search-icon-border-color: var(--ti-common-color-line-normal, #adb0b8);
   // 搜索按钮图标与右边框距离(hide)
-  --ti-search-input-btn-icon-position-right: var(--ti-common-space-10, 10px);
+  --ti-search-input-btn-icon-position-right: var(--ti-common-space-3x);
   // 左侧搜索按钮图标右外边距
-  --ti-search-input-left-svg-margin-right: var(--ti-common-space-0, 0px);
+  --ti-search-input-left-svg-margin-right: calc(0px - var(--ti-common-space-2x));
   // 左侧搜索按钮图标左外边距
   --ti-search-input-left-svg-margin-left: var(--ti-common-space-3x, 12px);
 
@@ -73,7 +73,7 @@
   // 搜索下拉框背景色
   --ti-search-selector-bg-color: var(--ti-common-color-bg-white-normal, #fff);
   // 搜索下拉框阴影
-  --ti-search-selector-box-shadow: var(--ti-common-shadow-2-down, 0 2px 8px 0 rgba(0, 0, 0, 0.2));
+  --ti-search-selector-box-shadow: var(--ti-common-shadow-3-up);
   // 搜索下拉框最小宽度
   --ti-search-selector-box-min-width: var(--ti-common-size-20x, 80px);
   // 搜索下拉框上外边距
diff --git a/packages/theme/src/select-dropdown/old-theme.js b/packages/theme/src/select-dropdown/old-theme.js
new file mode 100644
index 000000000..26e5168b0
--- /dev/null
+++ b/packages/theme/src/select-dropdown/old-theme.js
@@ -0,0 +1,30 @@
+export const tinySelectDropdownOldTheme = {
+  'ti-select-dropdown-icon-color': 'var(--ti-common-color-icon-normal, #575d6c)',
+  'ti-select-dropdown-icon-size': 'var(--ti-common-font-size-1, 14px)',
+  'ti-select-dropdown-wrap-padding-bottom': 'var(--ti-common-space-0, 0px)',
+  'ti-select-dropdown-search-empty-padding-bottom': 'var(--ti-common-space-6, 6px)',
+  'ti-select-dropdown-search-empty-padding-top': 'var(--ti-common-space-6, 6px)',
+  'ti-select-dropdown-search-input-padding-left': 'var(--ti-common-space-2x, 8px)',
+  'ti-select-dropdown-search-input-padding-right': '54px',
+  'ti-select-dropdown-search-prefix-display': 'none',
+  'ti-select-dropdown-search-suffix-display': "'block'",
+  'ti-select-dropdown-search-border-width': 'var(--ti-common-size-0, 0px)',
+  'ti-select-dropdown-search-width': '100%',
+  'ti-select-dropdown-search-margin-right': 'var(--ti-common-size-0, 0px)',
+  'ti-select-dropdown-search-margin-left': 'var(--ti-common-size-0, 0px)',
+  'ti-select-dropdown-search-margin-bottom': 'var(--ti-common-space-base, 4px)',
+  'ti-select-dropdown-search-margin-top': 'calc(-1 * var(--ti-common-size-base))',
+  'ti-select-dropdown-search-bg-color': 'var(--ti-common-color-bg-white-emphasize, #f2f5fc)',
+  'ti-select-dropdown-padding-bottom': 'var(--ti-common-space-base, 4px)',
+  'ti-select-dropdown-padding-top': 'var(--ti-common-size-base, 4px)',
+  'ti-select-dropdown-empty-padding-vertical': 'var(--ti-common-space-6, 6px)',
+  'ti-select-dropdown-empty-padding-horizontal': 'var(--ti-common-space-10, 10px)',
+  'ti-select-dropdown-empty-font-size': 'var(--ti-common-font-size-1, 14px)',
+  'ti-select-dropdown-empty-text-color': 'var(--ti-common-color-placeholder, #adb0b8)',
+  'ti-select-dropdown-max-height': 'calc(30px * 8 + 8px)',
+  'ti-select-dropdown-margin-bottom': 'var(--ti-common-dropdown-gap, 2px)',
+  'ti-select-dropdown-margin-top': 'var(--ti-common-dropdown-gap, 2px)',
+  'ti-select-dropdown-item-padding-horizontal': 'var(--ti-common-space-2x, 8px)',
+  'ti-select-dropdown-box-shadow': 'var(--ti-common-shadow-2-down, 0 2px 8px 0 rgba(0, 0, 0, 0.2))',
+  'ti-select-dropdown-border-radius': 'var(--ti-common-border-radius-normal, 2px)'
+}
diff --git a/packages/theme/src/select-dropdown/smb-theme.js b/packages/theme/src/select-dropdown/smb-theme.js
deleted file mode 100644
index 86419ffbf..000000000
--- a/packages/theme/src/select-dropdown/smb-theme.js
+++ /dev/null
@@ -1,30 +0,0 @@
-export const tinySelectDropdownSmbTheme = {
-  'ti-select-dropdown-border-radius': 'var(--ti-common-border-radius-3)',
-  'ti-select-dropdown-empty-text-color': 'var(--ti-common-color-text-secondary)',
-  'ti-select-dropdown-empty-padding-horizontal': 'var(--ti-common-size-0)',
-  'ti-select-dropdown-empty-padding-vertical': '46px',
-  'ti-select-dropdown-empty-font-size': 'var(--ti-common-font-size-0)',
-  'ti-select-dropdown-margin-top': 'var(--ti-common-space-base)',
-  'ti-select-dropdown-margin-bottom': '0',
-  'ti-select-dropdown-box-shadow': 'var(--ti-common-shadow-2-down)',
-  'ti-select-dropdown-padding-top': 'var(--ti-common-space-2x)',
-  'ti-select-dropdown-padding-bottom': 'var(--ti-common-space-2x)',
-  'ti-select-dropdown-max-height': 'calc(32px * 7 + 8px)',
-  'ti-select-dropdown-search-margin-left': 'var(--ti-common-space-4x)',
-  'ti-select-dropdown-search-margin-right': 'var(--ti-common-space-4x)',
-  'ti-select-dropdown-search-margin-top': '0',
-  'ti-select-dropdown-search-margin-bottom': 'var(--ti-common-space-2x)',
-  'ti-select-dropdown-search-width': 'calc(100% - var(--ti-common-space-4x)*2)',
-  'ti-select-dropdown-search-bg-color': 'var(--ti-common-color-bg-white-normal)',
-  'ti-select-dropdown-search-border-width': 'var(--ti-common-border-weight-normal)',
-  'ti-select-dropdown-search-suffix-display': 'none',
-  'ti-select-dropdown-search-prefix-display': 'block',
-  'ti-select-dropdown-search-input-padding-right': 'var(--ti-common-space-3x)',
-  'ti-select-dropdown-search-input-padding-left': 'var(--ti-common-space-5x)',
-  'ti-select-dropdown-search-empty-padding-top': 'var(--ti-common-space-3x)',
-  'ti-select-dropdown-search-empty-padding-bottom': 'var(--ti-common-space-2x)',
-  'ti-select-dropdown-wrap-padding-bottom': 'var(--ti-common-space-0)',
-  'ti-select-dropdown-icon-size': 'var(--ti-common-font-size-2)',
-  'ti-select-dropdown-icon-color': 'var(--ti-common-color-icon-normal)',
-  'ti-select-dropdown-item-padding-horizontal': 'var(--ti-common-space-4x)'
-}
diff --git a/packages/theme/src/select-dropdown/vars.less b/packages/theme/src/select-dropdown/vars.less
index 9956435d4..d757e0476 100644
--- a/packages/theme/src/select-dropdown/vars.less
+++ b/packages/theme/src/select-dropdown/vars.less
@@ -18,26 +18,26 @@
   // 选择下拉框边框的样式
   --ti-select-dropdown-border-style: var(--ti-common-border-style-solid, solid);
   // 选择下拉框边框圆角
-  --ti-select-dropdown-border-radius: var(--ti-common-border-radius-normal, 2px);
+  --ti-select-dropdown-border-radius: var(--ti-common-border-radius-3);
   // 选择下拉框背景色
   --ti-select-dropdown-bg-color: var(--ti-common-color-light, #fff);
   // 选择下拉框的阴影
-  --ti-select-dropdown-box-shadow: var(--ti-common-shadow-2-down, 0 2px 8px 0 rgba(0, 0, 0, 0.2));
+  --ti-select-dropdown-box-shadow: var(--ti-common-shadow-2-down);
   // 下拉选项水平内边距
-  --ti-select-dropdown-item-padding-horizontal: var(--ti-common-space-2x, 8px);
+  --ti-select-dropdown-item-padding-horizontal: var(--ti-common-space-4x);
   // 选择下拉框的顶部外边距
-  --ti-select-dropdown-margin-top: var(--ti-common-dropdown-gap, 2px);
-  --ti-select-dropdown-margin-bottom: var(--ti-common-dropdown-gap, 2px);
+  --ti-select-dropdown-margin-top: var(--ti-common-space-base);
+  --ti-select-dropdown-margin-bottom: 0;
   // 下拉面板的最大高度
-  --ti-select-dropdown-max-height: calc(30px * 8 + 8px);
+  --ti-select-dropdown-max-height: calc(32px * 7 + 8px);
   // 远程搜索数据为空时下拉框文本色（hide）
-  --ti-select-dropdown-empty-text-color: var(--ti-common-color-placeholder, #adb0b8);
+  --ti-select-dropdown-empty-text-color: var(--ti-common-color-text-secondary);
   // 下拉面板空数据提示文本字号
-  --ti-select-dropdown-empty-font-size: var(--ti-common-font-size-1, 14px);
+  --ti-select-dropdown-empty-font-size: var(--ti-common-font-size-0);
   // 下拉面板空数据提示垂直内边距
-  --ti-select-dropdown-empty-padding-horizontal: var(--ti-common-space-10, 10px);
+  --ti-select-dropdown-empty-padding-horizontal: var(--ti-common-size-0);
   // 下拉面板空数据提示水平内边距
-  --ti-select-dropdown-empty-padding-vertical: var(--ti-common-space-6, 6px);
+  --ti-select-dropdown-empty-padding-vertical: 46px;
   // 下拉面板空数据图片宽度
   --ti-select-dropdown-empty-image-width: var(--ti-common-size-16x, 64px);
   // 下拉面板空数据图片高度
@@ -47,13 +47,13 @@
   // 下拉面板空数据提示文本行高
   --ti-select-dropdown-empty-line-height: var(--ti-common-line-height-number, 1.5);
   // 选择下拉框的顶部内边距
-  --ti-select-dropdown-padding-top: var(--ti-common-size-base, 4px);
+  --ti-select-dropdown-padding-top: var(--ti-common-space-2x);
   // 选择下拉框的水平内边距
   --ti-select-dropdown-padding-horizontal: var(--ti-common-size-0, 0px);
   // 选择下拉框的底部内边距
-  --ti-select-dropdown-padding-bottom: var(--ti-common-space-base, 4px);
+  --ti-select-dropdown-padding-bottom: var(--ti-common-space-2x);
   // 下拉面板搜索框背景色（hide）
-  --ti-select-dropdown-search-bg-color: var(--ti-common-color-bg-white-emphasize, #f2f5fc);
+  --ti-select-dropdown-search-bg-color: var(--ti-common-color-bg-white-normal);
   // 选择下拉框line背景色
   --ti-select-dropdown-line-bg-color: var(--ti-common-color-line-dividing, #dfe1e6);
   // 选择下拉框line垂直外边距
@@ -67,17 +67,17 @@
   // 选择下拉框悬浮图标色
   --ti-select-dropdown-svg-hover-bg-color: var(--ti-common-color-primary-normal, #5e7ce0);
   // 下拉面板搜索框顶部外边距
-  --ti-select-dropdown-search-margin-top: calc(-1 * var(--ti-common-size-base));
+  --ti-select-dropdown-search-margin-top: 0;
   // 下拉面板搜索框底部外边距
-  --ti-select-dropdown-search-margin-bottom: var(--ti-common-space-base, 4px);
+  --ti-select-dropdown-search-margin-bottom: var(--ti-common-space-2x);
   // 下拉面板搜索框左侧外边距
-  --ti-select-dropdown-search-margin-left: var(--ti-common-size-0, 0px);
+  --ti-select-dropdown-search-margin-left: var(--ti-common-space-4x);
   // 下拉面板搜索框右侧外边距
-  --ti-select-dropdown-search-margin-right: var(--ti-common-size-0, 0px);
+  --ti-select-dropdown-search-margin-right: var(--ti-common-space-4x);
   // 下拉面板搜索框的宽度
-  --ti-select-dropdown-search-width: 100%;
+  --ti-select-dropdown-search-width: calc(100% - var(--ti-common-space-4x)*2);
   // 下拉面板搜索框的边框宽度
-  --ti-select-dropdown-search-border-width: var(--ti-common-size-0, 0px);
+  --ti-select-dropdown-search-border-width: var(--ti-common-border-weight-normal);
   // 下拉面板搜索框的边框圆角
   --ti-select-dropdown-search-border-radius: var(--ti-common-border-radius-0, 0px);
   // 下拉面板搜索框的左边框色
@@ -89,25 +89,25 @@
   // 下拉面板搜索框的底部框色
   --ti-select-dropdown-search-border-color-bottom: var(--ti-common-color-line-dividing, #dfe1e6);
   // 下拉面板搜索框尾部图标显示状态
-  --ti-select-dropdown-search-suffix-display: 'block';
+  --ti-select-dropdown-search-suffix-display: none;
   // 下拉面板搜索框头部图标显示状态
-  --ti-select-dropdown-search-prefix-display: none;
+  --ti-select-dropdown-search-prefix-display: block;
   // 下拉面板搜索框高度
   --ti-select-dropdown-search-height: 28px;
   // 下拉面板搜索框右侧内边距
-  --ti-select-dropdown-search-input-padding-right: 54px;
+  --ti-select-dropdown-search-input-padding-right: var(--ti-common-space-3x);
   // 下拉面板搜索框左侧外边距
-  --ti-select-dropdown-search-input-padding-left: var(--ti-common-space-2x, 8px);
+  --ti-select-dropdown-search-input-padding-left: var(--ti-common-space-5x);
   // 面板可搜索的时候空数据容器顶部内边距
-  --ti-select-dropdown-search-empty-padding-top: var(--ti-common-space-6, 6px);
+  --ti-select-dropdown-search-empty-padding-top: var(--ti-common-space-3x);
   // 面板可搜索的时候空数据容器底部内边距
-  --ti-select-dropdown-search-empty-padding-bottom: var(--ti-common-space-6, 6px);
+  --ti-select-dropdown-search-empty-padding-bottom: var(--ti-common-space-2x);
   // 滚动容器的底部外边距
-  --ti-select-dropdown-wrap-padding-bottom: var(--ti-common-space-0, 0px);
+  --ti-select-dropdown-wrap-padding-bottom: var(--ti-common-space-0);
   // 下拉面板图标尺寸
-  --ti-select-dropdown-icon-size: var(--ti-common-font-size-1, 14px);
+  --ti-select-dropdown-icon-size: var(--ti-common-font-size-2);
   // 下拉面板图标颜色
-  --ti-select-dropdown-icon-color: var(--ti-common-color-icon-normal, #575d6c);
+  --ti-select-dropdown-icon-color: var(--ti-common-color-icon-normal);
   // 下拉面板新增按钮的文本色
   --ti-select-dropdown-top-create-text-color: var(--ti-common-color-text-link);
   // 下拉面板新增按钮的文本悬浮色
diff --git a/packages/theme/src/select/old-theme.js b/packages/theme/src/select/old-theme.js
new file mode 100644
index 000000000..6019db930
--- /dev/null
+++ b/packages/theme/src/select/old-theme.js
@@ -0,0 +1,16 @@
+export const tinySelectOldTheme = {
+  'ti-select-collapse-button-text-icon-color': 'var(--ti-common-color-primary-normal, #5e7ce0)',
+  'ti-select-tags-padding-right-disabled': 'var(--ti-common-size-7x, 28px)',
+  'ti-select-tags-max-height': 'var(--ti-common-size-24x, 96px)',
+  'ti-select-tags-height': 'calc(var(--ti-common-size-base) * 7)',
+  'ti-select-tags-margin-left': 'var(--ti-common-space-1, 1px)',
+  'ti-select-tags-margin-bottom': 'var(--ti-common-space-1, 1px)',
+  'ti-select-tags-margin-right': 'var(--ti-common-space-1, 1px)',
+  'ti-select-tags-margin-top': 'var(--ti-common-space-1, 1px)',
+  'ti-select-tags-wrap-padding-bottom': 'calc(var(--ti-common-space-1, 1px) * 2)',
+  'ti-select-tags-wrap-padding-top': 'calc(var(--ti-common-space-1, 1px) * 2)',
+  'ti-select-tags-wrap-padding-left': 'calc(var(--ti-common-space-1, 1px) * 2)',
+  'ti-select-input-caret-font-size': '10px',
+  'ti-select-input-caret-hover-icon-color': 'var(--ti-common-color-icon-hover, #5e7ce0)',
+  'ti-select-input-caret-icon-color': 'var(--ti-common-color-text-secondary, #575d6c)'
+}
diff --git a/packages/theme/src/select/smb-theme.js b/packages/theme/src/select/smb-theme.js
deleted file mode 100644
index c6fe1d833..000000000
--- a/packages/theme/src/select/smb-theme.js
+++ /dev/null
@@ -1,17 +0,0 @@
-export const tinySelectSmbTheme = {
-  'ti-select-input-caret-font-size': 'var(--ti-common-font-size-2)',
-  'ti-select-input-caret-hover-icon-color': 'var(--ti-common-color-icon-graybg-hover)',
-  'ti-select-input-caret-icon-color': 'var(--ti-common-color-icon-normal)',
-  'ti-select-tags-height': 'var(--ti-common-space-8x)',
-  'ti-select-tags-wrap-padding-left': 'var(--ti-common-space-2)',
-  'ti-select-tags-wrap-padding-top': 'var(--ti-common-space-2)',
-  'ti-select-tags-wrap-padding-bottom': 'var(--ti-common-space-2)',
-
-  'ti-select-tags-margin-left': 'var(--ti-common-space-2)',
-  'ti-select-tags-margin-right': 'var(--ti-common-space-2)',
-  'ti-select-tags-margin-top': 'var(--ti-common-space-2)',
-  'ti-select-tags-margin-bottom': 'var(--ti-common-space-2)',
-  'ti-select-tags-max-height': 'none',
-  'ti-select-tags-padding-right-disabled': 'var(--ti-common-space-8x)',
-  'ti-select-collapse-button-text-icon-color': 'var(--ti-common-color-text-link)'
-}
diff --git a/packages/theme/src/select/vars.less b/packages/theme/src/select/vars.less
index 2f29e1fa3..677a22fad 100644
--- a/packages/theme/src/select/vars.less
+++ b/packages/theme/src/select/vars.less
@@ -19,11 +19,11 @@
   --ti-select-input-font-size: var(--ti-common-font-size-base, 12px);
 
   // 选择器输入框尾部图标的颜色
-  --ti-select-input-caret-icon-color: var(--ti-common-color-text-secondary, #575d6c);
+  --ti-select-input-caret-icon-color: var(--ti-common-color-icon-normal);
   // 选择器输入框尾部图标悬浮时的颜色
-  --ti-select-input-caret-hover-icon-color: var(--ti-common-color-icon-hover, #5e7ce0);
+  --ti-select-input-caret-hover-icon-color: var(--ti-common-color-icon-graybg-hover);
   // 选择器输入框尾部图标的尺寸
-  --ti-select-input-caret-font-size: 10px;
+  --ti-select-input-caret-font-size: var(--ti-common-font-size-2);
   // 选择器输入框尾部关闭图标右侧外边距
   --ti-select-input-icon-close-margin-right: var(--ti-common-space-0, 0px);
   // 选择器输入框尾部图标禁用时的颜色（hide）
@@ -39,27 +39,27 @@
   // 中型选择器输入框高度（hide）
   --ti-select-input-medium-height: var(--ti-common-size-42);
   // 选择器多选标签容器的左侧内边距
-  --ti-select-tags-wrap-padding-left: calc(var(--ti-common-space-1, 1px) * 2);
+  --ti-select-tags-wrap-padding-left: var(--ti-common-space-2);
   // 选择器多选标签容器的顶部内边距
-  --ti-select-tags-wrap-padding-top: calc(var(--ti-common-space-1, 1px) * 2);
+  --ti-select-tags-wrap-padding-top: var(--ti-common-space-2);
   // 选择器多选标签容器的底部内边距
-  --ti-select-tags-wrap-padding-bottom: calc(var(--ti-common-space-1, 1px) * 2);
+  --ti-select-tags-wrap-padding-bottom: var(--ti-common-space-2);
   // 选择器多选标签容器的右侧内边距
   --ti-select-tags-wrap-padding-right: var(--ti-common-space-0, 0px);
   // 选择器多选标签顶部外边距
-  --ti-select-tags-margin-top: var(--ti-common-space-1, 1px);
+  --ti-select-tags-margin-top: var(--ti-common-space-2);
   // 选择器多选标签右侧外边距
-  --ti-select-tags-margin-right: var(--ti-common-space-1, 1px);
+  --ti-select-tags-margin-right: var(--ti-common-space-2);
   // 选择器多选标签底部外边距
-  --ti-select-tags-margin-bottom: var(--ti-common-space-1, 1px);
+  --ti-select-tags-margin-bottom: var(--ti-common-space-2);
   // 选择器多选标签左侧外边距
-  --ti-select-tags-margin-left: var(--ti-common-space-1, 1px);
+  --ti-select-tags-margin-left: var(--ti-common-space-2);
   // 选择器多选标签单行的高度
-  --ti-select-tags-height: calc(var(--ti-common-size-base) * 7);
+  --ti-select-tags-height: var(--ti-common-space-8x);
   // 选择器多选标签最大高度
-  --ti-select-tags-max-height: var(--ti-common-size-24x, 96px);
+  --ti-select-tags-max-height: none;
   // 多选禁用时右侧内边距
-  --ti-select-tags-padding-right-disabled: var(--ti-common-size-7x, 28px);
+  --ti-select-tags-padding-right-disabled: var(--ti-common-space-8x);
   // 多选禁用文本色
   --ti-select-tags-text-color-disabled: var(--ti-common-color-text-disabled, #adb0b8);
   // 选择器后缀图标显示状态
@@ -71,7 +71,7 @@
   // 选择器suffix文本色
   --ti-select-suffix-text-color: var(--ti-common-color-text-weaken, #8a8e99);
   // 收起按钮文本与图标色(hide)
-  --ti-select-collapse-button-text-icon-color: var(--ti-common-color-primary-normal, #5e7ce0);
+  --ti-select-collapse-button-text-icon-color: var(--ti-common-color-text-link);
   // 收起按钮图标左边距(hide)
   --ti-select-collapse-button-icon-margin-left: var(--ti-common-space-2, 2px);
   // 收起按钮字号(hide)
diff --git a/packages/theme/src/skeleton-item/old-theme.js b/packages/theme/src/skeleton-item/old-theme.js
new file mode 100644
index 000000000..79cb119ba
--- /dev/null
+++ b/packages/theme/src/skeleton-item/old-theme.js
@@ -0,0 +1,7 @@
+export const tinySkeletonItemOldTheme = {
+  'ti-skeleton-item-linear-gradient':
+    'linear-gradient(100deg, rgba(255, 255, 255, 0) 40%, rgba(255, 255, 255, 0.5) 50%, rgba(255, 255, 255, 0) 60%) #f2f2f3',
+  'ti-skeleton-item-image-icon-color': 'var(--ti-common-color-icon-darkbg-normal, #adb0b8)',
+  'ti-skeleton-item-border-radius': 'var(--ti-common-border-radius-1)',
+  'ti-skeleton-item-bg-color': 'var(--ti-base-color-bg-5, #f5f5f6)'
+}
diff --git a/packages/theme/src/skeleton-item/smb-theme.js b/packages/theme/src/skeleton-item/smb-theme.js
deleted file mode 100644
index 727209dd5..000000000
--- a/packages/theme/src/skeleton-item/smb-theme.js
+++ /dev/null
@@ -1,6 +0,0 @@
-export const tinySkeletonItemSmbTheme = {
-  'ti-skeleton-item-border-radius': '2px',
-  'ti-skeleton-item-bg-color': 'var(--ti-common-color-bg-normal)',
-  'ti-skeleton-item-image-icon-color': 'var(--ti-common-color-bg-normal)',
-  'ti-skeleton-item-linear-gradient': 'linear-gradient(to right, #fafafa, #ebebeb, #fafafa)'
-}
diff --git a/packages/theme/src/skeleton-item/vars.less b/packages/theme/src/skeleton-item/vars.less
index fb16970a7..942303715 100644
--- a/packages/theme/src/skeleton-item/vars.less
+++ b/packages/theme/src/skeleton-item/vars.less
@@ -1,10 +1,10 @@
 .component-css-vars-skeleton-item() {
   // 骨架屏元素背景设置
-  --ti-skeleton-item-bg-color: var(--ti-base-color-bg-5, #f5f5f6);
+  --ti-skeleton-item-bg-color: var(--ti-common-color-bg-normal);
   // 骨架屏元素半径设置
-  --ti-skeleton-item-border-radius: var(--ti-common-border-radius-1);
+  --ti-skeleton-item-border-radius: 2px;
   // 图片颜色设置
-  --ti-skeleton-item-image-icon-color: var(--ti-common-color-icon-darkbg-normal, #adb0b8);
+  --ti-skeleton-item-image-icon-color: var(--ti-common-color-bg-normal);
   // 方形高度设置
   --ti-skeleton-item-square-height: var(--ti-common-size-4x);
   // 圆角半径设置
@@ -28,5 +28,5 @@
   // 大图片宽度设置
   --ti-skeleton-item-image-large-size-width: var(--ti-common-size-50x);
   // 渐变颜色设置(hide)
-  --ti-skeleton-item-linear-gradient: linear-gradient(100deg, rgba(255, 255, 255, 0) 40%, rgba(255, 255, 255, 0.5) 50%, rgba(255, 255, 255, 0) 60%) #f2f2f3;
+  --ti-skeleton-item-linear-gradient: linear-gradient(to right, #fafafa, #ebebeb, #fafafa);
 }
diff --git a/packages/theme/src/skeleton/old-theme.js b/packages/theme/src/skeleton/old-theme.js
new file mode 100644
index 000000000..1d252af96
--- /dev/null
+++ b/packages/theme/src/skeleton/old-theme.js
@@ -0,0 +1,6 @@
+export const tinySkeletonOldTheme = {
+  'ti-skeleton-rows-margin-bottom': 'var(--ti-common-space-3x)',
+  'ti-skeleton-rows-margin-top': 'var(--ti-common-space-3x)',
+  'ti-skeleton-title-height': 'var(--ti-common-space-4x)',
+  'ti-skeleton-title-width': '40%'
+}
diff --git a/packages/theme/src/skeleton/smb-theme.js b/packages/theme/src/skeleton/smb-theme.js
deleted file mode 100644
index f7b021e22..000000000
--- a/packages/theme/src/skeleton/smb-theme.js
+++ /dev/null
@@ -1,6 +0,0 @@
-export const tinySkeletonSmbTheme = {
-  'ti-skeleton-title-width': '20%',
-  'ti-skeleton-title-height': 'var(--ti-common-space-6x)',
-  'ti-skeleton-rows-margin-top': 'var(--ti-common-space-6x)',
-  'ti-skeleton-rows-margin-bottom': 'var(--ti-common-space-6x)'
-}
diff --git a/packages/theme/src/skeleton/vars.less b/packages/theme/src/skeleton/vars.less
index c45b876b0..dd615295c 100644
--- a/packages/theme/src/skeleton/vars.less
+++ b/packages/theme/src/skeleton/vars.less
@@ -3,10 +3,10 @@
   --ti-skeleton-avatar-background-color: var(--ti-common-color-bg-disabled, #f5f5f6);
   --ti-skeleton-avatar-margin-right: var(--ti-common-space-4x, 16px);
   --ti-skeleton-title-margin-bottom: var(--ti-common-space-4x, 16px);
-  --ti-skeleton-title-width: 40%;
+  --ti-skeleton-title-width: 20%;
   --ti-skeleton-row-margin-bottom: var(--ti-common-space-3x, 12px);
   --ti-skeleton-last-row-width: 60%;
-  --ti-skeleton-title-height: var(--ti-common-space-4x);
-  --ti-skeleton-rows-margin-top: var(--ti-common-space-3x);
-  --ti-skeleton-rows-margin-bottom: var(--ti-common-space-3x);
+  --ti-skeleton-title-height: var(--ti-common-space-6x);
+  --ti-skeleton-rows-margin-top: var(--ti-common-space-6x);
+  --ti-skeleton-rows-margin-bottom: var(--ti-common-space-6x);
 }
diff --git a/packages/theme/src/slider/old-theme.js b/packages/theme/src/slider/old-theme.js
new file mode 100644
index 000000000..f247bab10
--- /dev/null
+++ b/packages/theme/src/slider/old-theme.js
@@ -0,0 +1,31 @@
+export const tinySliderOldTheme = {
+  'ti-slider-margin-left': 'calc(var(--ti-common-space-6, 6px) * -1)',
+  'ti-slider-tips-text-color': 'var(--ti-common-color-text-white, #fff)',
+  'ti-slider-input-text-align': 'center',
+  'ti-slider-input-unit-margin-left': 'var(--ti-common-space-2x, 8px)',
+  'ti-slider-input-margin-left': 'var(--ti-common-size-3x, 12px)',
+  'ti-slider-input-width': 'var(--ti-common-size-10x, 40px)',
+  'ti-slider-handle-disabled-border-color': 'var(--ti-common-color-text-disabled)',
+  'ti-slider-handle-icon-disabled-fill-color': 'var(--ti-common-color-text-disabled)',
+  'ti-slider-handle-margin-top': 'calc(var(--ti-common-space-10, 10px) * -1)',
+  'ti-slider-handle-icon-fill-color': 'var(--ti-common-color-line-active, #5e7ce0)',
+  'ti-slider-handle-icon-display': 'inline-block',
+  'ti-slider-handle-border-weight-hover': 'var(--ti-common-border-weight-normal, 1px)',
+  'ti-slider-handle-box-shadow': 'var(--ti-common-shadow-1-down, 0 1px 4px 0 rgba(0, 0, 0, 0.1))',
+  'ti-slider-handle-border-color-hover': 'var(--ti-common-color-bg-hover, #344899)',
+  'ti-slider-handle-border-radius': 'calc(var(--ti-common-border-radius-2, 8px) + 2px)',
+  'ti-slider-handle-border-color': 'var(--ti-common-color-line-active, #5e7ce0)',
+  'ti-slider-handle-bg-color':
+    'linear-gradient(\n    153deg,\n    var(--ti-common-color-icon-white, #fff),\n    var(--ti-common-color-bg-light-normal, #e9edfa) 99%\n  )',
+  'ti-slider-handle-height': 'var(--ti-common-size-7x, 28px)',
+  'ti-slider-handle-width': 'var(--ti-common-size-5x, 20px)',
+  'ti-slider-range-disabled-bg-color': 'var(--ti-common-color-text-disabled)',
+  'ti-slider-range-margin-top': 'calc(-1 * var(--ti-common-space-base))',
+  'ti-slider-range-hover-bg-color': 'var(--ti-common-color-icon-hover, #5e7ce0)',
+  'ti-slider-range-bg-color': 'var(--ti-common-color-icon-hover, #5e7ce0)',
+  'ti-slider-range-border-radius': 'var(--ti-common-border-radius-normal, 2px)',
+  'ti-slider-range-height': 'var(--ti-common-size-4x, 16px)',
+  'ti-slider-border-radius': 'var(--ti-common-border-radius-normal, 2px)',
+  'ti-slider-height': 'var(--ti-common-size-2x, 8px)',
+  'ti-slider-bg-color': 'var(--ti-common-color-bg-light-normal, #e9edfa)'
+}
diff --git a/packages/theme/src/slider/smb-theme.js b/packages/theme/src/slider/smb-theme.js
deleted file mode 100644
index a45a386a4..000000000
--- a/packages/theme/src/slider/smb-theme.js
+++ /dev/null
@@ -1,39 +0,0 @@
-export const tinySliderSmbTheme = {
-  'ti-slider-border-radius': 'var(--ti-common-border-radius-2)',
-  'ti-slider-bg-color': 'var(--ti-common-color-bg-normal)',
-  'ti-slider-height': 'var(--ti-common-space-2x)',
-  'ti-slider-margin-left': 'calc(var(--ti-common-space-base) * -1)',
-
-  'ti-slider-range-bg-color': 'var(--ti-common-color-data-1)',
-  'ti-slider-range-hover-bg-color': 'var(--ti-common-color-data-1)',
-  'ti-slider-range-height': 'var(--ti-common-space-2x)',
-  'ti-slider-range-margin-top': '0',
-  'ti-slider-range-border-radius': 'var(--ti-common-border-radius-2)',
-  'ti-slider-range-disabled-bg-color': 'var(--ti-common-color-bg-secondary)',
-
-  'ti-slider-handle-width': 'var(--ti-common-space-6x)',
-  'ti-slider-handle-height': 'var(--ti-common-space-6x)',
-  'ti-slider-handle-border-color': 'var(--ti-common-color-line-disabled)',
-  'ti-slider-handle-border-color-hover': 'var(--ti-common-color-data-1)',
-  'ti-slider-handle-box-shadow': '0 1px 4px 0 rgba(0, 0, 0, 0.08)', // 没有这个变量
-  'ti-slider-handle-margin-top': 'calc(var(--ti-common-space-2x) * -1)',
-  'ti-slider-handle-icon-fill-color': 'var(--ti-common-color-data-1)',
-  'ti-slider-handle-border-radius': 'var(--ti-common-border-radius-5)',
-  'ti-slider-handle-icon-disabled-fill-color': 'var(--ti-common-color-icon-disabled)',
-  'ti-slider-handle-disabled-border-color': 'var(--ti-common-color-icon-disabled)',
-  'ti-slider-handle-icon-display': 'none',
-  'ti-slider-handle-bg-color': 'var(--ti-common-color-bg-white-normal)',
-  'ti-slider-handle-border-weight-hover': 'var(--ti-common-border-weight-1)',
-
-  'ti-slider-tips-text-color': 'var(--ti-common-color-dark)',
-  'ti-slider-tips-box-shadow': 'var(--ti-common-box-shadow-popover)',
-
-  'ti-slider-input-margin-left': 'var(--ti-common-space-4x)',
-  'ti-slider-input-width': 'calc(var(--ti-common-space-10x) * 2)',
-  'ti-slider-input-text-align': 'left',
-
-  'ti-slider-mark-label-font-size': 'var(--ti-common-font-size-1)',
-  'ti-slider-mark-label-text-color': 'var(--ti-common-color-text-weaken)',
-
-  'ti-slider-input-unit-margin-left': 'var(--ti-common-space-base)'
-}
diff --git a/packages/theme/src/slider/vars.less b/packages/theme/src/slider/vars.less
index eff45200c..ca087e886 100644
--- a/packages/theme/src/slider/vars.less
+++ b/packages/theme/src/slider/vars.less
@@ -12,79 +12,75 @@
 
 .component-css-vars-slider() {
   // 滑块线条默认背景色
-  --ti-slider-bg-color: var(--ti-common-color-bg-light-normal, #e9edfa);
+  --ti-slider-bg-color: var(--ti-common-color-bg-normal);
   // 滑块线条禁用背景色
   --ti-slider-bg-color-disabled: var(--ti-common-color-bg-disabled);
   // 滑块线条高度
-  --ti-slider-height: var(--ti-common-size-2x, 8px);
+  --ti-slider-height: var(--ti-common-space-2x);
   // 滑块线条圆角
-  --ti-slider-border-radius: var(--ti-common-border-radius-normal, 2px);
+  --ti-slider-border-radius: var(--ti-common-border-radius-2);
 
   // 滑块进度条已完成部分的高度
-  --ti-slider-range-height: var(--ti-common-size-4x, 16px);
+  --ti-slider-range-height: var(--ti-common-space-2x);
   // 横向滑块进度条圆角
-  --ti-slider-range-border-radius: var(--ti-common-border-radius-normal, 2px);
+  --ti-slider-range-border-radius: var(--ti-common-border-radius-2);
   // 滑块进度条背景色
-  --ti-slider-range-bg-color: var(--ti-common-color-icon-hover, #5e7ce0);
+  --ti-slider-range-bg-color: var(--ti-common-color-data-1);
   // 滑块进度条悬浮背景色
-  --ti-slider-range-hover-bg-color: var(--ti-common-color-icon-hover, #5e7ce0);
+  --ti-slider-range-hover-bg-color: var(--ti-common-color-data-1);
   // 滑块提示框top
   --ti-slider-range-top: calc(-1 * var(--ti-common-space-base));
   // 滑块进度条顶部外边距
-  --ti-slider-range-margin-top: calc(-1 * var(--ti-common-space-base));
+  --ti-slider-range-margin-top: 0;
   // 滑块进度条禁用时背景色
-  --ti-slider-range-disabled-bg-color: var(--ti-common-color-text-disabled);
+  --ti-slider-range-disabled-bg-color: var(--ti-common-color-bg-secondary);
 
   // 滑块点宽度
-  --ti-slider-handle-width: var(--ti-common-size-5x, 20px);
+  --ti-slider-handle-width: var(--ti-common-space-6x);
   // 滑块点高度
-  --ti-slider-handle-height: var(--ti-common-size-7x, 28px);
+  --ti-slider-handle-height: var(--ti-common-space-6x);
   // 滑块点背景色
-  --ti-slider-handle-bg-color: linear-gradient(
-    153deg,
-    var(--ti-common-color-icon-white, #fff),
-    var(--ti-common-color-bg-light-normal, #e9edfa) 99%
-  );
+  --ti-slider-handle-bg-color: var(--ti-common-color-bg-white-normal);
   // 滑块点边框色
-  --ti-slider-handle-border-color: var(--ti-common-color-line-active, #5e7ce0);
+  --ti-slider-handle-border-color: var(--ti-common-color-line-disabled);
   // 滑块点圆角
-  --ti-slider-handle-border-radius: calc(var(--ti-common-border-radius-2, 8px) + 2px);
+  --ti-slider-handle-border-radius: var(--ti-common-border-radius-5);
 
   // 滑块点悬浮文本色
   --ti-slider-handle-text-color-hover: var(--ti-common-color-bg-hover, #344899);
   // 滑块点悬浮边框色
-  --ti-slider-handle-border-color-hover: var(--ti-common-color-bg-hover, #344899);
+  --ti-slider-handle-border-color-hover: var(--ti-common-color-data-1);
   // 滑块点阴影
-  --ti-slider-handle-box-shadow: var(--ti-common-shadow-1-down, 0 1px 4px 0 rgba(0, 0, 0, 0.1));
+  --ti-slider-handle-box-shadow: 0 1px 4px 0 rgba(0, 0, 0, 0.08);
   // 滑块点top
   --ti-slider-handle-top: calc(-1 * var(--ti-common-space-base));
   // 滑块点边框厚度
   --ti-slider-handle-border-weight: var(--ti-common-border-weight-normal, 1px);
   // 滑块点边框悬浮厚度
-  --ti-slider-handle-border-weight-hover: var(--ti-common-border-weight-normal, 1px);
+  --ti-slider-handle-border-weight-hover: var(--ti-common-border-weight-1);
   // 滑块点图标的display(hide)
-  --ti-slider-handle-icon-display: inline-block;
+  --ti-slider-handle-icon-display: none;
   // 滑块点图标色
-  --ti-slider-handle-icon-fill-color: var(--ti-common-color-line-active, #5e7ce0);
+  --ti-slider-handle-icon-fill-color: var(--ti-common-color-data-1);
   // 滑块点图标悬浮色
   --ti-slider-handle-icon-fill-color-hover: var(--ti-common-color-bg-hover, #344899);
   // 滑块点的缩放值(hide)
   --ti-slider-handle-transform: scale(1);
   // 滑块点顶部外边距
-  --ti-slider-handle-margin-top: calc(var(--ti-common-space-10, 10px) * -1);
+  --ti-slider-handle-margin-top: calc(var(--ti-common-space-2x) * -1);
   // 滑块点水平外边距
   --ti-slider-handle-margin-horizontal: calc(var(--ti-common-space-2x, 8px) * -1);
   // 滑块点底部外边距
   --ti-slider-handle-margin-bottom: var(--ti-common-space-0, 0px);
   // 滑块点禁用时图标颜色
-  --ti-slider-handle-icon-disabled-fill-color: var(--ti-common-color-text-disabled);
+  --ti-slider-handle-icon-disabled-fill-color: var(--ti-common-color-icon-disabled);
   // 滑块点禁用时边框颜色
-  --ti-slider-handle-disabled-border-color: var(--ti-common-color-text-disabled);
+  --ti-slider-handle-disabled-border-color: var(--ti-common-color-icon-disabled);
 
   // 滑块输入框高度
   --ti-slider-input-height: var(--ti-common-size-height-normal, 30px);
   // 滑块输入框宽度
-  --ti-slider-input-width: var(--ti-common-size-10x, 40px);
+  --ti-slider-input-width: calc(var(--ti-common-space-10x) * 2);
   // 滑块输入框边框圆角
   --ti-slider-input-border-radius: calc(var(--ti-common-border-radius-normal, 2px) + 2px);
   // 滑块输入框边框色
@@ -94,13 +90,13 @@
   // 滑块输入框背景色
   --ti-slider-input-bg-color: var(--ti-common-color-light, #fff);
   // 滑块输入框左边外间距
-  --ti-slider-input-margin-left: var(--ti-common-size-3x, 12px);
+  --ti-slider-input-margin-left: var(--ti-common-space-4x);
   // 滑块输入框单位左边padding
-  --ti-slider-input-unit-margin-left: var(--ti-common-space-2x, 8px);
+  --ti-slider-input-unit-margin-left: var(--ti-common-space-base);
   // 滑块输入框单位文本色
   --ti-slider-input-unit-text-color: var(--ti-common-color-text-primary);
   // 滑块输入框单位文字对齐方式(hide)
-  --ti-slider-input-text-align: center;
+  --ti-slider-input-text-align: left;
 
   // 滑块刻度的宽度，竖向模式时作为滑块刻度的高度
   --ti-slider-mark-point-width: calc(var(--ti-common-space-base, 4px) / 2);
@@ -114,7 +110,7 @@
   // 滑块活动时提示框边框色
   --ti-slider-tips-border-color: var(--ti-common-color-bg-dark-normal, #464c59);
   // 滑块活动时提示框文本色
-  --ti-slider-tips-text-color: var(--ti-common-color-text-white, #fff);
+  --ti-slider-tips-text-color: var(--ti-common-color-dark);
   // 滑块活动时提示框左外边距
   --ti-slider-tips-margin-left: calc(var(--ti-common-space-6, 6px) / 2);
 
@@ -123,5 +119,5 @@
   // 竖向滑块右外边距
   --ti-slider-margin-right: var(--ti-common-space-0, 0px);
   // 竖向滑块左外边距
-  --ti-slider-margin-left: calc(var(--ti-common-space-6, 6px) * -1);
+  --ti-slider-margin-left: calc(var(--ti-common-space-base) * -1);
 }
diff --git a/packages/theme/src/split/old-theme.js b/packages/theme/src/split/old-theme.js
new file mode 100644
index 000000000..6461057a0
--- /dev/null
+++ b/packages/theme/src/split/old-theme.js
@@ -0,0 +1,4 @@
+export const tinySplitOldTheme = {
+  'ti-split-trigger-button-bg-color': 'var(--ti-common-color-icon-white, #fff)',
+  'ti-split-trigger-button-border-width': 'var(--ti-common-border-weight-normal, 1px)'
+}
diff --git a/packages/theme/src/split/smb-theme.js b/packages/theme/src/split/smb-theme.js
deleted file mode 100644
index 17278723f..000000000
--- a/packages/theme/src/split/smb-theme.js
+++ /dev/null
@@ -1,6 +0,0 @@
-export const tinySplitSmbTheme = {
-  // 不显示边框线
-  'ti-split-trigger-button-border-width': '0',
-  // 不显示背景
-  'ti-split-trigger-button-bg-color': 'var(--ti-base-color-transparent)'
-}
diff --git a/packages/theme/src/split/vars.less b/packages/theme/src/split/vars.less
index 7371515de..9c74ec4c6 100644
--- a/packages/theme/src/split/vars.less
+++ b/packages/theme/src/split/vars.less
@@ -37,9 +37,9 @@
   // 简易模式的按钮的边框色
   --ti-split-trigger-button-border-color: #1919191a;
   // 简易模式的按钮的边框宽度
-  --ti-split-trigger-button-border-width: var(--ti-common-border-weight-normal, 1px);
+  --ti-split-trigger-button-border-width: 0;
   // 简易模式的按钮的边框圆角
   --ti-split-trigger-button-border-radius: var(--ti-common-border-radius-1, 4px);
   // 简易模式的按钮的背景色
-  --ti-split-trigger-button-bg-color: var(--ti-common-color-icon-white, #fff);
+  --ti-split-trigger-button-bg-color: var(--ti-base-color-transparent);
 }
diff --git a/packages/theme/src/statistic/old-theme.js b/packages/theme/src/statistic/old-theme.js
new file mode 100644
index 000000000..1fa7de575
--- /dev/null
+++ b/packages/theme/src/statistic/old-theme.js
@@ -0,0 +1,6 @@
+export const tinyStatisticOldTheme = {
+  'ti-statistic-description-font-size': 'var(--ti-common-font-size-6)',
+  'ti-statistic-description-font-weight': 'var(--ti-common-font-weight-normal)',
+  'ti-statistic-font-color': 'var(--ti-common-color-info-text)',
+  'ti-statistic-suffix-font-size': 'var(--ti-common-font-size-base)'
+}
diff --git a/packages/theme/src/statistic/smb-theme.js b/packages/theme/src/statistic/smb-theme.js
deleted file mode 100644
index 7fb62a1f2..000000000
--- a/packages/theme/src/statistic/smb-theme.js
+++ /dev/null
@@ -1,6 +0,0 @@
-export const tinyStatisticSmbTheme = {
-  'ti-statistic-description-font-size': 'var(--ti-common-font-size-5)',
-  'ti-statistic-font-color': 'var(--ti-common-color-primary-normal)',
-  'ti-statistic-suffix-font-size': 'var(--ti-common-font-size-0)',
-  'ti-statistic-description-font-weight': 'var(--ti-common-font-weight-normal)'
-}
diff --git a/packages/theme/src/statistic/vars.less b/packages/theme/src/statistic/vars.less
index 3289e3112..84ebf56cc 100644
--- a/packages/theme/src/statistic/vars.less
+++ b/packages/theme/src/statistic/vars.less
@@ -2,11 +2,11 @@
   // 标题字体大小
   --ti-statistic-font-size: var(--ti-common-font-size-base);
   // 后缀字体大小
-  --ti-statistic-suffix-font-size: var(--ti-common-font-size-base);
+  --ti-statistic-suffix-font-size: var(--ti-common-font-size-0);
   // 标题内容字体大小
   --ti-statistic-title-font-size: var(--ti-common-font-size-6);
   // 标题字体颜色
-  --ti-statistic-font-color: var(--ti-common-color-info-text);
+  --ti-statistic-font-color: var(--ti-common-color-primary-normal);
   // 标题字体粗细
   --ti-statistic-title-font-weight: var(--ti-common-font-weight-4);
   // 标题上间距
@@ -30,5 +30,5 @@
   // 后缀左边距
   --ti-statistic-suffix-margin-left: var(--ti-common-space-base);
   // 数字内容字体
-  --ti-statistic-description-font-size: var(--ti-common-font-size-6);
+  --ti-statistic-description-font-size: var(--ti-common-font-size-5);
 }
diff --git a/packages/theme/src/steps/old-theme.js b/packages/theme/src/steps/old-theme.js
new file mode 100644
index 000000000..4da29c412
--- /dev/null
+++ b/packages/theme/src/steps/old-theme.js
@@ -0,0 +1,44 @@
+export const tinyStepsOldTheme = {
+  'ti-steps-timeline-dot-primary-bg-color': 'var(--ti-steps-timeline-dot-bg-color)',
+  'ti-steps-timeline-item-secondary-text-font-size': 'var(--ti-common-font-size-base, 12px)',
+  'ti-steps-timeline-item-padding-bottom': 'var(--ti-common-size-5x, 20px)',
+  'ti-steps-timeline-dot-bg-color': 'var(--ti-common-color-line-dividing, #dfe1e6)',
+  'ti-steps-timeline-dot-border-color': 'var(--ti-common-color-line-dividing, #dfe1e6)',
+  'ti-steps-timeline-shape-dot-content-margin-left': 'var(--ti-common-size-3x, 12px)',
+  'ti-steps-timeline-vertical-line-margin-left': 'var(--ti-common-size-3x, 12px)',
+  'ti-steps-timeline-line-margin-vertical': 'var(--ti-common-size-base, 4px)',
+  'ti-steps-timeline-date-time-font-size': 'var(--ti-common-font-size-base, 12px)',
+  'ti-steps-advanced-count-font-size': 'var(--ti-common-font-size-base, 12px)',
+  'ti-steps-advanced-count-bg-color': 'var(--ti-common-bg-primary, #c7000b)',
+  'ti-steps-advanced-link-font-size': 'var(--ti-common-font-size-base, 12px)',
+  'ti-steps-advanced-li-text-color': 'var(--ti-common-color-selected-text-color, #fff)',
+  'ti-steps-mini-font-size-base': 'var(--ti-common-font-size-base, 12px)',
+  'ti-steps-mini-number-font-size': 'var(--ti-common-font-size-base, 12px)',
+  'ti-steps-disabled-select-icon-color': 'var(--ti-common-color-text-disabled, #adb0b8)',
+  'ti-steps-disabled-select-icon-bg-color': 'var(--ti-common-color-bg-white-normal, #fff)',
+  'ti-steps-disabled-name-text-color': 'var(--ti-common-color-text-disabled, #adb0b8)',
+  'ti-steps-disabled-border-color': 'var(--ti-steps-disabled-icon-color)',
+  'ti-steps-disabled-icon-bg-color': 'var(--ti-common-color-bg-disabled, #f5f5f6)',
+  'ti-steps-error-icon-size': 'var(--ti-common-font-size-1, 14px)',
+  'ti-steps-timeline-date-time-text-color': 'var(--ti-common-color-text-primary, #252b3a)',
+  'ti-steps-unselected-border-color': 'var(--ti-steps-unselected-icon-color)',
+  'ti-steps-doing-line-border-color': 'var(--ti-common-color-bg-secondary, #adb0b8)',
+  'ti-steps-line-bg-color': 'var(--ti-common-color-bg-secondary, #adb0b8)',
+  'ti-steps-done-icon-size': 'var(--ti-common-font-size-1, 14px)',
+  'ti-steps-done-icon-color': 'var(--ti-common-color-icon-active, #5e7ce0)',
+  'ti-steps-line-active-bg-color': 'var(--ti-common-color-line-active, #5e7ce0)',
+  'ti-steps-done-text-color': 'var(--ti-common-color-text-primary, #252b3a)',
+  'ti-steps-advanced-desc-active-text-color': 'var(--ti-common-color-primary-normal, #5e7ce0)',
+  'ti-steps-active-font-weight': 'var(--ti-common-font-weight-4, normal)',
+  'ti-steps-custom-icon-width-height': 'var(--ti-common-space-6x, 24px)',
+  'ti-steps-vertical-title-margin-top': 'var(--ti-common-space-3x, 12px)',
+  'ti-steps-description-text-color': 'var(--ti-common-color-text-secondary, #575d6c)',
+  'ti-steps-bottom-divider-margin-top': 'var(--ti-common-space-4x, 16px)',
+  'ti-steps-content-margin-top': 'var(--ti-common-space-6, 6px)',
+  'ti-steps-text-margin-left': 'var(--ti-common-space-base, 4px)',
+  'ti-steps-icon-hover-text-color': 'var(--ti-common-color-primary-normal, #5e7ce0)',
+  'ti-steps-icon-size': 'var(--ti-common-size-5x, 20px)',
+  'ti-steps-text-color-hover': 'var(--ti-common-color-primary-normal, #5e7ce0)',
+  'ti-steps-font-size-hover': 'var(--ti-common-font-weight-4, normal)',
+  'ti-steps-circle-width-height': 'var(--ti-common-size-5x, 20px)'
+}
diff --git a/packages/theme/src/steps/smb-theme.js b/packages/theme/src/steps/smb-theme.js
deleted file mode 100644
index e67dd6f97..000000000
--- a/packages/theme/src/steps/smb-theme.js
+++ /dev/null
@@ -1,45 +0,0 @@
-export const tinyStepsSmbTheme = {
-  'ti-steps-circle-width-height': 'var(--ti-common-size-height-normal)',
-  'ti-steps-icon-size': 'var(--ti-common-size-height-normal)',
-  'ti-steps-icon-padding': 'var(--ti-common-space-base)',
-  'ti-steps-text-margin-left': 'var(--ti-common-space-2x)',
-  'ti-steps-font-size-hover': 'var(--ti-common-font-weight-bold)',
-  'ti-steps-text-color-hover': 'var(--ti-common-color-text-primary)',
-  'ti-steps-icon-hover-text-color': 'var(--ti-common-color-text-primary)',
-  'ti-steps-content-margin-top': 'var(--ti-common-space-2x)',
-  'ti-steps-advanced-li-text-color': 'var(--ti-common-color-text-white)',
-  'ti-steps-unselected-border-color': 'var(--ti-common-color-line-disabled)',
-  'ti-steps-done-text-color': 'var(--ti-common-color-text-primary)',
-  'ti-steps-done-icon-color': 'var(--ti-common-color-text-primary)',
-  'ti-steps-done-icon-size': 'var(--ti-common-font-size-4)',
-  'ti-steps-active-font-weight': 'var(--ti-common-font-weight-6)',
-  'ti-steps-line-active-bg-color': 'var(--ti-common-color-dash-line-normal)',
-  'ti-steps-line-bg-color': 'var(--ti-common-color-bg-disabled)',
-  'ti-steps-doing-line-border-color': 'var(--ti-common-color-line-disabled)',
-  'ti-steps-advanced-link-font-size': 'var(--ti-common-font-size-0)',
-  'ti-steps-advanced-count-font-size': 'var(--ti-common-font-size-0)',
-  'ti-steps-error-icon-size': 'var(--ti-common-font-size-2)',
-  'ti-steps-disabled-icon-bg-color': 'var(--ti-common-color-bg-disabled)',
-  'ti-steps-disabled-border-color': 'var(--ti-common-color-line-disabled)',
-  'ti-steps-disabled-name-text-color': 'var(--ti-common-color-text-disabled)',
-  'ti-steps-disabled-select-icon-bg-color': 'var(--ti-common-color-bg-disabled)',
-  'ti-steps-disabled-select-icon-color': 'var(--ti-common-color-text-disabled)',
-  'ti-steps-timeline-date-time-text-color': 'var(--ti-common-color-text-primary)',
-  'ti-steps-timeline-date-time-font-size': 'var(--ti-common-font-size-0)',
-  'ti-steps-mini-number-font-size': 'var(--ti-common-font-size-0)',
-  'ti-steps-mini-font-size-base': 'var(--ti-common-font-size-0)',
-  'ti-steps-bottom-divider-margin-top': 'calc(var(--ti-common-space-6x) + 1px)',
-  'ti-steps-timeline-line-margin-vertical': 'var(--ti-common-space-base)',
-  'ti-steps-timeline-dot-border-color': 'var(--ti-base-color-brand-5)',
-  'ti-steps-timeline-dot-bg-color': 'var(--ti-common-color-light)',
-  'ti-steps-timeline-dot-primary-bg-color': 'var(--ti-base-color-brand-5)',
-  'ti-steps-timeline-item-secondary-text-font-size': 'var(--ti-common-font-size-0)',
-  'ti-steps-timeline-vertical-line-margin-left': 'var(--ti-common-space-4x)',
-  'ti-steps-timeline-item-padding-bottom': 'var(--ti-common-space-6x)',
-  'ti-steps-custom-icon-width-height': 'var(--ti-common-space-5x)',
-  'ti-steps-advanced-count-bg-color': '#c7000b',
-  'ti-steps-vertical-title-margin-top': 'var(--ti-common-space-2x)',
-  'ti-steps-timeline-shape-dot-content-margin-left': 'var(--ti-common-space-4x)',
-  'ti-steps-description-text-color': 'var(--ti-common-color-text-weaken)',
-  'ti-steps-advanced-desc-active-text-color': 'var(--ti-common-color-text-weaken)'
-}
diff --git a/packages/theme/src/steps/vars.less b/packages/theme/src/steps/vars.less
index 8315dcf03..7b9810a02 100644
--- a/packages/theme/src/steps/vars.less
+++ b/packages/theme/src/steps/vars.less
@@ -12,13 +12,13 @@
 
 .component-css-vars-steps() {
   // 节点圆圈尺寸
-  --ti-steps-circle-width-height: var(--ti-common-size-5x, 20px);
+  --ti-steps-circle-width-height: var(--ti-common-size-height-normal);
   // 序号字号
   --ti-steps-number-font-size: var(--ti-common-font-size-base, 12px);
   // 节点内容字号
   --ti-steps-font-size-base: var(--ti-common-font-size-base, 12px);
   // 节点内容悬浮字号
-  --ti-steps-font-size-hover: var(--ti-common-font-weight-4, normal);
+  --ti-steps-font-size-hover: var(--ti-common-font-weight-bold);
   // 节点文本色
   --ti-steps-text-color: var(--ti-common-color-text-primary, #252b3a);
   // 节点内容悬浮背景色
@@ -26,11 +26,11 @@
   // 节点内容悬浮边框色
   --ti-steps-border-color-hover: var(--ti-common-color-line-active, #5e7ce0);
   // 节点内容悬浮字体色
-  --ti-steps-text-color-hover: var(--ti-common-color-primary-normal, #5e7ce0);
+  --ti-steps-text-color-hover: var(--ti-common-color-text-primary);
   // 序号圆圈大小
-  --ti-steps-icon-size: var(--ti-common-size-5x, 20px);
+  --ti-steps-icon-size: var(--ti-common-size-height-normal);
   // 序号悬浮字体色
-  --ti-steps-icon-hover-text-color: var(--ti-common-color-primary-normal, #5e7ce0);
+  --ti-steps-icon-hover-text-color: var(--ti-common-color-text-primary);
   // 步骤条字号(hide)
   --ti-steps-font-size-7: var(--ti-common-font-size-7, 36px);
   // 节点间横线厚度
@@ -40,27 +40,27 @@
   // 节点间横线最小宽度
   --ti-steps-line-min-width: var(--ti-common-space-4x, 16px);
   // 节点内容左边距
-  --ti-steps-text-margin-left: var(--ti-common-space-base, 4px);
+  --ti-steps-text-margin-left: var(--ti-common-space-2x);
   // 节点间横线默认长度
   --ti-steps-line-width: var(--ti-common-size-16x, 64px);
   // 节点文本内容最大宽度
   --ti-steps-content-max-width: calc(var(--ti-common-space-10, 10px) * 25);
   // 节点文本内容上边距
-  --ti-steps-content-margin-top: var(--ti-common-space-6, 6px);
+  --ti-steps-content-margin-top: var(--ti-common-space-2x);
   // 底部分割线厚度
   --ti-steps-bottom-divider-height: var(--ti-common-space-1, 1px);
   // 底部分割线与主体间距
-  --ti-steps-bottom-divider-margin-top: var(--ti-common-space-4x, 16px);
+  --ti-steps-bottom-divider-margin-top: calc(var(--ti-common-space-6x) + 1px);
   // 底部分割线的颜色
   --ti-steps-bottom-divider-bg-color: var(--ti-common-color-line-dividing, #dfe1e6);
   // 描述信息字号
   --ti-steps-description-font-size: var(--ti-common-font-size-base, 12px);
   // 描述信息字体色
-  --ti-steps-description-text-color: var(--ti-common-color-text-secondary, #575d6c);
+  --ti-steps-description-text-color: var(--ti-common-color-text-weaken);
   // 描述信息最小宽度
   --ti-steps-description-min-width: calc(var(--ti-common-space-10, 10px) * 10);
   // 垂直单链型节点标题上边距
-  --ti-steps-vertical-title-margin-top: var(--ti-common-space-3x, 12px);
+  --ti-steps-vertical-title-margin-top: var(--ti-common-space-2x);
   // 垂直单链型节点描述上边距
   --ti-steps-vertical-description-margin-top: var(--ti-common-space-2x, 8px);
   // 图标边框宽度
@@ -68,7 +68,7 @@
   // 自定义图标背景色
   --ti-steps-custom-icon-bg-color: var(--ti-common-color-bg-white-normal, #fff);
   // 自定义图标大小(hide)
-  --ti-steps-custom-icon-width-height: var(--ti-common-space-6x, 24px);
+  --ti-steps-custom-icon-width-height: var(--ti-common-space-5x);
 
   // 活跃节点背景色
   --ti-steps-advanced-active-bg-color: var(--ti-common-color-bg-emphasize, #5e7ce0);
@@ -79,33 +79,33 @@
   // 活跃节点序号图标色
   --ti-steps-line-active-icon-color: var(--ti-common-color-icon-white, #fff);
   // 活跃节点字重
-  --ti-steps-active-font-weight: var(--ti-common-font-weight-4, normal);
+  --ti-steps-active-font-weight: var(--ti-common-font-weight-6);
   // 活跃节点内容字体色
   --ti-steps-advanced-active-text-color: var(--ti-common-color-primary-normal, #5e7ce0);
   // 活跃节点内容描述字体色
-  --ti-steps-advanced-desc-active-text-color: var(--ti-common-color-primary-normal, #5e7ce0);
+  --ti-steps-advanced-desc-active-text-color: var(--ti-common-color-text-weaken);
 
   // 已完成节点文本色
-  --ti-steps-done-text-color: var(--ti-common-color-text-primary, #252b3a);
+  --ti-steps-done-text-color: var(--ti-common-color-text-primary);
   // 已完成节点线条色
-  --ti-steps-line-active-bg-color: var(--ti-common-color-line-active, #5e7ce0);
+  --ti-steps-line-active-bg-color: var(--ti-common-color-dash-line-normal);
   // 已完成节点边框色
   --ti-steps-done-active-border-color: var(--ti-common-color-line-active, #5e7ce0);
   // 已完成节点悬浮边框色
   --ti-steps-done-active-border-color-hover: var(--ti-common-color-primary-hover, #7693f5);
   // 已完成节点图标(或文本)色
-  --ti-steps-done-icon-color: var(--ti-common-color-icon-active, #5e7ce0);
+  --ti-steps-done-icon-color: var(--ti-common-color-text-primary);
   // 已完成节点图标大小
-  --ti-steps-done-icon-size: var(--ti-common-font-size-1, 14px);
+  --ti-steps-done-icon-size: var(--ti-common-font-size-4);
   // 已完成节点背景色
   --ti-steps-done-icon-bg-color: var(--ti-common-color-bg-white-normal, #fff);
   // 已完成节点图标大小
   --ti-steps-done-icon-size: var(--ti-common-font-size-1, 14px);
 
   // 未完成的线条色
-  --ti-steps-line-bg-color: var(--ti-common-color-bg-secondary, #adb0b8);
+  --ti-steps-line-bg-color: var(--ti-common-color-bg-disabled);
   // doing状态线条色
-  --ti-steps-doing-line-border-color: var(--ti-common-color-bg-secondary, #adb0b8);
+  --ti-steps-doing-line-border-color: var(--ti-common-color-line-disabled);
   // 未完成节点的背景色
   --ti-steps-icon-bg-color: var(--ti-common-color-bg-white-normal, #fff);
   // 未完成节点序号图标色
@@ -115,11 +115,11 @@
   // 未完成节点序号悬浮名称字体色
   --ti-steps-unselected-hover-name-text-color: var(--ti-common-color-icon-hover, #5e7ce0);
   // 未完成节点边框色
-  --ti-steps-unselected-border-color: var(--ti-steps-unselected-icon-color);
+  --ti-steps-unselected-border-color: var(--ti-common-color-line-disabled);
   // 未完成节点悬浮边框色
   --ti-steps-unselected-hover-border-color: var(--ti-steps-unselected-hover-icon-color);
   // 未完成节点内容文本色
-  --ti-steps-timeline-date-time-text-color: var(--ti-common-color-text-primary, #252b3a);
+  --ti-steps-timeline-date-time-text-color: var(--ti-common-color-text-primary);
 
   // 处理中节点边框色
   --ti-steps-doing-border-color: var(--ti-common-color-line-active, #5e7ce0);
@@ -142,33 +142,33 @@
   // 错误节点图标色
   --ti-steps-error-icon-color: var(--ti-common-color-error-text, #de504e);
   // 错误节点图标大小
-  --ti-steps-error-icon-size: var(--ti-common-font-size-1, 14px);
+  --ti-steps-error-icon-size: var(--ti-common-font-size-2);
   // 错误节点边框色
   --ti-steps-error-border-color: var(--ti-common-color-error-border, #f66f6a);
   // 错误节点描述文本色
   --ti-steps-error-text-color: var(--ti-common-color-error-text, #de504e);
 
   // 禁用节点的背景色
-  --ti-steps-disabled-icon-bg-color: var(--ti-common-color-bg-disabled, #f5f5f6);
+  --ti-steps-disabled-icon-bg-color: var(--ti-common-color-bg-disabled);
   // 禁用节点序号文本色
   --ti-steps-disabled-icon-color: var(--ti-common-color-text-disabled, #adb0b8);
   // 禁用节点边框色
-  --ti-steps-disabled-border-color: var(--ti-steps-disabled-icon-color);
+  --ti-steps-disabled-border-color: var(--ti-common-color-line-disabled);
   // 禁用节点描述文本色
   --ti-steps-disabled-text-color: var(--ti-common-color-text-disabled, #adb0b8);
   // 禁用节点名称文本色
-  --ti-steps-disabled-name-text-color: var(--ti-common-color-text-disabled, #adb0b8);
+  --ti-steps-disabled-name-text-color: var(--ti-common-color-text-disabled);
   // 禁用节点选中背景色
-  --ti-steps-disabled-select-icon-bg-color: var(--ti-common-color-bg-white-normal, #fff);
+  --ti-steps-disabled-select-icon-bg-color: var(--ti-common-color-bg-disabled);
   // 禁用节点选中序号文本色
-  --ti-steps-disabled-select-icon-color: var(--ti-common-color-text-disabled, #adb0b8);
+  --ti-steps-disabled-select-icon-color: var(--ti-common-color-text-disabled);
 
   // mini尺寸序号圆圈大小
   --ti-steps-mini-icon-size: var(--ti-common-font-size-2, 16px);
   // mini尺寸序号字号
-  --ti-steps-mini-number-font-size: var(--ti-common-font-size-base, 12px);
+  --ti-steps-mini-number-font-size: var(--ti-common-font-size-0);
   // mini尺寸节点内容字号
-  --ti-steps-mini-font-size-base: var(--ti-common-font-size-base, 12px);
+  --ti-steps-mini-font-size-base: var(--ti-common-font-size-0);
 
   // small尺寸序号圆圈大小
   --ti-steps-small-icon-size: var(--ti-common-font-size-5, 16px);
@@ -186,29 +186,29 @@
   // 向导步骤条未选中项背景色
   --ti-steps-advanced-li-bg-color: var(--ti-common-color-bg-white-normal, #fff);
   // 向导步骤条当前项和计数标记点的文本色
-  --ti-steps-advanced-li-text-color: var(--ti-common-color-selected-text-color, #fff);
+  --ti-steps-advanced-li-text-color: var(--ti-common-color-text-white);
   // 向导步骤条节点悬浮文本色
   --ti-steps-advanced-li-hover-text-color: var(--ti-common-color-text-secondary, #575d6c);
   // 向导步骤条节点悬浮背景色
   --ti-steps-advanced-li-hover-bg-color: var(--ti-common-color-bg-white-emphasize, #f2f5fc);
   // 向导步骤条字号
-  --ti-steps-advanced-link-font-size: var(--ti-common-font-size-base, 12px);
+  --ti-steps-advanced-link-font-size: var(--ti-common-font-size-0);
   // 向导步骤条节点里的图标高度
   --ti-steps-advanced-dot-height: var(--ti-common-size-3x, 12px);
   // 向导步骤条节点里的图标宽度
   --ti-steps-advanced-dot-width: var(--ti-common-size-3x, 12px);
   // 向导步骤条计数标记点背景色
-  --ti-steps-advanced-count-bg-color: var(--ti-common-bg-primary, #c7000b);
+  --ti-steps-advanced-count-bg-color: #c7000b;
   // 向导步骤条计数标记点边框圆角
   --ti-steps-advanced-count-border-radius: var(--ti-common-space-10, 10px);
   // 向导步骤条计数标记点字号
-  --ti-steps-advanced-count-font-size: var(--ti-common-font-size-base, 12px);
+  --ti-steps-advanced-count-font-size: var(--ti-common-font-size-0);
   // 向导步骤条计数标记点高度
   --ti-steps-advanced-count-height: calc(var(--ti-common-space-6, 6px) * 3);
   // 向导步骤条厚度(hide)
   --ti-steps-advanced-border-weight: calc(var(--ti-common-space-base, 4px) * 3.5);
   // 时间线时间字号(hide)
-  --ti-steps-timeline-date-time-font-size: var(--ti-common-font-size-base, 12px);
+  --ti-steps-timeline-date-time-font-size: var(--ti-common-font-size-0);
   // 向导步骤条正在处理节点背景色(hide)
   --ti-steps-advanced-dot-doing-bg-color: var(--ti-common-color-warn, #fa9841);
   // 向导步骤条待处理节点背景色(hide)
@@ -247,31 +247,31 @@
   // 竖式步骤条节点左侧时间预留宽度
   --ti-steps-timeline-vertical-time-width: var(--ti-common-size-25x, 100px);
   // 竖式步骤条线条上下间距
-  --ti-steps-timeline-line-margin-vertical: var(--ti-common-size-base, 4px);
+  --ti-steps-timeline-line-margin-vertical: var(--ti-common-space-base);
   // 竖式步骤条线条背景色
   --ti-steps-timeline-vertical-line-bg-color: var(--ti-common-color-line-dividing, #dfe1e6);
   // 竖式步骤条线条左间距
-  --ti-steps-timeline-vertical-line-margin-left: var(--ti-common-size-3x, 12px);
+  --ti-steps-timeline-vertical-line-margin-left: var(--ti-common-space-4x);
   // 竖式步骤条线条右间距
   --ti-steps-timeline-vertical-line-margin-right: var(--ti-steps-timeline-vertical-line-margin-left);
   // 竖式步骤条圆点与内容间隔
-  --ti-steps-timeline-shape-dot-content-margin-left: var(--ti-common-size-3x, 12px);
+  --ti-steps-timeline-shape-dot-content-margin-left: var(--ti-common-space-4x);
   // 竖式步骤条圆点尺寸
   --ti-steps-timeline-dot-width: var(--ti-common-size-2x, 8px);
   // 竖式步骤条圆点边框色
-  --ti-steps-timeline-dot-border-color: var(--ti-common-color-line-dividing, #dfe1e6);
+  --ti-steps-timeline-dot-border-color: var(--ti-base-color-brand-5);
   // 竖式步骤条圆点背景色
-  --ti-steps-timeline-dot-bg-color: var(--ti-common-color-line-dividing, #dfe1e6);
+  --ti-steps-timeline-dot-bg-color: var(--ti-common-color-light);
   // 竖式步骤条节点内容底部内边距
-  --ti-steps-timeline-item-padding-bottom: var(--ti-common-size-5x, 20px);
+  --ti-steps-timeline-item-padding-bottom: var(--ti-common-space-6x);
   // 竖式步骤条二级文本颜色
   --ti-steps-timeline-item-secondary-text-color: var(--ti-common-color-text-weaken, #8a8e99);
   // 竖式步骤条二级文本字号
-  --ti-steps-timeline-item-secondary-text-font-size: var(--ti-common-font-size-base, 12px);
+  --ti-steps-timeline-item-secondary-text-font-size: var(--ti-common-font-size-0);
   // 竖式步骤条标题与二级文本间距
   --ti-steps-timeline-item-title-margin-bottom: var(--ti-common-size-base, 4px);
   // 基本状态圆点颜色
-  --ti-steps-timeline-dot-primary-bg-color: var(--ti-steps-timeline-dot-bg-color);
+  --ti-steps-timeline-dot-primary-bg-color: var(--ti-base-color-brand-5);
   // 成功状态圆点颜色
   --ti-steps-timeline-dot-success-bg-color: var(--ti-common-color-success, #50d4ab);
   // 警告状态圆点颜色
diff --git a/packages/theme/src/switch/old-theme.js b/packages/theme/src/switch/old-theme.js
new file mode 100644
index 000000000..3ebf00cf5
--- /dev/null
+++ b/packages/theme/src/switch/old-theme.js
@@ -0,0 +1,17 @@
+export const tinySwitchOldTheme = {
+  'ti-switch-mini-button-left': 'calc(100% - var(--ti-switch-dot-offset))',
+  'ti-switch-mini-button-width': 'var(--ti-common-space-4x)',
+  'ti-switch-mini-button-height': 'var(--ti-common-space-4x)',
+  'ti-switch-mini-width': 'calc(var(--ti-switch-width) - 4px)',
+  'ti-switch-mini-height': 'calc(var(--ti-common-size-height-mini) - 4px)',
+  'ti-switch-border-weight': 'var(--ti-common-border-weight-normal, 1px)',
+  'ti-switch-border-radius': 'var(--ti-common-size-6x, 24px)',
+  'ti-switch-width': 'calc(var(--ti-common-size-base, 4px) * 9.5)',
+  'ti-switch-dot-offset': 'calc(var(--ti-switch-dot-size) + var(--ti-switch-dot-position-left))',
+  'ti-switch-dot-position-top': 'var(--ti-common-space-1, 1px)',
+  'ti-switch-dot-position-left': 'var(--ti-common-space-1, 1px)',
+  'ti-switch-disabled-dot-bg-color': 'var(--ti-common-color-bg-disabled, #f5f5f6)',
+  'ti-switch-disabled-bg-color': 'var(--ti-common-color-bg-dark-disabled, #dfe1e6)',
+  'ti-switch-off-bg-color': 'var(--ti-common-color-bg-secondary, #adb0b8)',
+  'ti-switch-on-bg-color': 'var(--ti-common-color-bg-emphasize, #5e7ce0)'
+}
diff --git a/packages/theme/src/switch/smb-theme.js b/packages/theme/src/switch/smb-theme.js
deleted file mode 100644
index 46f03e589..000000000
--- a/packages/theme/src/switch/smb-theme.js
+++ /dev/null
@@ -1,29 +0,0 @@
-/**
- * Copyright (c) 2022 - present TinyVue Authors.
- * Copyright (c) 2022 - present Huawei Cloud Computing Technologies Co., Ltd.
- *
- * Use of this source code is governed by an MIT-style license.
- *
- * THE OPEN SOURCE SOFTWARE IN THIS PRODUCT IS DISTRIBUTED IN THE HOPE THAT IT WILL BE USEFUL,
- * BUT WITHOUT ANY WARRANTY, WITHOUT EVEN THE IMPLIED WARRANTY OF MERCHANTABILITY OR FITNESS FOR
- * A PARTICULAR PURPOSE. SEE THE APPLICABLE LICENSES FOR MORE DETAILS.
- *
- */
-
-export const tinySwitchSMBTheme = {
-  'ti-switch-on-bg-color': 'var(--ti-common-color-data-1)',
-  'ti-switch-off-bg-color': '#C2C2C2',
-  'ti-switch-disabled-bg-color': 'var(--ti-common-color-bg-dark-disabled)',
-  'ti-switch-disabled-dot-bg-color': '#ffffff',
-  'ti-switch-width': 'var(--ti-common-size-10x)',
-  'ti-switch-border-radius': 'calc(var(--ti-common-border-radius-3) * 2.5)',
-  'ti-switch-dot-position-left': '2px',
-  'ti-switch-dot-position-top': '2px',
-  'ti-switch-dot-offset': 'calc(var(--ti-switch-dot-size) + 2px)',
-  'ti-switch-border-weight': '0px',
-  'ti-switch-mini-width': 'calc(var(--ti-common-size-width-minor) + 2px)',
-  'ti-switch-mini-height': 'calc(var(--ti-common-size-height-normal)/2)',
-  'ti-switch-mini-button-height': 'calc(var(--ti-common-size-height-small)/2)',
-  'ti-switch-mini-button-width': 'calc(var(--ti-common-size-width-mini)/2)',
-  'ti-switch-mini-button-left': 'calc(var(--ti-common-space-4x) + 2px)'
-}
diff --git a/packages/theme/src/switch/vars.less b/packages/theme/src/switch/vars.less
index 84aa46003..a7a866ab3 100644
--- a/packages/theme/src/switch/vars.less
+++ b/packages/theme/src/switch/vars.less
@@ -12,11 +12,11 @@
 
 .component-css-vars-switch() {
   // 开关开启状态背景色
-  --ti-switch-on-bg-color: var(--ti-common-color-bg-emphasize, #5e7ce0);
+  --ti-switch-on-bg-color: var(--ti-common-color-data-1);
   // 开关关闭状态背景色
-  --ti-switch-off-bg-color: var(--ti-common-color-bg-secondary, #adb0b8);
+  --ti-switch-off-bg-color: #C2C2C2;
   // 开关关闭禁用状态背景色
-  --ti-switch-disabled-bg-color: var(--ti-common-color-bg-dark-disabled, #dfe1e6);
+  --ti-switch-disabled-bg-color: var(--ti-common-color-bg-dark-disabled);
   // 开关开启禁用状态背景色
   --ti-switch-checked-disabled-bg-color: var(--ti-common-color-bg-light-emphasize, #beccfa);
   // 开关开启禁用状态边框色
@@ -24,27 +24,27 @@
   // 开关禁用状态文本色
   --ti-switch-disabled-text-color: var(--ti-common-color-info-disabled, #bfbfbf);
   // 开关禁用状态圆点色
-  --ti-switch-disabled-dot-bg-color: var(--ti-common-color-bg-disabled, #f5f5f6);
+  --ti-switch-disabled-dot-bg-color: #ffffff;
   // 开关默认圆点色
   --ti-switch-dot-bg-color: var(--ti-common-color-light, #fff);
   // 开关圆点尺寸
   --ti-switch-dot-size: var(--ti-common-size-4x, 16px);
   // 开关圆点左边距(hide)
-  --ti-switch-dot-position-left: var(--ti-common-space-1, 1px);
+  --ti-switch-dot-position-left: 2px;
   // 开关圆点上边距(hide)
-  --ti-switch-dot-position-top: var(--ti-common-space-1, 1px);
+  --ti-switch-dot-position-top: 2px;
   // 开关圆点偏移量(hide)
-  --ti-switch-dot-offset: calc(var(--ti-switch-dot-size) + var(--ti-switch-dot-position-left));
+  --ti-switch-dot-offset: calc(var(--ti-switch-dot-size) + 2px);
   // 开关文本色
   --ti-switch-text-color: var(--ti-common-color-light, #fff);
   // 默认开关宽度
-  --ti-switch-width: calc(var(--ti-common-size-base, 4px) * 9.5);
+  --ti-switch-width: var(--ti-common-size-10x);
   // 开关高度
   --ti-switch-height: var(--ti-common-size-5x, 20px);
   // 开关圆角
-  --ti-switch-border-radius: var(--ti-common-size-6x, 24px);
+  --ti-switch-border-radius: calc(var(--ti-common-border-radius-3) * 2.5);
   // 开关边框厚度
-  --ti-switch-border-weight: var(--ti-common-border-weight-normal, 1px);
+  --ti-switch-border-weight: 0px;
   // 开关字号
   --ti-switch-inner-font-size: 12px;
   // 开关左侧距离(hide)
@@ -52,10 +52,10 @@
   // 自定义文本开关宽度
   --ti-switch-text-width: calc(var(--ti-common-size-11x, 44px) + 1px);
   // mini尺寸
-  --ti-switch-mini-height: calc(var(--ti-common-size-height-mini) - 4px);
-  --ti-switch-mini-width: calc(var(--ti-switch-width) - 4px);
+  --ti-switch-mini-height: calc(var(--ti-common-size-height-normal)/2);
+  --ti-switch-mini-width: calc(var(--ti-common-size-width-minor) + 2px);
   // mini尺寸button
-  --ti-switch-mini-button-height: var(--ti-common-space-4x);
-  --ti-switch-mini-button-width: var(--ti-common-space-4x);
-  --ti-switch-mini-button-left: calc(100% - var(--ti-switch-dot-offset));
+  --ti-switch-mini-button-height: calc(var(--ti-common-size-height-small)/2);
+  --ti-switch-mini-button-width: calc(var(--ti-common-size-width-mini)/2);
+  --ti-switch-mini-button-left: calc(var(--ti-common-space-4x) + 2px);
 }
diff --git a/packages/theme/src/tabs/old-theme.js b/packages/theme/src/tabs/old-theme.js
new file mode 100644
index 000000000..b940c0fc6
--- /dev/null
+++ b/packages/theme/src/tabs/old-theme.js
@@ -0,0 +1,17 @@
+export const tinyTabsOldTheme = {
+  'ti-tabs-content-margin-horizontal': 'var(--ti-common-space-6x, 24px)',
+  'ti-tabs-content-margin-vertical': 'calc(var(--ti-common-space-base, 4px) * 3.75)',
+  'ti-tabs-more-left-box-height': 'var(--ti-common-size-10x, 40px)',
+  'ti-tabs-more-icon-height': 'calc(var(--ti-common-size-base, 4px) * 10.25)',
+  'ti-tabs-more-icon-padding-horizontal': '8.5px',
+  'ti-tabs-dropdown-more-margin-top': 'var(--ti-common-space-3x, 12px)',
+  'ti-tabs-item-active-border-weight': 'var(--ti-common-border-weight-2, 3px)',
+  'ti-tabs-item-font-size': 'var(--ti-common-font-size-1, 14px)',
+  'ti-tabs-item-margin-right': 'var(--ti-common-space-10x, 40px)',
+  'ti-tabs-dark-item-height': 'calc(var(--ti-common-space-base, 4px) * 9.25)',
+  'ti-tabs-dark-bg-color-hover': 'var(--ti-common-color-bg-dark-emphasize, #5c6173)',
+  'ti-tabs-item-card-hover-font-weight': 'var(--ti-common-font-weight-5, 500)',
+  'ti-tabs-small-item-font-size': 'var(--ti-common-font-size-1, 14px)',
+  'ti-tabs-height': 'var(--ti-common-size-10x, 40px)',
+  'ti-tabs-header-font-weight-active': 'var(--ti-common-font-weight-5, 500)'
+}
diff --git a/packages/theme/src/tabs/smb-theme.js b/packages/theme/src/tabs/smb-theme.js
deleted file mode 100644
index 0a8088502..000000000
--- a/packages/theme/src/tabs/smb-theme.js
+++ /dev/null
@@ -1,17 +0,0 @@
-export const tinyTabsSmbTheme = {
-  'ti-tabs-height': 'var(--ti-common-size-12x)',
-  'ti-tabs-dark-item-height': 'calc(var(--ti-common-size-base) * 11.75)',
-  'ti-tabs-header-font-weight-active': 'var(--ti-common-font-weight-bold)',
-  'ti-tabs-item-font-size': 'var(--ti-common-font-size-2)',
-  'ti-tabs-item-card-hover-font-weight': 'var(--ti-common-font-weight-bold)',
-  'ti-tabs-item-margin-right': 'var(--ti-common-space-8x)',
-  'ti-tabs-item-active-border-weight': 'var(--ti-common-border-weight-1)',
-  'ti-tabs-more-icon-padding-horizontal': '13.5px',
-  'ti-tabs-more-icon-height': 'calc(var(--ti-common-space-base) * 13)',
-  'ti-tabs-more-left-box-height': 'calc(var(--ti-common-size-base) * 13)',
-  'ti-tabs-dropdown-more-margin-top': 'var(--ti-common-space-base)',
-  'ti-tabs-content-margin-vertical': 'var(--ti-common-space-3x)',
-  'ti-tabs-content-margin-horizontal': 'var(--ti-common-space-0)',
-  'ti-tabs-dark-bg-color-hover': 'var(--ti-common-color-icon-graybg-hover)',
-  'ti-tabs-small-item-font-size': 'var(--ti-common-font-size-2)'
-}
diff --git a/packages/theme/src/tabs/vars.less b/packages/theme/src/tabs/vars.less
index de04ecdd8..e186c4862 100644
--- a/packages/theme/src/tabs/vars.less
+++ b/packages/theme/src/tabs/vars.less
@@ -14,7 +14,7 @@
   // 标签栏选中项边框色(除bordercard类)
   --ti-tabs-header-font-active-border-color: var(--ti-common-color-line-active, #5e7ce0);
   // 标签栏选中项字重
-  --ti-tabs-header-font-weight-active: var(--ti-common-font-weight-5, 500);
+  --ti-tabs-header-font-weight-active: var(--ti-common-font-weight-bold);
   // 标签栏(选中|悬浮)项文本色(除bordercard类)
   --ti-tabs-header-font-active-text-color: var(--ti-common-color-primary-normal, #5e7ce0);
   // 标签栏(更多选项|加号按钮)悬浮文本色
@@ -42,7 +42,7 @@
   // 标签页内容字号
   --ti-tabs-content-font-size: var(--ti-common-font-size-2, 16px);
   // card类型(无size属性)标签项高度
-  --ti-tabs-height: var(--ti-common-size-10x, 40px);
+  --ti-tabs-height: var(--ti-common-size-12x);
   // card类型未选中项文本色
   --ti-tabs-header-font-normal-text-color: var(--ti-common-color-text-primary, #252b3a);
   // 分隔符类型未选中项文本色
@@ -72,7 +72,7 @@
   // card类型small尺寸标签项水平内边距(new)
   --ti-tabs-small-separator-padding-horizontal: var(--ti-common-size-3x, 12px);
   // card类型small尺寸标签项字号(new)
-  --ti-tabs-small-item-font-size: var(--ti-common-font-size-1, 14px);
+  --ti-tabs-small-item-font-size: var(--ti-common-font-size-2);
   // card类型标签项水平内边距
   --ti-tabs-item-padding-horizontal: var(--ti-common-space-3x, 12px);
   // card类型选中项底部小滑块厚度(hide)
@@ -88,7 +88,7 @@
   // card类型标签项默认上|右边框色
   --ti-tabs-item-card-border-color: var(--ti-common-color-transparent, transparent);
   // card类型标签项悬浮字重
-  --ti-tabs-item-card-hover-font-weight: var(--ti-common-font-weight-5, 500);
+  --ti-tabs-item-card-hover-font-weight: var(--ti-common-font-weight-bold);
   // bordercard类型选中项圆角
   --ti-tabs-dark-border-radius: var(--ti-common-border-radius-normal, 2px) var(--ti-common-border-radius-normal, 2px) 0
     0;
@@ -99,7 +99,7 @@
   // bordercard类型非选中项悬浮文本色
   --ti-tabs-dark-text-color-hover: var(--ti-common-color-text-white, #fff);
   // bordercard类型非选中项悬浮背景色
-  --ti-tabs-dark-bg-color-hover: var(--ti-common-color-bg-dark-emphasize, #5c6173);
+  --ti-tabs-dark-bg-color-hover: var(--ti-common-color-icon-graybg-hover);
   // bordercard类型非选中项文本色
   --ti-tabs-dark-text-color: var(--ti-common-color-text-darkbg, #adb0b8);
   // bordercard类型标签项上外边距
@@ -111,17 +111,17 @@
   // bordercard类型默认背景色
   --ti-tabs-header-dark-bg-color: var(--ti-common-color-bg-dark-normal, #464c59);
   // bordercard类型标签项高度
-  --ti-tabs-dark-item-height: calc(var(--ti-common-space-base, 4px) * 9.25);
+  --ti-tabs-dark-item-height: calc(var(--ti-common-size-base) * 11.75);
   // 标签项超出时上下按钮尺寸[3.9.1新增]
   --ti-tabs-prev-next-btn-icon-size: var(--ti-common-font-size-base, 12px);
   // 标签项默认右外边距
-  --ti-tabs-item-margin-right: var(--ti-common-space-10x, 40px);
+  --ti-tabs-item-margin-right: var(--ti-common-space-8x);
   // 标签项active边框样式(hide)
   --ti-tabs-item-active-border-style: var(--ti-common-border-style-solid, solid);
   // 标签项底部边框样式(hide)
   --ti-tabs-item-bottom-border-style: var(--ti-common-border-style-solid, solid);
   // 横向标签栏字号
-  --ti-tabs-item-font-size: var(--ti-common-font-size-1, 14px);
+  --ti-tabs-item-font-size: var(--ti-common-font-size-2);
   // 纵向标签栏非选中项背景色
   --ti-tabs-header-bg-color: var(--ti-common-color-bg-disabled, #f5f5f6);
   // 纵向标签栏字号
@@ -129,7 +129,7 @@
   // 竖向标签项水平内边距
   --ti-tabs-item-vertical-padding-horizontal: var(--ti-common-space-5x, 20px);
   // 选中标签项小滑块厚度(不含card类型)
-  --ti-tabs-item-active-border-weight: var(--ti-common-border-weight-2, 3px);
+  --ti-tabs-item-active-border-weight: var(--ti-common-border-weight-1);
   // 选中标签项小滑块边框色
   --ti-tabs-item-active-border-color: var(--ti-tabs-header-font-active-border-color);
   // 可关闭项关闭按钮悬浮背景色
@@ -149,25 +149,25 @@
   // 可关闭项左外边距
   --ti-tabs-icon-close-margin-left: 5px;
   // 更多下拉框上外边距
-  --ti-tabs-dropdown-more-margin-top: var(--ti-common-space-3x, 12px);
+  --ti-tabs-dropdown-more-margin-top: var(--ti-common-space-base);
   // 更多下拉框项悬浮背景色
   --ti-tabs-dropdown-more-item-hover-bg-color: var(--ti-common-color-hover-background, #f2f5fc);
   // 更多下拉框项悬浮字重
   --ti-tabs-dropdown-more-item-hover-font-weight: var(--ti-common-font-weight-5, 500);
   // 头部更多按钮水平内边距
-  --ti-tabs-more-icon-padding-horizontal: 8.5px;
+  --ti-tabs-more-icon-padding-horizontal: 13.5px;
   // 头部更多图标盒子高度
-  --ti-tabs-more-icon-height: calc(var(--ti-common-size-base, 4px) * 10.25);
+  --ti-tabs-more-icon-height: calc(var(--ti-common-space-base) * 13);
   // 头部更多图标尺寸[3.9.1新增]
   --ti-tabs-more-icon-size: var(--ti-common-font-size-2, 16px);
   // 头部更多按钮左侧盒子阴影高度
-  --ti-tabs-more-left-box-height: var(--ti-common-size-10x, 40px);
+  --ti-tabs-more-left-box-height: calc(var(--ti-common-size-base) * 13);
   // 头部更多按钮左侧盒子阴影
   --ti-tabs-more-left-box-shadow: -3px 0px 4px 0px rgba(0, 0, 0, 0.08);
   // 内容垂直外边距
-  --ti-tabs-content-margin-vertical: calc(var(--ti-common-space-base, 4px) * 3.75);
+  --ti-tabs-content-margin-vertical: var(--ti-common-space-3x);
   // 内容水平外边距
-  --ti-tabs-content-margin-horizontal: var(--ti-common-space-6x, 24px);
+  --ti-tabs-content-margin-horizontal: var(--ti-common-space-0);
   // buttoncard类型标签栏背景色
   --ti-tabs-button-card-nav-bg-color: var(--ti-common-color-bg-6, rgba(0, 0, 0, 0.05));
   // buttoncard类型选项文本色
diff --git a/packages/theme/src/tag/old-theme.js b/packages/theme/src/tag/old-theme.js
new file mode 100644
index 000000000..b21d9af01
--- /dev/null
+++ b/packages/theme/src/tag/old-theme.js
@@ -0,0 +1,26 @@
+export const tinyTagOldTheme = {
+  'ti-tag-disabled-background-color': 'rgba(0, 0, 0, 0.05)',
+  'ti-tag-info-background-color': 'var(--ti-common-color-info-bg, rgba(51, 51, 51, 0.06))',
+  'ti-tag-primary-background-color': 'var(--ti-common-color-bg-normal, #eef0f5)',
+  'ti-tag-primary-close-opacity': '0.5',
+  'ti-tag-primary-close-hover-icon-color': 'var(--ti-common-color-text-secondary, #575d6c)',
+  'ti-tag-primary-close-icon-color': 'var(--ti-common-color-text-secondary, #575d6c)',
+  'ti-tag-primary-text-color': 'var(--ti-common-color-text-secondary, #575d6c)',
+  'ti-tag-close-small-margin-right': 'var(--ti-common-space-0, 0px)',
+  'ti-tag-close-small-margin-left': 'var(--ti-common-space-6, 6px)',
+  'ti-tag-close-medium-margin-right': 'var(--ti-common-space-0, 0px)',
+  'ti-tag-close-medium-margin-left': 'var(--ti-common-space-6, 6px)',
+  'ti-tag-close-margin-right': 'var(--ti-common-space-0, 0px)',
+  'ti-tag-close-margin-left': 'var(--ti-common-space-6, 6px)',
+  'ti-tag-close-font-size': 'var(--ti-common-font-size-1, 14px)',
+  'ti-tag-font-size': 'var(--ti-common-font-size-base, 12px)',
+  'ti-tag-small-border-radius': 'var(--ti-common-border-radius-normal, 2px)',
+  'ti-tag-border-radius': 'var(--ti-common-border-radius-normal, 2px)',
+  'ti-tag-border-weight': 'var(--ti-common-border-weight-normal, 1px)',
+  'ti-tag-mini-height': 'var(--ti-common-size-4x, 16px)',
+  'ti-tag-small-padding-horizontal': 'var(--ti-common-space-2x, 8px)',
+  'ti-tag-small-height': 'var(--ti-common-line-height-4, 20px)',
+  'ti-tag-medium-padding-horizontal': 'var(--ti-common-space-2x, 8px)',
+  'ti-tag-medium-height': 'var(--ti-common-size-6x, 24px)',
+  'ti-tag-height': 'calc(var(--ti-common-size-base, 4px) * 5.5)'
+}
diff --git a/packages/theme/src/tag/smb-theme.js b/packages/theme/src/tag/smb-theme.js
deleted file mode 100644
index fc405f5fb..000000000
--- a/packages/theme/src/tag/smb-theme.js
+++ /dev/null
@@ -1,26 +0,0 @@
-export const tinyTagSMBTheme = {
-  'ti-tag-primary-close-icon-color': 'var(--ti-common-color-bg-secondary)',
-  'ti-tag-font-size': 'var(--ti-common-font-size-1)',
-  'ti-tag-small-height': 'var(--ti-common-line-height-base)',
-  'ti-tag-height': 'var(--ti-common-line-height-2)',
-  'ti-tag-medium-height': 'var(--ti-common-size-height-normal)',
-  'ti-tag-medium-padding-horizontal': 'var(--ti-common-space-3x)',
-  'ti-tag-small-padding-horizontal': 'var(--ti-common-space-base)',
-  'ti-tag-small-border-radius': 'var(--ti-common-border-radius-1)',
-  'ti-tag-primary-background-color': 'var(--ti-common-color-bg-6)',
-  'ti-tag-info-background-color': 'var(--ti-common-color-bg-light-normal)',
-  'ti-tag-border-weight': '0',
-  'ti-tag-border-radius': 'var(--ti-common-border-radius-2)',
-  'ti-tag-close-font-size': 'var(--ti-common-font-size-2)',
-  'ti-tag-close-margin-left': 'var(--ti-common-space-base)',
-  'ti-tag-disabled-background-color': 'var(--ti-common-color-bg-disabled)',
-  'ti-tag-close-margin-right': 'calc(var(--ti-common-space-base) * -1)',
-  'ti-tag-close-medium-margin-left': 'var(--ti-common-space-2x)',
-  'ti-tag-close-medium-margin-right': 'calc(var(--ti-common-space-base) * -1)',
-  'ti-tag-close-small-margin-left': 'var(--ti-common-space-2)',
-  'ti-tag-close-small-margin-right': 'calc(var(--ti-common-space-2) * -1)',
-  'ti-tag-primary-close-opacity': '1',
-  'ti-tag-mini-height': 'var(--ti-common-size-3x)',
-  'ti-tag-primary-text-color': 'var(--ti-common-color-primary-normal)',
-  'ti-tag-primary-close-hover-icon-color': 'var(--ti-common-color-icon-graybg-hover)'
-}
diff --git a/packages/theme/src/tag/vars.less b/packages/theme/src/tag/vars.less
index 71ea015ed..84d9e73e1 100644
--- a/packages/theme/src/tag/vars.less
+++ b/packages/theme/src/tag/vars.less
@@ -12,53 +12,53 @@
 
 .component-css-vars-tag() {
   // 标签默认高度
-  --ti-tag-height: calc(var(--ti-common-size-base, 4px) * 5.5);
+  --ti-tag-height: var(--ti-common-line-height-2);
   // 中等标签高度
-  --ti-tag-medium-height: var(--ti-common-size-6x, 24px);
+  --ti-tag-medium-height: var(--ti-common-size-height-normal);
   // 中等标签水平内边距
-  --ti-tag-medium-padding-horizontal: var(--ti-common-space-2x, 8px);
+  --ti-tag-medium-padding-horizontal: var(--ti-common-space-3x);
   // 中型标签圆角
   --ti-tag-medium-border-radius: var(--ti-common-border-radius-normal, 2px);
   // 小型标签高度
-  --ti-tag-small-height: var(--ti-common-line-height-4, 20px);
+  --ti-tag-small-height: var(--ti-common-line-height-base);
   // 小型标签水平内边距
-  --ti-tag-small-padding-horizontal: var(--ti-common-space-2x, 8px);
+  --ti-tag-small-padding-horizontal: var(--ti-common-space-base);
   // 超小标签高度
-  --ti-tag-mini-height: var(--ti-common-size-4x, 16px);
+  --ti-tag-mini-height: var(--ti-common-size-3x);
   // 标签边框厚度
-  --ti-tag-border-weight: var(--ti-common-border-weight-normal, 1px);
+  --ti-tag-border-weight: 0;
   // 标签圆角
-  --ti-tag-border-radius: var(--ti-common-border-radius-normal, 2px);
+  --ti-tag-border-radius: var(--ti-common-border-radius-2);
   // 小型|超小标签圆角
-  --ti-tag-small-border-radius: var(--ti-common-border-radius-normal, 2px);
+  --ti-tag-small-border-radius: var(--ti-common-border-radius-1);
   // 标签默认字号
-  --ti-tag-font-size: var(--ti-common-font-size-base, 12px);
+  --ti-tag-font-size: var(--ti-common-font-size-1);
   // 标签关闭按钮字号
-  --ti-tag-close-font-size: var(--ti-common-font-size-1, 14px);
+  --ti-tag-close-font-size: var(--ti-common-font-size-2);
   // 标签关闭按钮默认左外边距
-  --ti-tag-close-margin-left: var(--ti-common-space-6, 6px);
+  --ti-tag-close-margin-left: var(--ti-common-space-base);
   // 标签关闭按钮默认右外边距
-  --ti-tag-close-margin-right: var(--ti-common-space-0, 0px);
+  --ti-tag-close-margin-right: calc(var(--ti-common-space-base) * -1);
   // 中型标签关闭按钮左外边距
-  --ti-tag-close-medium-margin-left: var(--ti-common-space-6, 6px);
+  --ti-tag-close-medium-margin-left: var(--ti-common-space-2x);
   // 中等标签关闭按钮右外边距
-  --ti-tag-close-medium-margin-right: var(--ti-common-space-0, 0px);
+  --ti-tag-close-medium-margin-right: calc(var(--ti-common-space-base) * -1);
   // (小型|超小)标签关闭按钮左外边距
-  --ti-tag-close-small-margin-left: var(--ti-common-space-6, 6px);
+  --ti-tag-close-small-margin-left: var(--ti-common-space-2);
   // (小型|超小)标签关闭按钮右外边距
-  --ti-tag-close-small-margin-right: var(--ti-common-space-0, 0px);
+  --ti-tag-close-small-margin-right: calc(var(--ti-common-space-2) * -1);
   // light主题标签默认文本色
-  --ti-tag-primary-text-color: var(--ti-common-color-text-secondary, #575d6c);
+  --ti-tag-primary-text-color: var(--ti-common-color-primary-normal);
   // light主题标签默认关闭图标色
-  --ti-tag-primary-close-icon-color: var(--ti-common-color-text-secondary, #575d6c);
+  --ti-tag-primary-close-icon-color: var(--ti-common-color-bg-secondary);
   // light主题标签默认关闭图标悬浮色
-  --ti-tag-primary-close-hover-icon-color: var(--ti-common-color-text-secondary, #575d6c);
+  --ti-tag-primary-close-hover-icon-color: var(--ti-common-color-icon-graybg-hover);
   // light主题标签默认关闭按钮透明度(hide)
-  --ti-tag-primary-close-opacity: 0.5;
+  --ti-tag-primary-close-opacity: 1;
   // light主题标签默认边框色
   --ti-tag-primary-border-color: var(--ti-common-color-bg-normal, #eef0f5);
   // light主题标签默认背景色
-  --ti-tag-primary-background-color: var(--ti-common-color-bg-normal, #eef0f5);
+  --ti-tag-primary-background-color: var(--ti-common-color-bg-6);
 
   // light主题警告类标签(文本|边框)色
   --ti-tag-warning-text-color: var(--ti-common-color-warn-text, #e37d29);
@@ -86,7 +86,7 @@
   // light主题信息类标签边框色
   --ti-tag-info-border-color: var(--ti-common-color-info-border, #d3d4d6);
   // light主题信息类标签背景色
-  --ti-tag-info-background-color: var(--ti-common-color-info-bg, rgba(51, 51, 51, 0.06));
+  --ti-tag-info-background-color: var(--ti-common-color-bg-light-normal);
 
   // dark主题标签默认文本色
   --ti-tag-dark-text-color: var(--ti-common-color-light, #fff);
@@ -157,5 +157,5 @@
   // grey标签背景色
   --ti-tag-grey-bg-color: #e6e6e6;
   // 禁用背景色
-  --ti-tag-disabled-background-color: rgba(0, 0, 0, 0.05);
+  --ti-tag-disabled-background-color: var(--ti-common-color-bg-disabled);
 }
diff --git a/packages/theme/src/text-popup/old-theme.js b/packages/theme/src/text-popup/old-theme.js
new file mode 100644
index 000000000..e1d8f52e9
--- /dev/null
+++ b/packages/theme/src/text-popup/old-theme.js
@@ -0,0 +1,7 @@
+export const tinyTextPopupOldTheme = {
+  'ti-text-popup-padding-horizontal': 'calc(var(--ti-common-space-2x, 8px) + 2px)',
+  'ti-text-popup-padding-vertical': 'calc(var(--ti-common-space-2x, 8px) - 2px)',
+  'ti-text-popup-border-color': 'var(--ti-common-color-border, #adb0b8)',
+  'ti-text-popup-font-size': 'var(--ti-common-font-size-base, 12px)',
+  'ti-text-popup-height': 'var(--ti-common-size-7x, 28px)'
+}
diff --git a/packages/theme/src/text-popup/smb-theme.js b/packages/theme/src/text-popup/smb-theme.js
deleted file mode 100644
index 4d00448fa..000000000
--- a/packages/theme/src/text-popup/smb-theme.js
+++ /dev/null
@@ -1,7 +0,0 @@
-export const tinyTextPopupSmbTheme = {
-  'ti-text-popup-padding-vertical': '5px',
-  'ti-text-popup-padding-horizontal': 'var(--ti-common-space-3x)',
-  'ti-text-popup-font-size': 'var(--ti-common-font-size-1)',
-  'ti-text-popup-border-color': 'var(--ti-common-color-line-normal)',
-  'ti-text-popup-height': '32px'
-}
diff --git a/packages/theme/src/text-popup/vars.less b/packages/theme/src/text-popup/vars.less
index 027bfed26..ada2e5135 100644
--- a/packages/theme/src/text-popup/vars.less
+++ b/packages/theme/src/text-popup/vars.less
@@ -14,13 +14,13 @@
   // 输入框圆角
   --ti-text-popup-border-radius: var(--ti-common-border-radius-normal, 2px);
   // 输入框高度
-  --ti-text-popup-height: var(--ti-common-size-7x, 28px);
+  --ti-text-popup-height: 32px;
   // 输入框字号
-  --ti-text-popup-font-size: var(--ti-common-font-size-base, 12px);
+  --ti-text-popup-font-size: var(--ti-common-font-size-1);
   // 输入框字族
   --ti-text-popup-font-family: var(--ti-common-font-family, 'Helvetica', 'Arial', 'PingFangSC-Regular', 'Hiragino Sans GB', 'Microsoft YaHei', '微软雅黑', 'Microsoft JhengHei');
   // 输入框边框色
-  --ti-text-popup-border-color: var(--ti-common-color-border, #adb0b8);
+  --ti-text-popup-border-color: var(--ti-common-color-line-normal);
   // 输入框聚焦展开时阴影
   --ti-text-popup-box-shadow: 0 0 1px 1px rgba(175, 175, 175, 0.3);
   // 输入框悬浮边框色
@@ -28,7 +28,7 @@
   //输入框聚焦边框色
   --ti-text-popup-focus-border-color: var(--ti-common-color-line-active, #5e7ce0);
   // 输入框垂直内边距
-  --ti-text-popup-padding-vertical: calc(var(--ti-common-space-2x, 8px) - 2px);
+  --ti-text-popup-padding-vertical: 5px;
   // 输入框水平内边距
-  --ti-text-popup-padding-horizontal: calc(var(--ti-common-space-2x, 8px) + 2px);
+  --ti-text-popup-padding-horizontal: var(--ti-common-space-3x);
 }
diff --git a/packages/theme/src/textarea/old-theme.js b/packages/theme/src/textarea/old-theme.js
new file mode 100644
index 000000000..7479291bd
--- /dev/null
+++ b/packages/theme/src/textarea/old-theme.js
@@ -0,0 +1,19 @@
+export const tinyTextareaOldTheme = {
+  'ti-textarea-count-padding-right': 'var(--ti-common-space-0, 0px)',
+  'ti-textarea-count-text-length-color': 'var(--ti-common-color-text-weaken, #8a8e99)',
+  'ti-textarea-count-border-radius': '0',
+  'ti-textarea-inner-width': '100%',
+  'ti-textarea-count-width': 'auto',
+  'ti-textarea-active-border-color': 'var(--ti-common-color-line-active, #5e7ce0)',
+  'ti-textarea-count-right': '16px',
+  'ti-textarea-count-bottom': '5px',
+  'ti-textarea-padding-bottom': 'var(--ti-common-space-2x, 8px)',
+  'ti-textarea-padding-right': 'var(--ti-common-space-2x, 8px)',
+  'ti-textarea-padding-horizontal': 'var(--ti-common-space-2x, 8px)',
+  'ti-textarea-padding-vertical': 'var(--ti-common-space-2x, 8px)',
+  'ti-textarea-exceed-text-color': 'var(--ti-common-bg-primary, #c7000b)',
+  'ti-textarea-disabled-bg-color': 'var(--ti-common-color-bg-disabled, #f5f5f6)',
+  'ti-textarea-placeholder-text-color': 'var(--ti-common-color-placeholder, #adb0b8)',
+  'ti-textarea-border-color': 'var(--ti-common-color-border, #adb0b8)',
+  'ti-textarea-count-font-size': 'var(--ti-common-font-size-base, 12px)'
+}
diff --git a/packages/theme/src/textarea/smb-theme.js b/packages/theme/src/textarea/smb-theme.js
deleted file mode 100644
index 8fc433e28..000000000
--- a/packages/theme/src/textarea/smb-theme.js
+++ /dev/null
@@ -1,24 +0,0 @@
-export const tinyTextareaSmbTheme = {
-  'ti-textarea-border-color': 'var(--ti-common-color-line-normal)',
-  'ti-textarea-count-font-size': 'var(--ti-common-font-size-0)',
-  'ti-textarea-padding-horizontal': 'var(--ti-common-space-3x)',
-  'ti-textarea-padding-right': 'var(--ti-common-space-base)',
-  'ti-textarea-active-border-color': 'var(--ti-common-color-line-active)',
-  'ti-textarea-count-width': 'calc(100% - 17px)',
-  'ti-textarea-count-bottom': '1px',
-  'ti-textarea-inner-width': '100%',
-  'ti-textarea-count-right': 'var(--ti-common-font-size-2)',
-  'ti-textarea-padding-vertical': 'var(--ti-common-space-2x)',
-  'ti-textarea-count-border-radius': 'var(--ti-common-border-radius-3)',
-  'ti-textarea-count-text-length-color': 'var(--ti-common-color-text-primary)',
-  'ti-textarea-placeholder-text-color': 'var(--ti-common-color-text-weaken)',
-  'ti-textarea-scrollbar-width': '8px',
-  'ti-textarea-scrollbar-bg-color': 'var(--ti-common-color-bg-dark-disabled)',
-  'ti-textarea-scrollbar-border-radius': 'var(--ti-common-border-radius-2)',
-  'ti-textarea-scrollbar-track-piece-bg-color': '#fff',
-  'ti-textarea-scrollbar-hover-bg-color': 'var(--ti-common-color-bg-dark-disabled)',
-  'ti-textarea-count-padding-right': 'var(--ti-common-space-base)',
-  'ti-textarea-padding-bottom': 'var(--ti-common-space-4x)',
-  'ti-textarea-disabled-bg-color': '#f2f2f2',
-  'ti-textarea-exceed-text-color': '#c7000b'
-}
diff --git a/packages/theme/src/textarea/vars.less b/packages/theme/src/textarea/vars.less
index 243068f1b..2f53ee76c 100644
--- a/packages/theme/src/textarea/vars.less
+++ b/packages/theme/src/textarea/vars.less
@@ -18,51 +18,51 @@
   // 文本域字体大小
   --ti-textarea-font-size: var(--ti-common-font-size-base, 12px);
   // 文本域计数器字体大小
-  --ti-textarea-count-font-size: var(--ti-common-font-size-base, 12px);
+  --ti-textarea-count-font-size: var(--ti-common-font-size-0);
   // 文本域高度
   --ti-textarea-height: var(--ti-common-size-height-normal, 28px);
   // 文本域边框圆角
   --ti-textarea-border-radius: var(--ti-common-border-radius-normal, 2px);
   // 文本域边框色
-  --ti-textarea-border-color: var(--ti-common-color-border, #adb0b8);
+  --ti-textarea-border-color: var(--ti-common-color-line-normal);
   // 文本域内层hover时显示的边框颜色
   --ti-textarea-inner-hover-border-color: var(--ti-common-color-border-hover, #575d6c);
   // 文本域内层active时显示的边框颜色
   --ti-textarea-inner-active-border-color: var(--ti-common-color-line-active, #5e7ce0);
   // 文本域占位符文本颜色
-  --ti-textarea-placeholder-text-color: var(--ti-common-color-placeholder, #adb0b8);
+  --ti-textarea-placeholder-text-color: var(--ti-common-color-text-weaken);
   // 文本域disabled时的文本颜色
   --ti-textarea-disabled-text-color: var(--ti-common-color-text-disabled, #adb0b8);
   // 文本域disabled时的背景颜色
-  --ti-textarea-disabled-bg-color: var(--ti-common-color-bg-disabled, #f5f5f6);
+  --ti-textarea-disabled-bg-color: #f2f2f2;
   // 文本域exceed时的文本颜色
-  --ti-textarea-exceed-text-color: var(--ti-common-bg-primary, #c7000b);
+  --ti-textarea-exceed-text-color: #c7000b;
   // 计数器的颜色
   --ti-textarea-count-color: var(--ti-common-color-text-weaken, #8a8e99);
   // 文本框垂直方向内边距
-  --ti-textarea-padding-vertical: var(--ti-common-space-2x, 8px);
+  --ti-textarea-padding-vertical: var(--ti-common-space-2x);
   // 文本框水平方向内边距
-  --ti-textarea-padding-horizontal: var(--ti-common-space-2x, 8px);
+  --ti-textarea-padding-horizontal: var(--ti-common-space-3x);
   // 文本框右侧内边距
-  --ti-textarea-padding-right: var(--ti-common-space-2x, 8px);
+  --ti-textarea-padding-right: var(--ti-common-space-base);
   // 文本框底部内边距
-  --ti-textarea-padding-bottom: var(--ti-common-space-2x, 8px);
+  --ti-textarea-padding-bottom: var(--ti-common-space-4x);
   // 计数器底部距离
-  --ti-textarea-count-bottom: 5px;
+  --ti-textarea-count-bottom: 1px;
   // 计数器右侧距离
-  --ti-textarea-count-right: 16px;
+  --ti-textarea-count-right: var(--ti-common-font-size-2);
   // 文本域active时显示的边框颜色
-  --ti-textarea-active-border-color: var(--ti-common-color-line-active, #5e7ce0);
+  --ti-textarea-active-border-color: var(--ti-common-color-line-active);
   // 计数器宽度
-  --ti-textarea-count-width: auto;
+  --ti-textarea-count-width: calc(100% - 17px);
   // 文本域宽度
   --ti-textarea-inner-width: 100%;
   // 计数器圆角
-  --ti-textarea-count-border-radius: 0;
+  --ti-textarea-count-border-radius: var(--ti-common-border-radius-3);
   // 计数器文本字数颜色
-  --ti-textarea-count-text-length-color: var(--ti-common-color-text-weaken, #8a8e99);
+  --ti-textarea-count-text-length-color: var(--ti-common-color-text-primary);
   // 计数器右侧内边距
-  --ti-textarea-count-padding-right: var(--ti-common-space-0, 0px);
+  --ti-textarea-count-padding-right: var(--ti-common-space-base);
   // 文本框字体
   --ti-textarea-font-family: var(--ti-common-font-family, 'Helvetica', 'Arial', 'PingFangSC-Regular', 'Hiragino Sans GB', 'Microsoft YaHei', '微软雅黑', 'Microsoft JhengHei');
   // 计数器行高
diff --git a/packages/theme/src/theme/smb-theme/index.js b/packages/theme/src/theme/smb-theme/index.js
index 0a5d91c87..ea9b86fa9 100644
--- a/packages/theme/src/theme/smb-theme/index.js
+++ b/packages/theme/src/theme/smb-theme/index.js
@@ -456,4 +456,6 @@ export const tinyBaseSmbTheme = {
   'ti-common-input-font-family': 'var(--ti-base-font-family)' // 输入框字体
 }
 
-export * from './component.js'
+// export * from './component.js'
+
+export const concatTheme = {}
diff --git a/packages/theme/src/time-panel/old-theme.js b/packages/theme/src/time-panel/old-theme.js
new file mode 100644
index 000000000..ffdf4e815
--- /dev/null
+++ b/packages/theme/src/time-panel/old-theme.js
@@ -0,0 +1,11 @@
+export const tinyTimePanelOldTheme = {
+  'ti-time-panel-width': '180px',
+  'ti-time-panel-footer-margin-right': '0',
+  'ti-time-panel-footer-padding-right': '0',
+  'ti-time-panel-footer-padding-top': '4px',
+  'ti-time-panel-footer-height': '36px',
+  'ti-time-panel-padding-right': '0',
+  'ti-time-panel-btn-cancel-display': 'inline-block',
+  'ti-time-panel-header-display': 'none',
+  'ti-time-panel-content-split-line-display': 'block'
+}
diff --git a/packages/theme/src/time-panel/smb-theme.js b/packages/theme/src/time-panel/smb-theme.js
deleted file mode 100644
index b95f8bc8e..000000000
--- a/packages/theme/src/time-panel/smb-theme.js
+++ /dev/null
@@ -1,11 +0,0 @@
-export const tinyTimePanelSmbTheme = {
-  'ti-time-panel-footer-height': 'var(--ti-common-size-14x)',
-  'ti-time-panel-footer-padding-top': 'var(--ti-common-size-4x)',
-  'ti-time-panel-footer-padding-right': 'var(--ti-common-size-4x)',
-  'ti-time-panel-padding-right': 'calc(var(--ti-common-size-4x) - 2px)',
-  'ti-time-panel-footer-margin-right': 'calc(2px - var(--ti-common-size-4x))',
-  'ti-time-panel-width': '220px',
-  'ti-time-panel-content-split-line-display': 'none',
-  'ti-time-panel-btn-cancel-display': 'none',
-  'ti-time-panel-header-display': 'block'
-}
diff --git a/packages/theme/src/time-panel/vars.less b/packages/theme/src/time-panel/vars.less
index a163c9259..63c6cb23b 100644
--- a/packages/theme/src/time-panel/vars.less
+++ b/packages/theme/src/time-panel/vars.less
@@ -12,23 +12,23 @@
 
 .component-css-vars-time-panel() {
   --ti-time-panel-box-shadow: 0 2px 12px 0 rgba(0, 0, 0, 0.1);
-  --ti-time-panel-content-split-line-display: block;
-  --ti-time-panel-header-display: none;
-  --ti-time-panel-btn-cancel-display: inline-block;
+  --ti-time-panel-content-split-line-display: none;
+  --ti-time-panel-header-display: block;
+  --ti-time-panel-btn-cancel-display: none;
   --ti-time-panel-btn-bg-color: transparent;
   --ti-time-panel-btn-padding-vertical: 0;
   --ti-time-panel-btn-padding-horizontal: 5px;
   --ti-time-panel-btn-border-radius: var(--ti-common-border-radius-normal, 2px);
   --ti-time-panel-btn-height: 28px;
-  --ti-time-panel-padding-right: 0;
+  --ti-time-panel-padding-right: calc(var(--ti-common-size-4x) - 2px);
   --ti-time-panel-btn-min-width: inherit;
   --ti-time-panel-btn-font-weight: 800;
   --ti-time-panel-btn-confirm-hover-bg-color: transparent;
-  --ti-time-panel-footer-height: 36px;
-  --ti-time-panel-footer-padding-top: 4px;
-  --ti-time-panel-footer-padding-right: 0;
-  --ti-time-panel-footer-margin-right: 0;
-  --ti-time-panel-width: 180px;
+  --ti-time-panel-footer-height: var(--ti-common-size-14x);
+  --ti-time-panel-footer-padding-top: var(--ti-common-size-4x);
+  --ti-time-panel-footer-padding-right: var(--ti-common-size-4x);
+  --ti-time-panel-footer-margin-right: calc(2px - var(--ti-common-size-4x));
+  --ti-time-panel-width: 220px;
   --ti-time-spinner-list-margin-bottom: 0px;
   --ti-time-spinner-list-margin-top: 0px;
   --ti-time-panel-btn-text-color: #303133;
diff --git a/packages/theme/src/time-range/old-theme.js b/packages/theme/src/time-range/old-theme.js
new file mode 100644
index 000000000..b3032dfe5
--- /dev/null
+++ b/packages/theme/src/time-range/old-theme.js
@@ -0,0 +1,16 @@
+export const tinyTimeRangeOldTheme = {
+  'ti-time-range-picker-footer-padding-right': '0',
+  'ti-time-range-picker-footer-padding-top': '4px',
+  'ti-time-range-picker-footer-height': '36px',
+  'ti-time-range-picker-header-margin-left': '0',
+  'ti-time-range-picker-header-color': 'var(--ti-common-color-info-normal, #252b3a)',
+  'ti-time-range-picker-header-border-bottom': '#fff',
+  'ti-time-range-picker-header-text-align': 'center',
+  'ti-time-range-picker-header-title-display': 'none',
+  'ti-time-range-picker-header-margin-bottom': '5px',
+  'ti-time-range-picker-header-line-height': '32px',
+  'ti-time-range-picker-header-height': '32px',
+  'ti-time-range-picker-cell-padding-top': '4px',
+  'ti-time-range-picker-content-padding': '10px',
+  'ti-time-range-picker-header-font-size': 'var(--ti-common-font-size-1, 14px)'
+}
diff --git a/packages/theme/src/time-range/smb-theme.js b/packages/theme/src/time-range/smb-theme.js
deleted file mode 100644
index 7b57ee9a6..000000000
--- a/packages/theme/src/time-range/smb-theme.js
+++ /dev/null
@@ -1,19 +0,0 @@
-export const tinyTimeRangeSmbTheme = {
-  'ti-time-range-picker-content-padding': 'var(--ti-common-space-0)',
-  'ti-time-range-picker-cell-padding-top': 'var(--ti-common-space-0)',
-  'ti-time-range-picker-cell-padding-right': 'var(--ti-common-space-0)',
-  'ti-time-range-picker-cell-padding-bottom': 'var(--ti-common-space-0)',
-  'ti-time-range-picker-header-margin-bottom': 'var(--ti-common-space-0)',
-  'ti-time-range-picker-header-height': 'var(--ti-common-size-height-large)',
-  'ti-time-range-picker-header-line-height': 'calc(var(--ti-common-line-height-6) - 2px)',
-  'ti-time-range-picker-header-text-align': 'left',
-  'ti-time-range-picker-header-title-display': 'flex',
-  'ti-time-range-picker-header-margin-left': 'var(--ti-common-size-4x)',
-  'ti-time-range-picker-header-color': 'var(--ti-base-color-common-2)',
-  'ti-time-range-picker-header-border-bottom': 'var(--ti-common-color-line-dividing)',
-  'ti-time-range-picker-footer-height': 'var(--ti-common-size-14x)',
-  'ti-time-range-picker-footer-padding-top': 'var(--ti-common-size-4x)',
-  'ti-time-range-picker-footer-padding-right': 'var(--ti-common-size-4x)',
-  'ti-time-range-picker-header-font-size': 'var(--ti-common-font-size-base)',
-  'ti-time-panel-btn-cancel-display': 'none'
-}
diff --git a/packages/theme/src/time-range/vars.less b/packages/theme/src/time-range/vars.less
index 70a1773c7..dce8110b7 100644
--- a/packages/theme/src/time-range/vars.less
+++ b/packages/theme/src/time-range/vars.less
@@ -11,22 +11,22 @@
 */
 
 .component-css-vars-time-range-picker() {
-  --ti-time-range-picker-header-font-size: var(--ti-common-font-size-1, 14px);
-  --ti-time-range-picker-content-padding: 10px;
-  --ti-time-range-picker-cell-padding-top: 4px;
+  --ti-time-range-picker-header-font-size: var(--ti-common-font-size-base);
+  --ti-time-range-picker-content-padding: var(--ti-common-space-0);
+  --ti-time-range-picker-cell-padding-top: var(--ti-common-space-0);
   --ti-time-range-picker-content-right: 7px;
   --ti-time-range-picker-content-bottom: 7px;
-  --ti-time-range-picker-header-height: 32px;
-  --ti-time-range-picker-header-line-height: 32px;
-  --ti-time-range-picker-header-margin-bottom: 5px;
-  --ti-time-range-picker-header-title-display: none;
-  --ti-time-range-picker-header-text-align: center;
-  --ti-time-range-picker-header-border-bottom: #fff;
-  --ti-time-range-picker-header-color: var(--ti-common-color-info-normal, #252b3a);
-  --ti-time-range-picker-header-margin-left: 0;
-  --ti-time-range-picker-footer-height: 36px;
-  --ti-time-range-picker-footer-padding-top: 4px;
-  --ti-time-range-picker-footer-padding-right: 0;
+  --ti-time-range-picker-header-height: var(--ti-common-size-height-large);
+  --ti-time-range-picker-header-line-height: calc(var(--ti-common-line-height-6) - 2px);
+  --ti-time-range-picker-header-margin-bottom: var(--ti-common-space-0);
+  --ti-time-range-picker-header-title-display: flex;
+  --ti-time-range-picker-header-text-align: left;
+  --ti-time-range-picker-header-border-bottom: var(--ti-common-color-line-dividing);
+  --ti-time-range-picker-header-color: var(--ti-base-color-common-2);
+  --ti-time-range-picker-header-margin-left: var(--ti-common-size-4x);
+  --ti-time-range-picker-footer-height: var(--ti-common-size-14x);
+  --ti-time-range-picker-footer-padding-top: var(--ti-common-size-4x);
+  --ti-time-range-picker-footer-padding-right: var(--ti-common-size-4x);
   --ti-time-range-picker-btn-cancel-display: inline-block;
   --ti-time-range-picker-btn-bg-color: transparent;
   --ti-time-range-picker-btn-padding-vertical: 0;
diff --git a/packages/theme/src/time-select/old-theme.js b/packages/theme/src/time-select/old-theme.js
new file mode 100644
index 000000000..d4f219acd
--- /dev/null
+++ b/packages/theme/src/time-select/old-theme.js
@@ -0,0 +1,9 @@
+export const tinyTimeSelectOldTheme = {
+  'ti-time-select-content-padding-top': 'unset',
+  'ti-time-select-scrollbar-wrap-max-height': 'unset',
+  'ti-time-select-scrollbar-height': '194px',
+  'ti-time-select-height': '194px',
+  'ti-time-select-item-selected-text-color': 'var(--ti-common-color-text-primary, #252b3a)',
+  'ti-time-select-item-hover-bg-color': 'var(--ti-common-color-hover-background, #5e7ce0)',
+  'ti-time-select-item-padding-horizontal': 'var(--ti-common-size-2x, 8px)'
+}
diff --git a/packages/theme/src/time-select/smb-theme.js b/packages/theme/src/time-select/smb-theme.js
deleted file mode 100644
index 7d849f246..000000000
--- a/packages/theme/src/time-select/smb-theme.js
+++ /dev/null
@@ -1,9 +0,0 @@
-export const tinyTimeSelectSmbTheme = {
-  'ti-time-select-item-hover-bg-color': 'var(--ti-common-color-bg-normal)',
-  'ti-time-select-item-selected-text-color': 'var(--ti-common-color-text-highlight)',
-  'ti-time-select-item-padding-horizontal': 'var(--ti-common-space-4x)',
-  'ti-time-select-height': '242px',
-  'ti-time-select-scrollbar-height': '242px',
-  'ti-time-select-scrollbar-wrap-max-height': 'unset',
-  'ti-time-select-content-padding-top': 'var(--ti-common-space-2x)'
-}
diff --git a/packages/theme/src/time-select/vars.less b/packages/theme/src/time-select/vars.less
index c4edfa563..a5f6f85c0 100644
--- a/packages/theme/src/time-select/vars.less
+++ b/packages/theme/src/time-select/vars.less
@@ -20,18 +20,18 @@
   // 时间选择选项行高
   --ti-time-select-item-line-height: var(--ti-common-size-height-normal, 28px);
   // 时间选择选项左右内边距
-  --ti-time-select-item-padding-horizontal: var(--ti-common-size-2x, 8px);
+  --ti-time-select-item-padding-horizontal: var(--ti-common-space-4x);
   // 时间选择选项悬浮背景色
-  --ti-time-select-item-hover-bg-color: var(--ti-common-color-hover-background, #5e7ce0);
+  --ti-time-select-item-hover-bg-color: var(--ti-common-color-bg-normal);
   // 时间选择选项禁用文本色
   --ti-time-select-item-disabled-text-color: var(--ti-common-color-text-disabled, #adb0b8);
   // 时间选择选项悬浮背景色(选中项)
   --ti-time-select-item-select-hover-bg-color: var(--ti-common-color-selected-background, #5e7ce0);
   // 时间选择选项字体色(选中项)
-  --ti-time-select-item-selected-text-color: var(--ti-common-color-text-primary, #252b3a);
+  --ti-time-select-item-selected-text-color: var(--ti-common-color-text-highlight);
   // 面板高度
-  --ti-time-select-height: 194px;
-  --ti-time-select-scrollbar-height: 194px;
+  --ti-time-select-height: 242px;
+  --ti-time-select-scrollbar-height: 242px;
   --ti-time-select-scrollbar-wrap-max-height: unset;
-  --ti-time-select-content-padding-top: unset;
+  --ti-time-select-content-padding-top: var(--ti-common-space-2x);
 }
diff --git a/packages/theme/src/time-spinner/old-theme.js b/packages/theme/src/time-spinner/old-theme.js
new file mode 100644
index 000000000..2f712e0e0
--- /dev/null
+++ b/packages/theme/src/time-spinner/old-theme.js
@@ -0,0 +1,16 @@
+export const tinyTimeSpinnerOldTheme = {
+  'ti-time-spinner-disabled-text-border-radius': 'var(--ti-common-space-0, 0)',
+  'ti-time-spinner-disabled-text-background': 'var(--ti-common-color-bg-white-normal, #fff)',
+  'ti-time-spinner-selected-border-radius': '0',
+  'ti-time-spinner-item-line-height': '32px',
+  'ti-time-spinner-item-height': '32px',
+  'ti-time-spinner-item-margin-right': '0',
+  'ti-time-spinner-item-margin-top': '0',
+  'ti-time-spinner-wrapper-max-height': '190px',
+  'ti-time-spinner-selected-bg-color': '#f2f2f3',
+  'ti-time-spinner-text-color': 'var(--ti-base-color-info-normal)',
+  'ti-time-spinner-item-bg-color': 'transparent',
+  'ti-time-spinner-item-font-weight': 'var(--ti-common-font-weight-4, 400)',
+  'ti-time-spinner-item-active-font-weight': '700',
+  'ti-time-spinner-item-active-text-color': '#303133'
+}
diff --git a/packages/theme/src/time-spinner/smb-theme.js b/packages/theme/src/time-spinner/smb-theme.js
deleted file mode 100644
index 41e898698..000000000
--- a/packages/theme/src/time-spinner/smb-theme.js
+++ /dev/null
@@ -1,18 +0,0 @@
-export const tinyTimeSpinnerSmbTheme = {
-  'ti-time-spinner-wrapper-max-height': '252px',
-  'ti-time-spinner-item-margin-top': '12px',
-  'ti-time-spinner-item-height': '28px',
-  'ti-time-spinner-item-line-height': '28px',
-  'ti-time-spinner-item-margin-right': '10px',
-  'ti-time-spinner-list-margin-bottom': '30px',
-  'ti-time-spinner-list-margin-top': '10px',
-  'ti-time-spinner-selected-bg-color': '#deedff',
-  'ti-time-spinner-item-bg-color': '#deedff',
-  'ti-time-spinner-selected-border-radius': '16px',
-  'ti-time-spinner-text-color': 'var(--ti-common-color-selected-text-color)',
-  'ti-time-spinner-item-active-text-color': 'var(--ti-common-color-selected-text-color)',
-  'ti-time-spinner-disabled-text-border-radius': 'var(--ti-common-size-4x)',
-  'ti-time-spinner-disabled-text-background': 'var(--ti-common-color-bg-disabled)',
-  'ti-time-spinner-item-font-weight': 'var(--ti-common-font-weight-4)',
-  'ti-time-spinner-item-active-font-weight': 'var(--ti-common-font-weight-6)'
-}
diff --git a/packages/theme/src/time-spinner/vars.less b/packages/theme/src/time-spinner/vars.less
index f3e5ebe66..38e56befd 100644
--- a/packages/theme/src/time-spinner/vars.less
+++ b/packages/theme/src/time-spinner/vars.less
@@ -13,22 +13,22 @@
 .component-css-vars-time-spinner() {
   --ti-time-spinner-arrow-text-color: #909399;
   --ti-time-spinner-arrow-hover-text-color: var(--ti-base-color-brand-7, #526ecc);
-  --ti-time-spinner-item-active-text-color: #303133;
-  --ti-time-spinner-item-active-font-weight: 700;
-  --ti-time-spinner-item-font-weight: var(--ti-common-font-weight-4, 400);
-  --ti-time-spinner-item-bg-color: transparent;
+  --ti-time-spinner-item-active-text-color: var(--ti-common-color-selected-text-color);
+  --ti-time-spinner-item-active-font-weight: var(--ti-common-font-weight-6);
+  --ti-time-spinner-item-font-weight: var(--ti-common-font-weight-4);
+  --ti-time-spinner-item-bg-color: #deedff;
   --ti-time-spinner-list-border-color: transparent;
   --ti-time-spinner-font-size: var(--ti-common-font-size-base, 12px);
-  --ti-time-spinner-text-color: var(--ti-base-color-info-normal);
+  --ti-time-spinner-text-color: var(--ti-common-color-selected-text-color);
   --ti-time-spinner-bg-color: var(--ti-base-color-light);
-  --ti-time-spinner-selected-bg-color: #f2f2f3;
-  --ti-time-spinner-wrapper-max-height: 190px;
-  --ti-time-spinner-item-margin-top: 0;
-  --ti-time-spinner-item-margin-right: 0;
-  --ti-time-spinner-item-height: 32px;
-  --ti-time-spinner-item-line-height: 32px;
-  --ti-time-spinner-selected-border-radius: 0;
+  --ti-time-spinner-selected-bg-color: #deedff;
+  --ti-time-spinner-wrapper-max-height: 252px;
+  --ti-time-spinner-item-margin-top: 12px;
+  --ti-time-spinner-item-margin-right: 10px;
+  --ti-time-spinner-item-height: 28px;
+  --ti-time-spinner-item-line-height: 28px;
+  --ti-time-spinner-selected-border-radius: 16px;
   --ti-time-spinner-disabled-text-color: var(--ti-common-color-text-disabled, #adb0b8);
-  --ti-time-spinner-disabled-text-background: var(--ti-common-color-bg-white-normal, #fff);
-  --ti-time-spinner-disabled-text-border-radius: var(--ti-common-space-0, 0);
+  --ti-time-spinner-disabled-text-background: var(--ti-common-color-bg-disabled);
+  --ti-time-spinner-disabled-text-border-radius: var(--ti-common-size-4x);
 }
diff --git a/packages/theme/src/toggle-menu/old-theme.js b/packages/theme/src/toggle-menu/old-theme.js
new file mode 100644
index 000000000..8103e4580
--- /dev/null
+++ b/packages/theme/src/toggle-menu/old-theme.js
@@ -0,0 +1,4 @@
+export const tinyToggleMenuOldTheme = {
+  'ti-toggle-menu-tree-node-height': 'var(--ti-common-size-7x, 28px)',
+  'ti-toggle-menu-font-size': 'var(--ti-common-font-size-base, 12px)'
+}
diff --git a/packages/theme/src/toggle-menu/smb-theme.js b/packages/theme/src/toggle-menu/smb-theme.js
deleted file mode 100644
index 70418c283..000000000
--- a/packages/theme/src/toggle-menu/smb-theme.js
+++ /dev/null
@@ -1,4 +0,0 @@
-export const tinyToggleMenuSmbTheme = {
-  'ti-toggle-menu-tree-node-height': 'var(--ti-common-size-8x)',
-  'ti-toggle-menu-font-size': 'var(--ti-common-font-size-1)'
-}
diff --git a/packages/theme/src/toggle-menu/vars.less b/packages/theme/src/toggle-menu/vars.less
index 618d5cfac..ccfd545ae 100644
--- a/packages/theme/src/toggle-menu/vars.less
+++ b/packages/theme/src/toggle-menu/vars.less
@@ -14,11 +14,11 @@
   // 收缩菜单宽度
   --ti-toggle-menu-width: var(--ti-common-size-50x, 200px);
   // 收缩菜单字号
-  --ti-toggle-menu-font-size: var(--ti-common-font-size-base, 12px);
+  --ti-toggle-menu-font-size: var(--ti-common-font-size-1);
   // 收缩菜单列表文本色
   --ti-toggle-menu-name-text-color: var(--ti-common-color-text-primary, #252b3a);
   // 收缩菜单列表项高度
-  --ti-toggle-menu-tree-node-height: var(--ti-common-size-7x, 28px);
+  --ti-toggle-menu-tree-node-height: var(--ti-common-size-8x);
   // 收缩菜单收缩搜索高度
   --ti-toggle-menu-filter-search-size: var(--ti-common-size-7x, 28px);
   // 收缩菜单输入框搜索图标尺寸
diff --git a/packages/theme/src/tooltip/old-theme.js b/packages/theme/src/tooltip/old-theme.js
new file mode 100644
index 000000000..49de4e207
--- /dev/null
+++ b/packages/theme/src/tooltip/old-theme.js
@@ -0,0 +1,16 @@
+export const tinyTooltipOldTheme = {
+  'ti-tooltip-padding-horizontal': 'var(--ti-common-space-4x, 16px)',
+  'ti-tooltip-padding-vertical': 'var(--ti-common-space-3x, 12px)',
+  'ti-tooltip-box-shadow': 'var(--ti-common-shadow-3-down, 0 4px 16px 0 rgba(0, 0, 0, 0.2))',
+  'ti-tooltip-popper-light-border-color': 'var(--ti-common-color-bg-dark-deep, #464c59)',
+  'ti-tooltip-popper-light-text-color': 'var(--ti-common-color-bg-dark-deep, #464c59)',
+  'ti-tooltip-popper-dark-text-color': 'var(--ti-common-color-light, #fff)',
+  'ti-tooltip-popper-dark-bg-color': 'var(--ti-common-color-bg-dark-deep, #464c59)',
+  'ti-tooltip-popper-info-border-color': 'var(--ti-common-color-prompt-border, #beccfa)',
+  'ti-tooltip-popper-info-bg-color': 'var(--ti-common-color-prompt-border, #beccfa)',
+  'ti-tooltip-popper-normal-text-color': 'var(--ti-tooltip-popper-dark-text-color)',
+  'ti-tooltip-popper-border-color': 'var(--ti-common-color-bg-dark-deep, #464c59)',
+  'ti-tooltip-popper-border-radius': 'var(--ti-common-border-radius-1, 4px)',
+  'ti-tooltip-popper-font-line-height': 'var(--ti-common-line-height-number, 1.5)',
+  'ti-tooltip-popper-border-width': '6px'
+}
diff --git a/packages/theme/src/tooltip/smb-theme.js b/packages/theme/src/tooltip/smb-theme.js
deleted file mode 100644
index 446aae47b..000000000
--- a/packages/theme/src/tooltip/smb-theme.js
+++ /dev/null
@@ -1,17 +0,0 @@
-export const tinyTooltipSmbTheme = {
-  'ti-tooltip-box-shadow': '0px 2px 12px 0px rgba(0,0,0,0.08)',
-  'ti-tooltip-popper-light-border-color': '#fff',
-  'ti-tooltip-popper-light-text-color': 'var(--ti-common-color-text-primary)',
-  'ti-tooltip-padding-vertical': '12px',
-  'ti-tooltip-padding-horizontal': '16px',
-  'ti-tooltip-popper-border-radius': '8px',
-  'ti-tooltip-popper-info-bg-color': '#1476FF',
-  'ti-tooltip-popper-info-border-color': '#1476FF',
-  'ti-tooltip-popper-dark-bg-color': '#191919',
-  'ti-tooltip-popper-dark-text-color': '#fff',
-  'ti-tooltip-popper-border-color': '#191919',
-  'ti-tooltip-popper-normal-text-color': '#191919',
-  'ti-tooltip-popper-font-line-height': 'var(--ti-common-line-height-number)',
-  // 设置为8px,也与smb示意图有出入
-  'ti-tooltip-popper-border-width': '8px'
-}
diff --git a/packages/theme/src/tooltip/vars.less b/packages/theme/src/tooltip/vars.less
index 8a9049d9e..ebc6da235 100644
--- a/packages/theme/src/tooltip/vars.less
+++ b/packages/theme/src/tooltip/vars.less
@@ -12,11 +12,11 @@
 
 .component-css-vars-tooltip() {
   // 弹框箭头的尺寸,(hide)
-  --ti-tooltip-popper-border-width: 6px;
+  --ti-tooltip-popper-border-width: 8px;
   // 弹框箭头的负尺寸,用于偏移(hide)
   --ti-tooltip-popper-neg-border-width: calc(var(--ti-tooltip-popper-border-width) * -1);
   // 弹框字体行高(hide)
-  --ti-tooltip-popper-font-line-height: var(--ti-common-line-height-number, 1.5);
+  --ti-tooltip-popper-font-line-height: var(--ti-common-line-height-number);
   // 弹框字体(hide)
   --ti-tooltip-popper-font-family: var(
     --ti-common-font-family,
@@ -29,24 +29,24 @@
     'Microsoft JhengHei'
   );
   // 悬浮弹出框圆角
-  --ti-tooltip-popper-border-radius: var(--ti-common-border-radius-1, 4px);
+  --ti-tooltip-popper-border-radius: 8px;
   // 悬浮弹出框字号
   --ti-tooltip-popper-font-size: var(--ti-common-font-size-base, 12px);
   // 弹框三角默认边框色
-  --ti-tooltip-popper-border-color: var(--ti-common-color-bg-dark-deep, #464c59);
+  --ti-tooltip-popper-border-color: #191919;
   // 正常背景色 (hide)
   --ti-tooltip-popper-normal-bg-color: var(--ti-common-color-bg-dark-deep, #464c59);
   // 文字提示正常文本色(hide)
-  --ti-tooltip-popper-normal-text-color: var(--ti-tooltip-popper-dark-text-color);
+  --ti-tooltip-popper-normal-text-color: #191919;
   // 弹框正常边框色 (hide)
   --ti-tooltip-popper-normal-border-color: var(--ti-common-color-bg-dark-deep, #464c59);
 
   // info类型弹框背景色
-  --ti-tooltip-popper-info-bg-color: var(--ti-common-color-prompt-border, #beccfa);
+  --ti-tooltip-popper-info-bg-color: #1476FF;
   // info类型弹框文本色
   --ti-tooltip-popper-info-text-color: var(--ti-common-color-light, #fff);
   // info类型弹框三角边框色
-  --ti-tooltip-popper-info-border-color: var(--ti-common-color-prompt-border, #beccfa);
+  --ti-tooltip-popper-info-border-color: #1476FF;
 
   // error类型弹框背景色
   --ti-tooltip-popper-error-bg-color: var(--ti-common-color-danger-normal, #c7000b);
@@ -70,23 +70,23 @@
   --ti-tooltip-popper-success-border-color: var(--ti-common-color-success-normal, #50d4ab);
 
   // dark主题弹框背景色
-  --ti-tooltip-popper-dark-bg-color: var(--ti-common-color-bg-dark-deep, #464c59);
+  --ti-tooltip-popper-dark-bg-color: #191919;
   // dark主题弹框文本色
-  --ti-tooltip-popper-dark-text-color: var(--ti-common-color-light, #fff);
+  --ti-tooltip-popper-dark-text-color: #fff;
   // light主题弹框背景色
   --ti-tooltip-popper-light-bg-color: var(--ti-common-color-light, #fff);
 
   // light主题|禁用弹框文本色
-  --ti-tooltip-popper-light-text-color: var(--ti-common-color-bg-dark-deep, #464c59);
+  --ti-tooltip-popper-light-text-color: var(--ti-common-color-text-primary);
   // light主题|禁用时弹框边框色
-  --ti-tooltip-popper-light-border-color: var(--ti-common-color-bg-dark-deep, #464c59);
+  --ti-tooltip-popper-light-border-color: #fff;
 
   // 弹框阴影
-  --ti-tooltip-box-shadow: var(--ti-common-shadow-3-down, 0 4px 16px 0 rgba(0, 0, 0, 0.2));
+  --ti-tooltip-box-shadow: 0px 2px 12px 0px rgba(0,0,0,0.08);
   // 弹框垂直内边距
-  --ti-tooltip-padding-vertical: var(--ti-common-space-3x, 12px);
+  --ti-tooltip-padding-vertical: 12px;
   // 弹框水平内边距
-  --ti-tooltip-padding-horizontal: var(--ti-common-space-4x, 16px);
+  --ti-tooltip-padding-horizontal: 16px;
   // 文字提示错误图标色
   --ti-tooltip-validate-icon-color: var(--ti-common-color-error, #f66f6a);
   // 文本内容容器最大高度
diff --git a/packages/theme/src/transfer/old-theme.js b/packages/theme/src/transfer/old-theme.js
new file mode 100644
index 000000000..7c598393e
--- /dev/null
+++ b/packages/theme/src/transfer/old-theme.js
@@ -0,0 +1,24 @@
+export const tinyTransferOldTheme = {
+  'ti-transfer-svg-font-size': '14px',
+  'ti-transfer-button-height': '30px',
+  'ti-transfer-button-width': '30px',
+  'ti-transfer-header-padding-right': 'var(--ti-common-space-2x, 8px)',
+  'ti-transfer-header-padding-left': 'var(--ti-common-space-2x, 8px)',
+  'ti-transfer-panel-item-padding-left': 'var(--ti-common-space-2x, 8px)',
+  'ti-transfer-panel-body-list-padding-bottom': 'var(--ti-common-space-6, 6px)',
+  'ti-transfer-panel-body-list-padding-top': 'var(--ti-common-space-6, 6px)',
+  'ti-transfer-header-border-color': 'var(--ti-common-color-line-normal, #adb0b8)',
+  'ti-transfer-header-bg-color': 'var(--ti-common-color-bg-white-emphasize, #f2f5fc)',
+  'ti-transfer-header-height': 'var(--ti-common-size-10x, 40px)',
+  'ti-transfer-panel-item-hover-bg-color': 'var(--ti-common-color-hover-background, #f2f5fc)',
+  'ti-transfer-panel-item-text-color': 'var(--ti-common-color-info-normal, #252b3a)',
+  'ti-transfer-panel-item-height': '30px',
+  'ti-transfer-panel-border-color': 'var(--ti-common-color-line-normal, #adb0b8)',
+  'ti-transfer-button-border-radius': 'var(--ti-common-border-radius-normal, 2px)',
+  'ti-transfer-button-padding-bottom': 'var(--ti-common-space-2x, 8px)',
+  'ti-transfer-button-padding-top': 'var(--ti-common-space-2x, 8px)',
+  'ti-transfer-button-padding-right': 'var(--ti-common-space-2x, 8px)',
+  'ti-transfer-button-padding-left': 'var(--ti-common-space-2x, 8px)',
+  'ti-transfer-button-bg-color': 'var(--ti-common-color-bg-emphasize, #5e7ce0)',
+  'ti-transfer-font-size': 'var(--ti-common-font-size-1, 14px)'
+}
diff --git a/packages/theme/src/transfer/smb-theme.js b/packages/theme/src/transfer/smb-theme.js
deleted file mode 100644
index 99df0dfee..000000000
--- a/packages/theme/src/transfer/smb-theme.js
+++ /dev/null
@@ -1,25 +0,0 @@
-export const tinyTransferSmbTheme = {
-  // transfer-SMB主题
-  'ti-transfer-panel-item-text-color': 'var(--ti-common-color-info-normal)',
-  'ti-transfer-font-size': 'var(--ti-common-font-size-1)',
-  'ti-transfer-panel-border-color': 'var(--ti-common-color-line-normal)',
-  'ti-transfer-panel-item-hover-bg-color': 'var(ti-common-color-bg-normal, #f5f5f5)',
-  'ti-transfer-header-height': '38px',
-  'ti-transfer-panel-item-height': 'var(--ti-common-size-8x)',
-  'ti-transfer-button-bg-color': '#1476ff',
-  'ti-transfer-button-height': 'var(--ti-common-size-4x)',
-  'ti-transfer-button-width': 'var(--ti-common-size-4x)',
-  'ti-transfer-button-padding-left': '2px',
-  'ti-transfer-button-padding-right': '2px',
-  'ti-transfer-button-padding-top': '2px',
-  'ti-transfer-button-padding-bottom': '2px',
-  'ti-transfer-button-border-radius': 'var(--ti-common-size-base)',
-  'ti-transfer-svg-font-size': '10px',
-  'ti-transfer-header-padding-left': 'var(--ti-common-space-4x)',
-  'ti-transfer-header-padding-right': 'var(--ti-common-space-4x)',
-  'ti-transfer-panel-body-list-padding-top': '4px',
-  'ti-transfer-panel-body-list-padding-bottom': '4px',
-  'ti-transfer-header-bg-color': '#fff',
-  'ti-transfer-header-border-color': 'rgba(0,0,0,0.08)',
-  'ti-transfer-panel-item-padding-left': 'var(--ti-common-space-4x)'
-}
diff --git a/packages/theme/src/transfer/vars.less b/packages/theme/src/transfer/vars.less
index e680a01bd..d3050ad3c 100644
--- a/packages/theme/src/transfer/vars.less
+++ b/packages/theme/src/transfer/vars.less
@@ -12,7 +12,7 @@
 
 .component-css-vars-transfer() {
   // 字体基础大小
-  --ti-transfer-font-size: var(--ti-common-font-size-1, 14px);
+  --ti-transfer-font-size: var(--ti-common-font-size-1);
   // 按钮组左侧内边距
   --ti-transfer-buttons-padding-left: var(--ti-common-space-4x, 16px);
   // 按钮组右侧内边距
@@ -46,17 +46,17 @@
   // 按钮底部外边距
   --ti-transfer-button-margin-bottom: var(--ti-common-space-0, 0px);
   // 按钮背景色
-  --ti-transfer-button-bg-color: var(--ti-common-color-bg-emphasize, #5e7ce0);
+  --ti-transfer-button-bg-color: #1476ff;
   // 按钮左侧内边距
-  --ti-transfer-button-padding-left: var(--ti-common-space-2x, 8px);
+  --ti-transfer-button-padding-left: 2px;
   // 按钮右侧内边距
-  --ti-transfer-button-padding-right: var(--ti-common-space-2x, 8px);
+  --ti-transfer-button-padding-right: 2px;
   // 按钮顶部内边距
-  --ti-transfer-button-padding-top: var(--ti-common-space-2x, 8px);
+  --ti-transfer-button-padding-top: 2px;
   // 按钮底部内边距
-  --ti-transfer-button-padding-bottom: var(--ti-common-space-2x, 8px);
+  --ti-transfer-button-padding-bottom: 2px;
   // 按钮圆角
-  --ti-transfer-button-border-radius: var(--ti-common-border-radius-normal, 2px);
+  --ti-transfer-button-border-radius: var(--ti-common-size-base);
   // 按钮禁用时文本色
   --ti-transfer-button-disabled-text-color: var(--ti-common-color-text-disabled, #adb0b8);
   // 按钮禁用时边框色
@@ -72,17 +72,17 @@
   // 面板内容区域高度
   --ti-transfer-panel-body-height: 260px;
   // 面板内容区域边框色
-  --ti-transfer-panel-border-color: var(--ti-common-color-line-normal, #adb0b8);
+  --ti-transfer-panel-border-color: var(--ti-common-color-line-normal);
   // 面板内容区域边框圆角
   --ti-transfer-panel-border-radius: var(--ti-common-border-radius-normal, 2px);
   // 面板高度
-  --ti-transfer-panel-item-height: 30px;
+  --ti-transfer-panel-item-height: var(--ti-common-size-8x);
   // 面板文本色
-  --ti-transfer-panel-item-text-color: var(--ti-common-color-info-normal, #252b3a);
+  --ti-transfer-panel-item-text-color: var(--ti-common-color-info-normal);
   // 面板悬浮时文本色
   --ti-transfer-panel-item-hover-text-color: var(--ti-common-color-icon-hover, #5e7ce0);
   // 面板悬浮时背景色
-  --ti-transfer-panel-item-hover-bg-color: var(--ti-common-color-hover-background, #f2f5fc);
+  --ti-transfer-panel-item-hover-bg-color: var(ti-common-color-bg-normal, #f5f5f5);
   // 面板搜索框高度
   --ti-transfer-panel-filter-height: var(--ti-common-size-height-normal, 28px);
   // 面板搜索框字体大小
@@ -102,11 +102,11 @@
   // 面板宽度
   --ti-transfer-panel-width: var(--ti-common-size-50x, 200px);
   // 面板头部高度
-  --ti-transfer-header-height: var(--ti-common-size-10x, 40px);
+  --ti-transfer-header-height: 38px;
   // 面板头部背景色
-  --ti-transfer-header-bg-color: var(--ti-common-color-bg-white-emphasize, #f2f5fc);
+  --ti-transfer-header-bg-color: #fff;
   // 面板头部边框色
-  --ti-transfer-header-border-color: var(--ti-common-color-line-normal, #adb0b8);
+  --ti-transfer-header-border-color: rgba(0,0,0,0.08);
   // 面板头部文本色
   --ti-transfer-header-text-color: var(--ti-common-color-info-normal, #252b3a);
   // 面板头部span文本色
@@ -152,13 +152,13 @@
   // 面板内容区域列表的右侧内边距
   --ti-transfer-panel-body-list-padding-right: var(--ti-common-space-0, 0px);
   // 面板内容区域列表的顶部内边距
-  --ti-transfer-panel-body-list-padding-top: var(--ti-common-space-6, 6px);
+  --ti-transfer-panel-body-list-padding-top: 4px;
   // 面板内容区域列表的底部内边距
-  --ti-transfer-panel-body-list-padding-bottom: var(--ti-common-space-6, 6px);
+  --ti-transfer-panel-body-list-padding-bottom: 4px;
   // 面板内容区域过滤后顶部内边距
   --ti-transfer-panel-body-filter-padding-top: var(--ti-common-space-0, 0px);
   // 面板左侧内边距
-  --ti-transfer-panel-item-padding-left: var(--ti-common-space-2x, 8px);
+  --ti-transfer-panel-item-padding-left: var(--ti-common-space-4x);
   // 面板多选框左侧内边距
   --ti-transfer-panel-item-checkbox-padding-left: calc(var(--ti-common-space-5x, 20px) + 2px);
   // 面板搜索框左侧内边距
@@ -178,9 +178,9 @@
   // 头部底部外边距
   --ti-transfer-header-margin-bottom: var(--ti-common-space-0, 0px);
   // 头部左侧内边距
-  --ti-transfer-header-padding-left: var(--ti-common-space-2x, 8px);
+  --ti-transfer-header-padding-left: var(--ti-common-space-4x);
   // 头部右侧内边距
-  --ti-transfer-header-padding-right: var(--ti-common-space-2x, 8px);
+  --ti-transfer-header-padding-right: var(--ti-common-space-4x);
   // 头部顶部内边距
   --ti-transfer-header-padding-top: var(--ti-common-space-0, 0px);
   // 头部底部内边距
@@ -236,9 +236,9 @@
   // 多选框左侧内边距
   --ti-transfer-checkbox-label-padding-left: var(--ti-common-space-2x, 8px);
   // 穿梭按钮宽度
-  --ti-transfer-button-width: 30px;
+  --ti-transfer-button-width: var(--ti-common-size-4x);
   // 穿梭按钮高度
-  --ti-transfer-button-height: 30px;
+  --ti-transfer-button-height: var(--ti-common-size-4x);
   // 穿梭箭头大小
-  --ti-transfer-svg-font-size: 14px;
+  --ti-transfer-svg-font-size: 10px;
 }
diff --git a/packages/theme/src/tree-menu/smb-theme.js b/packages/theme/src/tree-menu/old-theme.js
similarity index 50%
rename from packages/theme/src/tree-menu/smb-theme.js
rename to packages/theme/src/tree-menu/old-theme.js
index e88d73392..b8117cdfb 100644
--- a/packages/theme/src/tree-menu/smb-theme.js
+++ b/packages/theme/src/tree-menu/old-theme.js
@@ -1,12 +1,10 @@
-export const tinyTreeMenuSmbTheme = {
-  'ti-tree-node-content-current-bg-color': 'var(--ti-common-color-light)',
-  'ti-tree-menu-node-selected-bg-color': 'var(--ti-common-color-bg-normal)',
-  'ti-tree-menu-node-current-text-color': 'var(--ti-common-color-text-primary)',
-  'ti-tree-menu-square-left-border-color': 'var(--ti-common-color-icon-active)',
-  'ti-tree-menu-node-number-font-size': 'var(--ti-common-font-size-0)',
-  'ti-tree-menu-padding-top': 'var(--ti-common-size-2x)',
-  'ti-tree-menu-border-color': 'var(--ti-common-color-light)',
-  'ti-tree-menu-collapse-icon-margin-right': 'var(--ti-common-size-5x)',
-  'ti-common-color-light': 'var(--ti-common-color-line-dividing)',
-  'ti-tree-menu-node-number-color': 'var(--ti-common-color-text-weaken)'
+export const tinyTreeMenuOldTheme = {
+  'ti-tree-menu-node-number-color': 'var(--ti-common-color-text-disabled, #adb0b8)',
+  'ti-tree-menu-padding-top': 'var(--ti-common-size-4x, 16px)',
+  'ti-tree-menu-node-number-font-size': 'var(--ti-common-font-size-base, 12px)',
+  'ti-tree-menu-collapse-icon-margin-right': 'var(--ti-common-size-2x, 8px)',
+  'ti-tree-menu-square-left-border-color': 'var(--ti-common-color-line-active, #5e7ce0)',
+  'ti-tree-menu-node-current-text-color': 'var(--ti-common-color-text-highlight, #526ecc)',
+  'ti-tree-menu-node-selected-bg-color': 'var(--ti-common-color-bg-light-normal, #e9edfa)',
+  'ti-tree-menu-border-color': 'var(--ti-common-color-line-dividing, #dfe1e6)'
 }
diff --git a/packages/theme/src/tree-menu/vars.less b/packages/theme/src/tree-menu/vars.less
index 8f43ed9ba..7e676a671 100644
--- a/packages/theme/src/tree-menu/vars.less
+++ b/packages/theme/src/tree-menu/vars.less
@@ -18,15 +18,15 @@
   // 空数据显示文本字号(hide)
   --ti-tree-menu-font-size: var(--ti-common-font-size-base, 12px);
   // 边框色
-  --ti-tree-menu-border-color: var(--ti-common-color-line-dividing, #dfe1e6);
+  --ti-tree-menu-border-color: var(--ti-common-color-light);
   // 节点水平内边距
   --ti-tree-menu-node-body-text-padding-horizontal: 0;
   // 选中节点的背景色
-  --ti-tree-menu-node-selected-bg-color: var(--ti-common-color-bg-light-normal, #e9edfa);
+  --ti-tree-menu-node-selected-bg-color: var(--ti-common-color-bg-normal);
   // 选中节点文本色
-  --ti-tree-menu-node-current-text-color: var(--ti-common-color-text-highlight, #526ecc);
+  --ti-tree-menu-node-current-text-color: var(--ti-common-color-text-primary);
   // 选中节点左边框色
-  --ti-tree-menu-square-left-border-color: var(--ti-common-color-line-active, #5e7ce0);
+  --ti-tree-menu-square-left-border-color: var(--ti-common-color-icon-active);
   // 未选中节点文本色
   --ti-tree-menu-node-body-text-color: var(--ti-common-color-text-primary, #252b3a);
   // 节点悬浮背景色
@@ -36,19 +36,19 @@
   // 底部折叠按钮
   --ti-tree-menu-collapse-icon-hover-color: var(--ti-common-bg-color-focus, #0067d1);
   // 折叠图标右边距
-  --ti-tree-menu-collapse-icon-margin-right: var(--ti-common-size-2x, 8px);
+  --ti-tree-menu-collapse-icon-margin-right: var(--ti-common-size-5x);
   // 输入框下面的线
   --ti-tree-menu-border-top-color: var(--ti-common-color-light, #fff);
   // 节点序号字号
-  --ti-tree-menu-node-number-font-size: var(--ti-common-font-size-base, 12px);
+  --ti-tree-menu-node-number-font-size: var(--ti-common-font-size-0);
   // 活跃节点竖线与文本的间距
   --ti-tree-menu-node-vertical-line-margin-right: var(--ti-common-size-4x, 16px);
   // 输入框与文本的间距
-  --ti-tree-menu-padding-top: var(--ti-common-size-4x, 16px);
+  --ti-tree-menu-padding-top: var(--ti-common-size-2x);
   // 前缀图标右边距
   --ti-tree-menu-prefix-icon-margin-right: var(--ti-common-size-2x, 8px);
   // 禁用文本色
   --ti-tree-menu-disabled-text-color: var(--ti-common-color-text-disabled, #adb0b8);
   // 数字文本色
-  --ti-tree-menu-node-number-color: var(--ti-common-color-text-disabled, #adb0b8);
+  --ti-tree-menu-node-number-color: var(--ti-common-color-text-weaken);
 }
diff --git a/packages/theme/src/tree/old-theme.js b/packages/theme/src/tree/old-theme.js
new file mode 100644
index 000000000..6ba3529cf
--- /dev/null
+++ b/packages/theme/src/tree/old-theme.js
@@ -0,0 +1,11 @@
+export const tinyTreeOldTheme = {
+  'ti-tree-node-content-height': 'calc(var(--ti-common-space-10, 10px) * 3)',
+  'ti-tree-node-highlight-bg-color': 'var(--ti-common-color-bg-light-normal, #e9edfa)',
+  'ti-tree-node-padding-left': 'var(--ti-common-space-2x, 8px)',
+  'ti-tree-node-hover-outter-bg-color': 'var(--ti-common-color-transparent, transparent)',
+  'ti-tree-node-content-current-bg-color': 'var(--ti-common-color-bg-light-normal, #e9edfa)',
+  'ti-tree-selected-font-weight': 'var(--ti-common-font-weight-4, normal)',
+  'ti-tree-selected-text-color': 'var(--ti-common-color-text-primary, #252b3a)',
+  'ti-tree-padding-bottom': 'var(-ti-common-space-0, 0)',
+  'ti-tree-padding-top': 'var(-ti-common-space-0, 0)'
+}
diff --git a/packages/theme/src/tree/smb-theme.js b/packages/theme/src/tree/smb-theme.js
deleted file mode 100644
index c916cc004..000000000
--- a/packages/theme/src/tree/smb-theme.js
+++ /dev/null
@@ -1,12 +0,0 @@
-export const tinyTreeSmbTheme = {
-  'ti-tree-node-content-height': 'var(--ti-common-space-8x)',
-  'ti-tree-node-hover-outter-bg-color': 'var(--ti-common-color-hover-background)',
-  'ti-tree-selected-font-weight': 'var(--ti-common-font-weight-6)',
-  'ti-tree-node-content-current-bg-color': 'var(--ti-common-color-light)',
-  'ti-tree-node-highlight-bg-color': 'var(--ti-common-color-light)',
-  'ti-tree-selected-text-color': 'var(--ti-common-color-text-highlight)',
-  'ti-checkbox-bg-color-checked': 'var(--ti-common-color-icon-info)',
-  'ti-tree-node-padding-left': 'var(--ti-common-space-4x)',
-  'ti-tree-padding-top': 'var(--ti-common-space-4x)',
-  'ti-tree-padding-bottom': 'var(--ti-common-space-4x)'
-}
diff --git a/packages/theme/src/tree/vars.less b/packages/theme/src/tree/vars.less
index 7eae1337b..c7b8265a0 100644
--- a/packages/theme/src/tree/vars.less
+++ b/packages/theme/src/tree/vars.less
@@ -12,15 +12,15 @@
 
 .component-css-vars-tree() {
   // 顶部内边距
-  --ti-tree-padding-top: var(-ti-common-space-0, 0);
+  --ti-tree-padding-top: var(--ti-common-space-4x);
   // 底部内边距
-  --ti-tree-padding-bottom: var(-ti-common-space-0, 0);
+  --ti-tree-padding-bottom: var(--ti-common-space-4x);
   // 默认文本色
   --ti-tree-text-color: var(--ti-common-color-text-primary, #252b3a);
   // 选中文本色
-  --ti-tree-selected-text-color: var(--ti-common-color-text-primary, #252b3a);
+  --ti-tree-selected-text-color: var(--ti-common-color-text-highlight);
   // 选中文本字重
-  --ti-tree-selected-font-weight: var(--ti-common-font-weight-4, normal);
+  --ti-tree-selected-font-weight: var(--ti-common-font-weight-6);
   // 禁用文本色
   --ti-tree-disabled-text-color: var(--ti-common-color-text-disabled, #adb0b8);
   // 文本行高
@@ -32,11 +32,11 @@
   // 数据为空时整体最小高度
   --ti-tree-empty-min-height: var(--ti-common-size-15x, 60px);
   // 选中节点背景色
-  --ti-tree-node-content-current-bg-color: var(--ti-common-color-bg-light-normal, #e9edfa);
+  --ti-tree-node-content-current-bg-color: var(--ti-common-color-light);
   // 节点悬浮背景色
   --ti-tree-node-content-hover-bg-color: var(--ti-common-color-hover-background, #f2f5fc);
   // 节点悬浮外层背景色(hide)
-  --ti-tree-node-hover-outter-bg-color: var(--ti-common-color-transparent, transparent);
+  --ti-tree-node-hover-outter-bg-color: var(--ti-common-color-hover-background);
   // 节点悬浮内层背景色(hide)
   --ti-tree-node-hover-inner-bg-color: var(--ti-tree-node-content-hover-bg-color);
   // 节点字号
@@ -67,11 +67,11 @@
   --ti-tree-node-checked-icon-color: var(--ti-common-color-icon-hover, #5e7ce0);
 
   // 节点左内边距
-  --ti-tree-node-padding-left: var(--ti-common-space-2x, 8px);
+  --ti-tree-node-padding-left: var(--ti-common-space-4x);
   // 节点高亮背景色
-  --ti-tree-node-highlight-bg-color: var(--ti-common-color-bg-light-normal, #e9edfa);
+  --ti-tree-node-highlight-bg-color: var(--ti-common-color-light);
   // 节点内容高度
-  --ti-tree-node-content-height: calc(var(--ti-common-space-10, 10px) * 3);
+  --ti-tree-node-content-height: var(--ti-common-space-8x);
   // 节点内容边框弧度
   --ti-tree-node-content-border-radius: 0;
   // 节点右键菜单内容字号
diff --git a/packages/theme/src/upload-dragger/old-theme.js b/packages/theme/src/upload-dragger/old-theme.js
new file mode 100644
index 000000000..f7374c129
--- /dev/null
+++ b/packages/theme/src/upload-dragger/old-theme.js
@@ -0,0 +1,6 @@
+export const tinyUploadDraggerOldTheme = {
+  'ti-upload-dragger-icon-font-size': 'var(--ti-common-font-size-7, 36px)',
+  'ti-upload-dragger-icon-color': 'var(--ti-common-color-placeholder, #adb0b8)',
+  'ti-upload-dragger-height': 'var(--ti-common-size-45x, 180px)',
+  'ti-upload-dragger-width': 'calc(var(--ti-common-size-base, 4px) * 90)'
+}
diff --git a/packages/theme/src/upload-dragger/smb-theme.js b/packages/theme/src/upload-dragger/smb-theme.js
deleted file mode 100644
index a4ea71bbb..000000000
--- a/packages/theme/src/upload-dragger/smb-theme.js
+++ /dev/null
@@ -1,6 +0,0 @@
-export const tinyUploadDraggerSmbTheme = {
-  'ti-upload-dragger-height': '100px',
-  'ti-upload-dragger-width': '100px',
-  'ti-upload-dragger-icon-font-size': '24px',
-  'ti-upload-dragger-icon-color': '#191919'
-}
diff --git a/packages/theme/src/upload-dragger/vars.less b/packages/theme/src/upload-dragger/vars.less
index 888a4c329..e5d136a4c 100644
--- a/packages/theme/src/upload-dragger/vars.less
+++ b/packages/theme/src/upload-dragger/vars.less
@@ -12,9 +12,9 @@
 
 .component-css-vars-upload-dragger() {
   // 拖拽上传框宽度
-  --ti-upload-dragger-width: calc(var(--ti-common-size-base, 4px) * 90);
+  --ti-upload-dragger-width: 100px;
   // 拖拽上传框高度
-  --ti-upload-dragger-height: var(--ti-common-size-45x, 180px);
+  --ti-upload-dragger-height: 100px;
   // 拖拽上传框背景色
   --ti-upload-dragger-bg-color: var(--ti-common-color-bg-gray, #fafafa);
   // 拖拽上传框边框色
@@ -26,9 +26,9 @@
   // 文件拖到框内上传框背景色
   --ti-upload-dragger-dragover-bg-color: rgba(32, 159, 255, 0.06);
   // 拖拽上传框内图标色
-  --ti-upload-dragger-icon-color: var(--ti-common-color-placeholder, #adb0b8);
+  --ti-upload-dragger-icon-color: #191919;
   // 拖拽上传框内图标尺寸
-  --ti-upload-dragger-icon-font-size: var(--ti-common-font-size-7, 36px);
+  --ti-upload-dragger-icon-font-size: 24px;
   // 拖拽上传框内文本色
   --ti-upload-dragger-text-color: var(--ti-common-color-text-secondary, #575d6c);
   // 拖拽上传框内字号
diff --git a/packages/theme/src/upload-list/old-theme.js b/packages/theme/src/upload-list/old-theme.js
new file mode 100644
index 000000000..fc154f13a
--- /dev/null
+++ b/packages/theme/src/upload-list/old-theme.js
@@ -0,0 +1,19 @@
+export const tinyUploadListOldTheme = {
+  'ti-upload-list-picture-card-item-hover-bg-color': 'rgba(0, 0, 0, 0.5)',
+  'ti-upload-list-svg-refresh-position-right': '28px',
+  'ti-upload-list-item-margin-top': 'var(--ti-common-space-2x)',
+  'ti-upload-list-item-line-height': '1.8',
+  'ti-upload-list-picture-card-item-margin-right': '8px',
+  'ti-upload-list-picture-card-item-icon-color': 'inherit',
+  'ti-upload-list-picture-card-progress-size': '126px',
+  'ti-upload-list-picture-card-height': 'var(--ti-common-size-37x, 148px)',
+  'ti-upload-list-picture-card-width': 'var(--ti-common-size-37x, 148px)',
+  'ti-upload-list-picture-success-border-weight': 'var(--ti-common-border-weight-normal, 1px)',
+  'ti-upload-list-picture-card-item-border-color': 'var(--ti-common-color-border, #adb0b8)',
+  'ti-upload-list-picture-card-loading-border-color': 'var(--ti-common-border-style-solid, solid)',
+  'ti-upload-list-svg-icon-font-size': 'var(--ti-common-font-size-base, 12px)',
+  'ti-upload-list-item-name-icon-color': 'var(--ti-common-color-info, #252b3a)',
+  'ti-upload-list-item-hover-background-color': '#f5f7fa',
+  'ti-upload-list-item-border-radius': 'var(--ti-common-border-radius-normal, 2px)',
+  'ti-upload-list-item-text-color': 'var(--ti-common-color-info-normal, #252b3a)'
+}
diff --git a/packages/theme/src/upload-list/smb-theme.js b/packages/theme/src/upload-list/smb-theme.js
deleted file mode 100644
index 2e0134cf4..000000000
--- a/packages/theme/src/upload-list/smb-theme.js
+++ /dev/null
@@ -1,20 +0,0 @@
-export const tinyUploadListSmbTheme = {
-  'ti-upload-list-picture-card-width': 'var(--ti-common-size-25x)',
-  'ti-upload-list-picture-card-height': 'var(--ti-common-size-25x)',
-  'ti-upload-list-picture-card-progress-size': 'var(--ti-common-size-17x)',
-  'ti-upload-list-picture-card-item-icon-color': 'var(--ti-common-color-light)',
-  'ti-upload-list-item-line-height': 'var(--ti-common-line-height-1)',
-  'ti-upload-list-item-margin-top': 'var(--ti-common-space-2x)',
-  'ti-upload-list-picture-card-item-margin-right': 'var(--ti-common-space-4x)',
-  'ti-upload-list-item-border-radius': 'var(--ti-common-border-radius-4)',
-  'ti-upload-picture-card-border-radius': 'var(--ti-common-border-radius-4)',
-  'ti-upload-list-item-hover-background-color': 'var(--ti-common-color-bg-normal)',
-  'ti-upload-list-svg-icon-font-size': 'var(--ti-common-font-size-2)',
-  'ti-upload-list-svg-refresh-position-right': 'var(--ti-common-space-8x)',
-  'ti-upload-list-picture-card-item-hover-bg-color': 'var(--ti-common-bg-color-hover-40)',
-  'ti-upload-list-picture-success-border-weight': '0',
-  'ti-upload-list-item-text-color': 'var(--ti-common-color-text-secondary)',
-  'ti-upload-list-item-name-icon-color': 'var(--ti-common-color-primary-normal)',
-  'ti-upload-list-picture-card-item-border-color': 'var(--ti-common-color-line-normal)',
-  'ti-upload-list-picture-card-loading-border-color': 'dashed'
-}
diff --git a/packages/theme/src/upload-list/vars.less b/packages/theme/src/upload-list/vars.less
index 78329d268..e585e8226 100644
--- a/packages/theme/src/upload-list/vars.less
+++ b/packages/theme/src/upload-list/vars.less
@@ -14,17 +14,17 @@
   // 上传文件列表字号
   --ti-upload-list-item-font-size: var(--ti-common-font-size-1, 14px);
   // 上传文件列表文本色
-  --ti-upload-list-item-text-color: var(--ti-common-color-info-normal, #252b3a);
+  --ti-upload-list-item-text-color: var(--ti-common-color-text-secondary);
   // 上传文件列表项(图片框|悬浮背景)圆角
-  --ti-upload-list-item-border-radius: var(--ti-common-border-radius-normal, 2px);
+  --ti-upload-list-item-border-radius: var(--ti-common-border-radius-4);
   // 上传文件列表项悬浮背景色
-  --ti-upload-list-item-hover-background-color: #f5f7fa;
+  --ti-upload-list-item-hover-background-color: var(--ti-common-color-bg-normal);
   // 上传成功列表项悬浮文本色
   --ti-upload-list-item-hover-text-color: var(--ti-common-color-primary-hover, #7693f5);
   // 上传文件列表项悬浮下划线(hide)
   --ti-upload-list-item-hover-text-decoration: none;
   // 上传文件列表项前置图标色
-  --ti-upload-list-item-name-icon-color: var(--ti-common-color-info, #252b3a);
+  --ti-upload-list-item-name-icon-color: var(--ti-common-color-primary-normal);
   // 上传文件列表项前置图标尺寸
   --ti-upload-list-item-name-icon-font-size: var(--ti-common-font-size-2, 16px);
   // 上传文件列表项右侧图标色
@@ -32,15 +32,15 @@
   // 上传文件列表项右侧悬浮图标色
   --ti-upload-list-svg-close-hover-icon-color: var(--ti-common-color-icon-hover, #5e7ce0);
   // 上传文件列表项图标尺寸
-  --ti-upload-list-svg-icon-font-size: var(--ti-common-font-size-base, 12px);
+  --ti-upload-list-svg-icon-font-size: var(--ti-common-font-size-2);
   // 上传文件列表项成功图标尺寸
   --ti-upload-list-successful-icon-font-size: var(--ti-common-font-size-1, 14px);
   // 照片墙上传列表项上传中边框样式
-  --ti-upload-list-picture-card-loading-border-color: var(--ti-common-border-style-solid, solid);
+  --ti-upload-list-picture-card-loading-border-color: dashed;
   // 照片墙上传列表项边框色
-  --ti-upload-list-picture-card-item-border-color: var(--ti-common-color-border, #adb0b8);
+  --ti-upload-list-picture-card-item-border-color: var(--ti-common-color-line-normal);
   // 照片墙上传成功列表项边框厚度
-  --ti-upload-list-picture-success-border-weight: var(--ti-common-border-weight-normal, 1px);
+  --ti-upload-list-picture-success-border-weight: 0;
   // 照片墙上传列表项背景色
   --ti-upload-list-picture-card-item-bg-color: var(--ti-common-color-light, #fff);
   // 照片墙上传列表项右上角图标填充色
@@ -48,27 +48,27 @@
   // 上传列表项成功状态图标色或背景色
   --ti-upload-list-successful-status-bg-color: var(--ti-common-color-success-normal, #50d4ab);
   // 照片墙上传列表项宽度(new)
-  --ti-upload-list-picture-card-width: var(--ti-common-size-37x, 148px);
+  --ti-upload-list-picture-card-width: var(--ti-common-size-25x);
   // 照片墙上传列表项高度(new)
-  --ti-upload-list-picture-card-height: var(--ti-common-size-37x, 148px);
+  --ti-upload-list-picture-card-height: var(--ti-common-size-25x);
   // 照片墙上传列表项进度条尺寸(new)
-  --ti-upload-list-picture-card-progress-size: 126px;
+  --ti-upload-list-picture-card-progress-size: var(--ti-common-size-17x);
   // 照片墙上传列表项按钮颜色(new)
-  --ti-upload-list-picture-card-item-icon-color: inherit;
+  --ti-upload-list-picture-card-item-icon-color: var(--ti-common-color-light);
   // 照片墙上传列表项右外边距(new)
-  --ti-upload-list-picture-card-item-margin-right: 8px;
+  --ti-upload-list-picture-card-item-margin-right: var(--ti-common-space-4x);
   // 非picturecard模式上传列表进度条上外边距(hide)
   --ti-upload-list-item-progress-top: calc(var(--ti-common-line-height-2) + 2px);
   // 非picturecard模式上传文件列表文本行高(new)
-  --ti-upload-list-item-line-height: 1.8;
+  --ti-upload-list-item-line-height: var(--ti-common-line-height-1);
   // 非picturecard模式上传文件列表文本上外边距(new)
   --ti-upload-list-item-margin-top: var(--ti-common-space-2x);
   // 上传文件列表项失败文本和图标色
   --ti-upload-list-item-fail-text-color: #f23030;
   // 上传文件列表项刷新图标右边距(hide)
-  --ti-upload-list-svg-refresh-position-right: 28px;
+  --ti-upload-list-svg-refresh-position-right: var(--ti-common-space-8x);
   // 上传文件列表项删除图标右边距(hide)
   --ti-upload-list-svg-close-position-right: var(--ti-common-space-2x);
   // 照片墙上传列表项悬浮背景色(new)
-  --ti-upload-list-picture-card-item-hover-bg-color: rgba(0, 0, 0, 0.5);
+  --ti-upload-list-picture-card-item-hover-bg-color: var(--ti-common-bg-color-hover-40);
 }
diff --git a/packages/theme/src/upload/old-theme.js b/packages/theme/src/upload/old-theme.js
new file mode 100644
index 000000000..48612914f
--- /dev/null
+++ b/packages/theme/src/upload/old-theme.js
@@ -0,0 +1,9 @@
+export const tinyUploadOldTheme = {
+  'ti-upload-picture-card-height': 'var(--ti-common-size-37x, 148px)',
+  'ti-upload-picture-card-width': 'var(--ti-common-size-37x, 148px)',
+  'ti-upload-picture-card-icon-color': '#8c939d',
+  'ti-upload-picture-card-icon-font-size': 'var(--ti-common-size-7x, 28px)',
+  'ti-upload-picture-card-border-color': '#c0ccda',
+  'ti-upload-picture-card-bg-color': '#fbfdff',
+  'ti-upload-tip-text-color': 'var(--ti-common-color-text-primary, #252b3a)'
+}
diff --git a/packages/theme/src/upload/smb-theme.js b/packages/theme/src/upload/smb-theme.js
deleted file mode 100644
index 6c09cd4b7..000000000
--- a/packages/theme/src/upload/smb-theme.js
+++ /dev/null
@@ -1,9 +0,0 @@
-export const tinyUploadSmbTheme = {
-  'ti-upload-tip-text-color': '#808080',
-  'ti-upload-picture-card-width': '100px',
-  'ti-upload-picture-card-height': '100px',
-  'ti-upload-picture-card-icon-font-size': 'var(--ti-common-font-size-5)',
-  'ti-upload-picture-card-border-color': 'var(--ti-common-color-line-normal)',
-  'ti-upload-picture-card-icon-color': '#191919',
-  'ti-upload-picture-card-bg-color': '#FFFFFF'
-}
diff --git a/packages/theme/src/upload/vars.less b/packages/theme/src/upload/vars.less
index 87609d745..20b772297 100644
--- a/packages/theme/src/upload/vars.less
+++ b/packages/theme/src/upload/vars.less
@@ -14,21 +14,21 @@
   // 自定义上传提示字号
   --ti-upload-tip-font-size: var(--ti-common-font-size-base, 12px);
   // 自定义上传提示文本色
-  --ti-upload-tip-text-color: var(--ti-common-color-text-primary, #252b3a);
+  --ti-upload-tip-text-color: #808080;
   // 照片墙上传按钮背景色
-  --ti-upload-picture-card-bg-color: #fbfdff;
+  --ti-upload-picture-card-bg-color: #FFFFFF;
   // 照片墙上传按钮边框色
-  --ti-upload-picture-card-border-color: #c0ccda;
+  --ti-upload-picture-card-border-color: var(--ti-common-color-line-normal);
   // 照片墙上传按钮圆角
   --ti-upload-picture-card-border-radius: 6px;
   // 照片墙上传按钮悬浮边框色
   --ti-upload-picture-card-hover-border-color: var(--ti-common-color-dash-line-hover, #526ecc);
   // 照片墙上传按钮图标尺寸
-  --ti-upload-picture-card-icon-font-size: var(--ti-common-size-7x, 28px);
+  --ti-upload-picture-card-icon-font-size: var(--ti-common-font-size-5);
   // 照片墙上传按钮图标色
-  --ti-upload-picture-card-icon-color: #8c939d;
+  --ti-upload-picture-card-icon-color: #191919;
   // 拖拽上传区域宽度
-  --ti-upload-picture-card-width: var(--ti-common-size-37x, 148px);
+  --ti-upload-picture-card-width: 100px;
   // 拖拽上传区域高度
-  --ti-upload-picture-card-height: var(--ti-common-size-37x, 148px);
+  --ti-upload-picture-card-height: 100px;
 }
diff --git a/packages/theme/src/user-contact/smb-theme.js b/packages/theme/src/user-contact/old-theme.js
similarity index 67%
rename from packages/theme/src/user-contact/smb-theme.js
rename to packages/theme/src/user-contact/old-theme.js
index eb964598d..01ba0b38b 100644
--- a/packages/theme/src/user-contact/smb-theme.js
+++ b/packages/theme/src/user-contact/old-theme.js
@@ -1,5 +1,5 @@
-export const tinyUserContactSmbTheme = {
-  'ti-user-contact-role-desc-margin-left': 'var(--ti-common-space-0)',
-  'ti-user-contact-roleInfo-text-color': 'var(--ti-common-color-text-weaken)',
-  'ti-user-contact-roleInfo-font-size': 'var(--ti-common-font-size-0)'
+export const tinyUserContactOldTheme = {
+  'ti-user-contact-role-desc-margin-left': 'var(--ti-common-space-2x, 8px)',
+  'ti-user-contact-roleInfo-font-size': 'var(--ti-common-font-size-base, 12px)',
+  'ti-user-contact-roleInfo-text-color': 'var(--ti-common-color-info-normal, #252b3a)'
 }
diff --git a/packages/theme/src/user-contact/vars.less b/packages/theme/src/user-contact/vars.less
index 04295519e..4506b8a06 100644
--- a/packages/theme/src/user-contact/vars.less
+++ b/packages/theme/src/user-contact/vars.less
@@ -11,8 +11,8 @@
 */
 
 .component-css-vars-user-contact() {
-  --ti-user-contact-roleInfo-text-color: var(--ti-common-color-info-normal, #252b3a);
-  --ti-user-contact-roleInfo-font-size: var(--ti-common-font-size-base, 12px);
+  --ti-user-contact-roleInfo-text-color: var(--ti-common-color-text-weaken);
+  --ti-user-contact-roleInfo-font-size: var(--ti-common-font-size-0);
   --ti-user-contact-card-message-text-color: var(--ti-common-color-placeholder, #adb0b8);
   --ti-user-contact-card-border-color: #ddd;
   --ti-user-contact-card-header-bg-color: #3f4251;
@@ -21,5 +21,5 @@
   --ti-user-contact-card-header-roleNum-text-color: #b9babc;
   --ti-user-contact-card-espace-text-color: var(--ti-common-color-placeholder, #adb0b8);
   // 描述左外边距
-  --ti-user-contact-role-desc-margin-left: var(--ti-common-space-2x, 8px);
+  --ti-user-contact-role-desc-margin-left: var(--ti-common-space-0);
 }
diff --git a/packages/theme/src/wizard/old-theme.js b/packages/theme/src/wizard/old-theme.js
new file mode 100644
index 000000000..26f202a64
--- /dev/null
+++ b/packages/theme/src/wizard/old-theme.js
@@ -0,0 +1,51 @@
+export const tinyWizardOldTheme = {
+  'ti-wizard-time-right-title-margin-bottom': 'var(----ti-common-space-2x, 8px)',
+  'ti-wizard-time-right-padding-vertical': 'var(--ti-common-size-base, 4px)',
+  'ti-wizard-time-right-margin-left': 'var(--ti-common-space-3x, 12px)',
+  'ti-wizard-time-right-text-align': 'center',
+  'ti-wizard-time-dot-size': 'calc(var(--ti-common-size-base, 4) * 2.5)',
+  'ti-wizard-time-left-line-height': '1.2em',
+  'ti-wizard-time-left-icon-size': 'var(--ti-common-font-size-base, 14px)',
+  'ti-wizard-time-left-icon-margin-left': 'var(--ti-common-space-base, 4px)',
+  'ti-wizard-time-left-icon-color': 'auto',
+  'ti-wizard-time-left-icon-margin-right': 'var(--ti-common-space-0, 0px)',
+  'ti-wizard-time-left-point-position-top': '-14px',
+  'ti-wizard-time-left-position-top': '-24px',
+  'ti-wizard-time-left-margin-right': 'var(--ti-common-space-0, 0px)',
+  'ti-wizard-time-left-min-width': 'var(--ti-common-size-25x, 100px)',
+  'ti-wizard-time-node-icon-height': 'var(--ti-common-line-height-4, 20px)',
+  'ti-wizard-time-node-icon-width': 'var(--ti-common-size-4x, 16px)',
+  'ti-wizard-time-node-border-weight': 'var(--ti-common-border-weight-1, 2px)',
+  'ti-wizard-time-node-size': 'var(--ti-common-font-size-5, 24px)',
+  'ti-wizard-vertical-wait-desc-text-color': 'inherit',
+  'ti-wizard-vertical-desc-text-color': 'inherit',
+  'ti-wizard-vertical-desc-font-size': 'var(--ti-common-font-size-1, 14px)',
+  'ti-wizard-vertical-title-line-height': 'auto',
+  'ti-wizard-vertical-desc-margin-top': 'var(--ti-common-space-2x, 8px)',
+  'ti-wizard-vertical-text-margin-left': '15px',
+  'ti-wizard-vertical-node-box-height': 'auto',
+  'ti-wizard-vertical-icon-position-top': '-14px',
+  'ti-wizard-vertical-line-position-top': '0px',
+  'ti-wizard-vertical-icon-position': 'relative',
+  'ti-wizard-vertical-line-height': 'var(--ti-common-size-22x, 88px)',
+  'ti-wizard-vertical-line-width': 'var(--ti-common-size-base, 4px)',
+  'ti-wizard-button-group-text-align': 'right',
+  'ti-wizard-button-margin-left': 'var(--ti-common-space-2x, 8px)',
+  'ti-wizard-button-group-margin-top': 'var(--ti-common-space-10, 10px)',
+  'ti-wizard-node-title-margin-top': 'var(--ti-common-space-6, 6px)',
+  'ti-wizard-lines-normal-border-weight': '0px',
+  'ti-wizard-node-doing-font-weight': 'normal',
+  'ti-wizard-right-lines-doing-bg-color': 'var(--ti-common-color-bg-emphasize, #5e7ce0)',
+  'ti-wizard-chart-icon-bg-color': 'var(--ti-common-color-line-disabled, #dfe1e6)',
+  'ti-wizard-last-lines-bg-color': 'var(--ti-wizard-lines-normal-bg-color, #dfe1e6)',
+  'ti-wizard-time-last-lines-bg-color': 'none',
+  'ti-wizard-lines-normal-bg-color': '#c2c4c7',
+  'ti-wizard-first-lines-bg-color': 'var(--ti-common-color-bg-emphasize, #5e7ce0)',
+  'ti-wizard-lines-margin-horizontal': 'var(--ti-common-space-0, 0px)',
+  'ti-wizard-lines-width': 'calc(var(--ti-common-size-base, 4px) * 12.5)',
+  'ti-wizard-lines-height': 'var(--ti-common-size-base, 4px)',
+  'ti-wizard-node-size': 'var(--ti-common-font-size-4, 20px)',
+  'ti-wizard-icon-bg-color': 'var(--ti-common-color-bg-emphasize, #5e7ce0)',
+  'ti-wizard-normal-icon-color': 'var(--ti-common-color-light, #fff)',
+  'ti-wizard-icon-color': 'var(--ti-common-color-light, #fff)'
+}
diff --git a/packages/theme/src/wizard/smb-theme.js b/packages/theme/src/wizard/smb-theme.js
deleted file mode 100644
index 78727ce98..000000000
--- a/packages/theme/src/wizard/smb-theme.js
+++ /dev/null
@@ -1,52 +0,0 @@
-export const tinyWizardSmbTheme = {
-  'ti-wizard-icon-bg-color': 'var(--ti-common-color-light)',
-  'ti-wizard-icon-color': 'var(--ti-common-color-bg-emphasize)',
-  'ti-wizard-node-size': 'var(--ti-common-font-size-6)',
-  'ti-wizard-lines-height': 'var(--ti-common-border-weight-normal)',
-  'ti-wizard-lines-width': 'var(--ti-common-size-width-minor)',
-  'ti-wizard-lines-margin-horizontal': 'var(--ti-common-dropdown-gap)',
-  'ti-wizard-first-lines-bg-color': 'var(--ti-common-color-transparent)',
-  'ti-wizard-last-lines-bg-color': 'var(--ti-common-color-transparent)',
-  'ti-wizard-right-lines-doing-bg-color': 'var(--ti-common-color-line-disabled)',
-  'ti-wizard-lines-normal-bg-color': 'var(--ti-common-color-line-disabled)',
-  'ti-wizard-chart-icon-bg-color': 'var(--ti-common-color-bg-light-normal)',
-  'ti-wizard-lines-normal-border-weight': 'var(--ti-common-border-weight-normal)',
-  'ti-wizard-normal-icon-color': 'var(--ti-common-color-text-disabled)',
-  'ti-wizard-node-doing-font-weight': 'var(--ti-common-font-weight-bold)',
-  'ti-wizard-node-title-margin-top': 'var(--ti-common-dropdown-gap)',
-  'ti-wizard-button-group-margin-top': 'calc(var(--ti-common-space-base) * 9)',
-  'ti-wizard-button-group-text-align': 'left',
-  'ti-wizard-button-margin-left': 'var(--ti-common-space-3x)',
-  'ti-wizard-vertical-line-width': 'var(--ti-common-border-weight-normal)',
-  'ti-wizard-vertical-line-height': 'var(--ti-common-line-height-8)',
-  'ti-wizard-vertical-icon-position': 'absolute',
-  'ti-wizard-vertical-line-position-top': '54px',
-  'ti-wizard-vertical-icon-position-top': '-40px',
-  'ti-wizard-vertical-node-box-height':
-    'calc(var(--ti-wizard-vertical-line-height) + var(--ti-wizard-node-size) + 16px)',
-  'ti-wizard-vertical-text-margin-left': '21.5px',
-  'ti-wizard-vertical-desc-margin-top': 'var(--ti-common-space-0)',
-  'ti-wizard-vertical-title-line-height': 'var(--ti-common-line-height-number)',
-  'ti-wizard-vertical-desc-font-size': 'var(--ti-common-font-size-0)',
-  'ti-wizard-vertical-desc-text-color': 'var(--ti-common-color-text-weaken)',
-  'ti-wizard-vertical-wait-desc-text-color': 'var(--ti-common-color-bg-emphasize)',
-  'ti-wizard-time-node-size': 'var(--ti-common-font-size-6)',
-  'ti-wizard-time-node-border-weight': '0',
-  'ti-wizard-time-last-lines-bg-color': 'var(--ti-common-color-bg-emphasize)',
-  'ti-wizard-time-node-icon-width': 'var(--ti-common-font-size-6)',
-  'ti-wizard-time-node-icon-height': 'var(--ti-common-font-size-6)',
-  'ti-wizard-time-left-margin-right': 'var(--ti-common-space-2x)',
-  'ti-wizard-time-left-position-top': '-28px',
-  'ti-wizard-time-left-point-position-top': '-15px',
-  'ti-wizard-time-left-icon-color': 'var(--ti-common-color-icon-normal)',
-  'ti-wizard-time-left-icon-margin-right': 'var(--ti-common-space-10)',
-  'ti-wizard-time-left-min-width': 'var(--ti-common-size-width-medium)',
-  'ti-wizard-time-left-icon-margin-left': 'var(--ti-common-space-2x)',
-  'ti-wizard-time-left-icon-size': 'var(--ti-common-font-size-2)',
-  'ti-wizard-time-left-line-height': 'var(--ti-common-line-height-number)',
-  'ti-wizard-time-dot-size': 'var(--ti-common-size-3x)',
-  'ti-wizard-time-right-text-align': 'left',
-  'ti-wizard-time-right-margin-left': '15.5px',
-  'ti-wizard-time-right-padding-vertical': 'var(--ti-common-space-0)',
-  'ti-wizard-time-right-title-margin-bottom': 'var(--ti-common-space-0)'
-}
diff --git a/packages/theme/src/wizard/vars.less b/packages/theme/src/wizard/vars.less
index efd2370e3..acfaf9389 100644
--- a/packages/theme/src/wizard/vars.less
+++ b/packages/theme/src/wizard/vars.less
@@ -14,9 +14,9 @@
   // 横向流程图默认字号(不含基础插槽)
   --ti-wizard-font-size: var(--ti-common-font-size-base, 12px);
   // 节点文本色|图标色
-  --ti-wizard-icon-color: var(--ti-common-color-light, #fff);
+  --ti-wizard-icon-color: var(--ti-common-color-bg-emphasize);
   // 未完成节点文本色|图标色
-  --ti-wizard-normal-icon-color: var(--ti-common-color-light, #fff);
+  --ti-wizard-normal-icon-color: var(--ti-common-color-text-disabled);
   // 时间线流程图节点两侧文本色
   --ti-wizard-text-color: var(--ti-common-color-info-normal, #252b3a);
   // 时间线流程图节点右侧文字悬浮圆角
@@ -24,115 +24,115 @@
   // 时间线流程图节点右侧文字悬浮背景色
   --ti-wizard-detail-bg-color: var(--ti-common-color-warning-normal, #fa9841);
   // 已完成的节点和线条背景色
-  --ti-wizard-icon-bg-color: var(--ti-common-color-bg-emphasize, #5e7ce0);
+  --ti-wizard-icon-bg-color: var(--ti-common-color-light);
   // 已完成的节点边框色
   --ti-wizard-icon-border-color: var(--ti-common-color-bg-emphasize, #5e7ce0);
   // 节点下方文本色
   --ti-wizard-node-text-color: var(--ti-common-color-bg-emphasize, #5e7ce0);
   // 节点尺寸
-  --ti-wizard-node-size: var(--ti-common-font-size-4, 20px);
+  --ti-wizard-node-size: var(--ti-common-font-size-6);
   // 节点线高度
-  --ti-wizard-lines-height: var(--ti-common-size-base, 4px);
+  --ti-wizard-lines-height: var(--ti-common-border-weight-normal);
   // 节点线宽度
-  --ti-wizard-lines-width: calc(var(--ti-common-size-base, 4px) * 12.5);
+  --ti-wizard-lines-width: var(--ti-common-size-width-minor);
   // 节点线左右外边距
-  --ti-wizard-lines-margin-horizontal: var(--ti-common-space-0, 0px);
+  --ti-wizard-lines-margin-horizontal: var(--ti-common-dropdown-gap);
   // 第一条节点线颜色
-  --ti-wizard-first-lines-bg-color: var(--ti-common-color-bg-emphasize, #5e7ce0);
+  --ti-wizard-first-lines-bg-color: var(--ti-common-color-transparent);
   // 节点线颜色
   --ti-wizard-lines-bg-color: var(--ti-common-color-bg-emphasize, #5e7ce0);
   // 未完成节点线背景色
-  --ti-wizard-lines-normal-bg-color: #c2c4c7;
+  --ti-wizard-lines-normal-bg-color: var(--ti-common-color-line-disabled);
   // 时间线节点线颜色
   --ti-wizard-time-lines-bg-color: var(--ti-common-color-bg-emphasize, #5e7ce0);
   // 时间线最后一条节点线颜色
-  --ti-wizard-time-last-lines-bg-color: none;
+  --ti-wizard-time-last-lines-bg-color: var(--ti-common-color-bg-emphasize);
   // 最后一条节点线颜色
-  --ti-wizard-last-lines-bg-color: var(--ti-wizard-lines-normal-bg-color, #dfe1e6);
+  --ti-wizard-last-lines-bg-color: var(--ti-common-color-transparent);
   // 未完成的节点背景色
-  --ti-wizard-chart-icon-bg-color: var(--ti-common-color-line-disabled, #dfe1e6);
+  --ti-wizard-chart-icon-bg-color: var(--ti-common-color-bg-light-normal);
   // doing节点右侧线背景色
-  --ti-wizard-right-lines-doing-bg-color: var(--ti-common-color-bg-emphasize, #5e7ce0);
+  --ti-wizard-right-lines-doing-bg-color: var(--ti-common-color-line-disabled);
   // doing节点下方字重
-  --ti-wizard-node-doing-font-weight: normal;
+  --ti-wizard-node-doing-font-weight: var(--ti-common-font-weight-bold);
   // 未完成节点边框色
   --ti-wizard-lines-normal-border-color: var(--ti-common-color-line-disabled, #5c6173);
   // 未完成节点边框厚度
-  --ti-wizard-lines-normal-border-weight: 0px;
+  --ti-wizard-lines-normal-border-weight: var(--ti-common-border-weight-normal);
   // 节点标题上外边距
-  --ti-wizard-node-title-margin-top: var(--ti-common-space-6, 6px);
+  --ti-wizard-node-title-margin-top: var(--ti-common-dropdown-gap);
   // 页向导模式按钮组上外边距
-  --ti-wizard-button-group-margin-top: var(--ti-common-space-10, 10px);
+  --ti-wizard-button-group-margin-top: calc(var(--ti-common-space-base) * 9);
   // 页向导模式按钮左外边距
-  --ti-wizard-button-margin-left: var(--ti-common-space-2x, 8px);
+  --ti-wizard-button-margin-left: var(--ti-common-space-3x);
   // 页向导模式按钮组上对齐方式(hide)
-  --ti-wizard-button-group-text-align: right;
+  --ti-wizard-button-group-text-align: left;
   // 垂直模式线条宽度
-  --ti-wizard-vertical-line-width: var(--ti-common-size-base, 4px);
+  --ti-wizard-vertical-line-width: var(--ti-common-border-weight-normal);
   // 垂直模式线条高度
-  --ti-wizard-vertical-line-height: var(--ti-common-size-22x, 88px);
+  --ti-wizard-vertical-line-height: var(--ti-common-line-height-8);
   // 垂直模式图标定位模式(hide)
-  --ti-wizard-vertical-icon-position: relative;
+  --ti-wizard-vertical-icon-position: absolute;
   // 垂直模式文件外边距(hide)
   --ti-wizard-vertical-position-top: -5px;
   // 垂直模式文件外边距(hide)
-  --ti-wizard-vertical-line-position-top: 0px;
+  --ti-wizard-vertical-line-position-top: 54px;
   // 垂直模式文件外边距(hide)
-  --ti-wizard-vertical-icon-position-top: -14px;
+  --ti-wizard-vertical-icon-position-top: -40px;
   // 垂直模式节点部分整体高度
-  --ti-wizard-vertical-node-box-height: auto;
+  --ti-wizard-vertical-node-box-height: calc(var(--ti-wizard-vertical-line-height) + var(--ti-wizard-node-size) + 16px);
   // 垂直模式节点文字左外边距
-  --ti-wizard-vertical-text-margin-left: 15px;
+  --ti-wizard-vertical-text-margin-left: 21.5px;
   // 垂直模式节点描述文字上外边距
-  --ti-wizard-vertical-desc-margin-top: var(--ti-common-space-2x, 8px);
+  --ti-wizard-vertical-desc-margin-top: var(--ti-common-space-0);
   // 垂直模式节点标题文字行高
-  --ti-wizard-vertical-title-line-height: auto;
+  --ti-wizard-vertical-title-line-height: var(--ti-common-line-height-number);
   // 垂直模式节点标题字号
   --ti-wizard-vertical-title-font-size: var(--ti-common-font-size-1, 14px);
   // 垂直模式节点描述字号
-  --ti-wizard-vertical-desc-font-size: var(--ti-common-font-size-1, 14px);
+  --ti-wizard-vertical-desc-font-size: var(--ti-common-font-size-0);
   // 垂直模式节点描述文本色
-  --ti-wizard-vertical-desc-text-color: inherit;
+  --ti-wizard-vertical-desc-text-color: var(--ti-common-color-text-weaken);
   // 垂直模式未完成节点描述文本色
-  --ti-wizard-vertical-wait-desc-text-color: inherit;
+  --ti-wizard-vertical-wait-desc-text-color: var(--ti-common-color-bg-emphasize);
   // 时间线节点尺寸
-  --ti-wizard-time-node-size: var(--ti-common-font-size-5, 24px);
+  --ti-wizard-time-node-size: var(--ti-common-font-size-6);
   // 时间线节点边框厚度
-  --ti-wizard-time-node-border-weight: var(--ti-common-border-weight-1, 2px);
+  --ti-wizard-time-node-border-weight: 0;
   // 时间线节点内图标宽度
-  --ti-wizard-time-node-icon-width: var(--ti-common-size-4x, 16px);
+  --ti-wizard-time-node-icon-width: var(--ti-common-font-size-6);
   // 时间线节点内图标高度
-  --ti-wizard-time-node-icon-height: var(--ti-common-line-height-4, 20px);
+  --ti-wizard-time-node-icon-height: var(--ti-common-font-size-6);
   // 时间线节点内图标色
   --ti-wizard-time-node-icon-color: var(--ti-common-color-bg-emphasize, #5e7ce0);
   // 时间线节点内图标背景色
   --ti-wizard-time-node-bg-color: var(--ti-common-color-light, #fff);
   // 时间线节点左侧日期最小宽度
-  --ti-wizard-time-left-min-width: var(--ti-common-size-25x, 100px);
+  --ti-wizard-time-left-min-width: var(--ti-common-size-width-medium);
   // 时间线节点左侧日期右外边距
-  --ti-wizard-time-left-margin-right: var(--ti-common-space-0, 0px);
+  --ti-wizard-time-left-margin-right: var(--ti-common-space-2x);
   // 时间线节点左侧日期top定位(hide)
-  --ti-wizard-time-left-position-top: -24px;
+  --ti-wizard-time-left-position-top: -28px;
   // 时间线节点左侧时间top定位(hide)
-  --ti-wizard-time-left-point-position-top: -14px;
+  --ti-wizard-time-left-point-position-top: -15px;
   // 时间线节点左侧展开图标右外边距
-  --ti-wizard-time-left-icon-margin-right: var(--ti-common-space-0, 0px);
+  --ti-wizard-time-left-icon-margin-right: var(--ti-common-space-10);
   // 时间线节点左侧展开图标色
-  --ti-wizard-time-left-icon-color: auto;
+  --ti-wizard-time-left-icon-color: var(--ti-common-color-icon-normal);
   // 时间线节点左侧日期图标左外边距
-  --ti-wizard-time-left-icon-margin-left: var(--ti-common-space-base, 4px);
+  --ti-wizard-time-left-icon-margin-left: var(--ti-common-space-2x);
   // 时间线节点左侧日期图标尺寸
-  --ti-wizard-time-left-icon-size: var(--ti-common-font-size-base, 14px);
+  --ti-wizard-time-left-icon-size: var(--ti-common-font-size-2);
   // 时间线节点左侧文字行高
-  --ti-wizard-time-left-line-height: 1.2em;
+  --ti-wizard-time-left-line-height: var(--ti-common-line-height-number);
   // 时间线节点小圆点尺寸
-  --ti-wizard-time-dot-size: calc(var(--ti-common-size-base, 4) * 2.5);
+  --ti-wizard-time-dot-size: var(--ti-common-size-3x);
   // 时间线节点右侧文字对齐方式(hide)
-  --ti-wizard-time-right-text-align: center;
+  --ti-wizard-time-right-text-align: left;
   // 时间线节点右侧文字左外边距
-  --ti-wizard-time-right-margin-left: var(--ti-common-space-3x, 12px);
+  --ti-wizard-time-right-margin-left: 15.5px;
   // 时间线节点右侧文字垂直内边距
-  --ti-wizard-time-right-padding-vertical: var(--ti-common-size-base, 4px);
+  --ti-wizard-time-right-padding-vertical: var(--ti-common-space-0);
   // 时间线节点右侧标题底部外边距
-  --ti-wizard-time-right-title-margin-bottom: var(----ti-common-space-2x, 8px);
+  --ti-wizard-time-right-title-margin-bottom: var(--ti-common-space-0);
 }