diff --git a/README.md b/README.md
index 71ef3b82..7b1ccdcc 100644
--- a/README.md
+++ b/README.md
@@ -4,10 +4,10 @@
 
 StackEdit中文版的docker镜像地址：[mafgwo/stackedit](https://hub.docker.com/r/mafgwo/stackedit)
 
-**示例截图-黑色主题**
+**示例截图-暗色主题**
 ![](./images/dark.png)
 
-**示例截图-白色主题**
+**示例截图-亮色主题**
 ![](./images/light.png)
 
 ## 相比国外开源版本的区别：
diff --git a/src/components/Layout.vue b/src/components/Layout.vue
index e098476e..18559303 100644
--- a/src/components/Layout.vue
+++ b/src/components/Layout.vue
@@ -185,7 +185,7 @@ export default {
 }
 
 $preview-background-light: #f3f3f3;
-$preview-background-dark: #252525;
+$preview-background-dark: #444;
 
 .layout__panel--preview,
 .layout__panel--button-bar {
diff --git a/src/components/Tour.vue b/src/components/Tour.vue
index c1f529a8..5b4e11e7 100644
--- a/src/components/Tour.vue
+++ b/src/components/Tour.vue
@@ -39,7 +39,7 @@
       </div>
       <div class="tour-step__inner" v-else-if="step === 'theme'">
         <h2>切换主题！</h2>
-        <p>StackEdit中文版可以切换黑白主题。</p>
+        <p>StackEdit中文版可以切换亮/暗主题。</p>
         <p>点击 <icon-switch-theme></icon-switch-theme> 切换主题。</p>
         <div class="tour-step__button-bar">
           <button class="button" @click="finish">跳过</button>
diff --git a/src/components/gutters/Comment.vue b/src/components/gutters/Comment.vue
index eda2f05a..7941e5e3 100644
--- a/src/components/gutters/Comment.vue
+++ b/src/components/gutters/Comment.vue
@@ -16,7 +16,7 @@
       <div class="comment__text-inner" v-html="text"></div>
     </div>
     <div class="comment__buttons flex flex--row flex--end" v-if="showReply">
-      <button class="comment__button button" @click="setIsCommenting(true)">Reply</button>
+      <button class="comment__button button" @click="setIsCommenting(true)">评论</button>
     </div>
   </div>
 </template>
diff --git a/src/components/gutters/CurrentDiscussion.vue b/src/components/gutters/CurrentDiscussion.vue
index e7b4e702..494149aa 100644
--- a/src/components/gutters/CurrentDiscussion.vue
+++ b/src/components/gutters/CurrentDiscussion.vue
@@ -4,18 +4,18 @@
     <div class="current-discussion__inner">
       <div class="flex flex--row flex--space-between">
         <div class="current-discussion__buttons flex flex--row flex--end">
-          <button class="current-discussion__button button" v-if="showNext" @click="goToDiscussion(previousDiscussionId)" v-title="'上一个讨论'">
+          <button class="current-discussion__button button" v-if="showNext" @click="goToDiscussion(previousDiscussionId)" v-title="'上一个批注'">
             <icon-arrow-left></icon-arrow-left>
           </button>
-          <button class="current-discussion__button current-discussion__button--rotate button" v-if="showNext" @click="goToDiscussion(nextDiscussionId)" v-title="'下一个讨论'">
+          <button class="current-discussion__button current-discussion__button--rotate button" v-if="showNext" @click="goToDiscussion(nextDiscussionId)" v-title="'下一个批注'">
             <icon-arrow-left></icon-arrow-left>
           </button>
         </div>
         <div class="current-discussion__buttons flex flex--row flex--end">
-          <button class="current-discussion__button current-discussion__button--remove button" v-if="showRemove" @click="removeDiscussion" v-title="'删除讨论'">
+          <button class="current-discussion__button current-discussion__button--remove button" v-if="showRemove" @click="removeDiscussion" v-title="'删除批注'">
             <icon-delete></icon-delete>
           </button>
-          <button class="current-discussion__button button" @click="setCurrentDiscussionId()" v-title="'关闭讨论'">
+          <button class="current-discussion__button button" @click="setCurrentDiscussionId()" v-title="'关闭批注'">
             <icon-close></icon-close>
           </button>
         </div>
diff --git a/src/data/features.js b/src/data/features.js
index c9d91fb0..36ff920a 100644
--- a/src/data/features.js
+++ b/src/data/features.js
@@ -482,27 +482,27 @@ export default [
   new Feature(
     'comment',
     '评论',
-    '启动并删除讨论，添加和删除评论。',
+    '添加和删除批注，添加和删除评论。',
     [
       new Feature(
         'createDiscussion',
-        '启动讨论',
-        '使用“评论”按钮开始新的讨论。',
+        '添加批注',
+        '使用“批注”按钮图标添加新的批注。',
       ),
       new Feature(
         'addComment',
-        '添加评论',
-        '使用讨论在现有讨论中添加评论。',
+        '添加批注评论',
+        '使用“评论”按钮在现有批注中添加评论。',
       ),
       new Feature(
         'removeComment',
-        '删除评论',
-        '使用讨论在讨论中删除评论。',
+        '删除批注评论',
+        '使用“删除评论”按钮图标删除批注评论。',
       ),
       new Feature(
         'removeDiscussion',
-        '关闭讨论',
-        '使用讨论去删除讨论。',
+        '删除批注',
+        '使用“删除批注”按钮图标删除批注。',
       ),
     ],
   ),
diff --git a/src/data/simpleModals.js b/src/data/simpleModals.js
index 5b90223e..f09ea244 100644
--- a/src/data/simpleModals.js
+++ b/src/data/simpleModals.js
@@ -12,7 +12,7 @@ export default {
     '确认删除',
   ),
   discussionDeletion: simpleModal(
-    '<p>您将要删除讨论。你确定吗？</p>',
+    '<p>您将要删除批注。你确定吗？</p>',
     '取消',
     '确认删除',
   ),
diff --git a/src/styles/base.scss b/src/styles/base.scss
index 5cc1159a..ee4a1c2c 100644
--- a/src/styles/base.scss
+++ b/src/styles/base.scss
@@ -32,6 +32,11 @@ dl {
   margin: 0 0 1.1em;
 }
 
+ul,
+ol {
+  padding-left: 30px;
+}
+
 h1,
 h2,
 h3,
@@ -66,12 +71,12 @@ dt {
 
 a {
   color: $link-color;
-  text-decoration: underline;
+  text-decoration: none;
   text-decoration-skip: ink;
 
   &:hover,
   &:focus {
-    text-decoration: none;
+    text-decoration: underline;
   }
 }
 
@@ -100,8 +105,8 @@ blockquote {
   .app--dark .layout__panel--editor &,
   .app--dark .layout__panel--preview & {
     color: rgba(255, 255, 255, 0.4);
-    border-left-color: rgba(255, 255, 255, 0.1);
-    background: #3a3a3c;
+    border-left-color: #333;
+    background: rgba(51, 51, 51, 0.5);
   }
 }
 
diff --git a/src/styles/variables.scss b/src/styles/variables.scss
index 16c5d1bd..6f440bc5 100644
--- a/src/styles/variables.scss
+++ b/src/styles/variables.scss
@@ -3,12 +3,12 @@ $font-family-monospace: 'Roboto Mono', 'Lucida Sans Typewriter', 'Lucida Console
 $body-color-light: rgba(0, 0, 0, 0.75);
 $body-color-dark: rgba(255, 255, 255, 0.75);
 $code-bg: rgba(0, 0, 0, 0.05);
-$code-dark-bg: rgba(255, 255, 255, 0.1);
+$code-dark-bg: #333;
 $line-height-base: 1.67;
 $line-height-title: 1.33;
 $font-size-monospace: 0.85em;
 $highlighting-color: #ff0;
-$selection-highlighting-color: #ff9632;
+$selection-highlighting-color: #ffb067;
 $info-bg: #ffad3326;
 $code-border-radius: 3px;
 $link-color: #0c93e4;