diff --git a/app/javascript/styles/mastodon-material/color/plus-classic.scss b/app/javascript/styles/mastodon-material/color/plus-classic.scss
index f0470dfa6..2cd0c8a52 100644
--- a/app/javascript/styles/mastodon-material/color/plus-classic.scss
+++ b/app/javascript/styles/mastodon-material/color/plus-classic.scss
@@ -1,8 +1,3 @@
-$name: "Plus Classic";
-$target-version: "1.0.0";
-$website: "";
-@include version-check($name, $target-version, $website);
-
 $color-scheme: light;
 
 // Base color
diff --git a/app/javascript/styles/mastodon-material/color/v1-dark.scss b/app/javascript/styles/mastodon-material/color/v1-dark.scss
index a1accfd73..a39bbc7ee 100644
--- a/app/javascript/styles/mastodon-material/color/v1-dark.scss
+++ b/app/javascript/styles/mastodon-material/color/v1-dark.scss
@@ -126,7 +126,7 @@ $search-bar-focus-color: #ffffff;
 
 // Tab color
 $tab-item-color: transparentize(#ffffff, 0.5);
-$tab-item-active-color: $primary-color;
+$tab-item-active-color: #ffffff;
 $tab-bg-color: $top-bar-color;
 $tab-bg-hover-color: transparentize($tab-item-active-color, 0.9);
 $tab-bg-focus-color: transparentize($tab-item-active-color, 0.8);
diff --git a/app/javascript/styles/mastodon-material/plugins/cards.scss b/app/javascript/styles/mastodon-material/plugins/cards.scss
index 804cff785..b89739b42 100644
--- a/app/javascript/styles/mastodon-material/plugins/cards.scss
+++ b/app/javascript/styles/mastodon-material/plugins/cards.scss
@@ -16,6 +16,8 @@
             border-radius: 0;
         }
     }
+
+    .columns-area__panels__main { box-shadow: none }
 }
 
 .status {
@@ -36,6 +38,8 @@
     background: $card-bg-color;
 }
 
-.notification .status__wrapper.status__wrapper { box-shadow: none !important }
+.notification {
+    .status__wrapper.status__wrapper { box-shadow: none !important }
 
-.notification__filter-bar { @include non-overflow-shadow-4dp }
\ No newline at end of file
+    &__filter-bar { @include non-overflow-shadow-4dp }
+}
\ No newline at end of file
diff --git a/app/javascript/styles/mastodon-material/plugins/plus.scss b/app/javascript/styles/mastodon-material/plugins/plus.scss
index 96d0bd3f6..f28da5971 100644
--- a/app/javascript/styles/mastodon-material/plugins/plus.scss
+++ b/app/javascript/styles/mastodon-material/plugins/plus.scss
@@ -1,7 +1,8 @@
-$name: Plus;
+$name: "Plus";
+$plugin-version: "1.0.0";
 $target-version: "1.0.0";
 $website: "";
-@include version-check($name, $target-version, $website);
+@include version-check($name, $plugin-version, $target-version, $website);
 
 .status__action-bar-button {
     background: #eeeeee;
@@ -34,11 +35,6 @@ $website: "";
     }
 }
 
-// single column mode
-@media screen and (min-width: 415px) {
-    .columns-area__panels__main { box-shadow: none }
-}
-
 // Fedibird bottom bar in mobile
 .tabs-bar.bottom-bar {
     background: #212121;
diff --git a/app/javascript/styles/mastodon-material/plugins/quote.scss b/app/javascript/styles/mastodon-material/plugins/quote.scss
index 14c1ffe2a..83e78c1ba 100644
--- a/app/javascript/styles/mastodon-material/plugins/quote.scss
+++ b/app/javascript/styles/mastodon-material/plugins/quote.scss
@@ -1,3 +1,9 @@
+$name: "Quote";
+$plugin-version: "1.0.0";
+$target-version: "1.0.0";
+$website: "";
+@include version-check($name, $plugin-version, $target-version, $website);
+
 .quote-indicator,
 .reply-indicator {
     @include card-elevation(false);
diff --git a/app/javascript/styles/mastodon-material/theme/_mixins.scss b/app/javascript/styles/mastodon-material/theme/_mixins.scss
index 7c0229770..eab36e2e7 100644
--- a/app/javascript/styles/mastodon-material/theme/_mixins.scss
+++ b/app/javascript/styles/mastodon-material/theme/_mixins.scss
@@ -277,9 +277,8 @@ $shadow-color-3: rgba(0,0,0,.12);
     }
 }
 
