diff --git a/scripts/events/lib/config.js b/scripts/events/lib/config.js
index 4b9806e..f533ef5 100644
--- a/scripts/events/lib/config.js
+++ b/scripts/events/lib/config.js
@@ -28,7 +28,7 @@ module.exports = hexo => {
     let { i18n } = hexo.theme;
 
     const mergeLang = lang => {
-      i18n.set(lang, merge(i18n.get([lang]), data.languages[lang]));
+      if (data.languages[lang]) i18n.set(lang, merge(i18n.get([lang]), data.languages[lang]));
     };
 
     if (Array.isArray(language)) {
diff --git a/source/css/_common/outline/sidebar/site-state.styl b/source/css/_common/outline/sidebar/site-state.styl
index e77c5f0..6ece1d7 100644
--- a/source/css/_common/outline/sidebar/site-state.styl
+++ b/source/css/_common/outline/sidebar/site-state.styl
@@ -1,22 +1,15 @@
 .site-state {
   display: flex;
+  flex-wrap: wrap;
   justify-content: center;
   line-height: 1.4;
   margin-top: 10px;
-  overflow: hidden;
-  white-space: nowrap;
 }
 
-.site-state-item {
-  &:not(:first-child) {
-    border-left: 1px solid $site-state-item-border-color;
-  }
-
-  a {
-    border-bottom: none;
-    display: block;
-    padding: 0 15px;
-  }
+.site-state-item a {
+  border-bottom: none;
+  display: block;
+  padding: 0 15px;
 }
 
 .site-state-item-count {
diff --git a/source/css/_common/scaffolding/highlight/highlight.styl b/source/css/_common/scaffolding/highlight/highlight.styl
index 4a36f7c..20b4f06 100644
--- a/source/css/_common/scaffolding/highlight/highlight.styl
+++ b/source/css/_common/scaffolding/highlight/highlight.styl
@@ -38,6 +38,7 @@ code {
 
 kbd {
   @extend $code-inline;
+  background-image: linear-gradient(var(--highlight-gutter-background), var(--highlight-background), var(--highlight-gutter-background));
   border: 1px solid $grey-light;
   border-radius: .2em;
   box-shadow: .1em .1em .2em rgba(0, 0, 0, .1);
diff --git a/source/css/_mixins.styl b/source/css/_mixins.styl
index 8d806e5..38ec91d 100644
--- a/source/css/_mixins.styl
+++ b/source/css/_mixins.styl
@@ -76,7 +76,6 @@ random-color($min, $max) {
 
 word-wrap() {
   overflow-wrap: break-word;
-  word-wrap: break-word;
 }
 
 disable-user-select() {
diff --git a/source/css/_variables/Pisces.styl b/source/css/_variables/Pisces.styl
index be4a785..a6c69c2 100644
--- a/source/css/_variables/Pisces.styl
+++ b/source/css/_variables/Pisces.styl
@@ -48,7 +48,6 @@ $site-description-margin-top      = 0;
 $site-state-item-count-font-size  = $font-size-medium;
 $site-state-item-name-font-size   = $font-size-smaller;
 $site-state-item-name-color       = $grey-dark;
-$site-state-item-border-color     = $gainsboro;
 
 
 // Components
diff --git a/source/css/_variables/base.styl b/source/css/_variables/base.styl
index 705342e..71f9c1b 100644
--- a/source/css/_variables/base.styl
+++ b/source/css/_variables/base.styl
@@ -252,7 +252,6 @@ $site-description-margin-top          = 5px;
 $site-state-item-count-font-size      = $font-size-larger;
 $site-state-item-name-font-size       = $font-size-small;
 $site-state-item-name-color           = inherit;
-$site-state-item-border-color         = $black-dim;
 
 
 // Components