diff --git a/packages/common/component/BlockHistoryTemplate.vue b/packages/common/component/BlockHistoryTemplate.vue
deleted file mode 100644
index 7e7cbbbd3..000000000
--- a/packages/common/component/BlockHistoryTemplate.vue
+++ /dev/null
@@ -1,79 +0,0 @@
-<template>
-  <div class="version-col">
-    <div class="version-row">
-      <span v-if="isBlockManage" class="version-v">{{ blockHistory.version }}</span>
-      <span class="version-date">{{ format(blockHistory.updated_at, 'yyyy/MM/dd hh:mm:ss') }}</span>
-      <span v-if="isCurrentVersion(blockHistory)" class="current-version-tip">(当前版本)</span>
-    </div>
-    <div class="version-msg">
-      {{ blockHistory.message }}
-    </div>
-  </div>
-</template>
-
-<script>
-import { format } from '@opentiny/vue-renderless/common/date'
-
-export default {
-  props: {
-    currentVersion: {
-      type: String
-    },
-    blockHistory: {
-      type: Object,
-      required: true
-    },
-    isBlockManage: {
-      type: Boolean,
-      default: false
-    }
-  },
-  setup(props) {
-    const isCurrentVersion = (blockHistory) => blockHistory.version && blockHistory.version === props.currentVersion
-
-    return {
-      isCurrentVersion,
-      format
-    }
-  }
-}
-</script>
-
-<style lang="less" scoped>
-.current-version-tip {
-  display: inline-block;
-  color: var(--ti-lowcode-component-block-version-list-current-version-color);
-  margin: 0 6px;
-  line-height: 16px;
-}
-.version-col {
-  .version-row {
-    margin-top: 10px;
-    span {
-      display: inline-block;
-    }
-    .version-v {
-      font-size: 14px;
-      padding: 2px 12px;
-      margin-right: 10px;
-      background-color: var(--ti-lowcode-component-block-version-list-version-bg);
-      color: var(--ti-lowcode-component-block-version-list-version-color);
-      border-radius: 6px;
-    }
-
-    .version-date {
-      color: var(--ti-lowcode-component-block-version-list-time-color);
-      padding: 0 10px;
-      padding-left: 0;
-      font-size: 14px;
-    }
-  }
-  .version-msg {
-    padding: 5px 0;
-    color: var(--ti-lowcode-component-block-version-list-desc-color);
-    overflow: hidden;
-    text-overflow: ellipsis;
-    white-space: nowrap;
-  }
-}
-</style>
diff --git a/packages/common/component/CloseIcon.vue b/packages/common/component/CloseIcon.vue
index c105b7586..ee883ea00 100644
--- a/packages/common/component/CloseIcon.vue
+++ b/packages/common/component/CloseIcon.vue
@@ -29,7 +29,7 @@ export default {
 .icon-wrap {
   width: 24px;
   height: 24px;
-  color: var(--ti-lowcode-component-svg-button-color);
+  color: var(--te-common-icon-primary);
   font-size: 16px;
   border-radius: 4px;
   cursor: pointer;
@@ -39,12 +39,12 @@ export default {
   transition: 0.3s;
 
   &:hover {
-    color: var(--ti-lowcode-component-svg-button-hover-color);
-    background-color: var(--ti-lowcode-component-svg-button-hover-bg-color);
+    color: var(--te-common-icon-primary);
+    background-color: var(--te-common-bg-prompt);
   }
   &.active {
-    color: var(--ti-lowcode-component-svg-button-active-color);
-    background-color: var(--ti-lowcode-component-svg-button-active-bg-color);
+    color: var(--te-common-icon-primary);
+    background-color: var(--te-common-bg-prompt);
   }
 }
 </style>
diff --git a/packages/common/component/ConfigItem.vue b/packages/common/component/ConfigItem.vue
index 0f0fb3ea8..ad50df1e0 100644
--- a/packages/common/component/ConfigItem.vue
+++ b/packages/common/component/ConfigItem.vue
@@ -551,6 +551,7 @@ export default {
       .binding-state {
         color: var(--ti-lowcode-meta-config-item-bind-color);
         background: var(--ti-lowcode-meta-config-item-bind-bg);
+        border: 1px solid var(--ti-lowcode-meta-config-item-bind-border);
         padding: 4px 12px;
         overflow: hidden;
         text-overflow: ellipsis;
diff --git a/packages/common/component/PluginBlockList.vue b/packages/common/component/PluginBlockList.vue
index 289cbe8b5..13d8f2964 100644
--- a/packages/common/component/PluginBlockList.vue
+++ b/packages/common/component/PluginBlockList.vue
@@ -486,14 +486,6 @@ export default {
         position: static;
         margin-left: 4px;
         z-index: 9;
-        .block-detail-icon {
-          color: var(--ti-lowcode-component-block-list-setting-btn-color);
-          display: block;
-          &:hover {
-            cursor: pointer;
-            color: var(--ti-lowcode-component-block-list-setting-btn-hover-color);
-          }
-        }
       }
       &:hover {
         background-color: var(--te-common-bg-container);
@@ -599,14 +591,6 @@ export default {
       &.is-current-visible-icon {
         visibility: visible;
       }
-
-      .block-detail-icon {
-        color: var(--te-common-icon-secondary);
-        &:hover {
-          cursor: pointer;
-          color: var(--ti-lowcode-component-block-list-setting-btn-hover-color);
-        }
-      }
     }
     .block-setting {
       right: 0px;
diff --git a/packages/common/component/PluginPanel.vue b/packages/common/component/PluginPanel.vue
index 297ef4fd2..c0f444f6a 100644
--- a/packages/common/component/PluginPanel.vue
+++ b/packages/common/component/PluginPanel.vue
@@ -73,7 +73,7 @@ export default {
 .plugin-panel {
   width: 100%;
   height: 100%;
-  background: var(--ti-lowcode-plugin-panel-bg, --ti-lowcode-toolbar-bg);
+  background: var(--te-common-bg-default);
   display: flex;
   flex-direction: column;
   position: relative;
diff --git a/packages/common/component/PluginSetting.vue b/packages/common/component/PluginSetting.vue
index 79a0be627..463c8ec12 100644
--- a/packages/common/component/PluginSetting.vue
+++ b/packages/common/component/PluginSetting.vue
@@ -129,7 +129,7 @@ export default {
   width: var(--base-collection-panel-width);
   height: 100%;
   border-right: 1px solid var(--te-common-border-default);
-  background: var(--ti-lowcode-plugin-setting-panel-bg, --ti-lowcode-toolbar-bg);
+  background: var(--te-common-bg-default);
   overflow: hidden;
   border-left: 1px solid var(--ti-lowcode-plugin-panel-header-border-bottom-color);
   &:not(.second-panel) {
diff --git a/packages/common/component/SvgButton.vue b/packages/common/component/SvgButton.vue
index 996f98ccb..9db5fc1ea 100644
--- a/packages/common/component/SvgButton.vue
+++ b/packages/common/component/SvgButton.vue
@@ -60,8 +60,7 @@ export default {
     color: var(--te-common-icon-hover);
   }
   &.active {
-    color: var(--ti-lowcode-component-svg-button-active-color);
-    background-color: var(--ti-lowcode-component-svg-button-active-bg-color);
+    color: var(--te-common-icon-hover);
   }
 
   .svg-icon {
@@ -74,5 +73,9 @@ export default {
     color: var(--te-common-icon-primary);
     background-color: var(--te-common-bg-prompt);
   }
+  &.active {
+    color: var(--te-common-icon-primary);
+    background-color: var(--te-common-bg-prompt);
+  }
 }
 </style>
diff --git a/packages/common/component/index.js b/packages/common/component/index.js
index 0d40e5553..7397fd280 100644
--- a/packages/common/component/index.js
+++ b/packages/common/component/index.js
@@ -30,7 +30,6 @@ export { default as MetaCodeEditor } from './MetaCodeEditor.vue'
 export { default as VideoGuide } from './VideoGuide.vue'
 export { default as MonacoEditor } from './MonacoEditor.vue'
 export { default as BlockHistoryList } from './BlockHistoryList.vue'
-export { default as BlockHistoryTemplate } from './BlockHistoryTemplate.vue'
 export { default as BlockLinkField } from './BlockLinkField.vue'
 export { default as BlockLinkEvent } from './BlockLinkEvent.vue'
 export { default as BlockDescription } from './BlockDescription.vue'
diff --git a/packages/common/component/toolbar-built-in/ToolbarBaseButton.vue b/packages/common/component/toolbar-built-in/ToolbarBaseButton.vue
index 57b6ad041..dc4359b8a 100644
--- a/packages/common/component/toolbar-built-in/ToolbarBaseButton.vue
+++ b/packages/common/component/toolbar-built-in/ToolbarBaseButton.vue
@@ -33,7 +33,7 @@ export default {
 </script>
 <style lang="less" scoped>
 .toolbar-button {
-  background-color: var(--ti-lowcode-toolbar-button-bg) !important;
+  background-color: var(--te-common-bg-prompt) !important;
   border: none !important;
   min-width: 70px;
   height: 26px;
diff --git a/packages/layout/src/DesignSettings.vue b/packages/layout/src/DesignSettings.vue
index 67995eddf..2fb7e1473 100644
--- a/packages/layout/src/DesignSettings.vue
+++ b/packages/layout/src/DesignSettings.vue
@@ -77,6 +77,7 @@ export default {
     flex-direction: column;
     .tiny-tabs__header .tiny-tabs__nav {
       width: 60%;
+      background-color: var(--te-common-bg-default);
     }
     .tiny-tabs__nav-scroll {
       margin-left: 12px;
@@ -105,6 +106,7 @@ export default {
       }
       &.is-active {
         color: var(--ti-lowcode-setting-panel-tabs-item-title-active-color);
+        border: none;
       }
 
       .tiny-tabs__item__title {
diff --git a/packages/plugins/block/src/BlockConfig.vue b/packages/plugins/block/src/BlockConfig.vue
index bd418a958..ccc19674b 100644
--- a/packages/plugins/block/src/BlockConfig.vue
+++ b/packages/plugins/block/src/BlockConfig.vue
@@ -309,10 +309,17 @@ export default {
   .tag-button {
     color: var(--ti-lowcode-block-config-tag-color);
     background-color: var(--ti-lowcode-block-config-tag-bg);
+    border: none;
     height: 28px;
+    :deep(.tiny-tag__close) {
+      fill: var(--ti-lowcode-block-config-tag-close-color);
+    }
     &:hover {
       color: var(--ti-lowcode-block-config-tag-hover-color);
       background-color: var(--ti-lowcode-block-config-tag-hover-bg);
+      :deep(.tiny-tag__close) {
+        fill: var(--ti-lowcode-block-config-tag-close-hover-color);
+      }
     }
   }
 
diff --git a/packages/plugins/block/src/Main.vue b/packages/plugins/block/src/Main.vue
index b5d230474..f33d19f43 100644
--- a/packages/plugins/block/src/Main.vue
+++ b/packages/plugins/block/src/Main.vue
@@ -457,18 +457,6 @@ export default {
   .search-select {
     flex: 1;
   }
-  .add-group-btn {
-    display: flex;
-    align-items: center;
-    text-align: center;
-    margin-left: 8px;
-    border-color: transparent;
-    background-color: var(--ti-lowcode-component-block-list-add-group-btn-bg);
-    width: 30px;
-    height: 30px;
-    border: var(--ti-lowcode-component-block-list-add-group-btn-border);
-    border-radius: var(--ti-lowcode-component-block-list-add-group-btn-border-radius);
-  }
 }
 .app-manage-search {
   padding: 0 10px 12px 10px;
diff --git a/packages/plugins/help/src/HelpIcon.vue b/packages/plugins/help/src/HelpIcon.vue
index 43e9d8114..81fa646d1 100644
--- a/packages/plugins/help/src/HelpIcon.vue
+++ b/packages/plugins/help/src/HelpIcon.vue
@@ -331,14 +331,8 @@ div.tiny-guide.shepherd-element {
   }
 }
 
-// 引导遮罩层
-.shepherd-modal-overlay-container.shepherd-modal-is-visible {
-  fill: var(--ti-lowcode-help-guide-mask-bg-color);
-}
-
 .help-plugin-box {
   cursor: auto;
-  background-color: var(--ti-lowcode-help-box-bg-color);
   border-radius: 6px;
   padding: 4px 0;
   &-top {
@@ -365,6 +359,7 @@ div.tiny-guide.shepherd-element {
     margin: 0 -16px;
     padding: 0 16px;
     color: var(--te-common-text-primary);
+    fill: var(--te-common-icon-primary);
     span {
       display: flex;
       align-items: center;
diff --git a/packages/plugins/materials/src/meta/block/src/BlockGroup.vue b/packages/plugins/materials/src/meta/block/src/BlockGroup.vue
index b89c8b07e..b913b29bd 100644
--- a/packages/plugins/materials/src/meta/block/src/BlockGroup.vue
+++ b/packages/plugins/materials/src/meta/block/src/BlockGroup.vue
@@ -396,18 +396,6 @@ export default {
   display: flex;
   justify-content: space-between;
   padding: 12px;
-
-  .add-group-btn {
-    font-size: 16px;
-    width: 32px;
-    height: 32px;
-    border-radius: 6px;
-    border-color: var(--ti-lowcode-materials-border-icon-border-color);
-    background-color: var(--ti-lowcode-materials-border-icon-bg-color);
-    &:hover {
-      border-color: var(--ti-lowcode-materials-border-icon-border-color-hover);
-    }
-  }
 }
 
 .blocks-header-option {
diff --git a/packages/plugins/materials/src/meta/component/src/Main.vue b/packages/plugins/materials/src/meta/component/src/Main.vue
index a4b0fb13b..079301c66 100644
--- a/packages/plugins/materials/src/meta/component/src/Main.vue
+++ b/packages/plugins/materials/src/meta/component/src/Main.vue
@@ -154,7 +154,7 @@ export default {
       background: var(--te-common-bg-default);
 
       &:hover {
-        background: var(--ti-lowcode-material-component-list-hover-bg);
+        background: var(--te-common-bg-container);
         border-radius: 4px;
       }
 
diff --git a/packages/plugins/page/src/Tree.vue b/packages/plugins/page/src/Tree.vue
index 7d81cc74c..4d99bfb3d 100644
--- a/packages/plugins/page/src/Tree.vue
+++ b/packages/plugins/page/src/Tree.vue
@@ -287,10 +287,10 @@ const handleContainerDragLeave = (event) => {
       }
     }
     &.active {
-      background-color: var(--te-base-blue-20);
-      color: var(--te-common-bg-primary-checked);
+      background-color: var(--te-common-bg-container);
+      color: var(--te-common-text-primary);
       svg {
-        color: var(--te-common-bg-primary-checked);
+        color: var(--te-common-icon-secondary);
       }
     }
   }
diff --git a/packages/plugins/robot/src/Main.vue b/packages/plugins/robot/src/Main.vue
index 94446338c..32ebf94cb 100644
--- a/packages/plugins/robot/src/Main.vue
+++ b/packages/plugins/robot/src/Main.vue
@@ -432,7 +432,7 @@ export default {
     float: right;
     margin: 0 6px;
     cursor: pointer;
-    color: var(--te-common-icon-primary);
+    color: var(--ti-lowcode-chat-model-icon);
     &:hover {
       opacity: 0.8;
     }
@@ -605,7 +605,7 @@ export default {
     padding: 0;
     transition: all 0.1s linear;
     .svg-icon {
-      color: var(--ti-lowcode-chat-model-button-text);
+      fill: var(--ti-lowcode-chat-model-button-text);
       margin-right: 0;
     }
     span {
diff --git a/packages/plugins/script/src/Main.vue b/packages/plugins/script/src/Main.vue
index a5e2ec140..dc11acb28 100644
--- a/packages/plugins/script/src/Main.vue
+++ b/packages/plugins/script/src/Main.vue
@@ -133,16 +133,6 @@ export default {
         color: var(--ti-lowcode-plugin-panel-title-color);
         font-weight: var(--ti-lowcode-plugin-panel-title-font-weight);
       }
-
-      .help-link {
-        display: inline-block;
-        margin-left: 20px;
-        cursor: pointer;
-        color: var(--ti-lowcode-plugin-js-help-link-color);
-        &:hover {
-          text-decoration: underline;
-        }
-      }
     }
 
     .head-right {
diff --git a/packages/plugins/state/src/Main.vue b/packages/plugins/state/src/Main.vue
index 152f5372e..dfaafdaa1 100644
--- a/packages/plugins/state/src/Main.vue
+++ b/packages/plugins/state/src/Main.vue
@@ -400,7 +400,7 @@ export default {
     flex-direction: column;
     .add-btn {
       margin: 12px 0;
-      padding: 0 10px;
+      padding: 0 8px;
       width: 100%;
       .tiny-button {
         width: 100%;
@@ -435,7 +435,7 @@ export default {
 
     .left-filter {
       margin-top: 4px;
-      padding: 0 10px;
+      padding: 0 8px;
     }
 
     & > span {
diff --git a/packages/plugins/tree/src/Main.vue b/packages/plugins/tree/src/Main.vue
index 246409758..0c60939fc 100644
--- a/packages/plugins/tree/src/Main.vue
+++ b/packages/plugins/tree/src/Main.vue
@@ -313,7 +313,7 @@ export default {
     .tree-handle {
       font-size: var(--te-base-font-size-2);
       svg {
-        color: var(--te-common-icon-secondary);
+        fill: var(--te-common-icon-secondary);
       }
     }
   }
@@ -336,18 +336,6 @@ export default {
     }
   }
 
-  :deep(.tiny-grid .tiny-grid__body-wrapper .tiny-grid-body__row) {
-    background-color: var(--te-common-bg-default);
-    &:hover {
-      background-color: var(--te-common-bg-container);
-    }
-  }
-  :deep(.tiny-grid .tiny-grid__body-wrapper .tiny-grid-body__row:not(.row__hover):nth-child(2n)) {
-    background-color: var(--te-common-bg-default);
-    &:hover {
-      background-color: var(--te-common-bg-container);
-    }
-  }
   :deep(.tiny-grid-body__row.nav-tree .tiny-grid-cell) {
     line-height: inherit;
   }
diff --git a/packages/settings/events/src/components/AdvanceConfig.vue b/packages/settings/events/src/components/AdvanceConfig.vue
index d01291c50..49cd917bd 100644
--- a/packages/settings/events/src/components/AdvanceConfig.vue
+++ b/packages/settings/events/src/components/AdvanceConfig.vue
@@ -286,6 +286,7 @@ export default {
       box-sizing: border-box;
       background: var(--ti-lowcode-events-advanced-binding-state-bg-color);
       color: var(--ti-lowcode-events-advanced-binding-state-color);
+      border: 1px solid var(--ti-lowcode-events-advanced-binding-state-border-color);
       font-size: 12px;
       height: 30px;
       line-height: 22px;
diff --git a/packages/settings/events/src/components/BindEvents.vue b/packages/settings/events/src/components/BindEvents.vue
index 335c046aa..ddc5843da 100644
--- a/packages/settings/events/src/components/BindEvents.vue
+++ b/packages/settings/events/src/components/BindEvents.vue
@@ -50,15 +50,11 @@
               name="plugin-icon-page-schema"
               tips="定位到代码"
               placement="top"
+              :hoverBgColor="false"
               @click="openCodePanel(action)"
             ></svg-button>
-            <svg-button
-              name="setting"
-              tips="设置"
-              placement="top"
-              @click="openActionDialog(action, false)"
-            ></svg-button>
-            <svg-button name="delete" tips="删除" placement="top" @click="delEvent(action)"></svg-button>
+            <svg-button name="setting" :hoverBgColor="false" @click="openActionDialog(action, false)"></svg-button>
+            <svg-button name="delete" :hoverBgColor="false" @click="delEvent(action)"></svg-button>
           </div>
         </div>
       </li>
@@ -303,7 +299,6 @@ export default {
       }
 
       .linked {
-        background-color: var(--ti-lowcode-events-bind-action-item-linked-bg-color);
         color: var(--ti-lowcode-events-bind-action-item-linked-color);
       }
     }
@@ -351,10 +346,6 @@ export default {
     .text {
       margin-top: 12px;
     }
-
-    .empty-bind-event-tip {
-      color: var(--ti-lowcode-events-empty-action-tips-strong-color);
-    }
   }
 }
 .bind-event-list {
@@ -374,11 +365,4 @@ export default {
     background: var(--lowcode-events-bind-event-list-item-hover-bg-color);
   }
 }
-
-.add-custom-event-tip {
-  color: var(--ti-lowcode-events-add-custom-event-tips-color);
-  .event-tip-highlight {
-    color: var(--ti-lowcode-event-add-custom-event-tips-highlight-color);
-  }
-}
 </style>
diff --git a/packages/settings/events/src/components/BindEventsDialogContent.vue b/packages/settings/events/src/components/BindEventsDialogContent.vue
index 8ae30bdb9..de214fbef 100644
--- a/packages/settings/events/src/components/BindEventsDialogContent.vue
+++ b/packages/settings/events/src/components/BindEventsDialogContent.vue
@@ -126,7 +126,6 @@ export default {
       .monaco-editor {
         width: 100%;
         height: 216px;
-        padding: 12px 8px;
         color: var(--te-common-text-secondary);
       }
       .mark {
@@ -135,7 +134,6 @@ export default {
         position: absolute;
         z-index: 1;
         top: 0;
-        background-color: var(--ti-lowcode-bind-event-dialog-mark-bg-color);
       }
     }
 
diff --git a/packages/settings/events/src/components/BindEventsDialogSidebar.vue b/packages/settings/events/src/components/BindEventsDialogSidebar.vue
index ae8aa1a69..abeff175f 100644
--- a/packages/settings/events/src/components/BindEventsDialogSidebar.vue
+++ b/packages/settings/events/src/components/BindEventsDialogSidebar.vue
@@ -8,7 +8,6 @@
           <li v-for="item in filteredMethodList" :key="item.name" @click="selectMethod(item)">
             <div :class="['action-name', { active: item.name === context.bindMethodInfo.name }]">
               {{ item.title || item.name }}
-              <icon-yes v-if="item.name === context.bindMethodInfo.name" class="action-selected-icon"></icon-yes>
             </div>
           </li>
         </ul>
@@ -20,14 +19,12 @@
 <script>
 import { getMetaApi, META_APP } from '@opentiny/tiny-engine-meta-register'
 import { Search } from '@opentiny/vue'
-import { iconYes } from '@opentiny/vue-icon'
 import { inject, ref, watchEffect } from 'vue'
 import { INVALID_VARNAME_CHAR_RE, NEW_METHOD_TYPE } from './constants'
 
 export default {
   components: {
-    TinySearch: Search,
-    IconYes: iconYes()
+    TinySearch: Search
   },
   props: {
     eventBinding: {
@@ -135,11 +132,6 @@ export default {
         &.active {
           background: var(--ti-lowcode-bind-event-dialog-content-left-list-item-active-bg-color);
         }
-
-        .action-selected-icon {
-          font-size: 14px;
-          color: var(--ti-lowcode-bind-event-dialog-action-selected-icon-color);
-        }
       }
     }
   }
diff --git a/packages/theme/base/src/component-common.less b/packages/theme/base/src/component-common.less
index 259057ac1..6cb5807b7 100644
--- a/packages/theme/base/src/component-common.less
+++ b/packages/theme/base/src/component-common.less
@@ -61,6 +61,7 @@
   }
   // 选项框字体
   .tiny-option {
+    font-size: var(--te-base-font-size-base);
     // 选中状态
     &.selected {
       color: var(--te-common-text-emphasize);
@@ -161,6 +162,7 @@
 
   .tiny-collapse-item__content {
     color: var(--te-common-text-primary);
+    font-size: var(--te-base-font-size-base);
   }
 
   .tiny-collapse-item__wrap {
@@ -170,6 +172,7 @@
 
 // 4、树-tree
 .tiny-tree.tiny-tree {
+  background-color: var(--te-common-bg-default);
   .tiny-tree-node__wrapper {
     cursor: pointer;
     color: var(--te-common-text-primary);
@@ -215,6 +218,10 @@
       width: 100%; // 要验证一下是否需要写死
       border-radius: var(--te-base-border-radius-1);
       text-align: center;
+      background-color: var(--te-common-bg-container);
+    }
+    .tiny-tabs__nav-wrap {
+      border-radius: var(--te-base-border-radius-1);
     }
     .tiny-tabs__item {
       flex-grow: 1;
@@ -223,16 +230,27 @@
       background-color: var(--te-common-bg-container);
       height: auto;
       text-align: center;
+      border: none;
+      &:hover {
+        color: var(--te-common-text-primary);
+      }
       &.is-active {
         color: var(--te-common-text-primary);
         background-color: var(--te-common-bg-default);
         border-radius: var(--te-base-border-radius-1);
+        border: 1px solid var(--te-common-border-active);
       }
     }
     .tiny-tabs__nav-wrap-not-separator::after {
       background-color: var(--te-common-border-divider);
     }
   }
+  .tiny-tabs__item-separator {
+    background-color: var(--te-common-bg-container);
+  }
+  .tiny-tabs__nav-scroll {
+    margin-right: 0;
+  }
 }
 
 // 6、search组件
@@ -242,6 +260,7 @@
     border-radius: var(--te-base-border-radius-1);
     border: 1px solid var(--te-common-border-default);
     font-size: var(--te-base-font-size-base);
+    background-color: transparent;
   }
   .focus {
     border-color: var(--te-common-border-active);
@@ -279,6 +298,7 @@
     height: auto;
     font-size: var(--te-base-font-size-1);
     color: var(--te-common-text-primary);
+    background-color: var(--te-common-bg-popover);
     padding: 0;
     .tiny-dialog-box__close {
       font-size: var(--te-base-font-size-1);
@@ -323,7 +343,7 @@
     }
     .tiny-button--primary,
     .tiny-button--info {
-      margin-left: 4px;
+      margin-left: 12px;
     }
     .tiny-button--default.tiny-button--default {
       border-color: var(--te-common-border-secondary);
@@ -393,6 +413,7 @@
   .tiny-svg {
     margin-right: 4px;
     color: var(--te-common-icon-secondary);
+    fill: var(--te-common-icon-secondary);
     font-size: 16px;
   }
 }
@@ -714,6 +735,9 @@
 .tiny-tooltip.tiny-tooltip {
   &.tiny-tooltip__popper {
     &[class*='is-light'] {
+      .popper__arrow {
+        background: var(--te-common-bg-popover);
+      }
       background: var(--te-common-bg-popover);
       color: var(--te-common-text-primary);
       font-size: var(--te-base-font-size-base);
diff --git a/packages/theme/dark/block.less b/packages/theme/dark/block.less
index 82c60d613..a3967f74b 100644
--- a/packages/theme/dark/block.less
+++ b/packages/theme/dark/block.less
@@ -4,30 +4,8 @@
   --ti-lowcode-component-block-list-shortcut-title-color: var(--te-common-text-primary); // 快照标题颜色
   --ti-lowcode-component-block-list-shortcut-bg: var(--te-common-bg-default); // 快照标题颜色
   --ti-lowcode-component-block-list-item-active-bg: var(--te-common-bg-container); // 区块 active 背景色
-  --ti-lowcode-component-block-version-list-version-bg: var(--te-common-bg-default);
-  --ti-lowcode-component-block-version-list-version-color: var(--te-common-text-primary);
-  --ti-lowcode-component-block-version-list-panel-title-color: var(--te-common-text-primary);
-  --ti-lowcode-component-block-version-list-time-color: var(--te-common-text-primary);
-  --ti-lowcode-component-block-version-list-desc-color: var(--te-common-text-weaken);
-  --ti-lowcode-component-block-version-list-current-version-color: var(
-    --te-common-text-emphasize
-  ); // 暗色独有，可以注意一下，后续可考虑去掉
   --ti-lowcode-component-block-setting-popover-bg: var(--te-common-bg-default);
-  --ti-lowcode-component-block-setting-item-text-color: var(--te-common-text-secondary);
-  // 区块管理 - 添加分类
-  --ti-lowcode-component-block-list-add-group-btn-bg: var(--te-common-bg-default);
-  --ti-lowcode-component-block-list-add-group-btn-border: none;
-  --ti-lowcode-component-block-list-setting-btn-color: var(--te-common-text-weaken); // 暗色和亮色不一致，需要注意
-  --ti-lowcode-component-block-list-setting-btn-hover-color: var(
-    --te-common-text-checked
-  ); // 暗色和亮色不一致，需要注意
-  --ti-lowcode-component-block-list-add-group-btn-border-radius: none;
-}
-
-.block-setting-content {
-  .tiny-form-item.is-error .tiny-input__inner {
-    background-color: var(--te-common-bg-error);
-  }
+  --ti-lowcode-component-block-setting-item-text-color: var(--te-common-text-primary);
 }
 
 // 区块设置 - 标签
@@ -36,4 +14,6 @@
   --ti-lowcode-block-config-tag-bg: var(--te-common-bg-disabled);
   --ti-lowcode-block-config-tag-hover-color: var(--te-common-text-primary);
   --ti-lowcode-block-config-tag-hover-bg: var(--te-common-bg-disabled);
+  --ti-lowcode-block-config-tag-close-color: var(--te-common-icon-secondary);
+  --ti-lowcode-block-config-tag-close-hover-color: var(--te-common-icon-primary);
 }
diff --git a/packages/theme/dark/bridge.less b/packages/theme/dark/bridge.less
index 0619a1c4b..91ded6c64 100644
--- a/packages/theme/dark/bridge.less
+++ b/packages/theme/dark/bridge.less
@@ -2,5 +2,5 @@
   // 资源管理
   --ti-lowcode-bridge-list-color: var(--te-common-text-primary);
   --ti-lowcode-bridge-list-bg: var(--te-common-bg-container);
-  --ti-lowcode-birdge-editor-border-color: var(--te-common-border-default);
+  --ti-lowcode-birdge-editor-border-color: var(--te-common-border-divider);
 }
diff --git a/packages/theme/dark/events.less b/packages/theme/dark/events.less
index 2329806e8..33a16e3d8 100644
--- a/packages/theme/dark/events.less
+++ b/packages/theme/dark/events.less
@@ -1,37 +1,30 @@
-.setting-advanced-add-custom-event-tip {
-  --ti-lowcode-events-add-custom-event-tips-color: var(--te-common-text-primary);
-  --ti-lowcode-event-add-custom-event-tips-highlight-color: var(--te-common-color-warning);
-}
 .setting-advanced-bind-event-list {
   --ti-lowcode-events-bind-event-list-color: var(--te-common-text-primary);
   --ti-lowcode-events-bind-event-list-item-disabled-color: var(--te-common-text-disabled);
   --lowcode-events-bind-event-list-item-hover-bg-color: var(--te-common-bg-container);
 }
 .bind-action-list {
-  --ti-lowcode-events-bind-action-item-border-color: var(--te-common-border-default);
-  --ti-lowcode-events-event-bind-color: var(--te-common-text-checked);
+  --ti-lowcode-events-bind-action-item-border-color: var(--te-common-border-divider);
+  --ti-lowcode-events-event-bind-color: var(--te-common-text-weaken);
   --ti-lowcode-events-bind-action-item-color: var(--te-common-text-primary);
   --ti-lowcode-events-bind-action-item-hover-bg-color: var(--te-common-bg-container);
-  --ti-lowcode-events-bind-action-item-linked-bg-color: var(--te-common-color-success);
-  --ti-lowcode-events-bind-action-item-linked-color: var(--te-common-text-dark-inverse);
+  --ti-lowcode-events-bind-action-item-linked-color: var(--te-common-text-emphasize);
   --ti-lowcode-events-empty-action-bg-color: var(--te-common-bg-container);
   --ti-lowcode-events-empty-action-color: var(--te-common-text-weaken);
-  --ti-lowcode-events-empty-action-tips-strong-color: var(--te-common-color-warning);
 }
 
 .advanced-config-container {
-  --ti-lowcode-events-advanced-config-color: var(--te-common-text-primary);
+  --ti-lowcode-events-advanced-config-color: var(--te-common-text-secondary);
   --ti-lowcode-events-advanced-label-color: var(--te-common-text-secondary);
-  --ti-lowcode-events-advanced-binding-state-bg-color: var(--te-common-bg-primary-checked);
-  --ti-lowcode-events-advanced-binding-state-color: var(--te-common-text-dark-inverse);
+  --ti-lowcode-events-advanced-binding-state-bg-color: var(--te-common-bg-info);
+  --ti-lowcode-events-advanced-binding-state-border-color: var(--te-common-border-info);
+  --ti-lowcode-events-advanced-binding-state-color: var(--te-common-text-emphasize);
 }
 
 .bind-event-dialog-content {
   --ti-lowcode-bind-event-dialog-color: var(--te-common-text-secondary);
-  --ti-lowcode-bind-event-dialog-content-left-border-color: var(--te-common-border-default);
-  --ti-lowcode-bind-event-dialog-content-right-monaco-border-color: var(--te-common-border-default);
+  --ti-lowcode-bind-event-dialog-content-left-border-color: var(--te-common-border-divider);
+  --ti-lowcode-bind-event-dialog-content-right-monaco-border-color: var(--te-common-border-divider);
   --ti-lowcode-bind-event-dialog-content-left-list-item-active-bg-color: var(--te-common-bg-container);
-  --ti-lowcode-bind-event-dialog-new-action-tip-color: var(--te-common-text-secondary);
-  --ti-lowcode-bind-event-dialog-action-selected-icon-color: var(--te-common-text-checked);
-  --ti-lowcode-bind-event-dialog-mark-bg-color: var(--te-common-bg-container);
+  --ti-lowcode-bind-event-dialog-new-action-tip-color: var(--te-common-text-weaken);
 }
diff --git a/packages/theme/dark/gpt-dialog.less b/packages/theme/dark/gpt-dialog.less
index 3a3ab8ee6..6ccb70cb2 100644
--- a/packages/theme/dark/gpt-dialog.less
+++ b/packages/theme/dark/gpt-dialog.less
@@ -1,6 +1,8 @@
 .robot-dialog {
   // chatGPT聊天窗问题模板文字颜色
   --ti-lowcode-chat-model-text: #191919;
+  // chatGPT聊天窗右上角图标颜色
+  --ti-lowcode-chat-model-icon: #191919;
   // chatGPT聊天窗问题模板文字边框颜色
   --ti-lowcode-chat-model-text-border: #cbcbcb;
   // chatGPT聊天窗用户头像边框色
diff --git a/packages/theme/dark/help.less b/packages/theme/dark/help.less
index fc1c9fe20..f0cc08b31 100644
--- a/packages/theme/dark/help.less
+++ b/packages/theme/dark/help.less
@@ -3,11 +3,10 @@
   --ti-lowcode-help-guide-content-text-color: var(--te-common-text-secondary);
   --ti-lowcode-help-guide-title-text-color: var(--te-common-text-primary);
   --ti-lowcode-help-guide-progress-style-text-color: var(--te-common-text-primary);
-  --ti-lowcode-help-guide-mask-bg-color: var(--te-common-bg-default);
 }
 .help-plugin-box {
-  --ti-lowcode-help-box-bg-color: var(--te-common-bg-default);
   --ti-lowcode-help-box-title-text-color: var(--te-common-text-primary);
+  --ti-lowcode-help-box-item-text-color: var(--te-common-text-primary);
   --ti-lowcode-help-box-question-border-top: var(--te-common-border-divider);
   --ti-lowcode-help-box-item-hover-bg-color: var(--te-common-bg-container);
 }
diff --git a/packages/theme/dark/i18n.less b/packages/theme/dark/i18n.less
index 0206288b2..43d229625 100644
--- a/packages/theme/dark/i18n.less
+++ b/packages/theme/dark/i18n.less
@@ -2,9 +2,7 @@
   // 国际化表格加载中字体颜色
   --ti-lowcode-i18n-loading-text-color: var(--te-common-text-weaken);
   // 国际化表格加载中图标颜色
-  --ti-lowcode-i18n-loading-svg-color: var(--te-common-text-primary);
-  // 国际化边框颜色
-  --ti-lowcode-i18n-border-color: var(--te-common-border-default);
+  --ti-lowcode-i18n-loading-svg-color: var(--te-common-icon-primary);
   // 国际化按钮字体颜色
   --ti-lowcode-i18n-button-color: var(--te-common-text-primary);
 }
diff --git a/packages/theme/dark/life-cycles.less b/packages/theme/dark/life-cycles.less
index 8377abf2d..8636afa32 100644
--- a/packages/theme/dark/life-cycles.less
+++ b/packages/theme/dark/life-cycles.less
@@ -1,7 +1,7 @@
 :root {
   // 生命周期
-  --ti-lowcode-life-cycle-alert-color: var(--te-common-text-disabled);
+  --ti-lowcode-life-cycle-alert-color: var(--te-common-text-weaken);
   --ti-lowcode-life-cycle-item-hover-bg: var(--te-common-bg-container);
   --ti-lowcode-life-cycle-item-disable-color: var(--te-common-text-disabled);
-  --ti-lowcode-life-cycle-editor-border: var(--te-common-border-default);
+  --ti-lowcode-life-cycle-editor-border: var(--te-common-border-divider);
 }
diff --git a/packages/theme/dark/materials.less b/packages/theme/dark/materials.less
index 1ad6e15a8..df57ee0ed 100644
--- a/packages/theme/dark/materials.less
+++ b/packages/theme/dark/materials.less
@@ -1,22 +1,24 @@
 :root {
-  // 带边框的图标按钮边框颜色
-  --ti-lowcode-materials-border-icon-border-color: transparent;
-  // 带边框的图标按钮悬浮边框颜色
-  --ti-lowcode-materials-border-icon-border-color-hover: transparent;
-  // 带边框的图标按钮背景颜色
-  --ti-lowcode-materials-border-icon-bg-color: var(--te-common-bg-default);
   // 区块分组下拉选项下边框颜色
-  --ti-lowcode-materials-block-group-item-border-color: var(--te-common-border-checked); // 暗色和亮色不同，需注意
+  --ti-lowcode-materials-block-group-item-border-color: var(--te-common-border-active);
   // 添加区块筛选模块字体颜色
-  --ti-lowcode-materials-block-filter-text-color: var(--te-common-text-primary);
+  --ti-lowcode-materials-block-filter-text-color: var(--te-common-text-secondary);
   // 添加区块穿梭框面板背景颜色
-  --ti-lowcode-materials-block-transfer-bg-color: var(--te-common-bg-default);
+  --ti-lowcode-materials-block-transfer-bg-color: var(
+    --te-common-bg-default
+  ); // BlockGroupTransferPanel文件暂未有地方引用
   // 添加区块穿梭框面板头部字体颜色
-  --ti-lowcode-materials-block-transfer-header-text-color: var(--te-common-text-primary);
+  --ti-lowcode-materials-block-transfer-header-text-color: var(
+    --te-common-text-primary
+  ); // BlockGroupTransferPanel文件暂未有地方引用
   // 添加区块穿梭框面板头部背景颜色
-  --ti-lowcode-materials-block-transfer-header-bg-color: var(--te-common-bg-default); // 暗色和亮色不同，需注意
+  --ti-lowcode-materials-block-transfer-header-bg-color: var(
+    --te-common-bg-container
+  ); // BlockGroupTransferPanel文件暂未有地方引用
   // 组件列表  组件名称颜色
-  --ti-lowcode-materials-component-list-color: var(--te-common-text-secondary);
+  --ti-lowcode-materials-component-list-color: var(--te-common-text-primary);
   // 删除区块分组气泡弹窗背景色
   --ti-lowcode-materials-block-group-delete-popover-bg-color: var(--te-common-bg-popover);
+  // 删除区块分组气泡弹窗标题色
+  --ti-lowcode-materials-block-group-delete-popover-title-color: var(--te-common-text-primary);
 }
diff --git a/packages/theme/dark/metaComponent.less b/packages/theme/dark/metaComponent.less
index 924d20666..4ecb6e685 100644
--- a/packages/theme/dark/metaComponent.less
+++ b/packages/theme/dark/metaComponent.less
@@ -1,7 +1,7 @@
 :root {
   // MetaListItem
   --ti-lowcode-meta-list-item-bg-color: var(--te-common-bg-default);
-  --ti-lowcode-meta-list-item-border-color: var(--te-common-border-default);
+  --ti-lowcode-meta-list-item-border-color: var(--te-common-border-divider);
 
   --ti-lowcode-meta-list-top-color: var(--te-common-text-secondary);
   // MetaJsSlot
@@ -11,7 +11,7 @@
   --ti-lowcode-meta-codeEditor-color: var(--te-common-text-primary);
   --ti-lowcode-meta-codeEditor-hover-color: var(--te-common-text-primary);
   --ti-lowcode-meta-codeEditor-border-color: var(--te-common-border-default);
-  --ti-lowcode-meta-codeEditor-border-hover-color: var(--te-common-border-active);
+  --ti-lowcode-meta-codeEditor-border-hover-color: var(--te-common-border-divider);
   --ti-lowcode-meta-codeEditor-icon-color: var(--te-common-text-weaken);
 }
 
@@ -24,13 +24,29 @@
 // configItem
 .properties-item {
   --ti-lowcode-meta-config-item-error-tips-color: var(--te-common-color-error);
-  --ti-lowcode-meta-config-item-bind-color: var(--te-common-text-dark-inverse);
-  --ti-lowcode-meta-config-item-bind-bg: var(--te-common-bg-primary-checked);
+  --ti-lowcode-meta-config-item-label-color: var(--te-common-text-primary);
+  --ti-lowcode-meta-config-item-bind-color: var(--te-common-text-emphasize);
+  --ti-lowcode-meta-config-item-bind-bg: var(--te-common-bg-info);
+  --ti-lowcode-meta-config-item-bind-border: var(--te-common-border-info);
   --ti-lowcode-meta-config-item-active-bg: var(--te-common-bg-container);
+  --ti-lowcode-meta-config-item-link-color: var(--te-common-text-emphasize);
+}
+
+// MetaBindVariable
+.meta-bind-variable-dialog-box {
+  --ti-lowcode-meta-bind-variable-icon-color: var(--te-common-icon-primary);
+  --ti-lowcode-meta-bind-variable-content-left-title-color: var(--te-common-text-primary);
+  --ti-lowcode-meta-bind-variable-content-right-title-color: var(--te-common-text-primary);
+  --ti-lowcode-meta-bind-variable-bottom-color: var(--te-common-text-secondary);
+  --ti-lowcode-meta-bind-variable-content-left-list-color: var(--te-common-text-primary);
+  --ti-lowcode-meta-bind-variable-item-text-color: var(--te-common-text-primary);
+  --ti-lowcode-meta-bind-variable-header-alert-color: var(--te-common-text-primary);
+  --ti-lowcode-meta-bind-variable-top-color: var(--te-common-text-primary);
 }
 
 // MetaCodeEditor
 .meta-code-editor-dialog-box {
   --ti-lowcode-meta-code-editor-header-tips-container-color: var(--te-common-text-primary);
+  --ti-lowcode-meta-code-editor-header-tips-demo-color: var(--te-common-text-primary);
   --ti-lowcode-meta-code-editor-err-msg-color: var(--te-common-color-error);
 }
diff --git a/packages/theme/dark/pageManage.less b/packages/theme/dark/pageManage.less
index ae246aef2..cb9391f4d 100644
--- a/packages/theme/dark/pageManage.less
+++ b/packages/theme/dark/pageManage.less
@@ -1,6 +1,6 @@
 :root {
   --ti-lowcode-page-manage-title-background-text-color: var(--te-common-text-primary);
-  --ti-lowcode-page-manage-tip-text-color: var(--te-common-text-weaken);
+  --ti-lowcode-page-manage-tip-text-color: var(--te-common-text-primary);
   --ti-lowcode-page-manage-tree-text-background-color: var(--te-common-bg-default);
   --ti-lowcode-page-manage-tree-node-background-color: var(--te-common-bg-default);
   --ti-lowcode-page-manage-text-color: var(--te-common-text-secondary);
diff --git a/packages/theme/dark/plugin-js.less b/packages/theme/dark/plugin-js.less
index bb25ca60d..9fe181c46 100644
--- a/packages/theme/dark/plugin-js.less
+++ b/packages/theme/dark/plugin-js.less
@@ -1,5 +1,4 @@
 // 页面JS 插件面板
 .plugin-page-js-container {
   --ti-lowcode-plugin-js-bg: var(--te-common-bg-default);
-  --ti-lowcode-plugin-js-help-link-color: var(--te-common-text-link);
 }
diff --git a/packages/theme/dark/settings.less b/packages/theme/dark/settings.less
index 0cc7d74bb..61017b264 100644
--- a/packages/theme/dark/settings.less
+++ b/packages/theme/dark/settings.less
@@ -35,7 +35,7 @@
   --ti-lowcode-className-selector-del-popover-bg-color: var(--te-common-bg-default);
   --ti-lowcode-className-selector-del-popover-title-color: var(--te-common-text-primary);
   --ti-lowcode-property-active-color: var(--te-common-bg-primary-checked);
-  --ti-lowcode-spacing-margin-color: var(--te-base-gray-140);
-  --ti-lowcode-spacing-padding-color: var(--te-base-gray-130);
+  --ti-lowcode-spacing-margin-color: var(--te-common-bg-container-weaken);
+  --ti-lowcode-spacing-padding-color: var(--te-common-bg-prompt);
   --ti-lowcode-setting-plugin-icon-color: var(--te-common-icon-secondary);
 }
diff --git a/packages/theme/dark/toolbar.less b/packages/theme/dark/toolbar.less
index 251b77d1e..c16009dd0 100644
--- a/packages/theme/dark/toolbar.less
+++ b/packages/theme/dark/toolbar.less
@@ -1,12 +1,17 @@
-.tiny-engine-toolbar {
+:root {
   // 头部工具栏
   --ti-lowcode-toolbar-border-bottom-color: var(--te-common-border-divider);
   --ti-lowcode-toolbar-title-color: var(--te-common-text-primary);
+  --ti-lowcode-toolbar-sub-title-color: var(--te-common-text-secondary);
   --ti-lowcode-toolbar-hover-color: var(--te-common-bg-container);
   --ti-lowcode-toolbar-view-active-bg: var(--te-common-bg-prompt);
-  --ti-lowcode-toolbar-left-icon-bg-hover: var(--te-common-icon-primary);
-  --ti-lowcode-toolbar-active-color: var(--te-common-text-secondary);
-  --ti-lowcode-toolbar-user-img-border-color: var(--te-common-border-divider);
+  --ti-lowcode-toolbar-left-icon-bg-hover: var(--te-common-bg-disabled);
+  --ti-lowcode-toolbar-active-color: var(--te-common-bg-disabled);
+  --ti-lowcode-toolbar-user-img-border-color: var(--te-common-border-default);
   --ti-lowcode-toolbar-dot-color: var(--te-common-color-error);
-  --ti-lowcode-toolbar-right-line: var(--te-common-bg-prompt);
+  --ti-lowcode-toolbar-right-line: var(--te-common-border-divider);
+  // 顶部按钮显示背景色
+  --ti-lowcode-toolbar-button-bg: var(--te-common-bg-prompt);
+  // 顶部隐藏导航栏按钮hover颜色
+  --ti-lowcode-toolbar-ellipsis-hover-bg: var(--te-common-bg-container);
 }
diff --git a/packages/theme/dark/tree.less b/packages/theme/dark/tree.less
index 5f870f206..812c617e8 100644
--- a/packages/theme/dark/tree.less
+++ b/packages/theme/dark/tree.less
@@ -1,4 +1,3 @@
 .outlinebox {
-  --ti-lowcode-tree-icon-hover-color: var(--te-common-icon-hover);
-  --ti-lowcode-tree-border-color: transparent; // 亮色主题特有
+  --ti-lowcode-tree-border-color: var(--te-common-border-divider);
 }
diff --git a/packages/theme/dark/variable.less b/packages/theme/dark/variable.less
index 34c3d927d..def9298a8 100644
--- a/packages/theme/dark/variable.less
+++ b/packages/theme/dark/variable.less
@@ -57,7 +57,7 @@
 
   // ------ 各个模块的主题色，前缀为 --ti-lowcode-模块名 -------
 
-  --ti-lowcode-design-plugin-color: var(--te-common-text-weaken);
+  --ti-lowcode-design-plugin-color: var(--te-common-text-primary);
 
   // 物料-组件列表
   --ti-lowcode-material-component-list-hover-bg: var(--te-common-bg-container);
@@ -143,7 +143,7 @@
   // collapse 折叠面板激活后字体颜色
   --ti-lowcode-collapse-active-color: #ebebeb;
   // 左侧插件激活背景色
-  --ti-lowcode-left-panel-active-bg: var(--te-base-blue-140);
+  --ti-lowcode-left-panel-active-bg: var(--te-common-bg-container);
   // 左侧插件激活边框色
   --ti-lowcode-left-panel-active-border-color: #212121;
   // 左侧按钮边框色
diff --git a/packages/theme/light/block.less b/packages/theme/light/block.less
index fbf23c815..a3967f74b 100644
--- a/packages/theme/light/block.less
+++ b/packages/theme/light/block.less
@@ -4,19 +4,8 @@
   --ti-lowcode-component-block-list-shortcut-title-color: var(--te-common-text-primary); // 快照标题颜色
   --ti-lowcode-component-block-list-shortcut-bg: var(--te-common-bg-default); // 快照标题颜色
   --ti-lowcode-component-block-list-item-active-bg: var(--te-common-bg-container); // 区块 active 背景色
-  --ti-lowcode-component-block-version-list-version-bg: var(--te-common-bg-default);
-  --ti-lowcode-component-block-version-list-version-color: var(--te-common-text-primary);
-  --ti-lowcode-component-block-version-list-panel-title-color: var(--te-common-text-primary);
-  --ti-lowcode-component-block-version-list-time-color: var(--te-common-text-primary);
-  --ti-lowcode-component-block-version-list-desc-color: var(--te-common-text-weaken);
   --ti-lowcode-component-block-setting-popover-bg: var(--te-common-bg-default);
-  --ti-lowcode-component-block-setting-item-text-color: var(--te-common-text-secondary);
-  // 区块管理 - 添加分类
-  --ti-lowcode-component-block-list-add-group-btn-bg: transparent;
-  --ti-lowcode-component-block-list-add-group-btn-border: 1px solid var(--te-common-border-default);
-  --ti-lowcode-component-block-list-setting-btn-color: var(--te-common-text-primary);
-  --ti-lowcode-component-block-list-setting-btn-hover-color: var(--te-common-text-primary);
-  --ti-lowcode-component-block-list-add-group-btn-border-radius: 6px;
+  --ti-lowcode-component-block-setting-item-text-color: var(--te-common-text-primary);
 }
 
 // 区块设置 - 标签
@@ -25,4 +14,6 @@
   --ti-lowcode-block-config-tag-bg: var(--te-common-bg-disabled);
   --ti-lowcode-block-config-tag-hover-color: var(--te-common-text-primary);
   --ti-lowcode-block-config-tag-hover-bg: var(--te-common-bg-disabled);
+  --ti-lowcode-block-config-tag-close-color: var(--te-common-icon-secondary);
+  --ti-lowcode-block-config-tag-close-hover-color: var(--te-common-icon-primary);
 }
diff --git a/packages/theme/light/bridge.less b/packages/theme/light/bridge.less
index 0619a1c4b..377574ebe 100644
--- a/packages/theme/light/bridge.less
+++ b/packages/theme/light/bridge.less
@@ -2,5 +2,5 @@
   // 资源管理
   --ti-lowcode-bridge-list-color: var(--te-common-text-primary);
   --ti-lowcode-bridge-list-bg: var(--te-common-bg-container);
-  --ti-lowcode-birdge-editor-border-color: var(--te-common-border-default);
+  --ti-lowcode-birdge-editor-border-color: var(--te-common-border-divider); // 代码编辑器描边色
 }
diff --git a/packages/theme/light/events.less b/packages/theme/light/events.less
index e9ccf9375..c570808f2 100644
--- a/packages/theme/light/events.less
+++ b/packages/theme/light/events.less
@@ -1,8 +1,3 @@
-.setting-advanced-add-custom-event-tip {
-  --ti-lowcode-events-add-custom-event-tips-color: var(--te-common-text-primary);
-  --ti-lowcode-event-add-custom-event-tips-highlight-color: var(--te-common-color-warning);
-}
-
 .setting-advanced-bind-event-list {
   --ti-lowcode-events-bind-event-list-color: var(--te-common-text-primary);
   --ti-lowcode-events-bind-event-list-item-disabled-color: var(--te-common-text-disabled);
@@ -10,30 +5,27 @@
 }
 
 .bind-action-list {
-  --ti-lowcode-events-bind-action-item-border-color: var(--te-common-border-default);
-  --ti-lowcode-events-event-bind-color: var(--te-common-text-checked);
+  --ti-lowcode-events-bind-action-item-border-color: var(--te-common-border-divider);
+  --ti-lowcode-events-event-bind-color: var(--te-common-text-weaken);
   --ti-lowcode-events-bind-action-item-color: var(--te-common-text-primary);
   --ti-lowcode-events-bind-action-item-hover-bg-color: var(--te-common-bg-container);
-  --ti-lowcode-events-bind-action-item-linked-bg-color: var(--te-common-color-success);
-  --ti-lowcode-events-bind-action-item-linked-color: var(--te-common-text-dark-inverse);
+  --ti-lowcode-events-bind-action-item-linked-color: var(--te-common-text-emphasize);
   --ti-lowcode-events-empty-action-bg-color: var(--te-common-bg-container);
   --ti-lowcode-events-empty-action-color: var(--te-common-text-weaken);
-  --ti-lowcode-events-empty-action-tips-strong-color: var(--te-common-color-warning);
 }
 
 .advanced-config-container {
-  --ti-lowcode-events-advanced-config-color: var(--te-common-text-primary);
+  --ti-lowcode-events-advanced-config-color: var(--te-common-text-secondary);
   --ti-lowcode-events-advanced-label-color: var(--te-common-text-secondary);
-  --ti-lowcode-events-advanced-binding-state-bg-color: var(--te-common-bg-primary-checked);
-  --ti-lowcode-events-advanced-binding-state-color: var(--te-common-text-dark-inverse);
+  --ti-lowcode-events-advanced-binding-state-bg-color: var(--te-common-bg-info);
+  --ti-lowcode-events-advanced-binding-state-border-color: var(--te-common-border-info);
+  --ti-lowcode-events-advanced-binding-state-color: var(--te-common-text-emphasize);
 }
 
 .bind-event-dialog-content {
   --ti-lowcode-bind-event-dialog-color: var(--te-common-text-secondary);
-  --ti-lowcode-bind-event-dialog-content-left-border-color: var(--te-common-border-default);
-  --ti-lowcode-bind-event-dialog-content-right-monaco-border-color: var(--te-common-border-default);
+  --ti-lowcode-bind-event-dialog-content-left-border-color: var(--te-common-border-divider);
+  --ti-lowcode-bind-event-dialog-content-right-monaco-border-color: var(--te-common-border-divider);
   --ti-lowcode-bind-event-dialog-content-left-list-item-active-bg-color: var(--te-common-bg-container);
-  --ti-lowcode-bind-event-dialog-new-action-tip-color: var(--te-common-text-secondary);
-  --ti-lowcode-bind-event-dialog-action-selected-icon-color: var(--te-common-text-checked);
-  --ti-lowcode-bind-event-dialog-mark-bg-color: var(--te-common-bg-container);
+  --ti-lowcode-bind-event-dialog-new-action-tip-color: var(--te-common-text-weaken);
 }
diff --git a/packages/theme/light/gpt-dialog.less b/packages/theme/light/gpt-dialog.less
index 4457ec3c9..568d5fd77 100644
--- a/packages/theme/light/gpt-dialog.less
+++ b/packages/theme/light/gpt-dialog.less
@@ -1,6 +1,8 @@
 .robot-dialog {
   // chatGPT聊天窗问题模板文字颜色
   --ti-lowcode-chat-model-text: #191919;
+  // chatGPT聊天窗右上角图标颜色
+  --ti-lowcode-chat-model-icon: #191919;
   // chatGPT聊天窗问题模板文字边框颜色
   --ti-lowcode-chat-model-text-border: #cbcbcb;
   // chatGPT聊天窗用户头像边框色
diff --git a/packages/theme/light/help.less b/packages/theme/light/help.less
index ff0d4b1b6..f0cc08b31 100644
--- a/packages/theme/light/help.less
+++ b/packages/theme/light/help.less
@@ -3,11 +3,10 @@
   --ti-lowcode-help-guide-content-text-color: var(--te-common-text-secondary);
   --ti-lowcode-help-guide-title-text-color: var(--te-common-text-primary);
   --ti-lowcode-help-guide-progress-style-text-color: var(--te-common-text-primary);
-  --ti-lowcode-help-guide-mask-bg-color: inherit;
 }
 .help-plugin-box {
-  --ti-lowcode-help-box-bg-color: var(--te-common-bg-default);
   --ti-lowcode-help-box-title-text-color: var(--te-common-text-primary);
+  --ti-lowcode-help-box-item-text-color: var(--te-common-text-primary);
   --ti-lowcode-help-box-question-border-top: var(--te-common-border-divider);
   --ti-lowcode-help-box-item-hover-bg-color: var(--te-common-bg-container);
 }
diff --git a/packages/theme/light/i18n.less b/packages/theme/light/i18n.less
index 0206288b2..43d229625 100644
--- a/packages/theme/light/i18n.less
+++ b/packages/theme/light/i18n.less
@@ -2,9 +2,7 @@
   // 国际化表格加载中字体颜色
   --ti-lowcode-i18n-loading-text-color: var(--te-common-text-weaken);
   // 国际化表格加载中图标颜色
-  --ti-lowcode-i18n-loading-svg-color: var(--te-common-text-primary);
-  // 国际化边框颜色
-  --ti-lowcode-i18n-border-color: var(--te-common-border-default);
+  --ti-lowcode-i18n-loading-svg-color: var(--te-common-icon-primary);
   // 国际化按钮字体颜色
   --ti-lowcode-i18n-button-color: var(--te-common-text-primary);
 }
diff --git a/packages/theme/light/life-cycles.less b/packages/theme/light/life-cycles.less
index 8377abf2d..8636afa32 100644
--- a/packages/theme/light/life-cycles.less
+++ b/packages/theme/light/life-cycles.less
@@ -1,7 +1,7 @@
 :root {
   // 生命周期
-  --ti-lowcode-life-cycle-alert-color: var(--te-common-text-disabled);
+  --ti-lowcode-life-cycle-alert-color: var(--te-common-text-weaken);
   --ti-lowcode-life-cycle-item-hover-bg: var(--te-common-bg-container);
   --ti-lowcode-life-cycle-item-disable-color: var(--te-common-text-disabled);
-  --ti-lowcode-life-cycle-editor-border: var(--te-common-border-default);
+  --ti-lowcode-life-cycle-editor-border: var(--te-common-border-divider);
 }
diff --git a/packages/theme/light/materials.less b/packages/theme/light/materials.less
index b936e84ed..df57ee0ed 100644
--- a/packages/theme/light/materials.less
+++ b/packages/theme/light/materials.less
@@ -1,22 +1,24 @@
 :root {
-  // 带边框的图标按钮边框颜色
-  --ti-lowcode-materials-border-icon-border-color: var(--te-common-border-default);
-  // 带边框的图标按钮悬浮边框颜色
-  --ti-lowcode-materials-border-icon-border-color-hover: var(--te-common-border-active);
-  // 带边框的图标按钮背景颜色
-  --ti-lowcode-materials-border-icon-bg-color: var(--te-common-bg-default);
   // 区块分组下拉选项下边框颜色
-  --ti-lowcode-materials-block-group-item-border-color: var(--te-common-text-primary);
+  --ti-lowcode-materials-block-group-item-border-color: var(--te-common-border-active);
   // 添加区块筛选模块字体颜色
-  --ti-lowcode-materials-block-filter-text-color: var(--te-common-text-primary);
+  --ti-lowcode-materials-block-filter-text-color: var(--te-common-text-secondary);
   // 添加区块穿梭框面板背景颜色
-  --ti-lowcode-materials-block-transfer-bg-color: var(--te-common-bg-default);
+  --ti-lowcode-materials-block-transfer-bg-color: var(
+    --te-common-bg-default
+  ); // BlockGroupTransferPanel文件暂未有地方引用
   // 添加区块穿梭框面板头部字体颜色
-  --ti-lowcode-materials-block-transfer-header-text-color: var(--te-common-text-primary);
+  --ti-lowcode-materials-block-transfer-header-text-color: var(
+    --te-common-text-primary
+  ); // BlockGroupTransferPanel文件暂未有地方引用
   // 添加区块穿梭框面板头部背景颜色
-  --ti-lowcode-materials-block-transfer-header-bg-color: var(--te-common-bg-container);
+  --ti-lowcode-materials-block-transfer-header-bg-color: var(
+    --te-common-bg-container
+  ); // BlockGroupTransferPanel文件暂未有地方引用
   // 组件列表  组件名称颜色
-  --ti-lowcode-materials-component-list-color: var(--te-common-text-secondary);
+  --ti-lowcode-materials-component-list-color: var(--te-common-text-primary);
   // 删除区块分组气泡弹窗背景色
   --ti-lowcode-materials-block-group-delete-popover-bg-color: var(--te-common-bg-popover);
+  // 删除区块分组气泡弹窗标题色
+  --ti-lowcode-materials-block-group-delete-popover-title-color: var(--te-common-text-primary);
 }
diff --git a/packages/theme/light/metaComponent.less b/packages/theme/light/metaComponent.less
index 50a234785..c74698cf9 100644
--- a/packages/theme/light/metaComponent.less
+++ b/packages/theme/light/metaComponent.less
@@ -1,7 +1,7 @@
 :root {
   // MetaListItem
   --ti-lowcode-meta-list-item-bg-color: var(--te-common-bg-default);
-  --ti-lowcode-meta-list-item-border-color: var(--te-common-border-default);
+  --ti-lowcode-meta-list-item-border-color: var(--te-common-border-divider);
   //
   --ti-lowcode-meta-list-top-color: var(--te-common-text-secondary);
   // MetaJsSlot
@@ -11,7 +11,7 @@
   --ti-lowcode-meta-codeEditor-color: var(--te-common-text-primary);
   --ti-lowcode-meta-codeEditor-hover-color: var(--te-common-text-primary);
   --ti-lowcode-meta-codeEditor-border-color: var(--te-common-border-default);
-  --ti-lowcode-meta-codeEditor-border-hover-color: var(--te-common-border-active);
+  --ti-lowcode-meta-codeEditor-border-hover-color: var(--te-common-border-divider);
   --ti-lowcode-meta-codeEditor-icon-color: var(--te-common-text-weaken);
 }
 
@@ -24,13 +24,29 @@
 // configItem
 .properties-item {
   --ti-lowcode-meta-config-item-error-tips-color: var(--te-common-color-error);
-  --ti-lowcode-meta-config-item-bind-color: var(--te-common-text-dark-inverse);
-  --ti-lowcode-meta-config-item-bind-bg: var(--te-common-bg-primary-checked);
+  --ti-lowcode-meta-config-item-label-color: var(--te-common-text-primary);
+  --ti-lowcode-meta-config-item-bind-color: var(--te-common-text-emphasize);
+  --ti-lowcode-meta-config-item-bind-bg: var(--te-common-bg-info);
+  --ti-lowcode-meta-config-item-bind-border: var(--te-common-border-info);
   --ti-lowcode-meta-config-item-active-bg: var(--te-common-bg-container);
+  --ti-lowcode-meta-config-item-link-color: var(--te-common-text-emphasize);
+}
+
+// MetaBindVariable
+.meta-bind-variable-dialog-box {
+  --ti-lowcode-meta-bind-variable-icon-color: var(--te-common-icon-primary);
+  --ti-lowcode-meta-bind-variable-content-left-title-color: var(--te-common-text-primary);
+  --ti-lowcode-meta-bind-variable-content-right-title-color: var(--te-common-text-primary);
+  --ti-lowcode-meta-bind-variable-bottom-color: var(--te-common-text-secondary);
+  --ti-lowcode-meta-bind-variable-content-left-list-color: var(--te-common-text-primary);
+  --ti-lowcode-meta-bind-variable-item-text-color: var(--te-common-text-primary);
+  --ti-lowcode-meta-bind-variable-header-alert-color: var(--te-common-text-primary);
+  --ti-lowcode-meta-bind-variable-top-color: var(--te-common-text-primary);
 }
 
 // MetaCodeEditor
 .meta-code-editor-dialog-box {
   --ti-lowcode-meta-code-editor-header-tips-container-color: var(--te-common-text-primary);
+  --ti-lowcode-meta-code-editor-header-tips-demo-color: var(--te-common-text-primary);
   --ti-lowcode-meta-code-editor-err-msg-color: var(--te-common-color-error);
 }
diff --git a/packages/theme/light/pageManage.less b/packages/theme/light/pageManage.less
index ae246aef2..cb9391f4d 100644
--- a/packages/theme/light/pageManage.less
+++ b/packages/theme/light/pageManage.less
@@ -1,6 +1,6 @@
 :root {
   --ti-lowcode-page-manage-title-background-text-color: var(--te-common-text-primary);
-  --ti-lowcode-page-manage-tip-text-color: var(--te-common-text-weaken);
+  --ti-lowcode-page-manage-tip-text-color: var(--te-common-text-primary);
   --ti-lowcode-page-manage-tree-text-background-color: var(--te-common-bg-default);
   --ti-lowcode-page-manage-tree-node-background-color: var(--te-common-bg-default);
   --ti-lowcode-page-manage-text-color: var(--te-common-text-secondary);
diff --git a/packages/theme/light/plugin-js.less b/packages/theme/light/plugin-js.less
index bb25ca60d..9fe181c46 100644
--- a/packages/theme/light/plugin-js.less
+++ b/packages/theme/light/plugin-js.less
@@ -1,5 +1,4 @@
 // 页面JS 插件面板
 .plugin-page-js-container {
   --ti-lowcode-plugin-js-bg: var(--te-common-bg-default);
-  --ti-lowcode-plugin-js-help-link-color: var(--te-common-text-link);
 }
diff --git a/packages/theme/light/settings.less b/packages/theme/light/settings.less
index 8c65f66c7..1f6ac18ff 100644
--- a/packages/theme/light/settings.less
+++ b/packages/theme/light/settings.less
@@ -35,7 +35,7 @@
   --ti-lowcode-className-selector-del-popover-bg-color: var(--te-common-bg-default);
   --ti-lowcode-className-selector-del-popover-title-color: var(--te-common-text-primary);
   --ti-lowcode-property-active-color: var(--te-common-bg-primary-checked);
-  --ti-lowcode-spacing-margin-color: var(--te-base-gray-10);
-  --ti-lowcode-spacing-padding-color: var(--te-base-gray-30);
+  --ti-lowcode-spacing-margin-color: var(--te-common-bg-container-weaken);
+  --ti-lowcode-spacing-padding-color: var(--te-common-bg-prompt);
   --ti-lowcode-setting-plugin-icon-color: var(--te-common-icon-secondary);
 }
diff --git a/packages/theme/light/toolbar.less b/packages/theme/light/toolbar.less
index 251b77d1e..455ac1fbb 100644
--- a/packages/theme/light/toolbar.less
+++ b/packages/theme/light/toolbar.less
@@ -1,12 +1,17 @@
-.tiny-engine-toolbar {
+:root {
   // 头部工具栏
   --ti-lowcode-toolbar-border-bottom-color: var(--te-common-border-divider);
   --ti-lowcode-toolbar-title-color: var(--te-common-text-primary);
+  --ti-lowcode-toolbar-sub-title-color: var(--te-common-text-secondary);
   --ti-lowcode-toolbar-hover-color: var(--te-common-bg-container);
-  --ti-lowcode-toolbar-view-active-bg: var(--te-common-bg-prompt);
-  --ti-lowcode-toolbar-left-icon-bg-hover: var(--te-common-icon-primary);
-  --ti-lowcode-toolbar-active-color: var(--te-common-text-secondary);
-  --ti-lowcode-toolbar-user-img-border-color: var(--te-common-border-divider);
+  --ti-lowcode-toolbar-view-active-bg: var(--te-common-bg-prompt); // 相当于 规范中定义的 #191919 透明度5%
+  --ti-lowcode-toolbar-left-icon-bg-hover: var(--te-common-bg-disabled);
+  --ti-lowcode-toolbar-active-color: var(--te-common-bg-disabled);
+  --ti-lowcode-toolbar-user-img-border-color: var(--te-common-border-default);
   --ti-lowcode-toolbar-dot-color: var(--te-common-color-error);
-  --ti-lowcode-toolbar-right-line: var(--te-common-bg-prompt);
+  --ti-lowcode-toolbar-right-line: var(--te-common-border-divider);
+  // 顶部按钮显示背景色
+  --ti-lowcode-toolbar-button-bg: var(--te-common-bg-prompt);
+  // 顶部隐藏导航栏按钮hover颜色
+  --ti-lowcode-toolbar-ellipsis-hover-bg: var(--te-common-bg-container);
 }
diff --git a/packages/theme/light/tree.less b/packages/theme/light/tree.less
index 5330c185a..812c617e8 100644
--- a/packages/theme/light/tree.less
+++ b/packages/theme/light/tree.less
@@ -1,4 +1,3 @@
 .outlinebox {
-  --ti-lowcode-tree-icon-hover-color: var(--te-common-icon-hover);
-  --ti-lowcode-tree-border-color: var(--te-common-border-default); // 亮色主题特有
+  --ti-lowcode-tree-border-color: var(--te-common-border-divider);
 }
diff --git a/packages/theme/light/variable.less b/packages/theme/light/variable.less
index 080875ade..f091f7721 100644
--- a/packages/theme/light/variable.less
+++ b/packages/theme/light/variable.less
@@ -33,7 +33,7 @@
 
   // ------ 各个模块的主题色，前缀为 --ti-lowcode-模块名 -------
 
-  --ti-lowcode-design-plugin-color: var(--te-common-text-weaken);
+  --ti-lowcode-design-plugin-color: var(--te-common-text-primary);
 
   // 物料-组件列表
   --ti-lowcode-material-component-list-hover-bg: var(--te-common-bg-container);
@@ -114,7 +114,7 @@
 
   // -----下拉框相关主题配置-----
   // 左侧插件激活背景色
-  --ti-lowcode-left-panel-active-bg: var(--te-base-blue-20);
+  --ti-lowcode-left-panel-active-bg: var(--te-common-bg-container);
   // 左侧插件激活边框色
   --ti-lowcode-left-panel-active-border-color: #999;
   // 左侧tabs按钮边框色
@@ -172,16 +172,12 @@
   --ti-lowcode-icon-popover-hover-color: #333;
   // 查看区块详情icon颜色
   --ti-lowcode-block-detail-icon-color: #999;
-  // 顶部按钮显示背景色
-  --ti-lowcode-toolbar-button-bg: #ebebeb;
   // 顶部面包屑显示背景色
   --ti-lowcode-toolbar-breadcrumb-bg: rgba(110, 81, 224, 0.1);
   // 顶部左侧面包屑显示字体色
   --ti-lowcode-toolbar-breadcrumb-left-color: rgb(110, 81, 224);
   // 顶部面包屑显示背景色
   --ti-lowcode-toolbar-breadcrumb-bg-hover: rgba(110, 81, 224, 0.06);
-  // 顶部隐藏导航栏按钮hover颜色
-  --ti-lowcode-toolbar-ellipsis-hover-bg: #f5f5f5;
 
   // 中间画布底部面包屑hover背景色
   --ti-lowcode-breadcrumb-hover-bg: #fff;