-// version checker
-@mixin version-check($name, $target-version, $website) {
+@mixin version-check($name, $plugin-version, $target-version, $website) {
     @if $target-version != $version {
-        @debug "[Info] #{$name} is made for Mastodon Material #{$target-version}. Some css elements might be broken! Please check plugin website: #{$website}";
+        @debug "[Info] #{$name} #{$plugin-version} is made for Mastodon Material #{$target-version}. Some css elements might be broken! Please check the following website: #{$website}";
     }
 }
\ No newline at end of file
diff --git a/app/javascript/styles/mastodon-material/theme/account.scss b/app/javascript/styles/mastodon-material/theme/account.scss
index 7684ca8ac..e141fe8a8 100644
--- a/app/javascript/styles/mastodon-material/theme/account.scss
+++ b/app/javascript/styles/mastodon-material/theme/account.scss
@@ -24,7 +24,7 @@
 
     &__header {
         &__bar {
-            background: $tab-bg-color;
+            background: $card-bg-color;
             padding: 8px;
             border-bottom: none;
 
diff --git a/app/javascript/styles/mastodon-material/theme/columns.scss b/app/javascript/styles/mastodon-material/theme/columns.scss
index 80dff5771..e1e969138 100644
--- a/app/javascript/styles/mastodon-material/theme/columns.scss
+++ b/app/javascript/styles/mastodon-material/theme/columns.scss
@@ -277,11 +277,11 @@
 .muted {
     .status {
         &__content {
-            color: $read-primary-text-color !important;
+            color: $read-primary-text-color;
     
-            p { color: $read-primary-text-color !important }
+            p { color: $read-primary-text-color }
     
-            a { color: $read-secondary-text-color !important }
+            a { color: $read-secondary-text-color }
         }
 
         &__display-name strong { color: $read-primary-text-color }
diff --git a/app/javascript/styles/mastodon-material/theme/components.scss b/app/javascript/styles/mastodon-material/theme/components.scss
index c016e5db4..1c90d11fd 100644
--- a/app/javascript/styles/mastodon-material/theme/components.scss
+++ b/app/javascript/styles/mastodon-material/theme/components.scss
@@ -396,6 +396,8 @@
             border-radius: 2px;
             padding: 8px 16px;
         }
+
+        &__text { padding: 8px 0 }
     }
 
     &__chart {
diff --git a/app/javascript/styles/mastodon-material/theme/emoji-picker.scss b/app/javascript/styles/mastodon-material/theme/emoji-picker.scss
index 545bab92c..e953f8d82 100644
--- a/app/javascript/styles/mastodon-material/theme/emoji-picker.scss
+++ b/app/javascript/styles/mastodon-material/theme/emoji-picker.scss
@@ -4,20 +4,6 @@
         background: $menu-bg-color;
         border-radius: $menu-radius;
         margin-top: 0;
-
-        // bubble
-        // unable to fit the position
-        /*&::before {
-            @include shadow-8dp;
-            content: "";
-            position: absolute;
-            background: $menu-bg-color;
-            top: -6px;
-            width: 12px;
-            height: 12px;
-            transform: rotate(45deg);
-            z-index: -1;
-        }*/
     }
 
     &__modifiers__menu {
@@ -32,14 +18,16 @@
 }
 
 .emoji-mart {
-    width: 388px !important;
     font-size: 14px;
     color: $menu-text-color;
 
     &-bar {
         border: 0 solid $border-color;
 
-        &:first-child { background: $tab-bg-color }
+        &:first-child {
+            background: $tab-bg-color;
+            border-radius: $card-radius $card-radius 0 0;
+        }
     }
 
     &-anchor {
@@ -55,7 +43,7 @@
             &:hover { color: $tab-item-active-color }
         }
 
-        &:hover { color: $tab-item-color }
+        &:hover { color: $tab-item-active-color }
     }
 
     &-search {
@@ -65,6 +53,10 @@
             right: auto;
             left: 16px;
             padding: 2px 6px;
+
+            svg { fill: $icon-color }
+
+            &:disabled { opacity: 1 }
         }
 
         input {
@@ -80,6 +72,8 @@
                 background: $search-bar-focus-color;
                 color: $search-bar-text-color;
             }
+
+            &::placeholder { color: $tips-text-color }
         }
     }
 
diff --git a/app/javascript/styles/mastodon-material/theme/forms.scss b/app/javascript/styles/mastodon-material/theme/forms.scss
index ec8fc865c..b43602618 100644
--- a/app/javascript/styles/mastodon-material/theme/forms.scss
+++ b/app/javascript/styles/mastodon-material/theme/forms.scss
@@ -95,7 +95,10 @@
         padding-right: 40px;
         height: 40px;
 
-        option { background-color: $menu-bg-color }
+        option {
+            color: $menu-text-color;
+            background-color: $menu-bg-color;
+        }
 
         &:hover { background-color: $dropdown-field-bg-hover-color }
 
diff --git a/app/javascript/styles/mastodon-material/theme/responsive.scss b/app/javascript/styles/mastodon-material/theme/responsive.scss
index 2fc5cae79..1d4007b5c 100644
--- a/app/javascript/styles/mastodon-material/theme/responsive.scss
+++ b/app/javascript/styles/mastodon-material/theme/responsive.scss
@@ -103,7 +103,7 @@
     }
 }
 
-//single column mode
+// single column mode
 @media screen and (min-width: 630px) {
     .tabs-bar__link {
         &:hover {
diff --git a/app/javascript/styles/mastodon-material/theme/statuses.scss b/app/javascript/styles/mastodon-material/theme/statuses.scss
index 18054c4f4..2c7b8510f 100644
--- a/app/javascript/styles/mastodon-material/theme/statuses.scss
+++ b/app/javascript/styles/mastodon-material/theme/statuses.scss
@@ -140,6 +140,8 @@
         &>.fa {
             font-size: 26px;
         }
+
+        &-image { border-radius: $card-radius 0 0 $card-radius }
     }
 
     &__title {